@ably/ai-transport 0.0.1 → 0.1.0

package/dist/vercel/ably-ai-transport-vercel.js

@@ -1,46 +1,78 @@
 import * as e from "ably";
-import { isDataUIPart as t } from "ai";
+import { convertToModelMessages as t, isDataUIPart as n } from "ai";
 //#region src/constants.ts
-var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-ably-turn-id", o = "x-ably-msg-id", s = "x-ably-turn-client-id", c = "x-ably-role", l = "x-ably-cancel-turn-id", u = "x-ably-cancel-own", d = "x-ably-cancel-all", f = "x-ably-cancel-client-id", p = "x-ably-parent", m = "x-ably-fork-of", h = "x-ably-turn-reason", g = "x-ably-cancel", _ = "x-ably-turn-start", v = "x-ably-turn-end", y = "x-domain-", b = (e) => {
+var r = "x-ably-stream", i = "x-ably-status", a = "x-ably-stream-id", o = "x-ably-discrete", s = "x-ably-turn-id", c = "x-ably-msg-id", l = "x-ably-turn-client-id", u = "x-ably-role", d = "x-ably-amend", f = "x-ably-cancel-turn-id", p = "x-ably-cancel-own", m = "x-ably-cancel-all", h = "x-ably-cancel-client-id", g = "x-ably-parent", _ = "x-ably-fork-of", v = "x-ably-turn-reason", y = "x-ably-cancel", b = "x-ably-turn-start", x = "x-ably-turn-end", S = "x-domain-", C = (e) => {
 	let t = e.extras;
 	if (!t || typeof t != "object") return {};
 	let n = t.headers;
 	return !n || typeof n != "object" ? {} : n;
-}, ee = (e) => {
+}, w = (e) => {
 	if (e !== void 0) try {
 		return JSON.parse(e);
 	} catch {
 		return;
 	}
-}, x = (e, t) => ({
+}, T = (e, t) => ({
 	...e,
 	...t
-}), te = (e) => {
+}), ee = (e) => {
 	if (e !== void 0) return e === "true";
-}, S = (e, t) => e[y + t], C = (e) => {
+}, E = (e, t) => e[S + t], D = (e) => {
 	let t = {};
 	for (let n in e) Object.prototype.hasOwnProperty.call(e, n) && e[n] !== void 0 && (t[n] = e[n]);
 	return t;
-}, ne = (e) => ({
-	str: (t) => S(e, t),
-	strOr: (t, n) => S(e, t) ?? n,
-	bool: (t) => te(S(e, t)),
-	json: (t) => ee(S(e, t))
-}), w = () => {
+}, te = (e) => ({
+	str: (t) => E(e, t),
+	strOr: (t, n) => E(e, t) ?? n,
+	bool: (t) => ee(E(e, t)),
+	json: (t) => w(E(e, t))
+}), O = () => {
 	let e = {}, t = {
-		str: (n, r) => (r !== void 0 && (e[y + n] = r), t),
-		bool: (n, r) => (r !== void 0 && (e[y + n] = String(r)), t),
-		json: (n, r) => (r != null && (e[y + n] = JSON.stringify(r)), t),
+		str: (n, r) => (r !== void 0 && (e[S + n] = r), t),
+		bool: (n, r) => (r !== void 0 && (e[S + n] = String(r)), t),
+		json: (n, r) => (r != null && (e[S + n] = JSON.stringify(r)), t),
 		build: () => e
 	};
 	return t;
-}, T = (e) => C({
+}, k = (e) => D({
 	type: "dynamic-tool",
 	toolCallId: e.toolCallId,
 	toolName: e.toolName,
 	title: e.title,
 	providerExecuted: e.providerExecuted
-}), E = class {
+}), ne = (e, t) => {
+	let n = k(e);
+	switch (t.type) {
+		case "tool-output-available": return D({
+			...n,
+			state: "output-available",
+			input: e.input,
+			output: t.output,
+			preliminary: t.preliminary
+		});
+		case "tool-output-error": return {
+			...n,
+			state: "output-error",
+			input: e.input,
+			errorText: t.errorText
+		};
+		case "tool-output-denied": return {
+			...n,
+			state: "output-denied",
+			input: e.input,
+			approval: {
+				id: "",
+				approved: !1
+			}
+		};
+		case "tool-approval-request": return {
+			...n,
+			state: "approval-requested",
+			input: e.input,
+			approval: { id: t.approvalId }
+		};
+	}
+}, A = class {
 	constructor(e) {
 		this._activeIndex = /* @__PURE__ */ new Map(), this._partType = e;
 	}
@@ -62,7 +94,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 	reset() {
 		this._activeIndex = /* @__PURE__ */ new Map();
 	}
-}, D = class {
+}, re = class {
 	constructor() {
 		this._messageList = [], this._activeMessages = /* @__PURE__ */ new Map();
 	}
@@ -85,6 +117,42 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 		let t = this._messageList.findIndex((t) => t.id === e.id);
 		t !== -1 && (this._messageList[t] = e);
 	}
+	initMessage(e, t) {
+		let n = this._activeMessages.get(e);
+		if (n) {
+			let e = structuredClone(t), r = this._messageList.indexOf(n.message);
+			n.message = e, r !== -1 && (this._messageList[r] = e), n.toolTrackers = {};
+			for (let t = 0; t < e.parts.length; t++) {
+				let r = e.parts[t];
+				r?.type === "dynamic-tool" && (n.toolTrackers[r.toolCallId] = {
+					partIndex: t,
+					inputText: ""
+				}, n.streamStatus.set(r.toolCallId, "finished"));
+			}
+			return;
+		}
+		let r = structuredClone(t), i = {}, a = /* @__PURE__ */ new Map();
+		for (let e = 0; e < r.parts.length; e++) {
+			let t = r.parts[e];
+			t?.type === "dynamic-tool" && (i[t.toolCallId] = {
+				partIndex: e,
+				inputText: ""
+			}, a.set(t.toolCallId, "finished"));
+		}
+		let o = {
+			message: r,
+			textStreams: new A("text"),
+			reasoningStreams: new A("reasoning"),
+			toolTrackers: i,
+			streamStatus: a
+		};
+		this._activeMessages.set(e, o);
+		let s = this._messageList.findIndex((e) => e.id === t.id);
+		s === -1 ? this._messageList.push(o.message) : this._messageList[s] = o.message;
+	}
+	completeMessage(e) {
+		this._activeMessages.delete(e);
+	}
 	_ensureActiveMessage(e) {
 		let t = this._activeMessages.get(e);
 		if (t) return t;
@@ -94,8 +162,8 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				role: "assistant",
 				parts: []
 			},
-			textStreams: new E("text"),
-			reasoningStreams: new E("reasoning"),
+			textStreams: new A("text"),
+			reasoningStreams: new A("reasoning"),
 			toolTrackers: {},
 			streamStatus: /* @__PURE__ */ new Map()
 		};
@@ -149,7 +217,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 			default:
 				if (e.type.startsWith("data-")) {
 					if (e.transient) break;
-					let n = this._ensureActiveMessage(t), r = C({
+					let n = this._ensureActiveMessage(t), r = D({
 						type: e.type,
 						id: e.id,
 						data: e.data
@@ -228,7 +296,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 			case "tool-input-start": {
 				let n = this._ensureActiveMessage(t), r = n.message.parts.length;
 				n.message.parts.push({
-					...T(e),
+					...k(e),
 					state: "input-streaming",
 					input: void 0
 				}), n.toolTrackers[e.toolCallId] = {
@@ -250,7 +318,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				let a = this._getToolPart(e.toolCallId, n);
 				if (!a) break;
 				n.message.parts[a.tracker.partIndex] = {
-					...T(a.part),
+					...k(a.part),
 					state: "input-streaming",
 					input: i
 				};
@@ -260,7 +328,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				let n = this._ensureActiveMessage(t), r = this._getToolPart(e.toolCallId, n);
 				if (!r) break;
 				n.message.parts[r.tracker.partIndex] = {
-					...T(r.part),
+					...k(r.part),
 					state: "input-available",
 					input: e.input
 				}, n.streamStatus.set(e.toolCallId, "finished");
@@ -269,7 +337,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 			case "tool-input-error": {
 				let n = this._ensureActiveMessage(t), r = this._getToolPart(e.toolCallId, n);
 				if (r) n.message.parts[r.tracker.partIndex] = {
-					...T(r.part),
+					...k(r.part),
 					state: "output-error",
 					input: e.input,
 					errorText: e.errorText
@@ -277,7 +345,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				else {
 					let t = n.message.parts.length;
 					n.message.parts.push({
-						...T(e),
+						...k(e),
 						state: "output-error",
 						input: e.input,
 						errorText: e.errorText
@@ -293,44 +361,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 	}
 	_processToolOutput(e, t) {
 		let n = this._ensureActiveMessage(t), r = this._getToolPart(e.toolCallId, n);
-		if (r) switch (e.type) {
-			case "tool-output-available":
-				n.message.parts[r.tracker.partIndex] = C({
-					...T(r.part),
-					state: "output-available",
-					input: r.part.input,
-					output: e.output,
-					preliminary: e.preliminary
-				});
-				break;
-			case "tool-output-error":
-				n.message.parts[r.tracker.partIndex] = {
-					...T(r.part),
-					state: "output-error",
-					input: r.part.input,
-					errorText: e.errorText
-				};
-				break;
-			case "tool-output-denied":
-				n.message.parts[r.tracker.partIndex] = {
-					...T(r.part),
-					state: "output-denied",
-					input: r.part.input,
-					approval: {
-						id: "",
-						approved: !1
-					}
-				};
-				break;
-			case "tool-approval-request":
-				n.message.parts[r.tracker.partIndex] = {
-					...T(r.part),
-					state: "approval-requested",
-					input: r.part.input,
-					approval: { id: e.approvalId }
-				};
-				break;
-		}
+		r && (n.message.parts[r.tracker.partIndex] = ne(r.part, e));
 	}
 	_processContentPart(e, t) {
 		let n = this._ensureActiveMessage(t);
@@ -343,7 +374,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				});
 				break;
 			case "source-url":
-				n.message.parts.push(C({
+				n.message.parts.push(D({
 					type: "source-url",
 					sourceId: e.sourceId,
 					url: e.url,
@@ -351,7 +382,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				}));
 				break;
 			case "source-document":
-				n.message.parts.push(C({
+				n.message.parts.push(D({
 					type: "source-document",
 					sourceId: e.sourceId,
 					mediaType: e.mediaType,
@@ -361,7 +392,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				break;
 		}
 	}
-}, re = () => new D(), ie = (e) => [{
+}, j = () => new re(), ie = (e) => [{
 	kind: "event",
 	event: e
 }], ae = class {
@@ -393,7 +424,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				break;
 			default: return [];
 		}
-		let r = b(e)[o];
+		let r = C(e)[c];
 		if (r) for (let e of n) e.kind === "event" && (e.messageId = r);
 		return n;
 	}
@@ -401,7 +432,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 		return {
 			name: e.name ?? "",
 			data: e.data,
-			headers: b(e)
+			headers: C(e)
 		};
 	}
 	_stringData(e) {
@@ -441,14 +472,14 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 		if (!t) return [];
 		let n = this._serialState.get(t);
 		if (!n) return this._decodeUpdate(e);
-		let i = b(e), a = typeof e.data == "string" ? e.data : "", o = i[r], s = [];
-		return a.length > 0 && (n.accumulated += a, s.push(...this._hooks.buildDeltaEvents(n, a))), o === "finished" && !n.closed ? (n.closed = !0, s.push(...this._hooks.buildEndEvents(n, i)), this._logger?.debug("DefaultDecoderCore._decodeAppend(); stream finished", { streamId: n.streamId })) : o === "aborted" && !n.closed && (n.closed = !0, this._logger?.debug("DefaultDecoderCore._decodeAppend(); stream aborted", { streamId: n.streamId })), s;
+		let r = C(e), a = typeof e.data == "string" ? e.data : "", o = r[i], s = [];
+		return a.length > 0 && (n.accumulated += a, s.push(...this._hooks.buildDeltaEvents(n, a))), o === "finished" && !n.closed ? (n.closed = !0, s.push(...this._hooks.buildEndEvents(n, r)), this._logger?.debug("DefaultDecoderCore._decodeAppend(); stream finished", { streamId: n.streamId })) : o === "aborted" && !n.closed && (n.closed = !0, this._logger?.debug("DefaultDecoderCore._decodeAppend(); stream aborted", { streamId: n.streamId })), s;
 	}
 	_decodeUpdate(e) {
 		let t = e.serial;
 		if (!t) return [];
-		let i = this._toPayload(e), a = i.headers ?? {}, o = a[n] === "true", s = a[r], c = this._serialState.get(t);
-		if (!c) return this._decodeFirstContact(i, o, s, t);
+		let n = this._toPayload(e), a = n.headers ?? {}, o = a[r] === "true", s = a[i], c = this._serialState.get(t);
+		if (!c) return this._decodeFirstContact(n, o, s, t);
 		let l = this._stringData(e);
 		if (l.startsWith(c.accumulated)) {
 			let e = l.slice(c.accumulated.length), t = [];
@@ -503,32 +534,32 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 		let t = this._emitted.get(e);
 		return t || (t = /* @__PURE__ */ new Set(), this._emitted.set(e, t)), t;
 	}
-}, ce = (e) => new se(e), O = (e) => {
-	let t = ne(e);
+}, ce = (e) => new se(e), M = (e) => {
+	let t = te(e);
 	return {
 		...t,
 		providerMetadata: () => t.json("providerMetadata")
 	};
-}, k = (e) => ie(e), le = (e, t) => e === "stop" || e === "length" || e === "content-filter" || e === "tool-calls" || e === "error" || e === "other" ? e : t, A = (e) => e.startsWith("data-"), ue = (e) => {
+}, N = (e) => ie(e), le = (e, t) => e === "stop" || e === "length" || e === "content-filter" || e === "tool-calls" || e === "error" || e === "other" ? e : t, P = (e) => e.startsWith("data-"), ue = (e) => {
 	if (e) try {
 		return JSON.parse(e);
 	} catch {
 		return e;
 	}
-}, j = (e) => {
-	let t = O(e.headers);
+}, de = (e) => {
+	let t = M(e.headers);
 	switch (e.name) {
-		case "text": return C({
+		case "text": return D({
 			type: "text-start",
 			id: e.streamId,
 			providerMetadata: t.providerMetadata()
 		});
-		case "reasoning": return C({
+		case "reasoning": return D({
 			type: "reasoning-start",
 			id: e.streamId,
 			providerMetadata: t.providerMetadata()
 		});
-		case "tool-input": return C({
+		case "tool-input": return D({
 			type: "tool-input-start",
 			toolCallId: e.streamId,
 			toolName: t.strOr("toolName", ""),
@@ -542,7 +573,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 			id: e.streamId
 		};
 	}
-}, M = (e, t) => {
+}, fe = (e, t) => {
 	switch (e.name) {
 		case "text": return {
 			type: "text-delta",
@@ -565,23 +596,23 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 			delta: t
 		};
 	}
-}, N = (e, t) => {
-	let n = O(t);
+}, pe = (e, t) => {
+	let n = M(t);
 	switch (e.name) {
-		case "text": return C({
+		case "text": return D({
 			type: "text-end",
 			id: e.streamId,
 			providerMetadata: n.providerMetadata()
 		});
-		case "reasoning": return C({
+		case "reasoning": return D({
 			type: "reasoning-end",
 			id: e.streamId,
 			providerMetadata: n.providerMetadata()
 		});
-		case "tool-input": return C({
+		case "tool-input": return D({
 			type: "tool-input-available",
 			toolCallId: e.streamId,
-			toolName: n.strOr("toolName", O(e.headers).strOr("toolName", "")),
+			toolName: n.strOr("toolName", M(e.headers).strOr("toolName", "")),
 			input: ue(e.accumulated),
 			providerMetadata: n.providerMetadata()
 		});
@@ -590,9 +621,9 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 			id: e.streamId
 		};
 	}
-}, P = () => ce([{
+}, me = () => ce([{
 	key: "start",
-	build: (e) => [C({
+	build: (e) => [D({
 		type: "start",
 		messageId: e.messageId
 	})]
@@ -602,44 +633,44 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 }]), F = (e, t, n) => e.ensurePhases(t, n).map((e) => ({
 	kind: "event",
 	event: e
-})), I = (e, t, n) => (n.markEmitted(t, "start"), k(C({
+})), he = (e, t, n) => (n.markEmitted(t, "start"), N(D({
 	type: "start",
 	messageId: e.str("messageId"),
 	messageMetadata: e.json("messageMetadata")
-}))), L = (e, t) => (t.markEmitted(e, "start-step"), k({ type: "start-step" })), R = (e, t) => (t.resetPhase(e, "start-step"), k({ type: "finish-step" })), z = (e, t, n) => (n.clearScope(t), k(C({
+}))), ge = (e, t) => (t.markEmitted(e, "start-step"), N({ type: "start-step" })), _e = (e, t) => (t.resetPhase(e, "start-step"), N({ type: "finish-step" })), I = (e, t, n) => (n.clearScope(t), N(D({
 	type: "finish",
 	finishReason: le(e.str("finishReason"), "stop"),
 	messageMetadata: e.json("messageMetadata")
-}))), B = (e) => k({
+}))), ve = (e, t, n) => (n.clearScope(t), N({
 	type: "error",
 	errorText: typeof e == "string" ? e : ""
-}), V = (e, t, n) => (n.clearScope(t), k(C({
+})), ye = (e, t, n) => (n.clearScope(t), N(D({
 	type: "abort",
 	reason: typeof e == "string" && e ? e : void 0
-}))), H = (e) => k({
+}))), be = (e) => N({
 	type: "message-metadata",
 	messageMetadata: e.json("messageMetadata")
-}), U = (e, t) => k(C({
+}), xe = (e, t) => N(D({
 	type: "file",
 	url: typeof t == "string" ? t : "",
 	mediaType: e.strOr("mediaType", ""),
 	providerMetadata: e.providerMetadata()
-})), de = (e, t) => k(C({
+})), Se = (e, t) => N(D({
 	type: "source-url",
 	sourceId: e.strOr("sourceId", ""),
 	url: typeof t == "string" ? t : "",
 	title: e.str("title"),
 	providerMetadata: e.providerMetadata()
-})), fe = (e) => k(C({
+})), Ce = (e) => N(D({
 	type: "source-document",
 	sourceId: e.strOr("sourceId", ""),
 	mediaType: e.strOr("mediaType", ""),
 	title: e.strOr("title", ""),
 	filename: e.str("filename"),
 	providerMetadata: e.providerMetadata()
-})), pe = (e, t) => {
+})), we = (e, t) => {
 	let n = t;
-	return k(C({
+	return N(D({
 		type: "tool-input-error",
 		toolCallId: e.strOr("toolCallId", ""),
 		toolName: e.strOr("toolName", ""),
@@ -650,9 +681,9 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 		providerExecuted: e.bool("providerExecuted"),
 		providerMetadata: e.providerMetadata()
 	}));
-}, me = (e, t) => {
+}, Te = (e, t) => {
 	let n = t;
-	return k(C({
+	return N(D({
 		type: "tool-output-available",
 		toolCallId: e.strOr("toolCallId", ""),
 		output: n?.output,
@@ -660,32 +691,32 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 		providerExecuted: e.bool("providerExecuted"),
 		preliminary: e.bool("preliminary")
 	}));
-}, he = (e, t) => {
+}, Ee = (e, t) => {
 	let n = t;
-	return k(C({
+	return N(D({
 		type: "tool-output-error",
 		toolCallId: e.strOr("toolCallId", ""),
 		errorText: n?.errorText ?? "",
 		dynamic: e.bool("dynamic"),
 		providerExecuted: e.bool("providerExecuted")
 	}));
-}, ge = (e) => k({
+}, De = (e) => N({
 	type: "tool-approval-request",
 	toolCallId: e.strOr("toolCallId", ""),
 	approvalId: e.strOr("approvalId", "")
-}), _e = (e) => k({
+}), Oe = (e) => N({
 	type: "tool-output-denied",
 	toolCallId: e.strOr("toolCallId", "")
-}), ve = (e, t, n) => k(C({
+}), ke = (e, t, n) => N(D({
 	type: e,
 	data: n,
 	id: t.str("id"),
 	transient: t.bool("transient")
-})), ye = (e, t, n, r) => {
+})), Ae = (e, t, n, r) => {
 	let i = F(r, n, { messageId: e.str("messageId") });
 	return i.push({
 		kind: "event",
-		event: C({
+		event: D({
 			type: "tool-input-start",
 			toolCallId: e.strOr("toolCallId", ""),
 			toolName: e.strOr("toolName", ""),
@@ -696,7 +727,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 		})
 	}, {
 		kind: "event",
-		event: C({
+		event: D({
 			type: "tool-input-available",
 			toolCallId: e.strOr("toolCallId", ""),
 			toolName: e.strOr("toolName", ""),
@@ -704,8 +735,8 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 			providerMetadata: e.providerMetadata()
 		})
 	}), i;
-}, be = (e) => {
-	let t = e.headers ?? {}, n = O(t), r = t["x-ably-role"] ?? "user", i = n.str("messageId") ?? "", a;
+}, je = (e) => {
+	let t = e.headers ?? {}, n = M(t), r = t["x-ably-role"] ?? "user", i = n.str("messageId") ?? "", a;
 	switch (e.name) {
 		case "text":
 			a = {
@@ -721,7 +752,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 			};
 			break;
 		default:
-			A(e.name) && (a = C({
+			P(e.name) && (a = D({
 				type: e.name,
 				id: n.str("id"),
 				data: e.data
@@ -736,49 +767,49 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 			parts: [a]
 		}
 	}] : [];
-}, xe = (e, t) => (e === "text" || e === "file" || A(e)) && "x-ably-role" in t, Se = (e, t) => {
-	let n = e.headers ?? {}, r = O(n), i = n["x-ably-turn-id"] ?? "";
-	if (xe(e.name, n)) return be(e);
-	if (e.name === "tool-input") return ye(r, e.data, i, t);
+}, Me = (e, t) => (e === "text" || e === "file" || P(e)) && "x-ably-discrete" in t, Ne = (e, t) => {
+	let n = e.headers ?? {}, r = M(n), i = n["x-ably-turn-id"] ?? "";
+	if (Me(e.name, n)) return je(e);
+	if (e.name === "tool-input") return Ae(r, e.data, i, t);
 	switch (e.name) {
-		case "start": return I(r, i, t);
-		case "start-step": return L(i, t);
-		case "finish-step": return R(i, t);
-		case "finish": return z(r, i, t);
-		case "error": return B(e.data);
-		case "abort": return V(e.data, i, t);
-		case "message-metadata": return H(r);
-		case "file": return U(r, e.data);
-		case "source-url": return de(r, e.data);
-		case "source-document": return fe(r);
-		case "tool-input-error": return pe(r, e.data);
-		case "tool-output-available": return me(r, e.data);
-		case "tool-output-error": return he(r, e.data);
-		case "tool-approval-request": return ge(r);
-		case "tool-output-denied": return _e(r);
-		default: return A(e.name) ? ve(e.name, r, e.data) : [];
-	}
-}, Ce = (e) => ({
+		case "start": return he(r, i, t);
+		case "start-step": return ge(i, t);
+		case "finish-step": return _e(i, t);
+		case "finish": return I(r, i, t);
+		case "error": return ve(e.data, i, t);
+		case "abort": return ye(e.data, i, t);
+		case "message-metadata": return be(r);
+		case "file": return xe(r, e.data);
+		case "source-url": return Se(r, e.data);
+		case "source-document": return Ce(r);
+		case "tool-input-error": return we(r, e.data);
+		case "tool-output-available": return Te(r, e.data);
+		case "tool-output-error": return Ee(r, e.data);
+		case "tool-approval-request": return De(r);
+		case "tool-output-denied": return Oe(r);
+		default: return P(e.name) ? ke(e.name, r, e.data) : [];
+	}
+}, Pe = (e) => ({
 	buildStartEvents: (t) => {
-		let n = F(e, t.headers["x-ably-turn-id"] ?? "", { messageId: O(t.headers).str("messageId") });
+		let n = F(e, t.headers["x-ably-turn-id"] ?? "", { messageId: M(t.headers).str("messageId") });
 		return n.push({
 			kind: "event",
-			event: j(t)
+			event: de(t)
 		}), n;
 	},
-	buildDeltaEvents: (e, t) => k(M(e, t)),
-	buildEndEvents: (e, t) => k(N(e, t)),
-	decodeDiscrete: (t) => Se(t, e)
-}), we = class {
+	buildDeltaEvents: (e, t) => N(fe(e, t)),
+	buildEndEvents: (e, t) => N(pe(e, t)),
+	decodeDiscrete: (t) => Ne(t, e)
+}), Fe = class {
 	constructor(e = {}) {
-		this._core = oe(Ce(P()), e);
+		this._core = oe(Pe(me()), e);
 	}
 	decode(e) {
 		return this._core.decode(e);
 	}
-}, Te = (e = {}) => new we(e), W = /* @__PURE__ */ function(e) {
-	return e[e.BadRequest = 4e4] = "BadRequest", e[e.InvalidArgument = 40003] = "InvalidArgument", e[e.EncoderRecoveryFailed = 104e3] = "EncoderRecoveryFailed", e[e.TransportSubscriptionError = 104001] = "TransportSubscriptionError", e[e.CancelListenerError = 104002] = "CancelListenerError", e[e.TurnLifecycleError = 104003] = "TurnLifecycleError", e[e.TransportClosed = 104004] = "TransportClosed", e[e.TransportSendFailed = 104005] = "TransportSendFailed", e;
-}({}), Ee = (e, t) => e.code === t, De = class {
+}, Ie = (e = {}) => new Fe(e), L = /* @__PURE__ */ function(e) {
+	return e[e.BadRequest = 4e4] = "BadRequest", e[e.InvalidArgument = 40003] = "InvalidArgument", e[e.EncoderRecoveryFailed = 104e3] = "EncoderRecoveryFailed", e[e.TransportSubscriptionError = 104001] = "TransportSubscriptionError", e[e.CancelListenerError = 104002] = "CancelListenerError", e[e.TurnLifecycleError = 104003] = "TurnLifecycleError", e[e.TransportClosed = 104004] = "TransportClosed", e[e.TransportSendFailed = 104005] = "TransportSendFailed", e[e.ChannelContinuityLost = 104006] = "ChannelContinuityLost", e[e.ChannelNotReady = 104007] = "ChannelNotReady", e[e.StreamError = 104008] = "StreamError", e;
+}({}), Le = (e, t) => e.code === t, Re = class {
 	constructor(e, t = {}) {
 		this._trackers = /* @__PURE__ */ new Map(), this._pending = [], this._closed = !1, this._writer = e, this._defaultClientId = t.clientId, this._defaultExtras = t.extras, this._onMessageHook = t.onMessage ?? (() => {}), this._logger = t.logger?.withContext({ component: "EncoderCore" });
 	}
@@ -790,33 +821,34 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 	async publishDiscreteBatch(e, t) {
 		this._assertNotClosed(), this._logger?.trace("DefaultEncoderCore.publishDiscreteBatch();", { count: e.length });
 		let n = e.map((e) => this._buildDiscreteMessage(e, t));
+		for (let e of n) e.extras.headers[o] = "true";
 		return this._writer.publish(n);
 	}
-	async startStream(t, a, o) {
+	async startStream(t, n, o) {
 		this._assertNotClosed(), this._logger?.trace("DefaultEncoderCore.startStream();", {
-			name: a.name,
+			name: n.name,
 			streamId: t
 		});
-		let s = this._buildHeaders(a.headers ?? {}, o);
-		s[n] = "true", s[r] = "streaming", s[i] = t;
+		let s = this._buildHeaders(n.headers ?? {}, o);
+		s[r] = "true", s[i] = "streaming", s[a] = t;
 		let c = this._resolveClientId(o), l = {
-			name: a.name,
-			data: a.data,
+			name: n.name,
+			data: n.data,
 			extras: { headers: s },
 			...c ? { clientId: c } : {}
 		};
 		this._invokeOnMessage(l);
 		let u = (await this._writer.publish(l)).serials[0];
-		if (!u) throw new e.ErrorInfo(`unable to start stream; no serial returned for stream '${a.name}' (streamId: ${t})`, W.BadRequest, 400);
+		if (!u) throw new e.ErrorInfo(`unable to start stream; no serial returned for stream '${n.name}' (streamId: ${t})`, L.BadRequest, 400);
 		this._trackers.set(t, {
 			serial: u,
-			name: a.name,
+			name: n.name,
 			streamId: t,
-			accumulated: a.data,
+			accumulated: n.data,
 			persistentHeaders: s,
 			aborted: !1
 		}), this._logger?.debug("DefaultEncoderCore.startStream(); stream started", {
-			name: a.name,
+			name: n.name,
 			streamId: t,
 			serial: u
 		});
@@ -824,7 +856,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 	appendStream(t, n) {
 		this._assertNotClosed();
 		let r = this._trackers.get(t);
-		if (!r) throw new e.ErrorInfo(`unable to append to stream; no active stream for streamId '${t}'`, W.InvalidArgument, 400);
+		if (!r) throw new e.ErrorInfo(`unable to append to stream; no active stream for streamId '${t}'`, L.InvalidArgument, 400);
 		r.accumulated += n;
 		let i = {
 			serial: r.serial,
@@ -840,13 +872,13 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 	}
 	async closeStream(t, n) {
 		this._assertNotClosed(), this._logger?.trace("DefaultEncoderCore.closeStream();", { streamId: t });
-		let i = this._trackers.get(t);
-		if (!i) throw new e.ErrorInfo(`unable to close stream; no active stream for streamId '${t}'`, W.InvalidArgument, 400);
-		i.accumulated += n.data;
-		let a = this._buildClosingHeaders(i, n.headers ?? {});
-		a[r] = "finished";
+		let r = this._trackers.get(t);
+		if (!r) throw new e.ErrorInfo(`unable to close stream; no active stream for streamId '${t}'`, L.InvalidArgument, 400);
+		r.accumulated += n.data;
+		let a = this._buildClosingHeaders(r, n.headers ?? {});
+		a[i] = "finished";
 		let o = {
-			serial: i.serial,
+			serial: r.serial,
 			data: n.data,
 			extras: { headers: a }
 		};
@@ -859,13 +891,13 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 	}
 	async abortStream(t, n) {
 		this._assertNotClosed(), this._logger?.trace("DefaultEncoderCore.abortStream();", { streamId: t });
-		let i = this._trackers.get(t);
-		if (!i) throw new e.ErrorInfo(`unable to abort stream; no active stream for streamId '${t}'`, W.InvalidArgument, 400);
-		i.aborted = !0;
-		let a = this._buildClosingHeaders(i, {}, n);
-		a[r] = "aborted";
+		let r = this._trackers.get(t);
+		if (!r) throw new e.ErrorInfo(`unable to abort stream; no active stream for streamId '${t}'`, L.InvalidArgument, 400);
+		r.aborted = !0;
+		let a = this._buildClosingHeaders(r, {}, n);
+		a[i] = "aborted";
 		let o = {
-			serial: i.serial,
+			serial: r.serial,
 			data: "",
 			extras: { headers: a }
 		};
@@ -881,14 +913,14 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 		for (let t of this._trackers.values()) {
 			t.aborted = !0;
 			let n = this._buildClosingHeaders(t, {}, e);
-			n[r] = "aborted";
-			let i = {
+			n[i] = "aborted";
+			let r = {
 				serial: t.serial,
 				data: "",
 				extras: { headers: n }
 			};
-			this._invokeOnMessage(i);
-			let a = this._writer.appendMessage(i);
+			this._invokeOnMessage(r);
+			let a = this._writer.appendMessage(r);
 			this._pending.push({
 				promise: a,
 				streamId: t.streamId
@@ -909,30 +941,30 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 		}
 	}
 	async _doFlush(t) {
-		let n = await Promise.allSettled(t.map(async (e) => e.promise)), i = /* @__PURE__ */ new Set();
-		for (let [e, r] of n.entries()) {
+		let n = await Promise.allSettled(t.map(async (e) => e.promise)), r = /* @__PURE__ */ new Set();
+		for (let [e, i] of n.entries()) {
 			let n = t[e];
-			n && r.status === "rejected" && i.add(n.streamId);
+			n && i.status === "rejected" && r.add(n.streamId);
 		}
-		if (i.size === 0) {
+		if (r.size === 0) {
 			this._logger?.debug("DefaultEncoderCore._flushPending(); all appends succeeded");
 			return;
 		}
-		this._logger?.warn("DefaultEncoderCore._flushPending(); recovering failed appends", { failedStreams: [...i] });
+		this._logger?.warn("DefaultEncoderCore._flushPending(); recovering failed appends", { failedStreams: [...r] });
 		let a = [];
-		for (let e of i) {
+		for (let e of r) {
 			let t = this._trackers.get(e);
 			if (!t) continue;
-			let n = t.aborted ? "aborted" : "finished", i = {
+			let n = t.aborted ? "aborted" : "finished", r = {
 				serial: t.serial,
 				data: t.accumulated,
 				extras: { headers: {
 					...t.persistentHeaders,
-					[r]: n
+					[i]: n
 				} }
 			};
 			try {
-				await this._writer.updateMessage(i);
+				await this._writer.updateMessage(r);
 			} catch (t) {
 				a.push({
 					streamId: e,
@@ -942,7 +974,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 		}
 		if (a.length > 0) {
 			let t = a.map((e) => e.streamId).join(", ");
-			throw this._logger?.error("DefaultEncoderCore._flushPending(); recovery failed", { failedStreams: t }), new e.ErrorInfo(`unable to flush pending appends; recovery failed for stream(s): ${t}`, W.EncoderRecoveryFailed, 500);
+			throw this._logger?.error("DefaultEncoderCore._flushPending(); recovery failed", { failedStreams: t }), new e.ErrorInfo(`unable to flush pending appends; recovery failed for stream(s): ${t}`, L.EncoderRecoveryFailed, 500);
 		}
 	}
 	async close() {
@@ -964,26 +996,26 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 		}
 	}
 	_assertNotClosed() {
-		if (this._closed) throw new e.ErrorInfo("unable to write to encoder; encoder has been closed", W.InvalidArgument, 400);
+		if (this._closed) throw new e.ErrorInfo("unable to write to encoder; encoder has been closed", L.InvalidArgument, 400);
 	}
 	_resolveClientId(e) {
 		return e?.clientId ?? this._defaultClientId;
 	}
 	_buildHeaders(e, t) {
 		let n = {
-			...x(this._defaultExtras?.headers, t?.extras?.headers),
+			...T(this._defaultExtras?.headers, t?.extras?.headers),
 			...e
 		};
-		return t?.messageId !== void 0 && (n[o] = t.messageId), n;
+		return t?.messageId !== void 0 && (n[c] = t.messageId), n;
 	}
 	_buildDiscreteMessage(e, t) {
-		let r = this._buildHeaders(e.headers ?? {}, t);
-		r[n] = "false";
+		let n = this._buildHeaders(e.headers ?? {}, t);
+		n[r] = "false";
 		let i = this._resolveClientId(t), a = {
 			name: e.name,
 			data: e.data,
 			extras: {
-				headers: r,
+				headers: n,
 				...e.ephemeral ? { ephemeral: !0 } : {}
 			},
 			...i ? { clientId: i } : {}
@@ -991,17 +1023,57 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 		return this._invokeOnMessage(a), a;
 	}
 	_buildClosingHeaders(e, t, n) {
-		let r = { ...e.persistentHeaders }, i = x(this._defaultExtras?.headers, n?.extras?.headers);
+		let r = { ...e.persistentHeaders }, i = T(this._defaultExtras?.headers, n?.extras?.headers);
 		return Object.assign(r, i), Object.assign(r, t), r;
 	}
-}, Oe = (e, t = {}) => new De(e, t), ke = class {
+}, ze = (e, t = {}) => new Re(e, t), R = (t) => {
+	switch (t.type) {
+		case "tool-output-available": {
+			let e = O().str("toolCallId", t.toolCallId).bool("dynamic", t.dynamic).bool("providerExecuted", t.providerExecuted).bool("preliminary", t.preliminary).build();
+			return {
+				name: "tool-output-available",
+				data: { output: t.output },
+				headers: e
+			};
+		}
+		case "tool-output-error": {
+			let e = O().str("toolCallId", t.toolCallId).bool("dynamic", t.dynamic).bool("providerExecuted", t.providerExecuted).build();
+			return {
+				name: "tool-output-error",
+				data: { errorText: t.errorText },
+				headers: e
+			};
+		}
+		case "tool-approval-request": return {
+			name: "tool-approval-request",
+			data: "",
+			headers: O().str("toolCallId", t.toolCallId).str("approvalId", t.approvalId).build()
+		};
+		case "tool-output-denied": return {
+			name: "tool-output-denied",
+			data: "",
+			headers: O().str("toolCallId", t.toolCallId).build()
+		};
+		default:
+			if (t.type.startsWith("data-")) {
+				let e = t, n = O().str("id", e.id).bool("transient", e.transient).build(), r = e.transient === !0;
+				return {
+					name: t.type,
+					data: e.data,
+					headers: n,
+					ephemeral: r
+				};
+			}
+			throw new e.ErrorInfo(`unable to write event; unsupported chunk type '${t.type}'`, L.InvalidArgument, 400);
+	}
+}, Be = class {
 	constructor(e, t = {}) {
-		this._aborted = !1, this._core = Oe(e, t);
+		this._aborted = !1, this._core = ze(e, t), this._messageId = t.messageId;
 	}
 	async appendEvent(t, n) {
 		switch (t.type) {
 			case "text-start": {
-				let e = w().str("id", t.id).json("providerMetadata", t.providerMetadata).build();
+				let e = O().str("id", t.id).json("providerMetadata", t.providerMetadata).build();
 				await this._core.startStream(t.id, {
 					name: "text",
 					data: "",
@@ -1010,7 +1082,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				break;
 			}
 			case "reasoning-start": {
-				let e = w().str("id", t.id).json("providerMetadata", t.providerMetadata).build();
+				let e = O().str("id", t.id).json("providerMetadata", t.providerMetadata).build();
 				await this._core.startStream(t.id, {
 					name: "reasoning",
 					data: "",
@@ -1019,7 +1091,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				break;
 			}
 			case "tool-input-start": {
-				let e = w().str("toolCallId", t.toolCallId).str("toolName", t.toolName).bool("dynamic", t.dynamic).str("title", t.title).bool("providerExecuted", t.providerExecuted).json("providerMetadata", t.providerMetadata).build();
+				let e = O().str("toolCallId", t.toolCallId).str("toolName", t.toolName).bool("dynamic", t.dynamic).str("title", t.title).bool("providerExecuted", t.providerExecuted).json("providerMetadata", t.providerMetadata).build();
 				await this._core.startStream(t.toolCallId, {
 					name: "tool-input",
 					data: "",
@@ -1037,7 +1109,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				this._core.appendStream(t.toolCallId, t.inputTextDelta);
 				break;
 			case "text-end": {
-				let e = w().str("id", t.id).json("providerMetadata", t.providerMetadata).build();
+				let e = O().str("id", t.id).json("providerMetadata", t.providerMetadata).build();
 				await this._core.closeStream(t.id, {
 					name: "text",
 					data: "",
@@ -1046,7 +1118,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				break;
 			}
 			case "reasoning-end": {
-				let e = w().str("id", t.id).json("providerMetadata", t.providerMetadata).build();
+				let e = O().str("id", t.id).json("providerMetadata", t.providerMetadata).build();
 				await this._core.closeStream(t.id, {
 					name: "reasoning",
 					data: "",
@@ -1056,15 +1128,15 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 			}
 			case "tool-input-available":
 				try {
-					let e = w().str("toolCallId", t.toolCallId).str("toolName", t.toolName).json("providerMetadata", t.providerMetadata).build();
+					let e = O().str("toolCallId", t.toolCallId).str("toolName", t.toolName).json("providerMetadata", t.providerMetadata).build();
 					await this._core.closeStream(t.toolCallId, {
 						name: "tool-input",
 						data: "",
 						headers: e
 					});
 				} catch (n) {
-					if (!(n instanceof e.ErrorInfo && Ee(n, W.InvalidArgument))) throw n;
-					let r = w().str("toolCallId", t.toolCallId).str("toolName", t.toolName).bool("dynamic", t.dynamic).str("title", t.title).bool("providerExecuted", t.providerExecuted).json("providerMetadata", t.providerMetadata).build();
+					if (!(n instanceof e.ErrorInfo && Le(n, L.InvalidArgument))) throw n;
+					let r = O().str("toolCallId", t.toolCallId).str("toolName", t.toolName).bool("dynamic", t.dynamic).str("title", t.title).bool("providerExecuted", t.providerExecuted).json("providerMetadata", t.providerMetadata).build();
 					await this._core.publishDiscrete({
 						name: "tool-input",
 						data: t.input,
@@ -1073,7 +1145,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				}
 				break;
 			case "start": {
-				let e = w().str("messageId", t.messageId).json("messageMetadata", t.messageMetadata).build();
+				let e = O().str("messageId", t.messageId ?? this._messageId).json("messageMetadata", t.messageMetadata).build();
 				await this._core.publishDiscrete({
 					name: "start",
 					data: "",
@@ -1094,7 +1166,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				}, n);
 				break;
 			case "finish": {
-				let e = w().str("finishReason", t.finishReason).json("messageMetadata", t.messageMetadata).build();
+				let e = O().str("finishReason", t.finishReason).json("messageMetadata", t.messageMetadata).build();
 				await this._core.publishDiscrete({
 					name: "finish",
 					data: "",
@@ -1112,11 +1184,11 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				this._aborted = !0, await this._core.abortAllStreams(n), await this._core.publishDiscrete({
 					name: "abort",
 					data: t.reason ?? "",
-					headers: { [r]: "aborted" }
+					headers: { [i]: "aborted" }
 				}, n);
 				break;
 			case "tool-input-error": {
-				let e = w().str("toolCallId", t.toolCallId).str("toolName", t.toolName).bool("dynamic", t.dynamic).str("title", t.title).bool("providerExecuted", t.providerExecuted).json("providerMetadata", t.providerMetadata).build();
+				let e = O().str("toolCallId", t.toolCallId).str("toolName", t.toolName).bool("dynamic", t.dynamic).str("title", t.title).bool("providerExecuted", t.providerExecuted).json("providerMetadata", t.providerMetadata).build();
 				await this._core.publishDiscrete({
 					name: "tool-input-error",
 					data: {
@@ -1127,44 +1199,14 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				});
 				break;
 			}
-			case "tool-output-available": {
-				let e = w().str("toolCallId", t.toolCallId).bool("dynamic", t.dynamic).bool("providerExecuted", t.providerExecuted).bool("preliminary", t.preliminary).build();
-				await this._core.publishDiscrete({
-					name: "tool-output-available",
-					data: { output: t.output },
-					headers: e
-				});
-				break;
-			}
-			case "tool-output-error": {
-				let e = w().str("toolCallId", t.toolCallId).bool("dynamic", t.dynamic).bool("providerExecuted", t.providerExecuted).build();
-				await this._core.publishDiscrete({
-					name: "tool-output-error",
-					data: { errorText: t.errorText },
-					headers: e
-				});
-				break;
-			}
-			case "tool-approval-request": {
-				let e = w().str("toolCallId", t.toolCallId).str("approvalId", t.approvalId).build();
-				await this._core.publishDiscrete({
-					name: "tool-approval-request",
-					data: "",
-					headers: e
-				}, n);
-				break;
-			}
-			case "tool-output-denied": {
-				let e = w().str("toolCallId", t.toolCallId).build();
-				await this._core.publishDiscrete({
-					name: "tool-output-denied",
-					data: "",
-					headers: e
-				}, n);
+			case "tool-output-available":
+			case "tool-output-error":
+			case "tool-approval-request":
+			case "tool-output-denied":
+				await this._core.publishDiscrete(R(t), n);
 				break;
-			}
 			case "file": {
-				let e = w().str("mediaType", t.mediaType).json("providerMetadata", t.providerMetadata).build();
+				let e = O().str("mediaType", t.mediaType).json("providerMetadata", t.providerMetadata).build();
 				await this._core.publishDiscrete({
 					name: "file",
 					data: t.url,
@@ -1173,7 +1215,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				break;
 			}
 			case "source-url": {
-				let e = w().str("sourceId", t.sourceId).str("title", t.title).json("providerMetadata", t.providerMetadata).build();
+				let e = O().str("sourceId", t.sourceId).str("title", t.title).json("providerMetadata", t.providerMetadata).build();
 				await this._core.publishDiscrete({
 					name: "source-url",
 					data: t.url,
@@ -1182,7 +1224,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				break;
 			}
 			case "source-document": {
-				let e = w().str("sourceId", t.sourceId).str("mediaType", t.mediaType).str("title", t.title).str("filename", t.filename).json("providerMetadata", t.providerMetadata).build();
+				let e = O().str("sourceId", t.sourceId).str("mediaType", t.mediaType).str("title", t.title).str("filename", t.filename).json("providerMetadata", t.providerMetadata).build();
 				await this._core.publishDiscrete({
 					name: "source-document",
 					data: "",
@@ -1191,7 +1233,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				break;
 			}
 			case "message-metadata": {
-				let e = w().json("messageMetadata", t.messageMetadata).build();
+				let e = O().json("messageMetadata", t.messageMetadata).build();
 				await this._core.publishDiscrete({
 					name: "message-metadata",
 					data: "",
@@ -1201,7 +1243,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 			}
 			default:
 				if (t.type.startsWith("data-")) {
-					let e = w().str("id", t.id).bool("transient", t.transient).build(), r = t.transient === !0;
+					let e = O().str("id", t.id).bool("transient", t.transient).build(), r = t.transient === !0;
 					await this._core.publishDiscrete({
 						name: t.type,
 						data: t.data,
@@ -1212,186 +1254,197 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				break;
 		}
 	}
-	async writeEvent(t, n) {
-		if (!t.type.startsWith("data-")) throw new e.ErrorInfo(`unable to write event; only data-* chunk types are supported, got '${t.type}'`, W.InvalidArgument, 400);
-		let r = w().str("id", "id" in t ? t.id : void 0).bool("transient", "transient" in t ? t.transient : void 0).build(), i = "transient" in t && t.transient === !0;
-		return this._core.publishDiscrete({
-			name: t.type,
-			data: "data" in t ? t.data : void 0,
-			headers: r,
-			ephemeral: i
-		}, n);
+	async writeEvent(e, t) {
+		return this._core.publishDiscrete(R(e), t);
 	}
 	async writeMessages(e, t) {
-		let n = e.flatMap((e) => Ae(e));
+		let n = e.flatMap((e) => Ve(e));
 		return this._core.publishDiscreteBatch(n, t);
 	}
 	async abort(e) {
 		this._aborted || (this._aborted = !0, await this._core.abortAllStreams(), await this._core.publishDiscrete({
 			name: "abort",
 			data: e ?? "",
-			headers: { [r]: "aborted" }
+			headers: { [i]: "aborted" }
 		}));
 	}
 	async close() {
 		await this._core.close();
 	}
-}, Ae = (e) => {
-	let n = e.id, r = [];
+}, Ve = (e) => {
+	let t = e.id, r = [];
 	for (let i of e.parts) switch (i.type) {
 		case "text":
 			r.push({
 				name: "text",
 				data: i.text,
-				headers: w().str("messageId", n).build()
+				headers: O().str("messageId", t).build()
 			});
 			break;
 		case "file":
 			r.push({
 				name: "file",
 				data: i.url,
-				headers: w().str("messageId", n).str("mediaType", i.mediaType).build()
+				headers: O().str("messageId", t).str("mediaType", i.mediaType).build()
 			});
 			break;
 		default:
-			t(i) && r.push({
+			n(i) && r.push({
 				name: i.type,
 				data: i.data,
-				headers: w().str("messageId", n).str("id", i.id).build()
+				headers: O().str("messageId", t).str("id", i.id).build()
 			});
 			break;
 	}
 	return r.length === 0 && r.push({
 		name: "text",
 		data: "",
-		headers: w().str("messageId", n).build()
+		headers: O().str("messageId", t).build()
 	}), r;
-}, G = {
-	createEncoder: (e, t = {}) => new ke(e, t),
-	createDecoder: Te,
-	createAccumulator: re,
-	getMessageKey: (e) => e.id,
+}, z = {
+	createEncoder: (e, t = {}) => new Be(e, t),
+	createDecoder: Ie,
+	createAccumulator: j,
 	isTerminal: (e) => e.type === "finish" || e.type === "error" || e.type === "abort"
-}, je = (t, n) => ({
-	sendMessages: async (r) => {
-		let { messages: i, abortSignal: a, trigger: o, messageId: s } = r, c, l;
-		if (o === "regenerate-message") c = [], l = i;
-		else {
-			if (i.length === 0) throw new e.ErrorInfo("unable to send messages; messages array is empty for submit-message trigger", W.InvalidArgument, 400);
-			c = [i.at(-1)], l = i.slice(0, -1);
-		}
-		let u, d;
-		if (o === "regenerate-message" && s) {
-			u = s;
-			let e = t.getTree().getNodeByKey(s);
-			e && (u = e.msgId, d = e.parentId);
-		}
-		let f, p;
-		if (n?.prepareSendMessagesRequest) {
-			let e = n.prepareSendMessagesRequest({
-				id: r.chatId,
-				trigger: o,
-				messageId: s,
-				history: l,
-				messages: c,
-				forkOf: u,
-				parent: d
-			});
-			f = e.body ?? {}, p = e.headers;
-		} else f = {
-			history: l.map((e) => ({
-				message: e,
-				headers: t.getMessageHeaders(e)
-			})),
-			id: r.chatId,
-			trigger: o,
-			...s !== void 0 && { messageId: s },
-			...u !== void 0 && { forkOf: u },
-			...d !== void 0 && { parent: d }
-		}, p = void 0;
-		let m = {
-			body: f,
-			headers: p
-		};
-		u !== void 0 && (m.forkOf = u), d !== void 0 && (m.parent = d);
-		let h = await t.send(c, m);
-		a && a.addEventListener("abort", () => void t.cancel({ all: !0 }), { once: !0 });
-		let { readable: g, writable: _ } = new TransformStream(), v = _.getWriter();
-		return h.stream.pipeTo(new WritableStream({
-			close: () => {
-				v.close().catch(() => {});
-			},
-			abort: () => {
-				v.close().catch(() => {});
+}, He = (e) => {
+	let t, n = new Promise((e) => {
+		t = e;
+	}), r = new TransformStream({ flush: () => {
+		t();
+	} });
+	return e.pipeTo(r.writable).catch(() => {
+		t();
+	}), {
+		stream: r.readable,
+		done: n
+	};
+}, Ue = (e) => e.role === "assistant" && e.parts.some((e) => e.type === "dynamic-tool" && (e.state === "input-streaming" || e.state === "input-available" || e.state === "approval-requested")), We = (t, n) => {
+	let r = !1, i = /* @__PURE__ */ new Set(), a = (e) => {
+		r = e;
+		for (let t of i) try {
+			t(e);
+		} catch {}
+	};
+	return {
+		sendMessages: async (r) => {
+			let { messages: i, abortSignal: o, trigger: s, messageId: c } = r, l = t.view.flattenNodes(), u = i.at(-1), d = u ? l.find((e) => e.message.id === u.id) : void 0, f = s === "submit-message" && u?.role === "assistant" && !!d, p = s === "submit-message" && !c && u?.role === "user" ? i.at(-2) : void 0, m = p && Ue(p) ? l.find((e) => e.message.id === p.id) : void 0, h, g;
+			if (s === "regenerate-message" || f) h = [], g = i;
+			else {
+				if (i.length === 0) throw new e.ErrorInfo("unable to send messages; messages array is empty for submit-message trigger", L.InvalidArgument, 400);
+				h = [i.at(-1)], g = m ? i.slice(0, -2) : i.slice(0, -1);
 			}
-		})).catch(() => {
-			v.close().catch(() => {});
-		}), g;
-	},
-	reconnectToStream: () => Promise.resolve(null),
-	close: async (e) => t.close(e)
-}), Me = (e) => ({
+			let _, v;
+			if (c && !f) {
+				_ = c;
+				let e = l.find((e) => e.message.id === c);
+				e && (_ = e.msgId, v = e.parentId);
+			} else f ? v = d.msgId : m && (_ = m.msgId, v = m.parentId);
+			let y, b;
+			if (n?.prepareSendMessagesRequest) {
+				let e = n.prepareSendMessagesRequest({
+					chatId: r.chatId,
+					trigger: s,
+					messageId: c,
+					history: g,
+					messages: h,
+					forkOf: _,
+					parent: v
+				});
+				y = e.body ?? {}, b = e.headers;
+			} else {
+				let e = new Set(g.map((e) => e.id));
+				y = {
+					history: l.filter((t) => e.has(t.message.id)),
+					chatId: r.chatId,
+					trigger: s,
+					...c !== void 0 && { messageId: c },
+					..._ !== void 0 && { forkOf: _ },
+					...v !== void 0 && { parent: v }
+				}, b = void 0;
+			}
+			let x = {
+				body: y,
+				headers: b
+			};
+			_ !== void 0 && (x.forkOf = _), v !== void 0 && (x.parent = v);
+			let S = await t.view.send(h, x);
+			o && o.addEventListener("abort", () => void t.cancel({ all: !0 }), { once: !0 });
+			let { stream: C, done: w } = He(S.stream);
+			return a(!0), w.then(() => {
+				a(!1);
+			}), C;
+		},
+		reconnectToStream: () => Promise.resolve(null),
+		close: async (e) => t.close(e),
+		get streaming() {
+			return r;
+		},
+		onStreamingChange: (e) => (i.add(e), () => {
+			i.delete(e);
+		})
+	};
+}, Ge = (e) => ({
 	logAction: (t, n, r) => {
 		e.error(n, { detail: r });
 	},
 	shouldLog: () => !0
-}), Ne = e.Realtime.EventEmitter, Pe = class extends Ne {
+}), Ke = e.Realtime.EventEmitter, B = class extends Ke {
 	constructor(e) {
-		super(Me(e));
+		super(Ge(e));
 	}
-}, K = /* @__PURE__ */ function(e) {
+}, V = /* @__PURE__ */ function(e) {
 	return e.Trace = "trace", e.Debug = "debug", e.Info = "info", e.Warn = "warn", e.Error = "error", e.Silent = "silent", e;
-}({}), Fe = (e, t, n) => {
+}({}), qe = (e, t, n) => {
 	let r = n ? `, context: ${JSON.stringify(n)}` : "", i = `[${(/* @__PURE__ */ new Date()).toISOString()}] ${t.valueOf().toUpperCase()} ably-ai-transport: ${e}${r}`;
 	switch (t) {
-		case K.Trace:
-		case K.Debug:
+		case V.Trace:
+		case V.Debug:
 			console.log(i);
 			break;
-		case K.Info:
+		case V.Info:
 			console.info(i);
 			break;
-		case K.Warn:
+		case V.Warn:
 			console.warn(i);
 			break;
-		case K.Error:
+		case V.Error:
 			console.error(i);
 			break;
-		case K.Silent: break;
+		case V.Silent: break;
 	}
-}, Ie = (e) => new Le(e.logHandler ?? Fe, e.logLevel), q = /* @__PURE__ */ function(e) {
+}, Je = (e) => new Ye(e.logHandler ?? qe, e.logLevel), H = /* @__PURE__ */ function(e) {
 	return e[e.Trace = 0] = "Trace", e[e.Debug = 1] = "Debug", e[e.Info = 2] = "Info", e[e.Warn = 3] = "Warn", e[e.Error = 4] = "Error", e[e.Silent = 5] = "Silent", e;
-}(q || {}), J = new Map([
-	[K.Trace, q.Trace],
-	[K.Debug, q.Debug],
-	[K.Info, q.Info],
-	[K.Warn, q.Warn],
-	[K.Error, q.Error],
-	[K.Silent, q.Silent]
-]), Le = class t {
+}(H || {}), U = new Map([
+	[V.Trace, H.Trace],
+	[V.Debug, H.Debug],
+	[V.Info, H.Info],
+	[V.Warn, H.Warn],
+	[V.Error, H.Error],
+	[V.Silent, H.Silent]
+]), Ye = class t {
 	constructor(t, n, r) {
 		this._handler = t, this._context = r;
-		let i = J.get(n);
-		if (i === void 0) throw new e.ErrorInfo(`unable to create logger; invalid log level: ${n}`, W.InvalidArgument, 400);
+		let i = U.get(n);
+		if (i === void 0) throw new e.ErrorInfo(`unable to create logger; invalid log level: ${n}`, L.InvalidArgument, 400);
 		this._levelNumber = i;
 	}
 	trace(e, t) {
-		this._write(e, K.Trace, q.Trace, t);
+		this._write(e, V.Trace, H.Trace, t);
 	}
 	debug(e, t) {
-		this._write(e, K.Debug, q.Debug, t);
+		this._write(e, V.Debug, H.Debug, t);
 	}
 	info(e, t) {
-		this._write(e, K.Info, q.Info, t);
+		this._write(e, V.Info, H.Info, t);
 	}
 	warn(e, t) {
-		this._write(e, K.Warn, q.Warn, t);
+		this._write(e, V.Warn, H.Warn, t);
 	}
 	error(e, t) {
-		this._write(e, K.Error, q.Error, t);
+		this._write(e, V.Error, H.Error, t);
 	}
 	withContext(e) {
-		let n = [...J.entries()].find(([, e]) => e === this._levelNumber)?.[0] ?? K.Error;
+		let n = [...U.entries()].find(([, e]) => e === this._levelNumber)?.[0] ?? V.Error;
 		return new t(this._handler, n, this._mergeContext(e));
 	}
 	_write(e, t, n, r) {
@@ -1403,9 +1456,65 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 			...e
 		} : this._context : e ?? void 0;
 	}
-}, Re = class {
+}, W = (e) => {
+	let t = {
+		[u]: e.role,
+		[s]: e.turnId,
+		[c]: e.msgId
+	};
+	return e.turnClientId !== void 0 && (t[l] = e.turnClientId), e.parent && (t[g] = e.parent), e.forkOf && (t[_] = e.forkOf), e.amend && (t[d] = e.amend), t;
+}, Xe = class {
 	constructor(e, t) {
-		this._nodeIndex = /* @__PURE__ */ new Map(), this._codecKeyIndex = /* @__PURE__ */ new Map(), this._sortedList = [], this._parentIndex = /* @__PURE__ */ new Map(), this._selections = /* @__PURE__ */ new Map(), this._seqCounter = 0, this._getKey = e, this._logger = t;
+		this._turns = /* @__PURE__ */ new Map(), this._isTerminal = e, this._logger = t;
+	}
+	createStream(t) {
+		this._logger.trace("StreamRouter.createStream();", { turnId: t });
+		let n = {}, r = new ReadableStream({ start(e) {
+			n.controller = e;
+		} });
+		if (!n.controller) throw new e.ErrorInfo("unable to create stream; ReadableStream start() was not called synchronously", L.TransportSubscriptionError, 500);
+		return this._turns.set(t, {
+			controller: n.controller,
+			turnId: t
+		}), r;
+	}
+	closeStream(e) {
+		let t = this._turns.get(e);
+		if (!t) return !1;
+		this._logger.debug("StreamRouter.closeStream(); closing stream", { turnId: e });
+		try {
+			t.controller.close();
+		} catch {}
+		return this._turns.delete(e), !0;
+	}
+	errorStream(e, t) {
+		let n = this._turns.get(e);
+		if (!n) return !1;
+		this._logger.debug("StreamRouter.errorStream(); erroring stream", { turnId: e });
+		try {
+			n.controller.error(t);
+		} catch {}
+		return this._turns.delete(e), !0;
+	}
+	route(e, t) {
+		let n = this._turns.get(e);
+		if (!n) return !1;
+		try {
+			n.controller.enqueue(t);
+		} catch {
+			return this._turns.delete(e), !1;
+		}
+		return this._isTerminal(t) && this.closeStream(e), !0;
+	}
+	has(e) {
+		return this._turns.has(e);
+	}
+}, Ze = (e, t) => new Xe(e, t), Qe = class {
+	get structuralVersion() {
+		return this._structuralVersion;
+	}
+	constructor(e) {
+		this._nodeIndex = /* @__PURE__ */ new Map(), this._sortedList = [], this._parentIndex = /* @__PURE__ */ new Map(), this._turnClientIds = /* @__PURE__ */ new Map(), this._seqCounter = 0, this._structuralVersion = 0, this._logger = e, this._emitter = new B(e);
 	}
 	_compareNodes(e, t) {
 		let n = e.node.serial, r = t.node.serial;
@@ -1464,7 +1573,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 		}
 		return !1;
 	}
-	_getGroupRoot(e) {
+	getGroupRoot(e) {
 		let t = this._nodeIndex.get(e);
 		if (!t) return e;
 		let n = t.node, r = new Set([n.msgId]);
@@ -1475,75 +1584,63 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 		}
 		return n.msgId;
 	}
-	flatten() {
-		let e = [], t = /* @__PURE__ */ new Set(), n = /* @__PURE__ */ new Map();
-		for (let r of this._sortedList) {
-			let i = r.node, { msgId: a, parentId: o } = i;
-			if (o !== void 0 && !t.has(o)) continue;
-			let s = this._getSiblingGroup(a);
-			if (s.length > 1) {
-				let e = this._getGroupRoot(a), t = n.get(e);
-				if (t === void 0) {
-					let r = this._selections.get(e) ?? s.length - 1, i = s[Math.max(0, Math.min(r, s.length - 1))];
-					if (!i) break;
-					t = i.msgId, n.set(e, t);
+	flattenNodes(e) {
+		this._logger.trace("DefaultTree.flattenNodes();");
+		let t = [], n = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Map();
+		for (let i of this._sortedList) {
+			let a = i.node, { msgId: o, parentId: s } = a;
+			if (s !== void 0 && !n.has(s)) continue;
+			let c = this._getSiblingGroup(o);
+			if (c.length > 1) {
+				let t = this.getGroupRoot(o), n = r.get(t);
+				if (n === void 0) {
+					let i = e.get(t);
+					if (i && c.some((e) => e.msgId === i)) n = i;
+					else {
+						let e = c.at(-1);
+						if (!e) break;
+						n = e.msgId;
+					}
+					r.set(t, n);
 				}
-				if (a !== t) continue;
+				if (o !== n) continue;
 			}
-			t.add(a), e.push(i.message);
+			n.add(o), t.push(a);
 		}
-		return e;
+		return t;
 	}
 	getSiblings(e) {
-		return this._getSiblingGroup(e).map((e) => e.message);
+		return this._logger.trace("DefaultTree.getSiblings();", { msgId: e }), this._getSiblingGroup(e).map((e) => e.message);
+	}
+	getSiblingNodes(e) {
+		return this._getSiblingGroup(e);
 	}
 	hasSiblings(e) {
 		return this._getSiblingGroup(e).length > 1;
 	}
-	getSelectedIndex(e) {
-		let t = this._getSiblingGroup(e);
-		if (t.length <= 1) return 0;
-		let n = this._getGroupRoot(e), r = this._selections.get(n);
-		return r === void 0 ? t.length - 1 : Math.max(0, Math.min(r, t.length - 1));
-	}
-	select(e, t) {
-		this._logger.debug("ConversationTree.select();", {
-			msgId: e,
-			index: t
-		});
-		let n = this._getSiblingGroup(e);
-		if (n.length <= 1) return;
-		let r = this._getGroupRoot(e);
-		this._selections.set(r, Math.max(0, Math.min(t, n.length - 1)));
-	}
 	getNode(e) {
-		return this._nodeIndex.get(e)?.node;
-	}
-	getNodeByKey(e) {
-		let t = this._codecKeyIndex.get(e);
-		if (t) return this._nodeIndex.get(t)?.node;
+		return this._logger.trace("DefaultTree.getNode();", { msgId: e }), this._nodeIndex.get(e)?.node;
 	}
 	getHeaders(e) {
-		return this._nodeIndex.get(e)?.node.headers;
+		return this._logger.trace("DefaultTree.getHeaders();", { msgId: e }), this._nodeIndex.get(e)?.node.headers;
 	}
 	upsert(e, t, n, r) {
-		let i = n["x-ably-parent"] ?? void 0, a = n["x-ably-fork-of"] ?? void 0;
-		this._codecKeyIndex.set(this._getKey(t), e);
-		let o = this._nodeIndex.get(e);
+		let i = n["x-ably-parent"] ?? void 0, a = n["x-ably-fork-of"] ?? void 0, o = this._nodeIndex.get(e);
 		if (o) {
-			o.node.message = t, Object.keys(n).length > 0 && (o.node.headers = { ...n }), r && !o.node.serial && (this._logger.debug("ConversationTree.upsert(); promoting serial", {
+			o.node.message = t, Object.keys(n).length > 0 && (o.node.headers = { ...n }), r && !o.node.serial && (this._logger.debug("Tree.upsert(); promoting serial", {
 				msgId: e,
 				serial: r
-			}), o.node.serial = r, this._removeSorted(o), this._insertSorted(o));
+			}), o.node.serial = r, this._removeSorted(o), this._insertSorted(o), this._structuralVersion++), this._emitter.emit("update");
 			return;
 		}
-		this._logger.trace("ConversationTree.upsert(); inserting new node", {
+		this._logger.trace("Tree.upsert(); inserting new node", {
 			msgId: e,
 			parentId: i,
 			forkOf: a
 		});
 		let s = {
 			node: {
+				kind: "message",
 				message: t,
 				msgId: e,
 				parentId: i,
@@ -1553,224 +1650,580 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 			},
 			insertSeq: this._seqCounter++
 		};
-		this._nodeIndex.set(e, s), this._addToParentIndex(i, e), this._insertSorted(s);
+		this._nodeIndex.set(e, s), this._addToParentIndex(i, e), this._insertSorted(s), this._structuralVersion++, this._emitter.emit("update");
 	}
 	delete(e) {
 		let t = this._nodeIndex.get(e);
 		if (!t) return;
-		this._logger.debug("ConversationTree.delete();", { msgId: e });
-		let { node: n } = t, r = this._getKey(n.message);
-		this._codecKeyIndex.get(r) === e && this._codecKeyIndex.delete(r), this._removeFromParentIndex(n.parentId, e), this._removeSorted(t), this._nodeIndex.delete(e), this._selections.delete(e);
-	}
-}, ze = (e, t) => new Re(e, t), Y = (e) => {
-	let t = [...e.rawMessages].toReversed(), n = e.codec.createDecoder(), r = /* @__PURE__ */ new Map(), i = e.codec.createAccumulator(), s = 0, c = /* @__PURE__ */ new Map(), l = /* @__PURE__ */ new Map();
-	for (let u of t) {
-		let t = n.decode(u), d = b(u), f = d[a], p = d[o], m = u.serial;
-		if (f) {
-			let n = r.get(f);
+		this._logger.debug("Tree.delete();", { msgId: e });
+		let { node: n } = t;
+		this._removeFromParentIndex(n.parentId, e), this._removeSorted(t), this._nodeIndex.delete(e), this._structuralVersion++, this._emitter.emit("update");
+	}
+	getActiveTurnIds() {
+		this._logger.trace("DefaultTree.getActiveTurnIds();");
+		let e = /* @__PURE__ */ new Map();
+		for (let [t, n] of this._turnClientIds) {
+			let r = e.get(n);
+			r || (r = /* @__PURE__ */ new Set(), e.set(n, r)), r.add(t);
+		}
+		return e;
+	}
+	on(e, t) {
+		let n = t;
+		return this._emitter.on(e, n), () => {
+			this._emitter.off(e, n);
+		};
+	}
+	emitAblyMessage(e) {
+		this._logger.trace("DefaultTree.emitAblyMessage();"), this._emitter.emit("ably-message", e);
+	}
+	emitTurn(e) {
+		this._logger.trace("DefaultTree.emitTurn();", { turnId: e.turnId }), this._emitter.emit("turn", e);
+	}
+	trackTurn(e, t) {
+		this._logger.trace("DefaultTree.trackTurn();", {
+			turnId: e,
+			clientId: t
+		}), this._turnClientIds.set(e, t);
+	}
+	untrackTurn(e) {
+		this._logger.trace("DefaultTree.untrackTurn();", { turnId: e }), this._turnClientIds.delete(e);
+	}
+}, $e = (e) => new Qe(e), et = (e) => {
+	let t = [...e.rawMessages].toReversed(), n = e.codec.createDecoder(), r = /* @__PURE__ */ new Map(), i = e.codec.createAccumulator(), a = 0, o = /* @__PURE__ */ new Map(), l = /* @__PURE__ */ new Map(), u = [], f = [];
+	for (let p of t) {
+		let t = n.decode(p), m = C(p), h = m[s], g = m[c], _ = p.serial, v = m[d];
+		if (v) {
+			for (let e of r.values()) if (e.msgHeaders.has(v)) {
+				let n = [...e.msgHeaders.keys()].indexOf(v), r = n === -1 ? void 0 : e.accumulator.messages[n];
+				r && e.accumulator.initMessage(v, r), e.accumulator.processOutputs(t), f.push({
+					accumulator: e.accumulator,
+					messageId: v
+				});
+				break;
+			}
+			continue;
+		}
+		if (h) {
+			let n = r.get(h);
 			if (n || (n = {
 				accumulator: e.codec.createAccumulator(),
-				firstSeen: s++,
+				firstSeen: a++,
 				msgHeaders: /* @__PURE__ */ new Map(),
 				msgSerials: /* @__PURE__ */ new Map()
-			}, r.set(f, n)), p) {
-				let e = n.msgHeaders.get(p);
-				e ? Object.keys(d).length > 0 && Object.assign(e, d) : (n.msgHeaders.set(p, { ...d }), m && n.msgSerials.set(p, m));
+			}, r.set(h, n)), g) {
+				let e = n.msgHeaders.get(g);
+				e ? Object.keys(m).length > 0 && Object.assign(e, m) : (n.msgHeaders.set(g, { ...m }), _ && n.msgSerials.set(g, _));
 			}
 			n.accumulator.processOutputs(t);
-		} else i.processOutputs(t);
-		for (let n of t) if (n.kind === "message") {
-			let t = e.getMessageKey(n.message), r = c.get(t);
-			r ? Object.keys(d).length > 0 && Object.assign(r, d) : (c.set(t, { ...d }), m && l.set(t, m));
+		} else {
+			i.processOutputs(t);
+			for (let e of t) if (e.kind === "message" && g) {
+				u.push(g);
+				let e = o.get(g);
+				e ? Object.keys(m).length > 0 && Object.assign(e, m) : (o.set(g, { ...m }), _ && l.set(g, _));
+			}
 		}
 	}
-	let u = [];
-	for (let t of i.completedMessages) {
-		let n = e.getMessageKey(t);
-		u.push({
+	for (let { accumulator: e, messageId: t } of f) e.completeMessage(t);
+	let p = [];
+	for (let [e, t] of i.completedMessages.entries()) {
+		let n = u[e];
+		p.push({
 			message: t,
-			headers: c.get(n) ?? {},
-			serial: l.get(n) ?? ""
+			headers: n ? o.get(n) ?? {} : {},
+			serial: n ? l.get(n) ?? "" : ""
 		});
 	}
-	let d = [...r.values()].toSorted((e, t) => e.firstSeen - t.firstSeen);
-	for (let t of d) {
-		let n = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map();
-		for (let a of t.accumulator.completedMessages) {
-			let t = e.getMessageKey(a), s = c.get(t);
-			if (s) {
-				r.set(t, s);
-				let e = l.get(t);
-				e && i.set(t, e);
-				let a = s[o];
-				a && n.add(a);
-			}
-		}
-		let a = [...t.msgHeaders.entries()].filter(([e]) => !n.has(e)), s = 0;
-		for (let n of t.accumulator.completedMessages) {
-			let o = e.getMessageKey(n), c = a[s];
-			if (!r.has(o) && c) {
-				let [e, n] = c;
-				r.set(o, n);
-				let a = t.msgSerials.get(e);
-				a && i.set(o, a), s++;
-			}
-		}
-		for (let n of t.accumulator.completedMessages) {
-			let t = e.getMessageKey(n);
-			u.push({
-				message: n,
-				headers: r.get(t) ?? {},
-				serial: i.get(t) ?? ""
+	let m = [...r.values()].toSorted((e, t) => e.firstSeen - t.firstSeen);
+	for (let e of m) {
+		let t = [...e.msgHeaders.entries()], n = 0;
+		for (let r of e.accumulator.completedMessages) {
+			let i = t[n];
+			if (i) {
+				let [t, a] = i;
+				p.push({
+					message: r,
+					headers: a,
+					serial: e.msgSerials.get(t) ?? ""
+				}), n++;
+			} else p.push({
+				message: r,
+				headers: {},
+				serial: ""
 			});
 		}
 	}
-	return u.toReversed();
-}, X = async (e, t, n) => {
-	e.rawMessages.push(...t.items), e.lastAblyPage = t;
-	let r = Y(e).length;
-	for (; r < e.returnedCount + n && t.hasNext();) {
+	return p.toReversed();
+}, tt = (e) => {
+	if (e.cachedDecode && e.cachedAtRawLength === e.rawMessages.length) return e.cachedDecode;
+	let t = et(e);
+	return e.cachedDecode = t, e.cachedAtRawLength = e.rawMessages.length, t;
+}, G = (e, t) => {
+	for (let n of t) {
+		let t = C(n), r = t[c];
+		if (!r || t["x-ably-amend"]) continue;
+		let a = n.action, o = a === "message.create" && "x-ably-discrete" in t, s = t["x-ably-stream"] === "true" && (a === "message.create" || a === "message.update" || a === "message.append"), l = t[i], u = l === "finished" || l === "aborted";
+		(o || s) && e.startedMsgIds.add(r), (o || u) && e.terminatedMsgIds.add(r), e.startedMsgIds.has(r) && e.terminatedMsgIds.has(r) && e.completedMsgIds.add(r);
+	}
+}, K = async (e, t, n) => {
+	e.rawMessages.push(...t.items), e.lastAblyPage = t, G(e, t.items);
+	let r = e.returnedCount + n;
+	for (; e.completedMsgIds.size < r && t.hasNext();) {
 		e.logger.debug("decodeHistory.fetchUntilLimit(); fetching next page", {
 			collected: e.rawMessages.length,
-			decoded: r
+			completed: e.completedMsgIds.size
 		});
 		let n = await t.next();
 		if (!n) break;
-		t = n, e.rawMessages.push(...n.items), e.lastAblyPage = n, r = Y(e).length;
+		t = n, e.rawMessages.push(...n.items), e.lastAblyPage = n, G(e, n.items);
 	}
-}, Z = (e, t) => {
-	let n = Y(e), r = n.slice(e.returnedCount, e.returnedCount + t), i = [...r].toReversed();
+}, q = (e, t) => {
+	let n = tt(e), r = n.slice(e.returnedCount, e.returnedCount + t), i = [...r].toReversed();
 	e.returnedCount += r.length;
 	let a = n.length > e.returnedCount, o = e.lastAblyPage?.hasNext() ?? !1, s = e.rawMessages.length - e.returnedRawCount > 0 ? e.rawMessages.slice(e.returnedRawCount).toReversed() : [];
 	return e.returnedRawCount = e.rawMessages.length, {
-		items: i.map((e) => e.message),
-		itemHeaders: i.map((e) => e.headers),
-		itemSerials: i.map((e) => e.serial),
+		items: i.map((e) => ({
+			message: e.message,
+			headers: e.headers,
+			serial: e.serial
+		})),
 		rawMessages: s,
 		hasNext: () => a || o,
 		next: async () => {
-			if (a) return Z(e, t);
+			if (a) return q(e, t);
 			if (!o || !e.lastAblyPage) return;
 			let n = await e.lastAblyPage.next();
-			if (n) return await X(e, n, t), Z(e, t);
+			if (n) return await K(e, n, t), q(e, t);
 		}
 	};
-}, Be = async (e, t, n, r) => {
+}, nt = async (e, t, n, r) => {
 	let i = n?.limit ?? 100, a = {
 		codec: t,
 		rawMessages: [],
 		returnedCount: 0,
 		returnedRawCount: 0,
 		lastAblyPage: void 0,
-		getMessageKey: t.getMessageKey.bind(t),
+		cachedDecode: void 0,
+		cachedAtRawLength: 0,
+		startedMsgIds: /* @__PURE__ */ new Set(),
+		terminatedMsgIds: /* @__PURE__ */ new Set(),
+		completedMsgIds: /* @__PURE__ */ new Set(),
 		logger: r
 	};
 	r.trace("decodeHistory();", { limit: i });
 	let o = i * 10;
-	return await e.attach(), await X(a, await e.history({
+	return await e.attach(), await K(a, await e.history({
 		untilAttach: !0,
 		limit: o
-	}), i), Z(a, i);
-}, Q = (e) => {
-	let t = {
-		[c]: e.role,
-		[a]: e.turnId,
-		[o]: e.msgId
-	};
-	return e.turnClientId !== void 0 && (t[s] = e.turnClientId), e.parent && (t[p] = e.parent), e.forkOf && (t[m] = e.forkOf), t;
-}, Ve = class {
-	constructor(e, t) {
-		this._turns = /* @__PURE__ */ new Map(), this._isTerminal = e, this._logger = t;
+	}), i), q(a, i);
+}, rt = class {
+	constructor(e) {
+		this._branchSelections = /* @__PURE__ */ new Map(), this._withheldMsgIds = /* @__PURE__ */ new Set(), this._lastVisibleIds = [], this._lastVisibleMessages = [], this._lastVisibleTurnIds = /* @__PURE__ */ new Set(), this._hasMoreHistory = !1, this._withheldBuffer = [], this._unsubs = [], this._cachedNodes = [], this._lastStructuralVersion = -1, this._loadingOlder = !1, this._processingHistory = !1, this._closed = !1, this._tree = e.tree, this._channel = e.channel, this._codec = e.codec, this._sendDelegate = e.sendDelegate, this._onClose = e.onClose, this._logger = e.logger.withContext({ component: "View" }), this._logger.trace("DefaultView();"), this._emitter = new B(this._logger), this._cachedNodes = this._computeFlatNodes(), this._lastStructuralVersion = this._tree.structuralVersion, this._updateVisibleSnapshot(this._cachedNodes), this._unsubs.push(this._tree.on("update", () => {
+			this._onTreeUpdate();
+		}), this._tree.on("ably-message", (e) => {
+			this._onTreeAblyMessage(e);
+		}), this._tree.on("turn", (e) => {
+			this._onTreeTurn(e);
+		}));
 	}
-	createStream(t) {
-		this._logger.trace("StreamRouter.createStream();", { turnId: t });
-		let n = {}, r = new ReadableStream({ start(e) {
-			n.controller = e;
-		} });
-		if (!n.controller) throw new e.ErrorInfo("unable to create stream; ReadableStream start() was not called synchronously", W.TransportSubscriptionError, 500);
-		return this._turns.set(t, {
-			controller: n.controller,
-			turnId: t
-		}), r;
+	getMessages() {
+		return this.flattenNodes().map((e) => e.message);
 	}
-	closeStream(e) {
-		let t = this._turns.get(e);
-		if (!t) return !1;
-		this._logger.debug("StreamRouter.closeStream(); closing stream", { turnId: e });
-		try {
-			t.controller.close();
-		} catch {}
-		return this._turns.delete(e), !0;
+	flattenNodes() {
+		return this._cachedNodes;
 	}
-	route(e, t) {
-		let n = this._turns.get(e);
-		if (!n) return !1;
+	_computeFlatNodes() {
+		let e = this._tree.flattenNodes(this._resolveSelections());
+		return this._withheldMsgIds.size === 0 ? e : e.filter((e) => !this._withheldMsgIds.has(e.msgId));
+	}
+	hasOlder() {
+		return this._withheldBuffer.length > 0 || this._hasMoreHistory;
+	}
+	async loadOlder(e = 100) {
+		if (!(this._closed || this._loadingOlder)) {
+			this._loadingOlder = !0, this._logger.trace("DefaultView.loadOlder();", { limit: e });
+			try {
+				if (this._withheldBuffer.length > 0) {
+					let t = this._withheldBuffer.splice(-e, e);
+					this._releaseWithheld(t);
+					return;
+				}
+				if (!this._hasMoreHistory && !this._lastHistoryPage) {
+					await this._loadFirstPage(e);
+					return;
+				}
+				if (!this._hasMoreHistory) return;
+				if (!this._lastHistoryPage?.hasNext()) {
+					this._hasMoreHistory = !1;
+					return;
+				}
+				let t = await this._lastHistoryPage.next();
+				if (this._closed || !t) {
+					t || (this._hasMoreHistory = !1);
+					return;
+				}
+				await this._loadAndReveal(t, e);
+			} catch (e) {
+				throw this._logger.error("DefaultView.loadOlder(); failed", { error: e }), e;
+			} finally {
+				this._loadingOlder = !1;
+			}
+		}
+	}
+	select(e, t) {
+		this._logger.trace("DefaultView.select();", {
+			msgId: e,
+			index: t
+		});
+		let n = this._tree.getSiblingNodes(e);
+		if (n.length <= 1) return;
+		let r = this._tree.getGroupRoot(e), i = Math.max(0, Math.min(t, n.length - 1)), a = n[i];
+		a && (this._branchSelections.set(r, {
+			kind: "user",
+			selectedId: a.msgId
+		}), this._logger.debug("DefaultView.select();", {
+			msgId: e,
+			index: i,
+			selectedId: a.msgId
+		}), this._cachedNodes = this._computeFlatNodes(), this._updateVisibleSnapshot(this._cachedNodes), this._emitter.emit("update"));
+	}
+	getSelectedIndex(e) {
+		this._logger.trace("DefaultView.getSelectedIndex();", { msgId: e });
+		let t = this._tree.getSiblingNodes(e);
+		if (t.length <= 1) return 0;
+		let n = this._tree.getGroupRoot(e), r = this._branchSelections.get(n);
+		if (!r || r.kind === "pending") return t.length - 1;
+		let i = t.findIndex((e) => e.msgId === r.selectedId);
+		return i === -1 ? t.length - 1 : i;
+	}
+	getSiblings(e) {
+		return this._tree.getSiblings(e);
+	}
+	hasSiblings(e) {
+		return this._tree.hasSiblings(e);
+	}
+	getNode(e) {
+		return this._tree.getNode(e);
+	}
+	async send(t, n) {
+		if (this._logger.trace("DefaultView.send();"), this._closed) throw new e.ErrorInfo("unable to send; view is closed", L.InvalidArgument, 400);
+		let r = this.flattenNodes(), i = await this._sendDelegate(t, n, r);
+		if (n?.forkOf) {
+			let e = this._tree.getGroupRoot(n.forkOf);
+			if (i.optimisticMsgIds.length > 0) {
+				let t = i.optimisticMsgIds.at(-1);
+				t && (this._branchSelections.set(e, {
+					kind: "auto",
+					selectedId: t
+				}), this._cachedNodes = this._computeFlatNodes(), this._updateVisibleSnapshot(this._cachedNodes), this._emitter.emit("update"));
+			} else {
+				this._branchSelections.set(e, {
+					kind: "pending",
+					turnId: i.turnId
+				}), this._logger.debug("DefaultView.send(); deferring fork auto-selection", {
+					forkOf: n.forkOf,
+					groupRoot: e,
+					turnId: i.turnId
+				});
+				let t = this._tree.on("turn", (n) => {
+					if (n.type !== "x-ably-turn-end" || n.turnId !== i.turnId) return;
+					let r = this._branchSelections.get(e);
+					r?.kind === "pending" && r.turnId === i.turnId && this._branchSelections.delete(e), t();
+					let a = this._unsubs.indexOf(t);
+					a !== -1 && this._unsubs.splice(a, 1);
+				});
+				this._unsubs.push(t);
+			}
+		}
+		return i;
+	}
+	async regenerate(t, n) {
+		this._logger.trace("DefaultView.regenerate();", { messageId: t });
+		let r = this._tree.getNode(t);
+		if (!r) throw new e.ErrorInfo(`unable to regenerate; message not found in tree: ${t}`, L.InvalidArgument, 400);
+		let i = r.parentId;
+		return this.send([], {
+			...n,
+			body: {
+				history: this._getHistoryBefore(t),
+				...n?.body
+			},
+			forkOf: t,
+			parent: i
+		});
+	}
+	async edit(t, n, r) {
+		this._logger.trace("DefaultView.edit();", { messageId: t });
+		let i = this._tree.getNode(t);
+		if (!i) throw new e.ErrorInfo(`unable to edit; message not found in tree: ${t}`, L.InvalidArgument, 400);
+		let a = i.parentId;
+		return this.send(n, {
+			...r,
+			body: {
+				history: this._getHistoryBefore(t),
+				...r?.body
+			},
+			forkOf: t,
+			parent: a
+		});
+	}
+	async update(t, n, r) {
+		if (this._closed) throw new e.ErrorInfo("unable to update; view is closed", L.InvalidArgument, 400);
+		this._logger.trace("DefaultView.update();", {
+			msgId: t,
+			eventCount: n.length
+		});
+		let i = [{
+			kind: "event",
+			msgId: t,
+			events: n
+		}];
+		return this._sendDelegate([], r, this.flattenNodes(), i);
+	}
+	_getHistoryBefore(e) {
+		this._logger.trace("DefaultView._getHistoryBefore();", { messageId: e });
+		let t = this.flattenNodes(), n = t.findIndex((t) => t.msgId === e);
+		return n === -1 ? (this._logger.warn("DefaultView._getHistoryBefore(); target not in visible nodes, returning full list", { messageId: e }), t) : t.slice(0, n);
+	}
+	getActiveTurnIds() {
+		this._logger.trace("DefaultView.getActiveTurnIds();");
+		let e = this._tree.getActiveTurnIds();
+		if (this._withheldMsgIds.size === 0) return e;
+		let t = /* @__PURE__ */ new Map();
+		for (let [n, r] of e) {
+			let e = /* @__PURE__ */ new Set();
+			for (let t of r) this._lastVisibleTurnIds.has(t) && e.add(t);
+			e.size > 0 && t.set(n, e);
+		}
+		return t;
+	}
+	on(e, t) {
+		let n = t;
+		return this._emitter.on(e, n), () => {
+			this._emitter.off(e, n);
+		};
+	}
+	close() {
+		this._logger.info("DefaultView.close();"), this._closed = !0, this._loadingOlder = !1;
+		for (let e of this._unsubs) e();
+		this._unsubs.length = 0, this._emitter.off(), this._branchSelections.clear(), this._withheldMsgIds.clear(), this._withheldBuffer.length = 0, this._onClose?.();
+	}
+	async _loadFirstPage(e) {
+		let t = new Set(this._tree.flattenNodes(this._resolveSelections()).map((e) => e.msgId)), n = await nt(this._channel, this._codec, { limit: e }, this._logger);
+		if (this._closed) return;
+		let { newVisible: r, lastPage: i } = await this._loadUntilVisible(n, e, t);
+		if (this._closed) return;
+		this._lastHistoryPage = i, this._hasMoreHistory = i.hasNext();
+		let a = r.slice(-e), o = r.slice(0, -e);
+		for (let e of o) this._withheldMsgIds.add(e.msgId);
+		this._withheldBuffer.push(...o), this._releaseWithheld(a);
+	}
+	async _loadAndReveal(e, t) {
+		let n = new Set(this._tree.flattenNodes(this._resolveSelections()).map((e) => e.msgId)), { newVisible: r, lastPage: i } = await this._loadUntilVisible(e, t, n);
+		if (this._closed) return;
+		this._lastHistoryPage = i, this._hasMoreHistory = i.hasNext();
+		let a = r.slice(-t), o = r.slice(0, -t);
+		for (let e of o) this._withheldMsgIds.add(e.msgId);
+		this._withheldBuffer.push(...o), this._releaseWithheld(a);
+	}
+	_processHistoryPage(e) {
+		this._processingHistory = !0;
 		try {
-			n.controller.enqueue(t);
-		} catch {
-			return this._turns.delete(e), !1;
+			for (let t of e.items) {
+				let e = t.headers[c];
+				e && this._tree.upsert(e, t.message, t.headers, t.serial);
+			}
+			for (let t of e.rawMessages) this._tree.emitAblyMessage(t);
+		} finally {
+			this._processingHistory = !1;
 		}
-		return this._isTerminal(t) && this.closeStream(e), !0;
 	}
-	has(e) {
-		return this._turns.has(e);
+	async _loadUntilVisible(e, t, n) {
+		this._processHistoryPage(e);
+		let r = e, i = () => {
+			let e = 0;
+			for (let t of this._tree.flattenNodes(this._resolveSelections())) n.has(t.msgId) || e++;
+			return e;
+		};
+		for (; i() < t && r.hasNext();) {
+			let e = await r.next();
+			if (!e || this._closed) break;
+			this._processHistoryPage(e), r = e;
+		}
+		return {
+			newVisible: this._tree.flattenNodes(this._resolveSelections()).filter((e) => !n.has(e.msgId)),
+			lastPage: r
+		};
 	}
-}, He = (e, t) => new Ve(e, t), Ue = () => {}, We = class {
+	_releaseWithheld(e) {
+		for (let t of e) this._withheldMsgIds.delete(t.msgId);
+		e.length > 0 && (this._cachedNodes = this._computeFlatNodes(), this._updateVisibleSnapshot(this._cachedNodes), this._emitter.emit("update"));
+	}
+	_updateVisibleSnapshot(e) {
+		let t = e ?? this.flattenNodes();
+		this._lastVisibleIds = t.map((e) => e.msgId), this._lastVisibleMessages = t.map((e) => e.message), this._lastVisibleTurnIds = /* @__PURE__ */ new Set();
+		for (let e of t) {
+			let t = e.headers[s];
+			t && this._lastVisibleTurnIds.add(t);
+		}
+	}
+	_onTreeUpdate() {
+		if (this._processingHistory) return;
+		let e = this._tree.structuralVersion;
+		if (e === this._lastStructuralVersion) {
+			this._cachedNodes.some((e, t) => e.message !== this._lastVisibleMessages[t]) && (this._lastVisibleMessages = this._cachedNodes.map((e) => e.message), this._cachedNodes = [...this._cachedNodes], this._emitter.emit("update"));
+			return;
+		}
+		this._lastStructuralVersion = e, this._pinBranchSelections(), this._resolvePendingSelections();
+		let t = this._computeFlatNodes(), n = t.map((e) => e.msgId), r = t.map((e) => e.message);
+		this._visibleChanged(n, r) && (this._cachedNodes = t, this._updateVisibleSnapshot(t), this._emitter.emit("update"));
+	}
+	_resolveSelections() {
+		let e = /* @__PURE__ */ new Map();
+		for (let [t, n] of this._branchSelections) n.kind !== "pending" && e.set(t, n.selectedId);
+		return e;
+	}
+	_pinBranchSelections() {
+		for (let e of this._lastVisibleIds) {
+			if (!this._tree.hasSiblings(e)) continue;
+			let t = this._tree.getGroupRoot(e), n = this._branchSelections.get(t);
+			if (n?.kind === "pending") {
+				let r = this._tree.getSiblingNodes(e).at(-1);
+				r && r.msgId !== e && r.headers["x-ably-turn-id"] === n.turnId && (this._logger.debug("DefaultView._pinBranchSelections(); auto-selecting pending fork", {
+					msgId: e,
+					newestId: r.msgId,
+					turnId: n.turnId
+				}), this._branchSelections.set(t, {
+					kind: "auto",
+					selectedId: r.msgId
+				}));
+				continue;
+			}
+			n || this._branchSelections.set(t, {
+				kind: "pinned",
+				selectedId: e
+			});
+		}
+	}
+	_resolvePendingSelections() {
+		for (let [e, t] of this._branchSelections) {
+			if (t.kind !== "pending") continue;
+			let n = this._tree.getSiblingNodes(e);
+			if (n.length <= 1) continue;
+			let r = n.at(-1);
+			!r || r.msgId === e || r.headers["x-ably-turn-id"] === t.turnId && (this._logger.debug("DefaultView._resolvePendingSelections(); resolving off-branch pending", {
+				groupRoot: e,
+				newestId: r.msgId,
+				turnId: t.turnId
+			}), this._branchSelections.set(e, {
+				kind: "auto",
+				selectedId: r.msgId
+			}));
+		}
+	}
+	_onTreeAblyMessage(e) {
+		let t = C(e)[c];
+		if (!t) {
+			this._emitter.emit("ably-message", e);
+			return;
+		}
+		this._lastVisibleIds.includes(t) && this._emitter.emit("ably-message", e);
+	}
+	_onTreeTurn(e) {
+		if (this._lastVisibleTurnIds.has(e.turnId)) {
+			this._emitter.emit("turn", e);
+			return;
+		}
+		e.type === "x-ably-turn-start" && this._isTurnStartVisible(e) && (this._lastVisibleTurnIds.add(e.turnId), this._emitter.emit("turn", e));
+	}
+	_isTurnStartVisible(e) {
+		let { parent: t } = e;
+		return t === void 0 ? !0 : this._lastVisibleIds.includes(t);
+	}
+	_visibleChanged(e, t) {
+		if (e.length !== this._lastVisibleIds.length) return !0;
+		for (let [t, n] of e.entries()) if (n !== this._lastVisibleIds[t]) return !0;
+		for (let [e, n] of t.entries()) if (n !== this._lastVisibleMessages[e]) return !0;
+		return !1;
+	}
+}, J = (e) => new rt(e), it = () => {}, Y = /* @__PURE__ */ function(e) {
+	return e.READY = "ready", e.CLOSED = "closed", e;
+}(Y || {}), at = class {
 	constructor(e) {
-		if (this._ownMsgIds = /* @__PURE__ */ new Set(), this._ownTurnIds = /* @__PURE__ */ new Set(), this._turnClientIds = /* @__PURE__ */ new Map(), this._turnMsgIds = /* @__PURE__ */ new Map(), this._turnObservers = /* @__PURE__ */ new Map(), this._ablyMessages = [], this._withheldKeys = /* @__PURE__ */ new Set(), this._closed = !1, this._channel = e.channel, this._codec = e.codec, this._clientId = e.clientId, this._api = e.api ?? "/api/chat", this._credentials = e.credentials, this._headersFn = typeof e.headers == "function" ? e.headers : e.headers ? () => e.headers : void 0, this._bodyFn = typeof e.body == "function" ? e.body : e.body ? () => e.body : void 0, this._fetchFn = e.fetch ?? globalThis.fetch.bind(globalThis), this._logger = (e.logger ?? Ie({ logLevel: K.Silent })).withContext({ component: "ClientTransport" }), this._emitter = new Pe(this._logger), this._tree = ze(this._codec.getMessageKey.bind(this._codec), this._logger), this._router = He(this._codec.isTerminal.bind(this._codec), this._logger), this._decoder = this._codec.createDecoder(), e.messages) {
+		if (this._ownMsgIds = /* @__PURE__ */ new Set(), this._ownTurnIds = /* @__PURE__ */ new Set(), this._turnMsgIds = /* @__PURE__ */ new Map(), this._turnObservers = /* @__PURE__ */ new Map(), this._closeResolvers = [], this._views = /* @__PURE__ */ new Set(), this._state = Y.READY, this._pendingLocalEvents = [], this._channel = e.channel, this._codec = e.codec, this._clientId = e.clientId, this._api = e.api, this._credentials = e.credentials, this._headersFn = typeof e.headers == "function" ? e.headers : e.headers ? () => e.headers : void 0, this._bodyFn = typeof e.body == "function" ? e.body : e.body ? () => e.body : void 0, this._fetchFn = e.fetch ?? globalThis.fetch.bind(globalThis), this._logger = (e.logger ?? Je({ logLevel: V.Silent })).withContext({ component: "ClientTransport" }), this._emitter = new B(this._logger), this._hasAttachedOnce = this._channel.state === "attached", this._tree = $e(this._logger), this._view = J({
+			tree: this._tree,
+			channel: this._channel,
+			codec: this._codec,
+			sendDelegate: this._internalSend.bind(this),
+			logger: this._logger,
+			onClose: () => this._views.delete(this._view)
+		}), this._router = Ze(this._codec.isTerminal.bind(this._codec), this._logger), this._decoder = this._codec.createDecoder(), this._views.add(this._view), this.tree = this._tree, this.view = this._view, e.messages) {
 			let t;
 			for (let n of e.messages) {
-				let e = this._codec.getMessageKey(n), r = {};
-				t && (r[p] = t), this._tree.upsert(e, n, r), t = e;
+				let e = crypto.randomUUID(), r = { [c]: e };
+				t && (r[g] = t), this._tree.upsert(e, n, r), t = e;
 			}
-			this._emitter.emit("message");
 		}
 		this._onMessage = (e) => {
 			this._handleMessage(e);
-		}, this._attachPromise = this._channel.subscribe(this._onMessage);
+		}, this._attachPromise = this._channel.subscribe(this._onMessage), this._onChannelStateChange = (e) => {
+			this._handleChannelStateChange(e);
+		}, this._channel.on(this._onChannelStateChange);
 	}
 	_handleMessage(t) {
-		if (!this._closed) {
-			this._ablyMessages.push(t), this._emitter.emit("ably-message");
-			try {
-				if (t.name === "x-ably-turn-start") {
-					let e = b(t), n = e[a], r = e["x-ably-turn-client-id"] ?? "";
-					n && (this._turnClientIds.set(n, r), this._emitter.emit("turn", {
-						type: _,
+		if (this._state !== Y.CLOSED) try {
+			if (t.name === "x-ably-turn-start") {
+				let e = C(t), n = e[s], r = e["x-ably-turn-client-id"] ?? "";
+				if (n) {
+					this._tree.trackTurn(n, r);
+					let t = e[g], i = e[_];
+					this._tree.emitTurn({
+						type: b,
 						turnId: n,
-						clientId: r
-					}));
-					return;
+						clientId: r,
+						...t !== void 0 && { parent: t },
+						...i !== void 0 && { forkOf: i }
+					});
 				}
-				if (t.name === "x-ably-turn-end") {
-					let e = b(t), n = e[a], r = e["x-ably-turn-client-id"] ?? "", i = e["x-ably-turn-reason"] ?? "complete";
-					if (n) {
-						this._router.closeStream(n), this._turnObservers.delete(n), this._turnClientIds.delete(n);
-						let e = this._turnMsgIds.get(n);
-						if (e) {
-							for (let t of e) this._ownMsgIds.delete(t);
-							this._turnMsgIds.delete(n);
-						}
-						this._ownTurnIds.delete(n), this._emitter.emit("turn", {
-							type: v,
-							turnId: n,
-							clientId: r,
-							reason: i
-						});
+				this._tree.emitAblyMessage(t);
+				return;
+			}
+			if (t.name === "x-ably-turn-end") {
+				let e = C(t), n = e[s], r = e["x-ably-turn-client-id"] ?? "", i = e["x-ably-turn-reason"] ?? "complete";
+				if (n) {
+					this._router.closeStream(n), this._turnObservers.delete(n), this._tree.untrackTurn(n);
+					let e = this._turnMsgIds.get(n);
+					if (e) {
+						for (let t of e) this._ownMsgIds.delete(t);
+						this._turnMsgIds.delete(n);
 					}
-					return;
+					this._ownTurnIds.delete(n), this._tree.emitTurn({
+						type: x,
+						turnId: n,
+						clientId: r,
+						reason: i
+					});
 				}
-				let e = this._decoder.decode(t), n = b(t), r = t.serial, i = n[a];
-				i && this._updateTurnObserverHeaders(i, n, r);
-				for (let i of e) i.kind === "message" ? this._handleMessageOutput(i.message, n, r, t.action) : this._handleEventOutput(i, n);
-			} catch (t) {
-				let n = t instanceof e.ErrorInfo ? t : void 0;
-				this._emitter.emit("error", new e.ErrorInfo(`unable to process channel message; ${t instanceof Error ? t.message : String(t)}`, W.TransportSubscriptionError, 500, n));
+				this._tree.emitAblyMessage(t);
+				return;
+			}
+			let e = this._decoder.decode(t), n = C(t), r = t.serial, i = n[d];
+			if (i) {
+				for (let t of e) t.kind === "event" && this._handleAmendmentEvent(i, t);
+				return;
 			}
+			let a = n[s];
+			a && this._updateTurnObserverHeaders(a, n, r);
+			for (let i of e) i.kind === "message" ? this._handleMessageOutput(i.message, n, r, t.action) : this._handleEventOutput(i, n);
+			this._tree.emitAblyMessage(t);
+		} catch (t) {
+			let n = t instanceof e.ErrorInfo ? t : void 0;
+			this._emitter.emit("error", new e.ErrorInfo(`unable to process channel message; ${t instanceof Error ? t.message : String(t)}`, L.TransportSubscriptionError, 500, n));
 		}
 	}
 	_handleMessageOutput(e, t, n, r) {
-		let i = t[o];
+		let i = t[c];
 		if (i && this._ownMsgIds.has(i)) {
 			this._upsertAndNotify(e, t, n);
 			return;
@@ -1779,7 +2232,7 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 	}
 	_handleEventOutput(e, t) {
 		if (e.kind !== "event") return;
-		let n = e.event, r = t[a];
+		let n = e.event, r = t[s];
 		if (r) {
 			if (this._router.route(r, n)) {
 				this._accumulateAndEmit(r, e), this._codec.isTerminal(n) && this._turnObservers.delete(r);
@@ -1788,9 +2241,38 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 			this._ownTurnIds.has(r) && !this._turnObservers.has(r) || (this._accumulateAndEmit(r, e), this._codec.isTerminal(n) && this._turnObservers.delete(r));
 		}
 	}
+	_handleAmendmentEvent(e, t) {
+		this._logger.trace("ClientTransport._handleAmendmentEvent();", { targetMsgId: e });
+		let n = this._tree.getNode(e);
+		if (!n) {
+			this._logger.debug("ClientTransport._handleAmendmentEvent(); target not found, dropping", { targetMsgId: e });
+			return;
+		}
+		let r = this._codec.createAccumulator();
+		r.initMessage(e, n.message), r.processOutputs([t]);
+		let i = r.messages.at(-1);
+		i && this._tree.upsert(e, i, n.headers, n.serial);
+	}
+	_handleChannelStateChange(t) {
+		if (this._state === Y.CLOSED) return;
+		let { current: n, resumed: r } = t;
+		if (n === "attached" && !this._hasAttachedOnce) {
+			this._hasAttachedOnce = !0;
+			return;
+		}
+		if (!(n === "failed" || n === "suspended" || n === "detached" || n === "attached" && !r)) return;
+		this._logger.error("ClientTransport._handleChannelStateChange(); channel continuity lost", {
+			current: n,
+			resumed: r,
+			previous: t.previous
+		});
+		let i = new e.ErrorInfo(`unable to deliver events; channel continuity lost (${n}${n === "attached" ? ", resumed: false" : ""})`, L.ChannelContinuityLost, 500, t.reason);
+		for (let e of this._ownTurnIds) this._router.errorStream(e, i);
+		this._emitter.emit("error", i);
+	}
 	_upsertAndNotify(e, t, n) {
-		let r = this._codec.getMessageKey(e), i = t["x-ably-msg-id"] ?? r;
-		this._tree.upsert(i, e, t, n), this._emitter.emit("message");
+		let r = t[c];
+		r && this._tree.upsert(r, e, t, n);
 	}
 	_updateTurnObserverHeaders(e, t, n) {
 		let r = this._turnObservers.get(e);
@@ -1803,321 +2285,289 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 	_accumulateAndEmit(e, t) {
 		let n = this._turnObservers.get(e);
 		if (!n) return;
+		let r = n.headers[c];
+		if (r) {
+			let e = this._tree.getNode(r);
+			e && n.accumulator.initMessage(r, e.message);
+		}
 		n.accumulator.processOutputs([t]);
-		let r = n.accumulator.messages;
-		if (r.length === 0) return;
-		let i;
+		let i = n.accumulator.messages;
+		if (i.length === 0) return;
+		let a;
 		try {
-			i = structuredClone(r.at(-1));
+			a = structuredClone(i.at(-1));
 		} catch {
-			i = r.at(-1);
+			a = i.at(-1);
+		}
+		if (a) {
+			let e = n.headers[c];
+			e && this._tree.upsert(e, a, { ...n.headers }, n.serial);
 		}
-		i && (this._tree.upsert(n.headers["x-ably-msg-id"] ?? this._codec.getMessageKey(i), i, { ...n.headers }, n.serial), this._emitter.emit("message"));
 	}
 	async _publishCancel(e) {
 		this._logger.trace("ClientTransport._publishCancel();", { filter: e });
 		let t = {};
-		e.turnId ? t[l] = e.turnId : e.own ? t[u] = "true" : e.clientId ? t[f] = e.clientId : e.all && (t[d] = "true"), await this._channel.publish({
-			name: g,
+		e.turnId ? t[f] = e.turnId : e.own ? t[p] = "true" : e.clientId ? t[h] = e.clientId : e.all && (t[m] = "true"), await this._channel.publish({
+			name: y,
 			extras: { headers: t }
 		});
 	}
 	_closeMatchingTurnStreams(e) {
-		if (e.all) for (let e of this._ownTurnIds) this._router.closeStream(e);
-		else if (e.own) for (let e of this._ownTurnIds) this._router.closeStream(e);
-		else if (e.clientId) for (let [t, n] of this._turnClientIds) n === e.clientId && this._router.closeStream(t);
-		else e.turnId && this._router.closeStream(e.turnId);
+		for (let t of this._getMatchingTurnIds(e)) this._router.closeStream(t);
 	}
 	_getMatchingTurnIds(e) {
-		let t = /* @__PURE__ */ new Set();
-		if (e.all) for (let e of this._turnClientIds.keys()) t.add(e);
-		else if (e.own) for (let [e, n] of this._turnClientIds) n === this._clientId && t.add(e);
-		else if (e.clientId) for (let [n, r] of this._turnClientIds) r === e.clientId && t.add(n);
-		else e.turnId && this._turnClientIds.has(e.turnId) && t.add(e.turnId);
-		return t;
-	}
-	_getMessagesWithHeaders() {
-		return this._tree.flatten().map((e) => ({
-			message: e,
-			headers: this.getMessageHeaders(e)
-		}));
-	}
-	_getHistoryBefore(e) {
-		let t = this._getMessagesWithHeaders(), n = t.findIndex((t) => t.headers?.[o] === e);
-		return n === -1 ? t : t.slice(0, n);
-	}
-	_processHistoryPage(e) {
-		for (let [t, n] of e.items.entries()) {
-			let r = e.itemHeaders?.[t] ?? {}, i = e.itemSerials?.[t], a = this._codec.getMessageKey(n), o = r["x-ably-msg-id"] ?? a;
-			this._tree.upsert(o, n, r, i);
-		}
-		this._emitter.emit("message"), e.rawMessages && e.rawMessages.length > 0 && (this._ablyMessages.unshift(...e.rawMessages), this._emitter.emit("ably-message"));
-	}
-	async _loadUntilVisible(e, t, n) {
-		this._processHistoryPage(e);
-		let r = e, i = () => {
-			let e = 0;
-			for (let t of this._tree.flatten()) n.has(this._codec.getMessageKey(t)) || e++;
-			return e;
-		};
-		for (; i() < t && r.hasNext();) {
-			let e = await r.next();
-			if (!e) break;
-			this._processHistoryPage(e), r = e;
+		let t = /* @__PURE__ */ new Set(), n = this._tree.getActiveTurnIds();
+		if (e.all) for (let e of n.values()) for (let n of e) t.add(n);
+		else if (e.own) {
+			let e = n.get(this._clientId ?? "");
+			if (e) for (let n of e) t.add(n);
+		} else if (e.clientId) {
+			let r = n.get(e.clientId);
+			if (r) for (let e of r) t.add(e);
+		} else if (e.turnId) {
+			for (let r of n.values()) if (r.has(e.turnId)) {
+				t.add(e.turnId);
+				break;
+			}
 		}
-		return {
-			newVisible: this._tree.flatten().filter((e) => !n.has(this._codec.getMessageKey(e))),
-			lastPage: r
-		};
-	}
-	_releaseWithheld(e) {
-		for (let t of e) this._withheldKeys.delete(this._codec.getMessageKey(t));
-		e.length > 0 && this._emitter.emit("message");
+		return t;
 	}
-	async send(t, n) {
-		if (this._closed || (await this._attachPromise, this._closed)) throw new e.ErrorInfo("unable to send; transport is closed", W.TransportClosed, 400);
-		this._logger.trace("ClientTransport.send();");
-		let r = Array.isArray(t) ? t : [t], i = crypto.randomUUID();
-		this._ownTurnIds.add(i);
-		let a = /* @__PURE__ */ new Set(), s = [], l = this._getMessagesWithHeaders(), u;
+	createView() {
+		if (this._state === Y.CLOSED) throw new e.ErrorInfo("unable to create view; transport is closed", L.TransportClosed, 400);
+		this._logger.trace("DefaultClientTransport.createView();");
+		let t = J({
+			tree: this._tree,
+			channel: this._channel,
+			codec: this._codec,
+			sendDelegate: this._internalSend.bind(this),
+			logger: this._logger,
+			onClose: () => this._views.delete(t)
+		});
+		return this._views.add(t), t;
+	}
+	async _internalSend(t, n, r, i) {
+		if (this._state === Y.CLOSED || (await this._attachPromise, this._state === Y.CLOSED)) throw new e.ErrorInfo("unable to send; transport is closed", L.TransportClosed, 400);
+		let a = this._channel.state;
+		if (a !== "attached" && a !== "attaching") throw new e.ErrorInfo(`unable to send; channel is ${a}`, L.ChannelNotReady, 400);
+		this._logger.trace("ClientTransport._internalSend();");
+		let o = Array.isArray(t) ? t : [t], s = crypto.randomUUID();
+		this._ownTurnIds.add(s), this._tree.trackTurn(s, this._clientId ?? "");
+		let c = this._pendingLocalEvents;
+		this._pendingLocalEvents = [], i && i.length > 0 && this._applyEventsToTree(i);
+		let l = [...c, ...i ?? []], u = /* @__PURE__ */ new Set(), d = [], f = r, p;
 		if (n?.parent === void 0 && !n?.forkOf) {
-			let e = this._tree.flatten();
-			if (e.length > 0) {
-				let t = e.at(-1);
-				if (t) {
-					let e = this._codec.getMessageKey(t);
-					u = this._tree.getNodeByKey(e)?.msgId ?? e;
-				}
-			}
+			let e = f.at(-1);
+			e && (p = e.msgId);
 		}
-		let d = n?.parent === void 0 ? u : n.parent;
-		for (let e of r) {
+		let m = n?.parent === void 0 ? p : n.parent;
+		for (let e of o) {
 			let t = crypto.randomUUID();
-			this._ownMsgIds.add(t), a.add(t);
-			let r = n?.parent === void 0 ? u : n.parent ?? void 0, l = Q({
+			this._ownMsgIds.add(t), u.add(t);
+			let r = n?.parent === void 0 ? p : n.parent, i = W({
 				role: "user",
-				turnId: i,
+				turnId: s,
 				msgId: t,
 				turnClientId: this._clientId,
 				parent: r,
 				forkOf: n?.forkOf
 			});
-			this._upsertAndNotify(e, l);
-			let d = {
-				[o]: t,
-				[c]: "user"
-			};
-			r && (d[p] = r), s.push({
+			this._upsertAndNotify(e, i), d.push({
+				kind: "message",
 				message: e,
-				headers: d
-			}), n?.parent === void 0 && !n?.forkOf && (u = t);
+				msgId: t,
+				parentId: r,
+				forkOf: n?.forkOf,
+				headers: i,
+				serial: void 0
+			}), n?.parent === void 0 && !n?.forkOf && (p = t);
 		}
-		this._turnMsgIds.set(i, a);
-		let f = this._router.createStream(i), m = this._headersFn?.() ?? {}, h = {
+		this._turnMsgIds.set(s, u);
+		let h = this._router.createStream(s), g = this._headersFn?.() ?? {}, _ = {
 			...this._bodyFn?.() ?? {},
-			history: l,
+			history: f,
 			...n?.body,
-			turnId: i,
+			turnId: s,
 			clientId: this._clientId,
-			messages: s,
+			messages: d,
 			...n?.forkOf !== void 0 && { forkOf: n.forkOf },
-			...d !== void 0 && { parent: d }
-		}, g = {
-			...m,
+			...m !== void 0 && { parent: m },
+			...l.length > 0 && { events: l }
+		}, v = {
+			...g,
 			...n?.headers
 		};
 		return this._fetchFn(this._api, {
 			method: "POST",
 			headers: {
 				"Content-Type": "application/json",
-				...g
+				...v
 			},
-			body: JSON.stringify(h),
+			body: JSON.stringify(_),
 			...this._credentials ? { credentials: this._credentials } : {}
 		}).then((t) => {
-			t.ok || (this._emitter.emit("error", new e.ErrorInfo(`unable to send; HTTP POST to ${this._api} returned ${String(t.status)} ${t.statusText}`, W.TransportSendFailed, t.status)), this._router.closeStream(i));
+			if (!t.ok) {
+				let n = new e.ErrorInfo(`unable to send; HTTP POST to ${this._api} returned ${String(t.status)} ${t.statusText}`, L.TransportSendFailed, t.status);
+				this._emitter.emit("error", n), this._router.errorStream(s, n);
+			}
 		}).catch((t) => {
-			let n = t instanceof e.ErrorInfo ? t : void 0;
-			this._emitter.emit("error", new e.ErrorInfo(`unable to send; HTTP POST to ${this._api} failed: ${t instanceof Error ? t.message : String(t)}`, W.TransportSendFailed, 500, n)), this._router.closeStream(i);
+			let n = t instanceof e.ErrorInfo ? t : void 0, r = new e.ErrorInfo(`unable to send; HTTP POST to ${this._api} failed: ${t instanceof Error ? t.message : String(t)}`, L.TransportSendFailed, 500, n);
+			this._emitter.emit("error", r), this._router.errorStream(s, r);
 		}), {
-			stream: f,
-			turnId: i,
-			cancel: async () => this.cancel({ turnId: i })
+			stream: h,
+			turnId: s,
+			cancel: async () => this.cancel({ turnId: s }),
+			optimisticMsgIds: [...u]
 		};
 	}
-	async regenerate(e, t) {
-		this._logger.trace("ClientTransport.regenerate();", { messageId: e });
-		let n = this._tree.getNode(e)?.parentId;
-		return this.send([], {
-			...t,
-			body: {
-				history: this._getHistoryBefore(e),
-				...t?.body
-			},
-			forkOf: e,
-			parent: n
-		});
-	}
-	async edit(e, t, n) {
-		this._logger.trace("ClientTransport.edit();", { messageId: e });
-		let r = this._tree.getNode(e)?.parentId;
-		return this.send(t, {
-			...n,
-			body: {
-				history: this._getHistoryBefore(e),
-				...n?.body
-			},
-			forkOf: e,
-			parent: r
-		});
-	}
 	async cancel(e) {
-		if (this._closed) return;
+		if (this._state === Y.CLOSED) return;
 		let t = e ?? { own: !0 };
 		this._logger.debug("ClientTransport.cancel();", { filter: t }), await this._publishCancel(t), this._closeMatchingTurnStreams(t);
 	}
+	stageEvents(e, t) {
+		if (this._logger.trace("ClientTransport.stageEvents();", {
+			msgId: e,
+			eventCount: t.length
+		}), this._state === Y.CLOSED) {
+			this._logger.warn("ClientTransport.stageEvents(); transport is closed", { msgId: e });
+			return;
+		}
+		if (!this._tree.getNode(e)) {
+			this._logger.warn("ClientTransport.stageEvents(); msgId not found in tree", { msgId: e });
+			return;
+		}
+		if (t.length === 0) return;
+		let n = {
+			kind: "event",
+			msgId: e,
+			events: t
+		};
+		this._applyEventsToTree([n]), this._pendingLocalEvents.push(n);
+	}
+	stageMessage(e, t) {
+		if (this._logger.trace("ClientTransport.stageMessage();", { msgId: e }), this._state === Y.CLOSED) {
+			this._logger.warn("ClientTransport.stageMessage(); transport is closed", { msgId: e });
+			return;
+		}
+		let n = this._tree.getNode(e);
+		if (!n) {
+			this._logger.warn("ClientTransport.stageMessage(); msgId not found in tree", { msgId: e });
+			return;
+		}
+		this._tree.upsert(e, t, n.headers, n.serial);
+	}
+	_applyEventsToTree(e) {
+		for (let t of e) {
+			let e = this._tree.getNode(t.msgId);
+			if (!e) continue;
+			let n = t.events.map((e) => ({
+				kind: "event",
+				event: e,
+				messageId: t.msgId
+			})), r = this._codec.createAccumulator();
+			r.initMessage(t.msgId, e.message), r.processOutputs(n);
+			let i = r.messages.at(-1);
+			i && this._tree.upsert(t.msgId, i, e.headers, e.serial);
+		}
+	}
 	async waitForTurn(e) {
-		if (this._closed) return;
+		if (this._state === Y.CLOSED) return;
 		let t = e ?? { own: !0 }, n = this._getMatchingTurnIds(t);
 		if (n.size !== 0) return this._logger.debug("ClientTransport.waitForTurn();", { turnIds: [...n] }), new Promise((e) => {
-			let t = (r) => {
-				r.type === "x-ably-turn-end" && (n.delete(r.turnId), n.size === 0 && (this._emitter.off("turn", t), e()));
-			};
-			this._emitter.on("turn", t);
+			let t = !1, r = () => {
+				if (t) return;
+				t = !0, i();
+				let n = this._closeResolvers.indexOf(r);
+				n !== -1 && this._closeResolvers.splice(n, 1), e();
+			}, i = this._tree.on("turn", (e) => {
+				e.type === "x-ably-turn-end" && (n.delete(e.turnId), n.size === 0 && r());
+			});
+			this._closeResolvers.push(r);
 		});
 	}
 	on(e, t) {
-		if (this._closed) return Ue;
+		if (this._state === Y.CLOSED) return it;
 		let n = t;
 		return this._emitter.on(e, n), () => {
 			this._emitter.off(e, n);
 		};
 	}
-	getTree() {
-		return this._tree;
-	}
-	getActiveTurnIds() {
-		let e = /* @__PURE__ */ new Map();
-		for (let [t, n] of this._turnClientIds) {
-			let r = e.get(n);
-			r || (r = /* @__PURE__ */ new Set(), e.set(n, r)), r.add(t);
-		}
-		return e;
-	}
-	getMessageHeaders(e) {
-		let t = this._codec.getMessageKey(e);
-		return this._tree.getNodeByKey(t)?.headers;
-	}
-	getMessages() {
-		return this._withheldKeys.size === 0 ? this._tree.flatten() : this._tree.flatten().filter((e) => !this._withheldKeys.has(this._codec.getMessageKey(e)));
-	}
-	getMessagesWithHeaders() {
-		return this._getMessagesWithHeaders();
-	}
-	getAblyMessages() {
-		return [...this._ablyMessages];
-	}
-	async history(t) {
-		if (this._closed) throw new e.ErrorInfo("unable to load history; transport is closed", W.TransportClosed, 400);
-		this._logger.trace("ClientTransport.history();", { limit: t?.limit });
-		let n = t?.limit ?? 100, r = new Set(this._tree.flatten().map((e) => this._codec.getMessageKey(e))), i = await Be(this._channel, this._codec, t, this._logger), a = await this._loadUntilVisible(i, n, r);
-		i = a.lastPage;
-		let o = a.newVisible;
-		for (let e of o) this._withheldKeys.add(this._codec.getMessageKey(e));
-		let s = o.slice(-n), c = o.slice(0, -n);
-		this._releaseWithheld(s);
-		let l = (e) => ({
-			items: e,
-			hasNext: () => c.length > 0 || i.hasNext(),
-			next: async () => {
-				if (c.length > 0) {
-					let e = c.splice(-n, n);
-					return this._releaseWithheld(e), l(e);
-				}
-				if (!i.hasNext()) return;
-				let e = await i.next();
-				if (!e) return;
-				let t = new Set(r);
-				for (let e of this._tree.flatten()) t.add(this._codec.getMessageKey(e));
-				let a = await this._loadUntilVisible(e, n, t);
-				i = a.lastPage;
-				let o = a.newVisible;
-				for (let e of o) this._withheldKeys.add(this._codec.getMessageKey(e));
-				let s = o.splice(-n, n);
-				if (c.push(...o), this._releaseWithheld(s), s.length !== 0) return l(s);
-			}
-		});
-		return l(s);
-	}
 	async close(e) {
-		if (!this._closed) {
-			if (this._closed = !0, this._logger.info("ClientTransport.close();"), e?.cancel) {
+		if (this._state !== Y.CLOSED) {
+			if (this._state = Y.CLOSED, this._logger.info("ClientTransport.close();"), e?.cancel) {
 				try {
 					await this._publishCancel(e.cancel);
 				} catch {}
 				this._closeMatchingTurnStreams(e.cancel);
 			}
-			this._channel.unsubscribe(this._onMessage);
+			this._channel.unsubscribe(this._onMessage), this._channel.off(this._onChannelStateChange);
 			for (let e of this._ownTurnIds) this._router.closeStream(e);
-			this._turnObservers.clear(), this._emitter.off(), this._ownTurnIds.clear(), this._ownMsgIds.clear(), this._turnMsgIds.clear(), this._turnClientIds.clear(), this._withheldKeys.clear(), this._ablyMessages.length = 0;
+			this._turnObservers.clear(), this._emitter.off();
+			for (let e of this._views) e.close();
+			this._views.clear();
+			for (let e of this._closeResolvers) e();
+			this._closeResolvers.length = 0, this._ownTurnIds.clear(), this._ownMsgIds.clear(), this._turnMsgIds.clear();
 		}
 	}
-}, $ = (e) => new We(e), Ge = async (e, t, n, r, i) => {
-	i?.trace("pipeStream();");
-	let a = e.getReader(), o, s = n ? new Promise((e) => {
+}, ot = (e) => new at(e), st = async (e, t, n, r, i, a) => {
+	a?.trace("pipeStream();");
+	let o = e.getReader(), s, c = n ? new Promise((e) => {
 		if (n.aborted) {
 			e();
 			return;
 		}
-		o = () => {
+		s = () => {
 			e();
-		}, n.addEventListener("abort", o, { once: !0 });
-	}) : new Promise(() => {}), c = "complete";
+		}, n.addEventListener("abort", s, { once: !0 });
+	}) : new Promise(() => {}), l = "complete", u;
 	try {
 		for (;;) {
-			let e = await Promise.race([a.read(), s.then(() => "aborted")]);
+			let e = await Promise.race([o.read(), c.then(() => "aborted")]);
 			if (e === "aborted") {
-				c = "cancelled", i?.debug("pipeStream(); stream cancelled by abort signal"), r && await r(async (e) => t.appendEvent(e)), await t.abort("cancelled");
+				l = "cancelled", a?.debug("pipeStream(); stream cancelled by abort signal"), r && await r(async (e) => t.appendEvent(e)), await t.abort("cancelled");
 				break;
 			}
-			let { done: n, value: o } = e;
+			let { done: n, value: s } = e;
 			if (n) {
-				await t.close(), i?.debug("pipeStream(); stream completed");
+				await t.close(), a?.debug("pipeStream(); stream completed");
 				break;
 			}
-			await t.appendEvent(o);
+			await t.appendEvent(s, i?.(s));
 		}
 	} catch (e) {
-		c = "error";
-		let n = e instanceof Error ? e.message : String(e);
-		i?.error("pipeStream(); stream error", { error: n });
+		l = "error", u = e instanceof Error ? e : Error(String(e)), a?.error("pipeStream(); stream error", { error: u.message });
 		try {
 			await t.close();
 		} catch {}
 	} finally {
-		o && n?.removeEventListener("abort", o), a.releaseLock();
+		s && n?.removeEventListener("abort", s), o.releaseLock();
 	}
-	return { reason: c };
-}, Ke = class {
+	return {
+		reason: l,
+		error: u
+	};
+}, ct = class {
 	constructor(e, t) {
 		this._activeTurns = /* @__PURE__ */ new Map(), this._channel = e, this._logger = t?.withContext({ component: "TurnManager" });
 	}
-	async startTurn(e, t, n) {
+	async startTurn(e, t, n, r) {
 		this._logger?.trace("DefaultTurnManager.startTurn();", {
 			turnId: e,
 			clientId: t
 		});
-		let r = n ?? new AbortController(), i = t ?? "";
-		return this._activeTurns.set(e, {
-			controller: r,
-			clientId: i
-		}), await this._channel.publish({
-			name: _,
-			extras: { headers: {
-				[a]: e,
-				[s]: i
-			} }
-		}), this._logger?.debug("DefaultTurnManager.startTurn(); turn started", { turnId: e }), r.signal;
+		let i = n ?? new AbortController(), a = t ?? "";
+		this._activeTurns.set(e, {
+			controller: i,
+			clientId: a
+		});
+		let o = {
+			[s]: e,
+			[l]: a
+		};
+		return r?.parent !== void 0 && (o[g] = r.parent), r?.forkOf !== void 0 && (o[_] = r.forkOf), await this._channel.publish({
+			name: b,
+			extras: { headers: o }
+		}), this._logger?.debug("DefaultTurnManager.startTurn(); turn started", { turnId: e }), i.signal;
 	}
 	async endTurn(e, t) {
 		this._logger?.trace("DefaultTurnManager.endTurn();", {
@@ -2126,11 +2576,11 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 		});
 		let n = this._activeTurns.get(e)?.clientId ?? "";
 		await this._channel.publish({
-			name: v,
+			name: x,
 			extras: { headers: {
-				[a]: e,
-				[s]: n,
-				[h]: t
+				[s]: e,
+				[l]: n,
+				[v]: t
 			} }
 		}), this._activeTurns.delete(e), this._logger?.debug("DefaultTurnManager.endTurn(); turn ended", {
 			turnId: e,
@@ -2154,30 +2604,38 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 		for (let e of this._activeTurns.values()) e.controller.abort();
 		this._activeTurns.clear();
 	}
-}, qe = (e, t) => new Ke(e, t), Je = class {
+}, lt = (e, t) => new ct(e, t), X = /* @__PURE__ */ function(e) {
+	return e.READY = "ready", e.CLOSED = "closed", e;
+}(X || {}), Z = /* @__PURE__ */ function(e) {
+	return e.INITIALIZED = "initialized", e.STARTED = "started", e.ENDED = "ended", e;
+}(Z || {}), ut = class {
 	constructor(t) {
-		this._registeredTurns = /* @__PURE__ */ new Map(), this._channel = t.channel, this._codec = t.codec, this._logger = t.logger?.withContext({ component: "ServerTransport" }), this._onError = t.onError, this._turnManager = qe(this._channel, this._logger), this._channelListener = (e) => {
+		this._registeredTurns = /* @__PURE__ */ new Map(), this._state = X.READY, this._channel = t.channel, this._codec = t.codec, this._logger = t.logger?.withContext({ component: "ServerTransport" }), this._onError = t.onError, this._turnManager = lt(this._channel, this._logger), this._channelListener = (e) => {
 			this._handleChannelMessage(e);
-		}, this._attachPromise = this._channel.subscribe(g, this._channelListener).then(() => {}, (t) => {
-			let n = new e.ErrorInfo(`unable to subscribe to cancel messages; ${t instanceof Error ? t.message : String(t)}`, W.TransportSubscriptionError, 500, t instanceof e.ErrorInfo ? t : void 0);
+		}, this._attachPromise = this._channel.subscribe(y, this._channelListener).then(() => {}, (t) => {
+			let n = new e.ErrorInfo(`unable to subscribe to cancel messages; ${t instanceof Error ? t.message : String(t)}`, L.TransportSubscriptionError, 500, t instanceof e.ErrorInfo ? t : void 0);
 			this._logger?.error("DefaultServerTransport(); subscribe failed"), this._onError?.(n);
-		}), this._logger?.debug("DefaultServerTransport(); transport created");
+		}), this._hasAttachedOnce = this._channel.state === "attached", this._onChannelStateChange = (e) => {
+			this._handleChannelStateChange(e);
+		}, this._channel.on(this._onChannelStateChange), this._logger?.debug("DefaultServerTransport(); transport created");
 	}
 	newTurn(e) {
 		return this._logger?.trace("DefaultServerTransport.newTurn();", { turnId: e.turnId }), this._createTurn(e);
 	}
 	close() {
-		this._logger?.trace("DefaultServerTransport.close();"), this._channel.unsubscribe(g, this._channelListener);
-		for (let e of this._registeredTurns.values()) e.controller.abort();
-		this._registeredTurns.clear(), this._turnManager.close(), this._logger?.debug("DefaultServerTransport.close(); transport closed");
+		if (this._state !== X.CLOSED) {
+			this._state = X.CLOSED, this._logger?.trace("DefaultServerTransport.close();"), this._channel.unsubscribe(y, this._channelListener), this._channel.off(this._onChannelStateChange);
+			for (let e of this._registeredTurns.values()) e.controller.abort();
+			this._registeredTurns.clear(), this._turnManager.close(), this._logger?.debug("DefaultServerTransport.close(); transport closed");
+		}
 	}
 	_resolveFilter(e, t) {
 		let n = [...this._registeredTurns.keys()];
 		return e.all ? n : e.own && t ? n.filter((e) => this._registeredTurns.get(e)?.clientId === t) : e.clientId ? n.filter((t) => this._registeredTurns.get(t)?.clientId === e.clientId) : e.turnId && this._registeredTurns.has(e.turnId) ? [e.turnId] : [];
 	}
 	async _handleCancelMessage(t) {
-		let n = b(t), r = {};
-		n["x-ably-cancel-turn-id"] ? r.turnId = n[l] : n["x-ably-cancel-own"] === "true" ? r.own = !0 : n["x-ably-cancel-client-id"] ? r.clientId = n[f] : n["x-ably-cancel-all"] === "true" && (r.all = !0);
+		let n = C(t), r = {};
+		n["x-ably-cancel-turn-id"] ? r.turnId = n[f] : n["x-ably-cancel-own"] === "true" ? r.own = !0 : n["x-ably-cancel-client-id"] ? r.clientId = n[h] : n["x-ably-cancel-all"] === "true" && (r.all = !0);
 		let i = this._resolveFilter(r, t.clientId);
 		if (i.length === 0) return;
 		this._logger?.debug("DefaultServerTransport._handleCancelMessage(); matched turns", {
@@ -2204,113 +2662,174 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 				}
 				n.controller.abort(), this._logger?.debug("DefaultServerTransport._handleCancelMessage(); turn aborted", { turnId: t });
 			} catch (r) {
-				let i = new e.ErrorInfo(`unable to process cancel for turn ${t}; onCancel handler threw: ${r instanceof Error ? r.message : String(r)}`, W.CancelListenerError, 500, r instanceof e.ErrorInfo ? r : void 0);
+				let i = new e.ErrorInfo(`unable to process cancel for turn ${t}; onCancel handler threw: ${r instanceof Error ? r.message : String(r)}`, L.CancelListenerError, 500, r instanceof e.ErrorInfo ? r : void 0);
 				this._logger?.error("DefaultServerTransport._handleCancelMessage(); onCancel threw", { turnId: t }), (n.onError ?? this._onError)?.(i);
 			}
 		}
 	}
+	_handleChannelStateChange(t) {
+		if (this._state === X.CLOSED) return;
+		let { current: n, resumed: r } = t;
+		if (n === "attached" && !this._hasAttachedOnce) {
+			this._hasAttachedOnce = !0;
+			return;
+		}
+		if (!(n === "failed" || n === "suspended" || n === "detached" || n === "attached" && !r)) return;
+		this._logger?.error("DefaultServerTransport._handleChannelStateChange(); channel continuity lost", {
+			current: n,
+			resumed: r,
+			previous: t.previous
+		});
+		let i = new e.ErrorInfo(`unable to deliver cancel messages; channel continuity lost (${n}${n === "attached" ? ", resumed: false" : ""})`, L.ChannelContinuityLost, 500, t.reason);
+		this._onError?.(i);
+	}
 	_handleChannelMessage(t) {
 		try {
 			t.name === "x-ably-cancel" && this._handleCancelMessage(t).catch((t) => {
-				let n = new e.ErrorInfo(`unable to route cancel message; ${t instanceof Error ? t.message : String(t)}`, W.CancelListenerError, 500, t instanceof e.ErrorInfo ? t : void 0);
+				let n = new e.ErrorInfo(`unable to route cancel message; ${t instanceof Error ? t.message : String(t)}`, L.CancelListenerError, 500, t instanceof e.ErrorInfo ? t : void 0);
 				this._logger?.error("DefaultServerTransport._handleChannelMessage(); cancel routing error"), this._onError?.(n);
 			});
 		} catch (t) {
-			let n = new e.ErrorInfo(`unable to process channel message; ${t instanceof Error ? t.message : String(t)}`, W.TransportSubscriptionError, 500, t instanceof e.ErrorInfo ? t : void 0);
+			let n = new e.ErrorInfo(`unable to process channel message; ${t instanceof Error ? t.message : String(t)}`, L.TransportSubscriptionError, 500, t instanceof e.ErrorInfo ? t : void 0);
 			this._logger?.error("DefaultServerTransport._handleChannelMessage(); subscription error"), this._onError?.(n);
 		}
 	}
 	_createTurn(t) {
-		let { turnId: n, clientId: r, onMessage: i, onAbort: a, onCancel: o, onError: s, parent: c, forkOf: l } = t, u = new AbortController(), d = !1, f = !1, p = {
+		let { turnId: n, clientId: r, onMessage: i, onAbort: a, onCancel: o, onError: s, parent: c, forkOf: l, signal: u } = t, d = new AbortController(), f = Z.INITIALIZED, p = u ? AbortSignal.any([d.signal, u]) : d.signal, m = {
 			turnId: n,
 			clientId: r ?? "",
-			controller: u,
+			controller: d,
+			signal: p,
 			onCancel: o,
 			onError: s
 		};
-		this._registeredTurns.set(n, p);
-		let m = this._logger, h = this._turnManager, g = this._attachPromise, _ = this._codec, v = this._channel, y = this._registeredTurns;
+		this._registeredTurns.set(n, m);
+		let h = this._logger, g = this._turnManager, _ = this._attachPromise, v = this._codec, y = this._channel, b = this._registeredTurns;
 		return {
 			get turnId() {
 				return n;
 			},
 			get abortSignal() {
-				return u.signal;
+				return p;
 			},
 			start: async () => {
-				if (m?.trace("Turn.start();", { turnId: n }), u.signal.aborted) throw new e.ErrorInfo(`unable to start turn; turn ${n} was cancelled before start()`, W.InvalidArgument, 400);
-				if (!d) {
-					d = !0;
+				if (h?.trace("Turn.start();", { turnId: n }), p.aborted) throw new e.ErrorInfo(`unable to start turn; turn ${n} was cancelled before start()`, L.InvalidArgument, 400);
+				if (f === Z.INITIALIZED) {
+					f = Z.STARTED;
 					try {
-						await h.startTurn(n, r, u);
+						await g.startTurn(n, r, d, {
+							parent: c,
+							forkOf: l
+						});
 					} catch (t) {
-						let r = new e.ErrorInfo(`unable to publish turn-start for turn ${n}; ${t instanceof Error ? t.message : String(t)}`, W.TurnLifecycleError, 500, t instanceof e.ErrorInfo ? t : void 0);
-						throw m?.error("Turn.start(); failed to publish turn-start", { turnId: n }), s?.(r), r;
+						let r = new e.ErrorInfo(`unable to publish turn-start for turn ${n}; ${t instanceof Error ? t.message : String(t)}`, L.TurnLifecycleError, 500, t instanceof e.ErrorInfo ? t : void 0);
+						throw h?.error("Turn.start(); failed to publish turn-start", { turnId: n }), r;
 					}
-					m?.debug("Turn.start(); turn started", { turnId: n });
+					h?.debug("Turn.start(); turn started", { turnId: n });
 				}
 			},
 			addMessages: async (t, r) => {
-				if (m?.trace("Turn.addMessages();", {
+				if (h?.trace("Turn.addMessages();", {
 					turnId: n,
 					count: t.length
-				}), !d) throw new e.ErrorInfo(`unable to add messages; start() must be called before addMessages() (turn ${n})`, W.InvalidArgument, 400);
-				await g;
+				}), f === Z.INITIALIZED) throw new e.ErrorInfo(`unable to add messages; start() must be called before addMessages() (turn ${n})`, L.InvalidArgument, 400);
+				await _;
 				let a = [];
-				for (let e of t) {
-					let t = crypto.randomUUID(), o = x(Q({
-						role: "user",
-						turnId: n,
-						msgId: t,
-						turnClientId: r?.clientId,
-						parent: r?.parent === void 0 ? c ?? void 0 : r.parent ?? void 0,
-						forkOf: r?.forkOf ?? l
-					}), e.headers);
-					await _.createEncoder(v, {
-						extras: { headers: o },
-						onMessage: i
-					}).writeMessages([e.message], r?.clientId ? { clientId: r.clientId } : void 0), a.push(o["x-ably-msg-id"] ?? t);
+				try {
+					for (let e of t) {
+						let t = T(W({
+							role: "user",
+							turnId: n,
+							msgId: e.msgId,
+							turnClientId: r?.clientId,
+							parent: e.parentId ?? c,
+							forkOf: e.forkOf ?? l
+						}), e.headers);
+						await v.createEncoder(y, {
+							extras: { headers: t },
+							onMessage: i
+						}).writeMessages([e.message], r?.clientId ? { clientId: r.clientId } : void 0), a.push(e.msgId);
+					}
+				} catch (t) {
+					let r = new e.ErrorInfo(`unable to publish messages for turn ${n}; ${t instanceof Error ? t.message : String(t)}`, L.TurnLifecycleError, 500, t instanceof e.ErrorInfo ? t : void 0);
+					throw h?.error("Turn.addMessages(); publish failed", { turnId: n }), r;
 				}
-				return m?.debug("Turn.addMessages(); messages published", {
+				return h?.debug("Turn.addMessages(); messages published", {
 					turnId: n,
 					count: t.length
 				}), { msgIds: a };
 			},
+			addEvents: async (t) => {
+				if (h?.trace("Turn.addEvents();", {
+					turnId: n,
+					count: t.length
+				}), f === Z.INITIALIZED) throw new e.ErrorInfo(`unable to add events; start() must be called before addEvents() (turn ${n})`, L.InvalidArgument, 400);
+				await _;
+				let r = g.getClientId(n);
+				try {
+					for (let e of t) {
+						let t = W({
+							role: "assistant",
+							turnId: n,
+							msgId: e.msgId,
+							turnClientId: r,
+							amend: e.msgId
+						}), a = v.createEncoder(y, {
+							extras: { headers: t },
+							onMessage: i
+						});
+						for (let t of e.events) await a.writeEvent(t);
+						await a.close();
+					}
+				} catch (t) {
+					let r = new e.ErrorInfo(`unable to publish events for turn ${n}; ${t instanceof Error ? t.message : String(t)}`, L.TurnLifecycleError, 500, t instanceof e.ErrorInfo ? t : void 0);
+					throw h?.error("Turn.addEvents(); publish failed", { turnId: n }), r;
+				}
+				h?.debug("Turn.addEvents(); events published", {
+					turnId: n,
+					count: t.length
+				});
+			},
 			streamResponse: async (t, r) => {
-				if (m?.trace("Turn.streamResponse();", { turnId: n }), !d) throw new e.ErrorInfo(`unable to stream response; start() must be called before streamResponse() (turn ${n})`, W.InvalidArgument, 400);
-				await g;
-				let o = h.getSignal(n), s = h.getClientId(n), u = r?.parent === void 0 ? c ?? void 0 : r.parent ?? void 0, f = Q({
+				if (h?.trace("Turn.streamResponse();", { turnId: n }), f === Z.INITIALIZED) throw new e.ErrorInfo(`unable to stream response; start() must be called before streamResponse() (turn ${n})`, L.InvalidArgument, 400);
+				await _;
+				let o = g.getClientId(n), u = r?.parent === void 0 ? c : r.parent, d = crypto.randomUUID(), m = W({
 					role: "assistant",
 					turnId: n,
-					msgId: crypto.randomUUID(),
-					turnClientId: s,
+					msgId: d,
+					turnClientId: o,
 					parent: u,
 					forkOf: r?.forkOf ?? l
-				}), p = await Ge(t, _.createEncoder(v, {
-					extras: { headers: f },
-					onMessage: i
-				}), o, a, m);
-				return m?.debug("Turn.streamResponse(); stream finished", {
+				}), b = await st(t, v.createEncoder(y, {
+					extras: { headers: m },
+					onMessage: i,
+					messageId: d
+				}), p, a, r?.resolveWriteOptions, h);
+				if (b.error) {
+					let t = new e.ErrorInfo(`unable to stream response for turn ${n}; ${b.error.message}`, L.StreamError, 500, b.error instanceof e.ErrorInfo ? b.error : void 0);
+					h?.error("Turn.streamResponse(); stream error", { turnId: n }), s?.(t);
+				}
+				return h?.debug("Turn.streamResponse(); stream finished", {
 					turnId: n,
-					reason: p.reason
-				}), p;
+					reason: b.reason
+				}), b;
 			},
 			end: async (t) => {
-				if (m?.trace("Turn.end();", {
+				if (h?.trace("Turn.end();", {
 					turnId: n,
 					reason: t
-				}), !d) throw new e.ErrorInfo(`unable to end turn; start() must be called before end() (turn ${n})`, W.InvalidArgument, 400);
-				if (!f) {
-					f = !0;
+				}), f === Z.INITIALIZED) throw new e.ErrorInfo(`unable to end turn; start() must be called before end() (turn ${n})`, L.InvalidArgument, 400);
+				if (f !== Z.ENDED) {
+					f = Z.ENDED;
 					try {
-						await h.endTurn(n, t);
+						await g.endTurn(n, t);
 					} catch (t) {
-						let r = new e.ErrorInfo(`unable to publish turn-end for turn ${n}; ${t instanceof Error ? t.message : String(t)}`, W.TurnLifecycleError, 500, t instanceof e.ErrorInfo ? t : void 0);
-						throw m?.error("Turn.end(); failed to publish turn-end", { turnId: n }), s?.(r), r;
+						let r = new e.ErrorInfo(`unable to publish turn-end for turn ${n}; ${t instanceof Error ? t.message : String(t)}`, L.TurnLifecycleError, 500, t instanceof e.ErrorInfo ? t : void 0);
+						throw h?.error("Turn.end(); failed to publish turn-end", { turnId: n }), r;
 					} finally {
-						y.delete(n);
+						b.delete(n);
 					}
-					m?.debug("Turn.end(); turn ended", {
+					h?.debug("Turn.end(); turn ended", {
 						turnId: n,
 						reason: t
 					});
@@ -2318,14 +2837,131 @@ var n = "x-ably-stream", r = "x-ably-status", i = "x-ably-stream-id", a = "x-abl
 			}
 		};
 	}
-}, Ye = (e) => new Je(e), Xe = (e) => $({
+}, dt = (e) => new ut(e), ft = (e) => ot({
 	...e,
-	codec: G
-}), Ze = (e) => Ye({
+	codec: z,
+	api: e.api ?? "/api/chat"
+}), pt = (e) => dt({
 	...e,
-	codec: G
-});
+	codec: z
+}), Q = (e, t) => {
+	if (e.length === 0) return t;
+	let n = new Map(e.map((e) => [e.msgId, e]));
+	return t.map((e) => {
+		let t = n.get(e.msgId);
+		if (!t) return e;
+		let r = j();
+		r.initMessage(e.msgId, e.message), r.processOutputs(t.events.map((t) => ({
+			kind: "event",
+			event: t,
+			messageId: e.msgId
+		})));
+		let i = r.messages.at(-1);
+		return i ? {
+			...e,
+			message: i
+		} : e;
+	});
+}, mt = (e, t, n, r) => D({
+	...k(e),
+	state: "approval-responded",
+	input: e.input,
+	approval: D({
+		id: t,
+		approved: n,
+		reason: r
+	})
+}), ht = (e, t) => ({
+	...k(e),
+	state: "output-denied",
+	input: e.input,
+	approval: {
+		id: t,
+		approved: !1
+	}
+}), $ = (e, t) => {
+	if (t.length === 0) return e;
+	let n = new Map(t.map((e) => [e.toolCallId, e]));
+	return e.map((e) => {
+		let t;
+		for (let [r, i] of e.parts.entries()) {
+			if (i.type !== "dynamic-tool") continue;
+			let a = n.get(i.toolCallId);
+			if (!a) continue;
+			let o = i.approval?.id ?? crypto.randomUUID(), s = a.approved ? mt(i, o, !0, a.reason) : ht(i, o);
+			t ??= [...e.parts], t[r] = s;
+		}
+		return t ? {
+			...e,
+			parts: t
+		} : e;
+	});
+}, gt = (e, t) => {
+	let n = new Set(t.filter((e) => e.approved).map((e) => e.toolCallId));
+	if (n.size === 0) return /* @__PURE__ */ new Set();
+	let r = /* @__PURE__ */ new Set();
+	for (let t of e) for (let e of t.parts) e.type === "dynamic-tool" && n.has(e.toolCallId) && r.add(e.toolName);
+	return r;
+}, _t = (e, t) => {
+	if (t.size === 0) return e;
+	let n = Object.entries(e).map(([e, n]) => t.has(e) ? [e, {
+		...n,
+		needsApproval: !1
+	}] : [e, n]);
+	return Object.fromEntries(n);
+}, vt = async (e) => {
+	let { messages: n, decisions: r, tools: i } = e;
+	if (!r || r.length === 0) return {
+		modelMessages: await t(n),
+		tools: i
+	};
+	let a = await t($(n, r));
+	return {
+		modelMessages: a.at(-1)?.role === "user" ? a.slice(0, -1) : a,
+		tools: _t(i, gt(n, r))
+	};
+}, yt = (e, t, n) => {
+	let { decisions: r, ...i } = n, a = /* @__PURE__ */ new Map();
+	for (let e of r ?? []) e.approved && a.set(e.toolCallId, e.targetMsgId);
+	if (a.size === 0) return e.streamResponse(t, i);
+	let o = (e) => (e.type === "tool-output-available" || e.type === "tool-output-error") && a.has(e.toolCallId), s = [], c = t.pipeThrough(new TransformStream({
+		transform: (e, t) => {
+			if (o(e)) {
+				s.push(e);
+				return;
+			}
+			t.enqueue(e);
+		},
+		flush: (t) => {
+			if (!e.abortSignal.aborted) for (let e of s) t.enqueue(e);
+		}
+	}));
+	return e.streamResponse(c, {
+		...i,
+		resolveWriteOptions: (e) => {
+			if (!o(e)) return;
+			let t = a.get(e.toolCallId);
+			if (t !== void 0) return {
+				messageId: t,
+				extras: { headers: { [d]: t } }
+			};
+		}
+	});
+}, bt = (e) => {
+	let t = [];
+	for (let n of e) for (let e of n.message.parts) e.type === "dynamic-tool" && (e.state === "approval-responded" ? t.push({
+		toolCallId: e.toolCallId,
+		approved: !0,
+		targetMsgId: n.msgId,
+		...e.approval.reason === void 0 ? {} : { reason: e.approval.reason }
+	}) : e.state === "output-denied" && t.push({
+		toolCallId: e.toolCallId,
+		approved: !1,
+		targetMsgId: n.msgId
+	}));
+	return t;
+};
 //#endregion
-export { G as UIMessageCodec, je as createChatTransport, Xe as createClientTransport, Ze as createServerTransport };
+export { z as UIMessageCodec, $ as applyToolApprovalsToHistory, Q as applyToolEventsToHistory, We as createChatTransport, ft as createClientTransport, pt as createServerTransport, bt as extractApprovalDecisionsFromHistory, vt as prepareApprovalTurn, yt as streamResponseWithApprovalRedirect };
 
 //# sourceMappingURL=ably-ai-transport-vercel.js.map