@@ -1683,86 +1683,111 @@ describe("CheckpointReactor", () => {
16831683 } ) ,
16841684 ) ;
16851685
1686- it ( "executes provider revert and emits thread.reverted for checkpoint revert requests" , async ( ) => {
1687- const harness = await createHarness ( ) ;
1688- const createdAt = "2026-01-01T00:00:00.000Z" ;
1686+ it . each ( [ "thread.checkpoint.revert" , "thread.conversation.revert" ] as const ) (
1687+ "%s rewinds history with the requested filesystem behavior" ,
1688+ async ( commandType ) => {
1689+ const harness = await createHarness ( ) ;
1690+ const createdAt = "2026-01-01T00:00:00.000Z" ;
16891691
1690- await Effect . runPromise (
1691- harness . engine . dispatch ( {
1692- type : "thread.session.set" ,
1693- commandId : CommandId . make ( "cmd-session-set" ) ,
1694- threadId : ThreadId . make ( "thread-1" ) ,
1695- session : {
1692+ await Effect . runPromise (
1693+ harness . engine . dispatch ( {
1694+ type : "thread.session.set" ,
1695+ commandId : CommandId . make ( "cmd-session-set" ) ,
1696+ threadId : ThreadId . make ( "thread-1" ) ,
1697+ session : {
1698+ threadId : ThreadId . make ( "thread-1" ) ,
1699+ status : "ready" ,
1700+ providerName : "codex" ,
1701+ runtimeMode : "approval-required" ,
1702+ activeTurnId : null ,
1703+ lastError : null ,
1704+ updatedAt : createdAt ,
1705+ } ,
1706+ createdAt,
1707+ } ) ,
1708+ ) ;
1709+
1710+ await Effect . runPromise (
1711+ harness . engine . dispatch ( {
1712+ type : "thread.turn.diff.complete" ,
1713+ commandId : CommandId . make ( "cmd-diff-1" ) ,
16961714 threadId : ThreadId . make ( "thread-1" ) ,
1715+ turnId : asTurnId ( "turn-1" ) ,
1716+ completedAt : createdAt ,
1717+ checkpointRef : checkpointRefForThreadTurn ( ThreadId . make ( "thread-1" ) , 1 ) ,
16971718 status : "ready" ,
1698- providerName : "codex" ,
1699- runtimeMode : "approval-required" ,
1700- activeTurnId : null ,
1701- lastError : null ,
1702- updatedAt : createdAt ,
1703- } ,
1704- createdAt,
1705- } ) ,
1706- ) ;
1719+ files : [ ] ,
1720+ checkpointTurnCount : 1 ,
1721+ createdAt,
1722+ } ) ,
1723+ ) ;
1724+ await Effect . runPromise (
1725+ harness . engine . dispatch ( {
1726+ type : "thread.turn.diff.complete" ,
1727+ commandId : CommandId . make ( "cmd-diff-2" ) ,
1728+ threadId : ThreadId . make ( "thread-1" ) ,
1729+ turnId : asTurnId ( "turn-2" ) ,
1730+ completedAt : createdAt ,
1731+ checkpointRef : checkpointRefForThreadTurn ( ThreadId . make ( "thread-1" ) , 2 ) ,
1732+ status : "ready" ,
1733+ files : [ ] ,
1734+ checkpointTurnCount : 2 ,
1735+ createdAt,
1736+ } ) ,
1737+ ) ;
17071738
1708- await Effect . runPromise (
1709- harness . engine . dispatch ( {
1710- type : "thread.turn.diff.complete" ,
1711- commandId : CommandId . make ( "cmd-diff-1" ) ,
1712- threadId : ThreadId . make ( "thread-1" ) ,
1713- turnId : asTurnId ( "turn-1" ) ,
1714- completedAt : createdAt ,
1715- checkpointRef : checkpointRefForThreadTurn ( ThreadId . make ( "thread-1" ) , 1 ) ,
1716- status : "ready" ,
1717- files : [ ] ,
1718- checkpointTurnCount : 1 ,
1719- createdAt,
1720- } ) ,
1721- ) ;
1722- await Effect . runPromise (
1723- harness . engine . dispatch ( {
1724- type : "thread.turn.diff.complete" ,
1725- commandId : CommandId . make ( "cmd-diff-2" ) ,
1726- threadId : ThreadId . make ( "thread-1" ) ,
1727- turnId : asTurnId ( "turn-2" ) ,
1728- completedAt : createdAt ,
1729- checkpointRef : checkpointRefForThreadTurn ( ThreadId . make ( "thread-1" ) , 2 ) ,
1730- status : "ready" ,
1731- files : [ ] ,
1732- checkpointTurnCount : 2 ,
1733- createdAt,
1734- } ) ,
1735- ) ;
1739+ NodeFS . writeFileSync ( NodePath . join ( harness . cwd , "README.md" ) , "staged edit\n" ) ;
1740+ NodeChildProcess . execFileSync ( "git" , [ "add" , "README.md" ] , { cwd : harness . cwd } ) ;
1741+ NodeFS . writeFileSync ( NodePath . join ( harness . cwd , "README.md" ) , "unstaged edit\n" ) ;
1742+ NodeFS . writeFileSync ( NodePath . join ( harness . cwd , "scratch.txt" ) , "untracked edit\n" ) ;
1743+ const indexBefore = NodeChildProcess . execFileSync ( "git" , [ "ls-files" , "--stage" ] , {
1744+ cwd : harness . cwd ,
1745+ encoding : "utf8" ,
1746+ } ) ;
17361747
1737- await Effect . runPromise (
1738- harness . engine . dispatch ( {
1739- type : "thread.checkpoint.revert" ,
1740- commandId : CommandId . make ( "cmd-revert-request" ) ,
1741- threadId : ThreadId . make ( "thread-1" ) ,
1742- turnCount : 1 ,
1743- createdAt,
1744- } ) ,
1745- ) ;
1748+ await Effect . runPromise (
1749+ harness . engine . dispatch ( {
1750+ type : commandType ,
1751+ commandId : CommandId . make ( "cmd-revert-request" ) ,
1752+ threadId : ThreadId . make ( "thread-1" ) ,
1753+ turnCount : 1 ,
1754+ createdAt,
1755+ } ) ,
1756+ ) ;
17461757
1747- await waitForEvent ( harness . engine , ( event ) => event . type === "thread.reverted" ) ;
1748- const thread = await waitForThread (
1749- harness . readModel ,
1750- ( entry ) => entry . checkpoints . length === 1 ,
1751- ) ;
1758+ await waitForEvent ( harness . engine , ( event ) => event . type === "thread.reverted" ) ;
1759+ const thread = await waitForThread (
1760+ harness . readModel ,
1761+ ( entry ) => entry . checkpoints . length === 1 ,
1762+ ) ;
17521763
1753- expect ( thread . latestTurn ?. turnId ) . toBe ( "turn-1" ) ;
1754- expect ( thread . checkpoints ) . toHaveLength ( 1 ) ;
1755- expect ( thread . checkpoints [ 0 ] ?. checkpointTurnCount ) . toBe ( 1 ) ;
1756- expect ( harness . provider . rollbackConversation ) . toHaveBeenCalledTimes ( 1 ) ;
1757- expect ( harness . provider . rollbackConversation ) . toHaveBeenCalledWith ( {
1758- threadId : ThreadId . make ( "thread-1" ) ,
1759- numTurns : 1 ,
1760- } ) ;
1761- expect ( NodeFS . readFileSync ( NodePath . join ( harness . cwd , "README.md" ) , "utf8" ) ) . toBe ( "v2\n" ) ;
1762- expect (
1763- gitRefExists ( harness . cwd , checkpointRefForThreadTurn ( ThreadId . make ( "thread-1" ) , 2 ) ) ,
1764- ) . toBe ( false ) ;
1765- } ) ;
1764+ expect ( thread . latestTurn ?. turnId ) . toBe ( "turn-1" ) ;
1765+ expect ( thread . checkpoints ) . toHaveLength ( 1 ) ;
1766+ expect ( thread . checkpoints [ 0 ] ?. checkpointTurnCount ) . toBe ( 1 ) ;
1767+ expect ( harness . provider . rollbackConversation ) . toHaveBeenCalledTimes ( 1 ) ;
1768+ expect ( harness . provider . rollbackConversation ) . toHaveBeenCalledWith ( {
1769+ threadId : ThreadId . make ( "thread-1" ) ,
1770+ numTurns : 1 ,
1771+ } ) ;
1772+ expect ( NodeFS . readFileSync ( NodePath . join ( harness . cwd , "README.md" ) , "utf8" ) ) . toBe (
1773+ commandType === "thread.conversation.revert" ? "unstaged edit\n" : "v2\n" ,
1774+ ) ;
1775+ if ( commandType === "thread.conversation.revert" ) {
1776+ expect ( NodeFS . readFileSync ( NodePath . join ( harness . cwd , "scratch.txt" ) , "utf8" ) ) . toBe (
1777+ "untracked edit\n" ,
1778+ ) ;
1779+ expect (
1780+ NodeChildProcess . execFileSync ( "git" , [ "ls-files" , "--stage" ] , {
1781+ cwd : harness . cwd ,
1782+ encoding : "utf8" ,
1783+ } ) ,
1784+ ) . toBe ( indexBefore ) ;
1785+ }
1786+ expect (
1787+ gitRefExists ( harness . cwd , checkpointRefForThreadTurn ( ThreadId . make ( "thread-1" ) , 2 ) ) ,
1788+ ) . toBe ( false ) ;
1789+ } ,
1790+ ) ;
17661791
17671792 it ( "executes provider revert and emits thread.reverted for claude sessions" , async ( ) => {
17681793 const harness = await createHarness ( { providerName : ProviderDriverKind . make ( "claudeAgent" ) } ) ;
0 commit comments