@ably/ai-transport 0.2.0 → 0.3.0

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

@@ -1,21 +1,50 @@
 import * as e from "ably";
-import { useAbly as t } from "ably/react";
-import { createContext as n, useCallback as r, useContext as i, useEffect as a, useMemo as o, useRef as s, useState as c } from "react";
-import { jsx as l } from "react/jsx-runtime";
-var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-message-id", h = "run-client-id", g = "input-client-id", _ = "role", v = "parent", y = "fork-of", b = "msg-regenerate", x = "input-codec-message-id", S = "error-code", ee = "ai-cancel", C = /* @__PURE__ */ function(e) {
-	return e[e.BadRequest = 4e4] = "BadRequest", e[e.InvalidArgument = 40003] = "InvalidArgument", e[e.InsufficientCapability = 40160] = "InsufficientCapability", e[e.EncoderRecoveryFailed = 104e3] = "EncoderRecoveryFailed", e[e.SessionSubscriptionError = 104001] = "SessionSubscriptionError", e[e.CancelListenerError = 104002] = "CancelListenerError", e[e.RunLifecycleError = 104003] = "RunLifecycleError", e[e.SessionClosed = 104004] = "SessionClosed", e[e.SessionSendFailed = 104005] = "SessionSendFailed", e[e.ChannelContinuityLost = 104006] = "ChannelContinuityLost", e[e.ChannelNotReady = 104007] = "ChannelNotReady", e[e.StreamError = 104008] = "StreamError", e[e.InputEventNotFound = 104010] = "InputEventNotFound", e;
-}({}), te = (e) => ({
+import { ChannelProvider as t, useAbly as n } from "ably/react";
+import { createContext as r, useCallback as i, useContext as a, useEffect as o, useMemo as s, useRef as c, useState as l } from "react";
+import { jsx as u } from "react/jsx-runtime";
+//#region src/core/channel-options.ts
+var d = [
+	"PUBLISH",
+	"SUBSCRIBE",
+	"PRESENCE",
+	"PRESENCE_SUBSCRIBE",
+	"ANNOTATION_PUBLISH"
+], f = ["OBJECT_SUBSCRIBE", "OBJECT_PUBLISH"], p = [
+	"PUBLISH",
+	"SUBSCRIBE",
+	"PRESENCE",
+	"PRESENCE_SUBSCRIBE",
+	"OBJECT_PUBLISH",
+	"OBJECT_SUBSCRIBE",
+	"ANNOTATION_PUBLISH",
+	"ANNOTATION_SUBSCRIBE"
+], m = (e) => {
+	if (e === void 0 || e.length === 0) return;
+	let t = new Set([...d, ...e]), n = p.filter((e) => t.has(e)), r = [...t].filter((e) => !p.includes(e)).toSorted();
+	return [...n, ...r];
+}, h = "0.3.0", g = "ai-transport-js", _ = (e, t) => {
+	let n = e;
+	return n.options.agents = {
+		...n.options.agents,
+		...t
+	}, { params: { agent: y(t) } };
+}, v = (e) => {
+	let t = e?.adapterTag, n = { [g]: h };
+	return t && (n[t] = h), n;
+}, y = (e) => Object.entries(e).map(([e, t]) => `${e}/${t}`).join(" "), b = (e) => y(v(e)), x = (e, t) => _(e, v(t)), S = "stream", C = "status", w = "run-id", T = "invocation-id", E = "event-id", D = "codec-message-id", ee = "run-client-id", te = "input-client-id", O = "role", k = "parent", A = "fork-of", j = "msg-regenerate", M = "input-codec-message-id", ne = "error-code", re = "ai-cancel", N = /* @__PURE__ */ function(e) {
+	return e[e.BadRequest = 4e4] = "BadRequest", e[e.InvalidArgument = 40003] = "InvalidArgument", e[e.InsufficientCapability = 40160] = "InsufficientCapability", e[e.EncoderRecoveryFailed = 104e3] = "EncoderRecoveryFailed", e[e.SessionSubscriptionError = 104001] = "SessionSubscriptionError", e[e.CancelListenerError = 104002] = "CancelListenerError", e[e.RunLifecycleError = 104003] = "RunLifecycleError", e[e.SessionClosed = 104004] = "SessionClosed", e[e.SessionSendFailed = 104005] = "SessionSendFailed", e[e.ChannelContinuityLost = 104006] = "ChannelContinuityLost", e[e.ChannelNotReady = 104007] = "ChannelNotReady", e[e.StreamError = 104008] = "StreamError", e[e.InputEventNotFound = 104010] = "InputEventNotFound", e[e.HistoryFetchFailed = 104011] = "HistoryFetchFailed", e;
+}({}), ie = (e) => ({
 	logAction: (t, n, r) => {
 		e.error(n, { detail: r });
 	},
 	shouldLog: () => !0
-}), ne = e.Realtime.EventEmitter, w = class extends ne {
+}), ae = e.Realtime.EventEmitter, P = class extends ae {
 	constructor(e) {
-		super(te(e));
+		super(ie(e));
 	}
-}, T = /* @__PURE__ */ function(e) {
+}, oe = /* @__PURE__ */ function(e) {
 	return e.Trace = "trace", e.Debug = "debug", e.Info = "info", e.Warn = "warn", e.Error = "error", e.Silent = "silent", e;
-}({}), re = (e, t, n) => {
+}({}), se = (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 "trace":
@@ -33,18 +62,18 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 			break;
 		case "silent": break;
 	}
-}, ie = (e) => new ae(e.logHandler ?? re, e.logLevel), E = new Map([
+}, ce = (e) => new ue(e.logHandler ?? se, e.logLevel), le = new Map([
 	["trace", 0],
 	["debug", 1],
 	["info", 2],
 	["warn", 3],
 	["error", 4],
 	["silent", 5]
-]), ae = class t {
+]), ue = class t {
 	constructor(t, n, r) {
 		this._handler = t, this._context = r;
-		let i = E.get(n);
-		if (i === void 0) throw new e.ErrorInfo(`unable to create logger; invalid log level: ${n}`, C.InvalidArgument, 400);
+		let i = le.get(n);
+		if (i === void 0) throw new e.ErrorInfo(`unable to create logger; invalid log level: ${n}`, N.InvalidArgument, 400);
 		this._levelNumber = i;
 	}
 	trace(e, t) {
@@ -63,7 +92,7 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 		this._write(e, "error", 4, t);
 	}
 	withContext(e) {
-		let n = [...E.entries()].find(([, e]) => e === this._levelNumber)?.[0] ?? "error";
+		let n = [...le.entries()].find(([, e]) => e === this._levelNumber)?.[0] ?? "error";
 		return new t(this._handler, n, this._mergeContext(e));
 	}
 	_write(e, t, n, r) {
@@ -75,82 +104,89 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 			...e
 		} : this._context : e ?? void 0;
 	}
-}, oe = (e, t) => {
+}, F = (e) => e instanceof Error ? e.message : String(e), I = (t) => t instanceof e.ErrorInfo ? t : void 0, de = (e, t) => {
 	let n = e.extras;
 	if (!n || typeof n != "object") return {};
 	let r = n.ai;
 	if (!r || typeof r != "object") return {};
 	let i = r[t];
 	return !i || typeof i != "object" ? {} : i;
-}, D = (e) => oe(e, "transport"), O = "0.2.0", k = "ai-transport-js", se = (e, t) => {
-	let n = e;
-	return n.options.agents = {
-		...n.options.agents,
-		...t
-	}, { params: { agent: Object.entries(t).map(([e, t]) => `${e}/${t}`).join(" ") } };
-}, ce = (e, t) => {
-	let n = t?.adapterTag, r = { [k]: O };
-	return n && (r[n] = O), se(e, r);
-}, le = (e) => {
+}, L = (e) => de(e, "transport"), fe = (e) => {
 	let t = {
-		[_]: e.role,
-		[m]: e.codecMessageId
+		[O]: e.role,
+		[D]: e.codecMessageId
 	};
-	return e.runId !== void 0 && (t[d] = e.runId), e.runClientId !== void 0 && (t[h] = e.runClientId), e.parent && (t[v] = e.parent), e.forkOf && (t[y] = e.forkOf), e.regenerates && (t[b] = e.regenerates), e.invocationId && (t[f] = e.invocationId), e.inputClientId !== void 0 && (t[g] = e.inputClientId), e.inputCodecMessageId !== void 0 && (t[x] = e.inputCodecMessageId), e.inputEventId && (t[p] = e.inputEventId), t;
-}, A = (e) => e === "ai-run-start" || e === "ai-run-suspend" || e === "ai-run-resume" || e === "ai-run-end", j = (e, t, n) => {
-	let r = t[d];
-	if (!r) return;
-	let i = t["run-client-id"] ?? "";
+	return e.runId !== void 0 && (t[w] = e.runId), e.runClientId !== void 0 && (t[ee] = e.runClientId), e.parent && (t[k] = e.parent), e.forkOf && (t[A] = e.forkOf), e.regenerates && (t[j] = e.regenerates), e.invocationId && (t[T] = e.invocationId), e.inputClientId !== void 0 && (t[te] = e.inputClientId), e.inputCodecMessageId !== void 0 && (t[M] = e.inputCodecMessageId), e.inputEventId && (t[E] = e.inputEventId), t;
+}, pe = (e) => e === "ai-run-start" || e === "ai-run-suspend" || e === "ai-run-resume" || e === "ai-run-end", R = (t) => {
+	let n = t[ne], r = n === void 0 ? NaN : Number(n), i = Number.isFinite(r) ? r : N.SessionSubscriptionError, a = t["error-message"] ?? "agent reported an error", o = i >= 1e4 && i < 6e4 ? Math.floor(i / 100) : 500;
+	return new e.ErrorInfo(a, i, o);
+}, me = (e, t, n, r) => {
+	let i = t[w];
+	if (!i) return;
+	let a = t["run-client-id"] ?? "", o = r === void 0 ? {} : { timestamp: r };
 	if (e === "ai-run-start") {
-		let e = t[v], a = t[y], o = t[b];
+		let e = t[k], r = t[A], s = t[j];
 		return {
 			type: "start",
-			runId: r,
-			clientId: i,
+			runId: i,
+			clientId: a,
 			serial: n,
 			invocationId: t["invocation-id"] ?? "",
+			...o,
 			...e !== void 0 && { parent: e },
-			...a !== void 0 && { forkOf: a },
-			...o !== void 0 && { regenerates: o }
+			...r !== void 0 && { forkOf: r },
+			...s !== void 0 && { regenerates: s }
 		};
 	}
 	if (e === "ai-run-suspend") return {
 		type: "suspend",
-		runId: r,
-		clientId: i,
+		runId: i,
+		clientId: a,
 		serial: n,
-		invocationId: t["invocation-id"] ?? ""
+		invocationId: t["invocation-id"] ?? "",
+		...o
 	};
 	if (e === "ai-run-resume") return {
 		type: "resume",
-		runId: r,
-		clientId: i,
+		runId: i,
+		clientId: a,
 		serial: n,
-		invocationId: t["invocation-id"] ?? ""
+		invocationId: t["invocation-id"] ?? "",
+		...o
 	};
 	if (e === "ai-run-end") {
-		let e = t["run-reason"] ?? "complete";
-		return {
+		let e = t["run-reason"] ?? "complete", r = t["invocation-id"] ?? "";
+		return e === "error" ? {
 			type: "end",
-			runId: r,
-			clientId: i,
+			runId: i,
+			clientId: a,
 			serial: n,
-			invocationId: t["invocation-id"] ?? "",
-			reason: e
+			invocationId: r,
+			reason: e,
+			...o,
+			error: R(t)
+		} : {
+			type: "end",
+			runId: i,
+			clientId: a,
+			serial: n,
+			invocationId: r,
+			reason: e,
+			...o
 		};
 	}
-}, M = (e, t, n) => {
-	let r = D(n), i = n.serial;
-	if (A(n.name)) {
-		let t = j(n.name, r, i);
+}, he = (e, t, n) => {
+	let r = L(n), i = n.serial, a = n.timestamp;
+	if (pe(n.name)) {
+		let t = me(n.name, r, i, a);
 		return t && e.applyRunLifecycle(t), t;
 	}
-	let { inputs: a, outputs: o } = t.decode(n);
-	(a.length > 0 || o.length > 0 || r["run-id"]) && e.applyMessage({
-		inputs: a,
-		outputs: o
-	}, r, i);
-}, ue = class e {
+	let { inputs: o, outputs: s } = t.decode(n);
+	(o.length > 0 || s.length > 0 || r["run-id"]) && e.applyMessage({
+		inputs: o,
+		outputs: s
+	}, r, i, a, n.version.serial);
+}, ge = (e, t) => ({ apply: (n) => he(e, t, n) }), _e = class e {
 	constructor(e) {
 		this.inputEventId = e.inputEventId, this.sessionName = e.sessionName;
 	}
@@ -163,22 +199,80 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 			sessionName: this.sessionName
 		};
 	}
-}, N = (e) => e.kind === "run" ? e.runId : e.codecMessageId, P = (e) => e.kind === "run" ? e.startSerial : e.serial, F = (e, t, n) => {
+}, ve = async (t, n) => {
+	if (!t) throw new e.ErrorInfo(`unable to ${n}; connect() must be called before ${n}()`, N.InvalidArgument, 400);
+	return t;
+}, ye = async (e, t, n, r) => {
+	if (t !== void 0) try {
+		await e.detach();
+	} catch (e) {
+		n?.debug(`${r}.close(); channel detach failed`, { error: e });
+	}
+}, be = (e) => {
+	let { current: t, resumed: n } = e;
+	return t === "failed" || t === "suspended" || t === "detached" || t === "attached" && !n;
+}, xe = (t, n) => {
+	let { current: r } = t;
+	return new e.ErrorInfo(`unable to ${n}; channel continuity lost (${r}${r === "attached" ? ", resumed: false" : ""})`, N.ChannelContinuityLost, 500, t.reason);
+}, z = (e) => [...e.inputs.map((e) => ({
+	direction: "input",
+	event: e
+})), ...e.outputs.map((e) => ({
+	direction: "output",
+	event: e
+}))], Se = class {
+	constructor() {
+		this._entries = [], this._swept = !1;
+	}
+	get swept() {
+		return this._swept;
+	}
+	record(e, t, n, r, i) {
+		let a = this._recordEntry(e, t, this._swept ? [] : n, r, i);
+		return a === void 0 ? "dropped" : this._swept || a === this._entries.length - 1 ? "incremental" : "refold";
+	}
+	replay(e) {
+		for (let t of this._entries) for (let n of t.events) e(n, t.serial, t.messageId);
+	}
+	sweep() {
+		this._swept = !0;
+		for (let e of this._entries) e.events.length = 0;
+	}
+	_recordEntry(e, t, n, r, i) {
+		for (let a = this._entries.length - 1; a >= 0; a--) {
+			let o = this._entries[a];
+			if (!o) break;
+			if (o.serial === e) return r !== void 0 && (r <= o.decodedThrough || !i) ? void 0 : (o.events.push(...n), r !== void 0 && (o.decodedThrough = r), a);
+			if (o.serial < e) return this._entries.splice(a + 1, 0, {
+				serial: e,
+				messageId: t,
+				events: [...n],
+				decodedThrough: r ?? e
+			}), a + 1;
+		}
+		return this._entries.unshift({
+			serial: e,
+			messageId: t,
+			events: [...n],
+			decodedThrough: r ?? e
+		}), 0;
+	}
+}, B = (e) => e.kind === "run" ? e.runId : e.codecMessageId, V = (e) => e.kind === "run" ? e.startSerial : e.serial, H = (e, t, n) => {
 	let r = e.get(t);
 	r || (r = /* @__PURE__ */ new Set(), e.set(t, r)), r.add(n);
-}, I = (e, t, n) => {
+}, U = (e, t, n) => {
 	let r = e.get(t);
 	r && (r.delete(n), r.size === 0 && e.delete(t));
-}, L = class {
+}, Ce = class {
 	constructor(e, t) {
-		this._nodeIndex = /* @__PURE__ */ new Map(), this._codecMessageIdToNodeKey = /* @__PURE__ */ new Map(), this._sortedNodes = [], this._parentIndex = /* @__PURE__ */ new Map(), this._replyRunsByInput = /* @__PURE__ */ new Map(), this._seqCounter = 0, this._structuralVersion = 0, this._siblingCache = /* @__PURE__ */ new Map(), this._siblingCacheVersion = -1, this._codec = e, this._logger = t, this._emitter = new w(t);
+		this._nodeIndex = /* @__PURE__ */ new Map(), this._codecMessageIdToNodeKey = /* @__PURE__ */ new Map(), this._sortedNodes = [], this._parentIndex = /* @__PURE__ */ new Map(), this._replyRunsByInput = /* @__PURE__ */ new Map(), this._seqCounter = 0, this._structuralVersion = 0, this._siblingCache = /* @__PURE__ */ new Map(), this._siblingCacheVersion = -1, this._eventIdIndex = /* @__PURE__ */ new Map(), this._clock = 0, this._sweepQueue = [], this._codec = e, this._logger = t, this._emitter = new P(t);
 	}
 	_compareNodes(e, t) {
-		let n = P(e.node), r = P(t.node);
+		let n = V(e.node), r = V(t.node);
 		return n === void 0 && r === void 0 ? e.insertSeq - t.insertSeq : n === void 0 ? 1 : r === void 0 || n < r ? -1 : n > r ? 1 : e.insertSeq - t.insertSeq;
 	}
 	_insertSortedNode(e) {
-		if (P(e.node) === void 0) {
+		if (V(e.node) === void 0) {
 			this._sortedNodes.push(e);
 			return;
 		}
@@ -208,28 +302,94 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 			});
 		} catch (t) {
 			this._logger.error("Tree._foldInto(); fold threw", {
-				key: N(e.node),
+				key: B(e.node),
 				messageId: r,
 				err: t
 			});
 		}
 	}
+	_recordAndFold(e, t, n, r, i, a) {
+		if (n === void 0 || t.length === 0) {
+			n === void 0 && t.length > 0 && (e.optimistic = !0), this._foldInto(e, t, n, r);
+			return;
+		}
+		let o = e.log.record(n, r, t, i, a);
+		if (o === "dropped") {
+			this._logger.debug("Tree._recordAndFold(); version guard dropped re-delivered wire", {
+				key: B(e.node),
+				serial: n,
+				version: i,
+				swept: e.log.swept
+			});
+			return;
+		}
+		if (e.optimistic && !e.log.swept) {
+			e.optimistic = !1, this._refold(e);
+			return;
+		}
+		if (o === "refold") {
+			this._refold(e);
+			return;
+		}
+		e.log.swept && this._logger.warn("Tree._recordAndFold(); late wire after log retention window; folding in arrival order", {
+			key: B(e.node),
+			serial: n
+		}), this._foldInto(e, t, n, r);
+	}
+	_refold(e) {
+		let t = this._codec.init();
+		e.log.replay((n, r, i) => {
+			try {
+				t = this._codec.fold(t, n, {
+					serial: r,
+					messageId: i
+				});
+			} catch (t) {
+				this._logger.error("Tree._refold(); fold threw", {
+					key: B(e.node),
+					messageId: i,
+					err: t
+				});
+			}
+		}), e.node.projection = t;
+	}
+	_recordActivity(e, t) {
+		t !== void 0 && (t > e.lastActivityTs && (e.lastActivityTs = t), t > this._clock && (this._clock = t, this._drainSweepQueue()));
+	}
+	_maybeQueueSweep(e) {
+		let t = e.node;
+		t.kind === "run" && (e.log.swept || e.sweepQueued || e.runStartSeen && (t.state.status === "active" || t.state.status === "suspended" || (e.sweepQueued = !0, this._sweepQueue.push(t.runId))));
+	}
+	_drainSweepQueue() {
+		for (; this._sweepQueue.length > 0;) {
+			let e = this._sweepQueue[0], t = e === void 0 ? void 0 : this._nodeIndex.get(e);
+			if (!t || t.log.swept) {
+				this._sweepQueue.shift();
+				continue;
+			}
+			if (t.lastActivityTs + 12e4 >= this._clock) return;
+			this._sweepQueue.shift(), t.sweepQueued = !1, t.log.sweep(), this._logger.debug("Tree._drainSweepQueue(); dropped event-log payloads, kept replay keys", {
+				key: e,
+				lastActivityTs: t.lastActivityTs
+			});
+		}
+	}
 	_addToParentIndex(e, t) {
-		F(this._parentIndex, e, t);
+		H(this._parentIndex, e, t);
 	}
 	_removeFromParentIndex(e, t) {
-		I(this._parentIndex, e, t);
+		U(this._parentIndex, e, t);
 	}
 	_parentKeyOf(e) {
 		let t = e.parentCodecMessageId;
 		return t === void 0 ? void 0 : this._codecMessageIdToNodeKey.get(t);
 	}
 	_inputGroupRoot(e) {
-		let t = e, n = new Set([N(t)]);
+		let t = e, n = new Set([B(t)]);
 		for (; t.forkOf !== void 0 && !n.has(t.forkOf);) {
 			let e = this._nodeIndex.get(t.forkOf);
 			if (e?.node.kind !== "input" || e.node.parentCodecMessageId !== t.parentCodecMessageId) break;
-			t = e.node, n.add(N(t));
+			t = e.node, n.add(B(t));
 		}
 		return t;
 	}
@@ -247,47 +407,47 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 			t && this._isSiblingOf(t.node, r) && a.push(t);
 		}
 		a.sort((e, t) => this._compareNodes(e, t));
-		for (let e of a) this._siblingCache.set(N(e.node), a);
+		for (let e of a) this._siblingCache.set(B(e.node), a);
 		return this._siblingCache.set(e, a), a;
 	}
 	_isSiblingOf(e, t) {
 		if (e.kind !== t.kind || e.parentCodecMessageId !== t.parentCodecMessageId) return !1;
 		if (e.kind === "run") return !0;
-		let n = N(t);
-		if (N(e) === n) return !0;
-		let r = e, i = new Set([N(r)]);
+		let n = B(t);
+		if (B(e) === n) return !0;
+		let r = e, i = new Set([B(r)]);
 		for (; r.kind === "input" && r.forkOf !== void 0;) {
 			if (r.forkOf === n) return !0;
 			if (i.has(r.forkOf)) break;
 			let e = this._nodeIndex.get(r.forkOf);
 			if (!e) break;
-			r = e.node, i.add(N(r));
+			r = e.node, i.add(B(r));
 		}
 		return !1;
 	}
 	getGroupRoot(e) {
 		let t = this._nodeIndex.get(e);
 		if (!t) return e;
-		if (t.node.kind === "input") return N(this._inputGroupRoot(t.node));
+		if (t.node.kind === "input") return B(this._inputGroupRoot(t.node));
 		let n = this._getSiblingGroup(e)[0]?.node;
-		return n ? N(n) : e;
+		return n ? B(n) : e;
 	}
 	visibleNodes(e = /* @__PURE__ */ new Map()) {
 		this._logger.trace("DefaultTree.visibleNodes();");
 		let t = [], n = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Map();
 		for (let i of this._sortedNodes) {
-			let a = i.node, o = N(a), s = this._parentKeyOf(a);
+			let a = i.node, o = B(a), s = this._parentKeyOf(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 !== void 0 && c.some((e) => N(e.node) === i)) n = i;
+					if (i !== void 0 && c.some((e) => B(e.node) === i)) n = i;
 					else {
 						let e = c.at(-1);
 						if (!e) break;
-						n = N(e.node);
+						n = B(e.node);
 					}
 					r.set(t, n);
 				}
@@ -323,23 +483,23 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 	getSiblingNodes(e) {
 		return this._logger.trace("DefaultTree.getSiblingNodes();", { key: e }), this._getSiblingGroup(e).map((e) => e.node);
 	}
-	applyMessage(e, t, n) {
-		let r = t[d], i = t[m], a = r === void 0 && i !== void 0 && t.role === "user" && e.inputs.length > 0 ? i : void 0;
-		if (r === void 0 && a === void 0) {
+	applyMessage(e, t, n, r, i) {
+		let a = t[w], o = t[D], s = a === void 0 && o !== void 0 && t.role === "user" && e.inputs.length > 0 ? o : void 0;
+		if (a === void 0 && s === void 0) {
 			this._logger.warn("Tree.applyMessage(); message has no run-id and is not a user input; skipping");
 			return;
 		}
-		let o = [...e.inputs, ...e.outputs], s = a ?? r;
-		if (o.length === 0 && s !== void 0 && !this._nodeIndex.has(s)) return;
-		let c = this._structuralVersion;
-		a === void 0 ? r !== void 0 && this._applyRunMessage(r, e, t, n) : this._applyInputMessage(a, t, n, o), this._structuralVersion !== c && this._emitter.emit("update");
-	}
-	_applyInputMessage(e, t, n, r) {
-		let i = this._nodeIndex.get(e);
-		i ? i.node.kind === "input" && n && !i.node.serial && (this._logger.debug("Tree.applyMessage(); promoting input serial", {
+		let c = z(e), l = s ?? a;
+		if (c.length === 0 && l !== void 0 && !this._nodeIndex.has(l)) return;
+		let u = this._structuralVersion;
+		s === void 0 ? a !== void 0 && this._applyRunMessage(a, e, t, n, r, i) : this._applyInputMessage(s, t, n, r, i, c), this._structuralVersion !== u && this._emitter.emit("update");
+	}
+	_applyInputMessage(e, t, n, r, i, a) {
+		let o = this._nodeIndex.get(e);
+		o ? o.node.kind === "input" && n && !o.node.serial && (this._logger.debug("Tree.applyMessage(); promoting input serial", {
 			codecMessageId: e,
 			serial: n
-		}), i.node.serial = n, this._promoteSerial(i)) : (i = this._createInputNodeFromHeaders(e, t, n), this._insertNode(e, i, i.node.parentCodecMessageId), this._codecMessageIdToNodeKey.set(e, e), this._logger.debug("Tree.applyMessage(); created input node", { codecMessageId: e })), this._foldInto(i, r, n, e), this._emitter.emit("output", {
+		}), o.node.serial = n, this._promoteSerial(o)) : (o = this._createInputNodeFromHeaders(e, t, n), this._insertNode(e, o, o.node.parentCodecMessageId), this._codecMessageIdToNodeKey.set(e, e), this._logger.debug("Tree.applyMessage(); created input node", { codecMessageId: e })), this._recordActivity(o, r), this._recordAndFold(o, a, n, e, i, t[S] === "true"), this._emitter.emit("output", {
 			runId: void 0,
 			inputCodecMessageId: e,
 			codecMessageId: e,
@@ -347,27 +507,27 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 			events: []
 		});
 	}
-	_applyRunMessage(e, t, n, r) {
-		let i = n[m], a = n[x], o = [...t.inputs, ...t.outputs], s = t.outputs, c = this._nodeIndex.get(e);
-		if (!c && i !== void 0) {
-			let e = this._codecMessageIdToNodeKey.get(i), t = e === void 0 ? void 0 : this._nodeIndex.get(e);
-			t?.node.kind === "run" && t.node.startSerial === void 0 && (c = t);
+	_applyRunMessage(e, t, n, r, i, a) {
+		let o = n[D], s = n[M], c = z(t), l = t.outputs, u = this._nodeIndex.get(e);
+		if (!u && o !== void 0) {
+			let e = this._codecMessageIdToNodeKey.get(o), t = e === void 0 ? void 0 : this._nodeIndex.get(e);
+			t?.node.kind === "run" && t.node.startSerial === void 0 && (u = t);
 		}
-		c ? r && c.node.kind === "run" && !c.node.startSerial && (this._logger.debug("Tree.applyMessage(); promoting startSerial", {
+		u ? r && u.node.kind === "run" && !u.node.startSerial && (this._logger.debug("Tree.applyMessage(); promoting startSerial", {
 			runId: e,
 			serial: r
-		}), c.node.startSerial = r, this._promoteSerial(c)) : (c = this._createRunFromHeaders(e, n, r), this._insertNode(e, c, c.node.parentCodecMessageId), this._indexReplyRun(c.node, e), this._logger.debug("Tree.applyMessage(); created new Run", { runId: e }));
-		let l = N(c.node);
-		i && this._codecMessageIdToNodeKey.set(i, l), this._foldInto(c, o, r, i), this._emitter.emit("output", {
-			runId: l,
-			inputCodecMessageId: a,
-			codecMessageId: i,
+		}), u.node.startSerial = r, this._promoteSerial(u)) : (u = this._createRunFromHeaders(e, n, r), this._insertNode(e, u, u.node.parentCodecMessageId), this._indexReplyRun(u.node, e), this._logger.debug("Tree.applyMessage(); created new Run", { runId: e }));
+		let d = B(u.node);
+		o && this._codecMessageIdToNodeKey.set(o, d), this._recordActivity(u, i), this._recordAndFold(u, c, r, o, a, n[S] === "true"), this._emitter.emit("output", {
+			runId: d,
+			inputCodecMessageId: s,
+			codecMessageId: o,
 			serial: r,
-			events: s
+			events: l
 		});
 	}
 	_indexReplyRun(e, t) {
-		e.parentCodecMessageId !== void 0 && F(this._replyRunsByInput, e.parentCodecMessageId, t);
+		e.parentCodecMessageId !== void 0 && H(this._replyRunsByInput, e.parentCodecMessageId, t);
 	}
 	applyRunLifecycle(e) {
 		this._logger.trace("DefaultTree.applyRunLifecycle();", {
@@ -395,75 +555,85 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 		let t = this._nodeIndex.get(e.runId);
 		if (t?.node.kind === "run") {
 			let n = t.node;
-			if (n.status !== "active" && (n.status = "active"), e.serial && !n.startSerial && (n.startSerial = e.serial, this._promoteSerial(t)), n.parentCodecMessageId === void 0 && e.parent !== void 0 && (n.parentCodecMessageId = e.parent, this._removeFromParentIndex(void 0, e.runId), this._addToParentIndex(n.parentCodecMessageId, e.runId), this._indexReplyRun(n, e.runId), this._structuralVersion++), n.forkOf === void 0 && e.forkOf !== void 0) {
+			if (n.state.status === "suspended" && (n.state = { status: "active" }), e.serial && !n.startSerial && (n.startSerial = e.serial, this._promoteSerial(t)), n.parentCodecMessageId === void 0 && e.parent !== void 0 && (n.parentCodecMessageId = e.parent, this._removeFromParentIndex(void 0, e.runId), this._addToParentIndex(n.parentCodecMessageId, e.runId), this._indexReplyRun(n, e.runId), this._structuralVersion++), n.forkOf === void 0 && e.forkOf !== void 0) {
 				let t = this._codecMessageIdToNodeKey.get(e.forkOf);
 				t !== void 0 && t !== e.runId && (n.forkOf = t, this._structuralVersion++);
 			}
-			n.regeneratesCodecMessageId === void 0 && e.regenerates !== void 0 && (n.regeneratesCodecMessageId = e.regenerates, this._structuralVersion++), n.invocationId === "" && e.invocationId !== "" && (n.invocationId = e.invocationId);
+			n.regeneratesCodecMessageId === void 0 && e.regenerates !== void 0 && (n.regeneratesCodecMessageId = e.regenerates, this._structuralVersion++), n.invocationId === "" && e.invocationId !== "" && (n.invocationId = e.invocationId), t.runStartSeen = !0, this._recordActivity(t, e.timestamp), this._maybeQueueSweep(t);
 		} else if (!t) {
 			let t = this._createRunFromLifecycle(e);
-			this._insertNode(e.runId, t, t.node.parentCodecMessageId), this._indexReplyRun(t.node, e.runId);
+			this._insertNode(e.runId, t, t.node.parentCodecMessageId), this._indexReplyRun(t.node, e.runId), this._recordActivity(t, e.timestamp);
 		}
 	}
 	_applyRunSuspend(e) {
 		let t = this._nodeIndex.get(e.runId);
-		t?.node.kind === "run" && (t.node.status = "suspended", t.node.endSerial = e.serial);
+		t?.node.kind === "run" && (t.node.state = { status: "suspended" }, t.node.endSerial = e.serial, this._recordActivity(t, e.timestamp));
 	}
 	_applyRunResume(e) {
 		let t = this._nodeIndex.get(e.runId);
-		t?.node.kind === "run" && t.node.status === "suspended" && (t.node.status = "active");
+		t?.node.kind === "run" && t.node.state.status === "suspended" && (t.node.state = { status: "active" }, this._recordActivity(t, e.timestamp));
 	}
 	_applyRunEnd(e) {
 		let t = this._nodeIndex.get(e.runId);
-		t?.node.kind === "run" && (t.node.status = e.reason, t.node.endSerial = e.serial);
+		t?.node.kind === "run" && (t.node.state = e.reason === "error" ? {
+			status: "error",
+			error: e.error
+		} : { status: e.reason }, t.node.endSerial = e.serial, this._recordActivity(t, e.timestamp), this._maybeQueueSweep(t));
 	}
 	delete(e) {
 		let t = this._nodeIndex.get(e);
-		t && (this._logger.debug("Tree.delete();", { key: e }), this._removeFromParentIndex(t.node.parentCodecMessageId, e), this._removeSortedNode(t), this._nodeIndex.delete(e), t.node.kind === "run" && t.node.parentCodecMessageId !== void 0 && I(this._replyRunsByInput, t.node.parentCodecMessageId, e), this._structuralVersion++, this._emitter.emit("update"));
+		t && (this._logger.debug("Tree.delete();", { key: e }), this._removeFromParentIndex(t.node.parentCodecMessageId, e), this._removeSortedNode(t), this._nodeIndex.delete(e), t.node.kind === "run" && t.node.parentCodecMessageId !== void 0 && U(this._replyRunsByInput, t.node.parentCodecMessageId, e), this._structuralVersion++, this._emitter.emit("update"));
 	}
 	_createRunFromHeaders(e, t, n) {
-		let r = t[y];
+		let r = t[A];
 		return this._buildRunNode({
 			runId: e,
-			parentCodecMessageId: t[v],
+			parentCodecMessageId: t[k],
 			forkOf: r ? this._codecMessageIdToNodeKey.get(r) : void 0,
-			regeneratesCodecMessageId: t[b],
+			regeneratesCodecMessageId: t[j],
 			clientId: t["run-client-id"] ?? "",
 			invocationId: t["invocation-id"] ?? "",
-			startSerial: n
+			startSerial: n,
+			runStartSeen: !1
 		});
 	}
-	_buildRunNode(e) {
+	_wrapNode(e, t = !1) {
 		return {
-			node: {
-				kind: "run",
-				runId: e.runId,
-				parentCodecMessageId: e.parentCodecMessageId,
-				forkOf: e.forkOf,
-				regeneratesCodecMessageId: e.regeneratesCodecMessageId,
-				clientId: e.clientId,
-				invocationId: e.invocationId,
-				status: "active",
-				projection: this._codec.init(),
-				startSerial: e.startSerial,
-				endSerial: void 0
-			},
-			insertSeq: this._seqCounter++
+			node: e,
+			insertSeq: this._seqCounter++,
+			log: new Se(),
+			lastActivityTs: 0,
+			runStartSeen: t,
+			sweepQueued: !1,
+			optimistic: !1
+		};
+	}
+	_buildRunNode(e) {
+		let t = {
+			kind: "run",
+			runId: e.runId,
+			parentCodecMessageId: e.parentCodecMessageId,
+			forkOf: e.forkOf,
+			regeneratesCodecMessageId: e.regeneratesCodecMessageId,
+			clientId: e.clientId,
+			invocationId: e.invocationId,
+			state: { status: "active" },
+			projection: this._codec.init(),
+			startSerial: e.startSerial,
+			endSerial: void 0
 		};
+		return this._wrapNode(t, e.runStartSeen);
 	}
 	_createInputNodeFromHeaders(e, t, n) {
-		let r = t[y];
-		return {
-			node: {
-				kind: "input",
-				codecMessageId: e,
-				parentCodecMessageId: t[v],
-				forkOf: r,
-				projection: this._codec.init(),
-				serial: n
-			},
-			insertSeq: this._seqCounter++
+		let r = t[A], i = {
+			kind: "input",
+			codecMessageId: e,
+			parentCodecMessageId: t[k],
+			forkOf: r,
+			projection: this._codec.init(),
+			serial: n
 		};
+		return this._wrapNode(i);
 	}
 	_createRunFromLifecycle(e) {
 		let t = e.forkOf;
@@ -474,7 +644,8 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 			regeneratesCodecMessageId: e.regenerates,
 			clientId: e.clientId,
 			invocationId: e.invocationId,
-			startSerial: e.serial
+			startSerial: e.serial,
+			runStartSeen: !0
 		});
 	}
 	on(e, t) {
@@ -484,66 +655,125 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 		};
 	}
 	emitAblyMessage(e) {
-		this._logger.trace("DefaultTree.emitAblyMessage();"), this._emitter.emit("ably-message", e);
+		this._logger.trace("DefaultTree.emitAblyMessage();");
+		let t = L(e)[E];
+		t !== void 0 && !this._eventIdIndex.has(t) && this._eventIdIndex.set(t, e), this._emitter.emit("ably-message", e);
+	}
+	findAblyMessageByEventId(e) {
+		return this._eventIdIndex.get(e);
+	}
+}, we = (e, t) => new Ce(e, t), Te = (t, n) => new Promise((r, i) => {
+	if (n?.aborted) {
+		i(new e.ErrorInfo("unable to wait; signal aborted", N.InvalidArgument, 400));
+		return;
+	}
+	let a = setTimeout(() => {
+		n?.removeEventListener("abort", o), r();
+	}, t);
+	typeof a == "object" && a.unref();
+	let o = () => {
+		clearTimeout(a), i(new e.ErrorInfo("unable to wait; signal aborted", N.InvalidArgument, 400));
+	};
+	n?.addEventListener("abort", o, { once: !0 });
+}), Ee = async (t, n, r, i, a) => {
+	let o;
+	for (let s = 0; s <= n; s++) {
+		if (i?.aborted) throw new e.ErrorInfo("unable to fetch history page; signal aborted", N.InvalidArgument, 400, I(o));
+		try {
+			return await t();
+		} catch (e) {
+			if (o = e, s === n) break;
+			let t = r * 2 ** s;
+			a?.debug("loadHistoryPages.fetchPageWithRetry(); page fetch failed, retrying", {
+				attempt: s + 1,
+				maxRetries: n,
+				backoff: t
+			}), await Te(t, i);
+		}
 	}
-}, R = (e, t) => new L(e, t), z = (e, t) => {
+	throw new e.ErrorInfo(`unable to fetch history page; ${F(o)}`, N.HistoryFetchFailed, 500, I(o));
+}, De = async (t, n) => {
+	let { pageLimit: r, untilAttach: i = !0, signal: a, maxRetries: o = 3, retryBackoffMs: s = 100, logger: c } = n;
+	if (a?.aborted) throw new e.ErrorInfo("unable to load history; signal aborted", N.InvalidArgument, 400);
+	await t.attach();
+	let l = {
+		limit: r,
+		untilAttach: i
+	}, u = await Ee(() => t.history(l), o, s, a, c), d = !1;
+	return {
+		hasNext: () => u === void 0 || a?.aborted ? !1 : d ? u.hasNext() : !0,
+		next: async () => {
+			if (u === void 0) return;
+			if (a?.aborted) throw new e.ErrorInfo("unable to load history; signal aborted", N.InvalidArgument, 400);
+			if (!d) return d = !0, u.items;
+			if (!u.hasNext()) {
+				u = void 0;
+				return;
+			}
+			let t = await Ee(async () => await u?.next() ?? void 0, o, s, a, c);
+			if (!t) {
+				u = void 0;
+				return;
+			}
+			return u = t, t.items;
+		}
+	};
+}, Oe = (e, t) => {
 	for (let n of t) {
-		let t = D(n), r = t[m];
+		let t = L(n), r = t[D];
 		if (!r) continue;
-		let i = n.action, a = i === "message.create" && "discrete" in t, o = t.stream === "true" && (i === "message.create" || i === "message.update" || i === "message.append"), s = t[u], c = s === "complete" || s === "cancelled";
+		let i = n.action, a = i === "message.create" && "discrete" in t, o = t.stream === "true" && (i === "message.create" || i === "message.update" || i === "message.append"), s = t[C], c = s === "complete" || s === "cancelled";
 		(a || o) && e.startedCodecMessageIds.add(r), (a || c) && e.terminatedCodecMessageIds.add(r), e.startedCodecMessageIds.has(r) && e.terminatedCodecMessageIds.has(r) && e.completedCodecMessageIds.add(r);
 	}
-}, B = async (e, t, n) => {
-	e.rawMessages.push(...t.items), e.lastAblyPage = t, z(e, t.items);
-	let r = e.returnedCount + n;
-	for (; e.completedCodecMessageIds.size < r && t.hasNext();) {
-		e.logger.debug("loadHistory.fetchUntilLimit(); fetching next page", {
+}, W = async (e, t) => {
+	let n = e.returnedCount + t;
+	for (; e.completedCodecMessageIds.size < n && e.cursor.hasNext();) {
+		e.logger.debug("loadHistory.fetchUntilLimit(); pulling next page", {
 			collected: e.rawMessages.length,
 			completed: e.completedCodecMessageIds.size
 		});
-		let n = await t.next();
-		if (!n) break;
-		t = n, e.rawMessages.push(...n.items), e.lastAblyPage = n, z(e, n.items);
+		let t = await e.cursor.next();
+		if (!t) break;
+		e.rawMessages.push(...t), Oe(e, t);
 	}
-}, V = (e, t) => {
+}, G = (e, t) => {
 	let n = e.completedCodecMessageIds.size, r = Math.min(t, Math.max(0, n - e.returnedCount));
 	e.returnedCount += r;
-	let i = n > e.returnedCount, a = e.lastAblyPage?.hasNext() ?? !1, o = e.rawMessages.length - e.returnedRawCount > 0 ? e.rawMessages.slice(e.returnedRawCount).toReversed() : [];
+	let i = n > e.returnedCount, a = e.cursor.hasNext(), o = e.rawMessages.length - e.returnedRawCount > 0 ? e.rawMessages.slice(e.returnedRawCount).toReversed() : [];
 	return e.returnedRawCount = e.rawMessages.length, {
 		rawMessages: o,
 		hasNext: () => i || a,
 		next: async () => {
-			if (i) return V(e, t);
-			if (!a || !e.lastAblyPage) return;
-			let n = await e.lastAblyPage.next();
-			if (n) return await B(e, n, t), V(e, t);
+			if (i) return G(e, t);
+			if (a) return await W(e, t), G(e, t);
 		}
 	};
-}, H = async (e, t, n) => {
-	let r = t?.limit ?? 100, i = {
+}, ke = async (e, t, n) => {
+	let r = t?.limit ?? 100;
+	n.trace("loadHistory();", { limit: r });
+	let i = {
+		cursor: await De(e, {
+			pageLimit: r * 10,
+			untilAttach: !0,
+			logger: n
+		}),
 		rawMessages: [],
 		returnedCount: 0,
 		returnedRawCount: 0,
-		lastAblyPage: void 0,
 		startedCodecMessageIds: /* @__PURE__ */ new Set(),
 		terminatedCodecMessageIds: /* @__PURE__ */ new Set(),
 		completedCodecMessageIds: /* @__PURE__ */ new Set(),
 		logger: n
 	};
-	n.trace("loadHistory();", { limit: r });
-	let a = r * 10;
-	return await e.attach(), await B(i, await e.history({
-		untilAttach: !0,
-		limit: a
-	}), r), V(i, r);
-}, de = (e) => Array.isArray(e) ? e : [e], fe = 3, U = (e) => ({
+	return await W(i, r), G(i, r);
+}, Ae = (e) => Array.isArray(e) ? e : [e], K = (e) => ({
 	runId: e.runId,
 	clientId: e.clientId,
-	status: e.status,
-	invocationId: e.invocationId
-}), pe = class {
+	invocationId: e.invocationId,
+	...e.state
+}), je = class {
 	constructor(e) {
-		this._branchSelections = /* @__PURE__ */ new Map(), this._regenSelections = /* @__PURE__ */ new Map(), this._withheldRunIds = /* @__PURE__ */ new Set(), this._lastVisibleNodeKeys = [], this._lastVisibleProjections = [], this._lastVisibleMessagePairs = [], this._lastVisibleNodeKeySet = /* @__PURE__ */ new Set(), this._hasMoreHistory = !1, this._withheldBuffer = [], this._unsubs = [], this._cachedNodes = [], 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 w(this._logger), this._cachedNodes = this._computeFlatNodes(), this._updateVisibleSnapshot(this._cachedNodes), this._unsubs.push(this._tree.on("update", () => {
+		this._branchSelections = /* @__PURE__ */ new Map(), this._regenSelections = /* @__PURE__ */ new Map(), this._nonHeadRegenSelections = /* @__PURE__ */ new Map(), this._withheldRunIds = /* @__PURE__ */ new Set(), this._lastVisibleNodeKeys = [], this._lastVisibleProjections = [], this._lastVisibleMessagePairs = [], this._lastVisibleNodeKeySet = /* @__PURE__ */ new Set(), this._hasMoreHistory = !1, this._withheldBuffer = [], this._hiddenMessageCount = 0, this._unsubs = [], this._cachedNodes = [], this._loadingOlder = !1, this._processingHistory = !1, this._closed = !1, this._tree = e.tree, this._channel = e.channel, this._codec = e.codec, this._applier = e.applier, this._sendDelegate = e.sendDelegate, this._onClose = e.onClose, this._logger = e.logger.withContext({ component: "View" }), this._logger.trace("DefaultView();"), this._emitter = new P(this._logger), this._cachedNodes = this._computeFlatNodes(), this._updateVisibleSnapshot(this._cachedNodes), this._unsubs.push(this._tree.on("update", () => {
 			this._onTreeUpdate();
 		}), this._tree.on("ably-message", (e) => {
 			this._onTreeAblyMessage(e);
@@ -554,17 +784,17 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 		}));
 	}
 	_onTreeOutput(e) {
-		this._processingHistory || (e.runId !== void 0 && this._lastVisibleNodeKeySet.has(e.runId) || e.inputCodecMessageId !== void 0 && this._lastVisibleNodeKeySet.has(e.inputCodecMessageId)) && (this._lastVisibleProjections = this._cachedNodes.map((e) => e.projection), this._lastVisibleMessagePairs = this._extractMessages(this._cachedNodes), this._emitter.emit("update"));
+		this._processingHistory || (e.runId !== void 0 && this._lastVisibleNodeKeySet.has(e.runId) || e.inputCodecMessageId !== void 0 && this._lastVisibleNodeKeySet.has(e.inputCodecMessageId)) && (this._lastVisibleProjections = this._cachedNodes.map((e) => e.projection), this._lastVisibleMessagePairs = this._extractMessages(this._cachedNodes).slice(this._hiddenMessageCount), this._emitter.emit("update"));
 	}
 	getMessages() {
 		return this._lastVisibleMessagePairs;
 	}
 	runs() {
-		return this._cachedNodes.filter((e) => e.kind === "run").map((e) => U(e));
+		return this._cachedNodes.filter((e) => e.kind === "run").map((e) => K(e));
 	}
 	_computeFlatNodes() {
 		let e = this._treeVisibleNodes();
-		return this._withheldRunIds.size === 0 ? e : e.filter((e) => !this._withheldRunIds.has(N(e)));
+		return this._withheldRunIds.size === 0 ? e : e.filter((e) => !this._withheldRunIds.has(B(e)));
 	}
 	_recomputeAndEmit() {
 		this._cachedNodes = this._computeFlatNodes(), this._updateVisibleSnapshot(this._cachedNodes), this._emitter.emit("update");
@@ -577,38 +807,64 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 		let t = this._tree.getNodeByCodecMessageId(e);
 		return t?.kind === "run" ? t : void 0;
 	}
+	_nonHeadRegenerators(e, t) {
+		return this._tree.getReplyRuns(t).filter((t) => t.regeneratesCodecMessageId === e).toSorted((e, t) => (e.startSerial ?? "￿").localeCompare(t.startSerial ?? "￿"));
+	}
+	_selectedNonHeadMember(e, t, n) {
+		let r = this._nonHeadRegenSelections.get(e);
+		return r && r.kind !== "pending" && [t, ...n.map((e) => e.runId)].includes(r.selectedRunId) ? r.selectedRunId : n.at(-1)?.runId ?? t;
+	}
 	_extractMessages(e) {
-		let t = [];
-		for (let n of e) for (let e of this._codec.getMessages(n.projection)) t.push(e);
+		let t = [], n = /* @__PURE__ */ new Set();
+		for (let r of e) r.kind === "run" && n.has(r.runId) || this._emitNodeMessages(r, t, n);
 		return t;
 	}
+	_emitNodeMessages(e, t, n) {
+		let r = this._codec.getMessages(e.projection);
+		if (e.kind !== "run") {
+			t.push(...r);
+			return;
+		}
+		for (let i = 0; i < r.length; i++) {
+			let a = r[i];
+			if (!a) continue;
+			let o = i > 0 ? r[i - 1]?.codecMessageId : void 0;
+			if (o !== void 0) {
+				let r = this._nonHeadRegenerators(a.codecMessageId, o);
+				if (r.length > 0) {
+					for (let e of r) n.add(e.runId);
+					let i = this._selectedNonHeadMember(a.codecMessageId, e.runId, r);
+					if (i !== e.runId) {
+						let e = r.find((e) => e.runId === i);
+						if (e) {
+							this._emitNodeMessages(e, t, n);
+							return;
+						}
+					}
+				}
+			}
+			t.push(a);
+		}
+	}
 	hasOlder() {
-		return this._withheldBuffer.length > 0 || this._hasMoreHistory;
+		return this._hiddenMessageCount > 0 || this._withheldBuffer.length > 0 || this._hasMoreHistory;
 	}
-	async loadOlder(e = 100) {
+	async loadOlder(e = 10) {
 		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;
+				if (this._hiddenMessageCount >= e) {
+					this._hiddenMessageCount -= e, this._recomputeAndEmit();
 					return;
 				}
-				let t = await this._lastHistoryPage.next();
-				if (this._closed || !t) {
-					t || (this._hasMoreHistory = !1);
-					return;
+				let t = e - this._hiddenMessageCount, n = this._extractMessages(this._computeFlatNodes()).length, r = () => this._extractMessages(this._computeFlatNodes()).length - n;
+				if (this._withheldBuffer.length > 0) {
+					let e = this._messageTailSplitIndex(this._withheldBuffer, t), n = this._withheldBuffer.splice(e);
+					this._releaseWithheld(n);
 				}
-				await this._revealFromPage(t, e);
+				if (r() < t && (await this._fetchOlder(t - r()), this._closed)) return;
+				let i = this._extractMessages(this._computeFlatNodes()).length;
+				this._hiddenMessageCount = Math.max(0, this._hiddenMessageCount + (i - n) - e), this._recomputeAndEmit();
 			} catch (e) {
 				throw this._logger.error("DefaultView.loadOlder(); failed", { error: e }), e;
 			} finally {
@@ -616,13 +872,38 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 			}
 		}
 	}
+	async _fetchOlder(e) {
+		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._revealFromPage(t, e);
+	}
+	_messageTailSplitIndex(e, t) {
+		let n = 0;
+		for (let r = e.length - 1; r >= 0; r--) {
+			let i = e[r];
+			if (i && (n += this._codec.getMessages(i.projection).length, n >= t)) return r;
+		}
+		return 0;
+	}
 	runOf(e) {
 		this._logger.trace("DefaultView.runOf();", { codecMessageId: e });
 		let t = this._tree.getNodeByCodecMessageId(e);
 		if (!t) return;
-		if (t.kind === "run") return U(t);
+		if (t.kind === "run") return K(t);
 		let n = this._selectedReplyRun(t.codecMessageId);
-		return n ? U(n) : void 0;
+		return n ? K(n) : void 0;
 	}
 	_selectedReplyRun(e) {
 		let t = this._tree.getReplyRuns(e);
@@ -638,14 +919,16 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 	run(e) {
 		this._logger.trace("DefaultView.run();", { runId: e });
 		let t = this._tree.getRunNode(e);
-		return t ? U(t) : void 0;
+		return t ? K(t) : void 0;
 	}
 	branchSelection(e) {
 		let t = this._resolveMessageBranchPoint(e);
 		if (t) {
-			let e = t.siblings.flatMap((e) => {
-				let t = this._codec.getMessages(e.projection).at(0);
-				return t ? [t.message] : [];
+			let e = t.members.flatMap((e) => {
+				let t = this._tree.getNodeByCodecMessageId(e.representativeCodecMessageId);
+				if (!t) return [];
+				let n = this._codec.getMessages(t.projection).find((t) => t.codecMessageId === e.representativeCodecMessageId);
+				return n ? [n.message] : [];
 			});
 			if (e.length > 0) {
 				let n = this._resolveSelectedIndex(t), r = Math.max(0, Math.min(n, e.length - 1)), i = e[r];
@@ -681,35 +964,43 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 		});
 		let n = this._resolveMessageBranchPoint(e);
 		if (!n) return;
-		let r = Math.max(0, Math.min(t, n.siblings.length - 1)), i = n.siblings[r];
+		let r = Math.max(0, Math.min(t, n.members.length - 1)), i = n.members[r];
 		i && (n.kind === "fork-of" ? (this._branchSelections.set(n.groupRoot, {
 			kind: "user",
-			selectedKey: N(i)
+			selectedKey: i.memberNodeKey
 		}), this._logger.debug("DefaultView.selectSibling(); fork-of", {
 			codecMessageId: e,
 			index: r,
-			selectedKey: N(i)
+			selectedKey: i.memberNodeKey
+		})) : n.kind === "non-head-regen" ? (this._nonHeadRegenSelections.set(n.groupRoot, {
+			kind: "user",
+			selectedRunId: i.memberNodeKey
+		}), this._logger.debug("DefaultView.selectSibling(); non-head-regen", {
+			codecMessageId: e,
+			index: r,
+			selectedRunId: i.memberNodeKey,
+			anchor: n.groupRoot
 		})) : (this._regenSelections.set(n.groupRoot, {
 			kind: "user",
-			selectedRunId: N(i)
+			selectedRunId: i.memberNodeKey
 		}), this._logger.debug("DefaultView.selectSibling(); regenerate", {
 			codecMessageId: e,
 			index: r,
-			selectedRunId: N(i),
+			selectedRunId: i.memberNodeKey,
 			groupRoot: n.groupRoot
 		})), this._recomputeAndEmit());
 	}
 	_resolveSelectedIndex(e) {
 		if (e.kind === "fork-of") {
 			let t = this._branchSelections.get(e.groupRoot);
-			if (!t) return e.siblings.length - 1;
-			let n = e.siblings.findIndex((e) => N(e) === t.selectedKey);
-			return n === -1 ? e.siblings.length - 1 : n;
+			if (!t) return e.members.length - 1;
+			let n = e.members.findIndex((e) => e.memberNodeKey === t.selectedKey);
+			return n === -1 ? e.members.length - 1 : n;
 		}
-		let t = this._regenSelections.get(e.groupRoot);
-		if (!t || t.kind === "pending") return e.siblings.length - 1;
-		let n = e.siblings.findIndex((e) => N(e) === t.selectedRunId);
-		return n === -1 ? e.siblings.length - 1 : n;
+		let t = e.kind === "non-head-regen" ? this._nonHeadRegenSelections.get(e.groupRoot) : this._regenSelections.get(e.groupRoot);
+		if (!t || t.kind === "pending") return e.members.length - 1;
+		let n = e.members.findIndex((e) => e.memberNodeKey === t.selectedRunId);
+		return n === -1 ? e.members.length - 1 : n;
 	}
 	_resolveMessageBranchPoint(e) {
 		let t = this._tree.getNodeByCodecMessageId(e);
@@ -719,19 +1010,64 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 			return e.length > 1 ? {
 				kind: "fork-of",
 				groupRoot: this._tree.getGroupRoot(t.codecMessageId),
-				siblings: e
+				members: this._nodeHeadMembers(e)
 			} : void 0;
 		}
-		let n = this._tree.getSiblingNodes(t.runId);
-		if (n.length > 1 && this._codec.getMessages(t.projection).at(0)?.codecMessageId === e) return {
+		let n = this._codec.getMessages(t.projection), r = this._resolveNonHeadBranchPoint(t, n, e);
+		if (r) return r;
+		let i = this._tree.getSiblingNodes(t.runId);
+		if (i.length > 1 && n.at(0)?.codecMessageId === e) return {
 			kind: "regen",
 			groupRoot: this._tree.getGroupRoot(t.runId),
-			siblings: n
+			members: this._nodeHeadMembers(i)
 		};
 	}
+	_resolveNonHeadBranchPoint(e, t, n) {
+		if (t.at(0)?.codecMessageId === n && e.regeneratesCodecMessageId !== void 0) {
+			let t = e.regeneratesCodecMessageId, n = this._runByCodecMessageId(t);
+			if (n) {
+				let e = this._codec.getMessages(n.projection), r = e.findIndex((e) => e.codecMessageId === t), i = r > 0 ? e[r - 1]?.codecMessageId : void 0;
+				if (i !== void 0) return this._buildNonHeadGroup(t, n.runId, i);
+			}
+			return;
+		}
+		let r = t.findIndex((e) => e.codecMessageId === n), i = r > 0 ? t[r - 1]?.codecMessageId : void 0;
+		if (i !== void 0) return this._buildNonHeadGroup(n, e.runId, i);
+	}
+	_buildNonHeadGroup(e, t, n) {
+		let r = this._nonHeadRegenerators(e, n);
+		if (r.length === 0) return;
+		let i = [{
+			memberNodeKey: t,
+			representativeCodecMessageId: e
+		}];
+		for (let e of r) {
+			let t = this._codec.getMessages(e.projection).at(0);
+			t && i.push({
+				memberNodeKey: e.runId,
+				representativeCodecMessageId: t.codecMessageId
+			});
+		}
+		return {
+			kind: "non-head-regen",
+			groupRoot: e,
+			members: i
+		};
+	}
+	_nodeHeadMembers(e) {
+		let t = [];
+		for (let n of e) {
+			let e = this._codec.getMessages(n.projection).at(0);
+			e && t.push({
+				memberNodeKey: B(n),
+				representativeCodecMessageId: e.codecMessageId
+			});
+		}
+		return t;
+	}
 	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 = de(t), i = this._lastVisibleMessagePairs.at(-1)?.codecMessageId, a = await this._sendDelegate(r, n, i);
+		if (this._logger.trace("DefaultView.send();"), this._closed) throw new e.ErrorInfo("unable to send; view is closed", N.InvalidArgument, 400);
+		let r = Ae(t), i = this._lastVisibleMessagePairs.at(-1)?.codecMessageId, a = await this._sendDelegate(r, n, i);
 		return this._applyForkAutoSelect(a, n), a;
 	}
 	_applyForkAutoSelect(e, t) {
@@ -747,6 +1083,16 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 	_applyRegenerateAutoSelect(e, t) {
 		let n = this._runByCodecMessageId(t);
 		if (!n) return;
+		if (this._codec.getMessages(n.projection).at(0)?.codecMessageId !== t) {
+			this._nonHeadRegenSelections.set(t, {
+				kind: "pending",
+				carrierCodecMessageId: e.inputCodecMessageId
+			}), this._logger.debug("DefaultView._applyRegenerateAutoSelect(); deferring non-head regenerate selection", {
+				anchorCodecMessageId: t,
+				carrier: e.inputCodecMessageId
+			}), this._resolvePendingNonHeadRegenSelections(), this._recomputeAndEmitIfChanged();
+			return;
+		}
 		let r = this._tree.getGroupRoot(n.runId);
 		this._regenSelections.set(r, {
 			kind: "pending",
@@ -758,11 +1104,11 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 		}), this._resolvePendingRegenSelections(), this._recomputeAndEmitIfChanged();
 	}
 	async regenerate(t, n) {
-		if (this._logger.trace("DefaultView.regenerate();", { messageId: t }), this._closed) throw new e.ErrorInfo("unable to regenerate; view is closed", C.InvalidArgument, 400);
+		if (this._logger.trace("DefaultView.regenerate();", { messageId: t }), this._closed) throw new e.ErrorInfo("unable to regenerate; view is closed", N.InvalidArgument, 400);
 		let r = this._runByCodecMessageId(t);
-		if (!r) throw new e.ErrorInfo(`unable to regenerate; message not found in tree: ${t}`, C.InvalidArgument, 400);
+		if (!r) throw new e.ErrorInfo(`unable to regenerate; message not found in tree: ${t}`, N.InvalidArgument, 400);
 		let i = this._findParentMsgId(r, t);
-		if (!i) throw new e.ErrorInfo(`unable to regenerate; parent user message not found for ${t}`, C.InvalidArgument, 400);
+		if (!i) throw new e.ErrorInfo(`unable to regenerate; parent user message not found for ${t}`, N.InvalidArgument, 400);
 		let a = t;
 		r.regeneratesCodecMessageId !== void 0 && this._codec.getMessages(r.projection).at(0)?.codecMessageId === t && (a = r.regeneratesCodecMessageId);
 		let o = {
@@ -772,9 +1118,9 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 		return this._applyRegenerateAutoSelect(c, a), c;
 	}
 	async edit(t, n, r) {
-		if (this._logger.trace("DefaultView.edit();", { messageId: t }), this._closed) throw new e.ErrorInfo("unable to edit; view is closed", C.InvalidArgument, 400);
+		if (this._logger.trace("DefaultView.edit();", { messageId: t }), this._closed) throw new e.ErrorInfo("unable to edit; view is closed", N.InvalidArgument, 400);
 		let i = this._tree.getNodeByCodecMessageId(t);
-		if (!i) throw new e.ErrorInfo(`unable to edit; message not found in tree: ${t}`, C.InvalidArgument, 400);
+		if (!i) throw new e.ErrorInfo(`unable to edit; message not found in tree: ${t}`, N.InvalidArgument, 400);
 		let a = this._findParentMsgId(i, t);
 		return this.send(n, {
 			...r,
@@ -803,35 +1149,26 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 		if (!this._closed) {
 			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._regenSelections.clear(), this._withheldRunIds.clear(), this._withheldBuffer.length = 0, this._onClose?.();
+			this._unsubs.length = 0, this._emitter.off(), this._branchSelections.clear(), this._regenSelections.clear(), this._nonHeadRegenSelections.clear(), this._withheldRunIds.clear(), this._withheldBuffer.length = 0, this._hiddenMessageCount = 0, this._onClose?.();
 		}
 	}
 	async _loadFirstPage(e) {
-		let t = e * fe, n = await H(this._channel, { limit: t }, this._logger);
-		this._closed || await this._revealFromPage(n, e);
+		let t = await ke(this._channel, { limit: e }, this._logger);
+		this._closed || await this._revealFromPage(t, e);
 	}
 	async _revealFromPage(e, t) {
-		let n = new Set(this._treeVisibleNodes().map((e) => N(e))), { newVisible: r, lastPage: i } = await this._loadUntilVisible(e, t, n);
+		let n = new Set(this._treeVisibleNodes().map((e) => B(e))), { newVisible: r, lastPage: i } = await this._loadUntilVisible(e, t, n);
 		this._closed || (this._lastHistoryPage = i, this._hasMoreHistory = i.hasNext(), this._splitReveal(r, t));
 	}
 	_splitReveal(e, t) {
-		let n = 0, r = e.length;
-		for (let i = e.length - 1; i >= 0; i--) {
-			if (e[i]?.kind === "run") {
-				if (n === t) break;
-				n++;
-			}
-			r = i;
-		}
-		let i = e.slice(r), a = e.slice(0, r);
-		for (let e of a) this._withheldRunIds.add(N(e));
-		this._withheldBuffer.push(...a), this._releaseWithheld(i);
+		let n = this._messageTailSplitIndex(e, t), r = e.slice(n), i = e.slice(0, n);
+		for (let e of i) this._withheldRunIds.add(B(e));
+		this._withheldBuffer.push(...i), this._releaseWithheld(r);
 	}
 	_processHistoryPage(e) {
 		this._processingHistory = !0;
 		try {
-			let t = this._codec.createDecoder();
-			for (let n of e.rawMessages) M(this._tree, t, n);
+			for (let t of e.rawMessages) this._applier.apply(t);
 			for (let t of e.rawMessages) this._tree.emitAblyMessage(t);
 		} finally {
 			this._processingHistory = !1;
@@ -841,7 +1178,7 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 		this._processHistoryPage(e);
 		let r = e, i = () => {
 			let e = 0;
-			for (let t of this._treeVisibleNodes()) t.kind === "run" && !n.has(N(t)) && e++;
+			for (let t of this._treeVisibleNodes()) n.has(B(t)) || (e += this._codec.getMessages(t.projection).length);
 			return e;
 		};
 		for (; i() < t && r.hasNext();) {
@@ -850,20 +1187,20 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 			this._processHistoryPage(e), r = e;
 		}
 		return {
-			newVisible: this._treeVisibleNodes().filter((e) => !n.has(N(e))),
+			newVisible: this._treeVisibleNodes().filter((e) => !n.has(B(e))),
 			lastPage: r
 		};
 	}
 	_releaseWithheld(e) {
-		for (let t of e) this._withheldRunIds.delete(N(t));
+		for (let t of e) this._withheldRunIds.delete(B(t));
 		e.length > 0 && this._recomputeAndEmit();
 	}
 	_updateVisibleSnapshot(e) {
 		let t = e ?? this._cachedNodes;
-		this._lastVisibleNodeKeys = t.map((e) => N(e)), this._lastVisibleNodeKeySet = new Set(this._lastVisibleNodeKeys), this._lastVisibleProjections = t.map((e) => e.projection), this._lastVisibleMessagePairs = this._extractMessages(t);
+		this._lastVisibleNodeKeys = t.map((e) => B(e)), this._lastVisibleNodeKeySet = new Set(this._lastVisibleNodeKeys), this._lastVisibleProjections = t.map((e) => e.projection), this._lastVisibleMessagePairs = this._extractMessages(t).slice(this._hiddenMessageCount);
 	}
 	_onTreeUpdate() {
-		this._processingHistory || (this._pinBranchSelections(), this._resolvePendingRegenSelections(), this._recomputeAndEmitIfChanged());
+		this._processingHistory || (this._pinBranchSelections(), this._resolvePendingRegenSelections(), this._resolvePendingNonHeadRegenSelections(), this._recomputeAndEmitIfChanged());
 	}
 	_resolveSelections() {
 		let e = /* @__PURE__ */ new Map();
@@ -896,8 +1233,22 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 			});
 		}
 	}
+	_resolvePendingNonHeadRegenSelections() {
+		for (let [e, t] of this._nonHeadRegenSelections) {
+			if (t.kind === "user") continue;
+			let n = this._runByCodecMessageId(e);
+			if (!n) continue;
+			let r = this._codec.getMessages(n.projection), i = r.findIndex((t) => t.codecMessageId === e), a = i > 0 ? r[i - 1]?.codecMessageId : void 0;
+			if (a === void 0) continue;
+			let o = this._nonHeadRegenerators(e, a).at(-1);
+			o && this._nonHeadRegenSelections.set(e, {
+				kind: "auto",
+				selectedRunId: o.runId
+			});
+		}
+	}
 	_onTreeAblyMessage(e) {
-		let t = D(e), n = t[m], r = t[d];
+		let t = L(e), n = t[D], r = t[w];
 		if (!n && !r) {
 			this._emitter.emit("ably-message", e);
 			return;
@@ -915,32 +1266,33 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 		let { parent: t } = e;
 		if (t === void 0) return !0;
 		let n = this._tree.getNodeByCodecMessageId(t);
-		return n ? this._lastVisibleNodeKeySet.has(N(n)) : !0;
+		return n ? this._lastVisibleNodeKeySet.has(B(n)) : !0;
 	}
 	_visibleChanged(e) {
 		if (e.length !== this._lastVisibleNodeKeys.length) return !0;
-		for (let [t, n] of e.entries()) if (N(n) !== this._lastVisibleNodeKeys[t] || n.projection !== this._lastVisibleProjections[t]) return !0;
+		for (let [t, n] of e.entries()) if (B(n) !== this._lastVisibleNodeKeys[t] || n.projection !== this._lastVisibleProjections[t]) return !0;
 		return !1;
 	}
-}, W = (e) => new pe(e), me = () => {}, he = class {
+}, q = (e) => new je(e), Me = () => {}, Ne = class {
 	constructor(e) {
 		this._views = /* @__PURE__ */ new Set(), this._state = "ready", this._pendingRunStarts = /* @__PURE__ */ new Map();
-		let t = ce(e.client, e.codec);
-		if (this._channel = e.client.channels.get(e.channelName, t), this._codec = e.codec, this._clientId = e.clientId, this._logger = (e.logger ?? ie({ logLevel: T.Silent })).withContext({ component: "ClientSession" }), this._emitter = new w(this._logger), this._hasAttachedOnce = this._channel.state === "attached", this._tree = R(this._codec, this._logger), this._view = W({
+		let t = x(e.client, e.codec), n = m(e.channelModes);
+		if (n && (t.modes = n), this._channel = e.client.channels.get(e.channelName, t), this._client = e.client, this._codec = e.codec, this._logger = (e.logger ?? ce({ logLevel: oe.Silent })).withContext({ component: "ClientSession" }), this._emitter = new P(this._logger), this._hasAttachedOnce = this._channel.state === "attached", this._tree = we(this._codec, this._logger), this._applier = ge(this._tree, this._codec.createDecoder()), this._view = q({
 			tree: this._tree,
 			channel: this._channel,
 			codec: this._codec,
+			applier: this._applier,
 			sendDelegate: this._internalSend.bind(this),
 			logger: this._logger,
 			onClose: () => this._views.delete(this._view)
-		}), this._decoder = this._codec.createDecoder(), this._encoder = this._codec.createEncoder(this._channel, this._clientId === void 0 ? void 0 : { clientId: this._clientId }), this._views.add(this._view), this.tree = this._tree, this.view = this._view, e.messages) {
+		}), this._encoder = this._codec.createEncoder(this._channel), 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 = crypto.randomUUID(), r = {
-					[m]: e,
-					[_]: "user"
+					[D]: e,
+					[O]: "user"
 				};
-				t && (r[v] = t), this._tree.applyMessage({
+				t && (r[k] = t), this._tree.applyMessage({
 					inputs: [this._codec.createUserMessage(n)],
 					outputs: []
 				}, r), t = e;
@@ -952,60 +1304,68 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 			this._handleChannelStateChange(e);
 		}, this._channel.on(this._onChannelStateChange);
 	}
+	get presence() {
+		return this._channel.presence;
+	}
+	get object() {
+		return this._channel.object;
+	}
 	connect() {
-		return this._state === "closed" ? Promise.reject(new e.ErrorInfo("unable to connect; session is closed", C.SessionClosed, 400)) : this._connectPromise ? this._connectPromise : (this._logger.trace("DefaultClientSession.connect();"), this._connectPromise = this._channel.subscribe(this._onMessage).then(() => {
+		return this._state === "closed" ? Promise.reject(new e.ErrorInfo("unable to connect; session is closed", N.SessionClosed, 400)) : this._connectPromise ? this._connectPromise : (this._logger.trace("DefaultClientSession.connect();"), this._connectPromise = this._channel.subscribe(this._onMessage).then(() => {
 			this._logger.debug("DefaultClientSession.connect(); subscribed and attached");
 		}, (t) => {
-			let n = new e.ErrorInfo(`unable to subscribe to channel; ${t instanceof Error ? t.message : String(t)}`, C.SessionSubscriptionError, 500, t instanceof e.ErrorInfo ? t : void 0);
+			let n = new e.ErrorInfo(`unable to subscribe to channel; ${F(t)}`, N.SessionSubscriptionError, 500, I(t));
 			throw this._logger.error("DefaultClientSession.connect(); subscribe failed"), this._emitter.emit("error", n), n;
 		}), this._connectPromise);
 	}
-	async _requireConnected(t) {
-		if (!this._connectPromise) throw new e.ErrorInfo(`unable to ${t}; connect() must be called before ${t}()`, C.InvalidArgument, 400);
-		return this._connectPromise;
+	_resolveClientId() {
+		let e = this._client.auth.clientId;
+		return e && e !== "*" ? e : void 0;
+	}
+	async _requireConnected(e) {
+		return ve(this._connectPromise, e);
 	}
 	_handleMessage(t) {
 		if (this._state !== "closed") try {
 			if (t.name === "ai-run-end") {
-				let n = D(t);
-				if ((n["run-reason"] ?? "complete") === "error") {
-					let t = n[S], r = t === void 0 ? NaN : Number(t), i = Number.isFinite(r) ? r : C.SessionSubscriptionError, a = n["error-message"] ?? "agent reported an error", o = i >= 1e4 && i < 6e4 ? Math.floor(i / 100) : 500, s = new e.ErrorInfo(a, i, o);
+				let e = L(t);
+				if ((e["run-reason"] ?? "complete") === "error") {
+					let t = R(e);
 					this._logger.error("ClientSession._handleMessage(); agent error received", {
-						runId: n[d],
-						invocationId: n[f],
-						code: i
-					}), this._emitter.emit("error", s);
+						runId: e[w],
+						invocationId: e[T],
+						code: t.code
+					}), this._emitter.emit("error", t);
 				}
 			}
-			let n = M(this._tree, this._decoder, t);
-			if (n && (n.type === "start" || n.type === "resume")) {
-				let e = D(t)[x];
-				if (e !== void 0) {
-					let t = this._pendingRunStarts.get(e);
-					t && (this._pendingRunStarts.delete(e), t.resolve(n.runId));
+			let e = this._applier.apply(t);
+			if (e && (e.type === "start" || e.type === "resume")) {
+				let n = L(t)[M];
+				if (n !== void 0) {
+					let t = this._pendingRunStarts.get(n);
+					t && (this._pendingRunStarts.delete(n), t.resolve(e.runId));
 				}
 			}
 			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.SessionSubscriptionError, 500, n));
+			this._emitter.emit("error", new e.ErrorInfo(`unable to process channel message; ${F(t)}`, N.SessionSubscriptionError, 500, I(t)));
 		}
 	}
-	_handleChannelStateChange(t) {
+	_handleChannelStateChange(e) {
 		if (this._state === "closed") return;
-		let { current: n, resumed: r } = t;
-		if (n === "attached" && !this._hasAttachedOnce) {
+		let { current: t, resumed: n } = e;
+		if (t === "attached" && !this._hasAttachedOnce) {
 			this._hasAttachedOnce = !0;
 			return;
 		}
-		if (!(n === "failed" || n === "suspended" || n === "detached" || n === "attached" && !r)) return;
+		if (!be(e)) return;
 		this._logger.error("ClientSession._handleChannelStateChange(); channel continuity lost", {
-			current: n,
-			resumed: r,
-			previous: t.previous
+			current: t,
+			resumed: n,
+			previous: e.previous
 		});
-		let i = new e.ErrorInfo(`unable to deliver events; channel continuity lost (${n}${n === "attached" ? ", resumed: false" : ""})`, C.ChannelContinuityLost, 500, t.reason);
-		this._emitter.emit("error", i);
+		let r = xe(e, "deliver events");
+		this._emitter.emit("error", r);
 	}
 	_cleanupFailedSend(e) {
 		for (let t of e) {
@@ -1014,12 +1374,13 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 		}
 	}
 	createView() {
-		if (this._state === "closed") throw new e.ErrorInfo("unable to create view; session is closed", C.SessionClosed, 400);
+		if (this._state === "closed") throw new e.ErrorInfo("unable to create view; session is closed", N.SessionClosed, 400);
 		this._logger.trace("DefaultClientSession.createView();");
-		let t = W({
+		let t = q({
 			tree: this._tree,
 			channel: this._channel,
 			codec: this._codec,
+			applier: this._applier,
 			sendDelegate: this._internalSend.bind(this),
 			logger: this._logger,
 			onClose: () => this._views.delete(t)
@@ -1027,9 +1388,9 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 		return this._views.add(t), t;
 	}
 	async _internalSend(t, n, r) {
-		if (this._state === "closed" || (await this._requireConnected("send"), this._state === "closed")) throw new e.ErrorInfo("unable to send; session is closed", C.SessionClosed, 400);
+		if (this._state === "closed" || (await this._requireConnected("send"), this._state === "closed")) throw new e.ErrorInfo("unable to send; session is closed", N.SessionClosed, 400);
 		let i = this._channel.state;
-		if (i !== "attached" && i !== "attaching") throw new e.ErrorInfo(`unable to send; channel is ${i}`, C.ChannelNotReady, 400);
+		if (i !== "attached" && i !== "attaching") throw new e.ErrorInfo(`unable to send; channel is ${i}`, N.ChannelNotReady, 400);
 		this._logger.trace("ClientSession._internalSend();");
 		let a = n?.runId !== void 0, o = n?.runId, s;
 		n?.parent === void 0 && !n?.forkOf && (s = r);
@@ -1037,11 +1398,11 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 		for (let e of t) {
 			let t = crypto.randomUUID(), r = e.codecMessageId ?? crypto.randomUUID();
 			c.add(r);
-			let i = e.kind !== "user-message" && (e.kind === "regenerate" || e.codecMessageId !== void 0), a = e.parent ?? (n?.parent === void 0 ? s : n.parent), u = n?.forkOf, d = e.kind === "regenerate" ? e.target : void 0, f = le({
+			let i = e.kind !== "user-message" && (e.kind === "regenerate" || e.codecMessageId !== void 0), a = e.parent ?? (n?.parent === void 0 ? s : n.parent), u = n?.forkOf, d = e.kind === "regenerate" ? e.target : void 0, f = fe({
 				role: "user",
 				runId: o,
 				codecMessageId: r,
-				runClientId: this._clientId,
+				runClientId: this._resolveClientId(),
 				...a !== void 0 && { parent: a },
 				...u !== void 0 && { forkOf: u },
 				...d !== void 0 && { regenerates: d },
@@ -1059,7 +1420,7 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 			}), !i && n?.parent === void 0 && !n?.forkOf && e.parent === void 0 && (s = r);
 		}
 		let u = l.at(-1);
-		if (u === void 0) throw new e.ErrorInfo("unable to send; inputs array is empty (include at least one input)", C.InvalidArgument, 400);
+		if (u === void 0) throw new e.ErrorInfo("unable to send; inputs array is empty (include at least one input)", N.InvalidArgument, 400);
 		let d = u.inputEventId, f = u.codecMessageId, p = new Promise((e, t) => {
 			this._pendingRunStarts.set(f, {
 				resolve: e,
@@ -1070,11 +1431,10 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 			try {
 				for (let e of l) await this._encoder.publishInput(e.input, {
 					extras: { headers: e.headers },
-					messageId: e.codecMessageId,
-					...this._clientId !== void 0 && { clientId: this._clientId }
+					messageId: e.codecMessageId
 				});
 			} catch (t) {
-				let n = t instanceof e.ErrorInfo ? t : void 0, r = n?.statusCode === 401 || n?.statusCode === 403, i = new e.ErrorInfo(r ? "unable to publish events; missing publish capability on the channel" : `unable to publish events; ${t instanceof Error ? t.message : String(t)}`, r ? C.InsufficientCapability : C.SessionSendFailed, r ? 401 : 500, n);
+				let n = I(t), r = n?.statusCode === 401 || n?.statusCode === 403, i = new e.ErrorInfo(r ? "unable to publish events; missing publish capability on the channel" : `unable to publish events; ${F(t)}`, r ? N.InsufficientCapability : N.SessionSendFailed, r ? 401 : 500, n);
 				throw this._emitter.emit("error", i), this._pendingRunStarts.delete(f), a || this._cleanupFailedSend([...c]), i;
 			}
 		})(), {
@@ -1088,7 +1448,7 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 				});
 			},
 			optimisticCodecMessageIds: [...c],
-			toInvocation: () => ue.fromJSON({
+			toInvocation: () => _e.fromJSON({
 				inputEventId: d,
 				sessionName: this._channel.name
 			})
@@ -1103,14 +1463,14 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 			runId: e.runId,
 			inputCodecMessageId: e.inputCodecMessageId
 		});
-		let t = { [p]: crypto.randomUUID() };
-		e.runId !== void 0 && (t[d] = e.runId), e.inputCodecMessageId !== void 0 && (t[x] = e.inputCodecMessageId), await this._channel.publish({
-			name: ee,
+		let t = { [E]: crypto.randomUUID() };
+		e.runId !== void 0 && (t[w] = e.runId), e.inputCodecMessageId !== void 0 && (t[M] = e.inputCodecMessageId), await this._channel.publish({
+			name: re,
 			extras: { ai: { transport: t } }
 		});
 	}
 	on(e, t) {
-		if (this._state === "closed") return me;
+		if (this._state === "closed") return Me;
 		let n = t;
 		return this._emitter.on(e, n), () => {
 			this._emitter.off(e, n);
@@ -1121,135 +1481,144 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 			this._state = "closed", this._logger.info("ClientSession.close();"), this._connectPromise && this._channel.unsubscribe(this._onMessage), this._channel.off(this._onChannelStateChange), this._emitter.off();
 			for (let e of this._views) e.close();
 			if (this._views.clear(), this._pendingRunStarts.size > 0) {
-				let t = new e.ErrorInfo("unable to await run-start; session closed", C.SessionClosed, 400);
+				let t = new e.ErrorInfo("unable to await run-start; session closed", N.SessionClosed, 400);
 				for (let e of this._pendingRunStarts.values()) e.reject(t);
 				this._pendingRunStarts.clear();
 			}
 			try {
 				await this._encoder.close();
 			} catch {}
-			if (this._connectPromise) try {
-				await this._channel.detach();
-			} catch (e) {
-				this._logger.debug("ClientSession.close(); channel detach failed", { error: e });
-			}
+			await ye(this._channel, this._connectPromise, this._logger, "ClientSession");
 		}
 	}
-}, ge = (e) => new he(e), G = n({
+}, Pe = (e) => new Ne(e), J = r({
 	nearest: void 0,
 	providers: {}
-}), K = ({ children: n, ...r }) => {
-	let c = t(), { channelName: u } = r, d = s(void 0), f = s(u), p = s([]), m = s(!1), h = s(void 0);
-	if (!(d.current || h.current) || f.current !== u) {
-		f.current = u, d.current && p.current.push(d.current);
+}), Y = ({ children: r, ...i }) => {
+	let l = n(), { channelName: d } = i, f = s(() => {
+		let e = { params: { agent: b(i.codec) } }, t = m(i.channelModes);
+		return t && (e.modes = t), e;
+	}, [i.codec, i.channelModes]), p = c(void 0), h = c(d), g = c([]), _ = c(!1), v = c(void 0);
+	if (!(p.current || v.current) || h.current !== d) {
+		h.current = d, p.current && g.current.push(p.current);
 		try {
-			d.current = ge({
-				...r,
-				client: c
-			}), h.current = void 0;
+			p.current = Pe({
+				...i,
+				client: l
+			}), v.current = void 0;
 		} catch (t) {
-			d.current = void 0, h.current = t instanceof e.ErrorInfo ? t : new e.ErrorInfo("Unknown error while creating client session", C.BadRequest, 400);
+			p.current = void 0, v.current = t instanceof e.ErrorInfo ? t : new e.ErrorInfo("Unknown error while creating client session", N.BadRequest, 400);
 		}
 	}
-	let g = i(G), _ = d.current, v = h.current, y = o(() => ({
-		session: _,
-		sessionError: v
-	}), [_, v]), b = o(() => ({
-		nearest: y,
+	let y = a(J), x = p.current, S = v.current, C = s(() => ({
+		session: x,
+		sessionError: S
+	}), [x, S]), w = s(() => ({
+		nearest: C,
 		providers: {
-			...g.providers,
-			[u]: y
+			...y.providers,
+			[d]: C
 		}
 	}), [
-		u,
-		g,
-		y
+		d,
+		y,
+		C
 	]);
-	return a(() => () => {
-		for (let e of p.current) e.close();
-	}, [u]), a(() => {
-		d.current?.connect();
-	}, [u]), a(() => (m.current = !1, () => {
-		m.current = !0, Promise.resolve().then(() => {
-			m.current && d.current?.close();
+	return o(() => () => {
+		for (let e of g.current) e.close();
+	}, [d]), o(() => {
+		p.current?.connect();
+	}, [d]), o(() => (_.current = !1, () => {
+		_.current = !0, Promise.resolve().then(() => {
+			_.current && p.current?.close();
 		});
-	}), []), /* @__PURE__ */ l(G.Provider, {
-		value: b,
-		children: n
+	}), []), /* @__PURE__ */ u(J.Provider, {
+		value: w,
+		children: /* @__PURE__ */ u(t, {
+			channelName: d,
+			options: f,
+			children: r
+		})
 	});
-}, q = ({ session: e, skip: t } = {}) => {
-	let { nearest: n } = i(G), r = n?.session;
+}, X = ({ session: e, skip: t } = {}) => {
+	let { nearest: n } = a(J), r = n?.session;
 	if (!t && e !== null) return e ?? r;
-}, J = ({ session: e, skip: t } = {}) => {
-	let n = q({
+}, Fe = ({ session: e, skip: t } = {}) => {
+	let n = X({
 		session: e,
 		skip: t
-	}), [r, i] = c([]), o = s([]);
-	return a(() => {
-		if (o.current = [], i([]), n) return n.tree.on("ably-message", (e) => {
-			let t = [...o.current, e];
-			o.current = t, i(t);
+	}), [r, i] = l([]), a = c([]);
+	return o(() => {
+		if (a.current = [], i([]), n) return n.tree.on("ably-message", (e) => {
+			let t = [...a.current, e];
+			a.current = t, i(t);
 		});
 	}, [n]), r;
-}, Y = {
+}, Z = (t) => new e.ErrorInfo(`unable to ${t}; hook is skipped`, N.InvalidArgument, 400), Q = () => ({
 	get tree() {
-		throw new e.ErrorInfo("unable to access tree; hook is skipped", C.InvalidArgument, 400);
+		throw Z("access tree");
 	},
 	get view() {
-		throw new e.ErrorInfo("unable to access view; hook is skipped", C.InvalidArgument, 400);
+		throw Z("access view");
+	},
+	get presence() {
+		throw Z("access presence");
+	},
+	get object() {
+		throw Z("access object");
 	},
 	connect: () => {
-		throw new e.ErrorInfo("unable to connect; hook is skipped", C.InvalidArgument, 400);
+		throw Z("connect");
 	},
 	createView: () => {
-		throw new e.ErrorInfo("unable to create view; hook is skipped", C.InvalidArgument, 400);
+		throw Z("create view");
 	},
 	cancel: () => {
-		throw new e.ErrorInfo("unable to cancel; hook is skipped", C.InvalidArgument, 400);
+		throw Z("cancel");
 	},
 	on: () => {
-		throw new e.ErrorInfo("unable to subscribe; hook is skipped", C.InvalidArgument, 400);
+		throw Z("subscribe");
 	},
 	close: () => {
-		throw new e.ErrorInfo("unable to close; hook is skipped", C.InvalidArgument, 400);
+		throw Z("close");
 	}
-}, X = ({ channelName: t, skip: n, onError: r } = {}) => {
-	let { nearest: o, providers: c } = i(G), l = s(r);
+}), Ie = ({ channelName: t, skip: n, onError: r } = {}) => {
+	let { nearest: i, providers: s } = a(J), l = c(r);
 	l.current = r;
-	let u = n ? void 0 : t === void 0 ? o?.session : c[t]?.session;
-	if (a(() => {
+	let u = n ? void 0 : t === void 0 ? i?.session : s[t]?.session;
+	if (o(() => {
 		if (u) return u.on("error", (e) => {
 			l.current?.(e);
 		});
-	}, [u]), n) return { session: Y };
+	}, [u]), n) return { session: Q() };
 	if (t !== void 0) {
-		let n = c[t];
+		let n = s[t];
 		return n ? n.session ? { session: n.session } : {
-			session: Y,
+			session: Q(),
 			sessionError: n.sessionError
 		} : {
-			session: Y,
-			sessionError: new e.ErrorInfo(`unable to use session; no ClientSessionProvider found for channelName "${t}"`, C.BadRequest, 400)
+			session: Q(),
+			sessionError: new e.ErrorInfo(`unable to use session; no ClientSessionProvider found for channelName "${t}"`, N.BadRequest, 400)
 		};
 	}
-	return o ? o.session ? { session: o.session } : {
-		session: Y,
-		sessionError: o.sessionError
+	return i ? i.session ? { session: i.session } : {
+		session: Q(),
+		sessionError: i.sessionError
 	} : {
-		session: Y,
-		sessionError: new e.ErrorInfo("unable to use session; no ClientSessionProvider found in the tree", C.BadRequest, 400)
+		session: Q(),
+		sessionError: new e.ErrorInfo("unable to use session; no ClientSessionProvider found in the tree", N.BadRequest, 400)
 	};
-}, _e = {
+}, Le = {
 	hasSiblings: !1,
 	siblings: [],
 	index: 0,
 	selected: void 0
-}, Z = ({ session: t, view: n, limit: i, skip: o } = {}) => {
-	let l = q({
+}, $ = ({ session: t, view: n, limit: r, skip: a } = {}) => {
+	let s = X({
 		session: t,
-		skip: o
-	}), u = o ? void 0 : n ?? l?.view, [d, f] = c(() => u?.getMessages() ?? []), [p, m] = c(() => u?.hasOlder() ?? !1), [h, g] = c(!1), [_, v] = c(), y = s(!1), b = i !== void 0, x = s(!1);
-	a(() => {
+		skip: a
+	}), u = a ? void 0 : n ?? s?.view, [d, f] = l(() => u?.getMessages() ?? []), [p, m] = l(() => u?.hasOlder() ?? !1), [h, g] = l(!1), [_, v] = l(), y = c(!1), b = r !== void 0, x = c(!1);
+	o(() => {
 		if (!u) {
 			f([]), m(!1), v(void 0);
 			return;
@@ -1258,19 +1627,19 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 			f(u.getMessages()), m(u.hasOlder());
 		});
 	}, [u]);
-	let S = r(async () => {
+	let S = i(async () => {
 		if (!(!u || y.current)) {
 			y.current = !0, g(!0);
 			try {
-				await u.loadOlder(i), v(void 0);
+				await u.loadOlder(r), v(void 0);
 			} catch (t) {
-				t instanceof e.ErrorInfo ? v(t) : v(new e.ErrorInfo("Unknown error loading older messages", C.BadRequest, 400));
+				t instanceof e.ErrorInfo ? v(t) : v(new e.ErrorInfo("Unknown error loading older messages", N.BadRequest, 400));
 			} finally {
 				y.current = !1, g(!1);
 			}
 		}
-	}, [u, i]);
-	return a(() => {
+	}, [u, r]);
+	return o(() => {
 		!b || x.current || !u || (x.current = !0, S());
 	}, [
 		b,
@@ -1282,61 +1651,61 @@ var u = "status", d = "run-id", f = "invocation-id", p = "event-id", m = "codec-
 		loading: h,
 		loadError: _,
 		loadOlder: S,
-		runOf: r((e) => u?.runOf(e), [u]),
-		run: r((e) => u?.run(e), [u]),
-		runs: r(() => u?.runs() ?? [], [u]),
-		branchSelection: r((e) => u?.branchSelection(e) ?? _e, [u]),
-		selectSibling: r((e, t) => {
+		runOf: i((e) => u?.runOf(e), [u]),
+		run: i((e) => u?.run(e), [u]),
+		runs: i(() => u?.runs() ?? [], [u]),
+		branchSelection: i((e) => u?.branchSelection(e) ?? Le, [u]),
+		selectSibling: i((e, t) => {
 			u?.selectSibling(e, t);
 		}, [u]),
-		send: r(async (t, n) => {
-			if (!u) throw new e.ErrorInfo("unable to send; view is not available", C.InvalidArgument, 400);
+		send: i(async (t, n) => {
+			if (!u) throw new e.ErrorInfo("unable to send; view is not available", N.InvalidArgument, 400);
 			return u.send(t, n);
 		}, [u]),
-		regenerate: r(async (t, n) => {
-			if (!u) throw new e.ErrorInfo("unable to regenerate; view is not available", C.InvalidArgument, 400);
+		regenerate: i(async (t, n) => {
+			if (!u) throw new e.ErrorInfo("unable to regenerate; view is not available", N.InvalidArgument, 400);
 			return u.regenerate(t, n);
 		}, [u]),
-		edit: r(async (t, n, r) => {
-			if (!u) throw new e.ErrorInfo("unable to edit; view is not available", C.InvalidArgument, 400);
+		edit: i(async (t, n, r) => {
+			if (!u) throw new e.ErrorInfo("unable to edit; view is not available", N.InvalidArgument, 400);
 			return u.edit(t, n, r);
 		}, [u])
 	};
-}, Q = ({ session: e, limit: t, skip: n } = {}) => {
-	let r = q({
+}, Re = ({ session: e, limit: t, skip: n } = {}) => {
+	let r = X({
 		session: e,
 		skip: n
-	}), [i, o] = c();
-	return a(() => {
+	}), [i, a] = l();
+	return o(() => {
 		if (!r) {
-			o(void 0);
+			a(void 0);
 			return;
 		}
 		let e = r.createView();
-		return o(e), () => {
+		return a(e), () => {
 			e.close();
 		};
-	}, [r]), Z({
+	}, [r]), $({
 		view: i,
 		limit: t,
 		skip: n
 	});
-}, $ = ({ session: e } = {}) => {
-	let t = q({ session: e });
+}, ze = ({ session: e } = {}) => {
+	let t = X({ session: e });
 	return {
-		getRunNode: r((e) => t?.tree.getRunNode(e), [t]),
-		getNodeByCodecMessageId: r((e) => t?.tree.getNodeByCodecMessageId(e), [t]),
-		getSiblingNodes: r((e) => t?.tree.getSiblingNodes(e) ?? [], [t])
+		getRunNode: i((e) => t?.tree.getRunNode(e), [t]),
+		getNodeByCodecMessageId: i((e) => t?.tree.getNodeByCodecMessageId(e), [t]),
+		getSiblingNodes: i((e) => t?.tree.getSiblingNodes(e) ?? [], [t])
 	};
-}, ve = () => ({
-	ClientSessionProvider: K,
-	useClientSession: (e) => X(e ?? {}),
-	useView: (e) => Z(e ?? {}),
-	useTree: (e) => $(e ?? {}),
-	useAblyMessages: (e) => J(e ?? {}),
-	useCreateView: (e) => Q(e ?? {})
+}, Be = () => ({
+	ClientSessionProvider: Y,
+	useClientSession: (e) => Ie(e ?? {}),
+	useView: (e) => $(e ?? {}),
+	useTree: (e) => ze(e ?? {}),
+	useAblyMessages: (e) => Fe(e ?? {}),
+	useCreateView: (e) => Re(e ?? {})
 });
 //#endregion
-export { K as ClientSessionProvider, ve as createSessionHooks, J as useAblyMessages, X as useClientSession, Q as useCreateView, $ as useTree, Z as useView };
+export { Y as ClientSessionProvider, f as OBJECT_MODES, Be as createSessionHooks, Fe as useAblyMessages, Ie as useClientSession, Re as useCreateView, ze as useTree, $ as useView };
 
 //# sourceMappingURL=ably-ai-transport-react.js.map