diff --git a/adapter/strings/omp-spt.mjs b/adapter/strings/omp-spt.mjs
index e6ef979..5acab0d 100644
--- a/adapter/strings/omp-spt.mjs
+++ b/adapter/strings/omp-spt.mjs
@@ -30,31 +30,84 @@ export function drainEvents(raw) {
 		if (openEnd < 0) return { events, rest: raw.slice(start) };
 		const close = raw.indexOf("</EVENT>", openEnd + 1);
 		if (close < 0) return { events, rest: raw.slice(start) };
+		const end = close + "</EVENT>".length;
 		const tag = raw.slice(start, openEnd);
 		if (attribute(tag, "type") === "msg") {
 			events.push({
 				from: attribute(tag, "from"),
 				body: decodeBody(raw.slice(openEnd + 1, close)),
+				envelope: raw.slice(start, end),
 			});
 		}
-		cursor = close + "</EVENT>".length;
+		cursor = end;
 	}
 }
 
-export function extractReply(messages) {
-	const assistant = [...(messages ?? [])].reverse().find((message) => message?.role === "assistant");
-	if (!assistant) return "";
-	if (typeof assistant.content === "string") return assistant.content;
-	return (assistant.content ?? [])
+function messageText(message) {
+	if (typeof message?.content === "string") return message.content;
+	return (message?.content ?? [])
 		.filter((part) => part?.type === "text" && typeof part.text === "string")
 		.map((part) => part.text)
 		.join("");
 }
 
+export function extractReply(messages, afterUserMessage) {
+	const allMessages = messages ?? [];
+	let start = 0;
+	if (afterUserMessage !== undefined) {
+		const userIndex = allMessages.findLastIndex((message) => {
+			if (message?.role !== "user") return false;
+			const text = messageText(message);
+			return text === afterUserMessage || text.startsWith(`${afterUserMessage}\n\n<EVENT`);
+		});
+		if (userIndex < 0) return "";
+		start = userIndex + 1;
+	}
+	const assistant = allMessages
+		.slice(start)
+		.reverse()
+		.find((message) => message?.role === "assistant");
+	return assistant ? messageText(assistant) : "";
+}
+
 function firstLine(text) {
 	return text.split(/\r?\n/).find((line) => line.trim()) ?? "";
 }
 
+function errorSummary(error) {
+	const detail = error instanceof Error ? error.message : String(error);
+	return firstLine(detail).trim() || "unknown error";
+}
+
+function failureMessage(reason, error) {
+	const detail = error === undefined ? "" : `: ${errorSummary(error)}`;
+	return `[omp-spt] ${reason}${detail}`;
+}
+
+function senderStub(sender) {
+	const escaped = sender
+		.replaceAll("&", "&amp;")
+		.replaceAll('"', "&quot;")
+		.replaceAll("<", "&lt;")
+		.replaceAll(">", "&gt;");
+	return `<msg from="${escaped}"/>`;
+}
+
+function injectEnvelope(messages, item) {
+	const index = messages.findLastIndex(
+		(message) => message?.role === "user" && messageText(message) === item.stub,
+	);
+	if (index < 0) return messages;
+	const original = messages[index];
+	const content =
+		typeof original.content === "string"
+			? `${original.content}\n\n${item.envelope}`
+			: [...(original.content ?? []), { type: "text", text: `\n\n${item.envelope}` }];
+	const injected = [...messages];
+	injected[index] = { ...original, content };
+	return injected;
+}
+
 function runSpt(args, input) {
 	return new Promise((resolve, reject) => {
 		const child = spawn(process.env.OMP_SPT_SPT_BIN || "spt", args, {
@@ -75,126 +128,343 @@ function runSpt(args, input) {
 	});
 }
 
-// [impl->REQ-OMP-NATIVE-TUI]
-export default function ompSpt(pi) {
-	const id = process.env.SPT_ENDPOINT_ID?.trim();
-	if (!id) return;
-
-	let sid;
-	let token;
-	let listener;
-	let listenerBuffer = "";
-	let agentActive = false;
-	let current;
-	let stopping = false;
-	let ui;
-	const queue = [];
-
-	const logError = (message, error) => {
-		pi.logger.error(message, { error: String(error) });
-		ui?.notify(`${message}: ${error}`, "error");
-	};
+export function createOmpSpt(overrides = {}) {
+	const spawnProcess = overrides.spawnProcess ?? spawn;
+	const runSptCommand = overrides.runSptCommand ?? runSpt;
+	const setTimer = overrides.setTimeout ?? globalThis.setTimeout;
+	const clearTimer = overrides.clearTimeout ?? globalThis.clearTimeout;
+	const restartDelaysMs = [...(overrides.restartDelaysMs ?? [250, 1000, 4000])];
+	const env = overrides.env ?? process.env;
 
-	async function setState(state) {
-		if (!sid) return;
-		const auth = token ? ["--token", token] : ["--session-id", sid];
-		await runSpt(["api", "--adapter", ADAPTER, "state", state, id, ...auth]);
-	}
+	// [impl->REQ-OMP-NATIVE-TUI]
+	return function ompSpt(pi) {
+		const id = env.SPT_ENDPOINT_ID?.trim();
+		if (!id) return;
+
+		let sid;
+		let token;
+		let listener;
+		let listenerBuffer = "";
+		let listenerRestartCount = 0;
+		let restartTimer;
+		let dispatchTimer;
+		let agentActive = false;
+		let dispatching = false;
+		let current;
+		let stopping = false;
+		let ui;
+		let runtimeCtx;
+		let endpointState;
+		let stateOperation = Promise.resolve();
+		let endPromise;
+		let fatalPromise;
+		const queue = [];
+
+		const logError = (message, error) => {
+			pi.logger.error(message, { error: errorSummary(error) });
+			ui?.notify(`${message}: ${errorSummary(error)}`, "error");
+		};
+
+		function authArgs() {
+			if (!token) throw new Error("bind did not return an authentication token");
+			return ["--token", token];
+		}
+
+		function setState(state) {
+			if (!sid || !token || stopping) return Promise.resolve();
+			const operation = stateOperation.catch(() => {}).then(async () => {
+				if (endpointState === state || stopping) return;
+				await runSptCommand(["api", "--adapter", ADAPTER, "state", state, id, ...authArgs()]);
+				endpointState = state;
+			});
+			stateOperation = operation;
+			return operation;
+		}
 
-	function dispatchNext() {
-		if (stopping || agentActive || current || queue.length === 0) return;
-		current = queue.shift();
-		try {
-			pi.sendUserMessage(current.body);
-		} catch (error) {
-			logError("omp-spt could not submit an inbound message", error);
+		function endSession() {
+			if (!sid || !token) return Promise.resolve();
+			if (!endPromise) {
+				endPromise = (async () => {
+					await stateOperation.catch(() => {});
+					await runSptCommand(["api", "--adapter", ADAPTER, "session-end", id, ...authArgs()]);
+					endpointState = undefined;
+				})();
+			}
+			return endPromise;
+		}
+
+		async function settleItem(item, payload) {
+			if (!item || item.settled) return;
+			item.settled = true;
+			if (!item.from) {
+				logError("omp-spt received a message without a sender", new Error("missing EVENT from attribute"));
+				return;
+			}
+			try {
+				await runSptCommand(["send", item.from, "--from", id], payload);
+			} catch (error) {
+				logError(`omp-spt could not send the outcome to ${item.from}`, error);
+			}
+		}
+
+		function stopResources() {
+			if (dispatchTimer !== undefined) {
+				clearTimer(dispatchTimer);
+				dispatchTimer = undefined;
+			}
+			if (restartTimer !== undefined) {
+				clearTimer(restartTimer);
+				restartTimer = undefined;
+			}
+			const child = listener;
+			listener = undefined;
+			if (child) {
+				try {
+					child.kill();
+				} catch (error) {
+					pi.logger.error("omp-spt could not reap the listener", { error: errorSummary(error) });
+				}
+			}
+			listenerBuffer = "";
+		}
+
+		async function failPending(reason) {
+			const pending = current ? [current, ...queue] : [...queue];
 			current = undefined;
-			setTimeout(dispatchNext, 0);
+			queue.length = 0;
+			for (const item of pending) await settleItem(item, failureMessage(reason));
 		}
-	}
 
-	function startListener() {
-		const args = ["ready", id];
-		if (process.env.OMP_SPT_SUBNET) args.push("--subnet", process.env.OMP_SPT_SUBNET);
-		listener = spawn(process.env.OMP_SPT_SPT_BIN || "spt", args, {
-			stdio: ["ignore", "pipe", "pipe"],
-			windowsHide: true,
-		});
-		listener.stdout.setEncoding("utf8");
-		listener.stderr.setEncoding("utf8");
-		listener.stdout.on("data", (chunk) => {
-			listenerBuffer += chunk;
-			const drained = drainEvents(listenerBuffer);
-			listenerBuffer = drained.rest;
-			for (const event of drained.events) queue.push(event);
-			dispatchNext();
-		});
-		listener.stderr.on("data", (chunk) => pi.logger.debug("omp-spt listener", { output: chunk.trim() }));
-		listener.on("error", (error) => logError("omp-spt listener failed", error));
-		listener.on("close", (code) => {
+		async function failClosed(message, error) {
+			if (fatalPromise) return fatalPromise;
+			fatalPromise = (async () => {
+				stopping = true;
+				stopResources();
+				ui?.setStatus("omp-spt", "spt failed");
+				logError(message, error);
+				await failPending("endpoint stopped before your message could complete");
+				try {
+					await endSession();
+				} catch (endError) {
+					logError("omp-spt session teardown failed", endError);
+				}
+				runtimeCtx?.shutdown();
+			})();
+			return fatalPromise;
+		}
+
+		function scheduleDispatch() {
+			if (
+				stopping ||
+				agentActive ||
+				dispatching ||
+				current ||
+				queue.length === 0 ||
+				dispatchTimer !== undefined
+			) {
+				return;
+			}
+			dispatchTimer = setTimer(() => {
+				dispatchTimer = undefined;
+				void dispatchNext().catch((error) => failClosed("omp-spt dispatch failed", error));
+			}, 0);
+			dispatchTimer?.unref?.();
+		}
+
+		async function rejectItem(item, reason, error) {
+			logError(`omp-spt ${reason}`, error);
+			await settleItem(item, failureMessage(reason, error));
+			if (current === item) current = undefined;
 			if (!stopping) {
-				ui?.setStatus("omp-spt", "spt offline");
-				ui?.notify(`omp-spt listener exited (${code})`, "error");
+				try {
+					await setState("idle");
+				} catch (stateError) {
+					logError("omp-spt could not mark the endpoint idle after a failed submission", stateError);
+				}
 			}
-		});
-	}
+		}
 
-	pi.on("session_start", async (_event, ctx) => {
-		ui = ctx.ui;
-		sid = ctx.sessionManager.getSessionId();
-		try {
-			const bindArgs = ["api", "--adapter", ADAPTER, "bind", id, "--set-session-id", sid];
-			if (process.env.OMP_SPT_SUBNET) bindArgs.push("--subnet", process.env.OMP_SPT_SUBNET);
-			const bound = await runSpt(bindArgs);
-			token = bound.match(/\btoken=([^\s]+)/)?.[1];
-			await setState("idle");
-			startListener();
-			ctx.ui.setStatus("omp-spt", `spt:${id}`);
-		} catch (error) {
-			ctx.ui.setStatus("omp-spt", "spt bind failed");
-			logError(`omp-spt could not bind ${id}`, error);
+		async function dispatchNext() {
+			if (stopping || agentActive || dispatching || current || queue.length === 0) return;
+			dispatching = true;
+			const item = queue.shift();
+			current = item;
+			try {
+				try {
+					await setState("busy");
+				} catch (error) {
+					await rejectItem(item, "could not accept your message", error);
+					return;
+				}
+				if (stopping) return;
+				if (agentActive) {
+					if (current === item) current = undefined;
+					queue.unshift(item);
+					return;
+				}
+				item.stub = senderStub(item.from ?? "unknown");
+				item.submitted = true;
+				try {
+					pi.sendUserMessage(item.stub);
+				} catch (error) {
+					item.submitted = false;
+					await rejectItem(item, "could not submit your message to OMP", error);
+				}
+			} finally {
+				dispatching = false;
+				scheduleDispatch();
+			}
 		}
-	});
 
-	pi.on("agent_start", async () => {
-		agentActive = true;
-		try {
-			await setState("busy");
-		} catch (error) {
-			logError("omp-spt could not mark the endpoint busy", error);
+		function handleListenerDeath(reason) {
+			listenerBuffer = "";
+			if (stopping || restartTimer !== undefined) return;
+			if (listenerRestartCount >= restartDelaysMs.length) {
+				void failClosed("omp-spt listener restart budget exhausted", reason);
+				return;
+			}
+			const attempt = listenerRestartCount + 1;
+			const delay = restartDelaysMs[listenerRestartCount];
+			listenerRestartCount = attempt;
+			const message = `omp-spt listener stopped; restarting ${attempt}/${restartDelaysMs.length} in ${delay}ms`;
+			pi.logger.error(message, { error: errorSummary(reason) });
+			ui?.setStatus("omp-spt", `spt reconnecting (${attempt}/${restartDelaysMs.length})`);
+			ui?.notify(message, "warning");
+			restartTimer = setTimer(() => {
+				restartTimer = undefined;
+				startListener();
+			}, delay);
+			restartTimer?.unref?.();
 		}
-	});
 
-	pi.on("agent_end", async (event) => {
-		agentActive = false;
-		const completed = current;
-		current = undefined;
-		if (completed?.from) {
-			const reply = extractReply(event.messages) || "[omp-spt] turn ended without an assistant response.";
+		function startListener() {
+			if (stopping) return;
+			const args = ["ready", id];
+			if (env.OMP_SPT_SUBNET) args.push("--subnet", env.OMP_SPT_SUBNET);
+			let child;
 			try {
-				await runSpt(["send", completed.from, "--from", id], reply);
+				child = spawnProcess(env.OMP_SPT_SPT_BIN || "spt", args, {
+					stdio: ["ignore", "pipe", "pipe"],
+					windowsHide: true,
+				});
 			} catch (error) {
-				logError(`omp-spt could not reply to ${completed.from}`, error);
+				handleListenerDeath(error);
+				return;
 			}
+			listener = child;
+			listenerBuffer = "";
+			let dead = false;
+			const died = (reason) => {
+				if (dead) return;
+				dead = true;
+				if (listener === child) listener = undefined;
+				handleListenerDeath(reason);
+			};
+			child.stdout.setEncoding("utf8");
+			child.stderr.setEncoding("utf8");
+			child.stdout.on("data", (chunk) => {
+				if (listener !== child || stopping) return;
+				listenerRestartCount = 0;
+				listenerBuffer += chunk;
+				const drained = drainEvents(listenerBuffer);
+				listenerBuffer = drained.rest;
+				for (const event of drained.events) {
+					if (!event.from) {
+						logError(
+							"omp-spt received a message without a sender",
+							new Error("missing EVENT from attribute"),
+						);
+						continue;
+					}
+					queue.push(event);
+				}
+				if (!agentActive && !current && !dispatching) void dispatchNext();
+			});
+			child.stderr.on("data", (chunk) =>
+				pi.logger.debug("omp-spt listener", { output: String(chunk).trim() }),
+			);
+			child.on("error", (error) => died(error));
+			child.on("close", (code) => died(new Error(`spt ready exited ${code}`)));
+			ui?.setStatus("omp-spt", `spt:${id}`);
 		}
-		try {
-			await setState("idle");
-		} catch (error) {
-			logError("omp-spt could not mark the endpoint idle", error);
-		}
-		setTimeout(dispatchNext, 0);
-	});
 
-	pi.on("session_shutdown", async () => {
-		stopping = true;
-		listener?.kill();
-		ui?.setStatus("omp-spt", undefined);
-		if (!sid) return;
-		const auth = token ? ["--token", token] : ["--session-id", sid];
-		try {
-			await runSpt(["api", "--adapter", ADAPTER, "session-end", id, ...auth]);
-		} catch (error) {
-			pi.logger.error("omp-spt session teardown failed", { error: String(error) });
-		}
-	});
+		pi.on("session_start", async (_event, ctx) => {
+			runtimeCtx = ctx;
+			ui = ctx.ui;
+			sid = ctx.sessionManager.getSessionId();
+			try {
+				const bindArgs = ["api", "--adapter", ADAPTER, "bind", id, "--set-session-id", sid];
+				if (env.OMP_SPT_SUBNET) bindArgs.push("--subnet", env.OMP_SPT_SUBNET);
+				const bound = await runSptCommand(bindArgs);
+				token = bound.match(/\btoken=([^\s]+)/)?.[1];
+				if (!token) throw new Error("spt bind response did not include token=<value>");
+				await setState("idle");
+				ui.setStatus("omp-spt", `spt:${id}`);
+				startListener();
+			} catch (error) {
+				ui.setStatus("omp-spt", "spt bind failed");
+				await failClosed(`omp-spt could not bind ${id}`, error);
+			}
+		});
+
+		pi.on("session_before_switch", (event, ctx) => {
+			if (stopping) return;
+			ctx.ui.notify(
+				`omp-spt blocked the in-TUI ${event.reason} session switch; end this SPT session first`,
+				"warning",
+			);
+			return { cancel: true };
+		});
+
+		pi.on("context", (event) => {
+			if (!current?.submitted || current.settled) return;
+			const messages = injectEnvelope(event.messages, current);
+			if (messages !== event.messages) return { messages };
+		});
+
+		pi.on("agent_start", async () => {
+			if (stopping) return;
+			agentActive = true;
+			try {
+				await setState("busy");
+			} catch (error) {
+				logError("omp-spt could not mark the endpoint busy", error);
+			}
+		});
+
+		pi.on("agent_end", async (event) => {
+			agentActive = false;
+			if (stopping) return;
+			const completed = current;
+			if (completed?.submitted && !completed.settled) {
+				const reply = extractReply(event.messages, completed.stub);
+				await settleItem(
+					completed,
+					reply || failureMessage("turn ended without an assistant response"),
+				);
+			}
+			if (current === completed) current = undefined;
+			try {
+				await setState("idle");
+			} catch (error) {
+				logError("omp-spt could not mark the endpoint idle", error);
+			}
+			scheduleDispatch();
+		});
+
+		pi.on("session_shutdown", async (_event, ctx) => {
+			stopping = true;
+			runtimeCtx ??= ctx;
+			stopResources();
+			ui?.setStatus("omp-spt", undefined);
+			await failPending("OMP session shut down before your message could complete");
+			try {
+				await endSession();
+			} catch (error) {
+				pi.logger.error("omp-spt session teardown failed", { error: errorSummary(error) });
+			}
+		});
+	};
 }
+
+export default createOmpSpt();
diff --git a/tests/omp-extension.mjs b/tests/omp-extension.mjs
index 2ccf034..4efe0d1 100644
--- a/tests/omp-extension.mjs
+++ b/tests/omp-extension.mjs
@@ -1,25 +1,454 @@
 import assert from "node:assert/strict";
-import { decodeBody, drainEvents, extractReply } from "../adapter/strings/omp-spt.mjs";
+import { EventEmitter } from "node:events";
+import {
+	createOmpSpt,
+	decodeBody,
+	drainEvents,
+	extractReply,
+} from "../adapter/strings/omp-spt.mjs";
+
+const flush = () => new Promise((resolve) => setImmediate(resolve));
+
+class FakeStream extends EventEmitter {
+	setEncoding(encoding) {
+		this.encoding = encoding;
+	}
+}
+
+class FakeChild extends EventEmitter {
+	constructor() {
+		super();
+		this.stdout = new FakeStream();
+		this.stderr = new FakeStream();
+		this.kills = 0;
+	}
+
+	kill() {
+		this.kills += 1;
+	}
+}
+
+class FakeClock {
+	constructor() {
+		this.nextId = 1;
+		this.timers = new Map();
+	}
+
+	setTimeout(fn, delay) {
+		const handle = { id: this.nextId++, unref() {} };
+		this.timers.set(handle, { fn, delay });
+		return handle;
+	}
+
+	clearTimeout(handle) {
+		this.timers.delete(handle);
+	}
+
+	delays() {
+		return [...this.timers.values()].map(({ delay }) => delay);
+	}
+
+	async runNext(expectedDelay) {
+		const entry = [...this.timers.entries()].sort((left, right) => left[1].delay - right[1].delay)[0];
+		assert.ok(entry, `expected a ${expectedDelay}ms timer`);
+		const [handle, timer] = entry;
+		assert.equal(timer.delay, expectedDelay);
+		this.timers.delete(handle);
+		timer.fn();
+		await flush();
+	}
+}
+
+function createHarness(options = {}) {
+	const handlers = new Map();
+	const calls = [];
+	const children = [];
+	const submitted = [];
+	const statuses = [];
+	const notifications = [];
+	const errors = [];
+	const debug = [];
+	const clock = new FakeClock();
+	let shutdowns = 0;
+
+	const ui = {
+		notify(message, type) {
+			notifications.push({ message, type });
+		},
+		setStatus(key, text) {
+			statuses.push({ key, text });
+		},
+	};
+	const ctx = {
+		ui,
+		sessionManager: { getSessionId: () => options.sessionId ?? "session-1" },
+		shutdown() {
+			shutdowns += 1;
+		},
+	};
+	const pi = {
+		logger: {
+			error(message, details) {
+				errors.push({ message, details });
+			},
+			debug(message, details) {
+				debug.push({ message, details });
+			},
+		},
+		on(name, handler) {
+			const registered = handlers.get(name) ?? [];
+			registered.push(handler);
+			handlers.set(name, registered);
+		},
+		sendUserMessage(content) {
+			submitted.push(content);
+			options.onSubmit?.(content);
+		},
+	};
+	const runSptCommand = async (args, input) => {
+		const call = { args: [...args], input };
+		calls.push(call);
+		const overridden = await options.onRun?.(call);
+		if (overridden !== undefined) return overridden;
+		if (args[0] === "api" && args[3] === "bind") {
+			return options.bindOutput ?? "BOUND endpoint token=token-123";
+		}
+		return "";
+	};
+	const spawnProcess = (binary, args, spawnOptions) => {
+		const child = new FakeChild();
+		child.binary = binary;
+		child.args = [...args];
+		child.spawnOptions = spawnOptions;
+		children.push(child);
+		return child;
+	};
+	const extension = createOmpSpt({
+		env: {
+			SPT_ENDPOINT_ID: options.id ?? "omp-agent",
+			OMP_SPT_SUBNET: options.subnet,
+			OMP_SPT_SPT_BIN: "spt-test",
+		},
+		restartDelaysMs: options.restartDelaysMs ?? [5, 10],
+		runSptCommand,
+		spawnProcess,
+		setTimeout: clock.setTimeout.bind(clock),
+		clearTimeout: clock.clearTimeout.bind(clock),
+	});
+	extension(pi);
+
+	async function emit(name, event = {}) {
+		let result;
+		for (const handler of handlers.get(name) ?? []) {
+			const returned = await handler({ type: name, ...event }, ctx);
+			if (returned !== undefined) result = returned;
+		}
+		return result;
+	}
+
+	return {
+		calls,
+		children,
+		clock,
+		ctx,
+		debug,
+		emit,
+		errors,
+		handlers,
+		notifications,
+		statuses,
+		submitted,
+		get shutdowns() {
+			return shutdowns;
+		},
+	};
+}
+
+function commandCalls(harness, command) {
+	return harness.calls.filter((call) => call.args[0] === command);
+}
+
+function stateCalls(harness) {
+	return harness.calls.filter((call) => call.args[0] === "api" && call.args[3] === "state");
+}
+
+async function testParsingAndReplies() {
+	assert.equal(decodeBody('a&lt;b&gt;<br>&quot;c&quot; &amp; &amp;lt;'), 'a<b>\n"c" & &lt;');
+
+	const partialEnvelope = '<EVENT type="msg" from="doyle">hello<br>wo';
+	const partial = drainEvents(`noise${partialEnvelope}`);
+	assert.deepEqual(partial.events, []);
+	assert.equal(partial.rest, partialEnvelope);
+
+	const envelope = `${partial.rest}rld</EVENT>`;
+	const complete = drainEvents(`${envelope}<EVENT type="notify">skip</EVENT>`);
+	assert.deepEqual(complete.events, [
+		{ from: "doyle", body: "hello\nworld", envelope },
+	]);
+	assert.equal(complete.rest, "");
+
+	assert.equal(
+		extractReply([
+			{ role: "assistant", content: [{ type: "text", text: "first" }] },
+			{ role: "toolResult", content: [] },
+			{
+				role: "assistant",
+				content: [
+					{ type: "text", text: "final " },
+					{ type: "text", text: "answer" },
+				],
+			},
+		]),
+		"final answer",
+	);
+	assert.equal(
+		extractReply(
+			[
+				{ role: "assistant", content: "stale answer" },
+				{ role: "user", content: '<msg from="doyle"/>' },
+			],
+			'<msg from="doyle"/>',
+		),
+		"",
+	);
+}
 
 // [unit->REQ-OMP-NATIVE-TUI]
-assert.equal(decodeBody('a&lt;b&gt;<br>&quot;c&quot; &amp; &amp;lt;'), 'a<b>\n"c" & &lt;');
-
-const partial = drainEvents('noise<EVENT type="msg" from="doyle">hello<br>wo');
-assert.deepEqual(partial.events, []);
-assert.equal(partial.rest, '<EVENT type="msg" from="doyle">hello<br>wo');
-
-const complete = drainEvents(`${partial.rest}rld</EVENT><EVENT type="notify">skip</EVENT>`);
-assert.deepEqual(complete.events, [{ from: "doyle", body: "hello\nworld" }]);
-assert.equal(complete.rest, "");
-
-assert.equal(
-	extractReply([
-		{ role: "assistant", content: [{ type: "text", text: "first" }] },
-		{ role: "toolResult", content: [] },
-		{ role: "assistant", content: [{ type: "text", text: "final " }, { type: "text", text: "answer" }] },
-	]),
-	"final answer",
-);
-assert.equal(extractReply([{ role: "user", content: "hello" }]), "");
+async function testLifecycleCustodyAndContext() {
+	const harness = createHarness({ subnet: "mesh-a" });
+	assert.deepEqual([...harness.handlers.keys()], [
+		"session_start",
+		"session_before_switch",
+		"context",
+		"agent_start",
+		"agent_end",
+		"session_shutdown",
+	]);
+
+	await harness.emit("session_start");
+	assert.deepEqual(harness.calls[0], {
+		args: [
+			"api",
+			"--adapter",
+			"omp-spt",
+			"bind",
+			"omp-agent",
+			"--set-session-id",
+			"session-1",
+			"--subnet",
+			"mesh-a",
+		],
+		input: undefined,
+	});
+	assert.deepEqual(harness.calls[1].args, [
+		"api",
+		"--adapter",
+		"omp-spt",
+		"state",
+		"idle",
+		"omp-agent",
+		"--token",
+		"token-123",
+	]);
+	assert.equal(harness.children.length, 1);
+	assert.equal(harness.children[0].binary, "spt-test");
+	assert.deepEqual(harness.children[0].args, ["ready", "omp-agent", "--subnet", "mesh-a"]);
+
+	const blockedResume = await harness.emit("session_before_switch", { reason: "resume" });
+	const blockedNew = await harness.emit("session_before_switch", { reason: "new" });
+	assert.deepEqual(blockedResume, { cancel: true });
+	assert.deepEqual(blockedNew, { cancel: true });
+	assert.ok(harness.notifications.some(({ message }) => message.includes("resume session switch")));
+
+	const aliceEnvelope =
+		'<EVENT type="msg" from="alice" event_id="evt-1">hello&lt;world<br>line</EVENT>';
+	const bobEnvelope = '<EVENT type="msg" from="bob" event_id="evt-2">second</EVENT>';
+	harness.children[0].stdout.emit("data", `${aliceEnvelope}${bobEnvelope}`);
+	await flush();
+	assert.deepEqual(harness.submitted, ['<msg from="alice"/>']);
+	assert.deepEqual(
+		stateCalls(harness).map((call) => call.args[4]),
+		["idle", "busy"],
+	);
+
+	const originalMessages = [{ role: "user", content: '<msg from="alice"/>' }];
+	const context = await harness.emit("context", { messages: originalMessages });
+	assert.equal(originalMessages[0].content, '<msg from="alice"/>');
+	assert.equal(context.messages[0].content, `<msg from="alice"/>\n\n${aliceEnvelope}`);
+
+	const arrayContext = await harness.emit("context", {
+		messages: [{ role: "user", content: [{ type: "text", text: '<msg from="alice"/>' }] }],
+	});
+	assert.deepEqual(arrayContext.messages[0].content, [
+		{ type: "text", text: '<msg from="alice"/>' },
+		{ type: "text", text: `\n\n${aliceEnvelope}` },
+	]);
+
+	await harness.emit("agent_start");
+	assert.deepEqual(
+		stateCalls(harness).map((call) => call.args[4]),
+		["idle", "busy"],
+		"agent_start must not duplicate the already-honest busy transition",
+	);
+	await harness.emit("agent_end", {
+		messages: [
+			{ role: "user", content: '<msg from="alice"/>' },
+			{ role: "assistant", content: [{ type: "text", text: "alice reply" }] },
+		],
+	});
+	assert.deepEqual(harness.submitted, ['<msg from="alice"/>']);
+	assert.deepEqual(harness.clock.delays(), [0]);
+
+	await harness.clock.runNext(0);
+	assert.deepEqual(harness.submitted, ['<msg from="alice"/>', '<msg from="bob"/>']);
+	await harness.emit("agent_start");
+	await harness.emit("agent_end", {
+		messages: [
+			{ role: "assistant", content: "previous reply" },
+			{ role: "user", content: '<msg from="bob"/>' },
+		],
+	});
+
+	const outcomes = commandCalls(harness, "send");
+	assert.equal(outcomes.length, 2);
+	assert.deepEqual(
+		outcomes.map((call) => call.args),
+		[
+			["send", "alice", "--from", "omp-agent"],
+			["send", "bob", "--from", "omp-agent"],
+		],
+	);
+	assert.equal(outcomes[0].input, "alice reply");
+	assert.match(outcomes[1].input, /turn ended without an assistant response/);
+	assert.deepEqual(
+		stateCalls(harness).map((call) => call.args[4]),
+		["idle", "busy", "idle", "busy", "idle"],
+	);
+	for (const call of [...stateCalls(harness), ...harness.calls.filter((candidate) => candidate.args[3] === "session-end")]) {
+		assert.deepEqual(call.args.slice(-2), ["--token", "token-123"]);
+	}
+
+	await harness.emit("session_shutdown");
+	const ended = harness.calls.filter((call) => call.args[3] === "session-end");
+	assert.equal(ended.length, 1);
+	assert.deepEqual(ended[0].args.slice(-2), ["--token", "token-123"]);
+	assert.equal(harness.children[0].kills, 1);
+	assert.deepEqual(harness.clock.delays(), []);
+}
+
+async function testSubmissionFailureAdvancesQueue() {
+	const harness = createHarness({
+		onSubmit(content) {
+			if (content === '<msg from="broken"/>') throw new Error("OMP prompt flow rejected input");
+		},
+	});
+	await harness.emit("session_start");
+	harness.children[0].stdout.emit(
+		"data",
+		'<EVENT type="msg" from="broken">one</EVENT><EVENT type="msg" from="next">two</EVENT>',
+	);
+	await flush();
+
+	const firstOutcome = commandCalls(harness, "send");
+	assert.equal(firstOutcome.length, 1);
+	assert.deepEqual(firstOutcome[0].args, ["send", "broken", "--from", "omp-agent"]);
+	assert.match(firstOutcome[0].input, /could not submit your message to OMP/);
+	assert.deepEqual(harness.clock.delays(), [0]);
+
+	await harness.clock.runNext(0);
+	assert.deepEqual(harness.submitted, ['<msg from="broken"/>', '<msg from="next"/>']);
+	await harness.emit("agent_start");
+	await harness.emit("agent_end", {
+		messages: [
+			{ role: "user", content: '<msg from="next"/>' },
+			{ role: "assistant", content: "next reply" },
+		],
+	});
+	const outcomes = commandCalls(harness, "send");
+	assert.equal(outcomes.length, 2);
+	assert.deepEqual(
+		outcomes.map((call) => call.args[1]),
+		["broken", "next"],
+	);
+	assert.equal(outcomes[1].input, "next reply");
+	await harness.emit("session_shutdown");
+	assert.deepEqual(harness.clock.delays(), []);
+}
+
+async function testListenerRestartExhaustion() {
+	const harness = createHarness({ restartDelaysMs: [5, 10] });
+	await harness.emit("session_start");
+	const first = harness.children[0];
+	first.emit("close", 7);
+	assert.deepEqual(harness.clock.delays(), [5]);
+
+	await harness.clock.runNext(5);
+	const second = harness.children[1];
+	second.emit("error", new Error("listener crashed"));
+	second.emit("close", 8);
+	assert.deepEqual(harness.clock.delays(), [10], "error plus close schedules one restart");
+
+	await harness.clock.runNext(10);
+	const third = harness.children[2];
+	third.emit("close", 9);
+	await flush();
+
+	assert.equal(harness.children.length, 3);
+	assert.equal(harness.shutdowns, 1);
+	assert.ok(
+		harness.errors.some(({ message }) => message.includes("listener restart budget exhausted")),
+	);
+	assert.ok(
+		harness.notifications.some(({ message, type }) =>
+			type === "error" && message.includes("listener restart budget exhausted"),
+		),
+	);
+	assert.equal(harness.calls.filter((call) => call.args[3] === "session-end").length, 1);
+	assert.deepEqual(harness.clock.delays(), []);
+
+	await harness.emit("session_shutdown");
+	assert.equal(
+		harness.calls.filter((call) => call.args[3] === "session-end").length,
+		1,
+		"fatal shutdown and lifecycle shutdown share one teardown",
+	);
+}
+
+async function testShutdownReapsAndFailsQueuedCustody() {
+	const harness = createHarness();
+	await harness.emit("session_start");
+	const listener = harness.children[0];
+	listener.stdout.emit(
+		"data",
+		'<EVENT type="msg" from="first">one</EVENT><EVENT type="msg" from="queued">two</EVENT>',
+	);
+	await flush();
+	await harness.emit("agent_start");
+	await harness.emit("agent_end", {
+		messages: [
+			{ role: "user", content: '<msg from="first"/>' },
+			{ role: "assistant", content: "done" },
+		],
+	});
+	assert.deepEqual(harness.clock.delays(), [0]);
+
+	await harness.emit("session_shutdown");
+	assert.equal(listener.kills, 1);
+	assert.deepEqual(harness.clock.delays(), []);
+	assert.deepEqual(
+		commandCalls(harness, "send").map((call) => call.args[1]),
+		["first", "queued"],
+	);
+	assert.match(commandCalls(harness, "send")[1].input, /OMP session shut down/);
+	assert.equal(harness.calls.filter((call) => call.args[3] === "session-end").length, 1);
+	assert.deepEqual(harness.statuses.at(-1), { key: "omp-spt", text: undefined });
+	assert.equal(harness.shutdowns, 0, "normal lifecycle shutdown must not recursively shut down OMP");
+}
+
+await testParsingAndReplies();
+await testLifecycleCustodyAndContext();
+await testSubmissionFailureAdvancesQueue();
+await testListenerRestartExhaustion();
+await testShutdownReapsAndFailsQueuedCustody();
 
 console.log("OMP-EXTENSION OK");