@@ -8675,6 +8675,125 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
86758675 } ) . pipe ( Effect . provide ( NodeHttpServer . layerTest ) ) ,
86768676 ) ;
86778677
8678+ it . effect . each ( [
8679+ {
8680+ caseName : "a non-origin remote base" ,
8681+ baseBranch : "upstream/main" ,
8682+ fetchRemoteName : "upstream" ,
8683+ lookupRefName : "main" ,
8684+ remoteRefName : "upstream/main" ,
8685+ } ,
8686+ {
8687+ caseName : "an origin-prefixed base" ,
8688+ baseBranch : "origin/main" ,
8689+ fetchRemoteName : "origin" ,
8690+ lookupRefName : "main" ,
8691+ remoteRefName : "origin/main" ,
8692+ } ,
8693+ ] ) (
8694+ "fetches the base branch's own remote for $caseName" ,
8695+ ( { baseBranch, fetchRemoteName, lookupRefName, remoteRefName } ) =>
8696+ Effect . gen ( function * ( ) {
8697+ const fetchedCommit = "abcdef0123456789abcdef0123456789abcdef01" ;
8698+ const remoteExists = vi . fn (
8699+ ( _ : Parameters < GitVcsDriver . GitVcsDriver [ "Service" ] [ "remoteExists" ] > [ 0 ] ) =>
8700+ Effect . succeed ( true ) ,
8701+ ) ;
8702+ const fetchRemote = vi . fn (
8703+ ( _ : Parameters < GitVcsDriver . GitVcsDriver [ "Service" ] [ "fetchRemote" ] > [ 0 ] ) => Effect . void ,
8704+ ) ;
8705+ const remoteBranchExists = vi . fn (
8706+ ( _ : Parameters < GitVcsDriver . GitVcsDriver [ "Service" ] [ "remoteBranchExists" ] > [ 0 ] ) =>
8707+ Effect . succeed ( true ) ,
8708+ ) ;
8709+ const resolveRemoteTrackingCommit = vi . fn (
8710+ ( _ : Parameters < GitVcsDriver . GitVcsDriver [ "Service" ] [ "resolveRemoteTrackingCommit" ] > [ 0 ] ) =>
8711+ Effect . succeed ( {
8712+ commitSha : fetchedCommit ,
8713+ remoteRefName,
8714+ } ) ,
8715+ ) ;
8716+ const createWorktree = vi . fn (
8717+ ( _ : Parameters < GitVcsDriver . GitVcsDriver [ "Service" ] [ "createWorktree" ] > [ 0 ] ) =>
8718+ Effect . succeed ( {
8719+ worktree : {
8720+ refName : "t3code/bootstrap-refName" ,
8721+ path : "/tmp/bootstrap-worktree" ,
8722+ } ,
8723+ } ) ,
8724+ ) ;
8725+
8726+ yield * buildAppUnderTest ( {
8727+ layers : {
8728+ gitVcsDriver : {
8729+ remoteExists,
8730+ fetchRemote,
8731+ remoteBranchExists,
8732+ resolveRemoteTrackingCommit,
8733+ createWorktree,
8734+ } ,
8735+ orchestrationEngine : {
8736+ dispatch : ( command : OrchestrationCommand ) =>
8737+ Effect . sync ( ( ) => ( { sequence : 1 } ) ) ,
8738+ readEvents : ( ) => Stream . empty ,
8739+ } ,
8740+ } ,
8741+ } ) ;
8742+
8743+ const createdAt = "2026-01-01T00:00:00.000Z" ;
8744+ const wsUrl = yield * getWsServerUrl ( "/ws" ) ;
8745+ yield * Effect . scoped (
8746+ withWsRpcClient ( wsUrl , ( client ) =>
8747+ client [ ORCHESTRATION_WS_METHODS . dispatchCommand ] ( {
8748+ type : "thread.turn.start" ,
8749+ commandId : CommandId . make ( "cmd-bootstrap-turn-start-remote-base" ) ,
8750+ threadId : ThreadId . make ( "thread-bootstrap-remote-base" ) ,
8751+ message : {
8752+ messageId : MessageId . make ( "msg-bootstrap-remote-base" ) ,
8753+ role : "user" ,
8754+ text : "hello" ,
8755+ attachments : [ ] ,
8756+ } ,
8757+ modelSelection : defaultModelSelection ,
8758+ runtimeMode : "full-access" ,
8759+ interactionMode : "default" ,
8760+ bootstrap : {
8761+ prepareWorktree : {
8762+ projectCwd : "/tmp/project" ,
8763+ baseBranch,
8764+ branch : "t3code/bootstrap-refName" ,
8765+ startFromOrigin : true ,
8766+ } ,
8767+ } ,
8768+ createdAt,
8769+ } ) ,
8770+ ) ,
8771+ ) ;
8772+
8773+ assert . deepEqual ( fetchRemote . mock . calls [ 0 ] ?. [ 0 ] , {
8774+ cwd : "/tmp/project" ,
8775+ remoteName : fetchRemoteName ,
8776+ } ) ;
8777+ assert . deepEqual ( remoteBranchExists . mock . calls [ 0 ] ?. [ 0 ] , {
8778+ cwd : "/tmp/project" ,
8779+ remoteName : fetchRemoteName ,
8780+ refName : lookupRefName ,
8781+ } ) ;
8782+ assert . deepEqual ( resolveRemoteTrackingCommit . mock . calls [ 0 ] ?. [ 0 ] , {
8783+ cwd : "/tmp/project" ,
8784+ refName : baseBranch ,
8785+ fallbackRemoteName : fetchRemoteName ,
8786+ } ) ;
8787+ assert . deepEqual ( createWorktree . mock . calls [ 0 ] ?. [ 0 ] , {
8788+ cwd : "/tmp/project" ,
8789+ refName : fetchedCommit ,
8790+ newRefName : "t3code/bootstrap-refName" ,
8791+ baseRefName : baseBranch ,
8792+ path : null ,
8793+ } ) ;
8794+ } ) . pipe ( Effect . provide ( NodeHttpServer . layerTest ) ) ,
8795+ ) ;
8796+
86788797 it . effect ( "records setup-script failures without aborting bootstrap turn start" , ( ) =>
86798798 Effect . gen ( function * ( ) {
86808799 const dispatchedCommands : Array < OrchestrationCommand > = [ ] ;
0 commit comments