@ably/ai-transport 0.2.0 → 0.3.0

package/dist/ably-ai-transport.js

@@ -13,219 +13,414 @@ var t = class e {
 			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) => {
+}, 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", ee = "ai-output", T = "ai-input", E = /* @__PURE__ */ function(e) {
+	return e[e.BadRequest = 4e4] = "BadRequest", e[e.InvalidArgument = 40003] = "InvalidArgument", e[e.InsufficientCapability = 40160] = "InsufficientCapability", e[e.EncoderRecoveryFailed = 104e3] = "EncoderRecoveryFailed", e[e.SessionSubscriptionError = 104001] = "SessionSubscriptionError", e[e.CancelListenerError = 104002] = "CancelListenerError", e[e.RunLifecycleError = 104003] = "RunLifecycleError", e[e.SessionClosed = 104004] = "SessionClosed", e[e.SessionSendFailed = 104005] = "SessionSendFailed", e[e.ChannelContinuityLost = 104006] = "ChannelContinuityLost", e[e.ChannelNotReady = 104007] = "ChannelNotReady", e[e.StreamError = 104008] = "StreamError", e[e.InputEventNotFound = 104010] = "InputEventNotFound", e[e.HistoryFetchFailed = 104011] = "HistoryFetchFailed", e;
+}({}), te = (e, t) => e.code === t, D = /* @__PURE__ */ function(e) {
+	return e.Trace = "trace", e.Debug = "debug", e.Info = "info", e.Warn = "warn", e.Error = "error", e.Silent = "silent", e;
+}({}), O = (e, t, n) => {
+	let r = n ? `, context: ${JSON.stringify(n)}` : "", i = `[${(/* @__PURE__ */ new Date()).toISOString()}] ${t.valueOf().toUpperCase()} ably-ai-transport: ${e}${r}`;
+	switch (t) {
+		case "trace":
+		case "debug":
+			console.log(i);
+			break;
+		case "info":
+			console.info(i);
+			break;
+		case "warn":
+			console.warn(i);
+			break;
+		case "error":
+			console.error(i);
+			break;
+		case "silent": break;
+	}
+}, k = (e) => new A(e.logHandler ?? O, e.logLevel), ne = new Map([
+	["trace", 0],
+	["debug", 1],
+	["info", 2],
+	["warn", 3],
+	["error", 4],
+	["silent", 5]
+]), A = class t {
+	constructor(t, n, r) {
+		this._handler = t, this._context = r;
+		let i = ne.get(n);
+		if (i === void 0) throw new e.ErrorInfo(`unable to create logger; invalid log level: ${n}`, E.InvalidArgument, 400);
+		this._levelNumber = i;
+	}
+	trace(e, t) {
+		this._write(e, "trace", 0, t);
+	}
+	debug(e, t) {
+		this._write(e, "debug", 1, t);
+	}
+	info(e, t) {
+		this._write(e, "info", 2, t);
+	}
+	warn(e, t) {
+		this._write(e, "warn", 3, t);
+	}
+	error(e, t) {
+		this._write(e, "error", 4, t);
+	}
+	withContext(e) {
+		let n = [...ne.entries()].find(([, e]) => e === this._levelNumber)?.[0] ?? "error";
+		return new t(this._handler, n, this._mergeContext(e));
+	}
+	_write(e, t, n, r) {
+		n >= this._levelNumber && this._handler(e, t, this._mergeContext(r));
+	}
+	_mergeContext(e) {
+		return this._context ? e ? {
+			...this._context,
+			...e
+		} : this._context : e ?? void 0;
+	}
+}, j = (e) => e instanceof Error ? e.message : String(e), M = (t) => t instanceof e.ErrorInfo ? t : void 0, N = (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) => {
+}, P = (e) => N(e, "transport"), F = (e) => N(e, "codec"), I = (e) => {
 	if (e !== void 0) try {
 		return JSON.parse(e);
 	} catch {
 		return;
 	}
-}, A = (e, t) => ({
+}, L = (e, t) => ({
 	...e,
 	...t
-}), j = (e) => {
+}), R = (e) => {
 	if (e !== void 0) return e === "true";
-}, 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) => {
+}, z = (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), B = (e) => {
 	let t = {};
 	for (let n in e) Object.prototype.hasOwnProperty.call(e, n) && e[n] !== void 0 && (t[n] = e[n]);
 	return t;
-}, 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[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;
-}, L = "0.2.0", R = "ai-transport-js", z = (e, t) => {
+}, V = "0.3.0", re = "ai-transport-js", H = (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) => {
+	}, { params: { agent: W(t) } };
+}, U = (e) => {
+	let t = e?.adapterTag, n = { [re]: V };
+	return t && (n[t] = V), n;
+}, W = (e) => Object.entries(e).map(([e, t]) => `${e}/${t}`).join(" "), G = (e, t) => H(e, U(t)), ie = [
+	"PUBLISH",
+	"SUBSCRIBE",
+	"PRESENCE",
+	"PRESENCE_SUBSCRIBE",
+	"ANNOTATION_PUBLISH"
+], ae = ["OBJECT_SUBSCRIBE", "OBJECT_PUBLISH"], oe = [
+	"PUBLISH",
+	"SUBSCRIBE",
+	"PRESENCE",
+	"PRESENCE_SUBSCRIBE",
+	"OBJECT_PUBLISH",
+	"OBJECT_SUBSCRIBE",
+	"ANNOTATION_PUBLISH",
+	"ANNOTATION_SUBSCRIBE"
+], se = (e) => {
+	if (e === void 0 || e.length === 0) return;
+	let t = new Set([...ie, ...e]), n = oe.filter((e) => t.has(e)), r = [...t].filter((e) => !oe.includes(e)).toSorted();
+	return [...n, ...r];
+}, ce = (t, n) => new Promise((r, i) => {
+	if (n?.aborted) {
+		i(new e.ErrorInfo("unable to wait; signal aborted", E.InvalidArgument, 400));
+		return;
+	}
+	let a = setTimeout(() => {
+		n?.removeEventListener("abort", o), r();
+	}, t);
+	typeof a == "object" && a.unref();
+	let o = () => {
+		clearTimeout(a), i(new e.ErrorInfo("unable to wait; signal aborted", E.InvalidArgument, 400));
+	};
+	n?.addEventListener("abort", o, { once: !0 });
+}), le = async (t, n, r, i, a) => {
+	let o;
+	for (let s = 0; s <= n; s++) {
+		if (i?.aborted) throw new e.ErrorInfo("unable to fetch history page; signal aborted", E.InvalidArgument, 400, M(o));
+		try {
+			return await t();
+		} catch (e) {
+			if (o = e, s === n) break;
+			let t = r * 2 ** s;
+			a?.debug("loadHistoryPages.fetchPageWithRetry(); page fetch failed, retrying", {
+				attempt: s + 1,
+				maxRetries: n,
+				backoff: t
+			}), await ce(t, i);
+		}
+	}
+	throw new e.ErrorInfo(`unable to fetch history page; ${j(o)}`, E.HistoryFetchFailed, 500, M(o));
+}, ue = async (t, n) => {
+	let { pageLimit: r, untilAttach: i = !0, signal: a, maxRetries: o = 3, retryBackoffMs: s = 100, logger: c } = n;
+	if (a?.aborted) throw new e.ErrorInfo("unable to load history; signal aborted", E.InvalidArgument, 400);
+	await t.attach();
+	let l = {
+		limit: r,
+		untilAttach: i
+	}, u = await le(() => t.history(l), o, s, a, c), d = !1;
+	return {
+		hasNext: () => u === void 0 || a?.aborted ? !1 : d ? u.hasNext() : !0,
+		next: async () => {
+			if (u === void 0) return;
+			if (a?.aborted) throw new e.ErrorInfo("unable to load history; signal aborted", E.InvalidArgument, 400);
+			if (!d) return d = !0, u.items;
+			if (!u.hasNext()) {
+				u = void 0;
+				return;
+			}
+			let t = await le(async () => await u?.next() ?? void 0, o, s, a, c);
+			if (!t) {
+				u = void 0;
+				return;
+			}
+			return u = t, t.items;
+		}
+	};
+}, de = (e, t, n, r) => {
+	if (t === void 0) return [];
+	let i = [], a = e.getNodeByCodecMessageId(t), o = /* @__PURE__ */ new Set(), s = 0;
+	for (; a !== void 0;) {
+		let t = a.kind === "run" ? a.runId : a.codecMessageId;
+		if (o.has(t)) break;
+		if (a.kind === "run" && a.runId !== r) {
+			if (n !== void 0 && s >= n) break;
+			s += 1;
+		}
+		o.add(t), i.unshift(a);
+		let c = a.parentCodecMessageId;
+		if (c === void 0) break;
+		a = e.getNodeByCodecMessageId(c);
+	}
+	return i;
+}, fe = (e, t) => {
+	let n = 0;
+	for (let r of e) r.kind === "run" && r.runId !== t && n++;
+	return n;
+}, pe = (t, n) => {
+	let r = M(n);
+	return new e.ErrorInfo(`unable to ${t}; ${j(n)}`, r?.code ?? E.HistoryFetchFailed, r?.statusCode ?? 500, r);
+}, me = class {
+	constructor(e) {
+		this._historyExhausted = !1, this._tree = e.tree, this._channel = e.channel, this._codec = e.codec, this._applier = e.applier, this._inputEventLookbackMs = e.inputEventLookbackMs, this._logger = e.logger?.withContext({ component: "AgentView" });
+	}
+	_foldWire(e) {
+		this._applier.apply(e), this._tree.emitAblyMessage(e);
+	}
+	findInputEvent(t) {
+		let { invocationId: n, runId: r, expectedEventIds: i, timeoutMs: a, signal: o } = t, s = this._logger, l = new Set(i), u = l.size, d = /* @__PURE__ */ new Map(), f = new AbortController();
+		return new Promise((t, p) => {
+			let m = !1, h, g, _, v = () => {
+				g && g(), _ !== void 0 && clearTimeout(_), f.abort(), o.removeEventListener("abort", y);
+			}, y = () => {
+				m || (m = !0, v(), p(new e.ErrorInfo(`unable to look up input event; run ${r} was cancelled`, E.InvalidArgument, 400)));
+			}, b = () => {
+				if (m) return;
+				m = !0, v();
+				let e = [...d.values()].toSorted(z), i, a;
+				for (let t of e) if (i === void 0) {
+					i = P(t), a = t.clientId;
+					break;
+				}
+				s?.debug("AgentView.findInputEvent(); collected input events", {
+					runId: r,
+					invocationId: n,
+					count: e.length
+				}), t({
+					rawMessages: e,
+					firstHeaders: i,
+					firstClientId: a
+				});
+			}, x = (e) => {
+				if (m) return !1;
+				let t = P(e)[c];
+				return !t || !l.has(t) || d.has(t) ? !1 : (d.set(t, e), d.size >= u);
+			};
+			if (o.addEventListener("abort", y, { once: !0 }), o.aborted) {
+				y();
+				return;
+			}
+			for (let e of i) {
+				let t = this._tree.findAblyMessageByEventId(e);
+				if (t && x(t) && !m) {
+					b();
+					return;
+				}
+			}
+			g = this._tree.on("ably-message", (e) => {
+				x(e) && !m && b();
+			}), this._driveHistoryChain(() => m, f.signal, this._inputEventLookbackMs, "scan history for input event").catch((t) => {
+				m || (h = t instanceof e.ErrorInfo ? t : pe("scan history for input event", t), s?.warn("AgentView.findInputEvent(); history scan failed (continuing on live path)", { error: j(t) }));
+			}), _ = setTimeout(() => {
+				m || (m = !0, v(), p(new e.ErrorInfo(`unable to look up input event; received ${String(d.size)} of ${String(u)} input events for invocation ${n} within ${String(a)}ms`, E.InputEventNotFound, 504, h)));
+			}, a), typeof _ == "object" && _.unref();
+		});
+	}
+	async loadConversation(t, n, r, i, a, o) {
+		if (r.aborted) throw new e.ErrorInfo(`unable to load conversation; run ${t} was cancelled`, E.InvalidArgument, 400);
+		return await this._hydrateAncestors(t, n, r, i, a), this._collectConversation(t, n, i, o);
+	}
+	_collectConversation(e, t, n, r) {
+		let i = this._tree, a = de(i, t, n, e), o = i.getRunNode(e), s = [];
+		for (let e of a) for (let t of this._codec.getMessages(e.projection)) {
+			if (r !== void 0 && t.codecMessageId === r) return {
+				messages: s,
+				projection: o?.projection ?? this._codec.init()
+			};
+			s.push(t.message);
+		}
+		if (o !== void 0 && !a.some((t) => t.kind === "run" && t.runId === e)) for (let e of this._codec.getMessages(o.projection)) s.push(e.message);
+		return {
+			messages: s,
+			projection: o?.projection ?? this._codec.init()
+		};
+	}
+	messages(e, t, n) {
+		return this._collectConversation(e, t, void 0, n).messages;
+	}
+	async _driveHistoryChain(e, t, n, r) {
+		let i = !1, a, o = this._hydrationMutex ?? Promise.resolve(), s = (async () => {
+			if (await o.catch(() => {}), !(this._historyExhausted || t.aborted || e())) try {
+				i = await this._walkSharedHistory(e, t, n);
+			} catch (e) {
+				a = pe(r, e);
+			}
+		})();
+		if (this._hydrationMutex = s, await s, a !== void 0) throw a;
+		return { exhausted: i };
+	}
+	async _walkSharedHistory(e, t, n) {
+		this._cursor === void 0 && (this._cursor = await ue(this._channel, {
+			pageLimit: 200,
+			untilAttach: !0,
+			logger: this._logger
+		}));
+		let r = this._cursor;
+		for (; r.hasNext() && !e();) {
+			if (t.aborted) return !1;
+			let e = await r.next();
+			if (!e) break;
+			for (let t of e.toReversed()) this._foldWire(t);
+			if (n !== void 0) {
+				let t = e.at(-1);
+				if (t?.timestamp !== void 0 && t.timestamp < Date.now() - n) break;
+			}
+		}
+		return !r.hasNext() && !t.aborted;
+	}
+	async _hydrateAncestors(t, n, r, i, a) {
+		let o = () => {
+			let e = this._tree;
+			if (a && e.getRunNode(t)?.startSerial === void 0) return !0;
+			if (n === void 0) return !1;
+			if (e.getNodeByCodecMessageId(n) === void 0) return !0;
+			let r = de(e, n, i, t), o = r[0], s = o !== void 0 && o.parentCodecMessageId === void 0, c = i !== void 0 && fe(r, t) >= i && o !== void 0 && (o.kind !== "run" || o.runId === t);
+			return !s && !c;
+		};
+		if (!o() || this._historyExhausted) return;
+		let s;
+		try {
+			({exhausted: s} = await this._driveHistoryChain(() => !o(), r, void 0, "hydrate ancestors"));
+		} catch (e) {
+			throw this._logger?.error("AgentView._hydrateAncestors(); history fetch failed", {
+				runId: t,
+				error: j(e)
+			}), e;
+		}
+		if (s && (this._historyExhausted = !0), r.aborted && o()) throw new e.ErrorInfo("unable to hydrate ancestors; signal aborted", E.InvalidArgument, 400);
+	}
+}, he = (e) => new me(e), ge = (e) => {
 	let t = {
 		[f]: e.role,
 		[l]: e.codecMessageId
 	};
 	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) => {
+}, _e = (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"] ?? "";
+	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), e.errorCode !== void 0 && (t[v] = String(e.errorCode)), e.errorMessage !== void 0 && (t[y] = e.errorMessage), t;
+}, ve = (e) => e === "ai-run-start" || e === "ai-run-suspend" || e === "ai-run-resume" || e === "ai-run-end", ye = (t) => {
+	let n = t[v], r = n === void 0 ? NaN : Number(n), i = Number.isFinite(r) ? r : E.SessionSubscriptionError, a = t["error-message"] ?? "agent reported an error", o = i >= 1e4 && i < 6e4 ? Math.floor(i / 100) : 500;
+	return new e.ErrorInfo(a, i, o);
+}, be = (e, t, n, r) => {
+	let i = t[o];
+	if (!i) return;
+	let a = t["run-client-id"] ?? "", s = r === void 0 ? {} : { timestamp: r };
 	if (e === "ai-run-start") {
-		let e = t[p], a = t[m], o = t[h];
+		let e = t[p], r = t[m], o = t[h];
 		return {
 			type: "start",
-			runId: r,
-			clientId: i,
+			runId: i,
+			clientId: a,
 			serial: n,
 			invocationId: t["invocation-id"] ?? "",
+			...s,
 			...e !== void 0 && { parent: e },
-			...a !== void 0 && { forkOf: a },
+			...r !== void 0 && { forkOf: r },
 			...o !== void 0 && { regenerates: o }
 		};
 	}
 	if (e === "ai-run-suspend") return {
 		type: "suspend",
-		runId: r,
-		clientId: i,
+		runId: i,
+		clientId: a,
 		serial: n,
-		invocationId: t["invocation-id"] ?? ""
+		invocationId: t["invocation-id"] ?? "",
+		...s
 	};
 	if (e === "ai-run-resume") return {
 		type: "resume",
-		runId: r,
-		clientId: i,
+		runId: i,
+		clientId: a,
 		serial: n,
-		invocationId: t["invocation-id"] ?? ""
+		invocationId: t["invocation-id"] ?? "",
+		...s
 	};
 	if (e === "ai-run-end") {
-		let e = t["run-reason"] ?? "complete";
-		return {
+		let e = t["run-reason"] ?? "complete", r = t["invocation-id"] ?? "";
+		return e === "error" ? {
 			type: "end",
-			runId: r,
-			clientId: i,
+			runId: i,
+			clientId: a,
 			serial: n,
-			invocationId: t["invocation-id"] ?? "",
-			reason: e
+			invocationId: r,
+			reason: e,
+			...s,
+			error: ye(t)
+		} : {
+			type: "end",
+			runId: i,
+			clientId: a,
+			serial: n,
+			invocationId: r,
+			reason: e,
+			...s
 		};
 	}
-}, G = (e, t, n) => {
+}, xe = (e, t, n) => {
+	let r = P(n), i = n.serial, a = n.timestamp;
+	if (ve(n.name)) {
+		let t = be(n.name, r, i, a);
+		return t && e.applyRunLifecycle(t), t;
+	}
+	let { inputs: o, outputs: s } = t.decode(n);
+	(o.length > 0 || s.length > 0 || r["run-id"]) && e.applyMessage({
+		inputs: o,
+		outputs: s
+	}, r, i, a, n.version.serial);
+}, Se = (e, t) => ({ apply: (n) => xe(e, t, n) }), Ce = (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));
-		}
-	}
-	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) => {
+}, we = (e) => {
 	let t;
 	return {
 		promise: e === void 0 ? new Promise(() => {}) : e.aborted ? Promise.resolve() : new Promise((n) => {
@@ -237,613 +432,193 @@ var t = class e {
 			t && e && e.removeEventListener("abort", t);
 		}
 	};
-}, ce = async (e, t, n, r, i, a) => {
+}, Te = async (e, t, n, r, i, a) => {
 	a?.trace("pipeStream();");
-	let o = e.getReader(), s = se(n), c = "complete", l;
+	let o = e.getReader(), s = we(n), c = "complete", l;
 	try {
 		for (;;) {
 			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");
+				c = "cancelled", a?.debug("pipeStream(); stream cancelled by AbortSignal"), r && await r(async (e) => t.publishOutput(e)), await t.cancelStreams();
 				break;
-			}
-			let { done: n, value: l } = e;
-			if (n) {
-				await t.close(), a?.debug("pipeStream(); stream completed");
-				break;
-			}
-			await t.publishOutput(l, i?.(l));
-		}
-	} catch (e) {
-		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.cleanup(), o.releaseLock();
-	}
-	return {
-		reason: c,
-		error: l
-	};
-}, le = class {
-	constructor(e, t) {
-		this._activeRuns = /* @__PURE__ */ new Map(), this._channel = e, this._logger = t?.withContext({ component: "RunManager" });
-	}
-	async startRun(e, t, n, r) {
-		this._logger?.trace("DefaultRunManager.startRun();", {
-			runId: e,
-			clientId: t
-		});
-		let i = n ?? new AbortController(), a = t ?? "";
-		this._activeRuns.set(e, {
-			controller: i,
-			clientId: a
-		});
-		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
-		});
-		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._activeRuns.get(e)?.controller.signal;
-	}
-	getClientId(e) {
-		return this._activeRuns.get(e)?.clientId;
-	}
-	cancel(e) {
-		this._logger?.debug("DefaultRunManager.cancel();", { runId: e }), this._activeRuns.get(e)?.controller.abort();
-	}
-	getActiveRunIds() {
-		return [...this._activeRuns.keys()];
-	}
-	close() {
-		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._hasAttachedOnce = this._channel.state === "attached", this._onChannelStateChange = (e) => {
-			this._handleChannelStateChange(e);
-		}, 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);
-		};
-	}
-	createRun(e, t) {
-		return this._logger?.trace("DefaultAgentSession.createRun();", { inputEventId: e.inputEventId }), this._createRun(e, t ?? {});
-	}
-	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");
-		}
-	}
-	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 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
-		};
-		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 === "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("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" : ""})`, T.ChannelContinuityLost, 500, t.reason);
-		this._onError?.(i);
-	}
-	_handleChannelMessage(t) {
-		try {
-			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)}`, T.SessionSubscriptionError, 500, t instanceof e.ErrorInfo ? t : void 0);
-			this._logger?.error("DefaultAgentSession._handleChannelMessage(); subscription error"), this._onError?.(n);
-		}
-	}
-	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._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 runId() {
-				return r;
-			},
-			get invocationId() {
-				return i;
-			},
-			get abortSignal() {
-				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 (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;
-				}
-				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 {
-					await S.startRun(r, P, _, {
-						parent: U,
-						forkOf: L,
-						regenerates: R,
-						invocationId: i,
-						inputClientId: F,
-						inputCodecMessageId: z,
-						continuation: B
-					});
-				} catch (t) {
-					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;
-				}
-				x?.debug("Run.start(); run started", {
-					runId: r,
-					inputEventId: j
-				});
-			},
-			addEvents: async (t) => {
-				if (x?.trace("Run.addEvents();", {
-					runId: r,
-					count: t.length
-				}), 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 = V({
-							role: "assistant",
-							runId: r,
-							codecMessageId: e.codecMessageId,
-							runClientId: n,
-							invocationId: i,
-							inputClientId: F,
-							inputCodecMessageId: z
-						}), a = C.createEncoder(w, {
-							extras: { headers: t },
-							onMessage: s
-						});
-						for (let t of e.events) await a.publishOutput(t);
-						await a.close();
-					}
-				} catch (t) {
-					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;
-				}
-				x?.debug("Run.addEvents(); events published", {
-					runId: r,
-					count: t.length
-				});
-			},
-			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",
-					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
-				}), 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 });
-				}
-			},
-			end: async (t) => {
-				if (x?.trace("Run.end();", {
-					runId: r,
-					reason: t
-				}), 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 S.endRun(r, t, i, F, z);
-					} catch (t) {
-						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 {
-						G();
-					}
-					x?.debug("Run.end(); run ended", {
-						runId: r,
-						reason: t
-					});
-				}
-			}
-		};
-	}
-}, pe = (e) => new fe(e), me = (e) => ({
-	logAction: (t, n, r) => {
-		e.error(n, { detail: r });
-	},
-	shouldLog: () => !0
-}), he = e.Realtime.EventEmitter, Y = class extends he {
-	constructor(e) {
-		super(me(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;
-}({}), _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 "trace":
-		case "debug":
-			console.log(i);
-			break;
-		case "info":
-			console.info(i);
-			break;
-		case "warn":
-			console.warn(i);
-			break;
-		case "error":
-			console.error(i);
-			break;
-		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 = 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, "trace", 0, t);
+			}
+			let { done: n, value: l } = e;
+			if (n) {
+				await t.cancelStreams(), await t.close(), a?.debug("pipeStream(); stream completed");
+				break;
+			}
+			await t.publishOutput(l, i?.(l));
+		}
+	} catch (e) {
+		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.cleanup(), o.releaseLock();
 	}
-	debug(e, t) {
-		this._write(e, "debug", 1, t);
+	return {
+		reason: c,
+		error: l
+	};
+}, Ee = class {
+	constructor(e, t) {
+		this._activeRuns = /* @__PURE__ */ new Map(), this._channel = e, this._logger = t?.withContext({ component: "RunManager" });
 	}
-	info(e, t) {
-		this._write(e, "info", 2, t);
+	async startRun(e, t, n, r) {
+		this._logger?.trace("DefaultRunManager.startRun();", {
+			runId: e,
+			clientId: t
+		});
+		let i = n ?? new AbortController(), a = t ?? "";
+		this._activeRuns.set(e, {
+			controller: i,
+			clientId: a
+		});
+		let o = r?.continuation === !0, s = _e({
+			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
+		});
+		await this._channel.publish({
+			name: o ? C : x,
+			extras: { ai: { transport: s } }
+		}), this._logger?.debug("DefaultRunManager.startRun(); run started", { runId: e });
 	}
-	warn(e, t) {
-		this._write(e, "warn", 3, t);
+	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 });
 	}
-	error(e, t) {
-		this._write(e, "error", 4, t);
+	async endRun(e, t, n, r, i, a) {
+		this._logger?.trace("DefaultRunManager.endRun();", {
+			runId: e,
+			reason: t
+		});
+		let o = t === "error" && a ? {
+			errorCode: a.code,
+			errorMessage: a.message
+		} : {};
+		await this._publishTerminal(w, e, {
+			reason: t,
+			invocationId: n,
+			inputClientId: r,
+			inputCodecMessageId: i,
+			...o
+		}), this._logger?.debug("DefaultRunManager.endRun(); run ended", {
+			runId: e,
+			reason: t
+		});
 	}
-	withContext(e) {
-		let n = [...ye.entries()].find(([, e]) => e === this._levelNumber)?.[0] ?? "error";
-		return new t(this._handler, n, this._mergeContext(e));
+	async _publishTerminal(e, t, n) {
+		let r = _e({
+			runId: t,
+			runClientId: this._activeRuns.get(t)?.clientId ?? "",
+			...n
+		});
+		await this._channel.publish({
+			name: e,
+			extras: { ai: { transport: r } }
+		}), this._activeRuns.delete(t);
 	}
-	_write(e, t, n, r) {
-		n >= this._levelNumber && this._handler(e, t, this._mergeContext(r));
+	getClientId(e) {
+		return this._activeRuns.get(e)?.clientId;
 	}
-	_mergeContext(e) {
-		return this._context ? e ? {
-			...this._context,
-			...e
-		} : this._context : e ?? void 0;
+	close() {
+		this._logger?.trace("DefaultRunManager.close();", { activeRuns: this._activeRuns.size });
+		for (let e of this._activeRuns.values()) e.controller.abort();
+		this._activeRuns.clear();
 	}
-}, X = (e) => e.kind === "run" ? e.runId : e.codecMessageId, Z = (e) => e.kind === "run" ? e.startSerial : e.serial, xe = (e, t, n) => {
+}, De = (e, t) => new Ee(e, t), Oe = async (t, n) => {
+	if (!t) throw new e.ErrorInfo(`unable to ${n}; connect() must be called before ${n}()`, E.InvalidArgument, 400);
+	return t;
+}, ke = async (e, t, n, r) => {
+	if (t !== void 0) try {
+		await e.detach();
+	} catch (e) {
+		n?.debug(`${r}.close(); channel detach failed`, { error: e });
+	}
+}, Ae = (e) => {
+	let { current: t, resumed: n } = e;
+	return t === "failed" || t === "suspended" || t === "detached" || t === "attached" && !n;
+}, je = (t, n) => {
+	let { current: r } = t;
+	return new e.ErrorInfo(`unable to ${n}; channel continuity lost (${r}${r === "attached" ? ", resumed: false" : ""})`, E.ChannelContinuityLost, 500, t.reason);
+}, Me = (e) => ({
+	logAction: (t, n, r) => {
+		e.error(n, { detail: r });
+	},
+	shouldLog: () => !0
+}), Ne = e.Realtime.EventEmitter, K = class extends Ne {
+	constructor(e) {
+		super(Me(e));
+	}
+}, Pe = (e) => [...e.inputs.map((e) => ({
+	direction: "input",
+	event: e
+})), ...e.outputs.map((e) => ({
+	direction: "output",
+	event: e
+}))], Fe = class {
+	constructor() {
+		this._entries = [], this._swept = !1;
+	}
+	get swept() {
+		return this._swept;
+	}
+	record(e, t, n, r, i) {
+		let a = this._recordEntry(e, t, this._swept ? [] : n, r, i);
+		return a === void 0 ? "dropped" : this._swept || a === this._entries.length - 1 ? "incremental" : "refold";
+	}
+	replay(e) {
+		for (let t of this._entries) for (let n of t.events) e(n, t.serial, t.messageId);
+	}
+	sweep() {
+		this._swept = !0;
+		for (let e of this._entries) e.events.length = 0;
+	}
+	_recordEntry(e, t, n, r, i) {
+		for (let a = this._entries.length - 1; a >= 0; a--) {
+			let o = this._entries[a];
+			if (!o) break;
+			if (o.serial === e) return r !== void 0 && (r <= o.decodedThrough || !i) ? void 0 : (o.events.push(...n), r !== void 0 && (o.decodedThrough = r), a);
+			if (o.serial < e) return this._entries.splice(a + 1, 0, {
+				serial: e,
+				messageId: t,
+				events: [...n],
+				decodedThrough: r ?? e
+			}), a + 1;
+		}
+		return this._entries.unshift({
+			serial: e,
+			messageId: t,
+			events: [...n],
+			decodedThrough: r ?? e
+		}), 0;
+	}
+}, q = (e) => e.kind === "run" ? e.runId : e.codecMessageId, Ie = (e) => e.kind === "run" ? e.startSerial : e.serial, Le = (e, t, n) => {
 	let r = e.get(t);
 	r || (r = /* @__PURE__ */ new Set(), e.set(t, r)), r.add(n);
-}, Se = (e, t, n) => {
+}, Re = (e, t, n) => {
 	let r = e.get(t);
 	r && (r.delete(n), r.size === 0 && e.delete(t));
-}, Ce = class {
+}, ze = class {
 	constructor(e, t) {
-		this._nodeIndex = /* @__PURE__ */ new Map(), this._codecMessageIdToNodeKey = /* @__PURE__ */ new Map(), this._sortedNodes = [], this._parentIndex = /* @__PURE__ */ new Map(), this._replyRunsByInput = /* @__PURE__ */ new Map(), this._seqCounter = 0, this._structuralVersion = 0, this._siblingCache = /* @__PURE__ */ new Map(), this._siblingCacheVersion = -1, this._codec = e, this._logger = t, this._emitter = new Y(t);
+		this._nodeIndex = /* @__PURE__ */ new Map(), this._codecMessageIdToNodeKey = /* @__PURE__ */ new Map(), this._sortedNodes = [], this._parentIndex = /* @__PURE__ */ new Map(), this._replyRunsByInput = /* @__PURE__ */ new Map(), this._seqCounter = 0, this._structuralVersion = 0, this._siblingCache = /* @__PURE__ */ new Map(), this._siblingCacheVersion = -1, this._eventIdIndex = /* @__PURE__ */ new Map(), this._clock = 0, this._sweepQueue = [], this._codec = e, this._logger = t, this._emitter = new K(t);
 	}
 	_compareNodes(e, t) {
-		let n = Z(e.node), r = Z(t.node);
+		let n = Ie(e.node), r = Ie(t.node);
 		return n === void 0 && r === void 0 ? e.insertSeq - t.insertSeq : n === void 0 ? 1 : r === void 0 || n < r ? -1 : n > r ? 1 : e.insertSeq - t.insertSeq;
 	}
 	_insertSortedNode(e) {
-		if (Z(e.node) === void 0) {
+		if (Ie(e.node) === void 0) {
 			this._sortedNodes.push(e);
 			return;
 		}
@@ -873,28 +648,94 @@ var t = class e {
 			});
 		} catch (t) {
 			this._logger.error("Tree._foldInto(); fold threw", {
-				key: X(e.node),
+				key: q(e.node),
 				messageId: r,
 				err: t
 			});
 		}
 	}
+	_recordAndFold(e, t, n, r, i, a) {
+		if (n === void 0 || t.length === 0) {
+			n === void 0 && t.length > 0 && (e.optimistic = !0), this._foldInto(e, t, n, r);
+			return;
+		}
+		let o = e.log.record(n, r, t, i, a);
+		if (o === "dropped") {
+			this._logger.debug("Tree._recordAndFold(); version guard dropped re-delivered wire", {
+				key: q(e.node),
+				serial: n,
+				version: i,
+				swept: e.log.swept
+			});
+			return;
+		}
+		if (e.optimistic && !e.log.swept) {
+			e.optimistic = !1, this._refold(e);
+			return;
+		}
+		if (o === "refold") {
+			this._refold(e);
+			return;
+		}
+		e.log.swept && this._logger.warn("Tree._recordAndFold(); late wire after log retention window; folding in arrival order", {
+			key: q(e.node),
+			serial: n
+		}), this._foldInto(e, t, n, r);
+	}
+	_refold(e) {
+		let t = this._codec.init();
+		e.log.replay((n, r, i) => {
+			try {
+				t = this._codec.fold(t, n, {
+					serial: r,
+					messageId: i
+				});
+			} catch (t) {
+				this._logger.error("Tree._refold(); fold threw", {
+					key: q(e.node),
+					messageId: i,
+					err: t
+				});
+			}
+		}), e.node.projection = t;
+	}
+	_recordActivity(e, t) {
+		t !== void 0 && (t > e.lastActivityTs && (e.lastActivityTs = t), t > this._clock && (this._clock = t, this._drainSweepQueue()));
+	}
+	_maybeQueueSweep(e) {
+		let t = e.node;
+		t.kind === "run" && (e.log.swept || e.sweepQueued || e.runStartSeen && (t.state.status === "active" || t.state.status === "suspended" || (e.sweepQueued = !0, this._sweepQueue.push(t.runId))));
+	}
+	_drainSweepQueue() {
+		for (; this._sweepQueue.length > 0;) {
+			let e = this._sweepQueue[0], t = e === void 0 ? void 0 : this._nodeIndex.get(e);
+			if (!t || t.log.swept) {
+				this._sweepQueue.shift();
+				continue;
+			}
+			if (t.lastActivityTs + 12e4 >= this._clock) return;
+			this._sweepQueue.shift(), t.sweepQueued = !1, t.log.sweep(), this._logger.debug("Tree._drainSweepQueue(); dropped event-log payloads, kept replay keys", {
+				key: e,
+				lastActivityTs: t.lastActivityTs
+			});
+		}
+	}
 	_addToParentIndex(e, t) {
-		xe(this._parentIndex, e, t);
+		Le(this._parentIndex, e, t);
 	}
 	_removeFromParentIndex(e, t) {
-		Se(this._parentIndex, e, t);
+		Re(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)]);
+		let t = e, n = new Set([q(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));
+			t = e.node, n.add(q(t));
 		}
 		return t;
 	}
@@ -912,47 +753,47 @@ var t = class e {
 			t && this._isSiblingOf(t.node, r) && a.push(t);
 		}
 		a.sort((e, t) => this._compareNodes(e, t));
-		for (let e of a) this._siblingCache.set(X(e.node), a);
+		for (let e of a) this._siblingCache.set(q(e.node), a);
 		return this._siblingCache.set(e, a), a;
 	}
 	_isSiblingOf(e, t) {
 		if (e.kind !== t.kind || e.parentCodecMessageId !== t.parentCodecMessageId) return !1;
 		if (e.kind === "run") return !0;
-		let n = X(t);
-		if (X(e) === n) return !0;
-		let r = e, i = new Set([X(r)]);
+		let n = q(t);
+		if (q(e) === n) return !0;
+		let r = e, i = new Set([q(r)]);
 		for (; r.kind === "input" && r.forkOf !== void 0;) {
 			if (r.forkOf === n) return !0;
 			if (i.has(r.forkOf)) break;
 			let e = this._nodeIndex.get(r.forkOf);
 			if (!e) break;
-			r = e.node, i.add(X(r));
+			r = e.node, i.add(q(r));
 		}
 		return !1;
 	}
 	getGroupRoot(e) {
 		let t = this._nodeIndex.get(e);
 		if (!t) return e;
-		if (t.node.kind === "input") return X(this._inputGroupRoot(t.node));
+		if (t.node.kind === "input") return q(this._inputGroupRoot(t.node));
 		let n = this._getSiblingGroup(e)[0]?.node;
-		return n ? X(n) : e;
+		return n ? q(n) : e;
 	}
 	visibleNodes(e = /* @__PURE__ */ new Map()) {
 		this._logger.trace("DefaultTree.visibleNodes();");
 		let t = [], n = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Map();
 		for (let i of this._sortedNodes) {
-			let a = i.node, o = X(a), s = this._parentKeyOf(a);
+			let a = i.node, o = q(a), s = this._parentKeyOf(a);
 			if (s !== void 0 && !n.has(s)) continue;
 			let c = this._getSiblingGroup(o);
 			if (c.length > 1) {
 				let t = this.getGroupRoot(o), n = r.get(t);
 				if (n === void 0) {
 					let i = e.get(t);
-					if (i !== void 0 && c.some((e) => X(e.node) === i)) n = i;
+					if (i !== void 0 && c.some((e) => q(e.node) === i)) n = i;
 					else {
 						let e = c.at(-1);
 						if (!e) break;
-						n = X(e.node);
+						n = q(e.node);
 					}
 					r.set(t, n);
 				}
@@ -988,51 +829,51 @@ var t = class e {
 	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) {
+	applyMessage(e, t, n, r, i) {
+		let a = t[o], s = t[l], c = a === void 0 && s !== void 0 && t.role === "user" && e.inputs.length > 0 ? s : void 0;
+		if (a === void 0 && c === void 0) {
 			this._logger.warn("Tree.applyMessage(); message has no run-id and is not a user input; skipping");
 			return;
 		}
-		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", {
+		let u = Pe(e), d = c ?? a;
+		if (u.length === 0 && d !== void 0 && !this._nodeIndex.has(d)) return;
+		let f = this._structuralVersion;
+		c === void 0 ? a !== void 0 && this._applyRunMessage(a, e, t, n, r, i) : this._applyInputMessage(c, t, n, r, i, u), this._structuralVersion !== f && this._emitter.emit("update");
+	}
+	_applyInputMessage(e, t, r, i, a, o) {
+		let s = this._nodeIndex.get(e);
+		s ? s.node.kind === "input" && r && !s.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", {
+			serial: r
+		}), s.node.serial = r, this._promoteSerial(s)) : (s = this._createInputNodeFromHeaders(e, t, r), this._insertNode(e, s, s.node.parentCodecMessageId), this._codecMessageIdToNodeKey.set(e, e), this._logger.debug("Tree.applyMessage(); created input node", { codecMessageId: e })), this._recordActivity(s, i), this._recordAndFold(s, o, r, e, a, t[n] === "true"), this._emitter.emit("output", {
 			runId: void 0,
 			inputCodecMessageId: e,
 			codecMessageId: e,
-			serial: n,
+			serial: r,
 			events: []
 		});
 	}
-	_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);
+	_applyRunMessage(e, t, r, i, a, o) {
+		let s = r[l], c = r[_], u = Pe(t), d = t.outputs, f = this._nodeIndex.get(e);
+		if (!f && s !== void 0) {
+			let e = this._codecMessageIdToNodeKey.get(s), t = e === void 0 ? void 0 : this._nodeIndex.get(e);
+			t?.node.kind === "run" && t.node.startSerial === void 0 && (f = t);
 		}
-		c ? r && c.node.kind === "run" && !c.node.startSerial && (this._logger.debug("Tree.applyMessage(); promoting startSerial", {
+		f ? i && f.node.kind === "run" && !f.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
+			serial: i
+		}), f.node.startSerial = i, this._promoteSerial(f)) : (f = this._createRunFromHeaders(e, r, i), this._insertNode(e, f, f.node.parentCodecMessageId), this._indexReplyRun(f.node, e), this._logger.debug("Tree.applyMessage(); created new Run", { runId: e }));
+		let p = q(f.node);
+		s && this._codecMessageIdToNodeKey.set(s, p), this._recordActivity(f, a), this._recordAndFold(f, u, i, s, o, r[n] === "true"), this._emitter.emit("output", {
+			runId: p,
+			inputCodecMessageId: c,
+			codecMessageId: s,
+			serial: i,
+			events: d
 		});
 	}
 	_indexReplyRun(e, t) {
-		e.parentCodecMessageId !== void 0 && xe(this._replyRunsByInput, e.parentCodecMessageId, t);
+		e.parentCodecMessageId !== void 0 && Le(this._replyRunsByInput, e.parentCodecMessageId, t);
 	}
 	applyRunLifecycle(e) {
 		this._logger.trace("DefaultTree.applyRunLifecycle();", {
@@ -1060,155 +901,471 @@ var t = class 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) {
+			if (n.state.status === "suspended" && (n.state = { status: "active" }), e.serial && !n.startSerial && (n.startSerial = e.serial, this._promoteSerial(t)), n.parentCodecMessageId === void 0 && e.parent !== void 0 && (n.parentCodecMessageId = e.parent, this._removeFromParentIndex(void 0, e.runId), this._addToParentIndex(n.parentCodecMessageId, e.runId), this._indexReplyRun(n, e.runId), this._structuralVersion++), n.forkOf === void 0 && e.forkOf !== void 0) {
 				let t = this._codecMessageIdToNodeKey.get(e.forkOf);
 				t !== void 0 && t !== e.runId && (n.forkOf = t, this._structuralVersion++);
 			}
-			n.regeneratesCodecMessageId === void 0 && e.regenerates !== void 0 && (n.regeneratesCodecMessageId = e.regenerates, this._structuralVersion++), n.invocationId === "" && e.invocationId !== "" && (n.invocationId = e.invocationId);
+			n.regeneratesCodecMessageId === void 0 && e.regenerates !== void 0 && (n.regeneratesCodecMessageId = e.regenerates, this._structuralVersion++), n.invocationId === "" && e.invocationId !== "" && (n.invocationId = e.invocationId), t.runStartSeen = !0, this._recordActivity(t, e.timestamp), this._maybeQueueSweep(t);
 		} else if (!t) {
 			let t = this._createRunFromLifecycle(e);
-			this._insertNode(e.runId, t, t.node.parentCodecMessageId), this._indexReplyRun(t.node, e.runId);
+			this._insertNode(e.runId, t, t.node.parentCodecMessageId), this._indexReplyRun(t.node, e.runId), this._recordActivity(t, e.timestamp);
 		}
 	}
 	_applyRunSuspend(e) {
 		let t = this._nodeIndex.get(e.runId);
-		t?.node.kind === "run" && (t.node.status = "suspended", t.node.endSerial = e.serial);
+		t?.node.kind === "run" && (t.node.state = { status: "suspended" }, t.node.endSerial = e.serial, this._recordActivity(t, e.timestamp));
+	}
+	_applyRunResume(e) {
+		let t = this._nodeIndex.get(e.runId);
+		t?.node.kind === "run" && t.node.state.status === "suspended" && (t.node.state = { status: "active" }, this._recordActivity(t, e.timestamp));
+	}
+	_applyRunEnd(e) {
+		let t = this._nodeIndex.get(e.runId);
+		t?.node.kind === "run" && (t.node.state = e.reason === "error" ? {
+			status: "error",
+			error: e.error
+		} : { status: e.reason }, t.node.endSerial = e.serial, this._recordActivity(t, e.timestamp), this._maybeQueueSweep(t));
+	}
+	delete(e) {
+		let t = this._nodeIndex.get(e);
+		t && (this._logger.debug("Tree.delete();", { key: e }), this._removeFromParentIndex(t.node.parentCodecMessageId, e), this._removeSortedNode(t), this._nodeIndex.delete(e), t.node.kind === "run" && t.node.parentCodecMessageId !== void 0 && Re(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,
+			runStartSeen: !1
+		});
+	}
+	_wrapNode(e, t = !1) {
+		return {
+			node: e,
+			insertSeq: this._seqCounter++,
+			log: new Fe(),
+			lastActivityTs: 0,
+			runStartSeen: t,
+			sweepQueued: !1,
+			optimistic: !1
+		};
+	}
+	_buildRunNode(e) {
+		let t = {
+			kind: "run",
+			runId: e.runId,
+			parentCodecMessageId: e.parentCodecMessageId,
+			forkOf: e.forkOf,
+			regeneratesCodecMessageId: e.regeneratesCodecMessageId,
+			clientId: e.clientId,
+			invocationId: e.invocationId,
+			state: { status: "active" },
+			projection: this._codec.init(),
+			startSerial: e.startSerial,
+			endSerial: void 0
+		};
+		return this._wrapNode(t, e.runStartSeen);
+	}
+	_createInputNodeFromHeaders(e, t, n) {
+		let r = t[m], i = {
+			kind: "input",
+			codecMessageId: e,
+			parentCodecMessageId: t[p],
+			forkOf: r,
+			projection: this._codec.init(),
+			serial: n
+		};
+		return this._wrapNode(i);
+	}
+	_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,
+			runStartSeen: !0
+		});
+	}
+	on(e, t) {
+		let n = t;
+		return this._emitter.on(e, n), () => {
+			this._emitter.off(e, n);
+		};
+	}
+	emitAblyMessage(e) {
+		this._logger.trace("DefaultTree.emitAblyMessage();");
+		let t = P(e)[c];
+		t !== void 0 && !this._eventIdIndex.has(t) && this._eventIdIndex.set(t, e), this._emitter.emit("ably-message", e);
+	}
+	findAblyMessageByEventId(e) {
+		return this._eventIdIndex.get(e);
+	}
+}, Be = (e, t) => new ze(e, t), Ve = 200, He = class {
+	constructor(e) {
+		this._registeredRuns = /* @__PURE__ */ new Map(), this._runIdByInputCodecMessageId = /* @__PURE__ */ new Map(), this._deferredCancels = /* @__PURE__ */ new Map(), this._state = "ready", this._codec = e.codec;
+		let t = { ...G(e.client, e.codec) }, n = se(e.channelModes);
+		n && (t.modes = n), this._channel = e.client.channels.get(e.channelName, t), this._logger = e.logger?.withContext({ component: "AgentSession" }), this._onError = e.onError, this._runManager = De(this._channel, this._logger), this._inputEventLookupTimeoutMs = e.inputEventLookupTimeoutMs ?? 3e4, this._inputEventLookbackMs = e.inputEventLookbackMs ?? 12e4, this._tree = Be(this._codec, this._logger ?? k({ logLevel: D.Silent })), this._applier = Se(this._tree, this._codec.createDecoder()), this._agentView = this._createAgentView(), this._channelListener = (e) => {
+			this._handleChannelMessage(e);
+		}, this._hasAttachedOnce = this._channel.state === "attached", this._onChannelStateChange = (e) => {
+			this._handleChannelStateChange(e);
+		}, this._channel.on(this._onChannelStateChange), this._logger?.debug("DefaultAgentSession(); session created");
+	}
+	_createAgentView() {
+		return he({
+			tree: this._tree,
+			channel: this._channel,
+			codec: this._codec,
+			applier: this._applier,
+			logger: this._logger,
+			inputEventLookbackMs: this._inputEventLookbackMs
+		});
+	}
+	get presence() {
+		return this._channel.presence;
+	}
+	get object() {
+		return this._channel.object;
+	}
+	connect() {
+		return this._state === "closed" ? Promise.reject(new e.ErrorInfo("unable to connect; session is closed", E.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; ${j(t)}`, E.SessionSubscriptionError, 500, M(t));
+			throw this._logger?.error("DefaultAgentSession.connect(); subscribe failed"), this._onError?.(n), n;
+		}), this._connectPromise);
+	}
+	get tree() {
+		return this._tree;
+	}
+	createRun(e, t) {
+		return this._logger?.trace("DefaultAgentSession.createRun();", { inputEventId: e.inputEventId }), this._createRun(e, t ?? {});
+	}
+	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();
+			this._registeredRuns.clear(), this._runIdByInputCodecMessageId.clear(), this._deferredCancels.clear(), this._runManager.close(), await ke(this._channel, this._connectPromise, this._logger, "DefaultAgentSession"), this._logger?.debug("DefaultAgentSession.close(); session closed");
+		}
+	}
+	async _handleCancelMessage(e) {
+		let t = P(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 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 = Ce(this._deferredCancels, e, Ve);
+		n !== void 0 && this._logger?.warn("DefaultAgentSession._bufferDeferredCancel(); deferred-cancel buffer full, dropping oldest", {
+			evictedInputCodecMessageId: n,
+			limit: Ve
+		}), 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
+		};
+		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: ${j(n)}`, E.CancelListenerError, 500, M(n));
+			this._logger?.error("DefaultAgentSession._cancelRegistration(); onCancel threw", { runId: r }), (t.onError ?? this._onError)?.(i);
+		}
 	}
-	_applyRunResume(e) {
-		let t = this._nodeIndex.get(e.runId);
-		t?.node.kind === "run" && t.node.status === "suspended" && (t.node.status = "active");
+	_handleChannelStateChange(e) {
+		if (this._state === "closed") return;
+		let { current: t, resumed: n } = e;
+		if (t === "attached" && !this._hasAttachedOnce) {
+			this._hasAttachedOnce = !0;
+			return;
+		}
+		if (!Ae(e)) return;
+		this._logger?.error("DefaultAgentSession._handleChannelStateChange(); channel continuity lost", {
+			current: t,
+			resumed: n,
+			previous: e.previous
+		});
+		let r = je(e, "continue");
+		for (let e of this._registeredRuns.values()) e.controller.abort();
+		this._tree = Be(this._codec, this._logger ?? k({ logLevel: D.Silent })), this._applier = Se(this._tree, this._codec.createDecoder()), this._agentView = this._createAgentView(), this._onError?.(r);
 	}
-	_applyRunEnd(e) {
-		let t = this._nodeIndex.get(e.runId);
-		t?.node.kind === "run" && (t.node.status = e.reason, t.node.endSerial = e.serial);
+	_foldWire(e) {
+		this._applier.apply(e), this._tree.emitAblyMessage(e);
 	}
-	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"));
+	_handleChannelMessage(t) {
+		try {
+			if (this._foldWire(t), t.name === "ai-cancel") {
+				this._handleCancelMessage(t).catch((t) => {
+					let n = new e.ErrorInfo(`unable to route cancel message; ${j(t)}`, E.CancelListenerError, 500, M(t));
+					this._logger?.error("DefaultAgentSession._handleChannelMessage(); cancel routing error"), this._onError?.(n);
+				});
+				return;
+			}
+		} catch (t) {
+			let n = new e.ErrorInfo(`unable to process channel message; ${j(t)}`, E.SessionSubscriptionError, 500, M(t));
+			this._logger?.error("DefaultAgentSession._handleChannelMessage(); subscription error"), this._onError?.(n);
+		}
 	}
-	_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
-		});
+	async _requireConnected(e) {
+		return Oe(this._connectPromise, e);
 	}
-	_buildRunNode(e) {
-		return {
-			node: {
-				kind: "run",
-				runId: e.runId,
-				parentCodecMessageId: e.parentCodecMessageId,
-				forkOf: e.forkOf,
-				regeneratesCodecMessageId: e.regeneratesCodecMessageId,
-				clientId: e.clientId,
-				invocationId: e.invocationId,
-				status: "active",
-				projection: this._codec.init(),
-				startSerial: e.startSerial,
-				endSerial: void 0
-			},
-			insertSeq: this._seqCounter++
+	_createRun(t, n) {
+		let r = n.runId ?? crypto.randomUUID(), i = n.runId !== void 0, a = n.invocationId ?? crypto.randomUUID(), s = this._inputEventLookupTimeoutMs, { onMessage: c, onCancelled: d, onCancel: f, onError: g, signal: _ } = n, v = new AbortController(), y = "initialized", b = _ ? AbortSignal.any([v.signal, _]) : v.signal, x = {
+			runId: r,
+			invocationId: a,
+			controller: v,
+			signal: b,
+			onCancel: f,
+			onError: g
 		};
-	}
-	_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
+		this._registeredRuns.set(r, x);
+		let S = this._logger, C = this._runManager, w = this._codec, ee = this._channel, T = this._registeredRuns, te = this._runIdByInputCodecMessageId, D = this._deferredCancels, O = this._requireConnected.bind(this), k = () => this._agentView, ne = this._pullDeferredCancel.bind(this), A = t.inputEventId, N, P, F, I, L, R, z = !1, B, V = () => this._tree, re = { get messages() {
+			if (R === void 0) return [];
+			let e = V().getNodeByCodecMessageId(R);
+			if (!e) return [];
+			let t = e.kind === "input" ? e.serial : e.startSerial, n = e.kind === "input" ? e.forkOf : void 0;
+			return w.getMessages(e.projection).map((r) => ({
+				kind: "message",
+				message: r.message,
+				codecMessageId: r.codecMessageId,
+				parentId: e.parentCodecMessageId,
+				forkOf: n,
+				headers: {},
+				serial: t
+			}));
+		} }, H, U = () => {
+			T.delete(r), R !== void 0 && (te.delete(R), D.delete(R));
+		}, W = async (t, n, i) => {
+			try {
+				await i();
+			} catch (i) {
+				let a = new e.ErrorInfo(`unable to publish ${t} for run ${r}; ${j(i)}`, E.RunLifecycleError, 500, M(i));
+				throw S?.error(`Run.${n}(); failed to publish ${t}`, { runId: r }), a;
+			}
+		}, G = {
+			get runId() {
+				return r;
 			},
-			insertSeq: this._seqCounter++
-		};
-	}
-	_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;
-		return this._emitter.on(e, n), () => {
-			this._emitter.off(e, n);
+			get invocationId() {
+				return a;
+			},
+			get abortSignal() {
+				return b;
+			},
+			get view() {
+				return re;
+			},
+			get messages() {
+				return k().messages(r, H, L);
+			},
+			start: async () => {
+				if (S?.trace("Run.start();", {
+					runId: r,
+					inputEventId: A
+				}), await O("start"), b.aborted) throw new e.ErrorInfo(`unable to start run; run ${r} was cancelled before start()`, E.InvalidArgument, 400);
+				if (y !== "initialized") return;
+				if (y = "started", A && s > 0) try {
+					let e = await k().findInputEvent({
+						invocationId: a,
+						runId: r,
+						expectedEventIds: [A],
+						timeoutMs: s,
+						signal: b
+					});
+					e.firstHeaders !== void 0 && (B = e.firstHeaders), e.firstClientId !== void 0 && (P = e.firstClientId);
+				} catch (t) {
+					let n = t instanceof e.ErrorInfo ? t : new e.ErrorInfo(`unable to look up input event; ${j(t)}`, E.InputEventNotFound, 504);
+					throw U(), S?.error("Run.start(); input-event lookup failed", {
+						runId: r,
+						invocationId: a
+					}), n;
+				}
+				let t = B;
+				if (t) {
+					N = t[u], F = t[p], I = t[m], L = t[h], R = t[l];
+					let e = t[o];
+					z = e !== void 0, e !== void 0 && e !== r && (T.delete(r), r = e, x.runId = r, T.set(r, x));
+				}
+				H = R !== void 0 && this._tree.getNodeByCodecMessageId(R) !== void 0 ? R : F, R !== void 0 && (te.set(R, r), await ne(x, R)), await W("run-start", "start", async () => C.startRun(r, N, v, {
+					parent: H,
+					forkOf: I,
+					regenerates: L,
+					invocationId: a,
+					inputClientId: P,
+					inputCodecMessageId: R,
+					continuation: z
+				})), z || V().applyRunLifecycle({
+					type: "start",
+					runId: r,
+					clientId: N ?? "",
+					serial: void 0,
+					invocationId: a,
+					...H !== void 0 && { parent: H },
+					...I !== void 0 && { forkOf: I },
+					...L !== void 0 && { regenerates: L }
+				}), S?.debug("Run.start(); run started", {
+					runId: r,
+					inputEventId: A
+				});
+			},
+			loadConversation: async (e) => {
+				S?.trace("Run.loadConversation();", { runId: r }), await O("loadConversation");
+				let { messages: t } = await k().loadConversation(r, H, b, e?.maxRuns, i || z, L);
+				return t;
+			},
+			pipe: async (t, n) => {
+				if (S?.trace("Run.pipe();", { runId: r }), await O("pipe"), y === "initialized") throw new e.ErrorInfo(`unable to pipe stream; start() must be called before pipe() (run ${r})`, E.InvalidArgument, 400);
+				let i = C.getClientId(r), o = n?.parent ?? H, s = n?.forkOf ?? I, l = L, u = crypto.randomUUID(), f = ge({
+					role: "assistant",
+					runId: r,
+					codecMessageId: u,
+					runClientId: i,
+					parent: o,
+					forkOf: s,
+					invocationId: a,
+					inputClientId: P,
+					inputCodecMessageId: R,
+					regenerates: l
+				}), p = await Te(t, w.createEncoder(ee, {
+					extras: { headers: f },
+					onMessage: c,
+					messageId: u
+				}), b, d, n?.resolveWriteOptions, S);
+				if (p.error) {
+					let t = new e.ErrorInfo(`unable to pipe response for run ${r}; ${p.error.message}`, E.StreamError, 500, M(p.error));
+					S?.error("Run.pipe(); stream error", { runId: r }), g?.(t);
+				}
+				if (p.reason === "cancelled") try {
+					await G.end({ reason: "cancelled" });
+				} catch {
+					S?.error("Run.pipe(); run-end on cancel failed", { runId: r });
+				}
+				return S?.debug("Run.pipe(); stream finished", {
+					runId: r,
+					reason: p.reason
+				}), p;
+			},
+			suspend: async () => {
+				if (S?.trace("Run.suspend();", { runId: r }), await O("suspend"), y === "initialized") throw new e.ErrorInfo(`unable to suspend run; start() must be called before suspend() (run ${r})`, E.InvalidArgument, 400);
+				if (y !== "ended") {
+					y = "ended";
+					try {
+						await W("run-suspend", "suspend", async () => C.suspendRun(r, a, P, R));
+					} finally {
+						U();
+					}
+					S?.debug("Run.suspend(); run suspended", { runId: r });
+				}
+			},
+			end: async (t) => {
+				let { reason: n } = t, i = t.reason === "error" ? t.error : void 0;
+				if (S?.trace("Run.end();", {
+					runId: r,
+					reason: n
+				}), await O("end"), y === "initialized") throw new e.ErrorInfo(`unable to end run; start() must be called before end() (run ${r})`, E.InvalidArgument, 400);
+				if (y !== "ended") {
+					y = "ended";
+					try {
+						await W("run-end", "end", async () => C.endRun(r, n, a, P, R, i));
+					} finally {
+						U();
+					}
+					S?.debug("Run.end(); run ended", {
+						runId: r,
+						reason: n
+					});
+				}
+			}
 		};
+		return G;
 	}
-	emitAblyMessage(e) {
-		this._logger.trace("DefaultTree.emitAblyMessage();"), this._emitter.emit("ably-message", e);
-	}
-}, we = (e, t) => new Ce(e, t), Te = (e, t) => {
+}, Ue = (e) => new He(e), We = (e, t) => {
 	for (let n of t) {
-		let t = O(n), i = t[l];
+		let t = P(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);
 	}
-}, Ee = async (e, t, n) => {
-	e.rawMessages.push(...t.items), e.lastAblyPage = t, Te(e, t.items);
-	let r = e.returnedCount + n;
-	for (; e.completedCodecMessageIds.size < r && t.hasNext();) {
-		e.logger.debug("loadHistory.fetchUntilLimit(); fetching next page", {
+}, Ge = async (e, t) => {
+	let n = e.returnedCount + t;
+	for (; e.completedCodecMessageIds.size < n && e.cursor.hasNext();) {
+		e.logger.debug("loadHistory.fetchUntilLimit(); pulling next page", {
 			collected: e.rawMessages.length,
 			completed: e.completedCodecMessageIds.size
 		});
-		let n = await t.next();
-		if (!n) break;
-		t = n, e.rawMessages.push(...n.items), e.lastAblyPage = n, Te(e, n.items);
+		let t = await e.cursor.next();
+		if (!t) break;
+		e.rawMessages.push(...t), We(e, t);
 	}
-}, Q = (e, t) => {
+}, Ke = (e, t) => {
 	let n = e.completedCodecMessageIds.size, r = Math.min(t, Math.max(0, n - e.returnedCount));
 	e.returnedCount += r;
-	let i = n > e.returnedCount, a = e.lastAblyPage?.hasNext() ?? !1, o = e.rawMessages.length - e.returnedRawCount > 0 ? e.rawMessages.slice(e.returnedRawCount).toReversed() : [];
+	let i = n > e.returnedCount, a = e.cursor.hasNext(), o = e.rawMessages.length - e.returnedRawCount > 0 ? e.rawMessages.slice(e.returnedRawCount).toReversed() : [];
 	return e.returnedRawCount = e.rawMessages.length, {
 		rawMessages: o,
 		hasNext: () => i || a,
 		next: async () => {
-			if (i) return Q(e, t);
-			if (!a || !e.lastAblyPage) return;
-			let n = await e.lastAblyPage.next();
-			if (n) return await Ee(e, n, t), Q(e, t);
+			if (i) return Ke(e, t);
+			if (a) return await Ge(e, t), Ke(e, t);
 		}
 	};
-}, De = async (e, t, n) => {
-	let r = t?.limit ?? 100, i = {
+}, qe = async (e, t, n) => {
+	let r = t?.limit ?? 100;
+	n.trace("loadHistory();", { limit: r });
+	let i = {
+		cursor: await ue(e, {
+			pageLimit: r * 10,
+			untilAttach: !0,
+			logger: n
+		}),
 		rawMessages: [],
 		returnedCount: 0,
 		returnedRawCount: 0,
-		lastAblyPage: void 0,
 		startedCodecMessageIds: /* @__PURE__ */ new Set(),
 		terminatedCodecMessageIds: /* @__PURE__ */ new Set(),
 		completedCodecMessageIds: /* @__PURE__ */ new Set(),
 		logger: n
 	};
-	n.trace("loadHistory();", { limit: r });
-	let a = r * 10;
-	return await e.attach(), await Ee(i, await e.history({
-		untilAttach: !0,
-		limit: a
-	}), r), Q(i, r);
-}, Oe = (e) => Array.isArray(e) ? e : [e], ke = 3, $ = (e) => ({
+	return await Ge(i, r), Ke(i, r);
+}, Je = (e) => Array.isArray(e) ? e : [e], J = (e) => ({
 	runId: e.runId,
 	clientId: e.clientId,
-	status: e.status,
-	invocationId: e.invocationId
-}), Ae = class {
+	invocationId: e.invocationId,
+	...e.state
+}), Ye = class {
 	constructor(e) {
-		this._branchSelections = /* @__PURE__ */ new Map(), this._regenSelections = /* @__PURE__ */ new Map(), this._withheldRunIds = /* @__PURE__ */ new Set(), this._lastVisibleNodeKeys = [], this._lastVisibleProjections = [], this._lastVisibleMessagePairs = [], this._lastVisibleNodeKeySet = /* @__PURE__ */ new Set(), this._hasMoreHistory = !1, this._withheldBuffer = [], this._unsubs = [], this._cachedNodes = [], this._loadingOlder = !1, this._processingHistory = !1, this._closed = !1, this._tree = e.tree, this._channel = e.channel, this._codec = e.codec, this._sendDelegate = e.sendDelegate, this._onClose = e.onClose, this._logger = e.logger.withContext({ component: "View" }), this._logger.trace("DefaultView();"), this._emitter = new Y(this._logger), this._cachedNodes = this._computeFlatNodes(), this._updateVisibleSnapshot(this._cachedNodes), this._unsubs.push(this._tree.on("update", () => {
+		this._branchSelections = /* @__PURE__ */ new Map(), this._regenSelections = /* @__PURE__ */ new Map(), this._nonHeadRegenSelections = /* @__PURE__ */ new Map(), this._withheldRunIds = /* @__PURE__ */ new Set(), this._lastVisibleNodeKeys = [], this._lastVisibleProjections = [], this._lastVisibleMessagePairs = [], this._lastVisibleNodeKeySet = /* @__PURE__ */ new Set(), this._hasMoreHistory = !1, this._withheldBuffer = [], this._hiddenMessageCount = 0, this._unsubs = [], this._cachedNodes = [], this._loadingOlder = !1, this._processingHistory = !1, this._closed = !1, this._tree = e.tree, this._channel = e.channel, this._codec = e.codec, this._applier = e.applier, this._sendDelegate = e.sendDelegate, this._onClose = e.onClose, this._logger = e.logger.withContext({ component: "View" }), this._logger.trace("DefaultView();"), this._emitter = new K(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);
@@ -1219,17 +1376,17 @@ var t = class 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"));
+		this._processingHistory || (e.runId !== void 0 && this._lastVisibleNodeKeySet.has(e.runId) || e.inputCodecMessageId !== void 0 && this._lastVisibleNodeKeySet.has(e.inputCodecMessageId)) && (this._lastVisibleProjections = this._cachedNodes.map((e) => e.projection), this._lastVisibleMessagePairs = this._extractMessages(this._cachedNodes).slice(this._hiddenMessageCount), this._emitter.emit("update"));
 	}
 	getMessages() {
 		return this._lastVisibleMessagePairs;
 	}
 	runs() {
-		return this._cachedNodes.filter((e) => e.kind === "run").map((e) => $(e));
+		return this._cachedNodes.filter((e) => e.kind === "run").map((e) => J(e));
 	}
 	_computeFlatNodes() {
 		let e = this._treeVisibleNodes();
-		return this._withheldRunIds.size === 0 ? e : e.filter((e) => !this._withheldRunIds.has(X(e)));
+		return this._withheldRunIds.size === 0 ? e : e.filter((e) => !this._withheldRunIds.has(q(e)));
 	}
 	_recomputeAndEmit() {
 		this._cachedNodes = this._computeFlatNodes(), this._updateVisibleSnapshot(this._cachedNodes), this._emitter.emit("update");
@@ -1242,38 +1399,64 @@ var t = class e {
 		let t = this._tree.getNodeByCodecMessageId(e);
 		return t?.kind === "run" ? t : void 0;
 	}
+	_nonHeadRegenerators(e, t) {
+		return this._tree.getReplyRuns(t).filter((t) => t.regeneratesCodecMessageId === e).toSorted((e, t) => (e.startSerial ?? "￿").localeCompare(t.startSerial ?? "￿"));
+	}
+	_selectedNonHeadMember(e, t, n) {
+		let r = this._nonHeadRegenSelections.get(e);
+		return r && r.kind !== "pending" && [t, ...n.map((e) => e.runId)].includes(r.selectedRunId) ? r.selectedRunId : n.at(-1)?.runId ?? t;
+	}
 	_extractMessages(e) {
-		let t = [];
-		for (let n of e) for (let e of this._codec.getMessages(n.projection)) t.push(e);
+		let t = [], n = /* @__PURE__ */ new Set();
+		for (let r of e) r.kind === "run" && n.has(r.runId) || this._emitNodeMessages(r, t, n);
 		return t;
 	}
+	_emitNodeMessages(e, t, n) {
+		let r = this._codec.getMessages(e.projection);
+		if (e.kind !== "run") {
+			t.push(...r);
+			return;
+		}
+		for (let i = 0; i < r.length; i++) {
+			let a = r[i];
+			if (!a) continue;
+			let o = i > 0 ? r[i - 1]?.codecMessageId : void 0;
+			if (o !== void 0) {
+				let r = this._nonHeadRegenerators(a.codecMessageId, o);
+				if (r.length > 0) {
+					for (let e of r) n.add(e.runId);
+					let i = this._selectedNonHeadMember(a.codecMessageId, e.runId, r);
+					if (i !== e.runId) {
+						let e = r.find((e) => e.runId === i);
+						if (e) {
+							this._emitNodeMessages(e, t, n);
+							return;
+						}
+					}
+				}
+			}
+			t.push(a);
+		}
+	}
 	hasOlder() {
-		return this._withheldBuffer.length > 0 || this._hasMoreHistory;
+		return this._hiddenMessageCount > 0 || this._withheldBuffer.length > 0 || this._hasMoreHistory;
 	}
-	async loadOlder(e = 100) {
+	async loadOlder(e = 10) {
 		if (!(this._closed || this._loadingOlder)) {
 			this._loadingOlder = !0, this._logger.trace("DefaultView.loadOlder();", { limit: e });
 			try {
-				if (this._withheldBuffer.length > 0) {
-					let t = this._withheldBuffer.splice(-e, e);
-					this._releaseWithheld(t);
+				if (this._hiddenMessageCount >= e) {
+					this._hiddenMessageCount -= e, this._recomputeAndEmit();
 					return;
 				}
-				if (!this._hasMoreHistory && !this._lastHistoryPage) {
-					await this._loadFirstPage(e);
-					return;
-				}
-				if (!this._hasMoreHistory) return;
-				if (!this._lastHistoryPage?.hasNext()) {
-					this._hasMoreHistory = !1;
-					return;
-				}
-				let t = await this._lastHistoryPage.next();
-				if (this._closed || !t) {
-					t || (this._hasMoreHistory = !1);
-					return;
+				let t = e - this._hiddenMessageCount, n = this._extractMessages(this._computeFlatNodes()).length, r = () => this._extractMessages(this._computeFlatNodes()).length - n;
+				if (this._withheldBuffer.length > 0) {
+					let e = this._messageTailSplitIndex(this._withheldBuffer, t), n = this._withheldBuffer.splice(e);
+					this._releaseWithheld(n);
 				}
-				await this._revealFromPage(t, e);
+				if (r() < t && (await this._fetchOlder(t - r()), this._closed)) return;
+				let i = this._extractMessages(this._computeFlatNodes()).length;
+				this._hiddenMessageCount = Math.max(0, this._hiddenMessageCount + (i - n) - e), this._recomputeAndEmit();
 			} catch (e) {
 				throw this._logger.error("DefaultView.loadOlder(); failed", { error: e }), e;
 			} finally {
@@ -1281,13 +1464,38 @@ var t = class e {
 			}
 		}
 	}
+	async _fetchOlder(e) {
+		if (!this._hasMoreHistory && !this._lastHistoryPage) {
+			await this._loadFirstPage(e);
+			return;
+		}
+		if (!this._hasMoreHistory) return;
+		if (!this._lastHistoryPage?.hasNext()) {
+			this._hasMoreHistory = !1;
+			return;
+		}
+		let t = await this._lastHistoryPage.next();
+		if (this._closed || !t) {
+			t || (this._hasMoreHistory = !1);
+			return;
+		}
+		await this._revealFromPage(t, e);
+	}
+	_messageTailSplitIndex(e, t) {
+		let n = 0;
+		for (let r = e.length - 1; r >= 0; r--) {
+			let i = e[r];
+			if (i && (n += this._codec.getMessages(i.projection).length, n >= t)) return r;
+		}
+		return 0;
+	}
 	runOf(e) {
 		this._logger.trace("DefaultView.runOf();", { codecMessageId: e });
 		let t = this._tree.getNodeByCodecMessageId(e);
 		if (!t) return;
-		if (t.kind === "run") return $(t);
+		if (t.kind === "run") return J(t);
 		let n = this._selectedReplyRun(t.codecMessageId);
-		return n ? $(n) : void 0;
+		return n ? J(n) : void 0;
 	}
 	_selectedReplyRun(e) {
 		let t = this._tree.getReplyRuns(e);
@@ -1303,14 +1511,16 @@ var t = class e {
 	run(e) {
 		this._logger.trace("DefaultView.run();", { runId: e });
 		let t = this._tree.getRunNode(e);
-		return t ? $(t) : void 0;
+		return t ? J(t) : void 0;
 	}
 	branchSelection(e) {
 		let t = this._resolveMessageBranchPoint(e);
 		if (t) {
-			let e = t.siblings.flatMap((e) => {
-				let t = this._codec.getMessages(e.projection).at(0);
-				return t ? [t.message] : [];
+			let e = t.members.flatMap((e) => {
+				let t = this._tree.getNodeByCodecMessageId(e.representativeCodecMessageId);
+				if (!t) return [];
+				let n = this._codec.getMessages(t.projection).find((t) => t.codecMessageId === e.representativeCodecMessageId);
+				return n ? [n.message] : [];
 			});
 			if (e.length > 0) {
 				let n = this._resolveSelectedIndex(t), r = Math.max(0, Math.min(n, e.length - 1)), i = e[r];
@@ -1346,35 +1556,43 @@ var t = class e {
 		});
 		let n = this._resolveMessageBranchPoint(e);
 		if (!n) return;
-		let r = Math.max(0, Math.min(t, n.siblings.length - 1)), i = n.siblings[r];
+		let r = Math.max(0, Math.min(t, n.members.length - 1)), i = n.members[r];
 		i && (n.kind === "fork-of" ? (this._branchSelections.set(n.groupRoot, {
 			kind: "user",
-			selectedKey: X(i)
+			selectedKey: i.memberNodeKey
 		}), this._logger.debug("DefaultView.selectSibling(); fork-of", {
 			codecMessageId: e,
 			index: r,
-			selectedKey: X(i)
+			selectedKey: i.memberNodeKey
+		})) : n.kind === "non-head-regen" ? (this._nonHeadRegenSelections.set(n.groupRoot, {
+			kind: "user",
+			selectedRunId: i.memberNodeKey
+		}), this._logger.debug("DefaultView.selectSibling(); non-head-regen", {
+			codecMessageId: e,
+			index: r,
+			selectedRunId: i.memberNodeKey,
+			anchor: n.groupRoot
 		})) : (this._regenSelections.set(n.groupRoot, {
 			kind: "user",
-			selectedRunId: X(i)
+			selectedRunId: i.memberNodeKey
 		}), this._logger.debug("DefaultView.selectSibling(); regenerate", {
 			codecMessageId: e,
 			index: r,
-			selectedRunId: X(i),
+			selectedRunId: i.memberNodeKey,
 			groupRoot: n.groupRoot
 		})), this._recomputeAndEmit());
 	}
 	_resolveSelectedIndex(e) {
 		if (e.kind === "fork-of") {
 			let t = this._branchSelections.get(e.groupRoot);
-			if (!t) return e.siblings.length - 1;
-			let n = e.siblings.findIndex((e) => X(e) === t.selectedKey);
-			return n === -1 ? e.siblings.length - 1 : n;
+			if (!t) return e.members.length - 1;
+			let n = e.members.findIndex((e) => e.memberNodeKey === t.selectedKey);
+			return n === -1 ? e.members.length - 1 : n;
 		}
-		let t = this._regenSelections.get(e.groupRoot);
-		if (!t || t.kind === "pending") return e.siblings.length - 1;
-		let n = e.siblings.findIndex((e) => X(e) === t.selectedRunId);
-		return n === -1 ? e.siblings.length - 1 : n;
+		let t = e.kind === "non-head-regen" ? this._nonHeadRegenSelections.get(e.groupRoot) : this._regenSelections.get(e.groupRoot);
+		if (!t || t.kind === "pending") return e.members.length - 1;
+		let n = e.members.findIndex((e) => e.memberNodeKey === t.selectedRunId);
+		return n === -1 ? e.members.length - 1 : n;
 	}
 	_resolveMessageBranchPoint(e) {
 		let t = this._tree.getNodeByCodecMessageId(e);
@@ -1384,19 +1602,64 @@ var t = class e {
 			return e.length > 1 ? {
 				kind: "fork-of",
 				groupRoot: this._tree.getGroupRoot(t.codecMessageId),
-				siblings: e
+				members: this._nodeHeadMembers(e)
 			} : void 0;
 		}
-		let n = this._tree.getSiblingNodes(t.runId);
-		if (n.length > 1 && this._codec.getMessages(t.projection).at(0)?.codecMessageId === e) return {
+		let n = this._codec.getMessages(t.projection), r = this._resolveNonHeadBranchPoint(t, n, e);
+		if (r) return r;
+		let i = this._tree.getSiblingNodes(t.runId);
+		if (i.length > 1 && n.at(0)?.codecMessageId === e) return {
 			kind: "regen",
 			groupRoot: this._tree.getGroupRoot(t.runId),
-			siblings: n
+			members: this._nodeHeadMembers(i)
+		};
+	}
+	_resolveNonHeadBranchPoint(e, t, n) {
+		if (t.at(0)?.codecMessageId === n && e.regeneratesCodecMessageId !== void 0) {
+			let t = e.regeneratesCodecMessageId, n = this._runByCodecMessageId(t);
+			if (n) {
+				let e = this._codec.getMessages(n.projection), r = e.findIndex((e) => e.codecMessageId === t), i = r > 0 ? e[r - 1]?.codecMessageId : void 0;
+				if (i !== void 0) return this._buildNonHeadGroup(t, n.runId, i);
+			}
+			return;
+		}
+		let r = t.findIndex((e) => e.codecMessageId === n), i = r > 0 ? t[r - 1]?.codecMessageId : void 0;
+		if (i !== void 0) return this._buildNonHeadGroup(n, e.runId, i);
+	}
+	_buildNonHeadGroup(e, t, n) {
+		let r = this._nonHeadRegenerators(e, n);
+		if (r.length === 0) return;
+		let i = [{
+			memberNodeKey: t,
+			representativeCodecMessageId: e
+		}];
+		for (let e of r) {
+			let t = this._codec.getMessages(e.projection).at(0);
+			t && i.push({
+				memberNodeKey: e.runId,
+				representativeCodecMessageId: t.codecMessageId
+			});
+		}
+		return {
+			kind: "non-head-regen",
+			groupRoot: e,
+			members: i
 		};
 	}
+	_nodeHeadMembers(e) {
+		let t = [];
+		for (let n of e) {
+			let e = this._codec.getMessages(n.projection).at(0);
+			e && t.push({
+				memberNodeKey: q(n),
+				representativeCodecMessageId: e.codecMessageId
+			});
+		}
+		return t;
+	}
 	async send(t, n) {
-		if (this._logger.trace("DefaultView.send();"), this._closed) throw new e.ErrorInfo("unable to send; view is closed", T.InvalidArgument, 400);
-		let r = Oe(t), i = this._lastVisibleMessagePairs.at(-1)?.codecMessageId, a = await this._sendDelegate(r, n, i);
+		if (this._logger.trace("DefaultView.send();"), this._closed) throw new e.ErrorInfo("unable to send; view is closed", E.InvalidArgument, 400);
+		let r = Je(t), i = this._lastVisibleMessagePairs.at(-1)?.codecMessageId, a = await this._sendDelegate(r, n, i);
 		return this._applyForkAutoSelect(a, n), a;
 	}
 	_applyForkAutoSelect(e, t) {
@@ -1412,6 +1675,16 @@ var t = class e {
 	_applyRegenerateAutoSelect(e, t) {
 		let n = this._runByCodecMessageId(t);
 		if (!n) return;
+		if (this._codec.getMessages(n.projection).at(0)?.codecMessageId !== t) {
+			this._nonHeadRegenSelections.set(t, {
+				kind: "pending",
+				carrierCodecMessageId: e.inputCodecMessageId
+			}), this._logger.debug("DefaultView._applyRegenerateAutoSelect(); deferring non-head regenerate selection", {
+				anchorCodecMessageId: t,
+				carrier: e.inputCodecMessageId
+			}), this._resolvePendingNonHeadRegenSelections(), this._recomputeAndEmitIfChanged();
+			return;
+		}
 		let r = this._tree.getGroupRoot(n.runId);
 		this._regenSelections.set(r, {
 			kind: "pending",
@@ -1423,11 +1696,11 @@ var t = class e {
 		}), this._resolvePendingRegenSelections(), this._recomputeAndEmitIfChanged();
 	}
 	async regenerate(t, n) {
-		if (this._logger.trace("DefaultView.regenerate();", { messageId: t }), this._closed) throw new e.ErrorInfo("unable to regenerate; view is closed", T.InvalidArgument, 400);
+		if (this._logger.trace("DefaultView.regenerate();", { messageId: t }), this._closed) throw new e.ErrorInfo("unable to regenerate; view is closed", E.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);
+		if (!r) throw new e.ErrorInfo(`unable to regenerate; message not found in tree: ${t}`, E.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);
+		if (!i) throw new e.ErrorInfo(`unable to regenerate; parent user message not found for ${t}`, E.InvalidArgument, 400);
 		let a = t;
 		r.regeneratesCodecMessageId !== void 0 && this._codec.getMessages(r.projection).at(0)?.codecMessageId === t && (a = r.regeneratesCodecMessageId);
 		let o = {
@@ -1437,9 +1710,9 @@ var t = class e {
 		return this._applyRegenerateAutoSelect(c, a), c;
 	}
 	async edit(t, n, r) {
-		if (this._logger.trace("DefaultView.edit();", { messageId: t }), this._closed) throw new e.ErrorInfo("unable to edit; view is closed", T.InvalidArgument, 400);
+		if (this._logger.trace("DefaultView.edit();", { messageId: t }), this._closed) throw new e.ErrorInfo("unable to edit; view is closed", E.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);
+		if (!i) throw new e.ErrorInfo(`unable to edit; message not found in tree: ${t}`, E.InvalidArgument, 400);
 		let a = this._findParentMsgId(i, t);
 		return this.send(n, {
 			...r,
@@ -1468,35 +1741,26 @@ var t = class e {
 		if (!this._closed) {
 			this._logger.info("DefaultView.close();"), this._closed = !0, this._loadingOlder = !1;
 			for (let e of this._unsubs) e();
-			this._unsubs.length = 0, this._emitter.off(), this._branchSelections.clear(), this._regenSelections.clear(), this._withheldRunIds.clear(), this._withheldBuffer.length = 0, this._onClose?.();
+			this._unsubs.length = 0, this._emitter.off(), this._branchSelections.clear(), this._regenSelections.clear(), this._nonHeadRegenSelections.clear(), this._withheldRunIds.clear(), this._withheldBuffer.length = 0, this._hiddenMessageCount = 0, this._onClose?.();
 		}
 	}
 	async _loadFirstPage(e) {
-		let t = e * ke, n = await De(this._channel, { limit: t }, this._logger);
-		this._closed || await this._revealFromPage(n, e);
+		let t = await qe(this._channel, { limit: e }, this._logger);
+		this._closed || await this._revealFromPage(t, e);
 	}
 	async _revealFromPage(e, t) {
-		let n = new Set(this._treeVisibleNodes().map((e) => X(e))), { newVisible: r, lastPage: i } = await this._loadUntilVisible(e, t, n);
+		let n = new Set(this._treeVisibleNodes().map((e) => q(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);
+		let n = this._messageTailSplitIndex(e, t), r = e.slice(n), i = e.slice(0, n);
+		for (let e of i) this._withheldRunIds.add(q(e));
+		this._withheldBuffer.push(...i), this._releaseWithheld(r);
 	}
 	_processHistoryPage(e) {
 		this._processingHistory = !0;
 		try {
-			let t = this._codec.createDecoder();
-			for (let n of e.rawMessages) q(this._tree, t, n);
+			for (let t of e.rawMessages) this._applier.apply(t);
 			for (let t of e.rawMessages) this._tree.emitAblyMessage(t);
 		} finally {
 			this._processingHistory = !1;
@@ -1506,7 +1770,7 @@ var t = class e {
 		this._processHistoryPage(e);
 		let r = e, i = () => {
 			let e = 0;
-			for (let t of this._treeVisibleNodes()) t.kind === "run" && !n.has(X(t)) && e++;
+			for (let t of this._treeVisibleNodes()) n.has(q(t)) || (e += this._codec.getMessages(t.projection).length);
 			return e;
 		};
 		for (; i() < t && r.hasNext();) {
@@ -1515,20 +1779,20 @@ var t = class e {
 			this._processHistoryPage(e), r = e;
 		}
 		return {
-			newVisible: this._treeVisibleNodes().filter((e) => !n.has(X(e))),
+			newVisible: this._treeVisibleNodes().filter((e) => !n.has(q(e))),
 			lastPage: r
 		};
 	}
 	_releaseWithheld(e) {
-		for (let t of e) this._withheldRunIds.delete(X(t));
+		for (let t of e) this._withheldRunIds.delete(q(t));
 		e.length > 0 && this._recomputeAndEmit();
 	}
 	_updateVisibleSnapshot(e) {
 		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);
+		this._lastVisibleNodeKeys = t.map((e) => q(e)), this._lastVisibleNodeKeySet = new Set(this._lastVisibleNodeKeys), this._lastVisibleProjections = t.map((e) => e.projection), this._lastVisibleMessagePairs = this._extractMessages(t).slice(this._hiddenMessageCount);
 	}
 	_onTreeUpdate() {
-		this._processingHistory || (this._pinBranchSelections(), this._resolvePendingRegenSelections(), this._recomputeAndEmitIfChanged());
+		this._processingHistory || (this._pinBranchSelections(), this._resolvePendingRegenSelections(), this._resolvePendingNonHeadRegenSelections(), this._recomputeAndEmitIfChanged());
 	}
 	_resolveSelections() {
 		let e = /* @__PURE__ */ new Map();
@@ -1561,8 +1825,22 @@ var t = class e {
 			});
 		}
 	}
+	_resolvePendingNonHeadRegenSelections() {
+		for (let [e, t] of this._nonHeadRegenSelections) {
+			if (t.kind === "user") continue;
+			let n = this._runByCodecMessageId(e);
+			if (!n) continue;
+			let r = this._codec.getMessages(n.projection), i = r.findIndex((t) => t.codecMessageId === e), a = i > 0 ? r[i - 1]?.codecMessageId : void 0;
+			if (a === void 0) continue;
+			let o = this._nonHeadRegenerators(e, a).at(-1);
+			o && this._nonHeadRegenSelections.set(e, {
+				kind: "auto",
+				selectedRunId: o.runId
+			});
+		}
+	}
 	_onTreeAblyMessage(e) {
-		let t = O(e), n = t[l], r = t[o];
+		let t = P(e), n = t[l], r = t[o];
 		if (!n && !r) {
 			this._emitter.emit("ably-message", e);
 			return;
@@ -1580,25 +1858,26 @@ var t = class e {
 		let { parent: t } = e;
 		if (t === void 0) return !0;
 		let n = this._tree.getNodeByCodecMessageId(t);
-		return n ? this._lastVisibleNodeKeySet.has(X(n)) : !0;
+		return n ? this._lastVisibleNodeKeySet.has(q(n)) : !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;
+		for (let [t, n] of e.entries()) if (q(n) !== this._lastVisibleNodeKeys[t] || n.projection !== this._lastVisibleProjections[t]) return !0;
 		return !1;
 	}
-}, je = (e) => new Ae(e), Me = () => {}, Ne = class {
+}, Xe = (e) => new Ye(e), Ze = () => {}, Qe = class {
 	constructor(e) {
 		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({
+		let t = G(e.client, e.codec), n = se(e.channelModes);
+		if (n && (t.modes = n), this._channel = e.client.channels.get(e.channelName, t), this._client = e.client, this._codec = e.codec, this._logger = (e.logger ?? k({ logLevel: D.Silent })).withContext({ component: "ClientSession" }), this._emitter = new K(this._logger), this._hasAttachedOnce = this._channel.state === "attached", this._tree = Be(this._codec, this._logger), this._applier = Se(this._tree, this._codec.createDecoder()), this._view = Xe({
 			tree: this._tree,
 			channel: this._channel,
 			codec: this._codec,
+			applier: this._applier,
 			sendDelegate: this._internalSend.bind(this),
 			logger: this._logger,
 			onClose: () => this._views.delete(this._view)
-		}), this._decoder = this._codec.createDecoder(), this._encoder = this._codec.createEncoder(this._channel, this._clientId === void 0 ? void 0 : { clientId: this._clientId }), this._views.add(this._view), this.tree = this._tree, this.view = this._view, e.messages) {
+		}), this._encoder = this._codec.createEncoder(this._channel), this._views.add(this._view), this.tree = this._tree, this.view = this._view, e.messages) {
 			let t;
 			for (let n of e.messages) {
 				let e = crypto.randomUUID(), r = {
@@ -1617,60 +1896,68 @@ var t = class e {
 			this._handleChannelStateChange(e);
 		}, this._channel.on(this._onChannelStateChange);
 	}
+	get presence() {
+		return this._channel.presence;
+	}
+	get object() {
+		return this._channel.object;
+	}
 	connect() {
-		return this._state === "closed" ? Promise.reject(new e.ErrorInfo("unable to connect; session is closed", T.SessionClosed, 400)) : this._connectPromise ? this._connectPromise : (this._logger.trace("DefaultClientSession.connect();"), this._connectPromise = this._channel.subscribe(this._onMessage).then(() => {
+		return this._state === "closed" ? Promise.reject(new e.ErrorInfo("unable to connect; session is closed", E.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);
+			let n = new e.ErrorInfo(`unable to subscribe to channel; ${j(t)}`, E.SessionSubscriptionError, 500, M(t));
 			throw this._logger.error("DefaultClientSession.connect(); subscribe failed"), this._emitter.emit("error", n), n;
 		}), this._connectPromise);
 	}
-	async _requireConnected(t) {
-		if (!this._connectPromise) throw new e.ErrorInfo(`unable to ${t}; connect() must be called before ${t}()`, T.InvalidArgument, 400);
-		return this._connectPromise;
+	_resolveClientId() {
+		let e = this._client.auth.clientId;
+		return e && e !== "*" ? e : void 0;
+	}
+	async _requireConnected(e) {
+		return Oe(this._connectPromise, e);
 	}
 	_handleMessage(t) {
 		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);
+				let e = P(t);
+				if ((e["run-reason"] ?? "complete") === "error") {
+					let t = ye(e);
 					this._logger.error("ClientSession._handleMessage(); agent error received", {
-						runId: n[o],
-						invocationId: n[s],
-						code: i
-					}), this._emitter.emit("error", l);
+						runId: e[o],
+						invocationId: e[s],
+						code: t.code
+					}), this._emitter.emit("error", t);
 				}
 			}
-			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));
+			let e = this._applier.apply(t);
+			if (e && (e.type === "start" || e.type === "resume")) {
+				let n = P(t)[_];
+				if (n !== void 0) {
+					let t = this._pendingRunStarts.get(n);
+					t && (this._pendingRunStarts.delete(n), t.resolve(e.runId));
 				}
 			}
 			this._tree.emitAblyMessage(t);
 		} catch (t) {
-			let n = t instanceof e.ErrorInfo ? t : void 0;
-			this._emitter.emit("error", new e.ErrorInfo(`unable to process channel message; ${t instanceof Error ? t.message : String(t)}`, T.SessionSubscriptionError, 500, n));
+			this._emitter.emit("error", new e.ErrorInfo(`unable to process channel message; ${j(t)}`, E.SessionSubscriptionError, 500, M(t)));
 		}
 	}
-	_handleChannelStateChange(t) {
+	_handleChannelStateChange(e) {
 		if (this._state === "closed") return;
-		let { current: n, resumed: r } = t;
-		if (n === "attached" && !this._hasAttachedOnce) {
+		let { current: t, resumed: n } = e;
+		if (t === "attached" && !this._hasAttachedOnce) {
 			this._hasAttachedOnce = !0;
 			return;
 		}
-		if (!(n === "failed" || n === "suspended" || n === "detached" || n === "attached" && !r)) return;
+		if (!Ae(e)) return;
 		this._logger.error("ClientSession._handleChannelStateChange(); channel continuity lost", {
-			current: n,
-			resumed: r,
-			previous: t.previous
+			current: t,
+			resumed: n,
+			previous: e.previous
 		});
-		let i = new e.ErrorInfo(`unable to deliver events; channel continuity lost (${n}${n === "attached" ? ", resumed: false" : ""})`, T.ChannelContinuityLost, 500, t.reason);
-		this._emitter.emit("error", i);
+		let r = je(e, "deliver events");
+		this._emitter.emit("error", r);
 	}
 	_cleanupFailedSend(e) {
 		for (let t of e) {
@@ -1679,12 +1966,13 @@ var t = class e {
 		}
 	}
 	createView() {
-		if (this._state === "closed") throw new e.ErrorInfo("unable to create view; session is closed", T.SessionClosed, 400);
+		if (this._state === "closed") throw new e.ErrorInfo("unable to create view; session is closed", E.SessionClosed, 400);
 		this._logger.trace("DefaultClientSession.createView();");
-		let t = je({
+		let t = Xe({
 			tree: this._tree,
 			channel: this._channel,
 			codec: this._codec,
+			applier: this._applier,
 			sendDelegate: this._internalSend.bind(this),
 			logger: this._logger,
 			onClose: () => this._views.delete(t)
@@ -1692,9 +1980,9 @@ var t = class e {
 		return this._views.add(t), t;
 	}
 	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);
+		if (this._state === "closed" || (await this._requireConnected("send"), this._state === "closed")) throw new e.ErrorInfo("unable to send; session is closed", E.SessionClosed, 400);
 		let a = this._channel.state;
-		if (a !== "attached" && a !== "attaching") throw new e.ErrorInfo(`unable to send; channel is ${a}`, T.ChannelNotReady, 400);
+		if (a !== "attached" && a !== "attaching") throw new e.ErrorInfo(`unable to send; channel is ${a}`, E.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);
@@ -1702,11 +1990,11 @@ var t = class e {
 		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({
+			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 = ge({
 				role: "user",
 				runId: s,
 				codecMessageId: n,
-				runClientId: this._clientId,
+				runClientId: this._resolveClientId(),
 				...a !== void 0 && { parent: a },
 				...o !== void 0 && { forkOf: o },
 				...d !== void 0 && { regenerates: d },
@@ -1724,7 +2012,7 @@ var t = class e {
 			}), !i && r?.parent === void 0 && !r?.forkOf && e.parent === void 0 && (c = 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);
+		if (d === void 0) throw new e.ErrorInfo("unable to send; inputs array is empty (include at least one input)", E.InvalidArgument, 400);
 		let f = d.inputEventId, p = d.codecMessageId, m = new Promise((e, t) => {
 			this._pendingRunStarts.set(p, {
 				resolve: e,
@@ -1735,11 +2023,10 @@ var t = class e {
 			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 }
+					messageId: e.codecMessageId
 				});
 			} catch (t) {
-				let n = t instanceof e.ErrorInfo ? t : void 0, r = n?.statusCode === 401 || n?.statusCode === 403, i = new e.ErrorInfo(r ? "unable to publish events; missing publish capability on the channel" : `unable to publish events; ${t instanceof Error ? t.message : String(t)}`, r ? T.InsufficientCapability : T.SessionSendFailed, r ? 401 : 500, n);
+				let n = M(t), r = n?.statusCode === 401 || n?.statusCode === 403, i = new e.ErrorInfo(r ? "unable to publish events; missing publish capability on the channel" : `unable to publish events; ${j(t)}`, r ? E.InsufficientCapability : E.SessionSendFailed, r ? 401 : 500, n);
 				throw this._emitter.emit("error", i), this._pendingRunStarts.delete(p), o || this._cleanupFailedSend([...l]), i;
 			}
 		})(), {
@@ -1775,7 +2062,7 @@ var t = class e {
 		});
 	}
 	on(e, t) {
-		if (this._state === "closed") return Me;
+		if (this._state === "closed") return Ze;
 		let n = t;
 		return this._emitter.on(e, n), () => {
 			this._emitter.off(e, n);
@@ -1786,23 +2073,19 @@ var t = class e {
 			this._state = "closed", this._logger.info("ClientSession.close();"), this._connectPromise && this._channel.unsubscribe(this._onMessage), this._channel.off(this._onChannelStateChange), this._emitter.off();
 			for (let e of this._views) e.close();
 			if (this._views.clear(), this._pendingRunStarts.size > 0) {
-				let t = new e.ErrorInfo("unable to await run-start; session closed", T.SessionClosed, 400);
+				let t = new e.ErrorInfo("unable to await run-start; session closed", E.SessionClosed, 400);
 				for (let e of this._pendingRunStarts.values()) e.reject(t);
 				this._pendingRunStarts.clear();
 			}
 			try {
 				await this._encoder.close();
 			} catch {}
-			if (this._connectPromise) try {
-				await this._channel.detach();
-			} catch (e) {
-				this._logger.debug("ClientSession.close(); channel detach failed", { error: e });
-			}
+			await ke(this._channel, this._connectPromise, this._logger, "ClientSession");
 		}
 	}
-}, Pe = (e) => new Ne(e), Fe = class {
+}, $e = (e) => new Qe(e), et = 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" });
+		this._trackers = /* @__PURE__ */ new Map(), this._pending = [], this._closed = !1, this._writer = e, this._defaultExtras = t.extras, this._onMessageHook = t.onMessage ?? (() => {}), this._logger = t.logger?.withContext({ component: "EncoderCore" });
 	}
 	async publishDiscrete(e, t) {
 		this._assertNotClosed(), this._logger?.trace("DefaultEncoderCore.publishDiscrete();", { name: e.name });
@@ -1821,33 +2104,33 @@ var t = class e {
 		});
 		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 = {
+		let c = a.codecHeaders ?? {}, l = {
 			name: a.name,
 			data: a.data,
-			extras: { ai: this._aiExtras(s, c) },
-			...l ? { clientId: l } : {}
+			extras: { ai: this._aiExtras(s, c) }
 		};
-		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._invokeOnMessage(l);
+		let u = (await this._writer.publish(l)).serials[0];
+		if (!u) throw new e.ErrorInfo(`unable to start stream; no serial returned for stream '${a.name}' (streamId: ${t})`, E.BadRequest, 400);
 		this._trackers.set(t, {
-			serial: d,
+			serial: u,
 			name: a.name,
 			streamId: t,
 			accumulated: a.data,
 			persistentTransport: s,
 			persistentCodec: c,
-			cancelled: !1
+			cancelled: !1,
+			completed: !1
 		}), this._logger?.debug("DefaultEncoderCore.startStream(); stream started", {
 			name: a.name,
 			streamId: t,
-			serial: d
+			serial: u
 		});
 	}
 	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}'`, T.InvalidArgument, 400);
+		if (!r) throw new e.ErrorInfo(`unable to append to stream; no active stream for streamId '${t}'`, E.InvalidArgument, 400);
 		r.accumulated += n;
 		let i = {
 			serial: r.serial,
@@ -1864,8 +2147,8 @@ var t = class e {
 	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}'`, T.InvalidArgument, 400);
-		i.accumulated += n.data;
+		if (!i) throw new e.ErrorInfo(`unable to close stream; no active stream for streamId '${t}'`, E.InvalidArgument, 400);
+		i.accumulated += n.data, i.completed = !0;
 		let { transport: a, codec: o } = this._buildClosing(i, n);
 		a[r] = "complete";
 		let s = {
@@ -1880,28 +2163,10 @@ var t = class e {
 			streamId: t
 		}), await this._flushPending(), this._logger?.debug("DefaultEncoderCore.closeStream(); stream closed", { 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 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: { ai: this._aiExtras(a, o) }
-		};
-		this._invokeOnMessage(s);
-		let c = this._writer.appendMessage(s);
-		this._pending.push({
-			promise: c,
-			streamId: t
-		}), await this._flushPending(), this._logger?.debug("DefaultEncoderCore.cancelStream(); stream cancelled", { streamId: t });
-	}
 	async cancelAllStreams(e) {
 		this._assertNotClosed(), this._logger?.trace("DefaultEncoderCore.cancelAllStreams();", { streamCount: this._trackers.size });
 		for (let t of this._trackers.values()) {
+			if (t.cancelled || t.completed) continue;
 			t.cancelled = !0;
 			let { transport: n, codec: i } = this._buildClosing(t, void 0, e);
 			n[r] = "cancelled";
@@ -1965,7 +2230,7 @@ var t = class e {
 		}
 		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}`, T.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}`, E.EncoderRecoveryFailed, 500);
 		}
 	}
 	async close() {
@@ -1987,14 +2252,11 @@ var t = class e {
 		}
 	}
 	_assertNotClosed() {
-		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;
+		if (this._closed) throw new e.ErrorInfo("unable to write to encoder; encoder has been closed", E.InvalidArgument, 400);
 	}
 	_buildTransport(e, t) {
 		let n = {
-			...A(this._defaultExtras?.headers, t?.extras?.headers),
+			...L(this._defaultExtras?.headers, t?.extras?.headers),
 			...e
 		};
 		return t?.messageId !== void 0 && (n[l] = t.messageId), n;
@@ -2008,19 +2270,18 @@ var t = class 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 = {
+		let o = {
 			name: e.name,
 			data: e.data,
 			extras: {
 				ai: this._aiExtras(i, e.codecHeaders ?? {}),
 				...e.ephemeral ? { ephemeral: !0 } : {}
-			},
-			...o ? { clientId: o } : {}
+			}
 		};
-		return this._invokeOnMessage(s), s;
+		return this._invokeOnMessage(o), o;
 	}
 	_buildClosing(e, t, n) {
-		let r = A(this._defaultExtras?.headers, n?.extras?.headers);
+		let r = L(this._defaultExtras?.headers, n?.extras?.headers);
 		return {
 			transport: {
 				...e.persistentTransport,
@@ -2033,7 +2294,7 @@ var t = class e {
 			}
 		};
 	}
-}, Ie = (e, t = {}) => new Fe(e, t), Le = class {
+}, tt = (e, t = {}) => new et(e, t), nt = 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" });
 	}
@@ -2046,7 +2307,7 @@ var t = class e {
 		}), t) {
 			case "message.create": {
 				let t = this._toPayload(e);
-				return t.transportHeaders?.stream === "true" ? this._decodeStreamedCreate(t, e.serial) : this._hooks.decodeDiscrete(t);
+				return t.transportHeaders?.stream === "true" ? this._decodeStreamedCreate(t, e.serial, e.version.serial) : this._hooks.decodeDiscrete(t);
 			}
 			case "message.append": return this._decodeAppend(e);
 			case "message.update": return this._decodeUpdate(e);
@@ -2058,8 +2319,8 @@ var t = class e {
 		return {
 			name: e.name ?? "",
 			data: e.data,
-			transportHeaders: O(e),
-			codecHeaders: k(e)
+			transportHeaders: P(e),
+			codecHeaders: F(e)
 		};
 	}
 	_stringData(e) {
@@ -2079,69 +2340,90 @@ var t = class e {
 			this._logger?.error("DefaultDecoderCore._invokeOnStreamDelete(); callback threw", { error: e });
 		}
 	}
-	_decodeStreamedCreate(e, t) {
+	_alreadyIncorporated(e, t, n, r) {
+		return r !== void 0 && r <= n.version ? (this._logger?.debug(`DefaultDecoderCore.${e}(); delivery already incorporated`, {
+			serial: t,
+			version: r,
+			trackerVersion: n.version
+		}), !0) : n.closed ? (this._logger?.debug(`DefaultDecoderCore.${e}(); stream closed, dropping delivery`, {
+			serial: t,
+			version: r
+		}), !0) : (r !== void 0 && (n.version = r), !1);
+	}
+	_closeTracker(e) {
+		e.closed = !0, e.accumulated = "";
+	}
+	_applyTerminalStatus(e, t, n, r) {
+		return t === "complete" ? (r.push(...this._hooks.buildEndEvents(e, n)), this._closeTracker(e), !0) : t === "cancelled" ? (this._closeTracker(e), !0) : !1;
+	}
+	_decodeStreamedCreate(e, t, n) {
 		if (!t) return [];
-		let n = e.transportHeaders?.["stream-id"] ?? "", r = {
+		if (this._serialState.get(t)) return this._logger?.debug("DefaultDecoderCore._decodeStreamedCreate(); duplicate create for tracked stream", { serial: t }), [];
+		let r = e.transportHeaders?.["stream-id"] ?? "", i = {
 			name: e.name,
-			streamId: n,
+			streamId: r,
 			accumulated: "",
 			codecHeaders: { ...e.codecHeaders },
 			transportHeaders: { ...e.transportHeaders },
+			version: n ?? t,
 			closed: !1
 		};
-		return this._serialState.set(t, r), this._logger?.debug("DefaultDecoderCore._decodeStreamedCreate(); new stream", {
+		return this._serialState.set(t, i), this._logger?.debug("DefaultDecoderCore._decodeStreamedCreate(); new stream", {
 			name: e.name,
-			streamId: n,
+			streamId: r,
 			serial: t
-		}), this._hooks.buildStartEvents(r);
+		}), this._hooks.buildStartEvents(i);
 	}
 	_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;
+		if (!n) return this._logger?.warn("DefaultDecoderCore._decodeAppend(); append with no tracker, treating as first contact", { serial: t }), this._decodeUpdate(e);
+		if (this._alreadyIncorporated("_decodeAppend", t, n, e.version.serial)) return [];
+		let i = P(e), a = F(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))), this._applyTerminalStatus(n, s, a, c) && this._logger?.debug(`DefaultDecoderCore._decodeAppend(); stream ${s === "complete" ? "complete" : "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);
+		if (!l) return this._decodeFirstContact(i, s, c, t, e.version.serial);
+		if (this._alreadyIncorporated("_decodeUpdate", t, l, e.version.serial)) return [];
 		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 e.length > 0 && (l.accumulated = u, t.push(...this._hooks.buildDeltaEvents(l, e))), this._applyTerminalStatus(l, c, o, t), t;
 		}
 		return l.accumulated = u, l.codecHeaders = { ...o }, l.transportHeaders = { ...a }, this._invokeOnStreamUpdate(l), [];
 	}
-	_decodeFirstContact(e, t, n, r) {
+	_decodeFirstContact(e, t, n, r, i) {
 		if (!t) return this._hooks.decodeDiscrete(e);
-		let i = e.transportHeaders?.["stream-id"] ?? "", a = e.codecHeaders ?? {}, o = typeof e.data == "string" ? e.data : "";
+		let a = e.transportHeaders?.["stream-id"] ?? "", o = e.codecHeaders ?? {}, s = typeof e.data == "string" ? e.data : "";
 		this._logger?.debug("DefaultDecoderCore._decodeFirstContact(); first-contact stream", {
 			name: e.name,
-			streamId: i,
+			streamId: a,
 			serial: r
 		});
-		let s = {
+		let c = {
 			name: e.name,
-			streamId: i,
-			accumulated: o,
-			codecHeaders: { ...a },
+			streamId: a,
+			accumulated: s,
+			codecHeaders: { ...o },
 			transportHeaders: { ...e.transportHeaders },
-			closed: n === "complete" || n === "cancelled"
+			version: i ?? r,
+			closed: !1
 		};
-		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;
+		this._serialState.set(r, c);
+		let l = this._hooks.buildStartEvents(c);
+		return s.length > 0 && l.push(...this._hooks.buildDeltaEvents(c, s)), n === "complete" && l.push(...this._hooks.buildEndEvents(c, o)), (n === "complete" || n === "cancelled") && this._closeTracker(c), l;
 	}
 	_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 }), [];
+		return this._invokeOnStreamDelete(t, n), n && this._closeTracker(n), this._logger?.debug("DefaultDecoderCore._decodeDelete();", { serial: t }), [];
 	}
-}, Re = (e, t = {}) => new Le(e, t), ze = class {
+}, rt = (e, t = {}) => new nt(e, t), it = class {
 	constructor(e) {
 		this._emitted = /* @__PURE__ */ new Map(), this._phases = e;
 	}
@@ -2163,8 +2445,425 @@ var t = class e {
 		let t = this._emitted.get(e);
 		return t || (t = /* @__PURE__ */ new Set(), this._emitted.set(e, t)), t;
 	}
-}, Be = (e) => new ze(e);
+}, at = (e) => new it(e);
+//#endregion
+//#region src/core/codec/fields.ts
+function ot(e, t) {
+	return {
+		key: e,
+		read: (n) => n[e] ?? t,
+		write: (t, n) => {
+			typeof n == "string" && (t[e] = n);
+		}
+	};
+}
+function st(e, t) {
+	return {
+		key: e,
+		read: (n) => R(n[e]) ?? t,
+		write: (t, n) => {
+			typeof n == "boolean" && (t[e] = String(n));
+		}
+	};
+}
+var ct = (e) => ({
+	key: e,
+	read: (t) => I(t[e]),
+	write: (t, n) => {
+		n != null && (t[e] = JSON.stringify(n));
+	}
+}), lt = (e, t, n) => ({
+	key: e,
+	read: (r) => {
+		let i = r[e];
+		return t.find((e) => e === i) ?? n;
+	},
+	write: (t, n) => {
+		typeof n == "string" && (t[e] = n);
+	}
+}), ut = "kind", dt = "-*", ft = (e) => e.endsWith(dt) ? (t) => t.startsWith(e.slice(0, -1)) : void 0, pt = "partType", Y = (e, t) => e[t], X = (e, t, n, r) => {
+	let i = { [ut]: t };
+	for (let t of e) r && !r.includes(t.key) || t.write(i, Y(n, t.key));
+	return i;
+}, mt = (e, t) => e.find((e) => !e.match && e.partType === t) ?? e.find((e) => e.match?.(t)), ht = (e) => {
+	let t = /* @__PURE__ */ new Map(), n = [];
+	for (let r of e) r.construct === "event" && (r.match ? n.push(r) : t.set(r.type, r));
+	return {
+		discreteByType: t,
+		wildcards: n
+	};
+}, Z = (e, t) => {
+	let n = {};
+	for (let r of e) {
+		let e = r.read(t);
+		e !== void 0 && (n[r.key] = e);
+	}
+	return n;
+}, gt = (e) => {
+	let t = /* @__PURE__ */ new Map();
+	for (let n of e) t.set(n.kind, n);
+	let n = (e, t) => {
+		if (e.wireOnly) return [];
+		let n = Z(e.fields, t.codecHeaders);
+		e.data && Object.assign(n, e.data.decode(t.data));
+		let r = t.transportHeaders["codec-message-id"] ?? "";
+		return [{
+			kind: e.kind,
+			codecMessageId: r,
+			payload: B(n)
+		}];
+	}, r = (e, t) => {
+		let n = t.codecHeaders.partType ?? "", r = mt(e.parts, n);
+		if (!r) return [];
+		let i = Z(r.fields, t.codecHeaders);
+		r.data && Object.assign(i, r.data.decode(t.data)), i.type = n;
+		let a = e.assemble(B(i), {
+			codecHeaders: t.codecHeaders,
+			transportHeaders: t.transportHeaders
+		});
+		return [{
+			kind: e.kind,
+			...a
+		}];
+	};
+	return { decode: (e) => {
+		let i = t.get(e.codecKind);
+		return i ? i.construct === "event" ? n(i, e) : r(i, e) : [];
+	} };
+}, _t = (e, t) => t?.transportHeaders === void 0 ? e : {
+	...e,
+	transportHeaders: {
+		...e.transportHeaders,
+		...t.transportHeaders
+	}
+}, vt = (t, n) => {
+	let r = /* @__PURE__ */ new Map();
+	for (let e of t) r.set(e.kind, e);
+	let i = async (t, r, i, a) => {
+		if (t.wireOnly) {
+			await i.publishDiscrete({
+				name: n,
+				data: "",
+				codecHeaders: { [ut]: t.kind }
+			}, a.opts);
+			return;
+		}
+		let o = Y(r, "payload");
+		if (typeof o != "object" || !o) throw new e.ErrorInfo(`unable to encode input; event '${t.kind}' carries no payload object — declare it wireOnly or use an encode escape hatch`, E.InvalidArgument, 400);
+		let s = X(t.fields, t.kind, o), c = t.data ? t.data.encode(o) : "";
+		await i.publishDiscrete({
+			name: n,
+			data: c,
+			codecHeaders: s
+		}, a.opts);
+	}, a = async (e, t, r, i) => {
+		let a = e.messageHeaders?.(t), o = [];
+		for (let r of e.explode(t)) {
+			let t = e.partTypeOf(r), i = mt(e.parts, t);
+			if (!i) continue;
+			let s = r, c = {
+				...X(i.fields, e.kind, s),
+				...a?.codecHeaders,
+				[pt]: t
+			}, l = i.data ? i.data.encode(r) : "";
+			o.push(_t({
+				name: n,
+				data: l,
+				codecHeaders: c
+			}, a));
+		}
+		o.length === 0 && o.push(_t({
+			name: n,
+			data: "",
+			codecHeaders: {
+				[ut]: e.kind,
+				...a?.codecHeaders
+			}
+		}, a)), await r.publishDiscreteBatch(o, i.opts);
+	};
+	return { encode: async (t, n, o) => {
+		let s = r.get(t.kind);
+		if (!s) throw new e.ErrorInfo(`unable to publish; unsupported input kind '${t.kind}'`, E.InvalidArgument, 400);
+		await (s.construct === "event" ? i(s, t, n, o) : a(s, t, n, o));
+	} };
+}, yt = () => {
+	let e = (e, t) => {
+		let n = ft(e);
+		return {
+			partType: e,
+			...n ? { match: n } : {},
+			fields: t.fields ?? [],
+			data: t.data
+		};
+	};
+	return {
+		event: (e, t) => {
+			let n = t;
+			return {
+				construct: "event",
+				kind: e,
+				fields: n?.fields ?? [],
+				data: n?.data,
+				wireOnly: n?.wireOnly ?? !1
+			};
+		},
+		batch: (t, n) => {
+			let r = n.parts(e);
+			return {
+				construct: "batch",
+				kind: t,
+				explode: n.explode,
+				partTypeOf: n.partTypeOf,
+				parts: r,
+				messageHeaders: n.messageHeaders,
+				assemble: n.assemble
+			};
+		}
+	};
+}, bt = "type", xt = (e) => {
+	let { discreteByType: t, wildcards: n } = ht(e), r = /* @__PURE__ */ new Map();
+	for (let t of e) t.construct === "stream" && r.set(t.kind, t);
+	let i = (e, t) => (t[bt] = e, B(t)), a = (e, t, n) => {
+		let r = Z(e.fields, n.codecHeaders);
+		return e.data && Object.assign(r, e.data.decode(n.data)), [i(t, r)];
+	}, o = (e) => r.get(e.codecHeaders.kind ?? "");
+	return {
+		buildStart: (e) => {
+			let t = o(e);
+			if (!t) return [];
+			let n = Z(t.fields, e.codecHeaders);
+			return n[t.idField] = e.streamId, [i(t.start, n)];
+		},
+		buildDelta: (e, t) => {
+			let n = o(e);
+			if (!n) return [];
+			let r = {
+				[n.idField]: e.streamId,
+				[n.deltaField]: t
+			};
+			return [i(n.delta, r)];
+		},
+		buildEnd: (e, t) => {
+			let n = o(e);
+			if (!n) return [];
+			if (n.decodeEnd) return n.decodeEnd({
+				streamId: e.streamId,
+				accumulated: e.accumulated,
+				codecHeaders: e.codecHeaders,
+				closingCodecHeaders: t
+			});
+			let r = Z(n.fields, t);
+			return r[n.idField] = e.streamId, [i(n.end, r)];
+		},
+		decodeDiscrete: (e, i, o, s) => {
+			let c = {
+				codecKind: e,
+				codecHeaders: i,
+				transportHeaders: o,
+				data: s
+			}, l = t.get(e);
+			if (l) return a(l, e, c);
+			let u = r.get(e);
+			if (u?.decodeDiscrete) return u.decodeDiscrete(c);
+			let d = n.find((t) => t.match?.(e));
+			return d ? a(d, e, c) : [];
+		}
+	};
+}, St = (t, n) => {
+	let { discreteByType: r, wildcards: i } = ht(t), a = /* @__PURE__ */ new Map();
+	for (let e of t) e.construct === "stream" && (a.set(e.start, {
+		descriptor: e,
+		phase: "start"
+	}), a.set(e.delta, {
+		descriptor: e,
+		phase: "delta"
+	}), a.set(e.end, {
+		descriptor: e,
+		phase: "end"
+	}));
+	return { encode: async (t, o, s) => {
+		let { type: c } = t, l = a.get(c);
+		if (l) {
+			let { descriptor: e, phase: r } = l, i = (t, n) => X(e.fields, e.kind, t, n), a = Y(t, e.idField);
+			r === "start" ? await o.startStream(a, {
+				name: n,
+				data: "",
+				codecHeaders: i(t)
+			}, s.opts) : r === "delta" ? o.appendStream(a, Y(t, e.deltaField)) : e.onEnd ? await e.onEnd(t, o, {
+				h: i,
+				name: n,
+				messageId: s.messageId,
+				opts: s.opts
+			}) : await o.closeStream(a, {
+				name: n,
+				data: "",
+				codecHeaders: i(t)
+			});
+			return;
+		}
+		let u = r.get(c) ?? i.find((e) => e.match?.(c));
+		if (!u) throw new e.ErrorInfo(`unable to publish; unsupported event type '${c}'`, E.InvalidArgument, 400);
+		let d = (e, t) => X(u.fields, e.type, e, t);
+		if (u.encode) {
+			await u.encode(t, o, {
+				h: d,
+				name: n,
+				messageId: s.messageId,
+				opts: s.opts
+			});
+			return;
+		}
+		let f = u.data ? u.data.encode(t) : "";
+		await o.publishDiscrete({
+			name: n,
+			data: f,
+			codecHeaders: d(t),
+			ephemeral: u.ephemeral?.(t)
+		}, s.opts);
+	} };
+}, Ct = () => ({
+	event: (e, t) => ({
+		construct: "event",
+		type: e,
+		fields: t?.fields ?? [],
+		data: t?.data,
+		ephemeral: t?.ephemeral,
+		match: ft(e),
+		encode: t?.encode
+	}),
+	stream: (e, t) => ({
+		construct: "stream",
+		kind: e,
+		...t
+	})
+}), wt = () => ({
+	createUserMessage: (e) => ({
+		kind: "user-message",
+		message: e
+	}),
+	createRegenerate: (e, t) => ({
+		kind: "regenerate",
+		target: e,
+		parent: t
+	}),
+	createToolResult: (e, t) => ({
+		kind: "tool-result",
+		codecMessageId: e,
+		payload: t
+	}),
+	createToolResultError: (e, t) => ({
+		kind: "tool-result-error",
+		codecMessageId: e,
+		payload: t
+	}),
+	createToolApprovalResponse: (e, t) => ({
+		kind: "tool-approval-response",
+		codecMessageId: e,
+		payload: t
+	})
+}), Tt = class {
+	constructor(e, t, n, r) {
+		this._core = tt(e, t), this._messageId = t.messageId, this._outputEncoder = n, this._inputEncoder = r;
+	}
+	async publishInput(e, t) {
+		await this._inputEncoder.encode(e, this._core, { opts: t });
+	}
+	async publishOutput(e, t) {
+		await this._outputEncoder.encode(e, this._core, {
+			messageId: this._messageId,
+			opts: t
+		});
+	}
+	async cancelStreams() {
+		await this._core.cancelAllStreams();
+	}
+	async close() {
+		await this._core.close();
+	}
+}, Et = (e, t, n, r) => {
+	let i = e.codecHeaders ?? {}, a = e.transportHeaders ?? {}, o = i.kind ?? "";
+	if (e.name === "ai-input") return n.decode({
+		codecKind: o,
+		data: e.data,
+		codecHeaders: i,
+		transportHeaders: a
+	});
+	if (e.name === "ai-output") {
+		let n = a["run-id"] ?? "", s = r?.onDiscrete;
+		return [...(s !== void 0 && Object.hasOwn(s, o) ? s[o] : void 0)?.(n, { codecHeaders: i }) ?? [], ...t.decodeDiscrete(o, i, a, e.data)];
+	}
+	return [];
+}, Dt = (e) => e.name === ee, Ot = (e, t, n) => ({
+	buildStartEvents: (t) => {
+		if (!Dt(t)) return [];
+		let r = t.transportHeaders["run-id"] ?? "";
+		return [...n?.onStreamStart?.(r, t) ?? [], ...e.buildStart(t)];
+	},
+	buildDeltaEvents: (t, n) => Dt(t) ? e.buildDelta(t, n) : [],
+	buildEndEvents: (t, n) => Dt(t) ? e.buildEnd(t, n) : [],
+	decodeDiscrete: (r) => Et(r, e, t, n)
+}), kt = class {
+	constructor(e) {
+		this._core = e;
+	}
+	decode(e) {
+		let t = this._core.decode(e);
+		return e.name === "ai-input" ? {
+			inputs: t,
+			outputs: []
+		} : {
+			inputs: [],
+			outputs: t
+		};
+	}
+}, Q = (t, n, r) => {
+	let i = t.get(n);
+	if (i !== void 0) throw new e.ErrorInfo(`unable to define codec; dispatch literal '${n}' is declared by both ${i} and ${r}`, E.InvalidArgument, 400);
+	t.set(n, r);
+}, $ = (t, n) => {
+	for (let r of t) if (r.key === "kind" || r.key === "partType") throw new e.ErrorInfo(`unable to define codec; ${n} binds the driver-reserved header key '${r.key}'`, E.InvalidArgument, 400);
+}, At = (e, t) => {
+	let n = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Map();
+	for (let t of e) if (t.construct === "event") {
+		let e = `output event '${t.type}'`;
+		Q(n, t.type, e), Q(r, t.type, e), $(t.fields, e);
+	} else {
+		let e = `output stream '${t.kind}'`;
+		Q(r, t.kind, e);
+		for (let r of [
+			t.start,
+			t.delta,
+			t.end
+		]) Q(n, r, e);
+		$(t.fields, e);
+	}
+	let i = /* @__PURE__ */ new Map();
+	for (let e of t) {
+		let t = `input ${e.construct} '${e.kind}'`;
+		if (Q(i, e.kind, t), e.construct === "event") $(e.fields, t);
+		else {
+			let n = /* @__PURE__ */ new Map();
+			for (let r of e.parts) {
+				let e = `${t} part '${r.partType}'`;
+				Q(n, r.partType, e), $(r.fields, e);
+			}
+		}
+	}
+}, jt = () => (e) => {
+	let { reducer: t, decodeLifecycle: n } = e, r = e.output(Ct()), i = e.input(yt());
+	At(r, i);
+	let a = St(r, ee), o = vt(i, T), s = xt(r), c = gt(i);
+	return {
+		...e.adapterTag === void 0 ? {} : { adapterTag: e.adapterTag },
+		init: t.init,
+		fold: t.fold,
+		getMessages: t.getMessages,
+		createEncoder: (e, t = {}) => new Tt(e, t, a, o),
+		createDecoder: () => new kt(rt(Ot(s, c, n?.()), {})),
+		...wt()
+	};
+};
 //#endregion
-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 };
+export { b as EVENT_CANCEL, w as EVENT_RUN_END, x as EVENT_RUN_START, E as ErrorCode, K 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, D as LogLevel, ae as OBJECT_MODES, st as boolField, ge as buildTransportHeaders, O as consoleLogger, Ue as createAgentSession, $e as createClientSession, rt as createDecoderCore, tt as createEncoderCore, at as createLifecycleTracker, jt as defineCodec, lt as enumField, te as errorInfoIs, F as getCodecHeaders, P as getTransportHeaders, ct as jsonField, k as makeLogger, L as mergeHeaders, ot as strField, B as stripUndefined };
 
 //# sourceMappingURL=ably-ai-transport.js.map