Sessions: PR detection fixes (#4971)

* Sessions: PR detection fixes

* Test update

Author: osortega

src/extension/chatSessions/vscode-node/copilotCLIChatSessions.ts

@@ -1262,13 +1262,13 @@ export class CopilotCLIChatSessionParticipant extends Disposable {
 		}
 	}
 
-	private static readonly _PR_DETECTION_RETRY_COUNT = 3;
+	private static readonly _PR_DETECTION_RETRY_COUNT = 5;
 	private static readonly _PR_DETECTION_INITIAL_DELAY_MS = 2_000;
 
 	private async handlePullRequestCreated(session: ICopilotCLISession): Promise<void> {
 		const sessionId = session.sessionId;
 		let prUrl = session.createdPullRequestUrl;
-		let prState = 'open';
+		let prState = '';
 
 		this.logService.debug(`[CopilotCLIChatSessionParticipant] handlePullRequestCreated for ${sessionId}: createdPullRequestUrl=${prUrl ?? 'none'}`);
 
@@ -1285,7 +1285,7 @@ export class CopilotCLIChatSessionParticipant extends Disposable {
 				this.logService.debug(`[CopilotCLIChatSessionParticipant] No PR URL from session, attempting retry detection for ${sessionId}, branch=${worktreeProperties.branchName}`);
 				const prResult = await this.detectPullRequestWithRetry(sessionId);
 				prUrl = prResult?.url;
-				prState = prResult?.state ?? 'open';
+				prState = prResult?.state ?? prResult?.url ? 'open' : '';
 			} else {
 				this.logService.debug(`[CopilotCLIChatSessionParticipant] Skipping retry detection for ${sessionId}: branch=${worktreeProperties.branchName ?? 'none'}, repoPath=${!!worktreeProperties.repositoryPath}`);
 			}

src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts

@@ -1535,13 +1535,13 @@ export class CopilotCLIChatSessionParticipant extends Disposable {
 		}
 	}
 
-	private static readonly _PR_DETECTION_RETRY_COUNT = 3;
+	private static readonly _PR_DETECTION_RETRY_COUNT = 5;
 	private static readonly _PR_DETECTION_INITIAL_DELAY_MS = 2_000;
 
 	private async handlePullRequestCreated(session: ICopilotCLISession): Promise<void> {
 		const sessionId = session.sessionId;
 		let prUrl = session.createdPullRequestUrl;
-		let prState = 'open';
+		let prState = '';
 
 		this.logService.debug(`[CopilotCLIChatSessionParticipant] handlePullRequestCreated for ${sessionId}: createdPullRequestUrl=${prUrl ?? 'none'}`);
 
@@ -1559,7 +1559,7 @@ export class CopilotCLIChatSessionParticipant extends Disposable {
 				this.logService.debug(`[CopilotCLIChatSessionParticipant] No PR URL from session, attempting retry detection for ${sessionId}, branch=${worktreeProperties.branchName}`);
 				const prResult = await this.detectPullRequestWithRetry(sessionId);
 				prUrl = prResult?.url;
-				prState = prResult?.state ?? 'open';
+				prState = prResult?.state ?? prUrl ? 'open' : '';
 			} else {
 				this.logService.debug(`[CopilotCLIChatSessionParticipant] Skipping retry detection for ${sessionId}: branch=${worktreeProperties.branchName ?? 'none'}, repoPath=${!!worktreeProperties.repositoryPath}`);
 			}

src/extension/chatSessions/vscode-node/test/copilotCLIChatSessionParticipant.spec.ts

@@ -2097,8 +2097,8 @@ describe('CopilotCLIChatSessionParticipant.handleRequest', () => {
 			await vi.runAllTimersAsync();
 			await handlerPromise;
 
-			// 3 attempts total (after 2s, 4s, and 8s delays)
-			expect(findPr).toHaveBeenCalledTimes(3);
+			// 5 attempts total (after 2s, 4s, 8s, 16s, and 32s delays)
+			expect(findPr).toHaveBeenCalledTimes(5);
 			// Should NOT have persisted any PR URL since all attempts failed
 			const setPropsCallsWithPrUrl = (worktree.setWorktreeProperties as ReturnType<typeof vi.fn>).mock.calls
 				.filter((args: unknown[]) => (args[1] as { pullRequestUrl?: string })?.pullRequestUrl !== undefined);