Skip to content

Sessions: PR detection fixes #4971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
osortega merged 2 commits into from
Apr 6, 2026
Merged

Sessions: PR detection fixes #4971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e581cf1
Sessions: PR detection fixes
osortega Apr 3, 2026
cd865b6
Test update
osortega Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/extension/chatSessions/vscode-node/copilotCLIChatSessions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Comment thread
osortega marked this conversation as resolved.
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'}`);

Expand All @@ -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}`);
}
Expand Down
6 changes: 3 additions & 3 deletions src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Comment thread
osortega marked this conversation as resolved.

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'}`);

Expand All @@ -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}`);
}
Expand Down
4 changes: 2 additions & 2 deletions src/extension/chatSessions/vscode-node/test/copilotCLIChatSessionParticipant.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading