Merge branch 'main' into alexr00/dying-snake

Author: alexr00

package.json

@@ -3723,37 +3723,6 @@
 			}
 		],
 		"languageModelTools": [
-			{
-				"name": "github-pull-request_copilot-coding-agent",
-				"displayName": "%languageModelTools.github-pull-request_copilot-coding-agent.displayName%",
-				"modelDescription": "Completes the provided task using an asynchronous coding agent. Use when the user wants copilot continue completing a task in the background or asynchronously. IMPORTANT: Use this tool LAST/FINAL when users mention '#github-pull-request_copilot-coding-agent' in their query. This indicates they want the task/job implemented by the remote coding agent after all other analysis, planning, and preparation is complete. Call this tool at the END to hand off the fully-scoped task to the asynchronous GitHub Copilot coding agent. The agent will create a new branch, implement the changes, and open a pull request. Always use this tool as the final step when the hashtag is mentioned, after completing any other necessary tools or analysis first.",
-				"when": "config.githubPullRequests.codingAgent.enabled",
-				"icon": "$(send-to-remote-agent)",
-				"canBeReferencedInPrompt": true,
-				"toolReferenceName": "copilotCodingAgent",
-				"userDescription": "%languageModelTools.github-pull-request_copilot-coding-agent.userDescription%",
-				"inputSchema": {
-					"type": "object",
-					"required": [
-						"title",
-						"body"
-					],
-					"properties": {
-						"title": {
-							"type": "string",
-							"description": "The title of the issue. Populate from chat context."
-						},
-						"body": {
-							"type": "string",
-							"description": "The body/description of the issue. Populate from chat context."
-						},
-						"existingPullRequest": {
-							"type": "number",
-							"description": "The number of an existing pull request related to the current coding agent task. Look in the chat history for this number.  In the chat it may look like 'Coding agent will continue work in #17...'. In this example, you should return '17'."
-						}
-					}
-				}
-			},
 			{
 				"name": "github-pull-request_issue_fetch",
 				"tags": [
@@ -4299,7 +4268,7 @@
 				],
 				"toolReferenceName": "openPullRequest",
 				"displayName": "%languageModelTools.github-pull-request_openPullRequest.displayName%",
-				"modelDescription": "Get comprehensive information about the GitHub pull request (PR) which is currently visible, but not necessarily checked out. This includes the PR title, full description, list of changed files, review comments, PR state, and status checks/CI results. For PRs created by Copilot, it also includes the session logs which indicate the development process and decisions made by the coding agent. When asked about the currently open pull request, do this first! Use this tool for any request related to \"pull request details,\" \"what changed,\" \"PR status,\" or similar queries even if the user does not explicitly mention \"pull request.\" When asked to use this tool, ALWAYS use it.",
+				"modelDescription": "Get comprehensive information about the GitHub pull request (PR) which is currently visible, but not necessarily checked out. This is the pull request that the user is currently viewing. This includes the PR title, full description, list of changed files, review comments, PR state, and status checks/CI results. For PRs created by Copilot, it also includes the session logs which indicate the development process and decisions made by the coding agent. When asked about the currently open pull request, do this first! Use this tool for any request related to \"pull request details,\" \"what changed,\" \"PR status,\" or similar queries even if the user does not explicitly mention \"pull request.\" When asked to use this tool, ALWAYS use it.",
 				"icon": "$(git-pull-request)",
 				"canBeReferencedInPrompt": true,
 				"userDescription": "%languageModelTools.github-pull-request_openPullRequest.description%",

package.nls.json

@@ -425,7 +425,5 @@
 	"languageModelTools.github-pull-request_activePullRequest.displayName": "Active Pull Request",
 	"languageModelTools.github-pull-request_activePullRequest.description": "Get information about the active GitHub pull request. This information includes: comments, files changed, pull request title + description, pull request state, and pull request status checks/CI.",
 	"languageModelTools.github-pull-request_openPullRequest.displayName": "Open Pull Request",
-	"languageModelTools.github-pull-request_openPullRequest.description": "Get information about the open GitHub pull request. This information includes: comments, files changed, pull request title + description, pull request state, and pull request status checks/CI.",
-	"languageModelTools.github-pull-request_copilot-coding-agent.displayName": "Copilot coding agent",
-	"languageModelTools.github-pull-request_copilot-coding-agent.userDescription": "Completes the provided task using an asynchronous coding agent. Use when the user wants copilot continue completing a task in the background or asynchronously. Launch an autonomous GitHub Copilot agent to work on coding tasks in the background. The agent will create a new branch, implement the requested changes, and open a pull request with the completed work."
+	"languageModelTools.github-pull-request_openPullRequest.description": "Get information about the open GitHub pull request. This information includes: comments, files changed, pull request title + description, pull request state, and pull request status checks/CI."
 }

src/github/createPRViewProvider.ts

@@ -1376,7 +1376,42 @@ Don't forget to commit your template file to the repository so that it can be us
 					const compareRepositoryName = message.args.compareRepo;
 					const compareBranchName = message.args.compareBranch;
 					const compareGithubRemoteName = `${compareOwner}/${compareRepositoryName}`;
-					const compareBranch = await this._folderRepositoryManager.repository.getBranch(compareBranchName);
+					let compareBranch = await this._folderRepositoryManager.repository.getBranch(compareBranchName);
+
+					// Fetch upstream to get accurate ahead/behind count
+					if (compareBranch.upstream) {
+						await this._folderRepositoryManager.repository.fetch(compareBranch.upstream.remote, compareBranch.upstream.name);
+						// Re-fetch branch info after fetch to get accurate ahead count
+						compareBranch = await this._folderRepositoryManager.repository.getBranch(compareBranchName);
+					}
+
+					// Check for unpushed commits when there's an upstream
+					if (compareBranch.upstream && compareBranch.ahead && compareBranch.ahead > 0) {
+						const pushCommits = vscode.l10n.t('Push Commits');
+						const continueWithoutPushing = vscode.l10n.t('Continue Without Pushing');
+						const commitCount = compareBranch.ahead;
+						const messageResult = await vscode.window.showInformationMessage(
+							vscode.l10n.t({
+								message: 'You have {0} unpushed commit(s) on \'{1}\'.\n\nDo you want to push them before creating the pull request?',
+								comment: ['{0} is the number of commits, {1} is the branch name'],
+								args: [commitCount, compareBranchName]
+							}),
+							{ modal: true },
+							pushCommits,
+							continueWithoutPushing
+						);
+						if (messageResult === pushCommits) {
+							progress.report({ message: vscode.l10n.t('Pushing commits'), increment: 10 });
+							totalIncrement += 10;
+							await this._folderRepositoryManager.repository.push(compareBranch.upstream.remote, compareBranchName);
+						} else if (messageResult !== continueWithoutPushing) {
+							// User cancelled (clicked X or pressed Escape)
+							progress.report({ message: vscode.l10n.t('Pull request cancelled'), increment: 100 - totalIncrement });
+							return;
+						}
+						// If continueWithoutPushing was selected, just continue with PR creation
+					}
+
 					let headRepo = compareBranch.upstream ? this._folderRepositoryManager.findRepo((githubRepo) => {
 						return (githubRepo.remote.owner === compareOwner) && (githubRepo.remote.repositoryName === compareRepositoryName);
 					}) : undefined;

webviews/common/common.css

@@ -350,7 +350,7 @@ body img.avatar {
 .label {
 	display: flex;
 	justify-content: normal;
-	padding: 0 2px 0 8px;
+	padding: 0 8px;
 	border-radius: 20px;
 	border-style: solid;
 	border-width: 1px;