fix(pi): follow replacement update PRs

Author: Bill Leoutsakos

apps/sim/executor/handlers/pi/cloud-backend.test.ts

@@ -81,13 +81,13 @@ function branchParams(overrides: Partial<PiCloudBranchRunParams> = {}): PiCloudB
   }
 }
 
-function existingPullRequestOutput() {
+function existingPullRequestOutput(pullNumber = 7) {
   return {
     success: true,
     output: {
       title: 'Feature',
       body: '',
-      html_url: 'https://github.com/octo/demo/pull/7',
+      html_url: `https://github.com/octo/demo/pull/${pullNumber}`,
       state: 'open',
       merged: false,
       mergeable: true,
@@ -849,6 +849,28 @@ describe('runCloudPi', () => {
       expect(result.prUrl).toBe('https://github.com/octo/demo/pull/1')
     })
 
+    it('updates the one replacement PR found after authoring', async () => {
+      mockExecuteTool
+        .mockResolvedValueOnce({
+          success: true,
+          output: { items: [{ number: 7 }], count: 1 },
+        })
+        .mockResolvedValueOnce(existingPullRequestOutput())
+        .mockResolvedValueOnce({
+          success: true,
+          output: { items: [{ number: 8 }], count: 1 },
+        })
+        .mockResolvedValueOnce(existingPullRequestOutput(8))
+        .mockResolvedValueOnce(existingPullRequestOutput(8))
+
+      const result = await runCloudBranchPi(branchParams(), { onEvent: vi.fn() })
+
+      expect(result.prUrl).toBe('https://github.com/octo/demo/pull/8')
+      expect(
+        mockExecuteTool.mock.calls.some(([tool]: [string]) => tool === 'github_create_pr')
+      ).toBe(false)
+    })
+
     it('does not claim a push happened when no-op authoring is followed by a PR error', async () => {
       mockRun.mockImplementation((command: string) => {
         if (command.includes('git clone')) {

apps/sim/executor/handlers/pi/cloud-backend.ts

@@ -291,7 +291,6 @@ async function updatePullRequest(
 async function ensureUpdatePullRequest(
   params: PiCloudBranchRunParams,
   branch: string,
-  existingPullRequest: BranchPullRequest | undefined,
   totals: PiRunTotals,
   secrets: readonly string[],
   signal?: AbortSignal
@@ -305,11 +304,6 @@ async function ensureUpdatePullRequest(
     },
     signal
   )
-  if (existingPullRequest) {
-    if (currentPullRequest && currentPullRequest.pullNumber !== existingPullRequest.pullNumber) {
-      throw new Error(`The open pull request for branch ${branch} changed during authoring`)
-    }
-  }
   if (currentPullRequest) {
     return updatePullRequest(params, currentPullRequest, secrets, signal)
   }
@@ -421,10 +415,9 @@ async function runCloudAuthoringPi(
   )
   const totals = createPiTotals()
   const thinking = mapThinkingLevel(params.thinkingLevel) ?? 'medium'
-  let existingPullRequest: BranchPullRequest | undefined
   if (params.mode === 'cloud_branch') {
     try {
-      existingPullRequest = await findOpenPrForBranch(
+      await findOpenPrForBranch(
         {
           owner: params.owner,
           repo: params.repo,
@@ -599,14 +592,7 @@ async function runCloudAuthoringPi(
 
       let pullRequest: OpenedPullRequest
       if (params.mode === 'cloud_branch') {
-        pullRequest = await ensureUpdatePullRequest(
-          params,
-          branch,
-          existingPullRequest,
-          totals,
-          secrets,
-          context.signal
-        )
+        pullRequest = await ensureUpdatePullRequest(params, branch, totals, secrets, context.signal)
       } else {
         const base = params.baseBranch?.trim() || detectedBase
         if (!base) {