@ably/ai-transport 0.1.0 → 0.2.0

package/dist/ably-ai-transport.js

@@ -1,437 +1,822 @@
 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-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;
-}, T = (e) => {
+//#region src/core/transport/invocation.ts
+var t = class e {
+	constructor(e) {
+		this.inputEventId = e.inputEventId, this.sessionName = e.sessionName;
+	}
+	static fromJSON(t) {
+		return new e(t);
+	}
+	toJSON() {
+		return {
+			inputEventId: this.inputEventId,
+			sessionName: this.sessionName
+		};
+	}
+}, n = "stream", r = "status", i = "stream-id", a = "discrete", o = "run-id", s = "invocation-id", c = "event-id", l = "codec-message-id", u = "run-client-id", d = "input-client-id", f = "role", p = "parent", m = "fork-of", h = "msg-regenerate", g = "run-reason", _ = "input-codec-message-id", v = "error-code", y = "error-message", b = "ai-cancel", x = "ai-run-start", S = "ai-run-suspend", C = "ai-run-resume", w = "ai-run-end", T = /* @__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 = (e, t) => e.code === t, D = (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;
+}, O = (e) => D(e, "transport"), k = (e) => D(e, "codec"), ee = (e) => {
 	if (e !== void 0) try {
 		return JSON.parse(e);
 	} catch {
 		return;
 	}
-}, E = (e, t) => ({
+}, A = (e, t) => ({
 	...e,
 	...t
-}), te = (e) => {
+}), j = (e) => {
 	if (e !== void 0) return e === "true";
-}, D = (e, t) => e[S + t], O = (e) => {
+}, M = (e, t) => e.serial === void 0 && t.serial === void 0 ? 0 : e.serial === void 0 ? 1 : t.serial === void 0 || e.serial < t.serial ? -1 : +(e.serial > t.serial), N = (e, t) => e[t], P = (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) => te(D(e, t)),
-	json: (t) => T(D(e, t))
-}), A = () => {
+}, F = (e) => ({
+	str: (t) => N(e, t),
+	strOr: (t, n) => N(e, t) ?? n,
+	bool: (t) => j(N(e, t)),
+	json: (t) => ee(N(e, t))
+}), I = () => {
 	let e = {}, 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),
+		str: (n, r) => (r !== void 0 && (e[n] = r), t),
+		bool: (n, r) => (r !== void 0 && (e[n] = String(r)), t),
+		json: (n, r) => (r != null && (e[n] = JSON.stringify(r)), t),
 		build: () => e
 	};
 	return t;
-}, j = (e) => {
+}, L = "0.2.0", R = "ai-transport-js", z = (e, t) => {
+	let n = e;
+	return n.options.agents = {
+		...n.options.agents,
+		...t
+	}, { params: { agent: Object.entries(t).map(([e, t]) => `${e}/${t}`).join(" ") } };
+}, B = (e, t) => {
+	let n = t?.adapterTag, r = { [R]: L };
+	return n && (r[n] = L), z(e, r);
+}, V = (e) => {
 	let t = {
-		[c]: e.role,
-		[a]: e.turnId,
-		[o]: e.msgId
+		[f]: e.role,
+		[l]: e.codecMessageId
 	};
-	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;
+	return e.runId !== void 0 && (t[o] = e.runId), e.runClientId !== void 0 && (t[u] = e.runClientId), e.parent && (t[p] = e.parent), e.forkOf && (t[m] = e.forkOf), e.regenerates && (t[h] = e.regenerates), e.invocationId && (t[s] = e.invocationId), e.inputClientId !== void 0 && (t[d] = e.inputClientId), e.inputCodecMessageId !== void 0 && (t[_] = e.inputCodecMessageId), e.inputEventId && (t[c] = e.inputEventId), t;
+}, H = (e) => {
+	let t = {
+		[o]: e.runId,
+		[u]: e.runClientId
+	};
+	return e.reason !== void 0 && (t[g] = e.reason), e.parent !== void 0 && (t[p] = e.parent), e.forkOf !== void 0 && (t[m] = e.forkOf), e.regenerates !== void 0 && (t[h] = e.regenerates), e.invocationId !== void 0 && (t[s] = e.invocationId), e.inputClientId !== void 0 && (t[d] = e.inputClientId), e.inputCodecMessageId !== void 0 && (t[_] = e.inputCodecMessageId), t;
+}, U = (e) => e === "ai-run-start" || e === "ai-run-suspend" || e === "ai-run-resume" || e === "ai-run-end", W = (e, t, n) => {
+	let r = t[o];
+	if (!r) return;
+	let i = t["run-client-id"] ?? "";
+	if (e === "ai-run-start") {
+		let e = t[p], a = t[m], o = t[h];
+		return {
+			type: "start",
+			runId: r,
+			clientId: i,
+			serial: n,
+			invocationId: t["invocation-id"] ?? "",
+			...e !== void 0 && { parent: e },
+			...a !== void 0 && { forkOf: a },
+			...o !== void 0 && { regenerates: o }
+		};
+	}
+	if (e === "ai-run-suspend") return {
+		type: "suspend",
+		runId: r,
+		clientId: i,
+		serial: n,
+		invocationId: t["invocation-id"] ?? ""
+	};
+	if (e === "ai-run-resume") return {
+		type: "resume",
+		runId: r,
+		clientId: i,
+		serial: n,
+		invocationId: t["invocation-id"] ?? ""
+	};
+	if (e === "ai-run-end") {
+		let e = t["run-reason"] ?? "complete";
+		return {
+			type: "end",
+			runId: r,
+			clientId: i,
+			serial: n,
+			invocationId: t["invocation-id"] ?? "",
+			reason: e
+		};
+	}
+}, G = (e, t, n) => {
+	if (e.has(t) || e.size < n) return;
+	let r = e.keys().next().value;
+	if (r !== void 0) return e.delete(r), r;
+}, K = (e, t) => {
+	let n = [], r = /* @__PURE__ */ new Set(), i = t;
+	for (; i !== void 0 && !r.has(i);) r.add(i), n.push(i), i = e.get(i)?.parentCodecMessageId;
+	return n.toReversed();
+}, q = (e, t, n) => {
+	let r = O(n), i = n.serial;
+	if (U(n.name)) {
+		let t = W(n.name, r, i);
+		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);
+}, te = (e, t, n, r, i) => {
+	let { inputs: a, outputs: o } = t.decode(r), s = n;
+	for (let t of [...a, ...o]) s = e.fold(s, t, {
+		serial: r.serial ?? "",
+		messageId: i
+	});
+	return s;
+}, ne = (e, t) => {
+	let n = /* @__PURE__ */ new Set(), r = [];
+	for (let t of e) t.serial !== void 0 && !n.has(t.serial) && (n.add(t.serial), r.push(t));
+	if (t !== void 0) for (let e of t) e.serial !== void 0 && !n.has(e.serial) && (n.add(e.serial), r.push(e));
+	return r.toSorted(M);
+}, re = async (e, t, n) => {
+	let r = [], i = await e.history({ limit: t });
+	for (r.push(...i.items); i.hasNext() && r.length < n;) {
+		let e = await i.next();
+		if (!e) break;
+		r.push(...e.items), i = e;
+	}
+	return r;
+}, J = (e, t, n, r) => {
+	let i = e.createDecoder(), a = e.init(), o = 0;
+	for (let s of t) {
+		let t = O(s);
+		if (t["run-id"] !== n || U(s.name)) continue;
+		let c = t[l];
+		if (r !== void 0 && c === r) break;
+		a = te(e, i, a, s, c ?? ""), o++;
+	}
+	return {
+		projection: a,
+		folded: o
+	};
+}, ie = (e, t, n) => {
+	let r = e.createDecoder(), i = e.init();
+	for (let a of t) {
+		let t = O(a);
+		t["run-id"] === void 0 && t["codec-message-id"] === n && (i = te(e, r, i, a, n));
+	}
+	return i;
+}, ae = async (t) => {
+	let { channel: n, codec: r, runId: i, signal: a, logger: o, liveMessages: s } = t;
+	if (a.aborted) throw new e.ErrorInfo(`unable to load run projection; run ${i} was cancelled`, T.InvalidArgument, 400);
+	await n.attach();
+	let { projection: c, folded: l } = J(r, ne(await re(n, 200, 2e3), s), i);
+	return o?.debug("loadRunProjection(); folded run events", {
+		runId: i,
+		folded: l
+	}), c;
+}, oe = async (t) => {
+	let { channel: n, codec: r, runId: i, signal: a, logger: s, liveMessages: c, assistantParentFallback: u, pageLimit: d, maxMessages: f } = t;
+	if (a.aborted) throw new e.ErrorInfo(`unable to load conversation; run ${i} was cancelled`, T.InvalidArgument, 400);
+	let m = ne(await re(n, d, f), c), h = /* @__PURE__ */ new Map(), g = /* @__PURE__ */ new Map();
+	for (let e of m) {
+		if (U(e.name)) continue;
+		let t = O(e), n = t[l];
+		if (n === void 0) continue;
+		let r = t[o];
+		r !== void 0 && g.set(r, n), h.has(n) || h.set(n, {
+			runId: r,
+			parentCodecMessageId: t[p]
+		});
+	}
+	for (let e of m) {
+		if (e.name !== "ai-run-start") continue;
+		let t = O(e), n = t[o];
+		if (n === void 0) continue;
+		let r = g.get(n);
+		if (r === void 0) continue;
+		let i = h.get(r);
+		i && i.parentCodecMessageId === void 0 && (i.parentCodecMessageId = t[p]);
+	}
+	let _ = [], v = 0;
+	if (u !== void 0) {
+		let e = K(h, u);
+		v = e.length;
+		for (let t of e) {
+			let e = h.get(t);
+			if (e?.runId === i) continue;
+			let n = e?.runId === void 0 ? ie(r, m, t) : J(r, m, e.runId).projection;
+			_.push(...r.getMessages(n).map((e) => e.message));
 		}
-		s = () => {
-			e();
-		}, n.addEventListener("abort", s, { once: !0 });
-	}) : new Promise(() => {}), l = "complete", u;
+	}
+	let { projection: y, folded: b } = J(r, m, i);
+	return _.push(...r.getMessages(y).map((e) => e.message)), s?.debug("loadConversation(); built", {
+		runId: i,
+		chainLength: v,
+		totalMessages: _.length,
+		folded: b
+	}), {
+		messages: _,
+		projection: y
+	};
+}, se = (e) => {
+	let t;
+	return {
+		promise: e === void 0 ? new Promise(() => {}) : e.aborted ? Promise.resolve() : new Promise((n) => {
+			t = () => {
+				n();
+			}, e.addEventListener("abort", t, { once: !0 });
+		}),
+		cleanup: () => {
+			t && e && e.removeEventListener("abort", t);
+		}
+	};
+}, ce = async (e, t, n, r, i, a) => {
+	a?.trace("pipeStream();");
+	let o = e.getReader(), s = se(n), c = "complete", l;
 	try {
 		for (;;) {
-			let e = await Promise.race([o.read(), c.then(() => "aborted")]);
-			if (e === "aborted") {
-				l = "cancelled", a?.debug("pipeStream(); stream cancelled by abort signal"), r && await r(async (e) => t.appendEvent(e)), await t.abort("cancelled");
+			let e = await Promise.race([o.read(), s.promise.then(() => "cancelled")]);
+			if (e === "cancelled") {
+				c = "cancelled", a?.debug("pipeStream(); stream cancelled by AbortSignal"), r && await r(async (e) => t.publishOutput(e)), await t.cancel("cancelled");
 				break;
 			}
-			let { done: n, value: s } = e;
+			let { done: n, value: l } = e;
 			if (n) {
 				await t.close(), a?.debug("pipeStream(); stream completed");
 				break;
 			}
-			await t.appendEvent(s, i?.(s));
+			await t.publishOutput(l, i?.(l));
 		}
 	} catch (e) {
-		l = "error", u = e instanceof Error ? e : Error(String(e)), a?.error("pipeStream(); stream error", { error: u.message });
+		c = "error", l = e instanceof Error ? e : Error(String(e)), a?.error("pipeStream(); stream error", { error: l.message });
 		try {
 			await t.close();
 		} catch {}
 	} finally {
-		s && n?.removeEventListener("abort", s), o.releaseLock();
+		s.cleanup(), o.releaseLock();
 	}
 	return {
-		reason: l,
-		error: u
+		reason: c,
+		error: l
 	};
-}, ne = class {
+}, le = class {
 	constructor(e, t) {
-		this._activeTurns = /* @__PURE__ */ new Map(), this._channel = e, this._logger = t?.withContext({ component: "TurnManager" });
+		this._activeRuns = /* @__PURE__ */ new Map(), this._channel = e, this._logger = t?.withContext({ component: "RunManager" });
 	}
-	async startTurn(e, t, n, r) {
-		this._logger?.trace("DefaultTurnManager.startTurn();", {
-			turnId: e,
+	async startRun(e, t, n, r) {
+		this._logger?.trace("DefaultRunManager.startRun();", {
+			runId: e,
 			clientId: t
 		});
-		let i = n ?? new AbortController(), o = t ?? "";
-		this._activeTurns.set(e, {
+		let i = n ?? new AbortController(), a = t ?? "";
+		this._activeRuns.set(e, {
 			controller: i,
-			clientId: o
+			clientId: a
 		});
-		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();", {
-			turnId: e,
-			reason: t
+		let o = r?.continuation === !0, s = H({
+			runId: e,
+			runClientId: a,
+			parent: o ? void 0 : r?.parent,
+			forkOf: o ? void 0 : r?.forkOf,
+			regenerates: o ? void 0 : r?.regenerates,
+			invocationId: r?.invocationId,
+			inputClientId: r?.inputClientId,
+			inputCodecMessageId: r?.inputCodecMessageId
 		});
-		let n = this._activeTurns.get(e)?.clientId ?? "";
-		await this._channel.publish({
-			name: y,
-			extras: { headers: {
-				[a]: e,
-				[s]: n,
-				[g]: t
-			} }
-		}), this._activeTurns.delete(e), this._logger?.debug("DefaultTurnManager.endTurn(); turn ended", {
-			turnId: e,
+		return await this._channel.publish({
+			name: o ? C : x,
+			extras: { ai: { transport: s } }
+		}), this._logger?.debug("DefaultRunManager.startRun(); run started", { runId: e }), i.signal;
+	}
+	async suspendRun(e, t, n, r) {
+		this._logger?.trace("DefaultRunManager.suspendRun();", { runId: e }), await this._publishTerminal(S, e, {
+			invocationId: t,
+			inputClientId: n,
+			inputCodecMessageId: r
+		}), this._logger?.debug("DefaultRunManager.suspendRun(); run suspended", { runId: e });
+	}
+	async endRun(e, t, n, r, i) {
+		this._logger?.trace("DefaultRunManager.endRun();", {
+			runId: e,
 			reason: t
+		}), await this._publishTerminal(w, e, {
+			reason: t,
+			invocationId: n,
+			inputClientId: r,
+			inputCodecMessageId: i
+		}), this._logger?.debug("DefaultRunManager.endRun(); run ended", {
+			runId: e,
+			reason: t
+		});
+	}
+	async _publishTerminal(e, t, n) {
+		let r = H({
+			runId: t,
+			runClientId: this._activeRuns.get(t)?.clientId ?? "",
+			...n
 		});
+		await this._channel.publish({
+			name: e,
+			extras: { ai: { transport: r } }
+		}), this._activeRuns.delete(t);
 	}
 	getSignal(e) {
-		return this._activeTurns.get(e)?.controller.signal;
+		return this._activeRuns.get(e)?.controller.signal;
 	}
 	getClientId(e) {
-		return this._activeTurns.get(e)?.clientId;
+		return this._activeRuns.get(e)?.clientId;
 	}
-	abort(e) {
-		this._logger?.debug("DefaultTurnManager.abort();", { turnId: e }), this._activeTurns.get(e)?.controller.abort();
+	cancel(e) {
+		this._logger?.debug("DefaultRunManager.cancel();", { runId: e }), this._activeRuns.get(e)?.controller.abort();
 	}
-	getActiveTurnIds() {
-		return [...this._activeTurns.keys()];
+	getActiveRunIds() {
+		return [...this._activeRuns.keys()];
 	}
 	close() {
-		this._logger?.trace("DefaultTurnManager.close();", { activeTurns: this._activeTurns.size });
-		for (let e of this._activeTurns.values()) e.controller.abort();
-		this._activeTurns.clear();
-	}
-}, 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._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._logger?.trace("DefaultRunManager.close();", { activeRuns: this._activeRuns.size });
+		for (let e of this._activeRuns.values()) e.controller.abort();
+		this._activeRuns.clear();
+	}
+}, ue = (e, t) => new le(e, t), de = async (t) => {
+	let { register: n, codec: r, invocationId: i, runId: a, expectedInputEventIds: o, timeoutMs: s, signal: l, logger: u } = t, d = new Set(o), f = d.size, h = [], g = [], _ = /* @__PURE__ */ new Set(), v, y, b = (e) => {
+		let t = r.createDecoder(), n = O(e), i = n["codec-message-id"] ?? "", { inputs: a, outputs: o } = t.decode(e), s = [...a, ...o], c = r.init();
+		for (let t of s) c = r.fold(c, t, {
+			serial: e.serial ?? "",
+			messageId: i
+		});
+		return r.getMessages(c).map(({ message: t }) => ({
+			kind: "message",
+			message: t,
+			codecMessageId: i,
+			parentId: n[p],
+			forkOf: n[m],
+			headers: n,
+			serial: e.serial
+		}));
+	};
+	return new Promise((t, r) => {
+		let o = !1, p = /* @__PURE__ */ new Set(), m = () => {}, x, S = () => {
+			m(), x !== void 0 && clearTimeout(x), l.removeEventListener("abort", C);
+		}, C = () => {
+			o || (o = !0, S(), r(new e.ErrorInfo(`unable to look up input event; run ${a} was cancelled`, T.InvalidArgument, 400)));
+		};
+		if (l.addEventListener("abort", C, { once: !0 }), !o) {
+			if (m = n((n) => {
+				if (o || n.serial !== void 0 && p.has(n.serial)) return;
+				n.serial !== void 0 && p.add(n.serial);
+				let s = O(n), l = s[c];
+				if (!l || !d.has(l) || _.has(l)) return;
+				_.add(l), v === void 0 && (v = s, y = n.clientId);
+				let m;
+				try {
+					m = b(n);
+				} catch (t) {
+					o = !0, S();
+					let n = t instanceof e.ErrorInfo ? t : void 0;
+					r(new e.ErrorInfo(`unable to look up input event; decode failed for invocation ${i}: ${t instanceof Error ? t.message : String(t)}`, T.InputEventNotFound, 504, n));
+					return;
+				}
+				for (let e of m) h.push(e);
+				g.push(n), !(_.size < f) && (o = !0, S(), h.sort(M), u?.debug("lookupInputEvents(); collected input events", {
+					runId: a,
+					invocationId: i,
+					count: h.length
+				}), t({
+					nodes: h,
+					firstHeaders: v,
+					firstClientId: y,
+					rawMessages: g
+				}));
+			}), o) {
+				m();
+				return;
+			}
+			x = setTimeout(() => {
+				o || (o = !0, S(), r(new e.ErrorInfo(`unable to look up input event; received ${String(h.length)} of ${String(f)} input events for invocation ${i} within ${String(s)}ms`, T.InputEventNotFound, 504)));
+			}, s);
+		}
+	});
+}, fe = class {
+	constructor(e) {
+		this._registeredRuns = /* @__PURE__ */ new Map(), this._runIdByInputCodecMessageId = /* @__PURE__ */ new Map(), this._deferredCancels = /* @__PURE__ */ new Map(), this._pendingInputEventLookups = /* @__PURE__ */ new Map(), this._inputEventBuffer = /* @__PURE__ */ new Map(), this._state = "ready", this._codec = e.codec;
+		let t = { params: {
+			...B(e.client, e.codec).params,
+			rewind: e.rewindWindow ?? "2m"
+		} };
+		this._channel = e.client.channels.get(e.channelName, t), this._logger = e.logger?.withContext({ component: "AgentSession" }), this._onError = e.onError, this._runManager = ue(this._channel, this._logger), this._inputEventLookupTimeoutMs = e.inputEventLookupTimeoutMs ?? 3e4, this._inputEventBufferLimit = e.inputEventBufferLimit ?? 200, this._channelListener = (e) => {
 			this._handleChannelMessage(e);
-		}, 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._hasAttachedOnce = this._channel.state === "attached", this._onChannelStateChange = (e) => {
+		}, this._hasAttachedOnce = this._channel.state === "attached", this._onChannelStateChange = (e) => {
 			this._handleChannelStateChange(e);
-		}, this._channel.on(this._onChannelStateChange), this._logger?.debug("DefaultServerTransport(); transport created");
+		}, this._channel.on(this._onChannelStateChange), this._logger?.debug("DefaultAgentSession(); session created");
+	}
+	connect() {
+		return this._state === "closed" ? Promise.reject(new e.ErrorInfo("unable to connect; session is closed", T.SessionClosed, 400)) : this._connectPromise ? this._connectPromise : (this._logger?.trace("DefaultAgentSession.connect();"), this._connectPromise = this._channel.subscribe(this._channelListener).then(() => {
+			this._logger?.debug("DefaultAgentSession.connect(); subscribed and attached");
+		}, (t) => {
+			let n = new e.ErrorInfo(`unable to subscribe to channel; ${t instanceof Error ? t.message : String(t)}`, T.SessionSubscriptionError, 500, t instanceof e.ErrorInfo ? t : void 0);
+			throw this._logger?.error("DefaultAgentSession.connect(); subscribe failed"), this._onError?.(n), n;
+		}), this._connectPromise);
+	}
+	_registerInputEventListener(e, t) {
+		for (let n of e) this._pendingInputEventLookups.set(n, t);
+		for (let n of e) {
+			let e = this._inputEventBuffer.get(n);
+			if (e) {
+				this._inputEventBuffer.delete(n);
+				for (let n of e) t(n);
+			}
+		}
+		return () => {
+			for (let n of e) this._pendingInputEventLookups.get(n) === t && this._pendingInputEventLookups.delete(n);
+		};
 	}
-	newTurn(e) {
-		return this._logger?.trace("DefaultServerTransport.newTurn();", { turnId: e.turnId }), this._createTurn(e);
+	createRun(e, t) {
+		return this._logger?.trace("DefaultAgentSession.createRun();", { inputEventId: e.inputEventId }), this._createRun(e, t ?? {});
 	}
-	close() {
-		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");
+	async close() {
+		if (this._state !== "closed") {
+			this._state = "closed", this._logger?.trace("DefaultAgentSession.close();"), this._connectPromise && this._channel.unsubscribe(this._channelListener), this._channel.off(this._onChannelStateChange);
+			for (let e of this._registeredRuns.values()) e.controller.abort();
+			if (this._registeredRuns.clear(), this._runIdByInputCodecMessageId.clear(), this._deferredCancels.clear(), this._pendingInputEventLookups.clear(), this._inputEventBuffer.clear(), this._runManager.close(), this._connectPromise) try {
+				await this._channel.detach();
+			} catch (e) {
+				this._logger?.debug("DefaultAgentSession.close(); channel detach failed", { error: e });
+			}
+			this._logger?.debug("DefaultAgentSession.close(); session 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 = 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", {
-			matchedTurnIds: i,
-			filter: r
-		});
-		let a = /* @__PURE__ */ new Map();
-		for (let e of i) {
-			let t = this._registeredTurns.get(e);
-			a.set(e, t?.clientId ?? "");
+	async _handleCancelMessage(e) {
+		let t = O(e), n = t[o], r = t[_];
+		if (!n && !r) {
+			this._logger?.warn("DefaultAgentSession._handleCancelMessage(); missing run-id and input-codec-message-id", { serial: e.serial });
+			return;
 		}
-		let o = {
-			message: t,
-			filter: r,
-			matchedTurnIds: i,
-			turnOwners: a
+		let i = n ?? (r ? this._runIdByInputCodecMessageId.get(r) : void 0), a = i ? this._registeredRuns.get(i) : void 0;
+		if (!a) {
+			r !== void 0 && this._bufferDeferredCancel(r, e);
+			return;
+		}
+		await this._cancelRegistration(a, e);
+	}
+	_bufferDeferredCancel(e, t) {
+		let n = G(this._deferredCancels, e, this._inputEventBufferLimit);
+		n !== void 0 && this._logger?.warn("DefaultAgentSession._bufferDeferredCancel(); deferred-cancel buffer full, dropping oldest", {
+			evictedInputCodecMessageId: n,
+			limit: this._inputEventBufferLimit
+		}), this._deferredCancels.set(e, t), this._logger?.debug("DefaultAgentSession._bufferDeferredCancel(); buffered early cancel", {
+			inputCodecMessageId: e,
+			serial: t.serial
+		});
+	}
+	async _pullDeferredCancel(e, t) {
+		let n = this._deferredCancels.get(t);
+		n !== void 0 && (this._deferredCancels.delete(t), this._logger?.debug("DefaultAgentSession._pullDeferredCancel(); honouring buffered cancel", {
+			runId: e.runId,
+			inputCodecMessageId: t
+		}), await this._cancelRegistration(e, n));
+	}
+	async _cancelRegistration(t, n) {
+		let { runId: r } = t;
+		this._logger?.debug("DefaultAgentSession._cancelRegistration(); matched run", { runId: r });
+		let i = {
+			message: n,
+			runId: r
 		};
-		for (let t of i) {
-			let n = this._registeredTurns.get(t);
-			if (n) try {
-				if (n.onCancel && !await n.onCancel(o)) {
-					this._logger?.debug("DefaultServerTransport._handleCancelMessage(); cancel rejected by onCancel", { turnId: t });
-					continue;
-				}
-				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)}`, C.CancelListenerError, 500, r instanceof e.ErrorInfo ? r : void 0);
-				this._logger?.error("DefaultServerTransport._handleCancelMessage(); onCancel threw", { turnId: t }), (n.onError ?? this._onError)?.(i);
+		try {
+			if (t.onCancel && !await t.onCancel(i)) {
+				this._logger?.debug("DefaultAgentSession._cancelRegistration(); cancel rejected by onCancel", { runId: r });
+				return;
 			}
+			t.controller.abort(), this._logger?.debug("DefaultAgentSession._cancelRegistration(); run cancelled", { runId: r });
+		} catch (n) {
+			let i = new e.ErrorInfo(`unable to process cancel for run ${r}; onCancel handler threw: ${n instanceof Error ? n.message : String(n)}`, T.CancelListenerError, 500, n instanceof e.ErrorInfo ? n : void 0);
+			this._logger?.error("DefaultAgentSession._cancelRegistration(); onCancel threw", { runId: r }), (t.onError ?? this._onError)?.(i);
 		}
 	}
 	_handleChannelStateChange(t) {
-		if (this._state === N.CLOSED) return;
+		if (this._state === "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", {
+		this._logger?.error("DefaultAgentSession._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);
+		let i = new e.ErrorInfo(`unable to deliver cancel messages; channel continuity lost (${n}${n === "attached" ? ", resumed: false" : ""})`, T.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)}`, C.CancelListenerError, 500, t instanceof e.ErrorInfo ? t : void 0);
-				this._logger?.error("DefaultServerTransport._handleChannelMessage(); cancel routing error"), this._onError?.(n);
-			});
+			if (t.name === "ai-cancel") {
+				this._handleCancelMessage(t).catch((t) => {
+					let n = new e.ErrorInfo(`unable to route cancel message; ${t instanceof Error ? t.message : String(t)}`, T.CancelListenerError, 500, t instanceof e.ErrorInfo ? t : void 0);
+					this._logger?.error("DefaultAgentSession._handleChannelMessage(); cancel routing error"), this._onError?.(n);
+				});
+				return;
+			}
+			let n = O(t)[c];
+			if (n !== void 0) {
+				let e = this._pendingInputEventLookups.get(n);
+				if (e) e(t);
+				else {
+					let e = this._inputEventBuffer.get(n);
+					if (e) e.push(t);
+					else {
+						let e = G(this._inputEventBuffer, n, this._inputEventBufferLimit);
+						e !== void 0 && this._logger?.warn("DefaultAgentSession._handleChannelMessage(); input-event buffer full, dropping oldest entry", {
+							evictedEventId: e,
+							limit: this._inputEventBufferLimit
+						}), this._inputEventBuffer.set(n, [t]);
+					}
+				}
+			}
 		} catch (t) {
-			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);
+			let n = new e.ErrorInfo(`unable to process channel message; ${t instanceof Error ? t.message : String(t)}`, T.SessionSubscriptionError, 500, t instanceof e.ErrorInfo ? t : void 0);
+			this._logger?.error("DefaultAgentSession._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, signal: u } = t, d = new AbortController(), f = P.INITIALIZED, p = u ? AbortSignal.any([d.signal, u]) : d.signal, m = {
-			turnId: n,
-			clientId: r ?? "",
-			controller: d,
-			signal: p,
-			onCancel: o,
-			onError: s
+	async _requireConnected(t) {
+		if (!this._connectPromise) throw new e.ErrorInfo(`unable to ${t}; connect() must be called before ${t}()`, T.InvalidArgument, 400);
+		return this._connectPromise;
+	}
+	_createRun(t, n) {
+		let r = n.runId ?? crypto.randomUUID(), i = n.invocationId ?? crypto.randomUUID(), a = this._inputEventLookupTimeoutMs, { onMessage: s, onCancelled: c, onCancel: d, onError: f, signal: g } = n, _ = new AbortController(), v = "initialized", y = g ? AbortSignal.any([_.signal, g]) : _.signal, b = {
+			runId: r,
+			invocationId: i,
+			controller: _,
+			signal: y,
+			onCancel: d,
+			onError: f
 		};
-		this._registeredTurns.set(n, m);
-		let h = this._logger, g = this._turnManager, _ = this._attachPromise, v = this._codec, y = this._channel, b = this._registeredTurns;
+		this._registeredRuns.set(r, b);
+		let x = this._logger, S = this._runManager, C = this._codec, w = this._channel, E = this._registeredRuns, D = this._runIdByInputCodecMessageId, O = this._deferredCancels, k = this._requireConnected.bind(this), ee = this._registerInputEventListener.bind(this), A = this._pullDeferredCancel.bind(this), j = t.inputEventId, M = [], N = { get messages() {
+			return M;
+		} }, P, F, I, L, R, z, B = !1, H, U, W, G = () => {
+			E.delete(r), z !== void 0 && (D.delete(z), O.delete(z));
+		}, K, q;
 		return {
-			get turnId() {
-				return n;
+			get runId() {
+				return r;
+			},
+			get invocationId() {
+				return i;
 			},
 			get abortSignal() {
-				return p;
+				return y;
+			},
+			get view() {
+				return N;
+			},
+			get messages() {
+				return q === void 0 ? K === void 0 ? M.map((e) => e.message) : C.getMessages(K).map((e) => e.message) : [...q];
 			},
 			start: async () => {
-				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 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)}`, C.TurnLifecycleError, 500, t instanceof e.ErrorInfo ? t : void 0);
-						throw h?.error("Turn.start(); failed to publish turn-start", { turnId: n }), r;
-					}
-					h?.debug("Turn.start(); turn started", { turnId: n });
+				if (x?.trace("Run.start();", {
+					runId: r,
+					inputEventId: j
+				}), await k("start"), y.aborted) throw new e.ErrorInfo(`unable to start run; run ${r} was cancelled before start()`, T.InvalidArgument, 400);
+				if (v !== "initialized") return;
+				if (v = "started", j && a > 0) try {
+					let e = await de({
+						register: (e) => ee([j], e),
+						codec: C,
+						invocationId: i,
+						runId: r,
+						expectedInputEventIds: [j],
+						timeoutMs: a,
+						signal: y,
+						logger: x
+					});
+					for (let t of e.nodes) M.push(t);
+					e.firstHeaders !== void 0 && (H = e.firstHeaders), e.firstClientId !== void 0 && (F = e.firstClientId), W = e.rawMessages;
+				} catch (t) {
+					let n = t instanceof e.ErrorInfo ? t : new e.ErrorInfo(`unable to look up input event; ${t instanceof Error ? t.message : String(t)}`, T.InputEventNotFound, 504);
+					throw G(), x?.error("Run.start(); input-event lookup failed", {
+						runId: r,
+						invocationId: i
+					}), n;
 				}
-			},
-			addMessages: async (t, r) => {
-				if (h?.trace("Turn.addMessages();", {
-					turnId: n,
-					count: t.length
-				}), 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 = [];
+				let t = H ?? M[0]?.headers;
+				if (t) {
+					P = t[u], I = t[p], L = t[m], R = t[h], z = t[l];
+					let e = t[o];
+					B = e !== void 0, e !== void 0 && e !== r && (E.delete(r), r = e, b.runId = r, E.set(r, b));
+				}
+				U = M.at(-1)?.codecMessageId ?? I, z !== void 0 && (D.set(z, r), await A(b, z));
 				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);
-					}
+					await S.startRun(r, P, _, {
+						parent: U,
+						forkOf: L,
+						regenerates: R,
+						invocationId: i,
+						inputClientId: F,
+						inputCodecMessageId: z,
+						continuation: B
+					});
 				} 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;
+					let n = new e.ErrorInfo(`unable to publish run-start for run ${r}; ${t instanceof Error ? t.message : String(t)}`, T.RunLifecycleError, 500, t instanceof e.ErrorInfo ? t : void 0);
+					throw x?.error("Run.start(); failed to publish run-start", { runId: r }), n;
 				}
-				return h?.debug("Turn.addMessages(); messages published", {
-					turnId: n,
-					count: t.length
-				}), { msgIds: a };
+				x?.debug("Run.start(); run started", {
+					runId: r,
+					inputEventId: j
+				});
 			},
 			addEvents: async (t) => {
-				if (h?.trace("Turn.addEvents();", {
-					turnId: n,
+				if (x?.trace("Run.addEvents();", {
+					runId: r,
 					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);
+				}), await k("addEvents"), v === "initialized") throw new e.ErrorInfo(`unable to add events; start() must be called before addEvents() (run ${r})`, T.InvalidArgument, 400);
+				let n = S.getClientId(r);
 				try {
 					for (let e of t) {
-						let t = j({
+						let t = V({
 							role: "assistant",
-							turnId: n,
-							msgId: e.msgId,
-							turnClientId: r,
-							amend: e.msgId
-						}), a = v.createEncoder(y, {
+							runId: r,
+							codecMessageId: e.codecMessageId,
+							runClientId: n,
+							invocationId: i,
+							inputClientId: F,
+							inputCodecMessageId: z
+						}), a = C.createEncoder(w, {
 							extras: { headers: t },
-							onMessage: i
+							onMessage: s
 						});
-						for (let t of e.events) await a.writeEvent(t);
+						for (let t of e.events) await a.publishOutput(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;
+					let n = new e.ErrorInfo(`unable to publish events for run ${r}; ${t instanceof Error ? t.message : String(t)}`, T.RunLifecycleError, 500, t instanceof e.ErrorInfo ? t : void 0);
+					throw x?.error("Run.addEvents(); publish failed", { runId: r }), n;
 				}
-				h?.debug("Turn.addEvents(); events published", {
-					turnId: n,
+				x?.debug("Run.addEvents(); events published", {
+					runId: r,
 					count: t.length
 				});
 			},
-			streamResponse: async (t, r) => {
-				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({
+			loadProjection: async () => {
+				x?.trace("Run.loadProjection();", { runId: r }), await k("loadProjection");
+				let e = await ae({
+					channel: w,
+					codec: C,
+					runId: r,
+					signal: y,
+					logger: x,
+					liveMessages: W
+				});
+				return K = e, e;
+			},
+			loadConversation: async (e) => {
+				x?.trace("Run.loadConversation();", { runId: r }), await k("loadConversation");
+				let { messages: t, projection: n } = await oe({
+					channel: w,
+					codec: C,
+					runId: r,
+					signal: y,
+					logger: x,
+					liveMessages: W,
+					assistantParentFallback: U,
+					pageLimit: e?.pageLimit ?? 200,
+					maxMessages: e?.maxMessages ?? 2e3
+				});
+				return K = n, q = t, t;
+			},
+			pipe: async (t, n) => {
+				if (x?.trace("Run.pipe();", { runId: r }), await k("pipe"), v === "initialized") throw new e.ErrorInfo(`unable to pipe stream; start() must be called before pipe() (run ${r})`, T.InvalidArgument, 400);
+				let a = S.getClientId(r), o = n?.parent ?? U, l = n?.forkOf ?? L, u = R, d = crypto.randomUUID(), p = V({
 					role: "assistant",
-					turnId: n,
-					msgId: d,
-					turnClientId: o,
-					parent: u,
-					forkOf: r?.forkOf ?? l
-				}), b = await M(t, v.createEncoder(y, {
-					extras: { headers: m },
-					onMessage: i,
+					runId: r,
+					codecMessageId: d,
+					runClientId: a,
+					parent: o,
+					forkOf: l,
+					invocationId: i,
+					inputClientId: F,
+					inputCodecMessageId: z,
+					regenerates: u
+				}), m = await ce(t, C.createEncoder(w, {
+					extras: { headers: p },
+					onMessage: s,
 					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);
+				}), y, c, n?.resolveWriteOptions, x);
+				if (m.error) {
+					let t = new e.ErrorInfo(`unable to pipe response for run ${r}; ${m.error.message}`, T.StreamError, 500, m.error instanceof e.ErrorInfo ? m.error : void 0);
+					x?.error("Run.pipe(); stream error", { runId: r }), f?.(t);
+				}
+				return x?.debug("Run.pipe(); stream finished", {
+					runId: r,
+					reason: m.reason
+				}), m;
+			},
+			suspend: async () => {
+				if (x?.trace("Run.suspend();", { runId: r }), await k("suspend"), v === "initialized") throw new e.ErrorInfo(`unable to suspend run; start() must be called before suspend() (run ${r})`, T.InvalidArgument, 400);
+				if (v !== "ended") {
+					v = "ended";
+					try {
+						await S.suspendRun(r, i, F, z);
+					} catch (t) {
+						let n = new e.ErrorInfo(`unable to publish run-suspend for run ${r}; ${t instanceof Error ? t.message : String(t)}`, T.RunLifecycleError, 500, t instanceof e.ErrorInfo ? t : void 0);
+						throw x?.error("Run.suspend(); failed to publish run-suspend", { runId: r }), n;
+					} finally {
+						G();
+					}
+					x?.debug("Run.suspend(); run suspended", { runId: r });
 				}
-				return h?.debug("Turn.streamResponse(); stream finished", {
-					turnId: n,
-					reason: b.reason
-				}), b;
 			},
 			end: async (t) => {
-				if (h?.trace("Turn.end();", {
-					turnId: n,
+				if (x?.trace("Run.end();", {
+					runId: r,
 					reason: t
-				}), 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;
+				}), await k("end"), v === "initialized") throw new e.ErrorInfo(`unable to end run; start() must be called before end() (run ${r})`, T.InvalidArgument, 400);
+				if (v !== "ended") {
+					v = "ended";
 					try {
-						await g.endTurn(n, t);
+						await S.endRun(r, t, i, F, z);
 					} catch (t) {
-						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;
+						let n = new e.ErrorInfo(`unable to publish run-end for run ${r}; ${t instanceof Error ? t.message : String(t)}`, T.RunLifecycleError, 500, t instanceof e.ErrorInfo ? t : void 0);
+						throw x?.error("Run.end(); failed to publish run-end", { runId: r }), n;
 					} finally {
-						b.delete(n);
+						G();
 					}
-					h?.debug("Turn.end(); turn ended", {
-						turnId: n,
+					x?.debug("Run.end(); run ended", {
+						runId: r,
 						reason: t
 					});
 				}
 			}
 		};
 	}
-}, ae = (e) => new ie(e), F = (e) => ({
+}, pe = (e) => new fe(e), me = (e) => ({
 	logAction: (t, n, r) => {
 		e.error(n, { detail: r });
 	},
 	shouldLog: () => !0
-}), I = e.Realtime.EventEmitter, L = class extends I {
+}), he = e.Realtime.EventEmitter, Y = class extends he {
 	constructor(e) {
-		super(F(e));
+		super(me(e));
 	}
-}, R = /* @__PURE__ */ function(e) {
+}, ge = /* @__PURE__ */ function(e) {
 	return e.Trace = "trace", e.Debug = "debug", e.Info = "info", e.Warn = "warn", e.Error = "error", e.Silent = "silent", e;
-}({}), z = (e, t, n) => {
+}({}), _e = (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 R.Trace:
-		case R.Debug:
+		case "trace":
+		case "debug":
 			console.log(i);
 			break;
-		case R.Info:
+		case "info":
 			console.info(i);
 			break;
-		case R.Warn:
+		case "warn":
 			console.warn(i);
 			break;
-		case R.Error:
+		case "error":
 			console.error(i);
 			break;
-		case R.Silent: break;
-	}
-}, 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;
-}(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 {
+		case "silent": break;
+	}
+}, ve = (e) => new be(e.logHandler ?? _e, e.logLevel), ye = new Map([
+	["trace", 0],
+	["debug", 1],
+	["info", 2],
+	["warn", 3],
+	["error", 4],
+	["silent", 5]
+]), be = class t {
 	constructor(t, n, r) {
 		this._handler = t, this._context = r;
-		let i = H.get(n);
-		if (i === void 0) throw new e.ErrorInfo(`unable to create logger; invalid log level: ${n}`, C.InvalidArgument, 400);
+		let i = ye.get(n);
+		if (i === void 0) throw new e.ErrorInfo(`unable to create logger; invalid log level: ${n}`, T.InvalidArgument, 400);
 		this._levelNumber = i;
 	}
 	trace(e, t) {
-		this._write(e, R.Trace, V.Trace, t);
+		this._write(e, "trace", 0, t);
 	}
 	debug(e, t) {
-		this._write(e, R.Debug, V.Debug, t);
+		this._write(e, "debug", 1, t);
 	}
 	info(e, t) {
-		this._write(e, R.Info, V.Info, t);
+		this._write(e, "info", 2, t);
 	}
 	warn(e, t) {
-		this._write(e, R.Warn, V.Warn, t);
+		this._write(e, "warn", 3, t);
 	}
 	error(e, t) {
-		this._write(e, R.Error, V.Error, t);
+		this._write(e, "error", 4, t);
 	}
 	withContext(e) {
-		let n = [...H.entries()].find(([, e]) => e === this._levelNumber)?.[0] ?? R.Error;
+		let n = [...ye.entries()].find(([, e]) => e === this._levelNumber)?.[0] ?? "error";
 		return new t(this._handler, n, this._mergeContext(e));
 	}
 	_write(e, t, n, r) {
@@ -443,143 +828,131 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 			...e
 		} : this._context : e ?? void 0;
 	}
-}, W = class {
+}, X = (e) => e.kind === "run" ? e.runId : e.codecMessageId, Z = (e) => e.kind === "run" ? e.startSerial : e.serial, xe = (e, t, n) => {
+	let r = e.get(t);
+	r || (r = /* @__PURE__ */ new Set(), e.set(t, r)), r.add(n);
+}, Se = (e, t, n) => {
+	let r = e.get(t);
+	r && (r.delete(n), r.size === 0 && e.delete(t));
+}, Ce = class {
 	constructor(e, 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);
+		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 Y(t);
 	}
 	_compareNodes(e, t) {
-		let n = e.node.serial, r = t.node.serial;
+		let n = Z(e.node), r = Z(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;
 	}
-	_insertSorted(e) {
-		if (e.node.serial === void 0) {
-			this._sortedList.push(e);
+	_insertSortedNode(e) {
+		if (Z(e.node) === void 0) {
+			this._sortedNodes.push(e);
 			return;
 		}
-		let t = 0, n = this._sortedList.length;
+		let t = 0, n = this._sortedNodes.length;
 		for (; t < n;) {
-			let r = t + n >>> 1, i = this._sortedList[r];
+			let r = t + n >>> 1, i = this._sortedNodes[r];
 			if (!i) break;
 			this._compareNodes(i, e) <= 0 ? t = r + 1 : n = r;
 		}
-		this._sortedList.splice(t, 0, e);
+		this._sortedNodes.splice(t, 0, e);
+	}
+	_removeSortedNode(e) {
+		let t = this._sortedNodes.indexOf(e);
+		t !== -1 && this._sortedNodes.splice(t, 1);
 	}
-	_removeSorted(e) {
-		let t = this._sortedList.indexOf(e);
-		t !== -1 && this._sortedList.splice(t, 1);
+	_insertNode(e, t, n) {
+		this._nodeIndex.set(e, t), this._addToParentIndex(n, e), this._insertSortedNode(t), this._structuralVersion++;
+	}
+	_promoteSerial(e) {
+		this._removeSortedNode(e), this._insertSortedNode(e), this._structuralVersion++;
+	}
+	_foldInto(e, t, n, r) {
+		for (let i of t) try {
+			e.node.projection = this._codec.fold(e.node.projection, i, {
+				serial: n ?? "",
+				messageId: r
+			});
+		} catch (t) {
+			this._logger.error("Tree._foldInto(); fold threw", {
+				key: X(e.node),
+				messageId: r,
+				err: t
+			});
+		}
 	}
 	_addToParentIndex(e, t) {
-		let n = this._parentIndex.get(e);
-		n || (n = /* @__PURE__ */ new Set(), this._parentIndex.set(e, n)), n.add(t);
+		xe(this._parentIndex, e, t);
 	}
 	_removeFromParentIndex(e, t) {
-		let n = this._parentIndex.get(e);
-		n && (n.delete(t), n.size === 0 && this._parentIndex.delete(e));
+		Se(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([X(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(X(t));
+		}
+		return t;
 	}
 	_getSiblingGroup(e) {
-		let t = this._nodeIndex.get(e);
-		if (!t) return [];
-		let n = t.node, r = new Set([n.msgId]);
-		for (; n.forkOf && !r.has(n.forkOf);) {
-			let e = this._nodeIndex.get(n.forkOf);
-			if (!e || e.node.parentId !== n.parentId) break;
-			n = e.node, r.add(n.msgId);
-		}
-		let i = n.parentId, a = n.msgId, o = [], s = this._parentIndex.get(i);
-		if (s) for (let e of s) {
+		this._siblingCacheVersion !== this._structuralVersion && (this._siblingCache.clear(), this._siblingCacheVersion = this._structuralVersion);
+		let t = this._siblingCache.get(e);
+		if (t) return t;
+		let n = this._nodeIndex.get(e);
+		if (!n) return [];
+		let r = n.node;
+		r.kind === "input" && (r = this._inputGroupRoot(r));
+		let i = r.parentCodecMessageId, a = [], o = this._parentIndex.get(i);
+		if (o) for (let e of o) {
 			let t = this._nodeIndex.get(e);
-			t && this._isSiblingOf(t.node, a) && o.push(t);
+			t && this._isSiblingOf(t.node, r) && a.push(t);
 		}
-		return o.sort((e, t) => this._compareNodes(e, t)), o.map((e) => e.node);
+		a.sort((e, t) => this._compareNodes(e, t));
+		for (let e of a) this._siblingCache.set(X(e.node), a);
+		return this._siblingCache.set(e, a), a;
 	}
 	_isSiblingOf(e, t) {
-		if (e.msgId === t) return !0;
-		let n = e, r = new Set([n.msgId]);
-		for (; n.forkOf;) {
-			if (n.forkOf === t) return !0;
-			if (r.has(n.forkOf)) break;
-			let e = this._nodeIndex.get(n.forkOf);
+		if (e.kind !== t.kind || e.parentCodecMessageId !== t.parentCodecMessageId) return !1;
+		if (e.kind === "run") return !0;
+		let n = X(t);
+		if (X(e) === n) return !0;
+		let r = e, i = new Set([X(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;
-			n = e.node, r.add(n.msgId);
+			r = e.node, i.add(X(r));
 		}
 		return !1;
 	}
 	getGroupRoot(e) {
 		let t = this._nodeIndex.get(e);
 		if (!t) return e;
-		let n = t.node, r = new Set([n.msgId]);
-		for (; n.forkOf && !r.has(n.forkOf);) {
-			let e = this._nodeIndex.get(n.forkOf);
-			if (!e || e.node.parentId !== n.parentId) break;
-			n = e.node, r.add(n.msgId);
-		}
-		return n.msgId;
+		if (t.node.kind === "input") return X(this._inputGroupRoot(t.node));
+		let n = this._getSiblingGroup(e)[0]?.node;
+		return n ? X(n) : e;
 	}
-	flattenNodes(e) {
-		this._logger.trace("DefaultTree.flattenNodes();");
+	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._sortedList) {
-			let a = i.node, { msgId: o, parentId: s } = a;
+		for (let i of this._sortedNodes) {
+			let a = i.node, o = X(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 && c.some((e) => e.msgId === i)) n = i;
+					if (i !== void 0 && c.some((e) => X(e.node) === i)) n = i;
 					else {
 						let e = c.at(-1);
 						if (!e) break;
-						n = e.msgId;
+						n = X(e.node);
 					}
 					r.set(t, n);
 				}
@@ -589,64 +962,185 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 		}
 		return t;
 	}
-	getSiblings(e) {
-		return this._logger.trace("DefaultTree.getSiblings();", { msgId: e }), this._getSiblingGroup(e).map((e) => e.message);
+	getRunNode(e) {
+		this._logger.trace("DefaultTree.getRunNode();", { runId: e });
+		let t = this._nodeIndex.get(e)?.node;
+		return t?.kind === "run" ? t : void 0;
 	}
-	getSiblingNodes(e) {
-		return this._getSiblingGroup(e);
+	getNode(e) {
+		return this._logger.trace("DefaultTree.getNode();", { key: e }), this._nodeIndex.get(e)?.node;
 	}
-	hasSiblings(e) {
-		return this._getSiblingGroup(e).length > 1;
+	getNodeByCodecMessageId(e) {
+		this._logger.trace("DefaultTree.getNodeByCodecMessageId();", { codecMessageId: e });
+		let t = this._codecMessageIdToNodeKey.get(e);
+		return t === void 0 ? void 0 : this._nodeIndex.get(t)?.node;
 	}
-	getNode(e) {
-		return this._logger.trace("DefaultTree.getNode();", { msgId: e }), this._nodeIndex.get(e)?.node;
-	}
-	getHeaders(e) {
-		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, 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("Tree.upsert(); promoting serial", {
-				msgId: e,
-				serial: r
-			}), o.node.serial = r, this._removeSorted(o), this._insertSorted(o), this._structuralVersion++), this._emitter.emit("update");
+	getReplyRuns(e) {
+		let t = this._replyRunsByInput.get(e);
+		if (!t) return [];
+		let n = [];
+		for (let e of t) {
+			let t = this._nodeIndex.get(e)?.node;
+			t?.kind === "run" && n.push(t);
+		}
+		return n;
+	}
+	getSiblingNodes(e) {
+		return this._logger.trace("DefaultTree.getSiblingNodes();", { key: e }), this._getSiblingGroup(e).map((e) => e.node);
+	}
+	applyMessage(e, t, n) {
+		let r = t[o], i = t[l], a = r === void 0 && i !== void 0 && t.role === "user" && e.inputs.length > 0 ? i : void 0;
+		if (r === void 0 && a === void 0) {
+			this._logger.warn("Tree.applyMessage(); message has no run-id and is not a user input; skipping");
 			return;
 		}
-		this._logger.trace("Tree.upsert(); inserting new node", {
-			msgId: e,
-			parentId: i,
-			forkOf: a
+		let s = [...e.inputs, ...e.outputs], c = a ?? r;
+		if (s.length === 0 && c !== void 0 && !this._nodeIndex.has(c)) return;
+		let u = this._structuralVersion;
+		a === void 0 ? r !== void 0 && this._applyRunMessage(r, e, t, n) : this._applyInputMessage(a, t, n, s), this._structuralVersion !== u && 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", {
+			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", {
+			runId: void 0,
+			inputCodecMessageId: e,
+			codecMessageId: e,
+			serial: n,
+			events: []
 		});
-		let s = {
+	}
+	_applyRunMessage(e, t, n, r) {
+		let i = n[l], a = n[_], 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);
+		}
+		c ? r && c.node.kind === "run" && !c.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 u = X(c.node);
+		i && this._codecMessageIdToNodeKey.set(i, u), this._foldInto(c, o, r, i), this._emitter.emit("output", {
+			runId: u,
+			inputCodecMessageId: a,
+			codecMessageId: i,
+			serial: r,
+			events: s
+		});
+	}
+	_indexReplyRun(e, t) {
+		e.parentCodecMessageId !== void 0 && xe(this._replyRunsByInput, e.parentCodecMessageId, t);
+	}
+	applyRunLifecycle(e) {
+		this._logger.trace("DefaultTree.applyRunLifecycle();", {
+			type: e.type,
+			runId: e.runId
+		});
+		let t = this._structuralVersion;
+		switch (e.type) {
+			case "start":
+				this._applyRunStart(e);
+				break;
+			case "suspend":
+				this._applyRunSuspend(e);
+				break;
+			case "resume":
+				this._applyRunResume(e);
+				break;
+			case "end":
+				this._applyRunEnd(e);
+				break;
+		}
+		this._emitter.emit("run", e), this._structuralVersion !== t && this._emitter.emit("update");
+	}
+	_applyRunStart(e) {
+		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) {
+				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);
+		} else if (!t) {
+			let t = this._createRunFromLifecycle(e);
+			this._insertNode(e.runId, t, t.node.parentCodecMessageId), this._indexReplyRun(t.node, e.runId);
+		}
+	}
+	_applyRunSuspend(e) {
+		let t = this._nodeIndex.get(e.runId);
+		t?.node.kind === "run" && (t.node.status = "suspended", t.node.endSerial = e.serial);
+	}
+	_applyRunResume(e) {
+		let t = this._nodeIndex.get(e.runId);
+		t?.node.kind === "run" && t.node.status === "suspended" && (t.node.status = "active");
+	}
+	_applyRunEnd(e) {
+		let t = this._nodeIndex.get(e.runId);
+		t?.node.kind === "run" && (t.node.status = e.reason, t.node.endSerial = e.serial);
+	}
+	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 && Se(this._replyRunsByInput, t.node.parentCodecMessageId, e), this._structuralVersion++, this._emitter.emit("update"));
+	}
+	_createRunFromHeaders(e, t, n) {
+		let r = t[m];
+		return this._buildRunNode({
+			runId: e,
+			parentCodecMessageId: t[p],
+			forkOf: r ? this._codecMessageIdToNodeKey.get(r) : void 0,
+			regeneratesCodecMessageId: t[h],
+			clientId: t["run-client-id"] ?? "",
+			invocationId: t["invocation-id"] ?? "",
+			startSerial: n
+		});
+	}
+	_buildRunNode(e) {
+		return {
 			node: {
-				kind: "message",
-				message: t,
-				msgId: e,
-				parentId: i,
-				forkOf: a,
-				headers: { ...n },
-				serial: r
+				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++
 		};
-		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("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");
+	_createInputNodeFromHeaders(e, t, n) {
+		let r = t[m];
+		return {
+			node: {
+				kind: "input",
+				codecMessageId: e,
+				parentCodecMessageId: t[p],
+				forkOf: r,
+				projection: this._codec.init(),
+				serial: n
+			},
+			insertSeq: this._seqCounter++
+		};
 	}
-	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;
+	_createRunFromLifecycle(e) {
+		let t = e.forkOf;
+		return this._buildRunNode({
+			runId: e.runId,
+			parentCodecMessageId: e.parent,
+			forkOf: t ? this._codecMessageIdToNodeKey.get(t) : void 0,
+			regeneratesCodecMessageId: e.regenerates,
+			clientId: e.clientId,
+			invocationId: e.invocationId,
+			startSerial: e.serial
+		});
 	}
 	on(e, t) {
 		let n = t;
@@ -657,165 +1151,101 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 	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);
+}, we = (e, t) => new Ce(e, t), Te = (e, t) => {
+	for (let n of t) {
+		let t = O(n), i = t[l];
+		if (!i) continue;
+		let a = n.action, o = a === "message.create" && "discrete" in t, s = t.stream === "true" && (a === "message.create" || a === "message.update" || a === "message.append"), c = t[r], u = c === "complete" || c === "cancelled";
+		(o || s) && e.startedCodecMessageIds.add(i), (o || u) && e.terminatedCodecMessageIds.add(i), e.startedCodecMessageIds.has(i) && e.terminatedCodecMessageIds.has(i) && e.completedCodecMessageIds.add(i);
 	}
-	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(h, n)), g) {
-				let e = n.msgHeaders.get(g);
-				e ? Object.keys(m).length > 0 && Object.assign(e, m) : (n.msgHeaders.set(g, { ...m }), _ && n.msgSerials.set(g, _));
-			}
-			n.accumulator.processOutputs(t);
-		} else {
-			i.processOutputs(t);
-			for (let 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, _));
-			}
-		}
-	}
-	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: n ? c.get(n) ?? {} : {},
-			serial: n ? u.get(n) ?? "" : ""
-		});
-	}
-	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 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);
+}, Ee = async (e, t, n) => {
+	e.rawMessages.push(...t.items), e.lastAblyPage = t, Te(e, t.items);
 	let r = e.returnedCount + n;
-	for (; e.completedMsgIds.size < r && t.hasNext();) {
-		e.logger.debug("decodeHistory.fetchUntilLimit(); fetching next page", {
+	for (; e.completedCodecMessageIds.size < r && t.hasNext();) {
+		e.logger.debug("loadHistory.fetchUntilLimit(); fetching next page", {
 			collected: e.rawMessages.length,
-			completed: e.completedMsgIds.size
+			completed: e.completedCodecMessageIds.size
 		});
 		let n = await t.next();
 		if (!n) break;
-		t = n, e.rawMessages.push(...n.items), e.lastAblyPage = n, J(e, n.items);
+		t = n, e.rawMessages.push(...n.items), e.lastAblyPage = n, Te(e, n.items);
 	}
-}, 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() : [];
+}, Q = (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() : [];
 	return e.returnedRawCount = e.rawMessages.length, {
-		items: i.map((e) => ({
-			message: e.message,
-			headers: e.headers,
-			serial: e.serial
-		})),
-		rawMessages: s,
-		hasNext: () => a || o,
+		rawMessages: o,
+		hasNext: () => i || a,
 		next: async () => {
-			if (a) return X(e, t);
-			if (!o || !e.lastAblyPage) return;
+			if (i) return Q(e, t);
+			if (!a || !e.lastAblyPage) return;
 			let n = await e.lastAblyPage.next();
-			if (n) return await Y(e, n, t), X(e, t);
+			if (n) return await Ee(e, n, t), Q(e, t);
 		}
 	};
-}, ce = async (e, t, n, r) => {
-	let i = n?.limit ?? 100, a = {
-		codec: t,
+}, De = async (e, t, n) => {
+	let r = t?.limit ?? 100, i = {
 		rawMessages: [],
 		returnedCount: 0,
 		returnedRawCount: 0,
 		lastAblyPage: void 0,
-		cachedDecode: void 0,
-		cachedAtRawLength: 0,
-		startedMsgIds: /* @__PURE__ */ new Set(),
-		terminatedMsgIds: /* @__PURE__ */ new Set(),
-		completedMsgIds: /* @__PURE__ */ new Set(),
-		logger: r
+		startedCodecMessageIds: /* @__PURE__ */ new Set(),
+		terminatedCodecMessageIds: /* @__PURE__ */ new Set(),
+		completedCodecMessageIds: /* @__PURE__ */ new Set(),
+		logger: n
 	};
-	r.trace("decodeHistory();", { limit: i });
-	let o = i * 10;
-	return await e.attach(), await Y(a, await e.history({
+	n.trace("loadHistory();", { limit: r });
+	let a = r * 10;
+	return await e.attach(), await Ee(i, await e.history({
 		untilAttach: !0,
-		limit: o
-	}), i), X(a, i);
-}, le = class {
+		limit: a
+	}), r), Q(i, r);
+}, Oe = (e) => Array.isArray(e) ? e : [e], ke = 3, $ = (e) => ({
+	runId: e.runId,
+	clientId: e.clientId,
+	status: e.status,
+	invocationId: e.invocationId
+}), Ae = 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._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 Y(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);
-		}), this._tree.on("turn", (e) => {
-			this._onTreeTurn(e);
+		}), this._tree.on("run", (e) => {
+			this._onTreeRun(e);
+		}), this._tree.on("output", (e) => {
+			this._onTreeOutput(e);
 		}));
 	}
+	_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"));
+	}
 	getMessages() {
-		return this.flattenNodes().map((e) => e.message);
+		return this._lastVisibleMessagePairs;
 	}
-	flattenNodes() {
-		return this._cachedNodes;
+	runs() {
+		return this._cachedNodes.filter((e) => e.kind === "run").map((e) => $(e));
 	}
 	_computeFlatNodes() {
-		let e = this._tree.flattenNodes(this._resolveSelections());
-		return this._withheldMsgIds.size === 0 ? e : e.filter((e) => !this._withheldMsgIds.has(e.msgId));
+		let e = this._treeVisibleNodes();
+		return this._withheldRunIds.size === 0 ? e : e.filter((e) => !this._withheldRunIds.has(X(e)));
+	}
+	_recomputeAndEmit() {
+		this._cachedNodes = this._computeFlatNodes(), this._updateVisibleSnapshot(this._cachedNodes), this._emitter.emit("update");
+	}
+	_recomputeAndEmitIfChanged() {
+		let e = this._computeFlatNodes();
+		this._visibleChanged(e) && (this._cachedNodes = e, this._updateVisibleSnapshot(e), this._emitter.emit("update"));
+	}
+	_runByCodecMessageId(e) {
+		let t = this._tree.getNodeByCodecMessageId(e);
+		return t?.kind === "run" ? t : void 0;
+	}
+	_extractMessages(e) {
+		let t = [];
+		for (let n of e) for (let e of this._codec.getMessages(n.projection)) t.push(e);
+		return t;
 	}
 	hasOlder() {
 		return this._withheldBuffer.length > 0 || this._hasMoreHistory;
@@ -843,7 +1273,7 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 					t || (this._hasMoreHistory = !1);
 					return;
 				}
-				await this._loadAndReveal(t, e);
+				await this._revealFromPage(t, e);
 			} catch (e) {
 				throw this._logger.error("DefaultView.loadOlder(); failed", { error: e }), e;
 			} finally {
@@ -851,132 +1281,182 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 			}
 		}
 	}
-	select(e, t) {
-		this._logger.trace("DefaultView.select();", {
-			msgId: e,
+	runOf(e) {
+		this._logger.trace("DefaultView.runOf();", { codecMessageId: e });
+		let t = this._tree.getNodeByCodecMessageId(e);
+		if (!t) return;
+		if (t.kind === "run") return $(t);
+		let n = this._selectedReplyRun(t.codecMessageId);
+		return n ? $(n) : void 0;
+	}
+	_selectedReplyRun(e) {
+		let t = this._tree.getReplyRuns(e);
+		if (t.length === 0) return;
+		if (t.length === 1) return t[0];
+		let n = this._tree.getGroupRoot(t[0]?.runId ?? ""), r = this._regenSelections.get(n), i = r && r.kind !== "pending" ? r.selectedRunId : void 0;
+		if (i !== void 0) {
+			let e = t.find((e) => e.runId === i);
+			if (e) return e;
+		}
+		return t.toSorted((e, t) => (e.startSerial ?? "￿").localeCompare(t.startSerial ?? "￿")).at(-1);
+	}
+	run(e) {
+		this._logger.trace("DefaultView.run();", { runId: e });
+		let t = this._tree.getRunNode(e);
+		return t ? $(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] : [];
+			});
+			if (e.length > 0) {
+				let n = this._resolveSelectedIndex(t), r = Math.max(0, Math.min(n, e.length - 1)), i = e[r];
+				return {
+					hasSiblings: e.length > 1,
+					siblings: e,
+					index: r,
+					selected: i
+				};
+			}
+		}
+		let n = this._tree.getNodeByCodecMessageId(e);
+		if (n) {
+			let t = this._codec.getMessages(n.projection).find((t) => t.codecMessageId === e);
+			if (t !== void 0) return {
+				hasSiblings: !1,
+				siblings: [t.message],
+				index: 0,
+				selected: t.message
+			};
+		}
+		return {
+			hasSiblings: !1,
+			siblings: [],
+			index: 0,
+			selected: void 0
+		};
+	}
+	selectSibling(e, t) {
+		this._logger.trace("DefaultView.selectSibling();", {
+			codecMessageId: 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, {
+		let n = this._resolveMessageBranchPoint(e);
+		if (!n) return;
+		let r = Math.max(0, Math.min(t, n.siblings.length - 1)), i = n.siblings[r];
+		i && (n.kind === "fork-of" ? (this._branchSelections.set(n.groupRoot, {
+			kind: "user",
+			selectedKey: X(i)
+		}), this._logger.debug("DefaultView.selectSibling(); fork-of", {
+			codecMessageId: e,
+			index: r,
+			selectedKey: X(i)
+		})) : (this._regenSelections.set(n.groupRoot, {
 			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);
+			selectedRunId: X(i)
+		}), this._logger.debug("DefaultView.selectSibling(); regenerate", {
+			codecMessageId: e,
+			index: r,
+			selectedRunId: X(i),
+			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) => X(e) === t.selectedKey);
+			return n === -1 ? e.siblings.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) => X(e) === t.selectedRunId);
+		return n === -1 ? e.siblings.length - 1 : n;
 	}
-	getNode(e) {
-		return this._tree.getNode(e);
+	_resolveMessageBranchPoint(e) {
+		let t = this._tree.getNodeByCodecMessageId(e);
+		if (!t) return;
+		if (t.kind === "input") {
+			let e = this._tree.getSiblingNodes(t.codecMessageId);
+			return e.length > 1 ? {
+				kind: "fork-of",
+				groupRoot: this._tree.getGroupRoot(t.codecMessageId),
+				siblings: e
+			} : void 0;
+		}
+		let n = this._tree.getSiblingNodes(t.runId);
+		if (n.length > 1 && this._codec.getMessages(t.projection).at(0)?.codecMessageId === e) return {
+			kind: "regen",
+			groupRoot: this._tree.getGroupRoot(t.runId),
+			siblings: n
+		};
 	}
 	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;
+		if (this._logger.trace("DefaultView.send();"), this._closed) throw new e.ErrorInfo("unable to send; view is closed", T.InvalidArgument, 400);
+		let r = Oe(t), i = this._lastVisibleMessagePairs.at(-1)?.codecMessageId, a = await this._sendDelegate(r, n, i);
+		return this._applyForkAutoSelect(a, n), a;
+	}
+	_applyForkAutoSelect(e, t) {
+		if (!t?.forkOf) return;
+		let n = e.optimisticCodecMessageIds.at(0);
+		if (n === void 0) return;
+		let r = this._tree.getGroupRoot(n);
+		this._branchSelections.set(r, {
+			kind: "auto",
+			selectedKey: n
+		}), this._recomputeAndEmit();
+	}
+	_applyRegenerateAutoSelect(e, t) {
+		let n = this._runByCodecMessageId(t);
+		if (!n) return;
+		let r = this._tree.getGroupRoot(n.runId);
+		this._regenSelections.set(r, {
+			kind: "pending",
+			carrierCodecMessageId: e.inputCodecMessageId
+		}), this._logger.debug("DefaultView._applyRegenerateAutoSelect(); deferring regenerate selection", {
+			anchorCodecMessageId: t,
+			groupRoot: r,
+			carrier: e.inputCodecMessageId
+		}), this._resolvePendingRegenSelections(), this._recomputeAndEmitIfChanged();
 	}
 	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([], {
+		if (this._logger.trace("DefaultView.regenerate();", { messageId: t }), this._closed) throw new e.ErrorInfo("unable to regenerate; view is closed", T.InvalidArgument, 400);
+		let r = this._runByCodecMessageId(t);
+		if (!r) throw new e.ErrorInfo(`unable to regenerate; message not found in tree: ${t}`, T.InvalidArgument, 400);
+		let i = this._findParentMsgId(r, t);
+		if (!i) throw new e.ErrorInfo(`unable to regenerate; parent user message not found for ${t}`, T.InvalidArgument, 400);
+		let a = t;
+		r.regeneratesCodecMessageId !== void 0 && this._codec.getMessages(r.projection).at(0)?.codecMessageId === t && (a = r.regeneratesCodecMessageId);
+		let o = {
 			...n,
-			body: {
-				history: this._getHistoryBefore(t),
-				...n?.body
-			},
-			forkOf: t,
 			parent: i
-		});
+		}, s = this._codec.createRegenerate(a, i), c = await this._sendDelegate([s], o, i);
+		return this._applyRegenerateAutoSelect(c, a), c;
 	}
 	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;
+		if (this._logger.trace("DefaultView.edit();", { messageId: t }), this._closed) throw new e.ErrorInfo("unable to edit; view is closed", T.InvalidArgument, 400);
+		let i = this._tree.getNodeByCodecMessageId(t);
+		if (!i) throw new e.ErrorInfo(`unable to edit; message not found in tree: ${t}`, T.InvalidArgument, 400);
+		let a = this._findParentMsgId(i, t);
 		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);
+	_findParentMsgId(e, t) {
+		let n = this._lastVisibleMessagePairs, r = n.findIndex((e) => e.codecMessageId === t);
+		if (r > 0) return n[r - 1]?.codecMessageId;
+		if (r === 0) return;
+		let i = this._codec.getMessages(e.projection), a = i.findIndex((e) => e.codecMessageId === t);
+		if (a > 0) return i[a - 1]?.codecMessageId;
+		if (a === 0 && e.parentCodecMessageId !== void 0) {
+			let t = this._tree.getNodeByCodecMessageId(e.parentCodecMessageId);
+			if (t) return this._codec.getMessages(t.projection).at(-1)?.codecMessageId;
 		}
-		return t;
 	}
 	on(e, t) {
 		let n = t;
@@ -985,35 +1465,38 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 		};
 	}
 	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?.();
+		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?.();
+		}
 	}
 	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);
+		let t = e * ke, n = await De(this._channel, { limit: t }, this._logger);
+		this._closed || await this._revealFromPage(n, e);
+	}
+	async _revealFromPage(e, t) {
+		let n = new Set(this._treeVisibleNodes().map((e) => X(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(X(e));
+		this._withheldBuffer.push(...a), this._releaseWithheld(i);
 	}
 	_processHistoryPage(e) {
 		this._processingHistory = !0;
 		try {
-			for (let t of e.items) {
-				let e = t.headers[o];
-				e && this._tree.upsert(e, t.message, t.headers, t.serial);
-			}
+			let t = this._codec.createDecoder();
+			for (let n of e.rawMessages) q(this._tree, t, n);
 			for (let t of e.rawMessages) this._tree.emitAblyMessage(t);
 		} finally {
 			this._processingHistory = !1;
@@ -1023,7 +1506,7 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 		this._processHistoryPage(e);
 		let r = e, i = () => {
 			let e = 0;
-			for (let t of this._tree.flattenNodes(this._resolveSelections())) n.has(t.msgId) || e++;
+			for (let t of this._treeVisibleNodes()) t.kind === "run" && !n.has(X(t)) && e++;
 			return e;
 		};
 		for (; i() < t && r.hasNext();) {
@@ -1032,290 +1515,173 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 			this._processHistoryPage(e), r = e;
 		}
 		return {
-			newVisible: this._tree.flattenNodes(this._resolveSelections()).filter((e) => !n.has(e.msgId)),
+			newVisible: this._treeVisibleNodes().filter((e) => !n.has(X(e))),
 			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"));
+		for (let t of e) this._withheldRunIds.delete(X(t));
+		e.length > 0 && this._recomputeAndEmit();
 	}
 	_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);
-		}
+		let t = e ?? this._cachedNodes;
+		this._lastVisibleNodeKeys = t.map((e) => X(e)), this._lastVisibleNodeKeySet = new Set(this._lastVisibleNodeKeys), this._lastVisibleProjections = t.map((e) => e.projection), this._lastVisibleMessagePairs = this._extractMessages(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"));
+		this._processingHistory || (this._pinBranchSelections(), this._resolvePendingRegenSelections(), this._recomputeAndEmitIfChanged());
 	}
 	_resolveSelections() {
 		let e = /* @__PURE__ */ new Map();
-		for (let [t, n] of this._branchSelections) n.kind !== "pending" && e.set(t, n.selectedId);
+		for (let [t, n] of this._branchSelections) e.set(t, n.selectedKey);
+		for (let [t, n] of this._regenSelections) n.kind !== "pending" && e.set(t, n.selectedRunId);
 		return e;
 	}
+	_treeVisibleNodes() {
+		return this._tree.visibleNodes(this._resolveSelections());
+	}
 	_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, {
+		for (let e of this._lastVisibleNodeKeys) {
+			if (this._tree.getNode(e)?.kind !== "input" || this._tree.getSiblingNodes(e).length <= 1) continue;
+			let t = this._tree.getGroupRoot(e);
+			this._branchSelections.get(t) || this._branchSelections.set(t, {
 				kind: "pinned",
-				selectedId: e
+				selectedKey: e
 			});
 		}
 	}
-	_resolvePendingSelections() {
-		for (let [e, t] of this._branchSelections) {
-			if (t.kind !== "pending") continue;
-			let n = this._tree.getSiblingNodes(e);
+	_resolvePendingRegenSelections() {
+		for (let [e, t] of this._regenSelections) {
+			if (t.kind === "user") continue;
+			let n = this._tree.getSiblingNodes(e).filter((e) => e.kind === "run");
 			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, {
+			r && this._regenSelections.set(e, {
 				kind: "auto",
-				selectedId: r.msgId
-			}));
+				selectedRunId: r.runId
+			});
 		}
 	}
 	_onTreeAblyMessage(e) {
-		let t = w(e)[o];
-		if (!t) {
+		let t = O(e), n = t[l], r = t[o];
+		if (!n && !r) {
 			this._emitter.emit("ably-message", e);
 			return;
 		}
-		this._lastVisibleIds.includes(t) && this._emitter.emit("ably-message", e);
+		r && this._lastVisibleNodeKeySet.has(r) && this._emitter.emit("ably-message", e);
 	}
-	_onTreeTurn(e) {
-		if (this._lastVisibleTurnIds.has(e.turnId)) {
-			this._emitter.emit("turn", e);
+	_onTreeRun(e) {
+		if (this._lastVisibleNodeKeySet.has(e.runId)) {
+			this._emitter.emit("run", e);
 			return;
 		}
-		e.type === "x-ably-turn-start" && this._isTurnStartVisible(e) && (this._lastVisibleTurnIds.add(e.turnId), this._emitter.emit("turn", e));
+		e.type === "start" && this._isRunStartVisible(e) && (this._lastVisibleNodeKeySet.add(e.runId), this._emitter.emit("run", e));
 	}
-	_isTurnStartVisible(e) {
+	_isRunStartVisible(e) {
 		let { parent: t } = e;
-		return t === void 0 ? !0 : this._lastVisibleIds.includes(t);
+		if (t === void 0) return !0;
+		let n = this._tree.getNodeByCodecMessageId(t);
+		return n ? this._lastVisibleNodeKeySet.has(X(n)) : !0;
 	}
-	_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;
+	_visibleChanged(e) {
+		if (e.length !== this._lastVisibleNodeKeys.length) return !0;
+		for (let [t, n] of e.entries()) if (X(n) !== this._lastVisibleNodeKeys[t] || n.projection !== this._lastVisibleProjections[t]) 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 {
+}, je = (e) => new Ae(e), Me = () => {}, Ne = class {
 	constructor(e) {
-		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({
+		this._views = /* @__PURE__ */ new Set(), this._state = "ready", this._pendingRunStarts = /* @__PURE__ */ new Map();
+		let t = B(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 ?? ve({ logLevel: ge.Silent })).withContext({ component: "ClientSession" }), this._emitter = new Y(this._logger), this._hasAttachedOnce = this._channel.state === "attached", this._tree = we(this._codec, this._logger), this._view = je({
 			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) {
+		}), 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) {
 			let t;
 			for (let n of e.messages) {
-				let e = crypto.randomUUID(), r = { [o]: e };
-				t && (r[m] = t), this._tree.upsert(e, n, r), t = e;
+				let e = crypto.randomUUID(), r = {
+					[l]: e,
+					[f]: "user"
+				};
+				t && (r[p] = t), this._tree.applyMessage({
+					inputs: [this._codec.createUserMessage(n)],
+					outputs: []
+				}, r), t = e;
 			}
 		}
 		this._onMessage = (e) => {
 			this._handleMessage(e);
-		}, this._attachPromise = this._channel.subscribe(this._onMessage), this._onChannelStateChange = (e) => {
+		}, this._onChannelStateChange = (e) => {
 			this._handleChannelStateChange(e);
 		}, this._channel.on(this._onChannelStateChange);
 	}
+	connect() {
+		return this._state === "closed" ? Promise.reject(new e.ErrorInfo("unable to connect; session is closed", T.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)}`, T.SessionSubscriptionError, 500, t instanceof e.ErrorInfo ? t : void 0);
+			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}()`, T.InvalidArgument, 400);
+		return this._connectPromise;
+	}
 	_handleMessage(t) {
-		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,
-						...t !== void 0 && { parent: t },
-						...i !== void 0 && { forkOf: i }
-					});
+		if (this._state !== "closed") try {
+			if (t.name === "ai-run-end") {
+				let n = O(t);
+				if ((n["run-reason"] ?? "complete") === "error") {
+					let t = n[v], r = t === void 0 ? NaN : Number(t), i = Number.isFinite(r) ? r : T.SessionSubscriptionError, a = n["error-message"] ?? "agent reported an error", c = i >= 1e4 && i < 6e4 ? Math.floor(i / 100) : 500, l = new e.ErrorInfo(a, i, c);
+					this._logger.error("ClientSession._handleMessage(); agent error received", {
+						runId: n[o],
+						invocationId: n[s],
+						code: i
+					}), this._emitter.emit("error", l);
 				}
-				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);
-					}
-					this._ownTurnIds.delete(n), this._tree.emitTurn({
-						type: y,
-						turnId: n,
-						clientId: r,
-						reason: i
-					});
+			let n = q(this._tree, this._decoder, t);
+			if (n && (n.type === "start" || n.type === "resume")) {
+				let e = O(t)[_];
+				if (e !== void 0) {
+					let t = this._pendingRunStarts.get(e);
+					t && (this._pendingRunStarts.delete(e), t.resolve(n.runId));
 				}
-				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));
+			this._emitter.emit("error", new e.ErrorInfo(`unable to process channel message; ${t instanceof Error ? t.message : String(t)}`, T.SessionSubscriptionError, 500, n));
 		}
 	}
-	_handleMessageOutput(e, t, n, r) {
-		let i = t[o];
-		if (i && this._ownMsgIds.has(i)) {
-			this._upsertAndNotify(e, t, n);
-			return;
-		}
-		r === "message.create" && this._upsertAndNotify(e, t, n);
-	}
-	_handleEventOutput(e, t) {
-		if (e.kind !== "event") return;
-		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);
-				return;
-			}
-			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;
+		if (this._state === "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", {
+		this._logger.error("ClientSession._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);
+		let i = new e.ErrorInfo(`unable to deliver events; channel continuity lost (${n}${n === "attached" ? ", resumed: false" : ""})`, T.ChannelContinuityLost, 500, t.reason);
 		this._emitter.emit("error", i);
 	}
-	_upsertAndNotify(e, t, n) {
-		let r = t[o];
-		r && this._tree.upsert(r, e, t, n);
-	}
-	_updateTurnObserverHeaders(e, t, n) {
-		let r = this._turnObservers.get(e);
-		r ? (Object.keys(t).length > 0 && Object.assign(r.headers, t), n !== void 0 && (r.serial = n)) : this._turnObservers.set(e, {
-			headers: { ...t },
-			serial: n,
-			accumulator: this._codec.createAccumulator()
-		});
-	}
-	_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 i = n.accumulator.messages;
-		if (i.length === 0) return;
-		let a;
-		try {
-			a = structuredClone(i.at(-1));
-		} catch {
-			a = i.at(-1);
-		}
-		if (a) {
-			let e = n.headers[o];
-			e && this._tree.upsert(e, a, { ...n.headers }, n.serial);
-		}
-	}
-	async _publishCancel(e) {
-		this._logger.trace("ClientTransport._publishCancel();", { filter: e });
-		let t = {};
-		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) {
-		for (let t of this._getMatchingTurnIds(e)) this._router.closeStream(t);
-	}
-	_getMatchingTurnIds(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;
-			}
+	_cleanupFailedSend(e) {
+		for (let t of e) {
+			let e = this._tree.getNodeByCodecMessageId(t);
+			e?.kind === "input" && e.serial === void 0 && this._tree.delete(e.codecMessageId);
 		}
-		return t;
 	}
 	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({
+		if (this._state === "closed") throw new e.ErrorInfo("unable to create view; session is closed", T.SessionClosed, 400);
+		this._logger.trace("DefaultClientSession.createView();");
+		let t = je({
 			tree: this._tree,
 			channel: this._channel,
 			codec: this._codec,
@@ -1325,291 +1691,116 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 		});
 		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);
+	async _internalSend(n, r, i) {
+		if (this._state === "closed" || (await this._requireConnected("send"), this._state === "closed")) throw new e.ErrorInfo("unable to send; session is closed", T.SessionClosed, 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 = f.at(-1);
-			e && (p = e.msgId);
-		}
-		let m = n?.parent === void 0 ? p : n.parent;
-		for (let e of o) {
-			let t = crypto.randomUUID();
-			this._ownMsgIds.add(t), u.add(t);
-			let r = n?.parent === void 0 ? p : n.parent, i = j({
+		if (a !== "attached" && a !== "attaching") throw new e.ErrorInfo(`unable to send; channel is ${a}`, T.ChannelNotReady, 400);
+		this._logger.trace("ClientSession._internalSend();");
+		let o = r?.runId !== void 0, s = r?.runId, c;
+		r?.parent === void 0 && !r?.forkOf && (c = i);
+		let l = /* @__PURE__ */ new Set(), u = [];
+		for (let e of n) {
+			let t = crypto.randomUUID(), n = e.codecMessageId ?? crypto.randomUUID();
+			l.add(n);
+			let i = e.kind !== "user-message" && (e.kind === "regenerate" || e.codecMessageId !== void 0), a = e.parent ?? (r?.parent === void 0 ? c : r.parent), o = r?.forkOf, d = e.kind === "regenerate" ? e.target : void 0, f = V({
 				role: "user",
-				turnId: s,
-				msgId: t,
-				turnClientId: this._clientId,
-				parent: r,
-				forkOf: n?.forkOf
+				runId: s,
+				codecMessageId: n,
+				runClientId: this._clientId,
+				...a !== void 0 && { parent: a },
+				...o !== void 0 && { forkOf: o },
+				...d !== void 0 && { regenerates: d },
+				inputEventId: t
 			});
-			this._upsertAndNotify(e, i), d.push({
-				kind: "message",
-				message: e,
-				msgId: t,
-				parentId: r,
-				forkOf: n?.forkOf,
-				headers: i,
-				serial: void 0
-			}), n?.parent === void 0 && !n?.forkOf && (p = t);
+			i || this._tree.applyMessage({
+				inputs: [e],
+				outputs: []
+			}, f), u.push({
+				input: e,
+				codecMessageId: n,
+				inputEventId: t,
+				headers: f,
+				isWireOnly: i
+			}), !i && r?.parent === void 0 && !r?.forkOf && e.parent === void 0 && (c = n);
 		}
-		this._turnMsgIds.set(s, u);
-		let h = this._router.createStream(s), g = this._headersFn?.() ?? {}, _ = {
-			...this._bodyFn?.() ?? {},
-			history: f,
-			...n?.body,
-			turnId: s,
-			clientId: this._clientId,
-			messages: d,
-			...n?.forkOf !== void 0 && { forkOf: n.forkOf },
-			...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",
-				...v
-			},
-			body: JSON.stringify(_),
-			...this._credentials ? { credentials: this._credentials } : {}
-		}).then((t) => {
-			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);
+		let d = u.at(-1);
+		if (d === void 0) throw new e.ErrorInfo("unable to send; inputs array is empty (include at least one input)", T.InvalidArgument, 400);
+		let f = d.inputEventId, p = d.codecMessageId, m = new Promise((e, t) => {
+			this._pendingRunStarts.set(p, {
+				resolve: e,
+				reject: t
+			});
+		});
+		return m.catch(() => {}), await (async () => {
+			try {
+				for (let e of u) await this._encoder.publishInput(e.input, {
+					extras: { headers: e.headers },
+					messageId: e.codecMessageId,
+					...this._clientId !== void 0 && { clientId: this._clientId }
+				});
+			} 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 ? T.InsufficientCapability : T.SessionSendFailed, r ? 401 : 500, n);
+				throw this._emitter.emit("error", i), this._pendingRunStarts.delete(p), o || this._cleanupFailedSend([...l]), i;
 			}
-		}).catch((t) => {
-			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: h,
-			turnId: s,
-			cancel: async () => this.cancel({ turnId: s }),
-			optimisticMsgIds: [...u]
+		})(), {
+			inputCodecMessageId: p,
+			runId: m,
+			inputEventId: f,
+			cancel: async () => {
+				await this._publishCancel({
+					inputCodecMessageId: p,
+					...s !== void 0 && { runId: s }
+				});
+			},
+			optimisticCodecMessageIds: [...l],
+			toInvocation: () => t.fromJSON({
+				inputEventId: f,
+				sessionName: this._channel.name
+			})
 		};
 	}
 	async cancel(e) {
-		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);
+		return this._publishCancel({ runId: e });
 	}
-	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._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 = !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);
+	async _publishCancel(e) {
+		if (this._state === "closed" || (await this._requireConnected("cancel"), this._state === "closed")) return;
+		this._logger.debug("ClientSession._publishCancel();", {
+			runId: e.runId,
+			inputCodecMessageId: e.inputCodecMessageId
+		});
+		let t = { [c]: crypto.randomUUID() };
+		e.runId !== void 0 && (t[o] = e.runId), e.inputCodecMessageId !== void 0 && (t[_] = e.inputCodecMessageId), await this._channel.publish({
+			name: b,
+			extras: { ai: { transport: t } }
 		});
 	}
 	on(e, t) {
-		if (this._state === Q.CLOSED) return ue;
+		if (this._state === "closed") return Me;
 		let n = t;
 		return this._emitter.on(e, n), () => {
 			this._emitter.off(e, n);
 		};
 	}
-	async close(e) {
-		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.off(this._onChannelStateChange);
-			for (let e of this._ownTurnIds) this._router.closeStream(e);
-			this._turnObservers.clear(), this._emitter.off();
+	async close() {
+		if (this._state !== "closed") {
+			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();
-			this._views.clear();
-			for (let e of this._closeResolvers) e();
-			this._closeResolvers.length = 0, this._ownTurnIds.clear(), this._ownMsgIds.clear(), this._turnMsgIds.clear();
-		}
-	}
-}, fe = (e) => new de(e), pe = (e) => [{
-	kind: "event",
-	event: e
-}], 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" });
-	}
-	decode(e) {
-		let t = e.action;
-		this._logger?.trace("DefaultDecoderCore.decode();", {
-			action: t,
-			serial: e.serial,
-			name: e.name
-		});
-		let n;
-		switch (t) {
-			case "message.create": {
-				let t = this._toPayload(e);
-				n = t.headers?.["x-ably-stream"] === "true" ? this._decodeStreamedCreate(t, e.serial) : this._hooks.decodeDiscrete(t);
-				break;
+			if (this._views.clear(), this._pendingRunStarts.size > 0) {
+				let t = new e.ErrorInfo("unable to await run-start; session closed", T.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 });
 			}
-			case "message.append":
-				n = this._decodeAppend(e);
-				break;
-			case "message.update":
-				n = this._decodeUpdate(e);
-				break;
-			case "message.delete":
-				n = this._decodeDelete(e);
-				break;
-			default: return [];
-		}
-		let r = w(e)[o];
-		if (r) for (let e of n) e.kind === "event" && (e.messageId = r);
-		return n;
-	}
-	_toPayload(e) {
-		return {
-			name: e.name ?? "",
-			data: e.data,
-			headers: w(e)
-		};
-	}
-	_stringData(e) {
-		return typeof e.data == "string" ? e.data : "";
-	}
-	_invokeOnStreamUpdate(e) {
-		if (this._onStreamUpdate) try {
-			this._onStreamUpdate(e);
-		} catch (e) {
-			this._logger?.error("DefaultDecoderCore._invokeOnStreamUpdate(); callback threw", { error: e });
-		}
-	}
-	_invokeOnStreamDelete(e, t) {
-		if (this._onStreamDelete) try {
-			this._onStreamDelete(e, t);
-		} catch (e) {
-			this._logger?.error("DefaultDecoderCore._invokeOnStreamDelete(); callback threw", { error: e });
-		}
-	}
-	_decodeStreamedCreate(e, t) {
-		if (!t) return [];
-		let n = e.headers?.["x-ably-stream-id"] ?? "", r = e.headers ?? {}, i = {
-			name: e.name,
-			streamId: n,
-			accumulated: "",
-			headers: { ...r },
-			closed: !1
-		};
-		return this._serialState.set(t, i), this._logger?.debug("DefaultDecoderCore._decodeStreamedCreate(); new stream", {
-			name: e.name,
-			streamId: n,
-			serial: t
-		}), this._hooks.buildStartEvents(i);
-	}
-	_decodeAppend(e) {
-		let t = e.serial;
-		if (!t) return [];
-		let r = this._serialState.get(t);
-		if (!r) return this._decodeUpdate(e);
-		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) {
-		let r = e.serial;
-		if (!r) return [];
-		let i = this._toPayload(e), a = i.headers ?? {}, o = a[t] === "true", s = a[n], c = this._serialState.get(r);
-		if (!c) return this._decodeFirstContact(i, o, s, r);
-		let l = this._stringData(e);
-		if (l.startsWith(c.accumulated)) {
-			let e = l.slice(c.accumulated.length), t = [];
-			return e.length > 0 && (c.accumulated = l, t.push(...this._hooks.buildDeltaEvents(c, e))), s === "finished" && !c.closed ? (c.closed = !0, t.push(...this._hooks.buildEndEvents(c, a))) : s === "aborted" && !c.closed && (c.closed = !0), t;
 		}
-		return c.accumulated = l, c.headers = { ...a }, this._invokeOnStreamUpdate(c), [];
-	}
-	_decodeFirstContact(e, t, n, r) {
-		if (!t) return this._hooks.decodeDiscrete(e);
-		let i = e.headers?.["x-ably-stream-id"] ?? "", a = e.headers ?? {}, o = typeof e.data == "string" ? e.data : "";
-		this._logger?.debug("DefaultDecoderCore._decodeFirstContact(); first-contact stream", {
-			name: e.name,
-			streamId: i,
-			serial: r
-		});
-		let s = {
-			name: e.name,
-			streamId: i,
-			accumulated: o,
-			headers: { ...a },
-			closed: n === "finished" || n === "aborted"
-		};
-		this._serialState.set(r, s);
-		let c = this._hooks.buildStartEvents(s);
-		return o.length > 0 && c.push(...this._hooks.buildDeltaEvents(s, o)), n === "finished" && c.push(...this._hooks.buildEndEvents(s, a)), c;
-	}
-	_decodeDelete(e) {
-		let t = e.serial;
-		if (!t) return [];
-		let n = this._serialState.get(t);
-		return this._invokeOnStreamDelete(t, n), n && (n.accumulated = "", n.closed = !0), this._logger?.debug("DefaultDecoderCore._decodeDelete();", { serial: t }), [];
 	}
-}, he = (e, t = {}) => new me(e, t), ge = class {
+}, Pe = (e) => new Ne(e), Fe = 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" });
 	}
@@ -1620,48 +1811,48 @@ 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";
+		let n = e.map((e) => this._buildDiscreteMessage(e, t, !0));
 		return this._writer.publish(n);
 	}
-	async startStream(i, a, o) {
+	async startStream(t, a, o) {
 		this._assertNotClosed(), this._logger?.trace("DefaultEncoderCore.startStream();", {
 			name: a.name,
-			streamId: i
+			streamId: t
 		});
-		let s = this._buildHeaders(a.headers ?? {}, o);
-		s[t] = "true", s[n] = "streaming", s[r] = i;
-		let c = this._resolveClientId(o), l = {
+		let s = this._buildTransport(a.transportHeaders, o);
+		s[n] = "true", s[r] = "streaming", s[i] = t;
+		let c = a.codecHeaders ?? {}, l = this._resolveClientId(o), u = {
 			name: a.name,
 			data: a.data,
-			extras: { headers: s },
-			...c ? { clientId: c } : {}
+			extras: { ai: this._aiExtras(s, c) },
+			...l ? { clientId: l } : {}
 		};
-		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})`, C.BadRequest, 400);
-		this._trackers.set(i, {
-			serial: u,
+		this._invokeOnMessage(u);
+		let d = (await this._writer.publish(u)).serials[0];
+		if (!d) throw new e.ErrorInfo(`unable to start stream; no serial returned for stream '${a.name}' (streamId: ${t})`, T.BadRequest, 400);
+		this._trackers.set(t, {
+			serial: d,
 			name: a.name,
-			streamId: i,
+			streamId: t,
 			accumulated: a.data,
-			persistentHeaders: s,
-			aborted: !1
+			persistentTransport: s,
+			persistentCodec: c,
+			cancelled: !1
 		}), this._logger?.debug("DefaultEncoderCore.startStream(); stream started", {
 			name: a.name,
-			streamId: i,
-			serial: u
+			streamId: t,
+			serial: d
 		});
 	}
 	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}'`, C.InvalidArgument, 400);
+		if (!r) throw new e.ErrorInfo(`unable to append to stream; no active stream for streamId '${t}'`, T.InvalidArgument, 400);
 		r.accumulated += n;
 		let i = {
 			serial: r.serial,
 			data: n,
-			extras: { headers: { ...r.persistentHeaders } }
+			extras: { ai: this._aiExtras({ ...r.persistentTransport }, { ...r.persistentCodec }) }
 		};
 		this._invokeOnMessage(i);
 		let a = this._writer.appendMessage(i);
@@ -1670,59 +1861,59 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 			streamId: t
 		});
 	}
-	async closeStream(t, r) {
+	async closeStream(t, n) {
 		this._assertNotClosed(), this._logger?.trace("DefaultEncoderCore.closeStream();", { streamId: t });
 		let i = this._trackers.get(t);
-		if (!i) throw new e.ErrorInfo(`unable to close stream; no active stream for streamId '${t}'`, C.InvalidArgument, 400);
-		i.accumulated += r.data;
-		let a = this._buildClosingHeaders(i, r.headers ?? {});
-		a[n] = "finished";
-		let o = {
+		if (!i) throw new e.ErrorInfo(`unable to close stream; no active stream for streamId '${t}'`, T.InvalidArgument, 400);
+		i.accumulated += n.data;
+		let { transport: a, codec: o } = this._buildClosing(i, n);
+		a[r] = "complete";
+		let s = {
 			serial: i.serial,
-			data: r.data,
-			extras: { headers: a }
+			data: n.data,
+			extras: { ai: this._aiExtras(a, o) }
 		};
-		this._invokeOnMessage(o);
-		let s = this._writer.appendMessage(o);
+		this._invokeOnMessage(s);
+		let c = this._writer.appendMessage(s);
 		this._pending.push({
-			promise: s,
+			promise: c,
 			streamId: t
 		}), await this._flushPending(), this._logger?.debug("DefaultEncoderCore.closeStream(); stream closed", { streamId: t });
 	}
-	async abortStream(t, r) {
-		this._assertNotClosed(), this._logger?.trace("DefaultEncoderCore.abortStream();", { streamId: t });
+	async cancelStream(t, n) {
+		this._assertNotClosed(), this._logger?.trace("DefaultEncoderCore.cancelStream();", { streamId: t });
 		let i = this._trackers.get(t);
-		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";
-		let o = {
+		if (!i) throw new e.ErrorInfo(`unable to cancel stream; no active stream for streamId '${t}'`, T.InvalidArgument, 400);
+		i.cancelled = !0;
+		let { transport: a, codec: o } = this._buildClosing(i, void 0, n);
+		a[r] = "cancelled";
+		let s = {
 			serial: i.serial,
 			data: "",
-			extras: { headers: a }
+			extras: { ai: this._aiExtras(a, o) }
 		};
-		this._invokeOnMessage(o);
-		let s = this._writer.appendMessage(o);
+		this._invokeOnMessage(s);
+		let c = this._writer.appendMessage(s);
 		this._pending.push({
-			promise: s,
+			promise: c,
 			streamId: t
-		}), await this._flushPending(), this._logger?.debug("DefaultEncoderCore.abortStream(); stream aborted", { streamId: t });
+		}), await this._flushPending(), this._logger?.debug("DefaultEncoderCore.cancelStream(); stream cancelled", { streamId: t });
 	}
-	async abortAllStreams(e) {
-		this._assertNotClosed(), this._logger?.trace("DefaultEncoderCore.abortAllStreams();", { streamCount: this._trackers.size });
+	async cancelAllStreams(e) {
+		this._assertNotClosed(), this._logger?.trace("DefaultEncoderCore.cancelAllStreams();", { streamCount: this._trackers.size });
 		for (let t of this._trackers.values()) {
-			t.aborted = !0;
-			let r = this._buildClosingHeaders(t, {}, e);
-			r[n] = "aborted";
-			let i = {
+			t.cancelled = !0;
+			let { transport: n, codec: i } = this._buildClosing(t, void 0, e);
+			n[r] = "cancelled";
+			let a = {
 				serial: t.serial,
 				data: "",
-				extras: { headers: r }
+				extras: { ai: this._aiExtras(n, i) }
 			};
-			this._invokeOnMessage(i);
-			let a = this._writer.appendMessage(i);
+			this._invokeOnMessage(a);
+			let o = this._writer.appendMessage(a);
 			this._pending.push({
-				promise: a,
+				promise: o,
 				streamId: t.streamId
 			});
 		}
@@ -1741,10 +1932,10 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 		}
 	}
 	async _doFlush(t) {
-		let r = await Promise.allSettled(t.map(async (e) => e.promise)), i = /* @__PURE__ */ new Set();
-		for (let [e, n] of r.entries()) {
-			let r = t[e];
-			r && n.status === "rejected" && i.add(r.streamId);
+		let n = await Promise.allSettled(t.map(async (e) => e.promise)), i = /* @__PURE__ */ new Set();
+		for (let [e, r] of n.entries()) {
+			let n = t[e];
+			n && r.status === "rejected" && i.add(n.streamId);
 		}
 		if (i.size === 0) {
 			this._logger?.debug("DefaultEncoderCore._flushPending(); all appends succeeded");
@@ -1755,13 +1946,13 @@ var t = "x-ably-stream", n = "x-ably-status", r = "x-ably-stream-id", i = "x-abl
 		for (let e of i) {
 			let t = this._trackers.get(e);
 			if (!t) continue;
-			let r = t.aborted ? "aborted" : "finished", i = {
+			let n = t.cancelled ? "cancelled" : "complete", i = {
 				serial: t.serial,
 				data: t.accumulated,
-				extras: { headers: {
-					...t.persistentHeaders,
-					[n]: r
-				} }
+				extras: { ai: this._aiExtras({
+					...t.persistentTransport,
+					[r]: n
+				}, { ...t.persistentCodec }) }
 			};
 			try {
 				await this._writer.updateMessage(i);
@@ -1774,7 +1965,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}`, C.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}`, T.EncoderRecoveryFailed, 500);
 		}
 	}
 	async close() {
@@ -1796,37 +1987,161 @@ 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", C.InvalidArgument, 400);
+		if (this._closed) throw new e.ErrorInfo("unable to write to encoder; encoder has been closed", T.InvalidArgument, 400);
 	}
 	_resolveClientId(e) {
 		return e?.clientId ?? this._defaultClientId;
 	}
-	_buildHeaders(e, t) {
+	_buildTransport(e, t) {
 		let n = {
-			...E(this._defaultExtras?.headers, t?.extras?.headers),
+			...A(this._defaultExtras?.headers, t?.extras?.headers),
 			...e
 		};
-		return t?.messageId !== void 0 && (n[o] = t.messageId), n;
-	}
-	_buildDiscreteMessage(e, n) {
-		let r = this._buildHeaders(e.headers ?? {}, n);
-		r[t] = "false";
-		let i = this._resolveClientId(n), a = {
+		return t?.messageId !== void 0 && (n[l] = t.messageId), n;
+	}
+	_aiExtras(e, t) {
+		return Object.keys(t).length > 0 ? {
+			transport: e,
+			codec: t
+		} : { transport: e };
+	}
+	_buildDiscreteMessage(e, t, r = !1) {
+		let i = this._buildTransport(e.transportHeaders, t);
+		i[n] = "false", r && (i[a] = "true");
+		let o = this._resolveClientId(t), s = {
 			name: e.name,
 			data: e.data,
 			extras: {
-				headers: r,
+				ai: this._aiExtras(i, e.codecHeaders ?? {}),
 				...e.ephemeral ? { ephemeral: !0 } : {}
 			},
-			...i ? { clientId: i } : {}
+			...o ? { clientId: o } : {}
+		};
+		return this._invokeOnMessage(s), s;
+	}
+	_buildClosing(e, t, n) {
+		let r = A(this._defaultExtras?.headers, n?.extras?.headers);
+		return {
+			transport: {
+				...e.persistentTransport,
+				...r,
+				...t?.transportHeaders
+			},
+			codec: {
+				...e.persistentCodec,
+				...t?.codecHeaders
+			}
+		};
+	}
+}, Ie = (e, t = {}) => new Fe(e, t), Le = 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" });
+	}
+	decode(e) {
+		let t = e.action;
+		switch (this._logger?.trace("DefaultDecoderCore.decode();", {
+			action: t,
+			serial: e.serial,
+			name: e.name
+		}), t) {
+			case "message.create": {
+				let t = this._toPayload(e);
+				return t.transportHeaders?.stream === "true" ? this._decodeStreamedCreate(t, e.serial) : this._hooks.decodeDiscrete(t);
+			}
+			case "message.append": return this._decodeAppend(e);
+			case "message.update": return this._decodeUpdate(e);
+			case "message.delete": return this._decodeDelete(e);
+			default: return [];
+		}
+	}
+	_toPayload(e) {
+		return {
+			name: e.name ?? "",
+			data: e.data,
+			transportHeaders: O(e),
+			codecHeaders: k(e)
+		};
+	}
+	_stringData(e) {
+		return typeof e.data == "string" ? e.data : "";
+	}
+	_invokeOnStreamUpdate(e) {
+		if (this._onStreamUpdate) try {
+			this._onStreamUpdate(e);
+		} catch (e) {
+			this._logger?.error("DefaultDecoderCore._invokeOnStreamUpdate(); callback threw", { error: e });
+		}
+	}
+	_invokeOnStreamDelete(e, t) {
+		if (this._onStreamDelete) try {
+			this._onStreamDelete(e, t);
+		} catch (e) {
+			this._logger?.error("DefaultDecoderCore._invokeOnStreamDelete(); callback threw", { error: e });
+		}
+	}
+	_decodeStreamedCreate(e, t) {
+		if (!t) return [];
+		let n = e.transportHeaders?.["stream-id"] ?? "", r = {
+			name: e.name,
+			streamId: n,
+			accumulated: "",
+			codecHeaders: { ...e.codecHeaders },
+			transportHeaders: { ...e.transportHeaders },
+			closed: !1
+		};
+		return this._serialState.set(t, r), this._logger?.debug("DefaultDecoderCore._decodeStreamedCreate(); new stream", {
+			name: e.name,
+			streamId: n,
+			serial: t
+		}), this._hooks.buildStartEvents(r);
+	}
+	_decodeAppend(e) {
+		let t = e.serial;
+		if (!t) return [];
+		let n = this._serialState.get(t);
+		if (!n) return this._decodeUpdate(e);
+		let i = O(e), a = k(e), o = typeof e.data == "string" ? e.data : "", s = i[r], c = [];
+		return o.length > 0 && (n.accumulated += o, c.push(...this._hooks.buildDeltaEvents(n, o))), s === "complete" && !n.closed ? (n.closed = !0, c.push(...this._hooks.buildEndEvents(n, a)), this._logger?.debug("DefaultDecoderCore._decodeAppend(); stream complete", { streamId: n.streamId })) : s === "cancelled" && !n.closed && (n.closed = !0, this._logger?.debug("DefaultDecoderCore._decodeAppend(); stream cancelled", { streamId: n.streamId })), c;
+	}
+	_decodeUpdate(e) {
+		let t = e.serial;
+		if (!t) return [];
+		let i = this._toPayload(e), a = i.transportHeaders ?? {}, o = i.codecHeaders ?? {}, s = a[n] === "true", c = a[r], l = this._serialState.get(t);
+		if (!l) return this._decodeFirstContact(i, s, c, t);
+		let u = this._stringData(e);
+		if (u.startsWith(l.accumulated)) {
+			let e = u.slice(l.accumulated.length), t = [];
+			return e.length > 0 && (l.accumulated = u, t.push(...this._hooks.buildDeltaEvents(l, e))), c === "complete" && !l.closed ? (l.closed = !0, t.push(...this._hooks.buildEndEvents(l, o))) : c === "cancelled" && !l.closed && (l.closed = !0), t;
+		}
+		return l.accumulated = u, l.codecHeaders = { ...o }, l.transportHeaders = { ...a }, this._invokeOnStreamUpdate(l), [];
+	}
+	_decodeFirstContact(e, t, n, r) {
+		if (!t) return this._hooks.decodeDiscrete(e);
+		let i = e.transportHeaders?.["stream-id"] ?? "", a = e.codecHeaders ?? {}, o = typeof e.data == "string" ? e.data : "";
+		this._logger?.debug("DefaultDecoderCore._decodeFirstContact(); first-contact stream", {
+			name: e.name,
+			streamId: i,
+			serial: r
+		});
+		let s = {
+			name: e.name,
+			streamId: i,
+			accumulated: o,
+			codecHeaders: { ...a },
+			transportHeaders: { ...e.transportHeaders },
+			closed: n === "complete" || n === "cancelled"
 		};
-		return this._invokeOnMessage(a), a;
+		this._serialState.set(r, s);
+		let c = this._hooks.buildStartEvents(s);
+		return o.length > 0 && c.push(...this._hooks.buildDeltaEvents(s, o)), n === "complete" && c.push(...this._hooks.buildEndEvents(s, a)), c;
 	}
-	_buildClosingHeaders(e, t, n) {
-		let r = { ...e.persistentHeaders }, i = E(this._defaultExtras?.headers, n?.extras?.headers);
-		return Object.assign(r, i), Object.assign(r, t), r;
+	_decodeDelete(e) {
+		let t = e.serial;
+		if (!t) return [];
+		let n = this._serialState.get(t);
+		return this._invokeOnStreamDelete(t, n), n && (n.accumulated = "", n.closed = !0), this._logger?.debug("DefaultDecoderCore._decodeDelete();", { serial: t }), [];
 	}
-}, $ = (e, t = {}) => new ge(e, t), _e = class {
+}, Re = (e, t = {}) => new Le(e, t), ze = class {
 	constructor(e) {
 		this._emitted = /* @__PURE__ */ new Map(), this._phases = e;
 	}
@@ -1848,8 +2163,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;
 	}
-}, ve = (e) => new _e(e);
+}, Be = (e) => new ze(e);
 //#endregion
-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 };
+export { b as EVENT_CANCEL, w as EVENT_RUN_END, x as EVENT_RUN_START, T as ErrorCode, Y as EventEmitter, l as HEADER_CODEC_MESSAGE_ID, v as HEADER_ERROR_CODE, y as HEADER_ERROR_MESSAGE, m as HEADER_FORK_OF, d as HEADER_INPUT_CLIENT_ID, h as HEADER_MSG_REGENERATE, p as HEADER_PARENT, f as HEADER_ROLE, u as HEADER_RUN_CLIENT_ID, o as HEADER_RUN_ID, g as HEADER_RUN_REASON, r as HEADER_STATUS, n as HEADER_STREAM, i as HEADER_STREAM_ID, t as Invocation, ge as LogLevel, V as buildTransportHeaders, _e as consoleLogger, pe as createAgentSession, Pe as createClientSession, Re as createDecoderCore, Ie as createEncoderCore, Be as createLifecycleTracker, E as errorInfoIs, k as getCodecHeaders, O as getTransportHeaders, F as headerReader, I as headerWriter, ve as makeLogger, A as mergeHeaders, P as stripUndefined };
 
 //# sourceMappingURL=ably-ai-transport.js.map