Skip to content

Commit 8df9eaa

Browse files
shivamhwpclaude
andcommitted
fix(web): attached pull request tasks tell the agent to switch to the branch
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 7d7a7d6 commit 8df9eaa

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -746,8 +746,8 @@ describe("fix findings handoff", () => {
746746
expect(resolve(false)).toContain("checkout prepared");
747747
expect(fix(true)).not.toMatch(/prepared/u);
748748
expect(resolve(true)).not.toMatch(/prepared/u);
749-
expect(fix(true)).toContain("checking it out first");
750-
expect(resolve(true)).toContain("check it out first");
749+
expect(fix(true)).toContain("switching to it or checking it out first");
750+
expect(resolve(true)).toContain("switch to it or check it out first");
751751
});
752752

753753
it("bounds a hostile review body instead of attaching it whole", () => {

‎apps/web/src/components/pullRequest/pullRequestDetail.logic.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@ function reviewThreadContext(
941941
// A task added to an existing thread's composer has no checkout prepared for it.
942942
function checkoutInstruction(inThisThread: boolean | undefined): string {
943943
return inThisThread
944-
? "Work in a checkout of its branch, checking it out first if this workspace has none"
944+
? "Work on its branch, switching to it or checking it out first if this workspace is not on it"
945945
: "Work in the prepared checkout";
946946
}
947947

@@ -1175,7 +1175,7 @@ export function buildResolveConflictsPrompt(input: {
11751175
return [
11761176
`${terminologyForUrl(input.url).shortLabel} #${input.number} (${boundedField(input.url)}) conflicts with its base branch \`${baseBranch}\`. ${
11771177
input.inThisThread
1178-
? `Its branch is \`${headBranch}\`; check it out first if this workspace has none.`
1178+
? `Its branch is \`${headBranch}\`; switch to it or check it out first if this workspace is not on it.`
11791179
: `Its branch \`${headBranch}\` is the checkout prepared for this thread.`
11801180
}`,
11811181
`Bring the checked-out branch up to date with \`${baseBranch}\` using this repository's convention, resolve every conflict while preserving the intent of both sides, and verify the project still builds before pushing.`,

0 commit comments

Comments
 (0)