fix properly (#7717)

Author: joshspicer

src/github/copilotApi.ts

@@ -83,6 +83,7 @@ export class CopilotApi {
 		const repoSlug = `${owner}/${name}`;
 		const apiUrl = `/agents/swe/v0/jobs/${repoSlug}`;
 		let status: number | undefined;
+		Logger.trace(`postRemoteAgentJob: Posting job to ${apiUrl} with payload: ${JSON.stringify(payload)}`, CopilotApi.ID);
 		try {
 			const response = await this.makeApiCall(apiUrl, {
 				method: 'POST',

src/github/copilotRemoteAgent.ts

@@ -528,20 +528,20 @@ export class CopilotRemoteAgentManager extends Disposable {
 		// We only create a new branch and commit if there are staged or working changes.
 		// This could be improved if we add lower-level APIs to our git extension (e.g. in-memory temp git index).
 
-		let ref = baseRef;
+		const base_ref = baseRef; // This is the ref the PR will merge into
+		let head_ref: string | undefined; // This is the ref coding agent starts work from (omitted unless we push local changes)
 		const hasChanges = autoPushAndCommit && (repository.state.workingTreeChanges.length > 0 || repository.state.indexChanges.length > 0);
 		if (hasChanges) {
 			if (!CopilotRemoteAgentConfig.getAutoCommitAndPushEnabled()) {
 				return { error: vscode.l10n.t('Uncommitted changes detected. Please commit or stash your changes before starting the remote agent. Enable \'{0}\' to push your changes automatically.', CODING_AGENT_AUTO_COMMIT_AND_PUSH), state: 'error' };
 			}
 			try {
-				await this.gitOperationsManager.commitAndPushChanges(repoInfo);
+				head_ref = await this.gitOperationsManager.commitAndPushChanges(repoInfo);
 			} catch (error) {
 				return { error: error.message, state: 'error' };
 			}
 		}
 
-		const base_ref = hasChanges ? baseRef : ref;
 		try {
 			if (!(await ghRepository.hasBranch(base_ref))) {
 				if (!CopilotRemoteAgentConfig.getAutoCommitAndPushEnabled()) {
@@ -577,7 +577,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 				body_placeholder: formatBodyPlaceholder(problemContext || prompt),
 				base_ref,
 				body_suffix,
-				...(hasChanges && { head_ref: ref })
+				...(head_ref && { head_ref })
 			}
 		};
 
@@ -591,7 +591,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 				number: pull_request.number,
 				link: pull_request.html_url,
 				webviewUri,
-				llmDetails: hasChanges ? `The pending changes have been pushed to branch '${ref}'. ${prLlmString}` : prLlmString,
+				llmDetails: head_ref ? `Local pending changes have been pushed to branch '${head_ref}'. ${prLlmString}` : prLlmString,
 				sessionId: session_id
 			};
 		} catch (error) {

src/github/copilotRemoteAgent/gitOperationsManager.ts

@@ -21,8 +21,8 @@ export class GitOperationsManager {
 
 			await this.performCommit(asyncBranch, repository, commitMessage);
 			await repository.push(remote.remoteName, asyncBranch, true);
-
 			this.showBranchSwitchNotification(repository, baseRef, asyncBranch);
+			return asyncBranch; // This is the new head ref
 		} catch (error) {
 			await this.rollbackToOriginalBranch(repository, baseRef);
 			Logger.error(`Failed to auto-commit and push pending changes: ${error}`, this.loggerID);