Implement seamless terminal commit flow for GPG signing and git hooks in Copilot Remote Agent (#7146)

* Initial plan

* Implement seamless terminal commit flow for GPG signing and git hooks

Co-authored-by: joshspicer <[email protected]>

* Polish terminal commit flow with helpful comments and instructions

Co-authored-by: joshspicer <[email protected]>

* improvements

---------

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: joshspicer <[email protected]>

Author: Copilot

src/github/copilotRemoteAgent.ts

@@ -294,6 +294,76 @@ export class CopilotRemoteAgentManager extends Disposable {
 		return vscode.l10n.t('🚀 Coding agent will continue work in [#{0}]({1}).  Track progress [here]({2}).', number, link, webviewUri.toString());
 	}
 
+	/**
+	 * Opens a terminal and waits for user to successfully commit
+	 * This is a fallback for when the commit cannot be done automatically (eg: GPG signing password needed)
+	 */
+	private async handleInteractiveCommit(repository: Repository, commitMessage: string): Promise<boolean> {
+		return new Promise<boolean>((resolve) => {
+			const startingCommit = repository.state.HEAD?.commit;
+
+			// Create terminal with git commit command
+			const terminal = vscode.window.createTerminal({
+				name: 'GitHub Coding Agent',
+				cwd: repository.rootUri.fsPath,
+				message: vscode.l10n.t('Commit your changes to continue Coding Agent session')
+			});
+
+			// Show terminal and send commit command
+			terminal.show();
+			terminal.sendText(`# Complete this commit to continue with your Coding Agent session. Ctrl+C to cancel.`);
+			terminal.sendText(`git commit -m "${commitMessage}"`);
+
+			let disposed = false;
+			let timeoutId: NodeJS.Timeout;
+			let stateListener: vscode.Disposable | undefined;
+			let disposalListener: vscode.Disposable | undefined;
+
+			const cleanup = () => {
+				if (disposed) return;
+				disposed = true;
+				clearTimeout(timeoutId);
+				stateListener?.dispose();
+				disposalListener?.dispose();
+				terminal.dispose();
+			};
+
+			// Listen for repository state changes
+			stateListener = repository.state.onDidChange(() => {
+				// Check if commit was successful (HEAD changed and no more staged changes)
+				if (repository.state.HEAD?.commit !== startingCommit &&
+					repository.state.indexChanges.length === 0) {
+					cleanup();
+					resolve(true);
+				}
+			});
+
+			// Set a timeout to avoid waiting forever
+			timeoutId = setTimeout(() => {
+				cleanup();
+				vscode.window.showWarningMessage(
+					vscode.l10n.t('Commit timeout. Please try the operation again after committing your changes.')
+				);
+				resolve(false);
+			}, 5 * 60 * 1000); // 5 minutes timeout
+
+			// Listen for terminal disposal (user closed it)
+			disposalListener = vscode.window.onDidCloseTerminal((closedTerminal) => {
+				if (closedTerminal === terminal) {
+					// Give a brief moment for potential state changes to propagate
+					setTimeout(() => {
+						if (!disposed) {
+							cleanup();
+							// Check one more time if commit happened just before terminal was closed
+							resolve(repository.state.HEAD?.commit !== startingCommit &&
+								repository.state.indexChanges.length === 0);
+						}
+					}, 1000);
+				}
+			});
+		});
+	}
+
 	async invokeRemoteAgent(prompt: string, problemContext: string, autoPushAndCommit = true): Promise<RemoteAgentResult> {
 		const capiClient = await this.copilotApi;
 		if (!capiClient) {
@@ -319,13 +389,29 @@ export class CopilotRemoteAgentManager extends Disposable {
 			const asyncBranch = `copilot/vscode${Date.now()}`;
 			try {
 				await repository.createBranch(asyncBranch, true);
-				await repository.add([]);
-				if (repository.state.indexChanges.length > 0) {
-					try {
-						await repository.commit('Checkpoint for Copilot Agent async session');
-					} catch (e) {
-						// https://github.com/microsoft/vscode/pull/252263
-						return { error: vscode.l10n.t('Could not \'git commit\' pending changes. If GPG signing or git hooks are enabled, please first commit or stash your changes and try again. ({0})', e.message), state: 'error' };
+				const commitMessage = 'Checkpoint for VS Code Coding Agent Session';
+				try {
+					await repository.commit(commitMessage, { all: true });
+					if (repository.state.HEAD?.name !== asyncBranch || repository.state.workingTreeChanges.length > 0 || repository.state.indexChanges.length > 0) {
+						throw new Error(vscode.l10n.t('Uncommitted changes still detected.'));
+					}
+				} catch (e) {
+					// Instead of immediately failing, open terminal for interactive commit
+					const commitSuccessful = await vscode.window.withProgress({
+						title: vscode.l10n.t('Waiting for commit to complete in the integrated terminal...'),
+						cancellable: true,
+						location: vscode.ProgressLocation.Notification
+					}, async (progress, token) => {
+						const commitPromise = this.handleInteractiveCommit(repository, commitMessage);
+						if (token) {
+							token.onCancellationRequested(() => {
+								return false;
+							});
+						}
+						return await commitPromise;
+					});
+					if (!commitSuccessful) {
+						return { error: vscode.l10n.t('Commit was unsuccessful.  Manually commit or stash your changes and try again.'), state: 'error' };
 					}
 				}
 				await repository.push(remote.remoteName, asyncBranch, true);