@morlay/ui-conversation-message-actions 0.0.19-alpha.3 → 0.0.19-alpha.4

package/src/plan.ts

@@ -1,14 +1,8 @@
 import { randomUUID } from "node:crypto";
 import type { AssistantMessage, ContentBlock, UserMessage } from "@deepseek-ai/dsh-llm";
 import { SessionSeq } from "@deepseek-ai/dsh-session";
-import type { SessionEvent, SessionId } from "@deepseek-ai/dsh-session";
-import {
-  SESSION_BRANCH_VERSION_SCHEMA,
-  SessionBranchError,
-  type EditableBlockKind,
-  type SessionBranchEffect,
-  type SessionBranchVersionEvent,
-} from "@morlay/session-branch";
+import type { SessionEvent } from "@deepseek-ai/dsh-session";
+import { SessionBranchError } from "@morlay/session-branch";
 import type {
   EditOperation,
   EditableMessageBlock,
@@ -34,7 +28,6 @@ export interface OperationPlan {
   anchorSeq: number;
 
   rewindBoundary?: number;
-  version: SessionBranchVersionEvent;
 
   manualTurn?: { turn: number; user: UserMessage; assistant: AssistantMessage };
 
@@ -220,17 +213,6 @@ function assistantReplacement(
   }) as AssistantMessage;
 }
 
-function pairVersionEffect(
-  sourceSessionId: SessionId,
-  effect: Omit<SessionBranchEffect, "id">,
-): SessionBranchVersionEvent {
-  return {
-    schemaVersion: SESSION_BRANCH_VERSION_SCHEMA,
-    effect: { ...effect, id: randomUUID() },
-    inverse: { kind: "restore-version", sessionId: sourceSessionId },
-  };
-}
-
 export function editPlan(operation: EditOperation, turns: readonly ClosedTurn[]): OperationPlan {
   const turnIndex = turns.findIndex(
     (turn) =>
@@ -262,16 +244,6 @@ export function editPlan(operation: EditOperation, turns: readonly ClosedTurn[])
       anchorSeq: turn.startSeq,
 
       ...(userIndex === 0 ? {} : { rewindBoundary: event.seq }),
-      version: pairVersionEffect(operation.sessionId, {
-        operation: "edit",
-        cascade: operation.cascade,
-        targetTurn: turn.turn,
-        targetEventSeq: event.seq,
-        targetBlockIndex: operation.blockIndex,
-        blockKind: "user",
-        before: before.text,
-        after: operation.text,
-      }),
       queuedUsers: [edited, ...sameTurnFollowups, ...later],
       targetSeq: event.seq,
     };
@@ -282,22 +254,10 @@ export function editPlan(operation: EditOperation, turns: readonly ClosedTurn[])
   const before = event.data.message.content[operation.blockIndex];
   if (!isTextualBlock(before))
     throw new SessionBranchError("所选助手消息块不是文本或思考。", "INVALID_BOUNDARY");
-  const blockKind: EditableBlockKind =
-    before.type === "reasoning" ? "assistant.reasoning" : "assistant.response";
   if (turn.user === undefined)
     throw new SessionBranchError("所选助手消息没有可重建的用户输入。", "INVALID_BOUNDARY");
   return {
     anchorSeq: turn.startSeq,
-    version: pairVersionEffect(operation.sessionId, {
-      operation: "edit",
-      cascade: operation.cascade,
-      targetTurn: turn.turn,
-      targetEventSeq: event.seq,
-      targetBlockIndex: operation.blockIndex,
-      blockKind,
-      before: before.text,
-      after: operation.text,
-    }),
     manualTurn: {
       turn: turn.turn,
       user: cloneUser(turn.user.data),
@@ -315,12 +275,6 @@ export function retryPlan(operation: RetryOperation, turns: readonly ClosedTurn[
     throw new SessionBranchError("所选回合没有可重放的用户输入。", "INVALID_BOUNDARY");
   return {
     anchorSeq: turn.startSeq,
-    version: pairVersionEffect(operation.sessionId, {
-      operation: "retry",
-      cascade: operation.cascade,
-      targetTurn: turn.turn,
-      targetEventSeq: turn.user.seq,
-    }),
     queuedUsers:
       operation.cascade === "preserve"
         ? downstreamUsers(turns, turnIndex)
@@ -343,12 +297,6 @@ export function rerollPlan(
     if (target === undefined) continue;
     return {
       anchorSeq: turn.startSeq,
-      version: pairVersionEffect(operation.sessionId, {
-        operation: "reroll",
-        cascade: "truncate",
-        targetTurn: turn.turn,
-        targetEventSeq: target.seq,
-      }),
       queuedUsers: turn.users.map((user) => cloneUser(user.data)),
       targetSeq: target.seq,
     };

package/src/shared.ts

@@ -1,6 +1,5 @@
 import type { SessionId } from "@deepseek-ai/dsh-session";
-import type { BranchTimeline, CascadePolicy } from "@morlay/session-branch";
-import type { VersionOperation } from "@morlay/session-branch";
+import type { CascadePolicy } from "@morlay/session-branch";
 
 export const SESSION_EDITOR_PATH = "/session-editor";
 
@@ -79,97 +78,3 @@ export interface RetryableTurn {
   time: number;
 }
 
-export interface VersionSummary {
-  sessionId: string;
-  parentSessionId?: string;
-  effectId?: string;
-  inverseSessionId?: string;
-  createdAt: number;
-  depth: number;
-  current: boolean;
-  onCurrentEffectPath: boolean;
-  operation?: VersionOperation;
-  cascade?: CascadePolicy;
-  targetTurn?: number;
-  blockKind?: EditableMessageBlock["kind"];
-  before?: string;
-  after?: string;
-}
-
-export interface SessionEditorTimeline {
-  sessionId: string;
-  messages: EditableMessageBlock[];
-  retryableTurns: RetryableTurn[];
-  versions: VersionSummary[];
-
-  undoStack: string[];
-
-  redoSessionIds: string[];
-}
-
-export function toTimelinePayload(
-  sessionId: SessionId,
-  timeline: BranchTimeline,
-  messages: EditableMessageBlock[],
-  retryableTurns: RetryableTurn[],
-): SessionEditorTimeline {
-  const currentPath = new Set<string>();
-  for (const node of timeline.nodes) currentPath.add(String(node.sessionId));
-  const versions: VersionSummary[] = timeline.nodes.map((node) => ({
-    sessionId: String(node.sessionId),
-    ...(node.parentSessionId === undefined
-      ? {}
-      : { parentSessionId: String(node.parentSessionId) }),
-    ...(node.effect === undefined
-      ? {}
-      : {
-          effectId: node.effect.id,
-          inverseSessionId: String(node.inverseSessionId),
-          operation: node.effect.operation,
-          cascade: node.effect.cascade,
-          targetTurn: node.effect.targetTurn,
-          ...(node.effect.blockKind === undefined ? {} : { blockKind: node.effect.blockKind }),
-          ...(node.effect.before === undefined ? {} : { before: node.effect.before }),
-          ...(node.effect.after === undefined ? {} : { after: node.effect.after }),
-        }),
-    createdAt: node.createdAt,
-    depth: depthOf(timeline, node.sessionId),
-    current: String(node.sessionId) === String(sessionId),
-    onCurrentEffectPath: currentPath.has(String(node.sessionId)),
-  }));
-  const versionsById = new Map(versions.map((version) => [version.sessionId, version]));
-  const undoStack: string[] = [];
-  let cursor = versionsById.get(String(sessionId));
-  while (cursor?.inverseSessionId !== undefined) {
-    if (undoStack.includes(cursor.inverseSessionId)) break;
-    undoStack.push(cursor.inverseSessionId);
-    cursor = versionsById.get(cursor.inverseSessionId);
-  }
-  const redoSessionIds = versions
-    .filter((version) => version.inverseSessionId === String(sessionId))
-    .map((version) => version.sessionId);
-  return {
-    sessionId: String(sessionId),
-    messages,
-    retryableTurns,
-    versions,
-    undoStack,
-    redoSessionIds,
-  };
-}
-
-function depthOf(
-  timeline: BranchTimeline,
-  sessionId: import("@deepseek-ai/dsh-session").SessionId,
-): number {
-  const byId = new Map(timeline.nodes.map((node) => [String(node.sessionId), node]));
-  let depth = 0;
-  let cursor = byId.get(String(sessionId));
-  const seen = new Set<string>();
-  while (cursor?.parentSessionId !== undefined && !seen.has(String(cursor.sessionId))) {
-    seen.add(String(cursor.sessionId));
-    depth += 1;
-    cursor = byId.get(String(cursor.parentSessionId));
-  }
-  return depth;
-}

package/src/testing.ts

@@ -9,7 +9,6 @@ import {
   type SessionHeader,
 } from "@deepseek-ai/dsh-session";
 import SessionProjectionRegistry from "@deepseek-ai/dsh-session-projection";
-import { type BranchTimeline } from "@morlay/session-branch";
 import SessionPersistenceSqlite from "@morlay/session-rdb";
 import { parseJsonlArtifact } from "@morlay/session-rdb/artifact";
 import { EmptySettings, meta, oneTurnLog } from "@morlay/session-rdb/testing";
@@ -17,7 +16,6 @@ import { SESSION_EDITOR_PATH } from "./shared.ts";
 import { SessionEditor } from "@morlay/ui-conversation-message-actions";
 
 export {
-  BranchTimeline,
   SESSION_EDITOR_PATH,
   Session,
   SessionIdBrand,

package/src/types.ts

@@ -1,5 +1,5 @@
 import type { SessionId } from "@deepseek-ai/dsh-session";
-import type { BranchTimeline, CascadePolicy } from "@morlay/session-branch";
+import type { CascadePolicy } from "@morlay/session-branch";
 
 export interface EditOperation {
   action: "edit";
@@ -61,8 +61,6 @@ export interface SessionEditorResult {
   live?: boolean;
 }
 
-export type SessionEditorTimeline = BranchTimeline;
-
 export interface EditableMessageBlock {
   key: string;
 

package/dist/shared-LK3nImWW.mjs

@@ -1,55 +0,0 @@
-//#region src/shared.ts
-const SESSION_EDITOR_PATH = "/session-editor";
-function toTimelinePayload(sessionId, timeline, messages, retryableTurns) {
-	const currentPath = /* @__PURE__ */ new Set();
-	for (const node of timeline.nodes) currentPath.add(String(node.sessionId));
-	const versions = timeline.nodes.map((node) => ({
-		sessionId: String(node.sessionId),
-		...node.parentSessionId === void 0 ? {} : { parentSessionId: String(node.parentSessionId) },
-		...node.effect === void 0 ? {} : {
-			effectId: node.effect.id,
-			inverseSessionId: String(node.inverseSessionId),
-			operation: node.effect.operation,
-			cascade: node.effect.cascade,
-			targetTurn: node.effect.targetTurn,
-			...node.effect.blockKind === void 0 ? {} : { blockKind: node.effect.blockKind },
-			...node.effect.before === void 0 ? {} : { before: node.effect.before },
-			...node.effect.after === void 0 ? {} : { after: node.effect.after }
-		},
-		createdAt: node.createdAt,
-		depth: depthOf(timeline, node.sessionId),
-		current: String(node.sessionId) === String(sessionId),
-		onCurrentEffectPath: currentPath.has(String(node.sessionId))
-	}));
-	const versionsById = new Map(versions.map((version) => [version.sessionId, version]));
-	const undoStack = [];
-	let cursor = versionsById.get(String(sessionId));
-	while (cursor?.inverseSessionId !== void 0) {
-		if (undoStack.includes(cursor.inverseSessionId)) break;
-		undoStack.push(cursor.inverseSessionId);
-		cursor = versionsById.get(cursor.inverseSessionId);
-	}
-	const redoSessionIds = versions.filter((version) => version.inverseSessionId === String(sessionId)).map((version) => version.sessionId);
-	return {
-		sessionId: String(sessionId),
-		messages,
-		retryableTurns,
-		versions,
-		undoStack,
-		redoSessionIds
-	};
-}
-function depthOf(timeline, sessionId) {
-	const byId = new Map(timeline.nodes.map((node) => [String(node.sessionId), node]));
-	let depth = 0;
-	let cursor = byId.get(String(sessionId));
-	const seen = /* @__PURE__ */ new Set();
-	while (cursor?.parentSessionId !== void 0 && !seen.has(String(cursor.sessionId))) {
-		seen.add(String(cursor.sessionId));
-		depth += 1;
-		cursor = byId.get(String(cursor.parentSessionId));
-	}
-	return depth;
-}
-//#endregion
-export { toTimelinePayload as n, SESSION_EDITOR_PATH as t };