@@ -26,6 +26,7 @@ import * as ProjectStore from "./ProjectStore.ts";
2626import type { ProviderAdapterV2RollbackTarget } from "./ProviderAdapter.ts" ;
2727import { ProviderSessionManagerV2 } from "./ProviderSessionManager.ts" ;
2828import { RuntimePolicyV2 } from "./RuntimePolicy.ts" ;
29+ import * as ThreadCommandExecutor from "./ThreadCommandExecutor.ts" ;
2930
3031export const ROLLBACK_FAILED_MESSAGE =
3132 "The provider could not roll back this conversation. Try again; if it keeps failing, check the provider and server logs." ;
@@ -91,6 +92,7 @@ export const layer: Layer.Layer<
9192 | FileSystem . FileSystem
9293 | Path . Path
9394 | ProjectStore . ProjectStoreV2
95+ | ThreadCommandExecutor . ThreadCommandExecutor
9496> = Layer . effect (
9597 CheckpointRollbackServiceV2 ,
9698 Effect . gen ( function * ( ) {
@@ -103,6 +105,7 @@ export const layer: Layer.Layer<
103105 const fileSystem = yield * FileSystem . FileSystem ;
104106 const projects = yield * ProjectStore . ProjectStoreV2 ;
105107 const path = yield * Path . Path ;
108+ const threadCommands = yield * ThreadCommandExecutor . ThreadCommandExecutor ;
106109
107110 const execute = Effect . fn ( "orchestrationV2.checkpointRollback.execute" ) ( function * ( input : {
108111 readonly threadId : ThreadId ;
@@ -274,72 +277,80 @@ export const layer: Layer.Layer<
274277 yield * checkpoints . deleteStaleRefs ( { scope, checkpoints : staleCheckpoints } ) ;
275278 }
276279
277- const now = yield * DateTime . now ;
278- const makeEvent = < Event extends OrchestrationV2DomainEvent > ( event : Omit < Event , "id" > ) =>
279- Effect . map (
280- ids . allocate . event ( { threadId : event . threadId } ) ,
281- ( id ) =>
282- ( {
283- ...event ,
284- id,
285- } ) as Event ,
286- ) ;
287- const events : Array < OrchestrationV2DomainEvent > = [ ] ;
288- events . push (
289- yield * makeEvent ( {
290- type : "provider-thread.updated" ,
291- threadId : input . threadId ,
292- driver : providerThread . driver ,
293- providerInstanceId : providerThread . providerInstanceId ,
294- occurredAt : now ,
295- payload : {
296- ...snapshot . providerThread ,
297- lastRunOrdinal : targetOrdinal === 0 ? null : targetOrdinal ,
298- updatedAt : now ,
299- } ,
300- } ) ,
301- ) ;
302- for ( const staleCheckpoint of staleCheckpoints ) {
303- events . push (
304- yield * makeEvent ( {
305- type : "checkpoint.captured" ,
306- threadId : input . threadId ,
307- ...( staleCheckpoint . runId === null ? { } : { runId : staleCheckpoint . runId } ) ,
308- nodeId : staleCheckpoint . nodeId ,
309- providerInstanceId : providerThread . providerInstanceId ,
310- occurredAt : now ,
311- payload : { ...staleCheckpoint , status : "stale" } ,
312- } ) ,
313- ) ;
314- }
315- for ( const run of runsToRollback ) {
316- const rootNode = projection . nodes . find ( ( candidate ) => candidate . id === run . rootNodeId ) ;
317- events . push (
318- yield * makeEvent ( {
319- type : "run.updated" ,
320- threadId : input . threadId ,
321- runId : run . id ,
322- ...( rootNode === undefined ? { } : { nodeId : rootNode . id } ) ,
323- providerInstanceId : run . providerInstanceId ,
324- occurredAt : now ,
325- payload : { ...run , status : "rolled_back" , completedAt : now } ,
326- } ) ,
327- ) ;
328- if ( rootNode !== undefined ) {
280+ // Thread commands write full provider thread rows under this lock. Without
281+ // it, a message sent during the rollback can plan against the old native
282+ // session and commit after this, undoing the provider's fork.
283+ yield * threadCommands . withLock (
284+ input . threadId ,
285+ Effect . gen ( function * ( ) {
286+ const now = yield * DateTime . now ;
287+ const makeEvent = < Event extends OrchestrationV2DomainEvent > ( event : Omit < Event , "id" > ) =>
288+ Effect . map (
289+ ids . allocate . event ( { threadId : event . threadId } ) ,
290+ ( id ) =>
291+ ( {
292+ ...event ,
293+ id,
294+ } ) as Event ,
295+ ) ;
296+ const events : Array < OrchestrationV2DomainEvent > = [ ] ;
329297 events . push (
330298 yield * makeEvent ( {
331- type : "node .updated" ,
299+ type : "provider-thread .updated" ,
332300 threadId : input . threadId ,
333- runId : run . id ,
334- nodeId : rootNode . id ,
335- providerInstanceId : run . providerInstanceId ,
301+ driver : providerThread . driver ,
302+ providerInstanceId : providerThread . providerInstanceId ,
336303 occurredAt : now ,
337- payload : { ...rootNode , status : "rolled_back" , completedAt : now } ,
304+ payload : {
305+ ...snapshot . providerThread ,
306+ lastRunOrdinal : targetOrdinal === 0 ? null : targetOrdinal ,
307+ updatedAt : now ,
308+ } ,
338309 } ) ,
339310 ) ;
340- }
341- }
342- yield * eventSink . write ( { events } ) ;
311+ for ( const staleCheckpoint of staleCheckpoints ) {
312+ events . push (
313+ yield * makeEvent ( {
314+ type : "checkpoint.captured" ,
315+ threadId : input . threadId ,
316+ ...( staleCheckpoint . runId === null ? { } : { runId : staleCheckpoint . runId } ) ,
317+ nodeId : staleCheckpoint . nodeId ,
318+ providerInstanceId : providerThread . providerInstanceId ,
319+ occurredAt : now ,
320+ payload : { ...staleCheckpoint , status : "stale" } ,
321+ } ) ,
322+ ) ;
323+ }
324+ for ( const run of runsToRollback ) {
325+ const rootNode = projection . nodes . find ( ( candidate ) => candidate . id === run . rootNodeId ) ;
326+ events . push (
327+ yield * makeEvent ( {
328+ type : "run.updated" ,
329+ threadId : input . threadId ,
330+ runId : run . id ,
331+ ...( rootNode === undefined ? { } : { nodeId : rootNode . id } ) ,
332+ providerInstanceId : run . providerInstanceId ,
333+ occurredAt : now ,
334+ payload : { ...run , status : "rolled_back" , completedAt : now } ,
335+ } ) ,
336+ ) ;
337+ if ( rootNode !== undefined ) {
338+ events . push (
339+ yield * makeEvent ( {
340+ type : "node.updated" ,
341+ threadId : input . threadId ,
342+ runId : run . id ,
343+ nodeId : rootNode . id ,
344+ providerInstanceId : run . providerInstanceId ,
345+ occurredAt : now ,
346+ payload : { ...rootNode , status : "rolled_back" , completedAt : now } ,
347+ } ) ,
348+ ) ;
349+ }
350+ }
351+ yield * eventSink . write ( { events } ) ;
352+ } ) ,
353+ ) ;
343354 } ) ;
344355
345356 return CheckpointRollbackServiceV2 . of ( {
0 commit comments