@morlay/ui-conversation-message-actions 0.0.14-alpha.2 → 0.0.14-alpha.4

package/README.md

@@ -21,6 +21,12 @@
 - **edit / retry / reroll 是就地操作**：`rewind` 截断到目标轮之前的闭合
   `turn/end` 边界，再 `append` 版本效果 + 手工回合 / 重放输入回**同一会话**
   ——session id 不变，版本树保持单根；
+- **重放复用目标轮号**：轮首 user 编辑（含未闭合轮）整轮截断，重放接回原
+  轮号；编辑 assistant 写入 manualTurn 后同步 agent 的轮次游标；
+- **空轮吸收**：目标轮之前的空轮（`turn/start` 后直接 `turn/end`，早期重放
+  缺陷的遗留形状）随截断一并删除，重放按保留前缀续号——轮次导航不再出现
+  点不开的空项与轮号空洞；manualTurn 的轮号同样按保留前缀收敛（正常会话
+  等于目标轮号）。版本效果仍记录**原**目标轮号（操作历史）；
 - **只有 `fork` 创建新 id**（`ForkOperation` / `forkFrom`，纯 append 派生）；
 - 版本效果事件（`session-branch/version`）携带 `ignorable: true`：live log 可见、
   **不落 canonical log**（rdb 持久化时过滤并稠密化剩余事件）；
@@ -32,6 +38,8 @@
 缺失时退化为「已 durable 的就地版本」（可随时 resume 续跑）：
 
 - **live agent**（会话驻留 / 已恢复）：直接 `followup` 排队，不重建、不换 id；
+  编辑前只等 agent 停下（`whenIdle`），残留排队输入由 rewind 在截断后强制
+  durable 取消（session-rdb 的 `LiveSessionHooks.inbox.clear`）；
 - **cold 会话**：`resume` 已持久化会话（`create` 对已持久化日志必失败），
   resume 后 agent 驻留（不 dispose，避免 session 被移出 store 破坏客户端窗口）；
 - 模型 provider/model 在 **rewind 之前**从 `request/header` 解析（就地编辑
@@ -50,7 +58,10 @@
   增长；重试先弹确认；未闭合轮次不显示重试；
 - **操作后刷新**：就地编辑后优先调用客户端会话级 `resync()`（重置窗口并重新
   拉取历史，不整页重载——rewind 的删除无法经 append-only 事件流表达，seq
-  回退只做增量会残留旧节点），不可用时回退 `location.reload()`；
+  回退只做增量会残留旧节点），随后丢弃该会话的全部投影行
+  （`projections.truncate(-1)`）——投影 store 按 higher-seq-wins 保留 rewind
+  前的高 seq 旧值，截断后的正确值 seq 更小，永远覆盖不上（轮次导航残留已
+  删除的轮次）；不可用时回退 `location.reload()`；
 - **构建约束**：client bundle 必须是**单文件**（client-modules 只服务/加载
   `client.js`）——`noExternal` 全内联第三方 + `inlineDynamicImports` 合并
   动态 import，`@deepseek-ai/*` 一律 external（平台 seed 词或独立插件，

package/dist/client.js

@@ -14,6 +14,10 @@ window.__ModuleLoader__.load({
 		const SESSION_EDITOR_PATH = "/session-editor";
 		//#endregion
 		//#region src/client/controller.ts
+		/** desktop 壳（官方 dsh-desktop-host）注入的 transport 标记：ownsHost 时 API 走 /api 前缀。 */
+		function editorApiPath() {
+			return globalThis.__DSH_TRANSPORT__?.ownsHost === true ? `/api${SESSION_EDITOR_PATH}` : SESSION_EDITOR_PATH;
+		}
 		function messageOf(error) {
 			return error instanceof Error ? error.message : String(error);
 		}
@@ -127,7 +131,7 @@ window.__ModuleLoader__.load({
 					state.error = null;
 				});
 				try {
-					const response = await fetch(`${SESSION_EDITOR_PATH}?sessionId=${encodeURIComponent(this.sessionId)}`, {
+					const response = await fetch(`${editorApiPath()}?sessionId=${encodeURIComponent(this.sessionId)}`, {
 						method: "GET",
 						headers: { accept: "application/json" },
 						cache: "no-store"
@@ -161,7 +165,7 @@ window.__ModuleLoader__.load({
 					state.error = null;
 				});
 				try {
-					const response = await fetch(SESSION_EDITOR_PATH, {
+					const response = await fetch(editorApiPath(), {
 						method: "POST",
 						headers: {
 							accept: "application/json",
@@ -187,6 +191,12 @@ window.__ModuleLoader__.load({
 					const resync = face.resync;
 					if (resync !== void 0) try {
 						await resync.call(face);
+						const projections = face.projections;
+						if (typeof projections?.truncate !== "function") {
+							location.reload();
+							return true;
+						}
+						projections.truncate(-1);
 						this.load();
 						return true;
 					} catch {}
@@ -352,11 +362,11 @@ window.__ModuleLoader__.load({
 		}
 		var MessageIconActions_module_css_default = {
 			"runTimeDot": "lKOSUG_runTimeDot",
-			"actions": "lKOSUG_actions",
-			"visuallyHidden": "lKOSUG_visuallyHidden",
 			"timeEnd": "lKOSUG_timeEnd",
+			"action": "lKOSUG_action",
 			"timeStart": "lKOSUG_timeStart",
-			"action": "lKOSUG_action"
+			"actions": "lKOSUG_actions",
+			"visuallyHidden": "lKOSUG_visuallyHidden"
 		};
 		//#endregion
 		//#region src/client/chat-node/MessageIconActions.tsx
@@ -498,8 +508,8 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var MessageEditDialog_module_css_default = {
-			"actions": "_7VqDXa_actions",
-			"input": "_7VqDXa_input"
+			"input": "_7VqDXa_input",
+			"actions": "_7VqDXa_actions"
 		};
 		//#endregion
 		//#region src/client/chat-node/MessageEditDialog.tsx
@@ -570,34 +580,34 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var MessageItem_module_css_default = {
-			"compactionTitle": "okW0Ua_compactionTitle",
+			"retryRow": "okW0Ua_retryRow",
 			"turnErrorRow": "okW0Ua_turnErrorRow",
-			"maxTokensTitle": "okW0Ua_maxTokensTitle",
-			"retryText": "okW0Ua_retryText",
-			"retryDetails": "okW0Ua_retryDetails",
-			"retryDetailLabel": "okW0Ua_retryDetailLabel",
-			"turnErrorCopy": "okW0Ua_turnErrorCopy",
-			"userStack": "okW0Ua_userStack",
-			"compactionRow": "okW0Ua_compactionRow",
+			"bubble": "okW0Ua_bubble",
+			"confirmActions": "okW0Ua_confirmActions",
+			"userRow": "okW0Ua_userRow",
+			"compactionLeading": "okW0Ua_compactionLeading",
+			"compactionButton": "okW0Ua_compactionButton",
+			"retry-shimmer": "okW0Ua_retry-shimmer",
 			"compactionContextIcon": "okW0Ua_compactionContextIcon",
-			"compactionSep": "okW0Ua_compactionSep",
+			"turnErrorDot": "okW0Ua_turnErrorDot",
+			"compactionSummary": "okW0Ua_compactionSummary",
 			"compactionBody": "okW0Ua_compactionBody",
-			"turnErrorCode": "okW0Ua_turnErrorCode",
+			"turnErrorCopy": "okW0Ua_turnErrorCopy",
+			"userStack": "okW0Ua_userStack",
+			"turnErrorTitle": "okW0Ua_turnErrorTitle",
 			"turnErrorMessage": "okW0Ua_turnErrorMessage",
-			"retryRow": "okW0Ua_retryRow",
-			"compactionDisclosureIcon": "okW0Ua_compactionDisclosureIcon",
-			"retry-shimmer": "okW0Ua_retry-shimmer",
-			"compactionLeading": "okW0Ua_compactionLeading",
-			"contextRow": "okW0Ua_contextRow",
-			"compactionSummary": "okW0Ua_compactionSummary",
-			"bubble": "okW0Ua_bubble",
 			"retrySummary": "okW0Ua_retrySummary",
-			"turnErrorTitle": "okW0Ua_turnErrorTitle",
+			"retryDetailLabel": "okW0Ua_retryDetailLabel",
+			"maxTokensTitle": "okW0Ua_maxTokensTitle",
+			"compactionDisclosureIcon": "okW0Ua_compactionDisclosureIcon",
+			"retryText": "okW0Ua_retryText",
 			"refChip": "okW0Ua_refChip",
-			"confirmActions": "okW0Ua_confirmActions",
-			"compactionButton": "okW0Ua_compactionButton",
-			"turnErrorDot": "okW0Ua_turnErrorDot",
-			"userRow": "okW0Ua_userRow"
+			"turnErrorCode": "okW0Ua_turnErrorCode",
+			"compactionRow": "okW0Ua_compactionRow",
+			"retryDetails": "okW0Ua_retryDetails",
+			"contextRow": "okW0Ua_contextRow",
+			"compactionTitle": "okW0Ua_compactionTitle",
+			"compactionSep": "okW0Ua_compactionSep"
 		};
 		//#endregion
 		//#region src/client/chat-node/MessageItem.tsx

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { _ as SessionEditorResult, d as EditableMessageBlock, f as RerollOperation, g as SessionEditorOperation, h as RewindOperation, l as retryableTurns, m as RetryableTurn, o as editableMessages, p as RetryOperation, r as closedTurns, u as EditOperation } from "./plan-C-_enFsA.mjs";
+import { _ as SessionEditorOperation, d as EditOperation, f as EditableMessageBlock, g as RewindOperation, h as RetryableTurn, m as RetryOperation, o as editableMessages, p as RerollOperation, r as closedTurns, u as retryableTurns, v as SessionEditorResult } from "./plan-BdU_mnTv.mjs";
 import { Context, Service } from "@deepseek-ai/cordis";
 import { Session, SessionEvent, SessionId } from "@deepseek-ai/dsh-session";
 import { BranchBoundary, BranchTimeline, BranchTimeline as BranchTimeline$1, CascadePolicy, EditableBlockKind, SESSION_BRANCH_VERSION_SCHEMA, SessionBranchVersionEvent } from "@morlay/session-branch";
@@ -14,14 +14,6 @@ interface EditorAgent {
   followup(message: UserMessage): void;
   /** 等待 agent 到达 quiescence（当前 turn/任务结束后 resolve）。 */
   whenIdle(): Promise<void>;
-  /**
-   * 队列中是否有待处理输入（next-turn / next-step）。rewind 截断会删除这些
-   * 输入所属轮次的事件，残留的 inbox 状态会与截断后的 log 失配，使后续
-   * splice 落库后无法从日志重放——编辑前必须清空。
-   */
-  readonly inboxPending: boolean;
-  /** 清空待处理输入（落库 canceled splice，须在 rewind 前调用）。 */
-  clearInbox(): void;
 }
 interface EditorAgentHandle {
   readonly agent: EditorAgent;

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { n as SessionEditor, t as SESSION_BRANCH_VERSION_SCHEMA } from "./src-DqUEYw-N.mjs";
+import { n as SessionEditor, t as SESSION_BRANCH_VERSION_SCHEMA } from "./src-ks167MhO.mjs";
 import { closedTurns, editableMessages, retryableTurns } from "./plan.mjs";
 export { SESSION_BRANCH_VERSION_SCHEMA, SessionEditor, SessionEditor as default, closedTurns, editableMessages, retryableTurns };

package/dist/{plan-C-_enFsA.d.mts → plan-BdU_mnTv.d.mts}

@@ -78,9 +78,16 @@ interface OperationPlan {
 declare function closedTurns(events: readonly SessionEvent[]): ClosedTurn[];
 declare function editableMessages(turns: readonly ClosedTurn[]): EditableMessageBlock[];
 declare function retryableTurns(turns: readonly ClosedTurn[]): RetryableTurn[];
+/**
+ * 目标轮之前最后一个「有内容」轮次的下标：跳过既无用户输入也无助手回复的
+ * 空轮。空轮是早期重放缺陷的遗留（turn/start 后直接 turn/end），在轨迹 /
+ * 轮次导航里表现为点不开的空项，并让后续轮号出现空洞。rewind 把它们随
+ * 目标轮一起截断，重放按保留前缀续号即可自愈。
+ */
+declare function precedingContentIndex(turns: readonly ClosedTurn[], turnIndex: number): number;
 declare function downstreamUsers(turns: readonly ClosedTurn[], start: number): UserMessage[];
 declare function editPlan(operation: EditOperation, turns: readonly ClosedTurn[]): OperationPlan;
 declare function retryPlan(operation: RetryOperation, turns: readonly ClosedTurn[]): OperationPlan;
 declare function rerollPlan(operation: RerollOperation, turns: readonly ClosedTurn[]): OperationPlan;
 //#endregion
-export { SessionEditorResult as _, editPlan as a, retryPlan as c, EditableMessageBlock as d, RerollOperation as f, SessionEditorOperation as g, RewindOperation as h, downstreamUsers as i, retryableTurns as l, RetryableTurn as m, OperationPlan as n, editableMessages as o, RetryOperation as p, closedTurns as r, rerollPlan as s, ClosedTurn as t, EditOperation as u };
+export { SessionEditorOperation as _, editPlan as a, rerollPlan as c, EditOperation as d, EditableMessageBlock as f, RewindOperation as g, RetryableTurn as h, downstreamUsers as i, retryPlan as l, RetryOperation as m, OperationPlan as n, editableMessages as o, RerollOperation as p, closedTurns as r, precedingContentIndex as s, ClosedTurn as t, retryableTurns as u, SessionEditorResult as v };

package/dist/plan.d.mts

@@ -1,2 +1,2 @@
-import { a as editPlan, c as retryPlan, i as downstreamUsers, l as retryableTurns, n as OperationPlan, o as editableMessages, r as closedTurns, s as rerollPlan, t as ClosedTurn } from "./plan-C-_enFsA.mjs";
-export { ClosedTurn, OperationPlan, closedTurns, downstreamUsers, editPlan, editableMessages, rerollPlan, retryPlan, retryableTurns };
+import { a as editPlan, c as rerollPlan, i as downstreamUsers, l as retryPlan, n as OperationPlan, o as editableMessages, r as closedTurns, s as precedingContentIndex, t as ClosedTurn, u as retryableTurns } from "./plan-BdU_mnTv.mjs";
+export { ClosedTurn, OperationPlan, closedTurns, downstreamUsers, editPlan, editableMessages, precedingContentIndex, rerollPlan, retryPlan, retryableTurns };

package/dist/plan.mjs

@@ -100,6 +100,21 @@ function retryableTurns(turns) {
 		time: turn.user.time
 	}]);
 }
+/**
+* 目标轮之前最后一个「有内容」轮次的下标：跳过既无用户输入也无助手回复的
+* 空轮。空轮是早期重放缺陷的遗留（turn/start 后直接 turn/end），在轨迹 /
+* 轮次导航里表现为点不开的空项，并让后续轮号出现空洞。rewind 把它们随
+* 目标轮一起截断，重放按保留前缀续号即可自愈。
+*/
+function precedingContentIndex(turns, turnIndex) {
+	let index = turnIndex - 1;
+	while (index >= 0) {
+		const turn = turns[index];
+		if (turn.users.length > 0 || turn.assistants.length > 0) break;
+		index -= 1;
+	}
+	return index;
+}
 function downstreamUsers(turns, start) {
 	return turns.slice(start).flatMap((turn) => turn.users.map((user) => cloneUser(user.data)));
 }
@@ -144,7 +159,7 @@ function editPlan(operation, turns) {
 		const later = operation.cascade === "preserve" ? downstreamUsers(turns, turnIndex + 1) : [];
 		return {
 			anchorSeq: turn.startSeq,
-			...turn.closed && userIndex === 0 ? {} : { rewindBoundary: event.seq },
+			...userIndex === 0 ? {} : { rewindBoundary: event.seq },
 			version: pairVersionEffect(operation.sessionId, {
 				operation: "edit",
 				cascade: operation.cascade,
@@ -222,4 +237,4 @@ function rerollPlan(operation, turns) {
 	throw new SessionBranchError("当前会话没有可重生成的已落定助手回复。", "INVALID_BOUNDARY");
 }
 //#endregion
-export { closedTurns, downstreamUsers, editPlan, editableMessages, rerollPlan, retryPlan, retryableTurns };
+export { closedTurns, downstreamUsers, editPlan, editableMessages, precedingContentIndex, rerollPlan, retryPlan, retryableTurns };

package/dist/{src-DqUEYw-N.mjs → src-ks167MhO.mjs}

@@ -1,4 +1,4 @@
-import { closedTurns, editPlan, editableMessages, rerollPlan, retryPlan, retryableTurns } from "./plan.mjs";
+import { closedTurns, editPlan, editableMessages, precedingContentIndex, rerollPlan, retryPlan, retryableTurns } from "./plan.mjs";
 import { Service } from "@deepseek-ai/cordis";
 import { SessionSeq } from "@deepseek-ai/dsh-session";
 import { SESSION_BRANCH_VERSION_SCHEMA as SESSION_BRANCH_VERSION_SCHEMA$1, SessionBranchError, balanceRewindPrefix } from "@morlay/session-branch";
@@ -173,18 +173,24 @@ var SessionEditor = class extends Service {
 		const turns = closedTurns(events);
 		const plan = operation.action === "edit" ? editPlan(operation, turns) : operation.action === "retry" ? retryPlan(operation, turns) : rerollPlan(operation, turns);
 		const headerConfig = events.findLast((event) => event.type === "request/header")?.data.header.config;
+		const turnIndex = turns.findIndex((turn) => turn.startSeq === plan.anchorSeq);
+		const preceding = precedingContentIndex(turns, turnIndex);
+		const boundary = plan.rewindBoundary !== void 0 ? plan.rewindBoundary : preceding < 0 ? -1 : turns[preceding].endSeq;
+		const replayTurn = preceding < 0 ? 1 : turns[preceding].turn + 1;
 		const seedSuffix = [];
 		appendLogSeedEvent(seedSuffix, "session-branch/version", plan.version, true);
-		if (plan.manualTurn !== void 0) appendManualTurn(seedSuffix, plan.manualTurn);
+		if (plan.manualTurn !== void 0) appendManualTurn(seedSuffix, {
+			...plan.manualTurn,
+			turn: replayTurn
+		});
 		const replay = await this.prepareReplay(operation.sessionId, plan.queuedUsers, signal, headerConfig);
-		const turnIndex = turns.findIndex((turn) => turn.startSeq === plan.anchorSeq);
-		const boundary = plan.rewindBoundary !== void 0 ? plan.rewindBoundary : turnIndex <= 0 ? -1 : turns[turnIndex - 1].endSeq;
 		const live = this.ctx.sessions.get(operation.sessionId);
 		await this.ctx.sessionBranch.rewind(operation.sessionId, boundary, signal);
 		if (seedSuffix.length > 0) {
 			if (live !== void 0) {
 				const handle = this.ctx.sessionPersistence.tracker.writerOf(operation.sessionId);
 				if (handle === void 0) throw new Error(`session "${operation.sessionId}" has no live write handle for the version effect`);
+				await this.ctx.sessions.flush(live);
 				await appendSeedSuffixLive(live, seedSuffix, (events) => handle.append(events));
 				await this.ctx.sessions.flush(live);
 			} else {
@@ -204,6 +210,11 @@ var SessionEditor = class extends Service {
 		}
 		let queuedTurns = 0;
 		if (replay.agent !== void 0 && plan.queuedUsers.length > 0) {
+			const lastSeedTurn = seedSuffix.findLast((event) => event.type === "turn/start")?.data.turn;
+			if (lastSeedTurn !== void 0) {
+				const phase = replay.agent.phase;
+				if (phase !== void 0) phase.lastTurn = lastSeedTurn;
+			}
 			for (const message of plan.queuedUsers) replay.agent.followup(message);
 			await this.ctx.sessions.flush(replay.agent.session);
 			queuedTurns = plan.queuedUsers.length;
@@ -234,7 +245,6 @@ var SessionEditor = class extends Service {
 		if (existing !== void 0) {
 			await existing.whenIdle();
 			signal?.throwIfAborted();
-			if (existing.inboxPending) existing.clearInbox();
 			return { agent: existing };
 		}
 		const provider = headerConfig?.provider ?? "";
@@ -403,9 +413,9 @@ async function handleRoute(editor, request, response) {
 	}
 }
 function registerHttpRoutes(ctx) {
-	const webServer = ctx.get("webServer");
-	if (webServer === void 0) return;
 	ctx.effect(() => {
+		const webServer = ctx.get("webServer");
+		if (webServer === void 0) return () => {};
 		const editor = ctx.sessionEditor;
 		return webServer.register({
 			kind: "exact",
@@ -413,6 +423,41 @@ function registerHttpRoutes(ctx) {
 			handler: (request, response) => handleRoute(editor, request, response)
 		});
 	}, "session-editor: HTTP route");
+	const registerConnectionRoute = () => {
+		const connection = ctx.get("connection", false);
+		if (connection === void 0) return;
+		const editor = ctx.sessionEditor;
+		ctx.effect(() => connection.fetch.register({
+			path: `/api${SESSION_EDITOR_PATH}`,
+			methods: ["GET", "POST"],
+			requestBody: "buffered",
+			fetch: (request) => handleFetchRoute(editor, request)
+		}), "session-editor: connection fetch route");
+	};
+	ctx.on("internal/service", (name) => {
+		if (name === "connection") registerConnectionRoute();
+	});
+	registerConnectionRoute();
+}
+/** connection.fetch 路由的 Fetch 形态处理（与 webServer 的 node:http 形态同语义）。 */
+async function handleFetchRoute(editor, request) {
+	try {
+		if (request.method === "GET") return jsonResponse(200, await readTimeline(editor, sessionIdOf(new URL(request.url).searchParams.get("sessionId"))));
+		if (request.method === "POST") return jsonResponse(200, await runOperation(editor, decodeOperation(await request.json())));
+		return new Response(null, { status: 405 });
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		return jsonResponse(error instanceof TypeError ? 400 : 409, { error: message });
+	}
+}
+function jsonResponse(status, value) {
+	return new Response(JSON.stringify(value), {
+		status,
+		headers: {
+			"content-type": "application/json; charset=utf-8",
+			"cache-control": "no-store"
+		}
+	});
 }
 //#endregion
 export { SessionEditor as n, SESSION_BRANCH_VERSION_SCHEMA$1 as t };