Skip to content

fix(opencode): skip ignored messages in undo/redo commands #9704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tarquinen wants to merge 2 commits into
base: dev
Choose a base branch
from
+15 −3
Open

fix(opencode): skip ignored messages in undo/redo commands #9704

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce1c294
fix(opencode): skip ignored messages in undo/redo commands
Tarquinen Jan 20, 2026
1836819
Merge branch 'dev' into fix-undo-redo-ignored-messages
Tarquinen Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,13 @@ export function Session() {
const status = sync.data.session_status?.[route.sessionID]
if (status?.type !== "idle") await sdk.client.session.abort({ sessionID: route.sessionID }).catch(() => {})
const revert = session()?.revert?.messageID
const message = messages().findLast((x) => (!revert || x.id < revert) && x.role === "user")
const message = messages().findLast((x) => {
if (x.role !== "user") return false
if (revert && x.id >= revert) return false
const parts = sync.data.part[x.id]
if (!parts || !Array.isArray(parts)) return false
return parts.some((part) => part && part.type === "text" && !part.synthetic && !part.ignored)
})
if (!message) return
sdk.client.session
.revert({
Expand All @@ -450,7 +456,7 @@ export function Session() {
parts.reduce(
(agg, part) => {
if (part.type === "text") {
if (!part.synthetic) agg.input += part.text
if (!part.synthetic && !part.ignored) agg.input += part.text
}
if (part.type === "file") agg.parts.push(part)
return agg
Expand All @@ -474,7 +480,13 @@ export function Session() {
dialog.clear()
const messageID = session()?.revert?.messageID
if (!messageID) return
const message = messages().find((x) => x.role === "user" && x.id > messageID)
const message = messages().find((x) => {
if (x.role !== "user") return false
if (x.id <= messageID) return false
const parts = sync.data.part[x.id]
if (!parts || !Array.isArray(parts)) return false
return parts.some((part) => part && part.type === "text" && !part.synthetic && !part.ignored)
})
if (!message) {
sdk.client.session.unrevert({
sessionID: route.sessionID,
Expand Down
Loading