88 ProviderSessionId ,
99 ProviderThreadId ,
1010 ThreadId ,
11+ VcsProcessExitError ,
1112} from "@t3tools/contracts" ;
1213import * as Effect from "effect/Effect" ;
1314import * as FileSystem from "effect/FileSystem" ;
@@ -29,6 +30,7 @@ import * as ProjectStore from "./ProjectStore.ts";
2930import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter" ;
3031import * as ProviderSessionManager from "./ProviderSessionManager.ts" ;
3132import * as RuntimePolicy from "./RuntimePolicy.ts" ;
33+ import { GIT_INDEX_LOCKED_DETAIL } from "../vcs/VcsProcess.ts" ;
3234
3335// A root that does not exist never overlaps, so other owners decide isolation.
3436const unrelatedProject = Option . some ( {
@@ -342,6 +344,123 @@ it.effect("reports a missing provider turn as a structured rollback failure", ()
342344 } ) . pipe ( Effect . provide ( layerTest ) ) ;
343345} ) ;
344346
347+ it . effect . each ( [
348+ {
349+ name : "a held Git index lock" ,
350+ restoreCause : new VcsProcessExitError ( {
351+ operation : "GitVcsDriverCore.restoreCheckpoint" ,
352+ command : "git" ,
353+ cwd : process . cwd ( ) ,
354+ exitCode : 128 ,
355+ detail : GIT_INDEX_LOCKED_DETAIL ,
356+ failureKind : "command-failed" ,
357+ retryable : true ,
358+ } ) ,
359+ expectedMessage : GIT_INDEX_LOCKED_DETAIL ,
360+ } ,
361+ {
362+ name : "raw Git output" ,
363+ restoreCause : new VcsProcessExitError ( {
364+ operation : "GitVcsDriver.restoreCheckpoint" ,
365+ command : "git" ,
366+ cwd : process . cwd ( ) ,
367+ exitCode : 1 ,
368+ detail : "error: could not clean /home/user/project/secret.txt" ,
369+ failureKind : "command-failed" ,
370+ } ) ,
371+ expectedMessage : CheckpointRollbackService . ROLLBACK_FAILED_MESSAGE ,
372+ } ,
373+ {
374+ name : "an unclassified Git failure" ,
375+ restoreCause : new VcsProcessExitError ( {
376+ operation : "GitVcsDriverCore.restoreCheckpoint" ,
377+ command : "git" ,
378+ cwd : process . cwd ( ) ,
379+ exitCode : 128 ,
380+ detail : "Process exited with a non-zero status." ,
381+ failureKind : "command-failed" ,
382+ } ) ,
383+ expectedMessage : CheckpointRollbackService . ROLLBACK_FAILED_MESSAGE ,
384+ } ,
385+ ] ) (
386+ "tells clients about $name only when it is a held index lock" ,
387+ ( { restoreCause, expectedMessage } ) => {
388+ const threadId = ThreadId . make ( "thread:rollback-restore-failed" ) ;
389+ const providerThreadId = ProviderThreadId . make ( "provider-thread:rollback-restore-failed" ) ;
390+ const providerSessionId = ProviderSessionId . make ( "provider-session:rollback-restore-failed" ) ;
391+ const checkpointId = CheckpointId . make ( "checkpoint:rollback-restore-failed" ) ;
392+ const scopeId = CheckpointScopeId . make ( "checkpoint-scope:rollback-restore-failed" ) ;
393+ const providerInstanceId = ProviderInstanceId . make ( "provider_rollback_restore_failed" ) ;
394+ // Checkpoint has no appRunOrdinal, so rollback targets thread_start and
395+ // never needs a provider turn; it still goes through checkpoints.restore.
396+ const restore = vi . fn ( ( ) =>
397+ Effect . fail (
398+ new CheckpointService . CheckpointRestoreError ( {
399+ scopeId,
400+ checkpointId,
401+ cause : restoreCause ,
402+ } ) ,
403+ ) ,
404+ ) ;
405+ const projection = {
406+ thread : {
407+ worktreePath : process . cwd ( ) ,
408+ activeProviderThreadId : providerThreadId ,
409+ modelSelection : { instanceId : providerInstanceId , model : "test-model" } ,
410+ } ,
411+ providerThreads : [ { id : providerThreadId , providerSessionId, providerInstanceId } ] ,
412+ providerSessions : [ ] ,
413+ checkpoints : [ { id : checkpointId , scopeId, status : "ready" , appRunOrdinal : null } ] ,
414+ checkpointScopes : [ { id : scopeId , cwd : process . cwd ( ) } ] ,
415+ runs : [ ] ,
416+ attempts : [ ] ,
417+ providerTurns : [ ] ,
418+ } as unknown as OrchestrationV2ThreadProjection ;
419+ const layerTest = layerCheckpointRollbackService . pipe (
420+ Layer . provide (
421+ Layer . mergeAll (
422+ ThreadCommandExecutor . layer ,
423+ Layer . mock ( CheckpointService . CheckpointServiceV2 ) ( { restore } ) ,
424+ Layer . mock ( EventSink . EventSinkV2 ) ( { } ) ,
425+ IdAllocator . layer ,
426+ Layer . mock ( ProjectionStore . ProjectionStoreV2 ) ( {
427+ getThreadRecords : ( ) => Effect . succeed ( projection ) ,
428+ getShellSnapshot : ( ) =>
429+ Effect . succeed ( {
430+ schemaVersion : 1 ,
431+ snapshotSequence : 0 ,
432+ threads : [ ] ,
433+ archivedThreads : [ ] ,
434+ } ) ,
435+ } ) ,
436+ Layer . mock ( ProviderSessionManager . ProviderSessionManagerV2 ) ( {
437+ open : ( ) => Effect . succeed ( { } as never ) ,
438+ } ) ,
439+ Layer . mock ( RuntimePolicy . RuntimePolicyV2 ) ( {
440+ resolve : ( ) => Effect . succeed ( { } as never ) ,
441+ } ) ,
442+ ) ,
443+ ) ,
444+ ) ;
445+
446+ return Effect . gen ( function * ( ) {
447+ const service = yield * CheckpointRollbackService . CheckpointRollbackServiceV2 ;
448+ const error = yield * service
449+ . execute ( {
450+ threadId,
451+ providerThreadId,
452+ checkpointId,
453+ scopeId,
454+ } )
455+ . pipe ( Effect . flip ) ;
456+
457+ assert . equal ( error . reason , "unexpected-failure" ) ;
458+ assert . equal ( CheckpointRollbackService . rollbackFailureClientMessage ( error ) , expectedMessage ) ;
459+ assert . equal ( restore . mock . calls . length , 1 ) ;
460+ } ) . pipe ( Effect . provide ( layerTest ) ) ;
461+ } ,
462+ ) ;
463+
345464it . effect . each ( [
346465 { restoreFiles : true , shared : "none" } ,
347466 { restoreFiles : false , shared : "root" } ,
0 commit comments