@khorsheed/dsh-client-message-tools 0.1.0 → 0.2.0

package/lib/index.js

@@ -1,3 +1,4 @@
+import { SessionSeq } from "@deepseek-ai/dsh-session";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
 import { Remote, TypertRemoteService } from "@deepseek-ai/dsh-typert-protocol";
 import { isAppendSurfaceEvent, isReplacementSurfaceEvent } from "@deepseek-ai/dsh-session/surface";
@@ -234,11 +235,11 @@ function joinAssistantMessageText(blocks) {
 function findWithdrawnSpan(events, targetSeq) {
 	for (let index = events.length - 1; index > targetSeq; index--) {
 		const event = events[index];
-		if (event !== void 0 && isMessageToolsReplacement(event) && event.sourceEventSeqs?.includes(targetSeq)) {
-			const span = [];
-			for (let seq = event.surfaceOp.start; seq < event.seq; seq++) span.push(seq);
-			return span;
-		}
+		if (event === void 0 || !isMessageToolsReplacement(event)) continue;
+		if (event.sourceEventSeqs?.includes(targetSeq) !== true) continue;
+		const span = [];
+		for (let seq = event.surfaceOp.start; seq < event.seq; seq++) span.push(seq);
+		return span;
 	}
 }
 /**
@@ -502,7 +503,7 @@ let MessageToolsService = (() => {
 				ok: false,
 				error: { code: "session-not-found" }
 			};
-			const planned = planWithdrawal(session.events, session.surface.nodes, request.targetSeq);
+			const planned = planWithdrawal(session.snapshotEvents(), session.surface.nodes, request.targetSeq);
 			if (!planned.ok) return {
 				ok: false,
 				error: { code: planned.code }
@@ -519,10 +520,10 @@ let MessageToolsService = (() => {
 			}), {
 				surfaceOp: {
 					op: "replace",
-					start: planned.plan.start,
-					end: planned.plan.end
+					start: SessionSeq(planned.plan.start),
+					end: SessionSeq(planned.plan.end)
 				},
-				sourceEventSeqs: [...planned.plan.sourceEventSeqs]
+				sourceEventSeqs: planned.plan.sourceEventSeqs.map((seq) => SessionSeq(seq))
 			});
 			await this.ctx.sessions.flush(session);
 			return {
@@ -553,7 +554,7 @@ let MessageToolsService = (() => {
 				ok: false,
 				error: { code: "session-not-found" }
 			};
-			const planned = planRestore(session.events, session.surface.nodes, request.targetSeq);
+			const planned = planRestore(session.snapshotEvents(), session.surface.nodes, request.targetSeq);
 			if (!planned.ok) return {
 				ok: false,
 				error: { code: planned.code }
@@ -575,7 +576,7 @@ let MessageToolsService = (() => {
 				});
 				appendedSeqs.push(session.append("user/message", message, {
 					surfaceOp: "append",
-					sourceEventSeqs: [entry.sourceSeq]
+					sourceEventSeqs: [SessionSeq(entry.sourceSeq)]
 				}).seq);
 			}
 			await this.ctx.sessions.flush(session);
@@ -602,7 +603,7 @@ let MessageToolsService = (() => {
 				ok: false,
 				error: { code: "session-not-found" }
 			};
-			const planned = planEdit(session.events, session.surface.nodes, request.targetSeq, request.text);
+			const planned = planEdit(session.snapshotEvents(), session.surface.nodes, request.targetSeq, request.text);
 			if (!planned.ok) return {
 				ok: false,
 				error: { code: planned.code }
@@ -616,10 +617,10 @@ let MessageToolsService = (() => {
 			}), {
 				surfaceOp: {
 					op: "replace",
-					start: planned.plan.start,
-					end: planned.plan.end
+					start: SessionSeq(planned.plan.start),
+					end: SessionSeq(planned.plan.end)
 				},
-				sourceEventSeqs: [...planned.plan.sourceEventSeqs]
+				sourceEventSeqs: planned.plan.sourceEventSeqs.map((seq) => SessionSeq(seq))
 			});
 			await this.ctx.sessions.flush(session);
 			const agent = this.ctx.agents.get(request.sessionId);