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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/ui-conversation-message-actions",
-  "version": "0.0.14-alpha.2",
+  "version": "0.0.14",
   "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.2"
+    "@morlay/session-branch": "^0.0.4"
   },
   "devDependencies": {
-    "@morlay/session-rdb": "^0.0.16-alpha.2",
+    "@morlay/session-rdb": "^0.0.16",
     "@types/react": "^19.2.18",
     "@types/react-dom": "^19.2.5",
     "lightningcss": "^1.32.0",
@@ -47,22 +47,22 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-api-session-controller": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-attachment": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-connection": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-store": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-ui-attachment": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-ui-chat": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-invariants": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-llm": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-session": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-session-persistence": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-session-projection": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-token-meter": "^0.1.5-alpha.1"
+    "@deepseek-ai/dsh-api-session-controller": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-attachment": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-connection": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-store": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-attachment": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-chat": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-invariants": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-llm": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-session": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-session-persistence": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-session-projection": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-token-meter": "^0.1.5-rc.1"
   },
   "dsh": {
     "bundle": {

package/src/client/controller.ts

@@ -16,6 +16,13 @@ import {
   type VersionOperation,
 } from "../shared.ts";
 
+/** desktop 壳（官方 dsh-desktop-host）注入的 transport 标记：ownsHost 时 API 走 /api 前缀。 */
+function editorApiPath(): string {
+  const transport = (globalThis as { __DSH_TRANSPORT__?: { ownsHost?: boolean } })
+    .__DSH_TRANSPORT__;
+  return transport?.ownsHost === true ? `/api${SESSION_EDITOR_PATH}` : SESSION_EDITOR_PATH;
+}
+
 export interface SessionEditorState {
   status: "idle" | "loading" | "ready" | "error";
   error: string | null;
@@ -157,7 +164,7 @@ export class SessionEditorController {
     });
     try {
       const response = await fetch(
-        `${SESSION_EDITOR_PATH}?sessionId=${encodeURIComponent(this.sessionId)}`,
+        `${editorApiPath()}?sessionId=${encodeURIComponent(this.sessionId)}`,
         {
           method: "GET",
           headers: { accept: "application/json" },
@@ -199,7 +206,7 @@ export class SessionEditorController {
       state.error = null;
     });
     try {
-      const response = await fetch(SESSION_EDITOR_PATH, {
+      const response = await fetch(editorApiPath(), {
         method: "POST",
         headers: { accept: "application/json", "content-type": "application/json" },
         body: JSON.stringify(operation),
@@ -229,6 +236,18 @@ export class SessionEditorController {
       if (resync !== undefined) {
         try {
           await resync.call(face);
+          // resync 只重建事件窗口；投影 store 按 higher-seq-wins 保留 rewind
+          // 前的高 seq 旧值（截断后的正确值 seq 更小，永远覆盖不上），轮次
+          // 导航会残留已删除的轮次。丢弃全部投影行，等 host 推送重建；拿不到
+          // 丢弃入口时整页重载兜底。
+          const projections = (
+            face as unknown as { projections?: { truncate?(lastSeq: number): void } }
+          ).projections;
+          if (typeof projections?.truncate !== "function") {
+            location.reload();
+            return true;
+          }
+          projections.truncate(-1);
           void this.load();
           return true;
         } catch {

package/src/index.ts

@@ -33,6 +33,7 @@ import {
   closedTurns,
   editableMessages,
   editPlan,
+  precedingContentIndex,
   retryPlan,
   rerollPlan,
   retryableTurns,
@@ -66,14 +67,6 @@ export 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;
 }
 
 export interface EditorAgentHandle {
@@ -288,11 +281,27 @@ export class SessionEditor extends Service {
     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 !== undefined
+        ? plan.rewindBoundary
+        : preceding < 0
+          ? -1
+          : turns[preceding]!.endSeq!;
+    // manualTurn 的轮号同样按保留前缀续号：正常会话等于目标轮号，有空轮
+    // 时收敛为连续编号。
+    const replayTurn = preceding < 0 ? 1 : turns[preceding]!.turn + 1;
+
     // 派生 seed 后缀：版本效果 + 可选手工回合。版本事件对核心是 ignorable，
     // 保证非 branch 读者可安全跳过。
     const seedSuffix: SessionEvent[] = [];
     appendLogSeedEvent(seedSuffix, "session-branch/version", plan.version, true);
-    if (plan.manualTurn !== undefined) appendManualTurn(seedSuffix, plan.manualTurn);
+    if (plan.manualTurn !== undefined) {
+      appendManualTurn(seedSuffix, { ...plan.manualTurn, turn: replayTurn });
+    }
 
     // 就地编辑：不创建新会话、不改变 id。需要重放排队输入时，先在 rewind
     // 前确保 agent 就绪（live agent 等其停；cold 先 resume）——rewind 截断后
@@ -304,13 +313,6 @@ export class SessionEditor extends Service {
       headerConfig,
     );
 
-    const turnIndex = turns.findIndex((turn) => turn.startSeq === plan.anchorSeq);
-    const boundary =
-      plan.rewindBoundary !== undefined
-        ? 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) {
@@ -333,6 +335,10 @@ export class SessionEditor extends Service {
             `session "${operation.sessionId}" has no live write handle for the version effect`,
           );
         }
+        // rewind 截断后可能已追加事件（如 inbox 取消 splice），它们仍在
+        // write-behind 缓冲里；直接对 handle 写版本效果前必须先把缓冲落盘，
+        // 否则 handle cursor 落后于 log 长度 → append seq mismatch。
+        await this.ctx.sessions.flush(live);
         await appendSeedSuffixLive(live, seedSuffix, (events) => handle.append(events));
         await this.ctx.sessions.flush(live);
       } else {
@@ -361,6 +367,13 @@ export class SessionEditor extends Service {
     // 缺失）时退化为已 durable 的就地版本。
     let queuedTurns = 0;
     if (replay.agent !== undefined && plan.queuedUsers.length > 0) {
+      // seedSuffix 里的 manualTurn 直接写入了 turn/start，而 agent 的轮次
+      // 游标仍停在 rewind 重置的位置；不同步就会把重放开成重复轮号。
+      const lastSeedTurn = seedSuffix.findLast((event) => event.type === "turn/start")?.data.turn;
+      if (lastSeedTurn !== undefined) {
+        const phase = (replay.agent as unknown as { phase?: { lastTurn?: number } }).phase;
+        if (phase !== undefined) 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;
@@ -410,10 +423,8 @@ export class SessionEditor extends Service {
     if (existing !== undefined) {
       await existing.whenIdle();
       signal?.throwIfAborted();
-      // 清空 inbox 残留（rewind 将删除这些输入所属轮次的事件；残留消息若
-      // 不清空，agent 后续 splice 落库后无法从日志重放——inbox 增量投影
-      // 假设 log 只 append）。
-      if (existing.inboxPending) existing.clearInbox();
+      // 排队输入由 rewind 在截断后强制 durable 取消（session-rdb 的
+      // LiveSessionHooks.inbox.clear），这里只需保证 agent 已停下。
       return { agent: existing };
     }
     // cold：resume 已持久化会话（create 会因「已存在持久化日志」失败）。
@@ -661,9 +672,11 @@ async function handleRoute(
 }
 
 function registerHttpRoutes(ctx: Context): void {
-  const webServer = ctx.get("webServer") as HttpServerLike | undefined;
-  if (webServer === undefined) return;
+  // web 模式：注册到 webServer（dsh web 的 HTTP 面）。服务在构造期可能
+  // 尚未就绪，effect 回调在插件激活后执行，此时 ctx.get 才能取到。
   ctx.effect(() => {
+    const webServer = ctx.get("webServer") as HttpServerLike | undefined;
+    if (webServer === undefined) return () => {};
     const editor = ctx.sessionEditor;
     return webServer.register({
       kind: "exact",
@@ -671,4 +684,66 @@ function registerHttpRoutes(ctx: Context): void {
       handler: (request, response) => handleRoute(editor, request, response),
     });
   }, "session-editor: HTTP route");
+  // desktop 模式：注册到 connection 的共享 /api 通道（官方 desktop 禁用
+  // webserver，走 connection 网关；路径带 /api 前缀）。connection 是可选
+  // 服务（web 模式无），且可能在 SessionEditor 构造前已 provide（事件已
+  // 错过）——监听 internal/service 事件并立即检查一次。
+  const registerConnectionRoute = (): void => {
+    const connection = ctx.get("connection", false) as
+      | {
+          fetch: {
+            register(route: {
+              path: string;
+              methods: readonly ("GET" | "HEAD" | "POST")[];
+              requestBody: "buffered" | "streaming";
+              fetch: (request: Request) => Promise<Response>;
+            }): () => Promise<void>;
+          };
+        }
+      | undefined;
+    if (connection === undefined) 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: SessionEditor, request: Request): Promise<Response> {
+  try {
+    if (request.method === "GET") {
+      const url = new URL(request.url);
+      const sessionId = sessionIdOf(url.searchParams.get("sessionId"));
+      return jsonResponse(200, await readTimeline(editor, sessionId));
+    }
+    if (request.method === "POST") {
+      return jsonResponse(200, await runOperation(editor, decodeOperation(await request.json())));
+    }
+    return new Response(null, { status: 405 });
+  } catch (error: unknown) {
+    const message = error instanceof Error ? error.message : String(error);
+    return jsonResponse(error instanceof TypeError ? 400 : 409, { error: message });
+  }
+}
+
+function jsonResponse(status: number, value: unknown): Response {
+  return new Response(JSON.stringify(value), {
+    status,
+    headers: {
+      "content-type": "application/json; charset=utf-8",
+      "cache-control": "no-store",
+    },
+  });
 }

package/src/plan.ts

@@ -162,6 +162,22 @@ export function retryableTurns(turns: readonly ClosedTurn[]): RetryableTurn[] {
   );
 }
 
+/**
+ * 目标轮之前最后一个「有内容」轮次的下标：跳过既无用户输入也无助手回复的
+ * 空轮。空轮是早期重放缺陷的遗留（turn/start 后直接 turn/end），在轨迹 /
+ * 轮次导航里表现为点不开的空项，并让后续轮号出现空洞。rewind 把它们随
+ * 目标轮一起截断，重放按保留前缀续号即可自愈。
+ */
+export function precedingContentIndex(turns: readonly ClosedTurn[], turnIndex: number): number {
+  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;
+}
+
 export function downstreamUsers(turns: readonly ClosedTurn[], start: number): UserMessage[] {
   return turns
     .slice(start)
@@ -229,10 +245,11 @@ export function editPlan(operation: EditOperation, turns: readonly ClosedTurn[])
     const later = operation.cascade === "preserve" ? downstreamUsers(turns, turnIndex + 1) : [];
     return {
       anchorSeq: turn.startSeq,
-      // 轮首 user 编辑（闭合轮）：整轮截断重放（rewind 到前一轮 turn/end）；
-      // 其余情况（未闭合轮、轮内 followup）：rewind 到该消息本身
+      // 轮首 user 编辑：整轮截断重放（rewind 到前一轮 turn/end），重放复用
+      // 目标轮号；未闭合轮同样整轮截断——保留悬空的 turn/start 会让重放
+      // 开到下一轮，轮号对不上。轮内 followup 只 rewind 到该消息本身
       // （exclusive drop），保留轮内已落定的前置输入与回复。
-      ...(turn.closed && userIndex === 0 ? {} : { rewindBoundary: event.seq }),
+      ...(userIndex === 0 ? {} : { rewindBoundary: event.seq }),
       version: pairVersionEffect(operation.sessionId, {
         operation: "edit",
         cascade: operation.cascade,