@morlay/ui-conversation-message-actions 0.0.14-alpha.0 → 0.0.14-alpha.1

package/dist/client.js

@@ -351,12 +351,12 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var MessageIconActions_module_css_default = {
-			"action": "lKOSUG_action",
-			"visuallyHidden": "lKOSUG_visuallyHidden",
 			"actions": "lKOSUG_actions",
-			"runTimeDot": "lKOSUG_runTimeDot",
 			"timeStart": "lKOSUG_timeStart",
-			"timeEnd": "lKOSUG_timeEnd"
+			"timeEnd": "lKOSUG_timeEnd",
+			"runTimeDot": "lKOSUG_runTimeDot",
+			"action": "lKOSUG_action",
+			"visuallyHidden": "lKOSUG_visuallyHidden"
 		};
 		//#endregion
 		//#region src/client/chat-node/MessageIconActions.tsx
@@ -568,34 +568,34 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var MessageItem_module_css_default = {
-			"compactionButton": "okW0Ua_compactionButton",
-			"retryRow": "okW0Ua_retryRow",
-			"retry-shimmer": "okW0Ua_retry-shimmer",
-			"maxTokensTitle": "okW0Ua_maxTokensTitle",
-			"refChip": "okW0Ua_refChip",
-			"userRow": "okW0Ua_userRow",
-			"compactionSummary": "okW0Ua_compactionSummary",
-			"userStack": "okW0Ua_userStack",
-			"compactionRow": "okW0Ua_compactionRow",
+			"turnErrorTitle": "okW0Ua_turnErrorTitle",
+			"retryText": "okW0Ua_retryText",
 			"compactionLeading": "okW0Ua_compactionLeading",
-			"compactionDisclosureIcon": "okW0Ua_compactionDisclosureIcon",
-			"retryDetails": "okW0Ua_retryDetails",
+			"retryRow": "okW0Ua_retryRow",
 			"contextRow": "okW0Ua_contextRow",
-			"retryDetailLabel": "okW0Ua_retryDetailLabel",
+			"compactionContextIcon": "okW0Ua_compactionContextIcon",
+			"retryDetails": "okW0Ua_retryDetails",
+			"compactionRow": "okW0Ua_compactionRow",
+			"compactionTitle": "okW0Ua_compactionTitle",
 			"turnErrorRow": "okW0Ua_turnErrorRow",
-			"compactionSep": "okW0Ua_compactionSep",
+			"turnErrorMessage": "okW0Ua_turnErrorMessage",
+			"confirmActions": "okW0Ua_confirmActions",
+			"compactionDisclosureIcon": "okW0Ua_compactionDisclosureIcon",
+			"compactionSummary": "okW0Ua_compactionSummary",
 			"turnErrorDot": "okW0Ua_turnErrorDot",
 			"turnErrorCopy": "okW0Ua_turnErrorCopy",
+			"userStack": "okW0Ua_userStack",
+			"compactionSep": "okW0Ua_compactionSep",
+			"userRow": "okW0Ua_userRow",
+			"retry-shimmer": "okW0Ua_retry-shimmer",
+			"compactionButton": "okW0Ua_compactionButton",
 			"bubble": "okW0Ua_bubble",
 			"compactionBody": "okW0Ua_compactionBody",
-			"retryText": "okW0Ua_retryText",
-			"retrySummary": "okW0Ua_retrySummary",
-			"compactionTitle": "okW0Ua_compactionTitle",
-			"turnErrorTitle": "okW0Ua_turnErrorTitle",
-			"turnErrorMessage": "okW0Ua_turnErrorMessage",
+			"retryDetailLabel": "okW0Ua_retryDetailLabel",
 			"turnErrorCode": "okW0Ua_turnErrorCode",
-			"confirmActions": "okW0Ua_confirmActions",
-			"compactionContextIcon": "okW0Ua_compactionContextIcon"
+			"maxTokensTitle": "okW0Ua_maxTokensTitle",
+			"refChip": "okW0Ua_refChip",
+			"retrySummary": "okW0Ua_retrySummary"
 		};
 		//#endregion
 		//#region src/client/chat-node/MessageItem.tsx

package/dist/testing.mjs

@@ -17929,7 +17929,9 @@ function findSurfaceRepairs(events) {
 	const degradeToAppend = /* @__PURE__ */ new Set();
 	const addAppendMarker = /* @__PURE__ */ new Set();
 	const clearSurfaceOp = /* @__PURE__ */ new Set();
-	for (const event of events) {
+	const clampEnd = /* @__PURE__ */ new Map();
+	for (let index = 0; index < events.length; index++) {
+		const event = events[index];
 		const op = event.surfaceOp;
 		if (op === void 0) {
 			if (SURFACE_EVENT_TYPES.has(event.type)) {
@@ -17952,7 +17954,12 @@ function findSurfaceRepairs(events) {
 		const end = replace?.["end"];
 		const shapeOk = replace !== void 0 && replace["op"] === "replace" && isEventSeqLike(start) && isEventSeqLike(end);
 		const startIdx = shapeOk ? nodes.indexOf(start) : -1;
-		const endIdx = shapeOk ? nodes.indexOf(end) : -1;
+		let endIdx = shapeOk ? nodes.indexOf(end) : -1;
+		let clamped;
+		if (shapeOk && startIdx !== -1 && endIdx === -1) {
+			clamped = clampReplaceEnd(events, index, nodes, startIdx);
+			if (clamped !== void 0) endIdx = nodes.indexOf(clamped);
+		}
 		const rangeOk = shapeOk && startIdx !== -1 && endIdx !== -1 && startIdx <= endIdx;
 		let rewriteOk = true;
 		if (rangeOk && event.type === "tool/result") {
@@ -17968,25 +17975,98 @@ function findSurfaceRepairs(events) {
 			nodes.push(event.seq);
 			continue;
 		}
+		if (clamped !== void 0) clampEnd.set(event.seq, clamped);
 		nodes.splice(startIdx, endIdx - startIdx + 1, event.seq);
 	}
 	return {
 		degradeToAppend,
 		addAppendMarker,
-		clearSurfaceOp
+		clearSurfaceOp,
+		clampEnd
 	};
 }
+/**
+* 夹取一个 end 落在旧坐标空间的 replace 的结尾。
+*
+* 仅当 replace 紧邻一个 metering 事件且其 `shadowedSeqs` 是权威数量时成立；
+* 夹取点是从 `start` 起的第 `shadowedSeqs.length` 个当前 surface 节点（不足
+* 则取当前 surface 末尾）。无法夹取（start 也不在当前 surface）时返回
+* `undefined`，由调用方降级为 append。
+*/
+function clampReplaceEnd(events, index, nodes, startIdx) {
+	const metering = index > 0 ? events[index - 1] : void 0;
+	if (metering === void 0 || !METERING_EVENT_TYPES.has(metering.type)) return void 0;
+	const shadowedSeqs = metering.data.shadowedSeqs;
+	if (!Array.isArray(shadowedSeqs) || shadowedSeqs.length === 0) return void 0;
+	return nodes[Math.min(startIdx + shadowedSeqs.length - 1, nodes.length - 1)];
+}
 function repairSurfaceOps(events) {
 	const repairs = findSurfaceRepairs(events);
-	if (repairs.degradeToAppend.size === 0 && repairs.addAppendMarker.size === 0 && repairs.clearSurfaceOp.size === 0) return;
+	if (repairs.degradeToAppend.size === 0 && repairs.addAppendMarker.size === 0 && repairs.clearSurfaceOp.size === 0 && repairs.clampEnd.size === 0) return;
 	for (const event of events) {
 		const raw = event;
+		const clamped = repairs.clampEnd.get(event.seq);
 		if (repairs.degradeToAppend.has(event.seq)) raw.surfaceOp = "append";
+		else if (clamped !== void 0) raw.surfaceOp = {
+			op: "replace",
+			start: raw.surfaceOp.start,
+			end: clamped
+		};
 		else if (repairs.addAppendMarker.has(event.seq)) raw.surfaceOp = "append";
 		else if (repairs.clearSurfaceOp.has(event.seq)) delete raw.surfaceOp;
 	}
 }
 /**
+* 读取时补全 assistant 结算字段：旧写入器不落库 `stream`（v2 才把流式记录
+* 嵌入消息），读回时缺失即补空数组——上游 seed 校验要求 turn/step/stream
+* 三者齐备，缺失会让整个会话加载失败。
+*/
+function repairAssistantSettlement(events) {
+	for (const event of events) {
+		if (event.type !== "assistant/message" && event.type !== "assistant/attempt") continue;
+		const data = event.data;
+		if (!Array.isArray(data["stream"])) data["stream"] = [];
+	}
+}
+/**
+* 把紧邻 replace 的 metering 事件的 `shadowedRange` / `shadowedSeqs` 对齐到
+* replace 最终的稠密 range。
+*
+* 旧写入器重编号事件后，metering 与 replace 一起落在旧坐标空间：二者数值
+* 相等但与当前 surface 无关。夹取（或 range 本身已落在稠密空间而 metering
+* 仍是旧值）后二者不再相等，而上游 token-meter 契约要求紧邻的 metering
+* range 与 replace range 完全一致（否则报 no adjacent shadow price）。range
+* 已一致时不改写——当前写入器保证一致，shadowedSeqs 的额外并发节点因此
+* 原样保留。
+*/
+function syncMeteringRanges(events) {
+	for (let i = 1; i < events.length; i++) {
+		const metering = events[i - 1];
+		if (!METERING_EVENT_TYPES.has(metering.type)) continue;
+		const op = events[i].surfaceOp;
+		if (typeof op !== "object" || op === null || op.op !== "replace") continue;
+		const { start, end } = op;
+		const data = metering.data;
+		if (data.shadowedRange?.start === start && data.shadowedRange.end === end) continue;
+		data.shadowedRange = {
+			start,
+			end
+		};
+		data.shadowedSeqs = events.filter((candidate) => candidate.seq >= start && candidate.seq <= end && SURFACE_EVENT_TYPES.has(candidate.type)).map((candidate) => candidate.seq);
+	}
+}
+/**
+* 读取视图修复总入口：结算字段补全 → surface 语义修复 → metering 对齐 →
+* provenance 重算 → 孤儿 inbox splice 改写。全部只作用于内存视图，不落库。
+*/
+function repairReadView(events) {
+	repairAssistantSettlement(events);
+	repairSurfaceOps(events);
+	syncMeteringRanges(events);
+	recomputeReplaceProvenance(events);
+	repairOrphanInboxSplices(events);
+}
+/**
 * 定位无法从空状态增量重放的 agent/inbox/spliced 事件（孤儿操作）。
 *
 * 上游 Inbox 每次构造都从会话起点重放全部 inbox splice，失败即拒绝整个
@@ -23472,6 +23552,36 @@ function convertLegacyRows(row, eventRows) {
 function isLegacyVersion(version) {
 	return version < 2;
 }
+/**
+* 迁移链拒绝后，把旧格式行直接当**当前格式**事件视图采用。
+*
+* 旧写入器只在建会话时落一次 header version，之后跟随上游演进继续追加
+* 事件——同一个 log 因此可能是混合世代（v0 时代的行 + 新版本字段），不是
+* 任何单一已发布格式，严格迁移链必然拒绝。这些行的数据形状（消息包装、
+* 类型名）已经是当前格式，只需 header 版本归一到当前、按稠密 seq 读取；
+* 事件数据的补全与 surface 修复由读取视图修复（repairReadView）负责。
+*
+* 调用方须在此之后执行 `validateStoredEvents`：真正属于旧格式的类型
+* （`assistant/chunk` / `compact/*` 等）仍会被 fail-loud 拒绝。
+*
+* @param row - 会话行（f_version < 2）。
+* @param eventRows - 该会话全部桥接行（按 f_sequence 升序）。
+* @returns 当前格式 header（version 归一到 SESSION_FORMAT_VERSION）、收缩后的
+*   继承前缀长度、稠密事件与可选 torn tail 起点。
+* @throws scanRows 的已提交区损坏错误（seq gap / 不可解析行）。
+*/
+function adoptLegacyRows(row, eventRows) {
+	const { preserved, tornFrom } = scanRows(eventRows, 0);
+	return {
+		meta: {
+			...rowToMeta(row),
+			version: SESSION_FORMAT_VERSION
+		},
+		inheritedEventCount: Math.min(row.fSeedLength ?? 0, preserved.length),
+		events: preserved,
+		...tornFrom !== void 0 ? { tornFrom } : {}
+	};
+}
 //#endregion
 //#region ../session-rdb/src/index.ts
 /** 会话级写所有权与 live 路由簿记。 */
@@ -23615,9 +23725,7 @@ var RdbSessionHandle = class RdbSessionHandle {
 			};
 			throw new SessionPersistenceNotFoundError(this.id);
 		}
-		repairSurfaceOps(log.events);
-		recomputeReplaceProvenance(log.events);
-		repairOrphanInboxSplices(log.events);
+		repairReadView(log.events);
 		return {
 			eventState: "detached",
 			events: log.events.slice(offset, offset + length)
@@ -23830,6 +23938,7 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 			const log = await this.readLog(id, {}, options?.signal);
 			if (log === void 0) throw new SessionPersistenceNotFoundError(id);
 			validateStoredEvents(log.meta, log.events);
+			if (log.migrated && log.events.length !== log.storedCount) await this.rewriteMigratedLog(id, log);
 			this.writeGuard.confirmHead(id, log.events.at(-1)?.seq ?? -1);
 			return this.tracker.adopt(new RdbSessionHandle(this, id, log.meta, "write", {
 				cursor: log.events.length,
@@ -23893,8 +24002,7 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 		signal?.throwIfAborted();
 		const log = await this.readLog(id, {}, signal);
 		if (log === void 0) return void 0;
-		repairSurfaceOps(log.events);
-		recomputeReplaceProvenance(log.events);
+		repairReadView(log.events);
 		const inheritedEventCount = Math.min(log.inheritedEventCount, log.events.length);
 		return {
 			meta: log.meta,
@@ -23962,14 +24070,29 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 		const meta = rowToMeta(row);
 		const eventRows = options.fromSeq === void 0 ? await this.backend.getEventRows(id) : await this.backend.getEventRows(id, options.fromSeq);
 		signal?.throwIfAborted();
-		if (isLegacyVersion(row.fVersion)) {
+		if (isLegacyVersion(row.fVersion)) try {
 			const converted = convertLegacyRows(row, eventRows);
 			return {
 				meta: converted.meta,
 				inheritedEventCount: converted.inheritedEventCount,
 				events: converted.events,
 				incarnation: row.fIncarnation,
-				revision: row.fRevision
+				revision: row.fRevision,
+				storedCount: eventRows.length,
+				migrated: true
+			};
+		} catch (error) {
+			this.ctx.logger.warn(`session-rdb: session "${id}" is not a single released format; adopting its stored rows as current-format data (${error instanceof Error ? error.message : String(error)})`);
+			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 } : {}
 			};
 		}
 		const { preserved, tornFrom } = scanRows(eventRows, options.fromSeq ?? 0);
@@ -23979,9 +24102,35 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 			events: preserved,
 			incarnation: row.fIncarnation,
 			revision: row.fRevision,
+			storedCount: eventRows.length,
+			migrated: false,
 			...tornFrom !== void 0 ? { tornFrom } : {}
 		};
 	}
+	/**
+	* 把迁移链读出的 v2 视图整体落库（旧格式会话写打开时的一次性迁移）。
+	*
+	* 迁移链会生成/合并事件（end-seed / attempt / chunk 合并），事件 seq 空间
+	* 与存储桥接行数不再相等；写路径以存储 head 为锚点重编号，二者不一致会让
+	* append 撞上已有行。这里在同一事务内删光本会话桥接行、按迁移视图重建
+	* （新事件行，完整信封），并更新 head 与 revision；旧事件行保留（可能被
+	* fork 子会话引用，孤儿由惰性 GC 处理）。
+	*/
+	async rewriteMigratedLog(id, log) {
+		await this.backend.transaction(async (tx) => {
+			await tx.deleteBridgeTail(id, 0);
+			await tx.upsertSession({
+				meta: log.meta,
+				inheritedEventCount: SessionLogOffset(log.inheritedEventCount)
+			}, randomUUID());
+			const { headEventId, headSequence } = await appendEventTail(tx, log.meta, log.events, {
+				parentId: "",
+				nextSeq: 0
+			});
+			await tx.updateHead(id, headEventId, headSequence);
+			await tx.bumpRevision(id);
+		});
+	}
 	async listSnapshots(signal) {
 		signal?.throwIfAborted();
 		await this.ready;
@@ -24167,6 +24316,7 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 			if (stored.meta.cwd !== session.header.cwd) throw new Error(`session "${id}" is already persisted at a different cwd (persisted: ${String(stored.meta.cwd)}, live: ${String(session.header.cwd)}) (id collision)`);
 			if (stored.inheritedEventCount !== session.inheritedEventCount) throw new Error(`session "${id}" is already persisted with a different inherited event count (id collision)`);
 			assertVersion(stored.meta);
+			repairReadView(stored.events);
 			const seed = session.snapshotEvents();
 			if (!seedCoversPrefix(seed, stored.events)) throw new Error(`session "${id}" already has a persisted log on disk that does not match this live session (id collision)`);
 			handle = await this.open(id, "write");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/ui-conversation-message-actions",
-  "version": "0.0.14-alpha.0",
+  "version": "0.0.14-alpha.1",
   "description": "Rewind / retry / fork orchestration (host) plus conversation.chat.node renderer replacement (browser) — message edit / retry actions on user bubbles.",
   "keywords": [
     "conversation-chat-node",
@@ -35,10 +35,10 @@
     "./client": "./dist/client.js"
   },
   "dependencies": {
-    "@morlay/session-branch": "^0.0.4-alpha.0"
+    "@morlay/session-branch": "^0.0.4-alpha.1"
   },
   "devDependencies": {
-    "@morlay/session-rdb": "^0.0.16-alpha.0",
+    "@morlay/session-rdb": "^0.0.16-alpha.1",
     "@types/react": "^19.2.18",
     "@types/react-dom": "^19.2.5",
     "lightningcss": "^1.32.0",