From a1b68daa9a21c3ca6352d0b1daa58e0456a4e270 Mon Sep 17 00:00:00 2001 From: Sercan Sagman Date: Thu, 18 Dec 2025 01:03:06 +0300 Subject: [PATCH] fix(tui): exclude reverted assistant reply when copying last message (#5705) Signed-off-by: assagman --- packages/opencode/src/cli/cmd/tui/routes/session/index.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx index c7d7537a2..780809bd6 100644 --- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx +++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx @@ -597,7 +597,10 @@ export function Session() { keybind: "messages_copy", category: "Session", onSelect: (dialog) => { - const lastAssistantMessage = messages().findLast((msg) => msg.role === "assistant") + const revertID = session()?.revert?.messageID + const lastAssistantMessage = messages().findLast( + (msg) => msg.role === "assistant" && (!revertID || msg.id < revertID), + ) if (!lastAssistantMessage) { toast.show({ message: "No assistant messages found", variant: "error" }) dialog.clear()