@ably/ai-transport 0.0.1 → 0.1.0

package/dist/ably-ai-transport.js

@@ -1,103 +1,106 @@
 import * as e from "ably";
 //#region src/constants.ts
-var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-ably-turn-id", a = "x-ably-msg-id", o = "x-ably-turn-client-id", s = "x-ably-role", c = "x-ably-cancel-turn-id", l = "x-ably-cancel-own", u = "x-ably-cancel-all", d = "x-ably-cancel-client-id", f = "x-ably-parent", p = "x-ably-fork-of", m = "x-ably-turn-reason", h = "x-ably-cancel", g = "x-ably-turn-start", _ = "x-ably-turn-end", v = "x-ably-abort", y = "x-ably-error", b = "x-domain-", x = /* @__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;
-}({}), S = (e, t) => e.code === t, C = (e) => {
+var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-ably-discrete", a = "x-ably-turn-id", o = "x-ably-msg-id", s = "x-ably-turn-client-id", c = "x-ably-role", l = "x-ably-amend", u = "x-ably-cancel-turn-id", d = "x-ably-cancel-own", f = "x-ably-cancel-all", p = "x-ably-cancel-client-id", m = "x-ably-parent", h = "x-ably-fork-of", g = "x-ably-turn-reason", _ = "x-ably-cancel", v = "x-ably-turn-start", y = "x-ably-turn-end", b = "x-ably-abort", x = "x-ably-error", S = "x-domain-", C = /* @__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;
+}({}), ee = (e, t) => e.code === t, w = (e) => {
 	let t = e.extras;
 	if (!t || typeof t != "object") return {};
 	let n = t.headers;
 	return !n || typeof n != "object" ? {} : n;
-}, w = (e) => {
+}, T = (e) => {
 	if (e !== void 0) try {
 		return JSON.parse(e);
 	} catch {
 		return;
 	}
-}, T = (e, t) => ({
+}, E = (e, t) => ({
 	...e,
 	...t
-}), E = (e) => {
+}), te = (e) => {
 	if (e !== void 0) return e === "true";
-}, D = (e, t) => e[b + t], O = (e) => {
+}, D = (e, t) => e[S + t], O = (e) => {
 	let t = {};
 	for (let n in e) Object.prototype.hasOwnProperty.call(e, n) && e[n] !== void 0 && (t[n] = e[n]);
 	return t;
 }, k = (e) => ({
 	str: (t) => D(e, t),
 	strOr: (t, n) => D(e, t) ?? n,
-	bool: (t) => E(D(e, t)),
-	json: (t) => w(D(e, t))
+	bool: (t) => te(D(e, t)),
+	json: (t) => T(D(e, t))
 }), A = () => {
 	let e = {}, t = {
-		str: (n, r) => (r !== void 0 && (e[b + n] = r), t),
-		bool: (n, r) => (r !== void 0 && (e[b + n] = String(r)), t),
-		json: (n, r) => (r != null && (e[b + 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;
 }, j = (e) => {
 	let t = {
-		[s]: e.role,
-		[i]: e.turnId,
-		[a]: e.msgId
+		[c]: e.role,
+		[a]: e.turnId,
+		[o]: e.msgId
 	};
-	return e.turnClientId !== void 0 && (t[o] = e.turnClientId), e.parent && (t[f] = e.parent), e.forkOf && (t[p] = e.forkOf), t;
-}, M = async (e, t, n, r, i) => {
-	i?.trace("pipeStream();");
-	let a = e.getReader(), o, s = n ? new Promise((e) => {
+	return e.turnClientId !== void 0 && (t[s] = e.turnClientId), e.parent && (t[m] = e.parent), e.forkOf && (t[h] = e.forkOf), e.amend && (t[l] = e.amend), t;
+}, M = 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 };
-}, N = class {
+	return {
+		reason: l,
+		error: u
+	};
+}, ne = 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(), a = t ?? "";
-		return this._activeTurns.set(e, {
-			controller: r,
-			clientId: a
-		}), await this._channel.publish({
-			name: g,
-			extras: { headers: {
-				[i]: e,
-				[o]: a
-			} }
-		}), this._logger?.debug("DefaultTurnManager.startTurn(); turn started", { turnId: e }), r.signal;
+		let i = n ?? new AbortController(), o = t ?? "";
+		this._activeTurns.set(e, {
+			controller: i,
+			clientId: o
+		});
+		let c = {
+			[a]: e,
+			[s]: o
+		};
+		return r?.parent !== void 0 && (c[m] = r.parent), r?.forkOf !== void 0 && (c[h] = r.forkOf), await this._channel.publish({
+			name: v,
+			extras: { headers: c }
+		}), this._logger?.debug("DefaultTurnManager.startTurn(); turn started", { turnId: e }), i.signal;
 	}
 	async endTurn(e, t) {
 		this._logger?.trace("DefaultTurnManager.endTurn();", {
@@ -106,11 +109,11 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 		});
 		let n = this._activeTurns.get(e)?.clientId ?? "";
 		await this._channel.publish({
-			name: _,
+			name: y,
 			extras: { headers: {
-				[i]: e,
-				[o]: n,
-				[m]: t
+				[a]: e,
+				[s]: n,
+				[g]: t
 			} }
 		}), this._activeTurns.delete(e), this._logger?.debug("DefaultTurnManager.endTurn(); turn ended", {
 			turnId: e,
@@ -134,30 +137,38 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 		for (let e of this._activeTurns.values()) e.controller.abort();
 		this._activeTurns.clear();
 	}
-}, P = (e, t) => new N(e, t), ee = class {
+}, re = (e, t) => new ne(e, t), N = /* @__PURE__ */ function(e) {
+	return e.READY = "ready", e.CLOSED = "closed", e;
+}(N || {}), P = /* @__PURE__ */ function(e) {
+	return e.INITIALIZED = "initialized", e.STARTED = "started", e.ENDED = "ended", e;
+}(P || {}), ie = 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 = P(this._channel, this._logger), this._channelListener = (e) => {
+		this._registeredTurns = /* @__PURE__ */ new Map(), this._state = N.READY, this._channel = t.channel, this._codec = t.codec, this._logger = t.logger?.withContext({ component: "ServerTransport" }), this._onError = t.onError, this._turnManager = re(this._channel, this._logger), this._channelListener = (e) => {
 			this._handleChannelMessage(e);
-		}, this._attachPromise = this._channel.subscribe(h, this._channelListener).then(() => {}, (t) => {
-			let n = new e.ErrorInfo(`unable to subscribe to cancel messages; ${t instanceof Error ? t.message : String(t)}`, x.TransportSubscriptionError, 500, t instanceof e.ErrorInfo ? t : void 0);
+		}, this._attachPromise = this._channel.subscribe(_, this._channelListener).then(() => {}, (t) => {
+			let n = new e.ErrorInfo(`unable to subscribe to cancel messages; ${t instanceof Error ? t.message : String(t)}`, C.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(h, 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 !== N.CLOSED) {
+			this._state = N.CLOSED, this._logger?.trace("DefaultServerTransport.close();"), this._channel.unsubscribe(_, 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 = C(t), r = {};
-		n["x-ably-cancel-turn-id"] ? r.turnId = n[c] : n["x-ably-cancel-own"] === "true" ? r.own = !0 : n["x-ably-cancel-client-id"] ? r.clientId = n[d] : n["x-ably-cancel-all"] === "true" && (r.all = !0);
+		let n = w(t), r = {};
+		n["x-ably-cancel-turn-id"] ? r.turnId = n[u] : n["x-ably-cancel-own"] === "true" ? r.own = !0 : n["x-ably-cancel-client-id"] ? r.clientId = n[p] : 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", {
@@ -184,113 +195,174 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "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)}`, x.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)}`, C.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 === N.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" : ""})`, C.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)}`, x.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)}`, C.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)}`, x.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)}`, C.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 = P.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()`, x.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()`, C.InvalidArgument, 400);
+				if (f === P.INITIALIZED) {
+					f = P.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)}`, x.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)}`, C.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})`, x.InvalidArgument, 400);
-				await g;
+				}), f === P.INITIALIZED) throw new e.ErrorInfo(`unable to add messages; start() must be called before addMessages() (turn ${n})`, C.InvalidArgument, 400);
+				await _;
 				let a = [];
-				for (let e of t) {
-					let t = crypto.randomUUID(), o = T(j({
-						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 = E(j({
+							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)}`, C.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 === P.INITIALIZED) throw new e.ErrorInfo(`unable to add events; start() must be called before addEvents() (turn ${n})`, C.InvalidArgument, 400);
+				await _;
+				let r = g.getClientId(n);
+				try {
+					for (let e of t) {
+						let t = j({
+							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)}`, C.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})`, x.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 = j({
+				if (h?.trace("Turn.streamResponse();", { turnId: n }), f === P.INITIALIZED) throw new e.ErrorInfo(`unable to stream response; start() must be called before streamResponse() (turn ${n})`, C.InvalidArgument, 400);
+				await _;
+				let o = g.getClientId(n), u = r?.parent === void 0 ? c : r.parent, d = crypto.randomUUID(), m = j({
 					role: "assistant",
 					turnId: n,
-					msgId: crypto.randomUUID(),
-					turnClientId: s,
+					msgId: d,
+					turnClientId: o,
 					parent: u,
 					forkOf: r?.forkOf ?? l
-				}), p = await M(t, _.createEncoder(v, {
-					extras: { headers: f },
-					onMessage: i
-				}), o, a, m);
-				return m?.debug("Turn.streamResponse(); stream finished", {
+				}), b = await M(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}`, C.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})`, x.InvalidArgument, 400);
-				if (!f) {
-					f = !0;
+				}), f === P.INITIALIZED) throw new e.ErrorInfo(`unable to end turn; start() must be called before end() (turn ${n})`, C.InvalidArgument, 400);
+				if (f !== P.ENDED) {
+					f = P.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)}`, x.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)}`, C.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
 					});
@@ -298,68 +370,68 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 			}
 		};
 	}
-}, F = (e) => new ee(e), I = (e) => ({
+}, ae = (e) => new ie(e), F = (e) => ({
 	logAction: (t, n, r) => {
 		e.error(n, { detail: r });
 	},
 	shouldLog: () => !0
-}), L = e.Realtime.EventEmitter, R = class extends L {
+}), I = e.Realtime.EventEmitter, L = class extends I {
 	constructor(e) {
-		super(I(e));
+		super(F(e));
 	}
-}, z = /* @__PURE__ */ function(e) {
+}, R = /* @__PURE__ */ function(e) {
 	return e.Trace = "trace", e.Debug = "debug", e.Info = "info", e.Warn = "warn", e.Error = "error", e.Silent = "silent", e;
-}({}), B = (e, t, n) => {
+}({}), z = (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 z.Trace:
-		case z.Debug:
+		case R.Trace:
+		case R.Debug:
 			console.log(i);
 			break;
-		case z.Info:
+		case R.Info:
 			console.info(i);
 			break;
-		case z.Warn:
+		case R.Warn:
 			console.warn(i);
 			break;
-		case z.Error:
+		case R.Error:
 			console.error(i);
 			break;
-		case z.Silent: break;
+		case R.Silent: break;
 	}
-}, V = (e) => new W(e.logHandler ?? B, e.logLevel), H = /* @__PURE__ */ function(e) {
+}, B = (e) => new U(e.logHandler ?? z, e.logLevel), V = /* @__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;
-}(H || {}), U = new Map([
-	[z.Trace, H.Trace],
-	[z.Debug, H.Debug],
-	[z.Info, H.Info],
-	[z.Warn, H.Warn],
-	[z.Error, H.Error],
-	[z.Silent, H.Silent]
-]), W = class t {
+}(V || {}), H = new Map([
+	[R.Trace, V.Trace],
+	[R.Debug, V.Debug],
+	[R.Info, V.Info],
+	[R.Warn, V.Warn],
+	[R.Error, V.Error],
+	[R.Silent, V.Silent]
+]), U = class t {
 	constructor(t, n, r) {
 		this._handler = t, this._context = r;
-		let i = U.get(n);
-		if (i === void 0) throw new e.ErrorInfo(`unable to create logger; invalid log level: ${n}`, x.InvalidArgument, 400);
+		let i = H.get(n);
+		if (i === void 0) throw new e.ErrorInfo(`unable to create logger; invalid log level: ${n}`, C.InvalidArgument, 400);
 		this._levelNumber = i;
 	}
 	trace(e, t) {
-		this._write(e, z.Trace, H.Trace, t);
+		this._write(e, R.Trace, V.Trace, t);
 	}
 	debug(e, t) {
-		this._write(e, z.Debug, H.Debug, t);
+		this._write(e, R.Debug, V.Debug, t);
 	}
 	info(e, t) {
-		this._write(e, z.Info, H.Info, t);
+		this._write(e, R.Info, V.Info, t);
 	}
 	warn(e, t) {
-		this._write(e, z.Warn, H.Warn, t);
+		this._write(e, R.Warn, V.Warn, t);
 	}
 	error(e, t) {
-		this._write(e, z.Error, H.Error, t);
+		this._write(e, R.Error, V.Error, t);
 	}
 	withContext(e) {
-		let n = [...U.entries()].find(([, e]) => e === this._levelNumber)?.[0] ?? z.Error;
+		let n = [...H.entries()].find(([, e]) => e === this._levelNumber)?.[0] ?? R.Error;
 		return new t(this._handler, n, this._mergeContext(e));
 	}
 	_write(e, t, n, r) {
@@ -371,9 +443,58 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 			...e
 		} : this._context : e ?? void 0;
 	}
-}, G = class {
+}, W = 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", C.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);
+	}
+}, G = (e, t) => new W(e, t), K = 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 L(e);
 	}
 	_compareNodes(e, t) {
 		let n = e.node.serial, r = t.node.serial;
@@ -432,7 +553,7 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "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]);
@@ -443,75 +564,63 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "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,
@@ -521,217 +630,580 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "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);
-	}
-}, K = (e, t) => new G(e, t), q = (e) => {
-	let t = [...e.rawMessages].toReversed(), n = e.codec.createDecoder(), r = /* @__PURE__ */ new Map(), o = e.codec.createAccumulator(), s = 0, c = /* @__PURE__ */ new Map(), l = /* @__PURE__ */ new Map();
-	for (let u of t) {
-		let t = n.decode(u), d = C(u), f = d[i], p = d[a], 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);
+	}
+}, q = (e) => new K(e), oe = (e) => {
+	let t = [...e.rawMessages].toReversed(), n = e.codec.createDecoder(), r = /* @__PURE__ */ new Map(), i = e.codec.createAccumulator(), s = 0, c = /* @__PURE__ */ new Map(), u = /* @__PURE__ */ new Map(), d = [], f = [];
+	for (let p of t) {
+		let t = n.decode(p), m = w(p), h = m[a], g = m[o], _ = p.serial, v = m[l];
+		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++,
 				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 o.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) {
+				d.push(g);
+				let e = c.get(g);
+				e ? Object.keys(m).length > 0 && Object.assign(e, m) : (c.set(g, { ...m }), _ && u.set(g, _));
+			}
 		}
 	}
-	let u = [];
-	for (let t of o.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 = d[e];
+		p.push({
 			message: t,
-			headers: c.get(n) ?? {},
-			serial: l.get(n) ?? ""
+			headers: n ? c.get(n) ?? {} : {},
+			serial: n ? u.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 o of t.accumulator.completedMessages) {
-			let t = e.getMessageKey(o), s = c.get(t);
-			if (s) {
-				r.set(t, s);
-				let e = l.get(t);
-				e && i.set(t, e);
-				let o = s[a];
-				o && n.add(o);
-			}
-		}
-		let o = [...t.msgHeaders.entries()].filter(([e]) => !n.has(e)), s = 0;
-		for (let n of t.accumulator.completedMessages) {
-			let a = e.getMessageKey(n), c = o[s];
-			if (!r.has(a) && c) {
-				let [e, n] = c;
-				r.set(a, n);
-				let o = t.msgSerials.get(e);
-				o && i.set(a, o), 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();
-}, J = async (e, t, n) => {
-	e.rawMessages.push(...t.items), e.lastAblyPage = t;
-	let r = q(e).length;
-	for (; r < e.returnedCount + n && t.hasNext();) {
+	return p.toReversed();
+}, se = (e) => {
+	if (e.cachedDecode && e.cachedAtRawLength === e.rawMessages.length) return e.cachedDecode;
+	let t = oe(e);
+	return e.cachedDecode = t, e.cachedAtRawLength = e.rawMessages.length, t;
+}, J = (e, t) => {
+	for (let r of t) {
+		let t = w(r), i = t[o];
+		if (!i || t["x-ably-amend"]) continue;
+		let a = r.action, s = a === "message.create" && "x-ably-discrete" in t, c = t["x-ably-stream"] === "true" && (a === "message.create" || a === "message.update" || a === "message.append"), l = t[n], u = l === "finished" || l === "aborted";
+		(s || c) && e.startedMsgIds.add(i), (s || u) && e.terminatedMsgIds.add(i), e.startedMsgIds.has(i) && e.terminatedMsgIds.has(i) && e.completedMsgIds.add(i);
+	}
+}, Y = async (e, t, n) => {
+	e.rawMessages.push(...t.items), e.lastAblyPage = t, J(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 = q(e).length;
+		t = n, e.rawMessages.push(...n.items), e.lastAblyPage = n, J(e, n.items);
 	}
-}, Y = (e, t) => {
-	let n = q(e), r = n.slice(e.returnedCount, e.returnedCount + t), i = [...r].toReversed();
+}, X = (e, t) => {
+	let n = se(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 Y(e, t);
+			if (a) return X(e, t);
 			if (!o || !e.lastAblyPage) return;
 			let n = await e.lastAblyPage.next();
-			if (n) return await J(e, n, t), Y(e, t);
+			if (n) return await Y(e, n, t), X(e, t);
 		}
 	};
-}, X = async (e, t, n, r) => {
+}, ce = 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 J(a, await e.history({
+	return await e.attach(), await Y(a, await e.history({
 		untilAttach: !0,
 		limit: o
-	}), i), Y(a, i);
-}, Z = class {
-	constructor(e, t) {
-		this._turns = /* @__PURE__ */ new Map(), this._isTerminal = e, this._logger = t;
+	}), i), X(a, i);
+}, le = 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 L(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", x.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", C.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}`, C.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}`, C.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", C.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 ce(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[o];
+				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
+		};
+	}
+	_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[a];
+			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 = w(e)[o];
+		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));
 	}
-}, Q = (e, t) => new Z(e, t), te = () => {}, ne = class {
+	_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;
+	}
+}, Z = (e) => new le(e), ue = () => {}, Q = /* @__PURE__ */ function(e) {
+	return e.READY = "ready", e.CLOSED = "closed", e;
+}(Q || {}), de = 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 ?? V({ logLevel: z.Silent })).withContext({ component: "ClientTransport" }), this._emitter = new R(this._logger), this._tree = K(this._codec.getMessageKey.bind(this._codec), this._logger), this._router = Q(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 = Q.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 ?? B({ logLevel: R.Silent })).withContext({ component: "ClientTransport" }), this._emitter = new L(this._logger), this._hasAttachedOnce = this._channel.state === "attached", this._tree = q(this._logger), this._view = Z({
+			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 = G(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[f] = t), this._tree.upsert(e, n, r), t = e;
+				let e = crypto.randomUUID(), r = { [o]: e };
+				t && (r[m] = 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 = C(t), n = e[i], r = e["x-ably-turn-client-id"] ?? "";
-					n && (this._turnClientIds.set(n, r), this._emitter.emit("turn", {
-						type: g,
+		if (this._state !== Q.CLOSED) try {
+			if (t.name === "x-ably-turn-start") {
+				let e = w(t), n = e[a], r = e["x-ably-turn-client-id"] ?? "";
+				if (n) {
+					this._tree.trackTurn(n, r);
+					let t = e[m], i = e[h];
+					this._tree.emitTurn({
+						type: v,
 						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 = C(t), n = e[i], r = e["x-ably-turn-client-id"] ?? "", a = 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: _,
-							turnId: n,
-							clientId: r,
-							reason: a
-						});
+				this._tree.emitAblyMessage(t);
+				return;
+			}
+			if (t.name === "x-ably-turn-end") {
+				let e = w(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._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: y,
+						turnId: n,
+						clientId: r,
+						reason: i
+					});
 				}
-				let e = this._decoder.decode(t), n = C(t), r = t.serial, a = n[i];
-				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);
-			} 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)}`, x.TransportSubscriptionError, 500, n));
+				this._tree.emitAblyMessage(t);
+				return;
 			}
+			let e = this._decoder.decode(t), n = w(t), r = t.serial, i = n[l];
+			if (i) {
+				for (let t of e) t.kind === "event" && this._handleAmendmentEvent(i, t);
+				return;
+			}
+			let o = n[a];
+			o && this._updateTurnObserverHeaders(o, 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)}`, C.TransportSubscriptionError, 500, n));
 		}
 	}
 	_handleMessageOutput(e, t, n, r) {
-		let i = t[a];
+		let i = t[o];
 		if (i && this._ownMsgIds.has(i)) {
 			this._upsertAndNotify(e, t, n);
 			return;
@@ -740,7 +1212,7 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 	}
 	_handleEventOutput(e, t) {
 		if (e.kind !== "event") return;
-		let n = e.event, r = t[i];
+		let n = e.event, r = t[a];
 		if (r) {
 			if (this._router.route(r, n)) {
 				this._accumulateAndEmit(r, e), this._codec.isTerminal(n) && this._turnObservers.delete(r);
@@ -749,9 +1221,38 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "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 === Q.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" : ""})`, C.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[o];
+		r && this._tree.upsert(r, e, t, n);
 	}
 	_updateTurnObserverHeaders(e, t, n) {
 		let r = this._turnObservers.get(e);
@@ -764,269 +1265,234 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 	_accumulateAndEmit(e, t) {
 		let n = this._turnObservers.get(e);
 		if (!n) return;
+		let r = n.headers[o];
+		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[o];
+			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[c] = e.turnId : e.own ? t[l] = "true" : e.clientId ? t[d] = e.clientId : e.all && (t[u] = "true"), await this._channel.publish({
-			name: h,
+		e.turnId ? t[u] = e.turnId : e.own ? t[d] = "true" : e.clientId ? t[p] = e.clientId : e.all && (t[f] = "true"), await this._channel.publish({
+			name: _,
 			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?.[a] === 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", x.TransportClosed, 400);
-		this._logger.trace("ClientTransport.send();");
-		let r = Array.isArray(t) ? t : [t], i = crypto.randomUUID();
-		this._ownTurnIds.add(i);
-		let o = /* @__PURE__ */ new Set(), c = [], l = this._getMessagesWithHeaders(), u;
+	createView() {
+		if (this._state === Q.CLOSED) throw new e.ErrorInfo("unable to create view; transport is closed", C.TransportClosed, 400);
+		this._logger.trace("DefaultClientTransport.createView();");
+		let t = Z({
+			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 === Q.CLOSED || (await this._attachPromise, this._state === Q.CLOSED)) throw new e.ErrorInfo("unable to send; transport is closed", C.TransportClosed, 400);
+		let a = this._channel.state;
+		if (a !== "attached" && a !== "attaching") throw new e.ErrorInfo(`unable to send; channel is ${a}`, C.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), o.add(t);
-			let r = n?.parent === void 0 ? u : n.parent ?? void 0, l = j({
+			this._ownMsgIds.add(t), u.add(t);
+			let r = n?.parent === void 0 ? p : n.parent, i = j({
 				role: "user",
-				turnId: i,
+				turnId: s,
 				msgId: t,
 				turnClientId: this._clientId,
 				parent: r,
 				forkOf: n?.forkOf
 			});
-			this._upsertAndNotify(e, l);
-			let d = {
-				[a]: t,
-				[s]: "user"
-			};
-			r && (d[f] = r), c.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, o);
-		let p = 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: c,
+			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}`, x.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}`, C.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)}`, x.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)}`, C.TransportSendFailed, 500, n);
+			this._emitter.emit("error", r), this._router.errorStream(s, r);
 		}), {
-			stream: p,
-			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 === Q.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 === Q.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 === Q.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 === Q.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 te;
+		if (this._state === Q.CLOSED) return ue;
 		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", x.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 X(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 !== Q.CLOSED) {
+			if (this._state = Q.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();
 		}
 	}
-}, re = (e) => new ne(e), ie = (e) => [{
+}, fe = (e) => new de(e), pe = (e) => [{
 	kind: "event",
 	event: e
-}], ae = class {
+}], me = class {
 	constructor(e, t = {}) {
 		this._serialState = /* @__PURE__ */ new Map(), this._hooks = e, this._onStreamUpdate = t.onStreamUpdate, this._onStreamDelete = t.onStreamDelete, this._logger = t.logger?.withContext({ component: "DecoderCore" });
 	}
@@ -1055,7 +1521,7 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 				break;
 			default: return [];
 		}
-		let r = C(e)[a];
+		let r = w(e)[o];
 		if (r) for (let e of n) e.kind === "event" && (e.messageId = r);
 		return n;
 	}
@@ -1063,7 +1529,7 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 		return {
 			name: e.name ?? "",
 			data: e.data,
-			headers: C(e)
+			headers: w(e)
 		};
 	}
 	_stringData(e) {
@@ -1103,7 +1569,7 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 		if (!t) return [];
 		let r = this._serialState.get(t);
 		if (!r) return this._decodeUpdate(e);
-		let i = C(e), a = typeof e.data == "string" ? e.data : "", o = i[n], s = [];
+		let i = w(e), a = typeof e.data == "string" ? e.data : "", o = i[n], s = [];
 		return a.length > 0 && (r.accumulated += a, s.push(...this._hooks.buildDeltaEvents(r, a))), o === "finished" && !r.closed ? (r.closed = !0, s.push(...this._hooks.buildEndEvents(r, i)), this._logger?.debug("DefaultDecoderCore._decodeAppend(); stream finished", { streamId: r.streamId })) : o === "aborted" && !r.closed && (r.closed = !0, this._logger?.debug("DefaultDecoderCore._decodeAppend(); stream aborted", { streamId: r.streamId })), s;
 	}
 	_decodeUpdate(e) {
@@ -1143,7 +1609,7 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 		let n = this._serialState.get(t);
 		return this._invokeOnStreamDelete(t, n), n && (n.accumulated = "", n.closed = !0), this._logger?.debug("DefaultDecoderCore._decodeDelete();", { serial: t }), [];
 	}
-}, oe = (e, t = {}) => new ae(e, t), $ = class {
+}, he = (e, t = {}) => new me(e, t), ge = 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" });
 	}
@@ -1155,6 +1621,7 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "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[i] = "true";
 		return this._writer.publish(n);
 	}
 	async startStream(i, a, o) {
@@ -1172,7 +1639,7 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 		};
 		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: ${i})`, x.BadRequest, 400);
+		if (!u) throw new e.ErrorInfo(`unable to start stream; no serial returned for stream '${a.name}' (streamId: ${i})`, C.BadRequest, 400);
 		this._trackers.set(i, {
 			serial: u,
 			name: a.name,
@@ -1189,7 +1656,7 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "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}'`, x.InvalidArgument, 400);
+		if (!r) throw new e.ErrorInfo(`unable to append to stream; no active stream for streamId '${t}'`, C.InvalidArgument, 400);
 		r.accumulated += n;
 		let i = {
 			serial: r.serial,
@@ -1206,7 +1673,7 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 	async closeStream(t, r) {
 		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}'`, x.InvalidArgument, 400);
+		if (!i) throw new e.ErrorInfo(`unable to close stream; no active stream for streamId '${t}'`, C.InvalidArgument, 400);
 		i.accumulated += r.data;
 		let a = this._buildClosingHeaders(i, r.headers ?? {});
 		a[n] = "finished";
@@ -1225,7 +1692,7 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 	async abortStream(t, r) {
 		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}'`, x.InvalidArgument, 400);
+		if (!i) throw new e.ErrorInfo(`unable to abort stream; no active stream for streamId '${t}'`, C.InvalidArgument, 400);
 		i.aborted = !0;
 		let a = this._buildClosingHeaders(i, {}, r);
 		a[n] = "aborted";
@@ -1307,7 +1774,7 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "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}`, x.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}`, C.EncoderRecoveryFailed, 500);
 		}
 	}
 	async close() {
@@ -1329,17 +1796,17 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 		}
 	}
 	_assertNotClosed() {
-		if (this._closed) throw new e.ErrorInfo("unable to write to encoder; encoder has been closed", x.InvalidArgument, 400);
+		if (this._closed) throw new e.ErrorInfo("unable to write to encoder; encoder has been closed", C.InvalidArgument, 400);
 	}
 	_resolveClientId(e) {
 		return e?.clientId ?? this._defaultClientId;
 	}
 	_buildHeaders(e, t) {
 		let n = {
-			...T(this._defaultExtras?.headers, t?.extras?.headers),
+			...E(this._defaultExtras?.headers, t?.extras?.headers),
 			...e
 		};
-		return t?.messageId !== void 0 && (n[a] = t.messageId), n;
+		return t?.messageId !== void 0 && (n[o] = t.messageId), n;
 	}
 	_buildDiscreteMessage(e, n) {
 		let r = this._buildHeaders(e.headers ?? {}, n);
@@ -1356,10 +1823,10 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 		return this._invokeOnMessage(a), a;
 	}
 	_buildClosingHeaders(e, t, n) {
-		let r = { ...e.persistentHeaders }, i = T(this._defaultExtras?.headers, n?.extras?.headers);
+		let r = { ...e.persistentHeaders }, i = E(this._defaultExtras?.headers, n?.extras?.headers);
 		return Object.assign(r, i), Object.assign(r, t), r;
 	}
-}, se = (e, t = {}) => new $(e, t), ce = class {
+}, $ = (e, t = {}) => new ge(e, t), _e = class {
 	constructor(e) {
 		this._emitted = /* @__PURE__ */ new Map(), this._phases = e;
 	}
@@ -1381,8 +1848,8 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 		let t = this._emitted.get(e);
 		return t || (t = /* @__PURE__ */ new Set(), this._emitted.set(e, t)), t;
 	}
-}, le = (e) => new ce(e);
+}, ve = (e) => new _e(e);
 //#endregion
-export { b as DOMAIN_HEADER_PREFIX, v as EVENT_ABORT, h as EVENT_CANCEL, y as EVENT_ERROR, _ as EVENT_TURN_END, g as EVENT_TURN_START, x as ErrorCode, R as EventEmitter, u as HEADER_CANCEL_ALL, d as HEADER_CANCEL_CLIENT_ID, l as HEADER_CANCEL_OWN, c as HEADER_CANCEL_TURN_ID, p as HEADER_FORK_OF, a as HEADER_MSG_ID, f as HEADER_PARENT, s as HEADER_ROLE, n as HEADER_STATUS, t as HEADER_STREAM, r as HEADER_STREAM_ID, o as HEADER_TURN_CLIENT_ID, i as HEADER_TURN_ID, m as HEADER_TURN_REASON, z as LogLevel, j as buildTransportHeaders, B as consoleLogger, re as createClientTransport, oe as createDecoderCore, se as createEncoderCore, le as createLifecycleTracker, F as createServerTransport, S as errorInfoIs, ie as eventOutput, C as getHeaders, k as headerReader, A as headerWriter, V as makeLogger, T as mergeHeaders, O as stripUndefined };
+export { S as DOMAIN_HEADER_PREFIX, b as EVENT_ABORT, _ as EVENT_CANCEL, x as EVENT_ERROR, y as EVENT_TURN_END, v as EVENT_TURN_START, C as ErrorCode, L as EventEmitter, f as HEADER_CANCEL_ALL, p as HEADER_CANCEL_CLIENT_ID, d as HEADER_CANCEL_OWN, u as HEADER_CANCEL_TURN_ID, h as HEADER_FORK_OF, o as HEADER_MSG_ID, m as HEADER_PARENT, c as HEADER_ROLE, n as HEADER_STATUS, t as HEADER_STREAM, r as HEADER_STREAM_ID, s as HEADER_TURN_CLIENT_ID, a as HEADER_TURN_ID, g as HEADER_TURN_REASON, R as LogLevel, j as buildTransportHeaders, z as consoleLogger, fe as createClientTransport, he as createDecoderCore, $ as createEncoderCore, ve as createLifecycleTracker, ae as createServerTransport, ee as errorInfoIs, pe as eventOutput, w as getHeaders, k as headerReader, A as headerWriter, B as makeLogger, E as mergeHeaders, O as stripUndefined };
 
 //# sourceMappingURL=ably-ai-transport.js.map