Skip to content

fix(session): restore todo state on undo/redo #5516

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
sachnun wants to merge 1 commit into
base: dev
Choose a base branch
from
+18 −0
Open

fix(session): restore todo state on undo/redo #5516

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 18 additions & 0 deletions packages/opencode/src/session/revert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { splitWhen } from "remeda"
import { Storage } from "../storage/storage"
import { Bus } from "../bus"
import { SessionPrompt } from "./prompt"
import { Todo } from "./todo"

export namespace SessionRevert {
const log = Log.create({ service: "session.revert" })
Expand Down Expand Up @@ -57,6 +58,8 @@ export namespace SessionRevert {
revert.snapshot = session.revert?.snapshot ?? (await Snapshot.track())
await Snapshot.revert(patches)
if (revert.snapshot) revert.diff = await Snapshot.diff(revert.snapshot)
const todos = getTodos(all, revert.messageID)
await Todo.update({ sessionID: input.sessionID, todos })
return Session.update(input.sessionID, (draft) => {
draft.revert = revert
})
Expand All @@ -70,6 +73,9 @@ export namespace SessionRevert {
const session = await Session.get(input.sessionID)
if (!session.revert) return session
if (session.revert.snapshot) await Snapshot.restore(session.revert.snapshot)
const all = await Session.messages({ sessionID: input.sessionID })
const todos = getTodos(all)
await Todo.update({ sessionID: input.sessionID, todos })
const next = await Session.update(input.sessionID, (draft) => {
draft.revert = undefined
})
Expand Down Expand Up @@ -101,8 +107,20 @@ export namespace SessionRevert {
})
}
}
const todos = getTodos(preserve)
await Todo.update({ sessionID, todos })
await Session.update(sessionID, (draft) => {
draft.revert = undefined
})
}

function getTodos(messages: MessageV2.WithParts[], until?: string): Todo.Info[] {
const idx = until ? messages.findIndex((m) => m.info.id === until) : messages.length
const parts = messages.slice(0, idx === -1 ? undefined : idx).flatMap((m) => m.parts)
const last = parts.findLast(
(p): p is MessageV2.ToolPart & { state: MessageV2.ToolStateCompleted } =>
p.type === "tool" && p.tool === "todowrite" && p.state.status === "completed",
)
return (last?.state.metadata?.todos as Todo.Info[]) ?? []
}
}
Loading