@morlay/ui-conversation-message-actions 0.0.19-alpha.5 → 0.0.19-alpha.6

package/dist/testing.mjs

@@ -10,6 +10,7 @@ import SessionProjectionRegistry from "@deepseek-ai/dsh-session-projection";
 import { SessionAlreadyExistsError, SessionAlreadyOwnedError, SessionHandleClosedError, SessionPersistence, SessionPersistenceNotFoundError, SessionPersistenceRevision, SessionReadOnlyError, assertContiguous, assertVersion, materializeAppendBatch, materializeCreateHeader, validateStoredEvents } from "@deepseek-ai/dsh-session-persistence";
 import { dirname, isAbsolute, join, resolve } from "node:path";
 import { AssistantStreamAccumulator, HarnessError, MessageId, freezeMessage, isAgentLoopRequest } from "@deepseek-ai/dsh-llm";
+import { isDeepStrictEqual } from "node:util";
 import { mkdir, open, readdir, stat } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
 import { DatabaseSync } from "node:sqlite";
@@ -63,7 +64,7 @@ function isNullable(value) {
 	return value === null || value === void 0;
 }
 /** Return true for non-array object values. */
-function isPlainObject$2(data) {
+function isPlainObject$1(data) {
 	return data && typeof data === "object" && !Array.isArray(data);
 }
 /** Filter object entries and return a new object. */
@@ -81,6 +82,43 @@ function pick$1(source, keys, forced) {
 	for (const key of keys) if (forced || source[key] !== void 0) result[key] = source[key];
 	return result;
 }
+/** Shared config references used by schema validators and plugin runtimes. */
+const write = Symbol.for("cosmokit.volatile.write");
+function snapshot(value, ancestors = /* @__PURE__ */ new Set()) {
+	if (typeof value === "function") throw new TypeError("volatile config cannot contain functions");
+	if (value === null || typeof value !== "object") return value;
+	if (ancestors.has(value)) throw new TypeError("volatile config cannot contain cycles");
+	ancestors.add(value);
+	try {
+		if (Array.isArray(value)) return Object.freeze(value.map((item) => snapshot(item, ancestors)));
+		if (Object.getPrototypeOf(value) !== Object.prototype && Object.getPrototypeOf(value) !== null) throw new TypeError("volatile config objects must be plain objects or arrays");
+		return Object.freeze(Object.fromEntries(Object.entries(value).map(([key, item]) => [key, snapshot(item, ancestors)])));
+	} finally {
+		ancestors.delete(value);
+	}
+}
+/**
+* Create a detached reference containing an immutable copy of the supplied data.
+* @param value - validated config data; class instances and functions are unsupported.
+* @returns a reference whose value is updated only by its owning runtime.
+*/
+function createVolatile(value) {
+	let current = snapshot(value);
+	return Object.freeze({
+		get: () => current,
+		[write]: (value) => {
+			current = value;
+		}
+	});
+}
+/**
+* Identify references across ESM/CJS copies of the shared library.
+* @param value - a parsed config value.
+* @returns whether the value implements the shared reference protocol.
+*/
+function isVolatile(value) {
+	return typeof value === "object" && value !== null && write in value;
+}
 /** Test values using `instanceof` with a `toStringTag` fallback. */
 function is$1(type, value) {
 	if (arguments.length === 1) return (value) => is$1(type, value);
@@ -161,26 +199,47 @@ function clone$1(source, refs = /* @__PURE__ */ new Map()) {
 	}
 	return result;
 }
-/** Deeply compare arrays, dates, regexps, buffers, and plain object fields. */
+/**
+* Compare values recursively, treating two volatile references as equal regardless of value.
+* Strict comparison distinguishes null/undefined, treats opaque objects by identity,
+* compares URLs by normalized href, treats array holes as undefined, and considers distinct cyclic structures unequal.
+* @param a - first value.
+* @param b - second value.
+* @param strict - whether to require strict data equality outside volatile references.
+* @returns whether the values compare equal.
+*/
 function deepEqual(a, b, strict) {
-	if (a === b) return true;
-	if (!strict && isNullable(a) && isNullable(b)) return true;
-	if (typeof a !== typeof b) return false;
-	if (typeof a !== "object") return false;
-	if (!a || !b) return false;
-	function check(test, then) {
-		return test(a) ? test(b) ? then(a, b) : false : test(b) ? false : void 0;
-	}
-	return check(Array.isArray, (a, b) => a.length === b.length && a.every((item, index) => deepEqual(item, b[index]))) ?? check(is$1("Date"), (a, b) => a.valueOf() === b.valueOf()) ?? check(is$1("RegExp"), (a, b) => a.source === b.source && a.flags === b.flags) ?? check(isArrayBufferLike, (a, b) => {
-		if (a.byteLength !== b.byteLength) return false;
-		const viewA = new Uint8Array(a);
-		const viewB = new Uint8Array(b);
-		for (let i = 0; i < viewA.length; i++) if (viewA[i] !== viewB[i]) return false;
-		return true;
-	}) ?? Object.keys({
-		...a,
-		...b
-	}).every((key) => deepEqual(a[key], b[key], strict));
+	const ancestors = /* @__PURE__ */ new Set();
+	function compare(a, b) {
+		if (a === b) return true;
+		if (isVolatile(a) || isVolatile(b)) return isVolatile(a) && isVolatile(b);
+		if (!strict && isNullable(a) && isNullable(b)) return true;
+		if (typeof a !== typeof b || typeof a !== "object" || !a || !b) return false;
+		if (ancestors.has(a)) return false;
+		function check(test, then) {
+			return test(a) ? test(b) ? then(a, b) : false : test(b) ? false : void 0;
+		}
+		ancestors.add(a);
+		try {
+			return check(Array.isArray, (a, b) => {
+				if (a.length !== b.length) return false;
+				for (let index = 0; index < a.length; index++) if (!compare(a[index], b[index])) return false;
+				return true;
+			}) ?? check(is$1("Date"), (a, b) => a.valueOf() === b.valueOf()) ?? check(is$1("URL"), (a, b) => a.href === b.href) ?? check(is$1("RegExp"), (a, b) => a.source === b.source && a.flags === b.flags) ?? check(isArrayBufferLike, (a, b) => {
+				if (a.byteLength !== b.byteLength) return false;
+				const viewA = new Uint8Array(a);
+				const viewB = new Uint8Array(b);
+				for (let i = 0; i < viewA.length; i++) if (viewA[i] !== viewB[i]) return false;
+				return true;
+			}) ?? ((!strict || [a, b].every((value) => Object.getPrototypeOf(value) === Object.prototype || Object.getPrototypeOf(value) === null)) && Object.keys({
+				...a,
+				...b
+			}).every((key) => compare(a[key], b[key])));
+		} finally {
+			ancestors.delete(a);
+		}
+	}
+	return compare(a, b);
 }
 /** Time constants plus parsing and formatting helpers. */
 var Time;
@@ -429,6 +488,7 @@ Schema.prototype.pattern = function pattern(regexp) {
 	return schema;
 };
 Schema.prototype.simplify = function simplify(value) {
+	if (isVolatile(value)) value = value.get();
 	if (deepEqual(value, this.meta.default, this.type === "dict")) return null;
 	if (isNullable(value)) return value;
 	if (this.type === "object" || this.type === "dict") {
@@ -485,12 +545,49 @@ for (const key of [
 	};
 	return schema;
 } });
+Schema.prototype.volatile = function volatile() {
+	if (this.meta.volatile) throw new TypeError("volatile schema is already wrapped");
+	return this.extra("volatile", true);
+};
 const resolvers = {};
+const checkedVolatile = Symbol("checked-volatile-schema");
+function validateVolatileSchema(schema, path = [], blocked = false, seen = /* @__PURE__ */ new Map()) {
+	const states = seen.get(schema) ?? /* @__PURE__ */ new Set();
+	if (states.has(blocked)) return;
+	states.add(blocked);
+	seen.set(schema, states);
+	if (schema.meta?.volatile && blocked) throw new ValidationError("volatile fields require a fixed object path without an enclosing volatile field", { path });
+	const nested = blocked || !!schema.meta?.volatile;
+	if (schema.dict) for (const [key, child] of Object.entries(schema.dict)) validateVolatileSchema(child, [...path, key], nested, seen);
+	if (schema.sKey) validateVolatileSchema(schema.sKey, [...path, "<key>"], true, seen);
+	if (schema.inner && (schema.type !== "lazy" || schema.inner[kSchema])) validateVolatileSchema(schema.inner, [...path, "*"], true, seen);
+	if (schema.list) for (let index = 0; index < schema.list.length; index++) validateVolatileSchema(schema.list[index], [...path, String(index)], true, seen);
+}
 Schema.extend = function extend(type, resolve) {
 	resolvers[type] = resolve;
 };
 Schema.resolve = function resolve(data, schema, options = {}, strict = false) {
 	if (!schema) return [data];
+	if (!options[checkedVolatile]) {
+		validateVolatileSchema(schema, options.path);
+		options = {
+			...options,
+			[checkedVolatile]: true
+		};
+	}
+	if (schema.meta?.volatile) {
+		const inner = Schema(schema);
+		inner.meta = {
+			...schema.meta,
+			volatile: false
+		};
+		const [value, adapted] = Schema.resolve(data, inner, options, strict);
+		try {
+			return [createVolatile(value), adapted];
+		} catch (error) {
+			throw new ValidationError(error instanceof Error ? error.message : String(error), options);
+		}
+	}
 	if (options.ignore?.(data, schema)) return [data];
 	if (isNullable(data) && schema.type !== "lazy") {
 		if (schema.meta.required) throw new ValidationError(`missing required value`, options);
@@ -593,6 +690,7 @@ Schema.extend("lazy", (data, schema, options, strict) => {
 			...schema.meta,
 			...schema.inner.meta
 		};
+		validateVolatileSchema(schema.inner, options.path, true);
 	}
 	return Schema.resolve(data, schema.inner, options, strict);
 });
@@ -692,7 +790,7 @@ function property(data, key, schema, options) {
 	} catch (e) {
 		if (!options?.autofix) throw e;
 		delete data[key];
-		return schema.meta.default;
+		return schema.meta.volatile ? createVolatile(schema.meta.default) : schema.meta.default;
 	}
 }
 Schema.extend("array", (data, { inner, meta }, options) => {
@@ -701,7 +799,7 @@ Schema.extend("array", (data, { inner, meta }, options) => {
 	return [data.map((_, index) => property(data, index, inner, options))];
 });
 Schema.extend("dict", (data, { inner, sKey }, options, strict) => {
-	if (!isPlainObject$2(data)) throw new ValidationError(`expected object but got ${data}`, options);
+	if (!isPlainObject$1(data)) throw new ValidationError(`expected object but got ${data}`, options);
 	const result = {};
 	for (const key in data) {
 		let rKey;
@@ -731,7 +829,7 @@ function merge$1(result, data) {
 	}
 }
 Schema.extend("object", (data, { dict }, options, strict) => {
-	if (!isPlainObject$2(data)) throw new ValidationError(`expected object but got ${data}`, options);
+	if (!isPlainObject$1(data)) throw new ValidationError(`expected object but got ${data}`, options);
 	const result = {};
 	for (const key in dict) {
 		const value = property(data, key, dict[key], options);
@@ -760,7 +858,7 @@ Schema.extend("intersect", (data, { list, toString }, options, strict) => {
 		else if (typeof value === "object") merge$1(result ??= {}, value);
 		else if (result !== value) throw new ValidationError(`expected ${toString()} but got ${JSON.stringify(data)}`, options);
 	}
-	if (!strict && isPlainObject$2(data)) merge$1(result, data);
+	if (!strict && isPlainObject$1(data)) merge$1(result, data);
 	return [result];
 });
 Schema.extend("transform", (data, { inner, callback, preserve }, options) => {
@@ -9082,7 +9180,7 @@ var PgText = class extends PgColumn {
 		return "text";
 	}
 };
-function text$2(a, b = {}) {
+function text$3(a, b = {}) {
 	const { name, config } = getColumnNameAndConfig(a, b);
 	return new PgTextBuilder(name, config);
 }
@@ -9390,7 +9488,7 @@ function getPgColumnBuilders() {
 		serial,
 		smallint,
 		smallserial,
-		text: text$2,
+		text: text$3,
 		time: time$1,
 		timestamp,
 		uuid: uuid$1,
@@ -14558,6 +14656,10 @@ var WriteGuard = class {
 	confirmHead(id, head) {
 		this.headSeqs.set(id, head);
 	}
+	/** 本实例有没有这条会话的 head 记录（迁移重写用它决定是"登记基准"还是"严格比较"）。 */
+	has(id) {
+		return this.headSeqs.has(id);
+	}
 	assertNoConcurrentWriter(id, storedHead) {
 		const known = this.headSeqs.get(id);
 		if (known === void 0) {
@@ -14594,12 +14696,6 @@ function offloadMessageImages(message, indexes) {
 					selected += 1;
 				}
 				imageIndex += 1;
-			} else if (block.type === "tool-result") {
-				const content = visit(block.content);
-				if (content !== block.content) projected = {
-					...block,
-					content
-				};
 			}
 			if (projected !== block) next ??= blocks.slice(0, index);
 			next?.push(projected);
@@ -14617,7 +14713,7 @@ function offloadMessageImages(message, indexes) {
 //#region ../../../vendor/deepseek-harness/packages/compaction/compaction-image-offload/lib/types/projection.js
 /** Browser-safe durable image selection declaration and pure replay definition. */
 /** Whether a durable value is a JSON object. */
-function isRecord$1(value) {
+function isRecord(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 /** Whether a durable occurrence index or sequence is canonical. */
@@ -14629,11 +14725,11 @@ const imageOffloadProjection = {
 	type: "image/offload",
 	project(event, context) {
 		const data = event.data;
-		if (!isRecord$1(data) || Object.keys(data).length !== 1 || !Array.isArray(data["targets"]) || data["targets"].length === 0) throw new Error("image/offload: data must contain a nonempty targets array");
+		if (!isRecord(data) || Object.keys(data).length !== 1 || !Array.isArray(data["targets"]) || data["targets"].length === 0) throw new Error("image/offload: data must contain a nonempty targets array");
 		const messages = /* @__PURE__ */ new Map();
 		const nodes = new Set(context.nodes);
 		for (const target of data["targets"]) {
-			if (!isRecord$1(target) || Object.keys(target).length !== 2 || !isIndex(target["seq"]) || !Array.isArray(target["imageIndexes"]) || target["imageIndexes"].length === 0) throw new Error("image/offload: each target must contain a seq and nonempty imageIndexes");
+			if (!isRecord(target) || Object.keys(target).length !== 2 || !isIndex(target["seq"]) || !Array.isArray(target["imageIndexes"]) || target["imageIndexes"].length === 0) throw new Error("image/offload: each target must contain a seq and nonempty imageIndexes");
 			const seq = target["seq"];
 			if (messages.has(seq)) throw new Error(`image/offload: duplicate target seq ${seq}`);
 			if (!nodes.has(seq)) throw new Error(`image/offload: target seq ${seq} is not a current surface node`);
@@ -16828,7 +16924,7 @@ function legacyMessageId(sessionId, seq) {
 function malformedLegacy(sessionId, type, seq) {
 	return new SessionFormatError(`session ${JSON.stringify(sessionId)} contains malformed pre-react-loop ${type} at seq ${seq}`);
 }
-const SURFACE_TYPES$2 = /* @__PURE__ */ new Set([
+const SURFACE_TYPES$3 = /* @__PURE__ */ new Set([
 	"user/message",
 	"assistant/message",
 	"tool/result"
@@ -16857,7 +16953,7 @@ function assertReleasedArtifactRelationships(artifact, extensions = {}) {
 		const extensionStepEvent = extensions.stepEvents?.has(event.type) === true;
 		if (RELEASED_V0_EVENT_DISPOSITIONS[event.type] === void 0 && !extensionStepEvent) continue;
 		const data = releasedV0Record(event.data, `${event.type} ${event.seq} data`);
-		if (SURFACE_TYPES$2.has(event.type)) surface = applySurface(surface, event);
+		if (SURFACE_TYPES$3.has(event.type)) surface = applySurface(surface, event);
 		if ((event.type === "turn/start" || event.type === "turn/end") && openCompaction !== void 0 && !staleCompactionStarts.has(openCompaction.startSeq)) throw new SessionFormatError(`${event.type} crosses an open compaction`);
 		if (extensionStepEvent) {
 			requireOpenStep(event, data, openTurn, openStep);
@@ -17190,7 +17286,7 @@ const EVENT_REQUIRED$1 = [
 	"time",
 	"data"
 ];
-const SURFACE_TYPES$1 = /* @__PURE__ */ new Set([
+const SURFACE_TYPES$2 = /* @__PURE__ */ new Set([
 	"user/message",
 	"assistant/message",
 	"tool/result"
@@ -17236,7 +17332,7 @@ function validateReleasedV2Artifact(artifact, mode, knownEventTypes, relationshi
 		const installed = knownEventTypes?.has(type) === true;
 		const ignorableUnknown = disposition === void 0 && record["ignorable"] === true;
 		if (mode === "current" && disposition === void 0 && !installed && !ignorableUnknown) throw new SessionFormatUnsupportedMigrationError(`format v2 contains unknown event type ${JSON.stringify(type)} at seq ${index}`);
-		const surface = disposition !== void 0 && SURFACE_TYPES$1.has(type);
+		const surface = disposition !== void 0 && SURFACE_TYPES$2.has(type);
 		assertReleasedV2Keys(record, EVENT_REQUIRED$1, mode === "physical" || disposition === void 0 ? SURFACE_OPTIONAL : surface ? SURFACE_OPTIONAL : LOG_OPTIONAL, `format v2 event ${index}`);
 		if (record["seq"] !== index) throw new SessionFormatError(`format v2 event ${index} is not dense`);
 		sessionFormatSafeInteger(record["time"], `format v2 event ${index} time`);
@@ -17559,7 +17655,7 @@ function transformReleasedEvent(state, event, context) {
 	if (event.type === "assistant/chunk") assertChunkEnvelope(event);
 	if (RELEASED_V0_EVENT_DISPOSITIONS[event.type] === void 0) throw refusal(`format v1 contains unknown event type ${JSON.stringify(event.type)} at seq ${event.seq}`);
 	const interrupted = legacyInterruptedTurn(state.legacyTurns, event);
-	if (event.type === "turn/start" && state.legacyTurns.openTurn !== null && interrupted === void 0) throw refusal(`turn/start ${JSON.stringify(record$1(event.data)["turn"])} does not close the prior turn`);
+	if (event.type === "turn/start" && state.legacyTurns.openTurn !== null && interrupted === void 0) throw refusal(`turn/start ${JSON.stringify(record$3(event.data)["turn"])} does not close the prior turn`);
 	assertSourceDeliveryMarker(state, event);
 	observeLegacyTurn(state.legacyTurns, event);
 	state.lastTime = event.time;
@@ -17601,7 +17697,7 @@ function assertChunkEnvelope(event) {
 }
 function assertSourceDeliveryMarker(state, event) {
 	if (event.type !== "session-log-deepseek/delivery-accepted") return;
-	const data = record$1(event.data);
+	const data = record$3(event.data);
 	const inherited = state.sourceHeader.parentSession !== void 0 && event.seq < state.sourceCut;
 	if (data["sessionFormatVersion"] === 1 && !inherited && data["sessionId"] !== state.sourceHeader.id) throw refusal("current-generation delivery marker names the wrong Session");
 }
@@ -17638,10 +17734,10 @@ function finishMigration(state, context) {
 	return state.targetCut;
 }
 function transformChunk(state, event, context) {
-	const data = record$1(event.data);
+	const data = record$3(event.data);
 	const turn = coordinate(data["turn"]);
 	const step = coordinate(data["step"]);
-	const chunk = record$1(data["chunk"]);
+	const chunk = record$3(data["chunk"]);
 	if (state.pending !== void 0 && (state.pending.group.terminal || state.pending.group.turn !== turn || state.pending.group.step !== step)) finishAttempt(state, context);
 	else if (state.pending !== void 0) flushBuffered(state, state.pending, context);
 	state.pending ??= {
@@ -17658,7 +17754,7 @@ function transformChunk(state, event, context) {
 	if (chunk["type"] === "finish") state.pending.group.terminal = true;
 }
 function transformMessage(state, event, context) {
-	const data = record$1(event.data);
+	const data = record$3(event.data);
 	const turn = coordinate(data["turn"]);
 	const step = coordinate(data["step"]);
 	const sources = event.sourceEventSeqs;
@@ -17738,8 +17834,8 @@ function legacyTurnState() {
 	};
 }
 function legacyInterruptedTurn(state, event) {
-	if (event.type !== "turn/start" || state.openTurn === null || state.openStep !== null || coordinate(record$1(event.data)["turn"]) !== state.openTurn + 1 || state.previous?.type !== "agent/inbox/spliced") return void 0;
-	const splice = record$1(state.previous.data);
+	if (event.type !== "turn/start" || state.openTurn === null || state.openStep !== null || coordinate(record$3(event.data)["turn"]) !== state.openTurn + 1 || state.previous?.type !== "agent/inbox/spliced") return void 0;
+	const splice = record$3(state.previous.data);
 	if (splice["target"] !== "next-turn" || !Array.isArray(splice["inserted"]) || splice["inserted"].length === 0) return;
 	return {
 		type: "turn/end",
@@ -17752,7 +17848,7 @@ function legacyInterruptedTurn(state, event) {
 	};
 }
 function observeLegacyTurn(state, event) {
-	const data = record$1(event.data);
+	const data = record$3(event.data);
 	if (event.type === "turn/start") {
 		state.openTurn = coordinate(data["turn"]);
 		state.openStep = null;
@@ -17765,8 +17861,8 @@ function observeLegacyTurn(state, event) {
 }
 function splitLegacyGoalChange(event) {
 	if (event.type !== "user/message") return void 0;
-	const data = record$1(event.data);
-	const source = record$1(data["source"]);
+	const data = record$3(event.data);
+	const source = record$3(data["source"]);
 	if (source["kind"] !== "goal" || source["change"] === void 0) return void 0;
 	return {
 		change: {
@@ -17885,7 +17981,7 @@ function streamOf(group) {
 	return group.stream.map(({ record }) => record);
 }
 function messageEvent(source, group) {
-	const data = record$1(source.data);
+	const data = record$3(source.data);
 	const { sourceEventSeqs: _sourceEventSeqs, ...event } = source;
 	return {
 		...event,
@@ -17912,7 +18008,7 @@ function remapReferences(source, targetSeq, mapping) {
 	const sources = sourceEventSeqs === void 0 ? {} : { sourceEventSeqs: mapList(numberArray(sourceEventSeqs), mapping, `${source.type} ${source.seq} sources`) };
 	let operation = surfaceOp;
 	if (surfaceOp !== void 0 && surfaceOp !== "append") {
-		const replacement = record$1(surfaceOp);
+		const replacement = record$3(surfaceOp);
 		operation = {
 			op: "replace",
 			start: mapOne(coordinate(replacement["start"]), mapping, `${source.type} ${source.seq} surface start`),
@@ -17928,7 +18024,7 @@ function remapReferences(source, targetSeq, mapping) {
 	};
 }
 function remapPayloadReferences(event, mapping) {
-	const data = record$1(event.data);
+	const data = record$3(event.data);
 	switch (event.type) {
 		case "command/done": return data["sourceEventSeq"] === void 0 ? data : {
 			...data,
@@ -17936,7 +18032,7 @@ function remapPayloadReferences(event, mapping) {
 		};
 		case "compaction/prune":
 		case "compaction/summary": {
-			const range = record$1(data["shadowedRange"]);
+			const range = record$3(data["shadowedRange"]);
 			return {
 				...data,
 				shadowedRange: {
@@ -17962,7 +18058,7 @@ function mapOne(value, mapping, label) {
 	if (mapped === void 0) throw refusal(`${label} targets consumed assistant/chunk ${value}`);
 	return mapped;
 }
-function record$1(value) {
+function record$3(value) {
 	return value;
 }
 function numberArray(value) {
@@ -17978,7 +18074,7 @@ function refusal(message) {
 //#region ../../../vendor/deepseek-harness/packages/session/session-format-v2-to-v3/lib/index.js
 /** Audited V2 migration admission and V3 payload validation, independent of installed core Session types. */
 /** Audited surface event names; all other admitted events are log-only. */
-const SURFACE_TYPES = /* @__PURE__ */ new Set([
+const SURFACE_TYPES$1 = /* @__PURE__ */ new Set([
 	"system/message",
 	"user/message",
 	"assistant/message",
@@ -18007,7 +18103,7 @@ const SOURCE_KINDS = /* @__PURE__ */ new Set([
 * @param label - diagnostic subject.
 * @returns the narrowed object.
 */
-function record(value, label) {
+function record$2(value, label) {
 	if (!isSessionFormatJsonObject(value)) throw new SessionFormatError(label + " must be an object");
 	return value;
 }
@@ -18037,7 +18133,7 @@ function assertEvent(event, version) {
 	const disposition = RELEASED_V2_EVENT_DISPOSITIONS[event.type];
 	const feedback = event.type === "feedback/message-put" || event.type === "feedback/message-delete";
 	if (disposition === void 0 && !feedback) throw new SessionFormatUnsupportedMigrationError("format v2 to v3 cannot safely transform unclassified event " + event.type);
-	const surface = SURFACE_TYPES.has(event.type);
+	const surface = SURFACE_TYPES$1.has(event.type);
 	keys(event, [
 		"type",
 		"seq",
@@ -18055,7 +18151,7 @@ function assertEvent(event, version) {
 		assertReleasedSurfaceMetadata(event, event.seq, event.type, "forbid-assistant");
 		if (event["surfaceOp"] === void 0) throw new SessionFormatError(event.type + " requires surfaceOp");
 	}
-	const data = record(event.data, event.type + " data");
+	const data = record$2(event.data, event.type + " data");
 	if (feedback) {
 		assertFeedback(event.type, data);
 		return;
@@ -18069,10 +18165,10 @@ function assertEvent(event, version) {
 	}
 	if (event.type === "session/end-seed" && data["inherited"] !== void 0 && data["inherited"] !== true) throw new SessionFormatError("session/end-seed inherited must be true");
 	if (event.type === "user/message") assertSource(data);
-	if (event.type === "assistant/message" || event.type === "tool/result") assertSource(record(data["message"], "message"));
+	if (event.type === "assistant/message" || event.type === "tool/result") assertSource(record$2(data["message"], "message"));
 	if (event.type === "tool/result" && isSessionFormatJsonObject(data["error"]) && data["error"]["code"] === "TOOL_NOT_STARTED") {
-		const message = record(data["message"], "tool result message");
-		const source = record(message["source"], "tool result source");
+		const message = record$2(data["message"], "tool result message");
+		const source = record$2(message["source"], "tool result source");
 		if (!isRepairIdentity(message["id"], source["callId"])) throw new SessionFormatError("TOOL_NOT_STARTED repair requires its canonical historical message id");
 	}
 	if (event.type === "agent/inbox/spliced" || event.type === "session/title-llm-request") {
@@ -18094,7 +18190,7 @@ function isRepairIdentity(id, callId) {
 	return /^(0|[1-9]\d*)$/.test(suffix) && Number.isSafeInteger(Number(suffix));
 }
 function assertSource(message) {
-	const source = record(message["source"], "message source");
+	const source = record$2(message["source"], "message source");
 	if (typeof source["kind"] !== "string" || !SOURCE_KINDS.has(source["kind"])) throw new SessionFormatUnsupportedMigrationError("cannot safely transform unclassified message source");
 	if (source["kind"] === "agent-message") {
 		keys(source, [
@@ -18127,14 +18223,14 @@ function assertOwnedContent(event, data) {
 		case "assistant/message":
 		case "tool/result":
 		case "team/message/queued":
-			assertContentKinds(record(data["message"], label + ".message")["content"], label + ".message.content");
+			assertContentKinds(record$2(data["message"], label + ".message")["content"], label + ".message.content");
 			break;
 		case "agent/inbox/spliced":
 		case "session/title-llm-request": {
 			const field = event.type === "agent/inbox/spliced" ? "inserted" : "messages";
 			for (const [index, value] of contentArray(data[field], label + "." + field).entries()) {
 				const path = label + "." + field + "[" + String(index) + "]";
-				assertContentKinds(record(value, path)["content"], path + ".content");
+				assertContentKinds(record$2(value, path)["content"], path + ".content");
 			}
 			break;
 		}
@@ -18144,9 +18240,9 @@ function assertOwnedContent(event, data) {
 	}
 	if (event.type === "assistant/message" || event.type === "assistant/attempt") for (const [index, value] of contentArray(data["stream"], label + ".stream").entries()) {
 		const path = label + ".stream[" + String(index) + "]";
-		const entry = record(value, path);
+		const entry = record$2(value, path);
 		if (entry["type"] !== "chunk") continue;
-		const chunk = record(entry["chunk"], path + ".chunk");
+		const chunk = record$2(entry["chunk"], path + ".chunk");
 		if (chunk["type"] === "block-end") assertContentBlock(chunk["block"], path + ".chunk.block");
 		if (chunk["type"] === "block-start") assertContentKind(chunk["blockType"], path + ".chunk.blockType");
 	}
@@ -18158,7 +18254,7 @@ function assertContentKinds(content, label) {
 	for (const [index, value] of contentArray(content, label).entries()) assertContentBlock(value, label + "[" + String(index) + "]");
 }
 function assertContentBlock(value, label) {
-	const block = record(value, label);
+	const block = record$2(value, label);
 	assertContentKind(block["type"], label);
 	if (block["type"] === "tool-result") {
 		if (!Array.isArray(block["content"])) throw new SessionFormatError(label + ".content: invalid message content kind \"tool-result\": content must be an array");
@@ -18166,7 +18262,7 @@ function assertContentBlock(value, label) {
 	}
 	if (block["type"] === "file") {
 		keys(block, ["type", "attachment"], [], label + " kind \"file\"");
-		const attachment = record(block["attachment"], label + " kind \"file\" attachment");
+		const attachment = record$2(block["attachment"], label + " kind \"file\" attachment");
 		keys(attachment, [
 			"attachmentId",
 			"name",
@@ -18204,10 +18300,10 @@ function assertV3StructuralRow(value) {
 	if (typeof value !== "object" || value === null || Array.isArray(value)) return;
 	const row = value;
 	if (row["type"] === "request/header") {
-		const data = record(row["data"], "request/header data");
-		if (Object.hasOwn(record(data["header"], "request header"), "system")) throw new SessionFormatUnsupportedMigrationError("format v3 request/header rejects retired header.system");
+		const data = record$2(row["data"], "request/header data");
+		if (Object.hasOwn(record$2(data["header"], "request header"), "system")) throw new SessionFormatUnsupportedMigrationError("format v3 request/header rejects retired header.system");
 	} else if (row["type"] === "system/message") {
-		const data = record(row["data"], "system/message data");
+		const data = record$2(row["data"], "system/message data");
 		assertSystem({
 			type: "system/message",
 			seq: 0,
@@ -18223,7 +18319,7 @@ function assertSystem(event, data) {
 		"message"
 	], [], "system/message data");
 	for (const coordinate of ["turn", "step"]) if (sessionFormatCount(data[coordinate], coordinate) === 0) throw new SessionFormatError(coordinate + " must be positive");
-	const message = record(data["message"], "system message");
+	const message = record$2(data["message"], "system message");
 	keys(message, [
 		"id",
 		"role",
@@ -18231,7 +18327,7 @@ function assertSystem(event, data) {
 		"content"
 	], [], "system message");
 	if (typeof message["id"] !== "string" || message["id"].length === 0 || message["role"] !== "system") throw new SessionFormatError("system message requires an id and system role");
-	const source = record(message["source"], "system source");
+	const source = record$2(message["source"], "system source");
 	if (source["kind"] !== "plugin" || typeof source["plugin"] !== "string" || source["plugin"].length === 0) throw new SessionFormatError("system message requires plugin source");
 	assertReleasedPayloadSemantics({
 		...event,
@@ -18249,7 +18345,7 @@ function assertFeedback(type, data) {
 		if (typeof data["messageId"] !== "string") throw new SessionFormatError("feedback messageId must be a string");
 		return;
 	}
-	const item = record(data["item"], "feedback item");
+	const item = record$2(data["item"], "feedback item");
 	keys(item, [
 		"messageId",
 		"rating",
@@ -18270,15 +18366,15 @@ function assertFeedback(type, data) {
 * @param knownEventTypes - additional installed event types whose envelopes are interpreted.
 */
 function assertV3Event(event, knownEventTypes) {
-	const value = record(event, "format v3 event");
+	const value = record$2(event, "format v3 event");
 	const subject = `format v3 ${event.type} at seq ${event.seq}`;
-	const opaque = !(!(event.type === "tool/code-dispatch-start" || event.type === "tool/code-dispatch") && (SURFACE_TYPES.has(event.type) || RELEASED_V2_EVENT_DISPOSITIONS[event.type] !== void 0 || event.type === "tool/ptc-dispatch-start" || event.type === "tool/ptc-dispatch" || event.type === "feedback/message-put" || event.type === "feedback/message-delete" || knownEventTypes?.has(event.type) === true));
+	const opaque = !(!(event.type === "tool/code-dispatch-start" || event.type === "tool/code-dispatch") && (SURFACE_TYPES$1.has(event.type) || RELEASED_V2_EVENT_DISPOSITIONS[event.type] !== void 0 || event.type === "tool/ptc-dispatch-start" || event.type === "tool/ptc-dispatch" || event.type === "feedback/message-put" || event.type === "feedback/message-delete" || knownEventTypes?.has(event.type) === true));
 	keys(value, [
 		"type",
 		"seq",
 		"time",
 		"data"
-	], SURFACE_TYPES.has(event.type) || opaque ? [
+	], SURFACE_TYPES$1.has(event.type) || opaque ? [
 		"ignorable",
 		"surfaceOp",
 		"sourceEventSeqs"
@@ -18287,11 +18383,11 @@ function assertV3Event(event, knownEventTypes) {
 	sessionFormatCount(event.seq, `${subject} seq`);
 	sessionFormatSafeInteger(event.time, `${subject} time`);
 	if (Object.hasOwn(value, "ignorable") && value["ignorable"] !== true) throw new SessionFormatError(`${subject} ignorable must be true when present`);
-	if (SURFACE_TYPES.has(event.type)) {
+	if (SURFACE_TYPES$1.has(event.type)) {
 		const operation = value["surfaceOp"];
 		if (operation === void 0) throw new SessionFormatError(`${subject} requires a surfaceOp marker`);
 		if (operation !== "append") {
-			const replace = record(operation, `${subject} surfaceOp`);
+			const replace = record$2(operation, `${subject} surfaceOp`);
 			if (Object.keys(replace).length !== 3 || replace["op"] !== "replace" || !Object.hasOwn(replace, "startSeq") || !Object.hasOwn(replace, "endSeq")) throw new SessionFormatError(`${subject} requires exact replace fields op/startSeq/endSeq`);
 			for (const key of ["startSeq", "endSeq"]) if (sessionFormatCount(replace[key], `${subject} surfaceOp ${key}`) >= event.seq) throw new SessionFormatError(`${subject} replacement endpoints must reference earlier events`);
 		}
@@ -18313,13 +18409,13 @@ function assertV3Event(event, knownEventTypes) {
 function assertCanonicalPayload(event) {
 	const subject = `format v3 ${event.type} at seq ${event.seq}`;
 	if (event.type === "request/header") {
-		const header = record(record(event.data, `${subject} data`)["header"], `${subject} header`);
+		const header = record$2(record$2(event.data, `${subject} data`)["header"], `${subject} header`);
 		if (Array.isArray(header["tools"]) && header["tools"].length === 0 || isSessionFormatJsonObject(header["adapterDefaults"]) && Object.keys(header["adapterDefaults"]).length === 0) throw new SessionFormatError(`${subject} empty optional header fields must be omitted`);
 	}
 	if (event.type !== "tool/result") return;
-	const data = record(event.data, `${subject} data`);
+	const data = record$2(event.data, `${subject} data`);
 	if (data["error"] === void 0) return;
-	const content = record(data["message"], `${subject} message`)["content"];
+	const content = record$2(data["message"], `${subject} message`)["content"];
 	if (!Array.isArray(content) || content.length !== 1 || !isSessionFormatJsonObject(content[0]) || content[0]["type"] !== "tool-result" || content[0]["isError"] !== true) throw new SessionFormatError(`${subject} carries error metadata for a non-error tool result`);
 }
 /**
@@ -18331,7 +18427,7 @@ function canonicalizeTransformedEvent(event) {
 	let target = event;
 	const operation = event["surfaceOp"];
 	if (operation !== void 0 && operation !== "append") {
-		const replace = record(operation, `format v2 ${event.type} at seq ${event.seq} surfaceOp`);
+		const replace = record$2(operation, `format v2 ${event.type} at seq ${event.seq} surfaceOp`);
 		if (Object.keys(replace).length !== 3 || replace["op"] !== "replace" || !Object.hasOwn(replace, "start") || !Object.hasOwn(replace, "end")) throw new SessionFormatError(`format v2 ${event.type} at seq ${event.seq} requires exact replace fields op/start/end`);
 		target = {
 			...event,
@@ -18343,8 +18439,8 @@ function canonicalizeTransformedEvent(event) {
 		};
 	}
 	if (event.type === "request/header") {
-		const data = record(event.data, `format v2 request/header at seq ${event.seq} data`);
-		const header = record(data["header"], `format v2 request/header at seq ${event.seq} header`);
+		const data = record$2(event.data, `format v2 request/header at seq ${event.seq} data`);
+		const header = record$2(data["header"], `format v2 request/header at seq ${event.seq} header`);
 		const empty = Object.keys(header).filter((key) => key === "tools" && Array.isArray(header[key]) && header[key].length === 0 || key === "adapterDefaults" && isSessionFormatJsonObject(header[key]) && Object.keys(header[key]).length === 0);
 		if (empty.length > 0) {
 			const canonical = Object.fromEntries(Object.entries(header).filter(([key]) => !empty.includes(key)));
@@ -18389,37 +18485,37 @@ function restoreReleasedV3Artifact(artifact, knownEventTypes) {
 		assertV3Event(event, knownEventTypes);
 		const system = event.type === "system/message";
 		if (event.type === "step/start") {
-			const data = record(event.data, event.type);
+			const data = record$2(event.data, event.type);
 			step = {
 				turn: data["turn"],
 				step: data["step"]
 			};
 		} else if (event.type === "step/end" || event.type === "turn/end") step = void 0;
 		if (system) {
-			const data = record(event.data, "system/message");
+			const data = record$2(event.data, "system/message");
 			if (step === void 0 || step.turn !== data["turn"] || step.step !== data["step"]) throw new SessionFormatError("system/message does not match an open step");
 			const operation = event["surfaceOp"];
 			if (hasSurface && head === void 0) throw new SessionFormatError("system/message requires a protected first surface head");
 			if (operation === "append") {
 				if (!hasSurface) head = event.seq;
 			} else {
-				const replace = record(operation, "system replacement");
+				const replace = record$2(operation, "system replacement");
 				if (replace["startSeq"] === head || replace["endSeq"] === head) {
 					if (replace["startSeq"] !== head || replace["endSeq"] !== head) throw new SessionFormatError("system/message must replace exactly the current system head");
 					head = event.seq;
 				}
 			}
-		} else if (SURFACE_TYPES.has(event.type) && event["surfaceOp"] !== "append") {
-			const replace = record(event["surfaceOp"], "surface replacement");
+		} else if (SURFACE_TYPES$1.has(event.type) && event["surfaceOp"] !== "append") {
+			const replace = record$2(event["surfaceOp"], "surface replacement");
 			if (replace["startSeq"] === head || replace["endSeq"] === head) throw new SessionFormatError("surface replacement cannot shadow the protected system head");
 		}
 		if (event.type === "compaction/prune" || event.type === "compaction/summary") {
-			const seqs = record(event.data, event.type)["shadowedSeqs"];
+			const seqs = record$2(event.data, event.type)["shadowedSeqs"];
 			if (Array.isArray(seqs) && seqs.some((seq) => seq === head)) throw new SessionFormatError("compaction cannot shadow the protected system head");
 		}
-		if (SURFACE_TYPES.has(event.type)) hasSurface = true;
+		if (SURFACE_TYPES$1.has(event.type)) hasSurface = true;
 		const projected = relationshipEvent(event);
-		if (!SURFACE_TYPES.has(event.type) || event["surfaceOp"] === "append") return projected;
+		if (!SURFACE_TYPES$1.has(event.type) || event["surfaceOp"] === "append") return projected;
 		const replacement = event["surfaceOp"];
 		return {
 			...projected,
@@ -18466,7 +18562,7 @@ function relationshipEvent(event) {
 			};
 	}
 	if (event.type === "system/message") {
-		const message = record(record(event.data, "system data")["message"], "system message");
+		const message = record$2(record$2(event.data, "system data")["message"], "system message");
 		return {
 			...event,
 			type: "user/message",
@@ -18477,11 +18573,11 @@ function relationshipEvent(event) {
 		};
 	}
 	if (event.type !== "tool/result") return event;
-	const data = record(event.data, "tool result");
+	const data = record$2(event.data, "tool result");
 	if (data["error"] === void 0) return event;
-	if (record(data["error"], "tool error")["code"] !== "TOOL_NOT_STARTED") return event;
-	const message = record(data["message"], "tool message");
-	const callId = record(message["source"], "tool source")["callId"];
+	if (record$2(data["error"], "tool error")["code"] !== "TOOL_NOT_STARTED") return event;
+	const message = record$2(data["message"], "tool message");
+	const callId = record$2(message["source"], "tool source")["callId"];
 	const id = message["id"];
 	if (!isRepairIdentity(id, callId)) return event;
 	const prefix = "interrupted-tool-result-" + callId + "-";
@@ -18598,14 +18694,14 @@ function remapEvent(event, seq, mapping) {
 		return value.map(one);
 	};
 	const range = (value) => {
-		const source = record(value, "sequence range");
+		const source = record$2(value, "sequence range");
 		return {
 			...source,
 			start: one(source["start"]),
 			end: one(source["end"])
 		};
 	};
-	let data = record(event.data, event.type);
+	let data = record$2(event.data, event.type);
 	switch (event.type) {
 		case "command/done":
 			if (data["sourceEventSeq"] !== void 0) data = {
@@ -18679,9 +18775,9 @@ var ReleasedV2ToV3Stage = class {
 		assertEvent(event, 2);
 		this.observeMessageIds(event);
 		let source = event;
-		const data = record(event.data, event.type);
+		const data = record$2(event.data, event.type);
 		if (event.type === "request/header") {
-			const { system, ...header } = record(data["header"], "request header");
+			const { system, ...header } = record$2(data["header"], "request header");
 			const prompt = typeof system === "string" ? system : "";
 			if (prompt !== this.prompt) this.emitSystem(prompt, event, context);
 			source = {
@@ -18692,7 +18788,7 @@ var ReleasedV2ToV3Stage = class {
 				}
 			};
 		}
-		if (SURFACE_TYPES.has(event.type) && this.head === void 0) throw new SessionFormatUnsupportedMigrationError("format v2 surface before first step cannot acquire a system head without changing chronology");
+		if (SURFACE_TYPES$1.has(event.type) && this.head === void 0) throw new SessionFormatUnsupportedMigrationError("format v2 surface before first step cannot acquire a system head without changing chronology");
 		if (event.type === "session/end-seed" && data["inherited"] === true) {
 			if (!this.input.sourceHeader.isSeeded) throw new SessionFormatError("format v2 unseeded Session contains an inherited end-seed marker");
 			this.sourceCut = event.seq;
@@ -18723,8 +18819,8 @@ var ReleasedV2ToV3Stage = class {
 		return sessionFormatCount(this.targetCut, "format v3 inherited event count");
 	}
 	observeMessageIds(event) {
-		const data = record(event.data, event.type);
-		const messages = event.type === "user/message" ? [data] : event.type === "assistant/message" || event.type === "tool/result" ? [record(data["message"], "message")] : event.type === "agent/inbox/spliced" ? data["inserted"] : event.type === "session/title-llm-request" ? data["messages"] : [];
+		const data = record$2(event.data, event.type);
+		const messages = event.type === "user/message" ? [data] : event.type === "assistant/message" || event.type === "tool/result" ? [record$2(data["message"], "message")] : event.type === "agent/inbox/spliced" ? data["inserted"] : event.type === "session/title-llm-request" ? data["messages"] : [];
 		for (const message of messages) {
 			const id = message["id"];
 			if (this.generatedIds.has(id)) throw new SessionFormatUnsupportedMigrationError("source message id collides with a generated system message id");
@@ -18829,6 +18925,1500 @@ function renameMessageSource(message) {
 	};
 }
 //#endregion
+//#region ../../../vendor/deepseek-harness/packages/session/session-format-v3-to-v4/lib/index.js
+/** Released V3 plugin-source conversion and declared message traversal. */
+/**
+* Visit only messages carried by first-party event payloads.
+* @param event - source or target logical event.
+* @param transform - message transform preserving unchanged identity.
+* @returns the event sharing all untouched payloads.
+*/
+function mapEventMessages(event, transform) {
+	const data = event.data;
+	if (!isSessionFormatJsonObject(data)) return event;
+	if (event.type === "user/message") {
+		const message = transform(data);
+		return message === data ? event : {
+			...event,
+			data: message
+		};
+	}
+	if (event.type === "developer/message" || event.type === "system/message" || event.type === "assistant/message" || event.type === "tool/result") {
+		if (!isSessionFormatJsonObject(data["message"])) throw new SessionFormatError(event.type + " requires a message");
+		const message = transform(data["message"]);
+		return message === data["message"] ? event : {
+			...event,
+			data: {
+				...data,
+				message
+			}
+		};
+	}
+	const key = event.type === "agent/inbox/spliced" ? "inserted" : event.type === "session/title-llm-request" ? "messages" : void 0;
+	if (key === void 0) return event;
+	const messages = data[key];
+	if (!Array.isArray(messages)) throw new SessionFormatError(event.type + " requires message array");
+	const mapped = messages.map((message) => {
+		if (!isSessionFormatJsonObject(message)) throw new SessionFormatError(event.type + " requires message objects");
+		return transform(message);
+	});
+	return mapped.every((message, index) => message === messages[index]) ? event : {
+		...event,
+		data: {
+			...data,
+			[key]: mapped
+		}
+	};
+}
+/** Released V3 plugin names whose current producer kind is not the plugin string. */
+const RENAMED_PRODUCERS = Object.freeze({
+	"compact": "compact-checkpoint",
+	"tools-code-mode": "ptc-mode",
+	"tools-ptc": "ptc-mode",
+	"dsh-compaction-basic": "compact-basic",
+	"@deepseek-ai/dsh-system-prompt": "runtime-context"
+});
+/** First-party V3 plugin identities that intentionally keep their current kind. */
+const RELEASED_SAME_NAME_PRODUCERS = /* @__PURE__ */ new Set([
+	"agent-instructions",
+	"session-reference",
+	"team-message",
+	"goal",
+	"skill-invocation",
+	"skill-catalog",
+	"coordinator",
+	"subagent-report",
+	"subagent-settled",
+	"webhook",
+	"agent-message",
+	"model-selection",
+	"plan-mode",
+	"time-context",
+	"tmux-context",
+	"user-approval",
+	"repeat-tool-reminder",
+	"tool-cordis",
+	"cordis-host-runner",
+	"tool-goal",
+	"tool-jobs",
+	"hooks-codex",
+	"hooks-claude-code",
+	"schedule",
+	"dsh-session-title-llm"
+]);
+/** Resolve the current producer kind for one released V3 plugin string. */
+function producerKind(plugin, role) {
+	if (plugin === "@deepseek-ai/dsh-system-prompt" && role === "system") return "system-prompt";
+	const renamed = Object.hasOwn(RENAMED_PRODUCERS, plugin) ? RENAMED_PRODUCERS[plugin] : void 0;
+	if (renamed !== void 0) return renamed;
+	if (RELEASED_SAME_NAME_PRODUCERS.has(plugin)) return plugin;
+	return `plugin:${plugin}`;
+}
+/**
+* Lift one released V3 plugin source into the current producer-owned shape.
+* @param source - source record whose `kind` is `'plugin'`.
+* @param seq - event seq for diagnostics.
+* @param role - carried message role for role-sensitive renames.
+* @returns a copy whose kind is the producer's own kind and whose `plugin` field is dropped.
+*/
+function rewritePluginSource(source, seq, role) {
+	const plugin = source["plugin"];
+	if (typeof plugin !== "string") throw new SessionFormatError(`plugin source at seq ${seq} is not canonical: plugin requires a string`);
+	const kind = producerKind(plugin, role);
+	if (Object.keys(source).length === 2) return { kind };
+	return Object.fromEntries(Object.entries(source).filter(([key]) => key !== "plugin").map(([key, item]) => [key, key === "kind" ? kind : item]));
+}
+/**
+* Convert released plugin wrappers while retaining every direct source kind and its metadata.
+* @param source - decoded V3 message source.
+* @param seq - event sequence for diagnostics.
+* @param role - enclosing message role for role-sensitive producer mappings.
+* @returns the converted source with every non-identity field preserved.
+*/
+function rewriteV3MessageSource(source, seq, role) {
+	const kind = source["kind"];
+	if (typeof kind !== "string" || kind.length === 0) throw new SessionFormatError(`message source at seq ${seq} requires a nonempty kind`);
+	if (kind === "plugin") return rewritePluginSource(source, seq, role);
+	return source;
+}
+/** Native source admission preserves unknown attribution and refuses retired plugin wrappers. */
+function source(message) {
+	const value = message["source"];
+	if (!isSessionFormatJsonObject(value) || typeof value["kind"] !== "string" || value["kind"].length === 0 || value["kind"] === "plugin") throw new SessionFormatError("format v4 message requires a producer-owned source kind");
+}
+/**
+* Validate producer attribution in every declared durable message slot.
+* @param event - complete native V4 event before Session adoption.
+*/
+function assertV4MessageSources(event) {
+	mapEventMessages(event, (message) => {
+		source(message);
+		return message;
+	});
+}
+/**
+* Refuse retired source syntax even after a malformed recoverable row; leave incomplete messages to decoding.
+* @param row - parsed row whose incomplete values have not been classified by the scanner.
+*/
+function assertV4SourceRowAdmission(row) {
+	if (!isSessionFormatJsonObject(row) || !isSessionFormatJsonObject(row["data"])) return;
+	const data = row["data"];
+	const messages = row["type"] === "user/message" ? [data] : row["type"] === "system/message" || row["type"] === "assistant/message" || row["type"] === "tool/result" ? [data["message"]] : row["type"] === "agent/inbox/spliced" ? data["inserted"] : row["type"] === "session/title-llm-request" ? data["messages"] : [];
+	if (!Array.isArray(messages)) return;
+	for (const message of messages) {
+		if (!isSessionFormatJsonObject(message)) continue;
+		const value = message["source"];
+		if (isSessionFormatJsonObject(value) && value["kind"] === "plugin") source(message);
+	}
+}
+/** Retired native syntax remains a hard refusal even after a recoverable physical-row failure. */
+function assertBlock(block, subject) {
+	if (isSessionFormatJsonObject(block) && block["type"] === "tool-result") throw new SessionFormatError(`${subject} must not contain a released tool-result wrapper`);
+}
+function assertContent$1(content, subject) {
+	if (Array.isArray(content)) content.forEach((block) => {
+		assertBlock(block, subject);
+	});
+}
+function assertMessageContent(message, subject) {
+	if (isSessionFormatJsonObject(message)) assertContent$1(message["content"], subject);
+}
+/**
+* Refuse retired headers, PTC tags, and tool-result blocks in interpreted content slots.
+* Tool arguments, replay state, schema parameters, and nested extension values remain opaque.
+* @param row - parsed physical row or complete native logical event.
+*/
+function assertV4RetiredSyntax(row) {
+	if (!isSessionFormatJsonObject(row)) return;
+	if ((row["type"] === "tool/code-dispatch-start" || row["type"] === "tool/code-dispatch") && row["ignorable"] !== true) throw new SessionFormatUnsupportedMigrationError(`format v4 rejects retired event type ${row["type"]}`);
+	const data = row["data"];
+	if (row["type"] === "request/header") {
+		if (!isSessionFormatJsonObject(data) || !isSessionFormatJsonObject(data["header"])) throw new SessionFormatError("format v4 request/header requires data and header objects");
+		if (Object.hasOwn(data["header"], "system")) throw new SessionFormatError("format v4 request/header rejects retired header.system");
+		return;
+	}
+	if (!isSessionFormatJsonObject(data)) return;
+	const subject = `format v4 ${String(row["type"])} at seq ${String(row["seq"])} content`;
+	switch (row["type"]) {
+		case "user/message":
+			assertContent$1(data["content"], subject);
+			break;
+		case "developer/message":
+		case "assistant/message":
+		case "team/message/queued":
+			assertMessageContent(data["message"], subject);
+			break;
+		case "agent/inbox/spliced":
+		case "session/title-llm-request": {
+			const messages = data[row["type"] === "agent/inbox/spliced" ? "inserted" : "messages"];
+			if (Array.isArray(messages)) messages.forEach((message) => {
+				assertMessageContent(message, subject);
+			});
+			break;
+		}
+		case "compaction/summary":
+			assertContent$1(data["summary"], subject);
+			assertContent$1(data["rawOutput"], subject);
+			break;
+		case "tool/ptc-dispatch": assertContent$1(data["content"], subject);
+	}
+	if ((row["type"] === "assistant/message" || row["type"] === "assistant/attempt") && Array.isArray(data["stream"])) for (const entry of data["stream"]) {
+		if (!isSessionFormatJsonObject(entry) || entry["type"] !== "chunk") continue;
+		const chunk = entry["chunk"];
+		if (!isSessionFormatJsonObject(chunk)) continue;
+		if (chunk["type"] === "block-end") assertBlock(chunk["block"], subject);
+		if (chunk["type"] === "block-start" && chunk["blockType"] === "tool-result") throw new SessionFormatError(`${subject} must not contain a released tool-result wrapper`);
+	}
+}
+/** Native system-message fields checked before physical recovery can discard a row. */
+function record$1(value, subject) {
+	if (!isSessionFormatJsonObject(value)) throw new SessionFormatError(`format v4 ${subject} requires an object`);
+	return value;
+}
+function string$1(value, subject, nonempty = false) {
+	if (typeof value !== "string" || nonempty && value.length === 0) throw new SessionFormatError(`format v4 ${subject} requires a string${nonempty ? " with content" : ""}`);
+}
+function positive(value, subject) {
+	if (sessionFormatCount(value, subject) === 0) throw new SessionFormatError(`format v4 ${subject} must be positive`);
+}
+function image(value) {
+	const attachment = record$1(value, "system image attachment");
+	string$1(attachment["attachmentId"], "system image attachmentId", true);
+	if (![
+		"image/png",
+		"image/jpeg",
+		"image/webp",
+		"image/gif"
+	].includes(attachment["mediaType"])) throw new SessionFormatError("format v4 system image requires a supported mediaType");
+	sessionFormatCount(attachment["bytes"], "system image bytes");
+	positive(attachment["width"], "system image width");
+	positive(attachment["height"], "system image height");
+	if (attachment["name"] !== void 0) string$1(attachment["name"], "system image name");
+	if (attachment["originalDimensions"] !== void 0) {
+		const original = record$1(attachment["originalDimensions"], "system image originalDimensions");
+		positive(original["width"], "system image original width");
+		positive(original["height"], "system image original height");
+	}
+}
+/**
+* Validate system fields independently of historical message representations; preserve additional JSON fields.
+* @param row - complete logical event or parsed physical row before corruption recovery.
+*/
+function assertV4SystemMessageFields(row) {
+	if (!isSessionFormatJsonObject(row) || row["type"] !== "system/message") return;
+	const data = record$1(row["data"], "system/message data");
+	positive(data["turn"], "system/message turn");
+	positive(data["step"], "system/message step");
+	const message = record$1(data["message"], "system message");
+	string$1(message["id"], "system message id", true);
+	if (message["role"] !== "system") throw new SessionFormatError("format v4 system message requires system role");
+	const content = message["content"];
+	if (!Array.isArray(content)) throw new SessionFormatError("format v4 system message requires content array");
+	for (const value of content) {
+		const block = record$1(value, "system content block");
+		string$1(block["type"], "system content type", true);
+		switch (block["type"]) {
+			case "text":
+			case "reasoning":
+				string$1(block["text"], "system content text");
+				break;
+			case "tool-call":
+				string$1(block["id"], "system tool-call id", true);
+				string$1(block["name"], "system tool-call name", true);
+				string$1(block["arguments"], "system tool-call arguments");
+				break;
+			case "image":
+				image(block["attachment"]);
+				break;
+			case "tool-result": throw new SessionFormatError("format v4 system content rejects retired tool-result wrappers");
+		}
+	}
+}
+/** Native V4 developer-message and deferred-tool-schema validation. */
+function assertToolChange(block, developer) {
+	if (!isSessionFormatJsonObject(block) || block["type"] !== "tool-addition" && block["type"] !== "tool-removal") return;
+	if (!developer) throw new SessionFormatError(`format v4 ${block["type"]} requires developer role`);
+	if (typeof block["toolName"] !== "string" || block["toolName"].length === 0) throw new SessionFormatError(`format v4 ${block["type"]} requires a nonempty toolName`);
+	if (block["type"] === "tool-addition" && Object.hasOwn(block, "tool")) throw new SessionFormatError("format v4 tool-addition must omit inline tool definitions");
+}
+function assertContent(value, developer = false) {
+	if (Array.isArray(value)) value.forEach((block) => {
+		assertToolChange(block, developer);
+	});
+}
+function assertDeveloperMessage(message) {
+	assertContent(message["content"], true);
+	const source = message["source"];
+	if (typeof message["id"] !== "string" || message["id"].length === 0 || !Array.isArray(message["content"]) || !isSessionFormatJsonObject(source) || typeof source["kind"] !== "string" || source["kind"].length === 0 || source["kind"] === "plugin") throw new SessionFormatError("format v4 developer message requires id, role, content, and a producer-owned source");
+}
+/** Ordinary-message corruption belongs to the decoder; recognized V4-only values are refused here. */
+function assertOrdinaryMessage(value) {
+	if (!isSessionFormatJsonObject(value)) return;
+	if (value["role"] === "developer") throw new SessionFormatError("format v4 developer/message and developer role must occur together");
+	assertContent(value["content"]);
+}
+/**
+* Validate native V4 developer messages, tool-change blocks, and deferred tool schemas.
+* Additional developer JSON fields are preserved. Malformed legacy message
+* slots remain available to recoverable decoding.
+* @param event - logical event or physical row before source-event range decoding.
+*/
+function assertV4DeveloperData(event) {
+	const data = event.data;
+	if (!isSessionFormatJsonObject(data)) {
+		if (event.type === "developer/message") throw new SessionFormatError("format v4 developer/message data must be an object");
+		return;
+	}
+	if (event.type === "developer/message") {
+		const message = data["message"];
+		if (!isSessionFormatJsonObject(message) || message["role"] !== "developer") throw new SessionFormatError("format v4 developer/message requires turn, step, and a developer message");
+		for (const field of ["turn", "step"]) if (sessionFormatCount(data[field], `developer/message ${field}`) === 0) throw new SessionFormatError(`developer/message ${field} must be positive`);
+		assertDeveloperMessage(message);
+		if (message["content"].some((block) => isSessionFormatJsonObject(block) && block["type"] === "tool-addition")) sessionFormatCount(data["headerSeq"], "developer/message headerSeq");
+		else if (Object.hasOwn(data, "headerSeq")) throw new SessionFormatError("format v4 developer/message must omit headerSeq without tool additions");
+	} else switch (event.type) {
+		case "user/message":
+			assertOrdinaryMessage(data);
+			break;
+		case "system/message":
+		case "assistant/message":
+		case "tool/result":
+			assertOrdinaryMessage(data["message"]);
+			break;
+		case "agent/inbox/spliced":
+		case "session/title-llm-request": {
+			const messages = data[event.type === "agent/inbox/spliced" ? "inserted" : "messages"];
+			if (Array.isArray(messages)) messages.forEach(assertOrdinaryMessage);
+			break;
+		}
+	}
+	if (event.type === "compaction/summary") {
+		assertContent(data["summary"]);
+		assertContent(data["rawOutput"]);
+	}
+	if ((event.type === "assistant/message" || event.type === "assistant/attempt") && Array.isArray(data["stream"])) for (const entry of data["stream"]) {
+		if (!isSessionFormatJsonObject(entry) || entry["type"] !== "chunk") continue;
+		const chunk = entry["chunk"];
+		if (!isSessionFormatJsonObject(chunk)) continue;
+		if (chunk["type"] === "block-end") assertToolChange(chunk["block"], false);
+		if (chunk["type"] === "block-start" && (chunk["blockType"] === "tool-addition" || chunk["blockType"] === "tool-removal")) throw new SessionFormatError("format v4 tool-change blocks require developer role");
+	}
+	if (event.type === "request/header" && isSessionFormatJsonObject(data["header"])) {
+		const tools = data["header"]["tools"];
+		if (Array.isArray(tools)) for (const tool of tools) {
+			if (!isSessionFormatJsonObject(tool) || !Object.hasOwn(tool, "deferLoading")) continue;
+			if (tool["deferLoading"] !== true) throw new SessionFormatError("format v4 tool deferLoading must be true when present");
+		}
+	}
+}
+/** Native V4 fork-result identity and not-started error validation. */
+/**
+* Validate fork-generated not-started results without changing their identity or text.
+* Append results carry their own sequence; replacement results retain an earlier identity.
+* @param row - logical event or physical event row.
+*/
+function assertV4ForkResult(row) {
+	if (!isSessionFormatJsonObject(row) || row["type"] !== "tool/result") return;
+	const data = row["data"];
+	if (!isSessionFormatJsonObject(data)) return;
+	const error = data["error"];
+	const message = data["message"];
+	if (!isSessionFormatJsonObject(error) || error["code"] !== "TOOL_NOT_STARTED" || !isSessionFormatJsonObject(message) || typeof message["id"] !== "string" || !message["id"].startsWith("forked-tool-result-")) return;
+	const source = message["source"];
+	const callId = isSessionFormatJsonObject(source) ? source["callId"] : void 0;
+	const prefix = `forked-tool-result-${String(callId)}-`;
+	const suffix = message["id"].slice(prefix.length);
+	const operation = row["surfaceOp"];
+	const replacement = isSessionFormatJsonObject(operation) && operation["op"] === "replace";
+	const sequence = Number(suffix);
+	const content = message["content"];
+	const text = Array.isArray(content) && content.length === 1 ? content[0] : void 0;
+	const sourceEventSeqs = row["sourceEventSeqs"];
+	if (typeof callId !== "string" || !message["id"].startsWith(prefix) || !/^(0|[1-9]\d*)$/.test(suffix) || !Number.isSafeInteger(sequence) || (replacement ? typeof row["seq"] !== "number" || sequence >= row["seq"] : sequence !== row["seq"]) || error["name"] !== "ToolNotStartedError" || !replacement && (sourceEventSeqs !== void 0 || operation !== "append") || replacement && (!Array.isArray(sourceEventSeqs) || sourceEventSeqs.length !== 1 || sourceEventSeqs[0] !== sequence) || message["role"] !== "tool" || message["isError"] !== true || message["toolCallId"] !== callId || !isSessionFormatJsonObject(source) || source["kind"] !== "tool" || !isSessionFormatJsonObject(text) || text["type"] !== "text" || typeof text["text"] !== "string") throw new SessionFormatError("invalid V4 not-started fork result");
+}
+/** First-class tool-role messages in the V4 representation. */
+const WRAPPER_FIELDS = /* @__PURE__ */ new Set([
+	"type",
+	"toolCallId",
+	"content",
+	"isError"
+]);
+const MESSAGE_FIELDS = /* @__PURE__ */ new Set([
+	"id",
+	"role",
+	"source",
+	"content"
+]);
+/** Preserve unknown fields without merging their original message and result owners. */
+function extensionFields(value, fields, owner) {
+	return Object.fromEntries(Object.entries(value).filter(([key]) => !fields.has(key)).map(([key, field]) => [`plugin:${owner}:${key}`, field]));
+}
+function resultContent(value, subject) {
+	if (!Array.isArray(value)) throw new SessionFormatError(`${subject} tool-result content must be an array`);
+	if (value.some((block) => isSessionFormatJsonObject(block) && block["type"] === "tool-result")) throw new SessionFormatUnsupportedMigrationError(`${subject} contains a nested tool-result unsupported by this converter`);
+	return value;
+}
+/**
+* Lift one released-V3 wrapper tool/result row into the first-class V4 message.
+* Validate the wrapper before dropping it so malformed historical content is
+* rejected instead of being silently truncated.
+* @param event - released wrapper tool/result event.
+* @returns the same event with a first-class tool-role message.
+* @throws {SessionFormatError} when the wrapper, tool source, content, or error flag is malformed.
+* @throws {SessionFormatUnsupportedMigrationError} when the result contains another result.
+*/
+function liftToolResult(event) {
+	if (event.type !== "tool/result" || !isSessionFormatJsonObject(event.data)) return event;
+	const data = event.data;
+	const message = data["message"];
+	if (!isSessionFormatJsonObject(message) || message["role"] !== "user") return event;
+	const source = message["source"];
+	const callId = isSessionFormatJsonObject(source) ? source["callId"] : void 0;
+	const content = message["content"];
+	const block = Array.isArray(content) && content.length === 1 ? content[0] : void 0;
+	const wrapper = isSessionFormatJsonObject(block) ? block : void 0;
+	const id = message["id"];
+	if (typeof id !== "string" || id.length === 0 || !isSessionFormatJsonObject(source) || source["kind"] !== "tool" || typeof callId !== "string" || callId.length === 0 || wrapper === void 0 || wrapper["type"] !== "tool-result" || wrapper["toolCallId"] !== callId) throw new SessionFormatError(`format v3 ${event.type} at seq ${event.seq} requires exactly one tool-result wrapper matching its tool source`);
+	const isError = wrapper["isError"];
+	if (isError !== void 0 && typeof isError !== "boolean") throw new SessionFormatError(`format v3 ${event.type} at seq ${event.seq} tool-result isError must be boolean`);
+	const targetMessage = {
+		role: "tool",
+		source,
+		toolCallId: callId,
+		content: resultContent(wrapper["content"], `format v3 ${event.type} at seq ${event.seq}`),
+		...isError === void 0 ? {} : { isError },
+		id,
+		...extensionFields(message, MESSAGE_FIELDS, "message"),
+		...extensionFields(wrapper, WRAPPER_FIELDS, "result")
+	};
+	return {
+		...event,
+		data: {
+			...data,
+			message: targetMessage
+		}
+	};
+}
+/**
+* Validate the native V4 first-class tool-role message of one tool/result row.
+* @param event - canonical V4 event.
+* @throws {SessionFormatError} when the row is not an exact first-class tool result.
+*/
+function assertV4ToolResultMessage(event) {
+	if (event.type !== "tool/result") return;
+	const subject = `format v4 ${event.type} at seq ${event.seq}`;
+	const data = event.data;
+	if (!isSessionFormatJsonObject(data)) throw new SessionFormatError(`${subject} data must be an object`);
+	const message = data["message"];
+	if (!isSessionFormatJsonObject(message)) throw new SessionFormatError(`${subject} message must be an object`);
+	const id = message["id"];
+	const role = message["role"];
+	const toolCallId = message["toolCallId"];
+	const source = message["source"];
+	const isError = message["isError"];
+	const content = message["content"];
+	const sourceCallId = isSessionFormatJsonObject(source) ? source["callId"] : void 0;
+	if (typeof id !== "string" || id.length === 0) throw new SessionFormatError(`${subject} requires a first-class message with a string id`);
+	if (role !== "tool") throw new SessionFormatError(`${subject} requires a tool-role message`);
+	if (typeof toolCallId !== "string" || toolCallId.length === 0 || sourceCallId !== toolCallId) throw new SessionFormatError(`${subject} requires toolCallId matching its tool source`);
+	if (!isSessionFormatJsonObject(source) || source["kind"] !== "tool") throw new SessionFormatError(`${subject} requires a tool source`);
+	if (!Array.isArray(content)) throw new SessionFormatError(`${subject} requires array content`);
+	if (content.some((block) => isSessionFormatJsonObject(block) && block["type"] === "tool-result")) throw new SessionFormatError(`${subject} content must not contain a released tool-result wrapper`);
+	if (isError !== void 0 && typeof isError !== "boolean") throw new SessionFormatError(`${subject} isError must be boolean when present`);
+	if (data["error"] !== void 0 && isError !== true) throw new SessionFormatError(`${subject} carries error metadata for a non-error tool result`);
+}
+/** Mandatory native V4 relationships; incomplete tails retain their open transactions. */
+const SURFACE_TYPES = /* @__PURE__ */ new Set([
+	"system/message",
+	"user/message",
+	"developer/message",
+	"assistant/message",
+	"tool/result"
+]);
+const STEP_EVENT_TYPES = /* @__PURE__ */ new Set([
+	"system/message",
+	"developer/message",
+	"assistant/attempt"
+]);
+const RELATIONSHIP_TYPES = /* @__PURE__ */ new Set([
+	...SURFACE_TYPES,
+	...STEP_EVENT_TYPES,
+	"turn/start",
+	"turn/end",
+	"step/start",
+	"step/end",
+	"tool/call",
+	"request/header",
+	"request/context",
+	"tool/ptc-dispatch-start",
+	"tool/ptc-dispatch",
+	"llm/retry",
+	"llm/retry-started",
+	"session/title",
+	"session/title-llm-request",
+	"command/run",
+	"command/done",
+	"compaction/start",
+	"compaction/summary",
+	"compaction/end",
+	"compaction/prune",
+	"session/end-seed"
+]);
+function record(value, subject) {
+	if (!isSessionFormatJsonObject(value)) throw new SessionFormatError(`${subject} requires an object`);
+	return value;
+}
+function text$2(value, subject) {
+	if (typeof value !== "string" || value.length === 0) throw new SessionFormatError(`${subject} requires a nonempty string`);
+	return value;
+}
+function array$1(value, subject) {
+	if (!Array.isArray(value)) throw new SessionFormatError(`${subject} requires an array`);
+	return value;
+}
+function earlier(value, seq, subject) {
+	const coordinate = sessionFormatCount(value, subject);
+	if (coordinate >= seq) throw new SessionFormatError(`${subject} must name an earlier event`);
+	return coordinate;
+}
+/** One native artifact's lifecycle state; no state survives between reads. */
+var Relationships = class {
+	artifact;
+	knownEventTypes;
+	turn = null;
+	step = null;
+	nextTurn = 1;
+	nextStep = 1;
+	provider;
+	surface = [];
+	protectedHead;
+	compaction;
+	tools = /* @__PURE__ */ new Map();
+	dispatches = /* @__PURE__ */ new Map();
+	retries = [];
+	startedRetries = /* @__PURE__ */ new Set();
+	commands = /* @__PURE__ */ new Set();
+	orphanCompactions = /* @__PURE__ */ new Set();
+	constructor(artifact, knownEventTypes) {
+		this.artifact = artifact;
+		this.knownEventTypes = knownEventTypes;
+		let start;
+		for (const event of artifact.events) {
+			if (!knownEventTypes.has(event.type)) continue;
+			if (event.type === "compaction/start") start = event.seq;
+			if (event.type === "compaction/end") start = void 0;
+			if (event.type === "session/end-seed") {
+				if (start !== void 0) this.orphanCompactions.add(start);
+				start = void 0;
+			}
+		}
+	}
+	requireTurn(type) {
+		if (this.turn === null) throw new SessionFormatError(`${type} is outside an open turn`);
+	}
+	requireStep(event, data) {
+		if (this.turn === null || this.step === null || data["turn"] !== this.turn || data["step"] !== this.step) throw new SessionFormatError(`${event.type} does not match an open turn and step`);
+	}
+	closeTools(type) {
+		if (this.tools.size !== 0) throw new SessionFormatError(`${type} leaves unresolved tool call ${String(this.tools.keys().next().value)}`);
+		this.tools.clear();
+	}
+	developer(event, data) {
+		if (data["headerSeq"] === void 0) return;
+		const headerSeq = earlier(data["headerSeq"], event.seq, "developer/message headerSeq");
+		const headerEvent = this.artifact.events[headerSeq];
+		if (headerEvent?.type !== "request/header") throw new SessionFormatError("developer/message headerSeq must reference an earlier request/header");
+		if (!this.knownEventTypes.has(headerEvent.type)) throw new SessionFormatError("developer/message headerSeq must reference a known request/header");
+		const tools = record(record(headerEvent.data, "request/header data")["header"], "request header")["tools"];
+		const content = array$1(record(data["message"], "developer message")["content"], "developer content");
+		for (const value of content) {
+			if (!isSessionFormatJsonObject(value) || value["type"] !== "tool-addition") continue;
+			const toolName = value["toolName"];
+			const definitions = Array.isArray(tools) ? tools.filter((tool) => isSessionFormatJsonObject(tool) && tool["name"] === toolName) : [];
+			if (definitions.length !== 1) throw new SessionFormatError(`developer/message tool-addition "${toolName}" must name exactly one tool in headerSeq ${headerSeq}`);
+			const definition = definitions[0];
+			if (typeof definition["description"] !== "string" || !isSessionFormatJsonObject(definition["parameters"])) throw new SessionFormatError(`developer/message tool-addition "${toolName}" requires a complete tool definition in headerSeq ${headerSeq}`);
+		}
+	}
+	foldSurface(event) {
+		if (!SURFACE_TYPES.has(event.type)) return;
+		if (event.type === "system/message" && this.surface.length > 0 && this.protectedHead === void 0) throw new SessionFormatError("system/message requires a protected first surface head");
+		if (event["surfaceOp"] === "append") {
+			if (event.type === "system/message" && this.surface.length === 0) this.protectedHead = event.seq;
+			this.surface.push(event.seq);
+			return;
+		}
+		const operation = record(event["surfaceOp"], `${event.type} surfaceOp`);
+		const first = this.surface.indexOf(earlier(operation["startSeq"], event.seq, "replacement start"));
+		const last = this.surface.indexOf(earlier(operation["endSeq"], event.seq, "replacement end"));
+		if (first < 0 || last < first) throw new SessionFormatError(`${event.type} replacement range is not on the current surface`);
+		const removed = this.surface.slice(first, last + 1);
+		const sources = array$1(event["sourceEventSeqs"], "replacement sourceEventSeqs");
+		if (removed.some((seq) => !sources.includes(seq))) throw new SessionFormatError("replacement sourceEventSeqs omit a shadowed surface node");
+		if (this.protectedHead !== void 0 && removed.includes(this.protectedHead)) {
+			if (event.type !== "system/message" || removed.length !== 1) throw new SessionFormatError("surface replacement cannot shadow the protected system head");
+			this.protectedHead = event.seq;
+		}
+		this.surface.splice(first, removed.length, event.seq);
+	}
+	tool(event, data) {
+		if (event.type === "tool/result" && event["surfaceOp"] !== "append") {
+			this.requireTurn(event.type);
+			return;
+		}
+		this.requireStep(event, data);
+		if (event.type === "assistant/message") {
+			const message = record(data["message"], "assistant message");
+			for (const value of array$1(message["content"], "assistant content")) {
+				const block = record(value, "assistant content block");
+				if (block["type"] !== "tool-call") continue;
+				const id = text$2(block["id"], "tool call id");
+				if (this.tools.has(id)) throw new SessionFormatError(`assistant/message repeats advertised tool call ${id}`);
+				this.tools.set(id, {
+					name: block["name"],
+					arguments: block["arguments"],
+					started: false
+				});
+			}
+			return;
+		}
+		const message = event.type === "tool/result" ? record(data["message"], "tool result message") : void 0;
+		const id = text$2(message === void 0 ? data["callId"] : message["toolCallId"], "tool call id");
+		const pending = this.tools.get(id);
+		if (pending === void 0) throw new SessionFormatError(`${event.type} ${id} has no advertised tool lifecycle`);
+		if (message === void 0) {
+			if (pending.started || pending.name !== data["name"] || pending.arguments !== data["arguments"]) throw new SessionFormatError(`tool/call ${id} does not match one advertised tool call`);
+			pending.started = true;
+		} else {
+			if (!pending.started && !notStartedRepair(event, data, message, id)) throw new SessionFormatError(`tool/result ${id} is not the exact TOOL_NOT_STARTED repair`);
+			this.tools.delete(id);
+		}
+	}
+	dispatch(event, data) {
+		this.requireTurn(event.type);
+		const id = text$2(data["subCallId"], "PTC subCallId");
+		const root = text$2(data["rootCallId"], "PTC rootCallId");
+		const parent = text$2(data["parentCallId"], "PTC parentCallId");
+		const existing = this.dispatches.get(id);
+		if (existing !== void 0 && existing.data["rootCallId"] !== root) throw new SessionFormatError("PTC dispatch changes its rootCallId");
+		if (parent !== root && this.dispatches.get(parent)?.data["rootCallId"] !== root) throw new SessionFormatError("PTC parentCallId does not belong to rootCallId");
+		if (event.type === "tool/ptc-dispatch-start") {
+			if (existing !== void 0) throw new SessionFormatError("PTC dispatch repeats subCallId");
+			this.dispatches.set(id, {
+				data,
+				settled: false
+			});
+			return;
+		}
+		if (existing === void 0 || existing.settled) throw new SessionFormatError("PTC dispatch has no unique start");
+		if ([
+			"rootCallId",
+			"parentCallId",
+			"name",
+			"arguments"
+		].some((key) => !isDeepStrictEqual(existing.data[key], data[key]))) throw new SessionFormatError("PTC dispatch does not match its start");
+		existing.settled = true;
+	}
+	retry(event, data) {
+		const id = text$2(data["retryId"], "retryId");
+		const attempt = sessionFormatCount(data["retry"], "retry");
+		if (event.type === "llm/retry-started") {
+			const scheduled = this.retries.find((item) => item["retryId"] === id && item["retry"] === attempt);
+			if (scheduled === void 0) throw new SessionFormatError("llm/retry-started pairs no prior scheduled attempt");
+			if (scheduled["turn"] !== data["turn"] || scheduled["step"] !== data["step"]) throw new SessionFormatError("llm/retry-started changes scheduled coordinates");
+			const key = JSON.stringify([id, attempt]);
+			if (this.startedRetries.has(key)) throw new SessionFormatError("llm/retry-started repeats one scheduled attempt");
+			this.startedRetries.add(key);
+			return;
+		}
+		if (this.turn === null || data["turn"] !== this.turn || data["step"] !== (this.step ?? this.nextStep - 1)) throw new SessionFormatError("llm/retry does not match the current turn and step");
+		if (data["provider"] !== this.provider) throw new SessionFormatError("llm/retry provider does not match the open request/header");
+		const prior = this.retries.findLast((item) => [
+			"turn",
+			"step",
+			"provider",
+			"policyKey"
+		].every((key) => item[key] === data[key]));
+		if (attempt !== (prior === void 0 ? 1 : sessionFormatCount(prior["retry"], "prior retry") + 1)) throw new SessionFormatError("llm/retry skips its policy attempt sequence");
+		if (prior === void 0 ? this.retries.some((item) => item["retryId"] === id) : prior["retryId"] !== id) throw new SessionFormatError("llm/retry must keep one retryId per policy chain");
+		this.retries.push(data);
+	}
+	compact(event, data) {
+		if (event.type === "compaction/prune" || event.type === "compaction/summary") this.span(event, data);
+		if (event.type === "compaction/prune") return;
+		if (event.type === "compaction/start") {
+			if (this.compaction !== void 0) throw new SessionFormatError("compaction/start overlaps an open compaction");
+			const owner = data["turn"] === null ? null : sessionFormatCount(data["turn"], "compaction turn");
+			if (owner !== this.turn) throw new SessionFormatError("compaction/start does not match the open turn");
+			this.compaction = {
+				id: text$2(data["compactionId"], "compactionId"),
+				command: data["sourceCommandId"],
+				turn: owner,
+				seq: event.seq,
+				summarized: false
+			};
+			return;
+		}
+		const current = this.compactionOwner(data, event.type);
+		if (current.turn !== this.turn) throw new SessionFormatError(`${event.type} does not match the open turn`);
+		if (event.type === "compaction/summary") {
+			if (current.summarized) throw new SessionFormatError("compaction/summary repeats");
+			current.summarized = true;
+		} else {
+			if (data["turn"] !== current.turn) throw new SessionFormatError("compaction/end changes its owner turn");
+			if (data["error"] === void 0 && !current.summarized) throw new SessionFormatError("successful compaction/end requires one summary");
+			this.compaction = void 0;
+		}
+	}
+	compactionOwner(data, subject) {
+		if (this.compaction === void 0 || this.compaction.id !== data["compactionId"] || this.compaction.command !== data["sourceCommandId"]) throw new SessionFormatError(`${subject} has no matching compaction/start`);
+		return this.compaction;
+	}
+	span(event, data) {
+		const range = record(data["shadowedRange"], "compaction shadowedRange");
+		const start = this.surface.indexOf(earlier(range["start"], event.seq, "compaction range start"));
+		const end = this.surface.indexOf(earlier(range["end"], event.seq, "compaction range end"));
+		const seqs = array$1(data["shadowedSeqs"], "compaction shadowedSeqs");
+		if (start < 0 || end < start || !isDeepStrictEqual(this.surface.slice(start, end + 1), seqs)) throw new SessionFormatError(`${event.type} shadowedSeqs do not name an exact current surface span`);
+		if (this.protectedHead !== void 0 && seqs.includes(this.protectedHead)) throw new SessionFormatError("compaction cannot shadow the protected system head");
+	}
+	accept(event) {
+		if (!this.knownEventTypes.has(event.type) || !RELATIONSHIP_TYPES.has(event.type)) return;
+		const data = record(event.data, event.type);
+		if (STEP_EVENT_TYPES.has(event.type)) this.requireStep(event, data);
+		if (event.type.startsWith("turn/") && this.compaction !== void 0 && !this.orphanCompactions.has(this.compaction.seq)) throw new SessionFormatError(`${event.type} crosses an open compaction`);
+		this.foldSurface(event);
+		switch (event.type) {
+			case "turn/start":
+				if (this.turn !== null || data["turn"] !== this.nextTurn) throw new SessionFormatError("turn/start does not open the expected turn");
+				this.turn = this.nextTurn;
+				this.nextStep = 1;
+				this.tools.clear();
+				break;
+			case "turn/end":
+				if (this.turn === null || data["turn"] !== this.turn || this.step !== null) throw new SessionFormatError("turn/end does not match the open turn with no open step");
+				this.closeTools(event.type);
+				this.turn = null;
+				this.nextTurn += 1;
+				break;
+			case "step/start":
+				if (this.turn === null || data["turn"] !== this.turn || this.step !== null || data["step"] !== this.nextStep) throw new SessionFormatError("step/start does not match the open turn and next step");
+				this.step = this.nextStep;
+				break;
+			case "step/end":
+				this.requireStep(event, data);
+				this.closeTools(event.type);
+				this.step = null;
+				this.nextStep += 1;
+				break;
+			case "assistant/message":
+			case "tool/call":
+			case "tool/result":
+				this.tool(event, data);
+				break;
+			case "developer/message":
+				this.developer(event, data);
+				break;
+			case "request/header":
+				this.requireTurn(event.type);
+				this.provider = record(record(data["header"], "request header")["config"], "request config")["provider"];
+				break;
+			case "request/context":
+				this.requireTurn(event.type);
+				break;
+			case "tool/ptc-dispatch-start":
+			case "tool/ptc-dispatch":
+				this.dispatch(event, data);
+				break;
+			case "llm/retry":
+			case "llm/retry-started":
+				this.retry(event, data);
+				break;
+			case "session/title":
+			case "session/title-llm-request":
+				titleSources(this.artifact.events, event, data, this.knownEventTypes);
+				break;
+			case "command/run": {
+				const id = text$2(data["commandId"], "commandId");
+				if (this.commands.has(id)) throw new SessionFormatError(`command/run repeats commandId ${id}`);
+				this.commands.add(id);
+				break;
+			}
+			case "command/done":
+				if (!this.commands.has(text$2(data["commandId"], "commandId"))) throw new SessionFormatError("command/done has no prior command/run");
+				if (data["sourceEventSeq"] !== void 0) {
+					const source = this.artifact.events[earlier(data["sourceEventSeq"], event.seq, "command sourceEventSeq")];
+					if (data["kind"] !== "success" || source?.type === "command/run" || source?.type === "command/done") throw new SessionFormatError("command/done has invalid sourceEventSeq");
+				}
+				break;
+			case "compaction/start":
+			case "compaction/summary":
+			case "compaction/end":
+			case "compaction/prune":
+				this.compact(event, data);
+				break;
+			case "user/message": {
+				const source = record(data["source"], "user message source");
+				if (event["surfaceOp"] !== "append" && source["kind"] === "compact-checkpoint") this.compactionOwner(source, "compaction checkpoint");
+				break;
+			}
+			case "session/end-seed": this.compaction = void 0;
+		}
+	}
+};
+function notStartedRepair(event, data, message, callId) {
+	const error = record(data["error"], "not-started error");
+	if (error["name"] !== "ToolNotStartedError" || error["code"] !== "TOOL_NOT_STARTED" || message["isError"] !== true || event["sourceEventSeqs"] !== void 0) return false;
+	const id = text$2(message["id"], "not-started message id");
+	if (id.startsWith(`forked-tool-result-${callId}-`)) return true;
+	const prefix = `interrupted-tool-result-${callId}-`;
+	const suffix = id.slice(prefix.length);
+	const content = array$1(message["content"], "not-started content");
+	const block = content[0];
+	return id.startsWith(prefix) && /^(0|[1-9]\d*)$/.test(suffix) && Number.isSafeInteger(Number(suffix)) && content.length === 1 && isSessionFormatJsonObject(block) && block["type"] === "text" && block["text"] === "The tool call was interrupted before the Harness recorded it as started. Retry it if it is still needed.";
+}
+function titleSources(events, event, data, knownEventTypes) {
+	const references = array$1(data["messageSeqs"], "title messageSeqs");
+	if (event.type === "session/title" && references.length === 0 !== (record(data["source"], "title source")["kind"] === "user")) throw new SessionFormatError("session/title messageSeqs must be empty exactly for a user title");
+	const seen = /* @__PURE__ */ new Set();
+	for (const value of references) {
+		const seq = earlier(value, event.seq, "title messageSeqs");
+		const source = events[seq];
+		if (seen.has(seq) || source?.type !== "user/message" || !knownEventTypes.has(source.type) || record(record(source.data, "title input")["source"], "title input source")["kind"] !== "user") throw new SessionFormatError(`${event.type} messageSeqs must cite distinct earlier human user/message events`);
+		seen.add(seq);
+	}
+	if (event.type !== "session/title-llm-request") return;
+	const messages = array$1(data["messages"], "title messages");
+	const message = record(messages[0], "title message");
+	const content = array$1(message["content"], "title content");
+	const block = content[0];
+	if (references.length === 0 || messages.length !== 1 || message["role"] !== "user" || record(message["source"], "title source")["kind"] !== "dsh-session-title-llm" || content.length !== 1 || !isSessionFormatJsonObject(block) || block["type"] !== "text") throw new SessionFormatError("session/title-llm-request messages do not represent messageSeqs");
+}
+/**
+* Validate native V4 lifecycle and ownership facts without rewriting any event.
+* @param artifact - artifact whose V4 envelopes and messages have been admitted.
+* @param knownEventTypes - installed event types whose payloads this reader interprets.
+*/
+function assertV4LifecycleRelationships(artifact, knownEventTypes) {
+	const state = new Relationships(artifact, knownEventTypes);
+	for (const event of artifact.events) state.accept(event);
+}
+/**
+* Validate supplemental child evidence supplied across the migration JSON interface.
+* @param value - collected child identity and optional descriptor.
+* @returns validated evidence; descriptor interpretation is deferred until parent membership is known.
+*/
+function childCatalogSource(value) {
+	if (!isSessionFormatJsonObject(value) || typeof value["childId"] !== "string" || !Object.hasOwn(value, "descriptor")) throw new SessionFormatUnsupportedMigrationError("catalog migration requires historical child identity and descriptor evidence");
+	sessionFormatCount(value["childCreatedAt"], "catalog child creation time");
+	sessionFormatCount(value["descriptorCount"], "child descriptor count");
+	return value;
+}
+/**
+* Interpret only the discovery fields of known historical descriptors.
+* @param source - validated child evidence.
+* @returns a catalog fact, or undefined without exactly one supported own descriptor.
+*/
+function childCatalogFact(source) {
+	const id = source["childId"];
+	const descriptor = source["descriptor"];
+	const count = source["descriptorCount"];
+	const known = isSessionFormatJsonObject(descriptor) && [
+		1,
+		2,
+		3
+	].includes(descriptor["version"]);
+	if (count !== 1 || !known) return void 0;
+	if (typeof descriptor["provider"] !== "string") throw new SessionFormatUnsupportedMigrationError(`${childCatalogSubject(source)} has an invalid subagent descriptor provider`);
+	if (descriptor["version"] !== 1 && descriptor["mode"] !== "continuable" && descriptor["mode"] !== "one-shot") throw new SessionFormatUnsupportedMigrationError(`${childCatalogSubject(source)} has an invalid subagent descriptor mode`);
+	return catalogFact({
+		version: 0,
+		childId: id,
+		childCreatedAt: source["childCreatedAt"],
+		mode: descriptor["version"] === 1 ? "continuable" : descriptor["mode"],
+		...descriptor["label"] === void 0 ? {} : { label: descriptor["label"] }
+	}, childCatalogSubject(source));
+}
+/**
+* Validate the historical fields used for catalog membership without interpreting extensions.
+* @param value - catalog payload or prepared historical discovery fact.
+* @param subject - event type or child identity used in rejection diagnostics.
+* @returns validated catalog payload.
+*/
+function catalogFact(value, subject = "subagent/catalog") {
+	if (!isSessionFormatJsonObject(value) || value["version"] !== 0 && value["version"] !== 1 || typeof value["childId"] !== "string" || value["mode"] !== "continuable" && value["mode"] !== "one-shot" && value["mode"] !== "unknown" || value["version"] === 0 && value["mode"] === "unknown" || value["mode"] === "continuable" && typeof value["label"] !== "string" || value["label"] !== void 0 && typeof value["label"] !== "string") throw new SessionFormatError(`${subject} requires a supported versioned catalog fact`);
+	sessionFormatCount(value["childCreatedAt"], "catalog child creation time");
+	return value;
+}
+/**
+* Name the child and its optional storage-owned location in a migration diagnostic.
+* @param source - validated supplemental child evidence.
+* @returns a child identity with its source path when persistence supplied one.
+*/
+function childCatalogSubject(source) {
+	return `Session ${source["childId"]}${typeof source["sourcePath"] === "string" ? ` (raw log: ${source["sourcePath"]})` : ""}`;
+}
+/** Native V4 metadata and generation-owned relationship validation. */
+/**
+* Validate the exact native V4 logical header.
+* @param header - decoded or otherwise untrusted V4 Session header candidate.
+*/
+function assertReleasedV4Header(header) {
+	if (!isSessionFormatJsonObject(header) || header["version"] !== 4) throw new SessionFormatError("expected format v4 header");
+	const required = [
+		"version",
+		"id",
+		"createdAt",
+		"isSeeded",
+		"delegationDepth"
+	];
+	const allowed = /* @__PURE__ */ new Set([
+		...required,
+		"cwd",
+		"parentSession",
+		"origin",
+		"agentPreset"
+	]);
+	const missing = required.find((key) => !Object.hasOwn(header, key));
+	const unexpected = Object.keys(header).find((key) => !allowed.has(key));
+	if (missing !== void 0) throw new SessionFormatError(`format v4 header lacks required field ${missing}`);
+	if (unexpected !== void 0) throw new SessionFormatError(`format v4 header has unexpected field ${unexpected}`);
+	if (typeof header.id !== "string") throw new SessionFormatError("format v4 header id must be a string");
+	sessionFormatCount(header.createdAt, "format v4 header createdAt");
+	sessionFormatCount(header.delegationDepth, "format v4 header delegationDepth");
+	if (typeof header.isSeeded !== "boolean") throw new SessionFormatError("format v4 header isSeeded must be boolean");
+	if (header.cwd !== void 0 && (typeof header.cwd !== "string" || !isAbsolute(header.cwd))) throw new SessionFormatError("format v4 header cwd must be absolute");
+	for (const key of ["parentSession", "agentPreset"]) if (header[key] !== void 0 && typeof header[key] !== "string") throw new SessionFormatError(`format v4 header ${key} must be a string`);
+	if (header.origin !== void 0 && header.origin !== "subagent") throw new SessionFormatError("format v4 header origin must be \"subagent\"");
+}
+/**
+* Validate V4 inheritance, vocabulary, native message admission, and
+* lifecycle, compaction, tool, retry, title, command, catalog, and delivery ownership.
+* Installed Session restoration owns common event envelopes and message acceptance.
+* @param artifact - complete detached V4 artifact.
+* @param knownEventTypes - event types understood by the installed Session package.
+* @returns the same validated artifact and event objects.
+*/
+function restoreReleasedV4Artifact(artifact, knownEventTypes) {
+	assertReleasedV4Header(artifact.header);
+	const cut = sessionFormatCount(artifact.inheritedEventCount, "format v4 inherited event count");
+	if (cut > artifact.events.length) throw new SessionFormatError("format v4 inherited event count exceeds its events");
+	if (!artifact.header.isSeeded && cut !== 0) throw new SessionFormatError("unseeded format v4 Session has inherited events");
+	let lastInheritedMarker;
+	for (const [index, event] of artifact.events.entries()) {
+		if (!knownEventTypes.has(event.type) && event["ignorable"] !== true) throw new SessionFormatUnsupportedMigrationError(`format v4 contains unknown event type ${JSON.stringify(event.type)} at seq ${index}`);
+		if (event.seq !== index) throw new SessionFormatError(`format v4 event ${index} is not dense`);
+		if (!knownEventTypes.has(event.type)) continue;
+		assertV4RetiredSyntax(event);
+		assertV4SystemMessageFields(event);
+		assertV4ToolResultMessage(event);
+		assertV4ForkResult(event);
+		if (event.type === "session/end-seed" && isSessionFormatJsonObject(event.data) && event.data["inherited"] === true) lastInheritedMarker = index;
+	}
+	if (artifact.header.isSeeded && lastInheritedMarker !== cut) throw new SessionFormatError("format v4 seeded header disagrees with its last inherited end-seed marker");
+	if (!artifact.header.isSeeded && lastInheritedMarker !== void 0) throw new SessionFormatError("format v4 unseeded Session contains an inherited end-seed marker");
+	assertReleasedV4Relationships(artifact, knownEventTypes);
+	return artifact;
+}
+/**
+* Validate delivery generation and active-generation coordinates before evaluating ownership.
+* @param event - decoded event whose delivery payload may be inspected.
+* @param currentVersion - generation whose watermark coordinates are active.
+* @returns the active delivery's nonempty Session id, or undefined for other events and generations.
+*/
+function validateDeliveryAccepted(event, currentVersion) {
+	if (event.type !== "session-log-deepseek/delivery-accepted") return void 0;
+	const data = event.data;
+	if (!isSessionFormatJsonObject(data)) throw new SessionFormatError("delivery-accepted data must be an object");
+	if (sessionFormatCount(data["sessionFormatVersion"] === void 0 ? 0 : data["sessionFormatVersion"], "delivery sessionFormatVersion") !== currentVersion) return void 0;
+	if (sessionFormatCount(data["throughSeq"], "delivery throughSeq") >= event.seq) throw new SessionFormatError("delivery throughSeq must precede its marker");
+	const id = data["sessionId"];
+	if (typeof id !== "string" || id.length === 0) throw new SessionFormatError("delivery requires a nonempty Session id");
+	return id;
+}
+/**
+* Validate native developer fields, message sources, lifecycle, catalog, and delivery
+* relationships without changing event vocabulary or tail recovery.
+* The owning admission stage rejects unknown required events;
+* unknown ignorable records retain their uninterpreted payloads.
+* @param artifact - decoded artifact with its final inherited cut.
+* @param knownEventTypes - installed event types whose payloads this reader interprets.
+*/
+function assertReleasedV4Relationships(artifact, knownEventTypes) {
+	const ids = /* @__PURE__ */ new Set();
+	for (const event of artifact.events) {
+		if (!knownEventTypes.has(event.type)) continue;
+		assertV4DeveloperData(event);
+		assertV4MessageSources(event);
+		const deliveryId = validateDeliveryAccepted(event, 4);
+		if (deliveryId !== void 0 && !(artifact.header.parentSession !== void 0 && event.seq < artifact.inheritedEventCount) && deliveryId !== artifact.header.id) throw new SessionFormatError("current-generation delivery marker names the wrong Session");
+		if (event.type === "subagent/catalog" && event.seq >= artifact.inheritedEventCount) {
+			const id = catalogFact(event.data)["childId"];
+			if (ids.has(id)) throw new SessionFormatError(`duplicate catalog child ${id}`);
+			ids.add(id);
+		}
+	}
+	assertV4LifecycleRelationships(artifact, knownEventTypes);
+}
+/** V4 framing with native tool-role admission and released physical rows. */
+function physicalV2(value) {
+	if (!isSessionFormatJsonObject(value) || value["version"] !== 4) throw new SessionFormatError("expected format v4 physical header");
+	return {
+		...value,
+		version: 2
+	};
+}
+/**
+* V4 physical encoder and decoder retain the released row framing while
+* validating the native tool-role message directly.
+*/
+const releasedV4SessionFormatCodec = Object.freeze({
+	version: 4,
+	decodeHeader(value) {
+		return {
+			...releasedV2SessionFormatCodec.decodeHeader(physicalV2(value)),
+			version: 4
+		};
+	},
+	createDecoder(value, recovery) {
+		const decoder = releasedV2SessionFormatCodec.createDecoder(physicalV2(value), recovery);
+		return {
+			...decoder,
+			header: {
+				...decoder.header,
+				version: 4
+			},
+			decodeRow(row, context) {
+				assertV4RowAdmission(row);
+				decoder.decodeRow(row, {
+					emitRun: context.emitRun.bind(context),
+					emitEvent: context.emitEvent.bind(context)
+				});
+			}
+		};
+	},
+	encodeHeader(header, inheritedEventCount) {
+		assertReleasedV4Header(header);
+		return {
+			...releasedV2SessionFormatCodec.encodeHeader({
+				...header,
+				version: 2
+			}, inheritedEventCount),
+			version: 4
+		};
+	},
+	encodeEvent(event) {
+		if (event.type === "developer/message" && event["ignorable"] === true) {
+			assertV4DeveloperData(event);
+			assertV4RetiredSyntax(event);
+		}
+		assertV4RowAdmission(event);
+		return releasedV2SessionFormatCodec.encodeEvent(event);
+	}
+});
+/**
+* Apply native V4 admission before a scanner discards a recoverable suffix.
+* Ignorable developer payloads require reader vocabulary; physical decoding defers them.
+* @param row - parsed physical row before framing and source-event range decoding.
+* @param knownEventTypes - installed event types, supplied by native readers before tail recovery.
+*/
+function assertV4RowAdmission(row, knownEventTypes) {
+	if (isSessionFormatJsonObject(row)) {
+		if (row["type"] === "developer/message" && row["ignorable"] === true && knownEventTypes?.has("developer/message") !== true) return;
+		assertV4DeveloperData(row);
+	}
+	assertV4SourceRowAdmission(row);
+	assertV4RetiredSyntax(row);
+	assertV4SystemMessageFields(row);
+	if (!isSessionFormatJsonObject(row) || row["type"] !== "tool/result") return;
+	const event = row;
+	assertV4ToolResultMessage(event);
+	assertV4ForkResult(event);
+}
+/** V3 content tags and request-tool fields admitted before V4 interpretation. */
+const V3_BLOCK_TYPES = /* @__PURE__ */ new Set([
+	"text",
+	"reasoning",
+	"image",
+	"file",
+	"tool-call",
+	"tool-result"
+]);
+function migrateBlock(value, subject) {
+	if (!isSessionFormatJsonObject(value) || typeof value["type"] !== "string") throw new SessionFormatError(`${subject} requires content blocks with string type tags`);
+	const type = value["type"];
+	if (V3_BLOCK_TYPES.has(type)) return value;
+	return {
+		...value,
+		type: `plugin:${type}`
+	};
+}
+/**
+* Convert declared content tags while keeping arguments and extension data opaque.
+* @param value - released content array.
+* @param subject - owning event and content location for diagnostics.
+* @returns content in the same order, sharing unchanged blocks and image references.
+*/
+function migrateV3Content(value, subject) {
+	if (!Array.isArray(value)) throw new SessionFormatError(`${subject} content must be an array`);
+	const mapped = value.map((block, index) => migrateBlock(block, `${subject}[${index}]`));
+	return mapped.every((block, index) => block === value[index]) ? value : mapped;
+}
+function migrateMessage(message, subject) {
+	const content = migrateV3Content(message["content"], subject);
+	return content === message["content"] ? message : {
+		...message,
+		content
+	};
+}
+function migrateChunk(value, subject) {
+	if (!isSessionFormatJsonObject(value)) return value;
+	if (value["type"] === "block-end") {
+		const block = migrateBlock(value["block"], `${subject}.block`);
+		return block === value["block"] ? value : {
+			...value,
+			block
+		};
+	}
+	if (value["type"] !== "block-start") return value;
+	const original = value["blockType"];
+	if (typeof original !== "string") throw new SessionFormatError(`${subject} blockType must be a string`);
+	const blockType = V3_BLOCK_TYPES.has(original) ? original : `plugin:${original}`;
+	return blockType === original ? value : {
+		...value,
+		blockType
+	};
+}
+/**
+* Convert declared V3 extension content and stream tags after canonical result lifting.
+* @param event - source event after producer attribution conversion.
+* @returns the event with namespaced content tags, retaining all coordinates and other fields.
+* @throws {SessionFormatUnsupportedMigrationError} A V3 tool definition contains the V4-only deferLoading field.
+*/
+function migrateV3EventContent(event) {
+	const subject = `format v3 ${event.type} at seq ${event.seq}`;
+	let mapped = mapEventMessages(event, (message) => migrateMessage(message, subject));
+	if (!isSessionFormatJsonObject(mapped.data)) return mapped;
+	let data = mapped.data;
+	const contentField = (key) => {
+		const content = migrateV3Content(data[key], `${subject}.${key}`);
+		if (content !== data[key]) data = {
+			...data,
+			[key]: content
+		};
+	};
+	if (event.type === "compaction/summary") {
+		contentField("summary");
+		if (data["rawOutput"] !== void 0) contentField("rawOutput");
+	} else if (event.type === "tool/ptc-dispatch") contentField("content");
+	else if (event.type === "team/message/queued" && isSessionFormatJsonObject(data["message"])) {
+		const message = migrateMessage(data["message"], subject);
+		if (message !== data["message"]) data = {
+			...data,
+			message
+		};
+	}
+	if (event.type === "request/header" && isSessionFormatJsonObject(data["header"])) {
+		const tools = data["header"]["tools"];
+		if (Array.isArray(tools)) {
+			for (const [index, tool] of tools.entries()) if (isSessionFormatJsonObject(tool) && Object.hasOwn(tool, "deferLoading")) throw new SessionFormatUnsupportedMigrationError(`${subject}.header.tools[${index}] contains deferLoading, which is only defined in V4`);
+		}
+	}
+	if ((event.type === "assistant/message" || event.type === "assistant/attempt") && Array.isArray(data["stream"])) {
+		const stream = data["stream"];
+		const converted = stream.map((entry, index) => {
+			if (!isSessionFormatJsonObject(entry) || entry["type"] !== "chunk") return entry;
+			const chunk = migrateChunk(entry["chunk"], `${subject}.stream[${index}]`);
+			return chunk === entry["chunk"] ? entry : {
+				...entry,
+				chunk
+			};
+		});
+		if (converted.some((entry, index) => entry !== stream[index])) data = {
+			...data,
+			stream: converted
+		};
+	}
+	if (data !== mapped.data) mapped = {
+		...mapped,
+		data
+	};
+	return mapped;
+}
+/** Fixed V3 event vocabulary and namespaced historical opaque events. */
+/** First-party event names understood by the released V3 reader, independent of the installed writer. */
+const RELEASED_V3_EVENT_TYPES = /* @__PURE__ */ new Set([
+	"agent-preset/selected",
+	"agent/inbox/spliced",
+	"approval/asked",
+	"approval/decided",
+	"approval/policy",
+	"assistant/attempt",
+	"assistant/message",
+	"command/done",
+	"command/run",
+	"compaction/end",
+	"compaction/prune",
+	"compaction/start",
+	"compaction/summary",
+	"deliverables/presented",
+	"feedback/message-delete",
+	"feedback/message-put",
+	"feedback/record",
+	"goal/change",
+	"hook/invoked",
+	"hook/result",
+	"image/offload",
+	"llm/retry",
+	"llm/retry-started",
+	"model/selection",
+	"permission/preset",
+	"plan/mode",
+	"request/context",
+	"request/header",
+	"sandbox/mode",
+	"schedule/change",
+	"session-log-deepseek/delivery-accepted",
+	"session/end-seed",
+	"session/title",
+	"session/title-llm-request",
+	"step/end",
+	"step/start",
+	"subagent/catalog",
+	"subagent/descriptor",
+	"subagent/model-selection-policy",
+	"system/message",
+	"team/member",
+	"team/message/delivered",
+	"team/message/queued",
+	"team/task",
+	"todo/write",
+	"tool-workflow/agent-end",
+	"tool-workflow/agent-start",
+	"tool-workflow/run-end",
+	"tool-workflow/run-start",
+	"tool/call",
+	"tool/ptc-dispatch",
+	"tool/ptc-dispatch-start",
+	"tool/result",
+	"turn/end",
+	"turn/start",
+	"user/message",
+	"web/deepseek-search-llm-request",
+	"workspace/changes"
+]);
+/**
+* Keep unknown ignorable events opaque after header promotion.
+* @param event - original V3 event; this incoming identity conversion is applied once.
+* @returns the same event or an ignorable namespaced event retaining its payload and coordinates.
+*/
+function namespaceV3OpaqueEvent(event) {
+	return event["ignorable"] === true && !RELEASED_V3_EVENT_TYPES.has(event.type) ? {
+		...event,
+		type: `plugin:${event.type}`,
+		ignorable: true
+	} : event;
+}
+/** Remap released V3 local event references after interrupted-turn insertion. */
+function object$1(value) {
+	if (!isSessionFormatJsonObject(value)) throw new SessionFormatError("V3 event reference container must be an object");
+	return value;
+}
+/**
+* Remap first-party local references, retaining generation-qualified captures and numeric payloads.
+* @param event - first-party source event before envelope renumbering.
+* @param seq - target event position.
+* @param mapping - target positions of all earlier source events.
+* @returns the event with target coordinates; unchanged events retain their identity.
+*/
+function remapV3References(event, seq, mapping) {
+	if (seq === event.seq) return event;
+	const reference = (value) => {
+		const source = sessionFormatCount(value, "V3 source event reference");
+		const target = mapping[source];
+		if (source >= event.seq || target === void 0) throw new SessionFormatError("V3 reference must name an earlier source event");
+		return target;
+	};
+	const references = (value) => {
+		if (!Array.isArray(value)) throw new SessionFormatError("V3 event references must be an array");
+		return value.map(reference);
+	};
+	let data = event.data;
+	switch (event.type) {
+		case "command/done": {
+			const source = object$1(data);
+			if (source["sourceEventSeq"] !== void 0) data = {
+				...source,
+				sourceEventSeq: reference(source["sourceEventSeq"])
+			};
+			break;
+		}
+		case "compaction/summary":
+		case "compaction/prune": {
+			const source = object$1(data);
+			const range = object$1(source["shadowedRange"]);
+			data = {
+				...source,
+				shadowedRange: {
+					...range,
+					start: reference(range["start"]),
+					end: reference(range["end"])
+				},
+				shadowedSeqs: references(source["shadowedSeqs"])
+			};
+			break;
+		}
+		case "session/title":
+		case "session/title-llm-request": {
+			const source = object$1(data);
+			data = {
+				...source,
+				messageSeqs: references(source["messageSeqs"])
+			};
+			break;
+		}
+		case "image/offload": {
+			const source = object$1(data);
+			const targets = source["targets"];
+			if (!Array.isArray(targets)) throw new SessionFormatError("V3 image offload targets must be an array");
+			data = {
+				...source,
+				targets: targets.map((value) => {
+					const target = object$1(value);
+					return {
+						...target,
+						seq: reference(target["seq"])
+					};
+				})
+			};
+			break;
+		}
+	}
+	const surface = event["surfaceOp"];
+	const range = surface === void 0 || surface === "append" ? void 0 : object$1(surface);
+	return {
+		...event,
+		seq,
+		data,
+		...event["sourceEventSeqs"] === void 0 ? {} : { sourceEventSeqs: references(event["sourceEventSeqs"]) },
+		...range === void 0 ? {} : { surfaceOp: {
+			...range,
+			startSeq: reference(range["startSeq"]),
+			endSeq: reference(range["endSeq"])
+		} }
+	};
+}
+/** Append historical child facts after converting V3 source events to V4. */
+/** Header-only migration declaration; body restoration requires explicit child evidence. */
+const sessionFormatV3ToV4 = defineSessionFormatMigration({
+	name: "@deepseek-ai/dsh-session-format-v3-to-v4",
+	fromVersion: 3,
+	toVersion: 4,
+	migrateHeader(header) {
+		assertReleasedV3Header(header);
+		return {
+			...header,
+			version: 4
+		};
+	},
+	createStage() {
+		throw new SessionFormatUnsupportedMigrationError("V3 catalog migration requires explicit historical child facts, including an empty array for a parent without children");
+	},
+	validateTargetHeader: assertReleasedV4Header
+});
+/**
+* Bind one parent's historical child evidence to its V3→V4 migration.
+* @param children - complete child evidence retained unchanged for the lifetime of this declaration; an empty array declares no children.
+* @returns an adjacent migration that creates independent stages with the supplied evidence.
+*/
+function createSessionFormatV3ToV4(children) {
+	return defineSessionFormatMigration({
+		...sessionFormatV3ToV4,
+		createStage: (input) => new ReleasedV3ToV4Stage(input, children)
+	});
+}
+var ReleasedV3ToV4Stage = class {
+	input;
+	headerInheritedEventCount;
+	candidates;
+	catalogs = [];
+	cut;
+	sourceCut;
+	mapping = [];
+	turn;
+	stepOpen = false;
+	nextTurnSpliced = false;
+	nextSeq = 0;
+	time;
+	foreignDeliverySeq;
+	constructor(input, children) {
+		this.input = input;
+		this.candidates = children.map(childCatalogSource).sort((left, right) => left["childCreatedAt"] - right["childCreatedAt"] || (left["childId"] === right["childId"] ? 0 : left["childId"] < right["childId"] ? -1 : 1));
+		this.cut = input.sourceHeader.isSeeded ? void 0 : 0;
+		this.sourceCut = this.cut;
+		if (!input.sourceHeader.isSeeded) this.headerInheritedEventCount = 0;
+		this.time = input.sourceHeader.createdAt;
+	}
+	transformEvent(event, context) {
+		if (event.seq !== this.mapping.length) throw new SessionFormatError("V3 source events must be dense");
+		const interrupted = this.observeRestart(event);
+		if (interrupted !== void 0) context.emitEvent({
+			type: "turn/end",
+			seq: this.nextSeq++,
+			time: event.time,
+			data: {
+				turn: interrupted,
+				reason: { kind: "interrupted" }
+			}
+		});
+		const targetSeq = this.nextSeq++;
+		this.time = event.time;
+		if (event.type === "session/end-seed" && isSessionFormatJsonObject(event.data) && event.data["inherited"] === true) {
+			if (!this.input.sourceHeader.isSeeded) throw new SessionFormatError("unseeded format v3 Session contains an inherited end-seed marker");
+			this.sourceCut = event.seq;
+			this.cut = targetSeq;
+			this.catalogs.length = 0;
+		} else if (event.type === "subagent/catalog") this.catalogs.push(event.data);
+		const deliveryId = validateDeliveryAccepted(event, 3);
+		if (event.type === "session-log-deepseek/delivery-accepted") {
+			if (event.data["sessionFormatVersion"] === 4) throw new SessionFormatUnsupportedMigrationError("format v3 delivery marker claims target format v4");
+			if (deliveryId !== void 0 && deliveryId !== this.input.sourceHeader.id) this.foreignDeliverySeq = event.seq;
+		}
+		const opaque = namespaceV3OpaqueEvent(event);
+		if (opaque !== event) {
+			this.mapping.push(targetSeq);
+			context.emitEvent(opaque.seq === targetSeq ? opaque : {
+				...opaque,
+				seq: targetSeq
+			});
+			return;
+		}
+		if (!RELEASED_V3_EVENT_TYPES.has(event.type)) throw new SessionFormatUnsupportedMigrationError(`format v3 contains unknown event type ${JSON.stringify(event.type)} at seq ${event.seq}`);
+		const remapped = remapV3References(event, targetSeq, this.mapping);
+		this.mapping.push(targetSeq);
+		const rewritten = mapEventMessages(remapped, (message) => {
+			const source = message["source"];
+			if (!isSessionFormatJsonObject(source)) return message;
+			const converted = rewriteV3MessageSource(source, event.seq, message["role"]);
+			return converted === source ? message : {
+				...message,
+				source: converted
+			};
+		});
+		context.emitEvent(migrateV3EventContent(liftToolResult(rewritten)));
+	}
+	transformRun(run, context) {
+		for (const event of run.expand()) this.transformEvent(event, context);
+	}
+	observeRestart(event) {
+		const data = event.data;
+		const interrupted = event.type === "turn/start" && this.turn !== void 0 && !this.stepOpen && this.nextTurnSpliced && isSessionFormatJsonObject(data) && data["turn"] === this.turn + 1 ? this.turn : void 0;
+		this.nextTurnSpliced = event.type === "agent/inbox/spliced" && isSessionFormatJsonObject(data) && data["target"] === "next-turn" && Array.isArray(data["inserted"]) && data["inserted"].length > 0;
+		if (event.type === "turn/start" && isSessionFormatJsonObject(data) && typeof data["turn"] === "number") this.turn = data["turn"];
+		else if (event.type === "turn/end") this.turn = void 0;
+		else if (event.type === "step/start") this.stepOpen = true;
+		else if (event.type === "step/end") this.stepOpen = false;
+		return interrupted;
+	}
+	finish(context) {
+		const cut = sessionFormatCount(this.cut, "V3 inherited event count");
+		const sourceCut = sessionFormatCount(this.sourceCut, "V3 source inherited event count");
+		const existingCatalogs = /* @__PURE__ */ new Map();
+		for (const data of this.catalogs) {
+			const fact = catalogFact(data);
+			const id = fact["childId"];
+			if (existingCatalogs.has(id)) throw new SessionFormatUnsupportedMigrationError(`duplicate catalog child ${id}`);
+			existingCatalogs.set(id, fact);
+		}
+		if (this.input.sourceInheritedEventCount !== void 0 && sourceCut !== this.input.sourceInheritedEventCount) throw new SessionFormatError("format v3 inherited cut disagrees with its source marker");
+		if (this.foreignDeliverySeq !== void 0 && (this.input.sourceHeader.parentSession === void 0 || this.foreignDeliverySeq >= sourceCut)) throw new SessionFormatError("current-generation delivery marker names the wrong Session");
+		for (const source of this.candidates) {
+			const id = source["childId"];
+			const existing = existingCatalogs.get(id);
+			const fact = childCatalogFact(source);
+			if (existing !== void 0) {
+				if (existing["childCreatedAt"] !== source["childCreatedAt"]) throw new SessionFormatUnsupportedMigrationError(`${childCatalogSubject(source)} conflicts with its parent catalog`);
+				if (fact !== void 0 && ["mode", "label"].some((key) => existing[key] !== fact[key])) throw new SessionFormatUnsupportedMigrationError(`${childCatalogSubject(source)} conflicts with its parent catalog`);
+				continue;
+			}
+			const entry = fact ?? {
+				version: 1,
+				childId: id,
+				childCreatedAt: source["childCreatedAt"],
+				mode: "unknown"
+			};
+			existingCatalogs.set(id, entry);
+			context.emitEvent({
+				type: "subagent/catalog",
+				seq: this.nextSeq++,
+				time: this.time,
+				data: entry
+			});
+		}
+		return cut;
+	}
+};
+//#endregion
 //#region ../../../vendor/deepseek-harness/packages/session/session-format-catalog/lib/index.js
 /** Pure first-party message interpreters for detached current-format replay, including browser readers. */
 /** Installed interpretation definitions; recovery listeners are mounted separately by their owning plugins. */
@@ -18856,34 +20446,72 @@ function validateInstalledCurrentSessionArtifact(artifact) {
 * GENERATED by `scripts/gen-session-format-catalog.ts` — do not edit by hand.
 * The direct imports make historical readability independent of mounted plugins.
 */
-/** Physical codec dispatch and complete adjacent chain, independent of mounted plugins. */
-const sessionFormatCatalog = createSessionFormatCatalog({
-	currentVersion: 3,
+/** Static assembly shared by current reads and parent-specific historical restoration. */
+const sessionFormatCatalogOptions = {
+	currentVersion: 4,
 	codecs: [
 		releasedV0SessionFormatCodec,
 		releasedV1SessionFormatCodec,
 		releasedV2SessionFormatCodec,
-		releasedV3SessionFormatCodec
+		releasedV3SessionFormatCodec,
+		releasedV4SessionFormatCodec
 	],
-	currentEncoder: releasedV3SessionFormatCodec,
+	currentEncoder: releasedV4SessionFormatCodec,
 	migrations: [
 		sessionFormatV0ToV1,
 		sessionFormatV1ToV2,
-		sessionFormatV2ToV3
+		sessionFormatV2ToV3,
+		sessionFormatV3ToV4
 	],
 	restoreCurrent(artifact) {
-		const restored = restoreReleasedV3Artifact(artifact, KNOWN_SESSION_EVENT_TYPES);
+		const restored = restoreReleasedV4Artifact(artifact, KNOWN_SESSION_EVENT_TYPES);
 		validateInstalledCurrentSessionArtifact(restored);
 		return restored;
 	},
 	restoreTransformedCurrent(artifact) {
-		return restoreReleasedV3Artifact(artifact, KNOWN_SESSION_EVENT_TYPES);
+		return restoreReleasedV4Artifact(artifact, KNOWN_SESSION_EVENT_TYPES);
 	},
 	restoreCurrentHeader(header) {
-		assertReleasedV3Header(header);
+		assertReleasedV4Header(header);
 		validateInstalledCurrentSessionHeader(header);
 		return header;
 	}
+};
+/** Physical codec dispatch and complete adjacent chain, independent of mounted plugins. */
+const sessionFormatCatalog = createSessionFormatCatalog(sessionFormatCatalogOptions);
+/** Bind parent-specific child evidence into the static first-party migration inventory. */
+/**
+* Assemble a catalog whose V3→V4 edge knows one parent's historical children.
+* @param children - complete child evidence retained unchanged for the catalog's lifetime; an empty array declares no children.
+* @returns a catalog with independent restore state per artifact and unchanged current-format readers.
+*/
+function createSessionFormatCatalogWithChildren(children) {
+	const migration = createSessionFormatV3ToV4(children);
+	return createSessionFormatCatalog({
+		...sessionFormatCatalogOptions,
+		migrations: sessionFormatCatalogOptions.migrations.map((edge) => edge === sessionFormatV3ToV4 ? migration : edge)
+	});
+}
+createSessionFormatCatalog({
+	currentVersion: 3,
+	codecs: [
+		releasedV0SessionFormatCodec,
+		releasedV1SessionFormatCodec,
+		releasedV2SessionFormatCodec,
+		releasedV3SessionFormatCodec
+	],
+	currentEncoder: releasedV3SessionFormatCodec,
+	migrations: [
+		sessionFormatV0ToV1,
+		sessionFormatV1ToV2,
+		sessionFormatV2ToV3
+	],
+	restoreCurrent: (artifact) => restoreReleasedV3Artifact(artifact, RELEASED_V3_EVENT_TYPES),
+	restoreTransformedCurrent: (artifact) => restoreReleasedV3Artifact(artifact, RELEASED_V3_EVENT_TYPES),
+	restoreCurrentHeader(header) {
+		assertReleasedV3Header(header);
+		return header;
+	}
 });
 //#endregion
 //#region ../session-rdb/src/log.ts
@@ -18910,7 +20538,8 @@ function rowToMeta(row) {
 		...row.fParentSession !== null ? { parentSession: row.fParentSession } : {},
 		isSeeded: row.fSeedLength !== null,
 		...row.fOrigin !== null ? { origin: row.fOrigin } : {},
-		...row.fDelegationDepth === null ? {} : { delegationDepth: row.fDelegationDepth }
+		...row.fDelegationDepth === null ? {} : { delegationDepth: row.fDelegationDepth },
+		...row.fAgentPreset === null ? {} : { agentPreset: row.fAgentPreset }
 	};
 }
 function sessionInsertRow(storage, incarnation) {
@@ -18926,6 +20555,7 @@ function sessionInsertRow(storage, incarnation) {
 		fSeedLength: meta.isSeeded ? storage.inheritedEventCount : null,
 		fOrigin: meta.origin ?? null,
 		fDelegationDepth: meta.delegationDepth ?? null,
+		fAgentPreset: meta.agentPreset ?? null,
 		fIncarnation: incarnation,
 		fRevision: 0
 	};
@@ -18939,7 +20569,8 @@ function sessionConflictRow(storage) {
 		fParentSession: meta.parentSession ?? null,
 		fSeedLength: meta.isSeeded ? storage.inheritedEventCount : null,
 		fOrigin: meta.origin ?? null,
-		fDelegationDepth: meta.delegationDepth ?? null
+		fDelegationDepth: meta.delegationDepth ?? null,
+		fAgentPreset: meta.agentPreset ?? null
 	};
 }
 function rowToEvent(row) {
@@ -19030,28 +20661,15 @@ function toolResultRewriteContentOnly(original, replacement) {
 	const replacementData = replacement.data;
 	const originalMessage = originalData["message"];
 	const replacementMessage = replacementData["message"];
-	const originalContent = Array.isArray(originalMessage?.content) ? originalMessage.content : void 0;
-	const replacementContent = Array.isArray(replacementMessage?.content) ? replacementMessage.content : void 0;
-	if (originalContent === void 0 || replacementContent === void 0) return false;
-	return isDeepEqualJson({
-		...originalData,
+	if (!Array.isArray(originalMessage?.content) || !Array.isArray(replacementMessage?.content)) return false;
+	const rest = (data, message) => ({
+		...data,
 		message: {
-			...originalMessage,
-			content: [{
-				...originalContent[0],
-				content: null
-			}]
-		}
-	}, {
-		...replacementData,
-		message: {
-			...replacementMessage,
-			content: [{
-				...replacementContent[0],
-				content: null
-			}]
+			...message,
+			content: null
 		}
 	});
+	return isDeepEqualJson(rest(originalData, originalMessage), rest(replacementData, replacementMessage));
 }
 function findSurfaceRepairs(events) {
 	const nodes = [];
@@ -19241,6 +20859,87 @@ function renameLegacyPtcEvents(events) {
 		}
 	}
 }
+/**
+* 把**旧代（v3 及更早）的消息形状**归一到当前格式（v4）：迁移链（严格）拒绝那些形状时，读路径仍要
+* 能把它们读出来——只动字段与标记，不改坐标、不改内容。
+*
+* 三件事：
+* - `system/message` 的 source：`{ kind: 'plugin', plugin: '@deepseek-ai/dsh-system-prompt' }` → `{ kind: 'system-prompt' }`
+*   （v4 起 system 消息只认这个 kind）；
+* - `tool/result` 的消息：v3 是 user 角色、结果块包在 `content[0]`；v4 是 `role: 'tool'` + 顶层
+*   `toolCallId` + `content` 就是结果块；
+* - 本仓库自己写过、上游已删除的事件类型（见 `LEGACY_OWN_EVENT_TYPES`）标 `ignorable: true`——v4 的
+*   校验对未知类型只接受可忽略信封。
+*
+* 只认这张白名单：**其它未知类型保持 fail loud**（那是「数据来自更新的 harness」的信号，不能吞掉）。
+*/
+function normalizeToCurrentShape(events) {
+	for (const event of events) {
+		const type = event.type;
+		if (LEGACY_OWN_EVENT_TYPES.has(type)) {
+			event.ignorable = true;
+			continue;
+		}
+		if (type === "system/message") {
+			const message = event.data["message"];
+			liftSystemMessageSource(message);
+			continue;
+		}
+		if (type === "tool/result") {
+			const message = event.data["message"];
+			liftToolResultMessage(message);
+		}
+	}
+}
+function liftSystemMessageSource(message) {
+	if (typeof message !== "object" || message === null) return;
+	const record = message;
+	const source = record["source"];
+	if (typeof source !== "object" || source === null) return;
+	if (source["kind"] !== "plugin") return;
+	record["source"] = { kind: "system-prompt" };
+}
+function liftToolResultMessage(message) {
+	if (typeof message !== "object" || message === null) return;
+	const record = message;
+	if (record["role"] === "tool" && typeof record["toolCallId"] === "string") return;
+	const source = record["source"];
+	const block = Array.isArray(record["content"]) ? record["content"][0] : void 0;
+	if (typeof block !== "object" || block === null) return;
+	const lifted = block;
+	const callId = lifted["toolCallId"] ?? source?.["callId"];
+	if (typeof callId !== "string") return;
+	record["role"] = "tool";
+	record["toolCallId"] = callId;
+	record["content"] = Array.isArray(lifted["content"]) ? lifted["content"] : [];
+	if (typeof lifted["isError"] === "boolean") record["isError"] = lifted["isError"];
+	record["source"] = {
+		kind: "tool",
+		callId
+	};
+}
+/**
+* 本仓库写过、后来连同机制一起删除的事件类型：读的时候标 `ignorable: true` 让校验跳过它们。
+* 新增历史类型时登记到这里——**不要**用「所有未知类型」代替（那会掩盖更新版本的未知事件）。
+*/
+const LEGACY_OWN_EVENT_TYPES = /* @__PURE__ */ new Set(["session-branch/version"]);
+/** 行里是否还带着旧代消息形状（`session-branch/version` 这类自造事件也算）——写路径曾把回退视图的结果
+* 以当前版本号落库，所以**版本号不可信**，读之前要按内容判一次。 */
+function hasLegacyShape(events) {
+	for (const event of events) {
+		const type = event.type;
+		if (LEGACY_OWN_EVENT_TYPES.has(type)) return true;
+		if (type === "system/message") {
+			if ((event.data["message"]?.["source"])?.["kind"] === "plugin") return true;
+			continue;
+		}
+		if (type === "tool/result") {
+			const message = event.data["message"];
+			if (message !== void 0 && message["role"] !== "tool") return true;
+		}
+	}
+	return false;
+}
 function repairReadView(events) {
 	repairAssistantSettlement(events);
 	repairRequestHeaders(events);
@@ -22956,7 +24655,7 @@ function buildColumn(name, c, tables) {
 	let col;
 	switch (c.type) {
 		case "text": {
-			const built = text$2(name);
+			const built = text$3(name);
 			col = c.primaryKey ? built.primaryKey() : built;
 			break;
 		}
@@ -23066,6 +24765,7 @@ const sessions = {
 		f_seed_length: { type: "integer" },
 		f_origin: { type: "text" },
 		f_delegation_depth: { type: "integer" },
+		f_agent_preset: { type: "text" },
 		f_incarnation: {
 			type: "text",
 			notNull: true
@@ -23075,6 +24775,8 @@ const sessions = {
 			notNull: true
 		},
 		f_archived_at: { type: "bigint" },
+		f_pinned_seq: { type: "integer" },
+		f_last_event_at: { type: "bigint" },
 		f_title: { type: "text" },
 		f_title_seq: { type: "integer" }
 	}
@@ -23345,23 +25047,28 @@ const eventUsage = {
 		f_model: { type: "text" },
 		f_input_tokens: {
 			type: "integer",
-			notNull: true
+			notNull: true,
+			default: 0
 		},
 		f_output_tokens: {
 			type: "integer",
-			notNull: true
+			notNull: true,
+			default: 0
 		},
 		f_cache_read_tokens: {
 			type: "integer",
-			notNull: true
+			notNull: true,
+			default: 0
 		},
 		f_reasoning_tokens: {
 			type: "integer",
-			notNull: true
+			notNull: true,
+			default: 0
 		},
 		f_total_tokens: {
 			type: "integer",
-			notNull: true
+			notNull: true,
+			default: 0
 		}
 	},
 	indexes: { idx_event_usage_created_at: { columns: ["f_created_at"] } }
@@ -23492,7 +25199,7 @@ function eventDimensions(event) {
 			kind,
 			role: "tool",
 			name: "",
-			actionId: data["message"]?.content?.[0]?.toolCallId ?? ""
+			actionId: data["message"]?.toolCallId ?? ""
 		};
 		case "tool/call": return {
 			kind,
@@ -23975,11 +25682,16 @@ function createStorageRepository(host) {
 			if (row === void 0) return null;
 			const ordered = await allRows(db.select().from(tWorkspaces).where(gte(tWorkspaces.fPosition, 0)).orderBy(tWorkspaces.fPosition));
 			const archives = await allRows(db.select({ fSessionId: tSessions.fSessionId }).from(tSessions).where(isNotNull(tSessions.fArchivedAt)).orderBy(tSessions.fArchivedAt));
+			const pinned = await allRows(db.select({
+				fSessionId: tSessions.fSessionId,
+				fPinnedSeq: tSessions.fPinnedSeq
+			}).from(tSessions).where(isNotNull(tSessions.fPinnedSeq)).orderBy(tSessions.fPinnedSeq));
 			const pendingMutation = pendingMutationOf(row);
 			return {
 				initialized: row.fInitialized !== 0,
 				workspaceIds: ordered.map((entry) => entry.fWorkspaceId),
 				archivedSessionIds: archives.map((entry) => entry.fSessionId),
+				pinnedSessionIds: pinned.map((entry) => entry.fSessionId),
 				...pendingMutation === void 0 ? {} : { pendingMutation }
 			};
 		},
@@ -23999,6 +25711,9 @@ function createStorageRepository(host) {
 				}));
 				await runQuery(db.update(tWorkspaces).set({ fPosition: -1 }));
 				for (const [position, workspaceId] of state.workspaceIds.entries()) await runQuery(db.update(tWorkspaces).set({ fPosition: position }).where(eq(tWorkspaces.fWorkspaceId, workspaceId)));
+				const pinned = state.pinnedSessionIds ?? [];
+				await runQuery(pinned.length === 0 ? db.update(tSessions).set({ fPinnedSeq: null }).where(isNotNull(tSessions.fPinnedSeq)) : db.update(tSessions).set({ fPinnedSeq: null }).where(and(isNotNull(tSessions.fPinnedSeq), notInArray(tSessions.fSessionId, pinned))));
+				for (const [position, sessionId] of pinned.entries()) await runQuery(db.update(tSessions).set({ fPinnedSeq: position }).where(eq(tSessions.fSessionId, sessionId)));
 				const archived = state.archivedSessionIds;
 				await runQuery(archived.length === 0 ? db.update(tSessions).set({ fArchivedAt: null }).where(isNotNull(tSessions.fArchivedAt)) : db.update(tSessions).set({ fArchivedAt: null }).where(and(isNotNull(tSessions.fArchivedAt), notInArray(tSessions.fSessionId, archived))));
 				const stamp = Date.now();
@@ -24154,6 +25869,19 @@ function backfillEventUsage(db) {
        AND (json_extract(e.f_data, '$.data.usage') IS NOT NULL
             OR json_extract(e.f_data, '$.usage') IS NOT NULL)`);
 }
+function sessionListRowOf(row) {
+	return {
+		sessionId: typeof row["session_id"] === "string" ? row["session_id"] : String(row["session_id"]),
+		title: typeof row["title"] === "string" ? row["title"] : null,
+		origin: typeof row["origin"] === "string" ? row["origin"] : null,
+		cwd: typeof row["cwd"] === "string" ? row["cwd"] : null,
+		createdAt: Number(row["created_at"]),
+		updatedAt: Number(row["updated_at"]),
+		archived: row["archived"] === 1 || row["archived"] === true,
+		subagent: row["origin"] === "subagent",
+		workspace: typeof row["workspace"] === "string" ? row["workspace"] : null
+	};
+}
 /** SQL 的缺失求和是 NULL：没有 usage 字段的行使该字段计 0。 */
 function tokenTotalsOf$1(row) {
 	return {
@@ -24382,7 +26110,7 @@ var SqliteBackend = class SqliteBackend {
 		insertEvents: (events) => this.insertEvents(events),
 		insertBridges: (rows) => this.insertBridges(rows),
 		updateHead: (id, headEventId, headSequence) => this.updateHead(id, headEventId, headSequence),
-		bumpRevision: (id) => this.bumpRevision(id),
+		bumpRevision: (id, lastEventAt) => this.bumpRevision(id, lastEventAt),
 		refreshTitle: (id) => this.refreshTitle(id),
 		deleteBridgeTail: (id, fromSequence) => this.deleteBridgeTail(id, fromSequence),
 		getPrevBridge: (id, sequence) => this.getPrevBridge(id, sequence),
@@ -24431,8 +26159,11 @@ var SqliteBackend = class SqliteBackend {
 			fHeadSequence: headSequence
 		}).where(eq(tSessions.fSessionId, id)).run();
 	}
-	async bumpRevision(id) {
-		this.db.update(tSessions).set({ fRevision: sql`${tSessions.fRevision} + 1` }).where(eq(tSessions.fSessionId, id)).run();
+	async bumpRevision(id, lastEventAt) {
+		this.db.update(tSessions).set({
+			fRevision: sql`${tSessions.fRevision} + 1`,
+			...lastEventAt === void 0 ? {} : { fLastEventAt: sql`MAX(COALESCE(${tSessions.fLastEventAt}, 0), ${lastEventAt})` }
+		}).where(eq(tSessions.fSessionId, id)).run();
 	}
 	async refreshTitle(id) {
 		const row = this.db.select({
@@ -24487,6 +26218,45 @@ var SqliteBackend = class SqliteBackend {
 	* 沿 `t_events` 的事件类型数——两者限定在**有 token 用量的会话**里，时间范围各自按自己的
 	* `f_created_at`（同一时刻写入，口径一致）。
 	*/
+	async listSessionRows(query = {}) {
+		const needle = query.query?.trim().toLowerCase() ?? "";
+		const like = `%${needle}%`;
+		const where = `WHERE (? = '' OR lower(COALESCE(s.f_title, '')) LIKE ? OR lower(COALESCE(w.f_title, '')) LIKE ?)
+                     AND (? = 1 OR s.f_origin IS NOT 'subagent')`;
+		const filterParams = [
+			needle,
+			like,
+			like,
+			query.includeSubagents === true ? 1 : 0
+		];
+		const limit = query.limit ?? 20;
+		const offset = query.offset ?? 0;
+		const rows = this.db.$client.prepare(`SELECT s.f_session_id AS session_id,
+                s.f_title AS title,
+                s.f_origin AS origin,
+                s.f_cwd AS cwd,
+                s.f_created_at AS created_at,
+                (s.f_archived_at IS NOT NULL) AS archived,
+                COALESCE(s.f_last_event_at, s.f_created_at) AS updated_at,
+                w.f_title AS workspace
+           FROM t_sessions s
+           LEFT JOIN t_workspaces w ON w.f_workspace_id = (
+                 SELECT b.f_workspace_id FROM t_workspace_sessions b
+                  WHERE b.f_session_id = s.f_session_id ORDER BY b.f_position LIMIT 1)
+          ${where}
+          ORDER BY updated_at DESC, s.f_session_id
+          LIMIT ? OFFSET ?`).all(...filterParams, limit, offset);
+		const counted = this.db.$client.prepare(`SELECT count(*) AS n
+           FROM t_sessions s
+           LEFT JOIN t_workspaces w ON w.f_workspace_id = (
+                 SELECT b.f_workspace_id FROM t_workspace_sessions b
+                  WHERE b.f_session_id = s.f_session_id ORDER BY b.f_position LIMIT 1)
+          ${where}`).get(...filterParams);
+		return {
+			items: rows.map((row) => sessionListRowOf(row)),
+			total: Number(counted.n)
+		};
+	}
 	async usageReport(sinceMs) {
 		const usageSince = sinceMs === void 0 ? "" : " AND u.f_created_at >= ?";
 		const params = sinceMs === void 0 ? [] : [sinceMs];
@@ -24777,7 +26547,7 @@ var PostgresBackend = class PostgresBackend {
 			insertEvents: (events) => this.insertEvents(tx, events),
 			insertBridges: (rows) => this.insertBridges(tx, rows),
 			updateHead: (id, headEventId, headSequence) => this.updateHead(tx, id, headEventId, headSequence),
-			bumpRevision: (id) => this.bumpRevision(tx, id),
+			bumpRevision: (id, lastEventAt) => this.bumpRevision(tx, id, lastEventAt),
 			refreshTitle: (id) => this.refreshTitle(tx, id),
 			deleteBridgeTail: (id, fromSequence) => this.deleteBridgeTail(tx, id, fromSequence),
 			getPrevBridge: (id, sequence) => this.getPrevBridge(tx, id, sequence),
@@ -24830,8 +26600,12 @@ var PostgresBackend = class PostgresBackend {
 			fHeadSequence: headSequence
 		}).where(eq(this.tables["t_sessions"].fSessionId, id)).execute();
 	}
-	async bumpRevision(exec, id) {
-		await exec.update(this.tables["t_sessions"]).set({ fRevision: sql`${this.tables["t_sessions"].fRevision} + 1` }).where(eq(this.tables["t_sessions"].fSessionId, id)).execute();
+	async bumpRevision(exec, id, lastEventAt) {
+		const sessions = this.tables["t_sessions"];
+		await exec.update(sessions).set({
+			fRevision: sql`${sessions.fRevision} + 1`,
+			...lastEventAt === void 0 ? {} : { fLastEventAt: sql`GREATEST(COALESCE(${sessions.fLastEventAt}, 0), ${lastEventAt})` }
+		}).where(eq(sessions.fSessionId, id)).execute();
 	}
 	async refreshTitle(exec, id) {
 		const bridges = this.tables["t_session_events"];
@@ -24917,6 +26691,55 @@ var PostgresBackend = class PostgresBackend {
     `);
 	}
 	/** 用量聚合：与 SQLite 侧同形，读 `t_event_usage`，数值列回来是字符串。 */
+	async listSessionRows(query = {}) {
+		const needle = query.query?.trim().toLowerCase() ?? "";
+		const like = `%${needle}%`;
+		const includeSubagents = query.includeSubagents === true;
+		const limit = query.limit ?? 20;
+		const offset = query.offset ?? 0;
+		const tSessions = this.tables["t_sessions"];
+		const tWorkspaces = this.tables["t_workspaces"];
+		const tWorkspaceSessions = this.tables["t_workspace_sessions"];
+		const workspaceTitle = sql`(SELECT w.f_title FROM ${tWorkspaceSessions} b
+                                     JOIN ${tWorkspaces} w ON w.f_workspace_id = b.f_workspace_id
+                                    WHERE b.f_session_id = s.f_session_id
+                                    ORDER BY b.f_position LIMIT 1)`;
+		const where = sql`WHERE (${needle} = ''
+                          OR lower(COALESCE(s.f_title, '')) LIKE ${like}
+                          OR lower(COALESCE(${workspaceTitle}, '')) LIKE ${like})
+                        AND (${includeSubagents} OR s.f_origin IS DISTINCT FROM 'subagent')`;
+		const rows = await this.db.execute(sql`
+      SELECT s.f_session_id AS session_id,
+             s.f_title AS title,
+             s.f_origin AS origin,
+             s.f_cwd AS cwd,
+             s.f_created_at AS created_at,
+             (s.f_archived_at IS NOT NULL) AS archived,
+             COALESCE(s.f_last_event_at, s.f_created_at) AS updated_at,
+             ${workspaceTitle} AS workspace
+        FROM ${tSessions} s
+        ${where}
+       ORDER BY updated_at DESC, s.f_session_id
+       LIMIT ${limit} OFFSET ${offset}
+    `);
+		const counted = await this.db.execute(sql`
+      SELECT count(*) AS n FROM ${tSessions} s ${where}
+    `);
+		return {
+			items: rows.rows.map((row) => ({
+				sessionId: typeof row["session_id"] === "string" ? row["session_id"] : String(row["session_id"]),
+				title: typeof row["title"] === "string" ? row["title"] : null,
+				origin: typeof row["origin"] === "string" ? row["origin"] : null,
+				cwd: typeof row["cwd"] === "string" ? row["cwd"] : null,
+				createdAt: numeric(row["created_at"]),
+				updatedAt: numeric(row["updated_at"]),
+				archived: row["archived"] === true,
+				subagent: row["origin"] === "subagent",
+				workspace: typeof row["workspace"] === "string" ? row["workspace"] : null
+			})),
+			total: numeric(counted.rows[0]?.["n"] ?? 0)
+		};
+	}
 	async usageReport(sinceMs) {
 		const usageSince = sinceMs === void 0 ? sql`` : sql` AND u.f_created_at >= ${sinceMs}`;
 		const daySince = sinceMs === void 0 ? sql`` : sql` AND c.f_day >= ${localDayKey(sinceMs)}`;
@@ -25008,7 +26831,7 @@ var PostgresBackend = class PostgresBackend {
 				...tokenTotalsOf(row)
 			})),
 			sessions: tokenSessions.rows.map((row) => ({
-				sessionId: String(row["session_id"]),
+				sessionId: typeof row["session_id"] === "string" ? row["session_id"] : String(row["session_id"]),
 				title: text(row["title"]),
 				subagent: row["subagent"] === true,
 				archived: row["archived"] === true,
@@ -25120,7 +26943,8 @@ function physicalHeader(row) {
 		...row.fCwd !== null ? { cwd: row.fCwd } : {},
 		...row.fParentSession !== null ? { parentSession: row.fParentSession } : {},
 		...row.fOrigin !== null ? { origin: row.fOrigin } : {},
-		delegationDepth: row.fDelegationDepth ?? 0
+		delegationDepth: row.fDelegationDepth ?? 0,
+		...row.fAgentPreset !== null ? { agentPreset: row.fAgentPreset } : {}
 	};
 	return row.fVersion < 2 ? {
 		...common,
@@ -25141,8 +26965,14 @@ function physicalEvent(row) {
 		...row.fSurfaceOp !== null ? { surfaceOp: JSON.parse(row.fSurfaceOp) } : {}
 	};
 }
+/**
+* 读旧格式用的 catalog：v3→v4 这条边要求显式子会话证据（上游 0.1.7 起），本仓库声明
+* **无子会话证据**——v3 的目录事实由父会话自己在成功路径上写成 `subagent/catalog` 事件，
+* 迁移的 child evidence 只是补偿入口；我们没有更权威的子集合来源可给（见 ADR-跟随上游session-format-v4）。
+*/
+const restoreCatalog = createSessionFormatCatalogWithChildren([]);
 function convertLegacyRows(row, eventRows) {
-	const restore = sessionFormatCatalog.createRestore(physicalHeader(row), {
+	const restore = restoreCatalog.createRestore(physicalHeader(row), {
 		recovery: "strict",
 		validation: "transformed"
 	});
@@ -25160,6 +26990,7 @@ function isLegacyVersion(version) {
 function adoptLegacyRows(row, eventRows) {
 	const { preserved, tornFrom } = scanRows(eventRows, 0);
 	repairRequestHeaders(preserved);
+	normalizeToCurrentShape(preserved);
 	return {
 		meta: {
 			...rowToMeta(row),
@@ -25294,19 +27125,27 @@ var SessionBranchRdbProvider = class {
 		};
 		const seed = [...renumber(prefix, 0), ...renumber(seedSuffix, prefix.length)];
 		const internals = this.persistence.internals();
-		const sourceRows = await internals.backend.getEventRows(sourceId);
-		const sourceEventIds = new Map(sourceRows.map((row) => [row.fSequence, row.fEventId]));
+		const reusable = !source.migrated && source.events.length === source.storedCount;
 		const reuse = /* @__PURE__ */ new Map();
-		for (const event of prefix) {
-			const eventId = sourceEventIds.get(event.seq);
-			if (eventId !== void 0) reuse.set(event.seq, eventId);
-		}
+		if (reusable) {
+			const sourceRows = await internals.backend.getEventRows(sourceId);
+			const sourceEventIds = new Map(sourceRows.map((row) => [row.fSequence, row.fEventId]));
+			for (const event of prefix) {
+				const eventId = sourceEventIds.get(event.seq);
+				if (eventId !== void 0) reuse.set(event.seq, eventId);
+			}
+		} else if (prefix.length > 0) this.live.warn?.(`session-rdb: fork "${sourceId}" copies event rows instead of reusing them — its read view comes from a migration, so stored seqs need not line up`);
 		internals.registerReuseEventIds(childId, reuse);
-		const handle = await this.persistence.create(childMeta, { inheritedEventCount: SessionLogOffset(prefix.length) });
 		try {
-			if (seed.length > 0) await handle.append(seed);
-		} finally {
-			await handle.close();
+			const handle = await this.persistence.create(childMeta, { inheritedEventCount: SessionLogOffset(prefix.length) });
+			try {
+				if (seed.length > 0) await handle.append(seed);
+			} finally {
+				await handle.close();
+			}
+		} catch (error) {
+			internals.dropReuseEventIds(childId);
+			throw error;
 		}
 		await this.persistence.rebuildEventCounts(childId);
 		return childId;
@@ -26669,7 +28508,7 @@ function parseJsonlArtifact(content) {
 	}
 	let restore;
 	try {
-		restore = sessionFormatCatalog.createRestore(header, {
+		restore = restoreCatalog.createRestore(header, {
 			recovery: "strict",
 			validation: "transformed"
 		});
@@ -27048,6 +28887,74 @@ function registerSessionGc(ctx, persistence) {
 	});
 }
 //#endregion
+//#region ../session-rdb/src/rows.ts
+/**
+* 管理面的会话列表：**我们自己的**一条路由（完整语料，含归档），与官方 `session/list` 分开。
+*
+* 官方那条（`session/list` → `ctx.sessionQuery.listSessions`）按部署策略默认排除已归档——那是给上游
+* UI 用的。归档集的管理动作要有完整列表，所以这里单独给一条：标题直接从会话列取，最后活动时间用
+* 该会话最后一个事件的时间。
+*/
+const SESSION_ROWS_PATH = "/api/session.rows";
+/** 一页的条数上限：超过就按上限截断（这个接口给页面用，不是导出通道）。 */
+const MAX_PAGE_SIZE = 200;
+const DEFAULT_PAGE_SIZE = 20;
+function registerSessionRows(ctx, backend) {
+	ctx.inject(["webServer", "connection"], (webCtx) => {
+		const webServer = webCtx.webServer;
+		const connection = webCtx.get("connection");
+		return webCtx.effect(() => webServer.register({
+			kind: "exact",
+			path: SESSION_ROWS_PATH,
+			handler: async (req, res) => {
+				const rejection = connection.requestRejection(req);
+				if (rejection !== void 0) {
+					res.writeHead(rejection);
+					res.end(rejection === 401 ? "unauthorized" : "forbidden");
+					return;
+				}
+				if (req.method !== "POST") {
+					res.writeHead(405, { "content-type": "application/json" });
+					res.end(JSON.stringify({ error: "method not allowed" }));
+					return;
+				}
+				const chunks = [];
+				for await (const chunk of req) chunks.push(chunk);
+				const raw = Buffer.concat(chunks).toString("utf8");
+				let envelope = {};
+				if (raw !== "") try {
+					envelope = JSON.parse(raw);
+				} catch {
+					res.writeHead(400, { "content-type": "application/json" });
+					res.end(JSON.stringify({ error: "request body is not JSON" }));
+					return;
+				}
+				const page = Number.isSafeInteger(envelope.page) && (envelope.page ?? 0) > 0 ? envelope.page : 1;
+				const requested = envelope.pageSize;
+				const pageSize = Number.isSafeInteger(requested) && (requested ?? 0) > 0 ? Math.min(requested, MAX_PAGE_SIZE) : DEFAULT_PAGE_SIZE;
+				try {
+					const { items, total } = await backend.listSessionRows({
+						...envelope.query === void 0 ? {} : { query: envelope.query },
+						...envelope.includeSubagents === void 0 ? {} : { includeSubagents: envelope.includeSubagents },
+						limit: pageSize,
+						offset: (page - 1) * pageSize
+					});
+					res.writeHead(200, { "content-type": "application/json" });
+					res.end(JSON.stringify({
+						items,
+						total,
+						page,
+						pageSize
+					}));
+				} catch (error) {
+					res.writeHead(500, { "content-type": "application/json" });
+					res.end(JSON.stringify({ error: error instanceof Error ? error.message : "session rows failed" }));
+				}
+			}
+		}), "session-rdb: session rows route");
+	});
+}
+//#endregion
 //#region ../../../vendor/deepseek-harness/packages/session/session-format-catalog/lib/types/message-projections.js
 /** Pure first-party message interpreters for detached current-format replay, including browser readers. */
 /** Installed interpretation definitions; recovery listeners are mounted separately by their owning plugins. */
@@ -27185,7 +29092,7 @@ const allowsEval = /* @__PURE__*/ cached(() => {
 		return false;
 	}
 });
-function isPlainObject$1(o) {
+function isPlainObject(o) {
 	if (isObject(o) === false) return false;
 	const ctor = o.constructor;
 	if (ctor === void 0) return true;
@@ -27196,7 +29103,7 @@ function isPlainObject$1(o) {
 	return true;
 }
 function shallowClone(o) {
-	if (isPlainObject$1(o)) return { ...o };
+	if (isPlainObject(o)) return { ...o };
 	if (Array.isArray(o)) return [...o];
 	if (o instanceof Map) return new Map(o);
 	if (o instanceof Set) return new Set(o);
@@ -27284,7 +29191,7 @@ function omit(schema, mask) {
 	}));
 }
 function extend(schema, shape) {
-	if (!isPlainObject$1(shape)) throw new Error("Invalid input to extend: expected a plain object");
+	if (!isPlainObject(shape)) throw new Error("Invalid input to extend: expected a plain object");
 	const checks = schema._zod.def.checks;
 	if (checks && checks.length > 0) {
 		const existingShape = sourceShape(schema);
@@ -27299,7 +29206,7 @@ function extended(schema, shape) {
 	return newShape;
 }
 function safeExtend(schema, shape) {
-	if (!isPlainObject$1(shape)) throw new Error("Invalid input to safeExtend: expected a plain object");
+	if (!isPlainObject(shape)) throw new Error("Invalid input to safeExtend: expected a plain object");
 	return clone(schema, mergeDefs(schema._zod.def, { shape: extended(schema, shape) }));
 }
 function merge(a, b) {
@@ -29278,7 +31185,7 @@ function mergeValues(a, b) {
 		valid: true,
 		data: a
 	};
-	if (isPlainObject$1(a) && isPlainObject$1(b)) {
+	if (isPlainObject(a) && isPlainObject(b)) {
 		const bKeys = Object.keys(b);
 		const sharedKeys = Object.keys(a).filter((key) => bKeys.indexOf(key) !== -1);
 		const newObj = {
@@ -33126,7 +35033,7 @@ var SessionObservationReader = class {
 			const snapshot = await this.statSource(persistence, sessionId, signal);
 			const attachedDuringStat = this.ctx.sessions.get(sessionId);
 			if (attachedDuringStat !== void 0) return this.live(attachedDuringStat, projectionMode);
-			let entry = this.cachedEntry(persistence, sessionId, snapshot.revision);
+			let entry = this.cachedEntry(persistence.identity, sessionId, snapshot.revision);
 			if (entry === void 0) {
 				const loaded = await this.loadSource(persistence, sessionId, signal);
 				throwIfObservationAborted(signal);
@@ -33146,7 +35053,7 @@ var SessionObservationReader = class {
 					throw new SessionQueryError(`stored session "${sessionId}" is corrupt: ${errorMessage(error)}`, "SESSION_QUERY_CORRUPT_SESSION", { cause: error });
 				}
 				entry = {
-					persistence,
+					persistenceIdentity: persistence.identity,
 					revision: snapshot.revision,
 					session,
 					events: Object.freeze(seed),
@@ -33187,9 +35094,9 @@ var SessionObservationReader = class {
 		}
 	}
 	/** Return a still-valid cached entry and mark it most recently used. */
-	cachedEntry(persistence, sessionId, revision) {
+	cachedEntry(persistenceIdentity, sessionId, revision) {
 		const cached = this.cache.get(sessionId);
-		if (cached === void 0 || cached.persistence !== persistence || cached.revision !== revision) return;
+		if (cached === void 0 || cached.persistenceIdentity !== persistenceIdentity || cached.revision !== revision) return;
 		this.cache.delete(sessionId);
 		this.cache.set(sessionId, cached);
 		return cached;
@@ -33341,7 +35248,6 @@ function blockText(block) {
 		case "text": return [block.text];
 		case "reasoning": return [];
 		case "tool-call": return [block.name, block.arguments];
-		case "tool-result": return block.content.flatMap(blockText);
 		default: return [];
 	}
 }
@@ -33970,6 +35876,23 @@ var SessionQueryRdb = class extends SessionQueryEngine {
 	constructor(ctx, config = {}) {
 		super(ctx, config);
 	}
+	/**
+	* 官方列表（`session/list`）**默认不含已归档**：归档是「收起来」的会话，列表与搜索都不该把它混进
+	* 日常集合（上游 client 再用 workspace registry 的归档集做「只看归档」的派生）。
+	*
+	* 完整语料（含归档）走我们自己的管理面路由 `SESSION_ROWS_PATH`——两条路分开，不在一处混。
+	*/
+	async listSessions(signal) {
+		const records = await super.listSessions(signal);
+		const archived = this.archivedSessionIds();
+		if (archived.size === 0) return records;
+		return records.filter((record) => !archived.has(String(record.header.id)));
+	}
+	/** 归档集合来自 workspace registry；服务未就绪时保守返回空集（宁可多给，不可漏掉可见会话）。 */
+	archivedSessionIds() {
+		const registry = this.ctx.get("workspaceRegistry");
+		return new Set(registry?.archivedSessionIds ?? []);
+	}
 	async searchSessions() {
 		throw searchDisabled();
 	}
@@ -34055,11 +35978,19 @@ var SessionProjectionCacheRdb = class extends Service {
 		if (record === void 0) return void 0;
 		return identityMatches(record.identity, expected) ? record : void 0;
 	}
-	cachedSnapshot(meta, inheritedEventCount, keys) {
-		const record = this.recordFor(meta.id, identityOf(meta, inheritedEventCount));
+	/**
+	* header-only 读（会话列表这类）：上游 0.1.7 起只给 header 与 keys——它要求的是**生命周期**身份，
+	* 不再要求调用方提供 inherited cut（那个 cut 只有写路径与 hydration 用得上）。
+	*/
+	cachedSnapshot(meta, keys) {
+		const record = this.recordForLifecycle(meta);
 		const snapshot = record === void 0 ? void 0 : this.viewRecord(record, keys);
 		return this.withDirectTitle(meta.id, keys, snapshot);
 	}
+	recordForLifecycle(meta) {
+		const record = this.lookup(meta.id);
+		return record === void 0 || !identityMatches(record.identity, lifecycleIdentityOf(meta)) ? void 0 : record;
+	}
 	withDirectTitle(id, keys, snapshot) {
 		if (keys !== void 0 && !keys.includes(PREDECESSOR_TITLE_KEY)) return snapshot;
 		if (snapshot?.values[PREDECESSOR_TITLE_KEY] !== void 0) return snapshot;
@@ -34074,15 +36005,10 @@ var SessionProjectionCacheRdb = class extends Service {
 			values
 		};
 	}
-	cachedPredecessorTitle(meta, inheritedEventCount) {
-		const expected = identityOf(meta, inheritedEventCount);
+	cachedPredecessorTitle(meta) {
 		const record = this.lookup(meta.id);
-		if (record === void 0 || !predecessorIdentityMatches(record.identity, expected)) return;
-		const title = this.viewRecord(record, [PREDECESSOR_TITLE_KEY]);
-		return title === void 0 ? void 0 : {
-			...title,
-			asOfSeq: -1
-		};
+		if (record === void 0 || !predecessorIdentityMatches(record.identity, lifecycleIdentityOf(meta))) return;
+		return this.viewRecord(record, [PREDECESSOR_TITLE_KEY]);
 	}
 	viewRecord(record, keys) {
 		const values = this.ctx.sessionProjections.viewCheckpoint(record.rows, keys);
@@ -34198,6 +36124,15 @@ function detachJson(rows) {
 	if (text === void 0) throw new TypeError("projection checkpoint is not losslessly JSON-serializable");
 	return JSON.parse(text);
 }
+/** header 能证明的生命周期身份（不含 inherited cut）：header-only 读只比对它。 */
+function lifecycleIdentityOf(header) {
+	return {
+		formatVersion: header.version,
+		createdAt: header.createdAt,
+		...header.cwd === void 0 ? {} : { cwd: header.cwd },
+		isSeeded: header.isSeeded
+	};
+}
 function identityOf(header, inheritedEventCount) {
 	const cut = SessionLogOffset(inheritedEventCount);
 	if (!header.isSeeded && cut !== 0) throw new Error("unseeded projection-cache identity inherited event count must be 0");
@@ -34216,7 +36151,7 @@ function predecessorIdentityMatches(stored, expected) {
 	return (stored.formatVersion === void 0 || stored.formatVersion < expected.formatVersion) && lifecycleIdentityMatches(stored, expected);
 }
 function lifecycleIdentityMatches(stored, expected) {
-	return stored.createdAt === expected.createdAt && stored.cwd === expected.cwd && (stored.isSeeded ?? false) === expected.isSeeded && (stored.inheritedEventCount ?? 0) === expected.inheritedEventCount;
+	return stored.createdAt === expected.createdAt && stored.cwd === expected.cwd && (stored.isSeeded ?? false) === expected.isSeeded;
 }
 //#endregion
 //#region ../session-rdb/src/storage-takeover/storage-backend.ts
@@ -34330,11 +36265,12 @@ function workspaceRecordOf(value) {
 }
 function workspaceStateOf(value) {
 	const state = value;
-	if (typeof state !== "object" || state === null || typeof state.initialized !== "boolean" || !Array.isArray(state.workspaceIds) || !Array.isArray(state.archivedSessionIds)) throw new TypeError("workspace registry state does not match the stored shape");
+	if (typeof state !== "object" || state === null || typeof state.initialized !== "boolean" || !Array.isArray(state.workspaceIds) || !Array.isArray(state.archivedSessionIds) || !Array.isArray(state.pinnedSessionIds)) throw new TypeError("workspace registry state does not match the stored shape");
 	return {
 		initialized: state.initialized,
 		workspaceIds: state.workspaceIds.map((id) => id),
 		archivedSessionIds: state.archivedSessionIds.map((id) => id),
+		pinnedSessionIds: state.pinnedSessionIds.map((id) => id),
 		...state.pendingMutation === void 0 ? {} : { pendingMutation: state.pendingMutation }
 	};
 }
@@ -34361,6 +36297,16 @@ function installStorageTakeover(ctx, options) {
 //#endregion
 //#region ../session-rdb/src/index.ts
 init_esm();
+/** 一批事件里的最大时间：写路径据此推进会话行的「最后活动时间」。 */
+function maxEventTime(events) {
+	let max;
+	for (const event of events) {
+		const time = event.time;
+		if (typeof time !== "number") continue;
+		if (max === void 0 || time > max) max = time;
+	}
+	return max;
+}
 const DEFAULT_PROJECTION_WRITE_EVERY_EVENTS = 200;
 const DEFAULT_PROJECTION_WRITE_INTERVAL_MS = 5e3;
 var SessionDeletionError = class extends Error {
@@ -34619,9 +36565,9 @@ var RdbSessionHandle = class RdbSessionHandle {
 	}
 	static LIVE_WRITE_BATCH_MAX_DELAY_MS = 200;
 };
-var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersistence {
+var SessionPersistenceRdb = class extends SessionPersistence {
 	config;
-	static inject = ["sessions", "settings"];
+	static inject = ["sessions"];
 	static Config = Schema.union([Schema.object({
 		type: Schema.const("sqlite"),
 		path: Schema.string().required(),
@@ -34651,7 +36597,6 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 			writeIntervalMs: DEFAULT_PROJECTION_WRITE_INTERVAL_MS
 		})
 	})]);
-	static settingsNs = "session-rdb";
 	name = "session-rdb";
 	tracker = new RdbBackendTracker(this.name);
 	backend;
@@ -34662,19 +36607,9 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 	liveBuffers = /* @__PURE__ */ new Map();
 	liveReady = /* @__PURE__ */ new Map();
 	constructor(ctx, config, injectedBackend) {
-		let resolved = config;
-		const settings = ctx.reflect.get("settings");
-		if (settings !== void 0) {
-			const scope = settings.register(SessionPersistenceRdb.settingsNs, SessionPersistenceRdb.Config, { base: config });
-			resolved = scope.get();
-			scope.watch(() => {
-				ctx.logger.warn("session-rdb: settings changed; restart to apply the new configuration");
-			});
-		}
 		super(ctx);
 		this.config = config;
-		this.config = resolved;
-		this.backend = injectedBackend ?? createBackend(resolved);
+		this.backend = injectedBackend ?? createBackend(config);
 		this.ready = this.init();
 		this.installLiveRouting(ctx);
 		new SessionBranchRdb(this.ctx);
@@ -34684,6 +36619,7 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 		registerSessionExport(this.ctx, this);
 		registerSessionGc(this.ctx, this);
 		registerSessionUsage(this.ctx, this);
+		registerSessionRows(this.ctx, this.backend);
 		installStorageTakeover(this.ctx, {
 			repository: this.backend.storage,
 			ready: this.ready,
@@ -34891,7 +36827,6 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 		if (events.length === 0) return false;
 		validateStoredEvents(meta, [...events]);
 		const reuse = this.reuseEventIds.get(meta.id);
-		if (reuse !== void 0) this.reuseEventIds.delete(meta.id);
 		let confirmedHead = -1;
 		await this.backend.transaction(async (tx) => {
 			if (tornTruncateTo !== void 0) {
@@ -34911,9 +36846,10 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 				nextSeq: head.fHeadSequence + 1
 			}, reuse);
 			await tx.updateHead(meta.id, headEventId, headSequence);
-			await tx.bumpRevision(meta.id);
+			await tx.bumpRevision(meta.id, maxEventTime(events));
 			confirmedHead = headSequence;
 		});
+		if (reuse !== void 0) this.reuseEventIds.delete(meta.id);
 		this.writeGuard.confirmHead(meta.id, confirmedHead);
 		this.tracker.materialized(meta.id);
 		await this.recordEventCounts(meta.id, events);
@@ -34954,6 +36890,19 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 			};
 		}
 		const { preserved, tornFrom } = scanRows(eventRows, options.fromSeq ?? 0);
+		if (hasLegacyShape(preserved)) {
+			const adopted = adoptLegacyRows(row, eventRows);
+			return {
+				meta: adopted.meta,
+				inheritedEventCount: adopted.inheritedEventCount,
+				events: adopted.events,
+				incarnation: row.fIncarnation,
+				revision: row.fRevision,
+				storedCount: eventRows.length,
+				migrated: false,
+				...adopted.tornFrom !== void 0 ? { tornFrom: adopted.tornFrom } : {}
+			};
+		}
 		return {
 			meta,
 			inheritedEventCount: row.fSeedLength ?? 0,
@@ -34996,6 +36945,9 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 	}
 	async rewriteMigratedLog(id, log) {
 		await this.backend.transaction(async (tx) => {
+			const head = await tx.getHead(id);
+			if (!this.writeGuard.has(id)) this.writeGuard.confirmHead(id, head.fHeadSequence);
+			this.writeGuard.assertNoConcurrentWriter(id, head.fHeadSequence);
 			await tx.deleteBridgeTail(id, 0);
 			await tx.upsertSession({
 				meta: log.meta,
@@ -35006,7 +36958,7 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 				nextSeq: 0
 			});
 			await tx.updateHead(id, headEventId, headSequence);
-			await tx.bumpRevision(id);
+			await tx.bumpRevision(id, maxEventTime(log.events));
 		});
 	}
 	async listSnapshots(signal) {
@@ -35097,6 +37049,10 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 	registerReuseEventIds(childId, map) {
 		this.reuseEventIds.set(childId, new Map(map));
 	}
+	/** 丢弃一个还没被消费的复用映射（fork 失败时）：留着会让同一个 childId 之后的落写复用父会话的事件行。 */
+	dropReuseEventIds(childId) {
+		this.reuseEventIds.delete(childId);
+	}
 	internals() {
 		return {
 			backend: this.backend,
@@ -35108,7 +37064,8 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 			readFrom: (id, fromSeq, signal) => this.readFrom(id, fromSeq, signal),
 			listSnapshots: (signal) => this.listSnapshots(signal),
 			readStoredRevision: (id, signal) => this.readStoredRevision(id, signal),
-			registerReuseEventIds: (childId, map) => this.registerReuseEventIds(childId, map)
+			registerReuseEventIds: (childId, map) => this.registerReuseEventIds(childId, map),
+			dropReuseEventIds: (childId) => this.dropReuseEventIds(childId)
 		};
 	}
 	rowRevision(row) {
@@ -35318,627 +37275,6 @@ async function appendEventTail(tx, meta, events, anchor, reuse) {
 	};
 }
 //#endregion
-//#region ../../../vendor/deepseek-harness/packages/settings/settings/lib/index.js
-/**
-* Structural secret redaction for settings values. `role('secret')` fields are
-* removed from a value before it crosses a wire boundary; a sidecar records
-* each schema-declared secret position and whether it currently holds a value,
-* so a configuration surface can render a write-only input without ever
-* receiving the secret itself.
-* @module @deepseek-ai/dsh-settings/redact
-*/
-/** Whether a value is a plain data object the walker may recurse into. */
-function isRecord(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function walk(node, value, path, secrets) {
-	if (node === void 0) return value;
-	if (node.meta?.role === "secret") {
-		secrets.push({
-			path,
-			set: value !== void 0
-		});
-		return;
-	}
-	switch (node.type) {
-		case "object": {
-			const properties = node.dict ?? {};
-			const source = isRecord(value) ? value : void 0;
-			const rebuilt = {};
-			if (source !== void 0) for (const [key, entry] of Object.entries(source)) {
-				if (key in properties) continue;
-				rebuilt[key] = entry;
-			}
-			for (const [key, child] of Object.entries(properties)) {
-				const stripped = walk(child, source?.[key], [...path, key], secrets);
-				if (stripped !== void 0) rebuilt[key] = stripped;
-			}
-			return source === void 0 && Object.keys(rebuilt).length === 0 ? value : rebuilt;
-		}
-		case "dict": {
-			if (!isRecord(value)) return value;
-			const rebuilt = {};
-			for (const [key, entry] of Object.entries(value)) {
-				const stripped = walk(node.inner, entry, [...path, key], secrets);
-				if (stripped !== void 0) rebuilt[key] = stripped;
-			}
-			return rebuilt;
-		}
-		case "array":
-			if (!Array.isArray(value)) return value;
-			return value.map((entry, index) => walk(node.inner, entry, [...path, String(index)], secrets));
-		default: return value;
-	}
-}
-/**
-* Remove every `role('secret')` field a schema declares from a value. The
-* walker follows `object`, `dict`, and `array` containers; a secret must be
-* declared directly on a field reachable through those containers (a secret
-* buried inside a union branch or transform is not reachable and must not be
-* modeled that way). The input is never mutated.
-* @param schema - live schemastery schema describing the value.
-* @param value - the value to strip; `undefined` yields an empty record with
-*   object-property secret slots still enumerated.
-* @returns the stripped detached value and the ordered secret positions.
-*/
-function redactSecrets(schema, value) {
-	const secrets = [];
-	return {
-		value: walk(schema, value, [], secrets),
-		secrets
-	};
-}
-/**
-* Service Definition for the user-settings capability seam (`ctx.settings`). Providers store one raw document of
-* per-namespace sections; plugins register a namespace schema and read the
-* resolved value, which layers schema defaults, the registrant's composition
-* `base`, and the user document section, in that order.
-* @module @deepseek-ai/dsh-settings
-*/
-const NAMESPACE_PATTERN = /^[a-z][a-z0-9-]*$/;
-function parseSettingsNamespace(value) {
-	if (!NAMESPACE_PATTERN.test(value)) throw new TypeError(`settings namespace "${value}" must match ${String(NAMESPACE_PATTERN)}`);
-	return value;
-}
-/**
-* A write refused because the namespace moved since the caller read it. The
-* Service Definition's serialized write queue orders writes; it cannot tell a fresh writer
-* from one holding a stale snapshot, which is what this reports.
-*/
-var SettingsConflictError = class extends Error {
-	/** Stable machine code for wire layers mapping this to their own taxonomy. */
-	code = "SETTINGS_CONFLICT";
-	/** The revision the write expected. */
-	expected;
-	/** The revision the namespace actually stands at. */
-	actual;
-	/**
-	* @param ns - the namespace whose write was refused.
-	* @param expected - the revision the caller sent.
-	* @param actual - the revision now stored.
-	*/
-	constructor(ns, expected, actual) {
-		super(`settings namespace "${ns}" changed since it was read (expected revision ${String(expected)}, now ${String(actual)})`);
-		this.name = "SettingsConflictError";
-		this.expected = expected;
-		this.actual = actual;
-	}
-};
-/** Whether a value is a plain data object (not an array, null, or class instance). */
-function isPlainObject(value) {
-	if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
-	const proto = Object.getPrototypeOf(value);
-	return proto === Object.prototype || proto === null;
-}
-/** Apply one path op to a detached section, returning the next section. */
-function applyPathOp(section, op) {
-	const [head, ...rest] = op.path;
-	if (head === void 0) {
-		if (op.op === "unset") return {};
-		if (!isPlainObject(op.value)) throw new TypeError("settings mutate: setting the section root requires a plain object");
-		return { ...op.value };
-	}
-	if (rest.length === 0) {
-		if (op.op === "set") return {
-			...section,
-			[head]: op.value
-		};
-		const { [head]: _removed, ...kept } = section;
-		return kept;
-	}
-	const child = section[head];
-	if (!isPlainObject(child)) {
-		if (op.op === "unset") return section;
-		return {
-			...section,
-			[head]: applyPathOp({}, {
-				...op,
-				path: rest
-			})
-		};
-	}
-	return {
-		...section,
-		[head]: applyPathOp(child, {
-			...op,
-			path: rest
-		})
-	};
-}
-/** Human label for a value that lossless JSON cannot represent (numbers reject inline). */
-function describeRejected(value) {
-	if (value === void 0) return "undefined";
-	if (typeof value === "object" && value !== null) {
-		const name = Object.getPrototypeOf(value)?.constructor?.name;
-		return name === void 0 || name === "Object" ? "a non-plain object" : `a ${name}`;
-	}
-	return `a ${typeof value}`;
-}
-/**
-* Detach and validate one write input in a single walk before persistence:
-* only JSON data (plain objects, arrays, strings, finite numbers,
-* booleans, `null`) may reach a provider document. `structuredClone` alone
-* would admit Dates, Maps, BigInts, and cycles that YAML/JSON storage then
-* silently distorts on the reload round-trip. `undefined` entries in objects
-* are skipped — the same sparse-patch semantics as {@link mergeLayers} — while
-* an `undefined` array entry is rejected rather than coerced.
-* @param root - plain-object write input (caller-checked).
-* @param reject - builds the validation error from a value label and its `$`-rooted path.
-* @returns the detached JSON-compatible clone.
-*/
-function cloneJsonShaped(root, reject) {
-	const visiting = /* @__PURE__ */ new WeakSet();
-	const clone = (value, path) => {
-		if (value === null || typeof value === "string" || typeof value === "boolean") return value;
-		if (typeof value === "number") {
-			if (!Number.isFinite(value)) throw reject("a non-finite number", path);
-			return value;
-		}
-		if (Array.isArray(value)) {
-			if (visiting.has(value)) throw reject("a circular reference", path);
-			visiting.add(value);
-			const entries = value.map((entry, index) => clone(entry, `${path}[${index}]`));
-			visiting.delete(value);
-			return entries;
-		}
-		if (isPlainObject(value)) {
-			if (visiting.has(value)) throw reject("a circular reference", path);
-			visiting.add(value);
-			const out = {};
-			for (const [key, entry] of Object.entries(value)) {
-				if (entry === void 0) continue;
-				out[key] = clone(entry, `${path}.${key}`);
-			}
-			visiting.delete(value);
-			return out;
-		}
-		throw reject(describeRejected(value), path);
-	};
-	return clone(root, "$");
-}
-/**
-* Layer `over` onto `under`: plain objects merge recursively, every other
-* value (arrays included) replaces the lower layer wholesale. `over` never
-* carries `undefined` entries — sections come from parsed documents and write
-* snapshots pass {@link cloneJsonShaped}, which strips them so a sparse patch
-* cannot erase lower keys.
-*/
-function mergeLayers(under, over) {
-	if (over === void 0) return under;
-	if (!isPlainObject(under) || !isPlainObject(over)) return over;
-	const merged = { ...under };
-	for (const [key, value] of Object.entries(over)) merged[key] = key in merged ? mergeLayers(merged[key], value) : value;
-	return merged;
-}
-/**
-* Abstract settings service. Providers implement raw-document storage
-* (`load`/`persist`) and push external changes through {@link Settings.publish};
-* the base class owns namespace registration, resolution, validation, change
-* detection, and the `settings/updated` commit event.
-*/
-var SettingsProvider = class extends Service {
-	registrations = /* @__PURE__ */ new Map();
-	/** Latest published raw document; empty until the provider's first publish. */
-	document = {};
-	/** Per-namespace write chains; settled tails, so a failure never poisons the queue. */
-	writeQueues = /* @__PURE__ */ new Map();
-	/** In-flight watcher invocation segments, drained by the dispose teardown. */
-	pendingTails = /* @__PURE__ */ new Set();
-	/** Set at service dispose: refuse new writes while queued ones drain. */
-	stopped = false;
-	/** Opaque read of {@link stopped}: control flow cannot narrow it across awaits. */
-	isStopped() {
-		return this.stopped;
-	}
-	constructor(ctx) {
-		super(ctx, "settings");
-	}
-	/**
-	* Load the provider's document once and publish it before the service
-	* becomes injectable, and register the write-drain teardown. Providers with
-	* their own init (watchers, connections) delegate here first via
-	* `yield* super[Service.init]()`; their disposers then run before the drain.
-	*/
-	async *[Service.init]() {
-		yield async () => {
-			this.stopped = true;
-			await Promise.allSettled([...this.writeQueues.values(), ...this.pendingTails]);
-		};
-		this.publish(await this.load());
-	}
-	/**
-	* Absolute path of the provider's user-editable document, when its storage
-	* is one local file. Configuration surfaces use this only as availability
-	* metadata; the guarded open operation resolves the path again Host-side.
-	* Non-file providers leave it undefined and expose no open-document affordance.
-	* @returns the absolute local document path, or undefined for non-file storage.
-	*/
-	get documentPath() {}
-	/**
-	* Prepare the provider's user-editable document for a native editor. File
-	* providers may materialize an absent document before returning its path;
-	* non-file providers return undefined.
-	* @returns the absolute local document path, or undefined for non-file storage.
-	*/
-	prepareDocument() {
-		return Promise.resolve(this.documentPath);
-	}
-	/**
-	* Register a namespace schema and receive its owner scope. The registration
-	* is an effect on the calling plugin's fiber: disposing that fiber removes
-	* the namespace and its observers. An invalid stored section fails the
-	* registration itself — the earliest point where the schema can judge it.
-	* @param ns - unique namespace; duplicate registration fails loud.
-	* @param schema - schemastery schema resolving this namespace's value.
-	* @param options - composition `base` layer and effect timing.
-	* @returns the owner scope for reads, observation, and updates.
-	* @throws {TypeError} when `ns` is not a lowercase hyphenated identifier.
-	*/
-	register(ns, schema, options) {
-		const parsedNs = parseSettingsNamespace(ns);
-		if (this.registrations.has(parsedNs)) throw new Error(`settings namespace "${parsedNs}" is already registered`);
-		const registration = {
-			ns: parsedNs,
-			schema,
-			base: options?.base,
-			applies: options?.applies ?? "live",
-			...options?.validate === void 0 ? {} : { validate: options.validate },
-			resolved: deepFreeze(this.resolve(schema, options?.base, this.section(parsedNs), options?.validate)),
-			revision: 0,
-			watchers: /* @__PURE__ */ new Set()
-		};
-		this.ctx.effect(() => {
-			this.registrations.set(parsedNs, registration);
-			return () => this.registrations.delete(parsedNs);
-		}, `settings.register(${JSON.stringify(String(parsedNs))})`);
-		return {
-			get: () => registration.resolved,
-			watch: (callback) => {
-				const watcher = {
-					callback,
-					tail: Promise.resolve(),
-					active: true
-				};
-				registration.watchers.add(watcher);
-				return () => {
-					watcher.active = false;
-					registration.watchers.delete(watcher);
-				};
-			},
-			update: (patch) => this.update(parsedNs, patch),
-			replace: (section) => this.replace(parsedNs, section)
-		};
-	}
-	/**
-	* Attach one optional-settings consumer to this provider. The consumer
-	* registers its composition entry as the base layer while this provider is
-	* present, then falls back to that entry if the provider detaches.
-	* @param owner - consumer context whose unload suppresses fallback work.
-	* @param ns - consumer-owned settings namespace.
-	* @param schema - schema resolving the namespace.
-	* @param entry - composition entry used as the base and fallback value.
-	* @param hooks - source sink, change notification, and optional validation.
-	* @throws {TypeError} when `ns` is not a lowercase hyphenated identifier.
-	*/
-	installSection(owner, ns, schema, entry, hooks) {
-		const scope = this.register(ns, schema, {
-			base: entry,
-			...hooks.validate === void 0 ? {} : { validate: hooks.validate }
-		});
-		hooks.setSource(() => scope.get());
-		this.ctx.effect(() => () => {
-			if (isUnloading(owner)) return;
-			hooks.setSource(() => entry);
-			hooks.onChange();
-		});
-		hooks.onChange();
-		scope.watch(() => {
-			if (isUnloading(owner)) return;
-			hooks.onChange();
-		});
-	}
-	/**
-	* Describe every registered namespace for configuration surfaces, including
-	* the composition `base` and raw user layers so a form can mark which fields
-	* the user overrode (presence in `user`) and what a reset returns to.
-	* @param options - redaction switch; wire surfaces must redact.
-	* @returns one descriptor per registered namespace, in registration order.
-	*/
-	describe(options) {
-		return [...this.registrations.values()].map((registration) => {
-			let user;
-			try {
-				user = this.section(registration.ns);
-			} catch {
-				user = void 0;
-			}
-			const base = registration.base === void 0 ? void 0 : structuredClone(registration.base);
-			const detachedUser = user === void 0 ? void 0 : structuredClone(user);
-			const descriptor = {
-				ns: registration.ns,
-				schema: registration.schema.toJSON(),
-				value: registration.resolved,
-				revision: registration.revision,
-				...base === void 0 ? {} : { base },
-				...detachedUser === void 0 ? {} : { user: detachedUser },
-				applies: registration.applies
-			};
-			if (options?.redactSecrets !== true) return descriptor;
-			const schema = registration.schema;
-			const redacted = redactSecrets(schema, registration.resolved);
-			return {
-				...descriptor,
-				value: redacted.value,
-				...base === void 0 ? {} : { base: redactSecrets(schema, base).value },
-				...detachedUser === void 0 ? {} : { user: redactSecrets(schema, detachedUser).value },
-				secrets: redacted.secrets
-			};
-		});
-	}
-	/**
-	* Read one registered namespace's resolved value.
-	* @param ns - the namespace to read.
-	* @returns the resolved value, or `undefined` while unregistered.
-	* @throws {TypeError} when `ns` is not a lowercase hyphenated identifier.
-	*/
-	get(ns) {
-		return this.registrations.get(parseSettingsNamespace(ns))?.resolved;
-	}
-	/**
-	* Merge a patch into one registered namespace's user layer, validate the
-	* resolved candidate, persist through the provider, then commit and emit.
-	* A validation failure rejects before anything is persisted. Writes to one
-	* namespace are serialized: concurrent updates apply in call order, each
-	* merging over the previous write's committed section.
-	* @param ns - the registered namespace to update.
-	* @param patch - plain-object patch over the user section.
-	* @param expectedRevision - the descriptor `revision` the caller read; a
-	*   namespace that moved past it rejects with {@link SettingsConflictError}.
-	* @throws {TypeError} when `ns` is not a lowercase hyphenated identifier.
-	*/
-	async update(ns, patch, expectedRevision) {
-		return this.write(parseSettingsNamespace(ns), patch, "merge", expectedRevision);
-	}
-	/**
-	* Replace one registered namespace's user section wholesale, validate,
-	* persist, then commit and emit. Keys absent from `section` fall back to the
-	* composition `base` and schema defaults — this is the removal/reset path a
-	* merge-only patch cannot express (`replace({})` re-inherits everything).
-	* @param ns - the registered namespace to replace.
-	* @param section - the complete next user section.
-	* @param expectedRevision - the descriptor `revision` the caller read; a
-	*   namespace that moved past it rejects with {@link SettingsConflictError}.
-	* @throws {TypeError} when `ns` is not a lowercase hyphenated identifier.
-	*/
-	async replace(ns, section, expectedRevision) {
-		return this.write(parseSettingsNamespace(ns), section, "replace", expectedRevision);
-	}
-	/**
-	* Apply path-addressed edits to one registered namespace's user section,
-	* validate, persist, then commit and emit. The ops are applied to the
-	* section as it stands when the write reaches the front of the queue, so a
-	* caller never has to restate fields it did not touch — and, crucially,
-	* cannot delete fields it never saw. This is the write path for any caller
-	* holding a redacted view; `replace` remains the wholesale reset.
-	* @param ns - the registered namespace to edit.
-	* @param ops - ordered path edits; later ops observe earlier ones.
-	* @param expectedRevision - the descriptor `revision` the caller read; a
-	*   namespace that moved past it rejects with {@link SettingsConflictError}.
-	* @throws {TypeError} when `ns` is not a lowercase hyphenated identifier.
-	*/
-	async mutate(ns, ops, expectedRevision) {
-		const parsedNs = parseSettingsNamespace(ns);
-		if (!Array.isArray(ops)) throw new TypeError(`settings mutate for "${parsedNs}" must be an array of path ops`);
-		for (const op of ops) {
-			if (!isPlainObject(op) || op["op"] !== "set" && op["op"] !== "unset") throw new TypeError(`settings mutate for "${parsedNs}" ops must be {op:'set'|'unset', path}`);
-			if (!Array.isArray(op["path"]) || op["path"].some((part) => typeof part !== "string")) throw new TypeError(`settings mutate for "${parsedNs}" op paths must be arrays of strings`);
-		}
-		return this.write(parsedNs, ops, "mutate", expectedRevision);
-	}
-	/** Validate a write, then queue it on the namespace's serialized write chain. */
-	write(ns, input, mode, expectedRevision) {
-		const verb = mode === "merge" ? "update" : mode === "replace" ? "replace" : "mutate";
-		const registration = this.registrations.get(ns);
-		if (registration === void 0) throw new Error(`settings namespace "${ns}" is not registered`);
-		if (this.isStopped()) throw new Error(`settings service is disposed: "${ns}" cannot be written`);
-		if (!this.writable) throw new Error(`settings provider is read-only: "${ns}" cannot be updated in-process`);
-		let payload;
-		if (mode === "mutate") payload = { ops: input };
-		else {
-			if (!isPlainObject(input)) throw new TypeError(`settings ${verb} for "${ns}" must be a plain object`);
-			payload = input;
-		}
-		const snapshot = cloneJsonShaped(payload, (label, path) => /* @__PURE__ */ new TypeError(`settings ${verb} for "${ns}" must contain only JSON-compatible data (found ${label} at ${path})`));
-		const run = (this.writeQueues.get(ns) ?? Promise.resolve()).catch(() => void 0).then(async () => {
-			if (this.isStopped()) throw new Error(`settings service was disposed before the queued "${ns}" ${verb} ran`);
-			if (this.registrations.get(ns) !== registration) throw new Error(`settings namespace "${ns}" registration was disposed before the queued ${verb} ran`);
-			const current = this.section(ns) ?? {};
-			if (expectedRevision !== void 0 && expectedRevision !== registration.revision) throw new SettingsConflictError(ns, expectedRevision, registration.revision);
-			const section = mode === "merge" ? mergeLayers(current, snapshot) : mode === "replace" ? snapshot : snapshot["ops"].reduce(applyPathOp, current);
-			const next = deepFreeze(this.resolve(registration.schema, registration.base, section, registration.validate));
-			await this.persist(ns, section);
-			this.document[ns] = section;
-			if (this.registrations.get(ns) === registration && !this.isStopped()) {
-				this.bumpRevision(registration, current, section);
-				this.commit(registration, next, "update");
-			}
-		});
-		this.writeQueues.set(ns, run);
-		return run;
-	}
-	/**
-	* Provider hook: commit a complete raw document observed in storage. Each
-	* registered namespace re-resolves; an invalid section keeps that
-	* namespace's last good value and warns, other namespaces still commit.
-	* @param doc - the detached raw document (unregistered sections preserved).
-	* @param source - change origin; defaults to `provider`.
-	*/
-	publish(doc, source = "provider") {
-		const before = /* @__PURE__ */ new Map();
-		for (const registration of this.registrations.values()) try {
-			before.set(registration.ns, this.section(registration.ns));
-		} catch {
-			before.set(registration.ns, void 0);
-		}
-		this.document = doc;
-		for (const registration of this.registrations.values()) {
-			let next;
-			try {
-				next = deepFreeze(this.resolve(registration.schema, registration.base, this.section(registration.ns), registration.validate));
-			} catch (error) {
-				this.ctx.logger.warn("settings: keeping last good \"%s\" after invalid stored section", registration.ns);
-				this.ctx.logger.warn(error);
-				continue;
-			}
-			this.bumpRevision(registration, before.get(registration.ns), this.section(registration.ns));
-			this.commit(registration, next, source);
-		}
-	}
-	/** Read one namespace's raw user section, rejecting non-object sections. */
-	section(ns) {
-		const section = this.document[ns];
-		if (section === void 0) return void 0;
-		if (!isPlainObject(section)) throw new TypeError(`settings section "${ns}" must be an object of keys`);
-		return section;
-	}
-	/** Resolve one namespace value: schema defaults, then `base`, then the user layer. */
-	resolve(schema, base, section, validate) {
-		const value = schema(mergeLayers(base, section));
-		validate?.(value);
-		return value;
-	}
-	/**
-	* Advance a namespace's revision when its RAW section changed, and announce
-	* it. Deliberately independent of {@link commit}'s resolved-value equality:
-	* storing an override equal to the composition base leaves the resolved
-	* value alone but changes what the document says, which is exactly what a
-	* configuration surface must re-read.
-	*/
-	bumpRevision(registration, before, after) {
-		if (deepEqualJson(before, after)) return;
-		registration.revision += 1;
-		this.emitDocumentUpdated(registration.ns, registration.revision);
-	}
-	/** Contained fan-out of `settings/document-updated`, mirroring {@link commit}'s. */
-	emitDocumentUpdated(ns, revision) {
-		let invariantFailure;
-		const args = [
-			"settings/document-updated",
-			ns,
-			revision
-		];
-		for (const listener of this.ctx.events.dispatch("emit", args)) try {
-			const returned = listener(ns, revision);
-			if (returned != null && typeof returned.then === "function") Promise.resolve(returned).then(void 0, (error) => {
-				this.warnListenerFailure(ns, error);
-			});
-		} catch (error) {
-			if (error?.code === "INVARIANT") {
-				invariantFailure ??= error;
-				continue;
-			}
-			this.warnListenerFailure(ns, error);
-		}
-		if (invariantFailure !== void 0) throw invariantFailure;
-	}
-	/** Commit a resolved value when changed: swap, notify watchers, emit the event. */
-	commit(registration, next, source) {
-		const prev = registration.resolved;
-		if (deepEqualJson(next, prev)) return;
-		registration.resolved = next;
-		for (const watcher of [...registration.watchers]) {
-			const segment = watcher.tail.then(() => {
-				if (!watcher.active || this.isStopped()) return;
-				return watcher.callback(next, prev);
-			}).then(() => void 0, (error) => {
-				this.warnWatcherFailure(registration.ns, error);
-			});
-			watcher.tail = segment;
-			this.pendingTails.add(segment);
-			segment.then(() => this.pendingTails.delete(segment));
-		}
-		let invariantFailure;
-		const args = [
-			"settings/updated",
-			registration.ns,
-			next,
-			prev,
-			source
-		];
-		for (const listener of this.ctx.events.dispatch("emit", args)) try {
-			const returned = listener(registration.ns, next, prev, source);
-			if (returned != null && typeof returned.then === "function") Promise.resolve(returned).then(void 0, (error) => {
-				this.warnListenerFailure(registration.ns, error);
-			});
-		} catch (error) {
-			if (error?.code === "INVARIANT") {
-				invariantFailure ??= error;
-				continue;
-			}
-			this.warnListenerFailure(registration.ns, error);
-		}
-		if (invariantFailure !== void 0) throw invariantFailure;
-	}
-	/** Contained-watcher diagnostic shared by the sync and async failure paths. */
-	warnWatcherFailure(ns, error) {
-		this.ctx.logger.warn("settings: watcher for \"%s\" failed", ns);
-		this.ctx.logger.warn(error);
-	}
-	/** Contained-listener diagnostic shared by the sync and async failure paths. */
-	warnListenerFailure(ns, error) {
-		this.ctx.logger.warn("settings: a settings/updated listener for \"%s\" failed", ns);
-		this.ctx.logger.warn(error);
-	}
-};
-/**
-* Value mirror of the `FiberState` members {@link isUnloading} compares
-* against: a const enum has no runtime object to import, and the value is
-* needed at runtime (same rationale as the CLI boot driver's mirror).
-*/
-const FIBER_DISPOSED = 4;
-const FIBER_UNLOADING = 5;
-/** Whether the consumer's own fiber is tearing down (not just losing the settings service). */
-function isUnloading(ctx) {
-	const state = ctx.fiber.state;
-	return state === FIBER_UNLOADING || state === FIBER_DISPOSED;
-}
-//#endregion
-//#region ../session-rdb/src/testing/helpers.ts
-var EmptySettings = class extends SettingsProvider {
-	constructor(ctx) {
-		super(ctx);
-	}
-	get writable() {
-		return true;
-	}
-	async load() {
-		return {};
-	}
-	persist(_ns, _section) {
-		return Promise.resolve();
-	}
-};
-//#endregion
 //#region ../session-rdb/src/testing/contract.ts
 function meta(id, cwd) {
 	return {
@@ -36066,7 +37402,6 @@ function oneTurnLog() {
 //#region src/testing.ts
 async function harness(provide) {
 	const ctx = new Context();
-	await ctx.plugin(EmptySettings);
 	await ctx.plugin(SessionStore);
 	new SessionProjectionRegistry(ctx);
 	const fiber = await ctx.plugin(SessionPersistenceRdb, {
@@ -36194,4 +37529,4 @@ function turnLog(base, turn, opts = {}) {
 	return events;
 }
 //#endregion
-export { EmptySettings, SESSION_EDITOR_PATH, Session, SessionIdBrand, SessionSeq, SessionStore, TokenMeter, assistantMessage, createPersisted, harness, meta, oneTurnLog, parseJsonlArtifact, turnLog, twoTurnLog, userMessage };
+export { SESSION_EDITOR_PATH, Session, SessionIdBrand, SessionSeq, SessionStore, TokenMeter, assistantMessage, createPersisted, harness, meta, oneTurnLog, parseJsonlArtifact, turnLog, twoTurnLog, userMessage };