@@ -3743,7 +3743,7 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
37433743 } ) ,
37443744 ) ;
37453745
3746- it . effect ( "create_pr pushes a clean branch before creating the PR when needed " , ( ) =>
3746+ it . effect ( "create_pr pushes committed changes while preserving a dirty worktree " , ( ) =>
37473747 Effect . gen ( function * ( ) {
37483748 const repoDir = yield * makeTempDir ( "t3code-git-manager-" ) ;
37493749 yield * initRepo ( repoDir ) ;
@@ -3753,6 +3753,10 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
37533753 NodeFS . writeFileSync ( NodePath . join ( repoDir , "create-pr-only.txt" ) , "create pr\n" ) ;
37543754 yield * runGit ( repoDir , [ "add" , "create-pr-only.txt" ] ) ;
37553755 yield * runGit ( repoDir , [ "commit" , "-m" , "Create PR only branch" ] ) ;
3756+ const headBefore = ( yield * runGit ( repoDir , [ "rev-parse" , "HEAD" ] ) ) . stdout . trim ( ) ;
3757+ NodeFS . writeFileSync ( NodePath . join ( repoDir , "README.md" ) , "uncommitted readme\n" ) ;
3758+ NodeFS . writeFileSync ( NodePath . join ( repoDir , "untracked.txt" ) , "untracked work\n" ) ;
3759+ const statusBefore = ( yield * runGit ( repoDir , [ "status" , "--porcelain" ] ) ) . stdout ;
37563760
37573761 const { manager, ghCalls } = yield * makeManager ( {
37583762 ghScenario : {
@@ -3781,6 +3785,10 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
37813785 expect ( result . push . setUpstream ) . toBe ( true ) ;
37823786 expect ( result . pr . status ) . toBe ( "created" ) ;
37833787 expect ( result . pr . number ) . toBe ( 303 ) ;
3788+ expect ( ( yield * runGit ( repoDir , [ "status" , "--porcelain" ] ) ) . stdout ) . toBe ( statusBefore ) ;
3789+ expect (
3790+ ( yield * runGit ( remoteDir , [ "rev-parse" , "feature/create-pr-only" ] ) ) . stdout . trim ( ) ,
3791+ ) . toBe ( headBefore ) ;
37843792 expect (
37853793 ghCalls . some ( ( call ) =>
37863794 call . includes ( "pr create --base main --head feature/create-pr-only" ) ,
@@ -6199,7 +6207,7 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
61996207 } ) ,
62006208 ) ;
62016209
6202- it . effect ( "create_pr emits only the PR phase when the branch is already pushed" , ( ) =>
6210+ it . effect ( "create_pr preserves dirty work on an already pushed branch " , ( ) =>
62036211 Effect . gen ( function * ( ) {
62046212 const repoDir = yield * makeTempDir ( "t3code-git-manager-" ) ;
62056213 yield * initRepo ( repoDir ) ;
@@ -6210,8 +6218,22 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
62106218 yield * runGit ( repoDir , [ "add" , "pr-only.txt" ] ) ;
62116219 yield * runGit ( repoDir , [ "commit" , "-m" , "PR only branch" ] ) ;
62126220 yield * runGit ( repoDir , [ "push" , "-u" , "origin" , "feature/pr-only-follow-up" ] ) ;
6221+ const headBefore = ( yield * runGit ( repoDir , [ "rev-parse" , "HEAD" ] ) ) . stdout ;
6222+ NodeFS . writeFileSync ( NodePath . join ( repoDir , "README.md" ) , "staged readme\n" ) ;
6223+ yield * runGit ( repoDir , [ "add" , "README.md" ] ) ;
6224+ NodeFS . writeFileSync ( NodePath . join ( repoDir , "pr-only.txt" ) , "unstaged feature work\n" ) ;
6225+ NodeFS . writeFileSync ( NodePath . join ( repoDir , "untracked.txt" ) , "untracked work\n" ) ;
6226+ const statusBefore = ( yield * runGit ( repoDir , [ "status" , "--porcelain" ] ) ) . stdout ;
6227+ const stagedBefore = ( yield * runGit ( repoDir , [ "diff" , "--cached" ] ) ) . stdout ;
6228+ let generatedContent : TextGeneration . PrContentGenerationInput | undefined ;
62136229
62146230 const { manager } = yield * makeManager ( {
6231+ textGeneration : {
6232+ generatePrContent : ( input ) => {
6233+ generatedContent = input ;
6234+ return Effect . succeed ( { title : "PR only branch" , body : "Committed feature work" } ) ;
6235+ } ,
6236+ } ,
62156237 ghScenario : {
62166238 prListSequence : [
62176239 JSON . stringify ( [ ] ) ,
@@ -6251,6 +6273,12 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
62516273 expect ( result . commit . status ) . toBe ( "skipped_not_requested" ) ;
62526274 expect ( result . push . status ) . toBe ( "skipped_not_requested" ) ;
62536275 expect ( result . pr . status ) . toBe ( "created" ) ;
6276+ expect ( generatedContent ?. diffPatch ) . toContain ( "+pr only" ) ;
6277+ expect ( generatedContent ?. diffPatch ) . not . toContain ( "staged readme" ) ;
6278+ expect ( generatedContent ?. diffPatch ) . not . toContain ( "unstaged feature work" ) ;
6279+ expect ( ( yield * runGit ( repoDir , [ "rev-parse" , "HEAD" ] ) ) . stdout ) . toBe ( headBefore ) ;
6280+ expect ( ( yield * runGit ( repoDir , [ "status" , "--porcelain" ] ) ) . stdout ) . toBe ( statusBefore ) ;
6281+ expect ( ( yield * runGit ( repoDir , [ "diff" , "--cached" ] ) ) . stdout ) . toBe ( stagedBefore ) ;
62546282 expect (
62556283 events . filter (
62566284 ( event ) : event is Extract < GitActionProgressEvent , { kind : "phase_started" } > =>
0 commit comments