Merge pull request microsoft#256711 from microsoft/copilot/fix-256710

Handle cd /d on Windows in command rewriting

Author: Tyriar

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalTool.ts

@@ -428,7 +428,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		const isPwsh = isPowerShell(shell, os);
 		const cdPrefixMatch = commandLine.match(
 			isPwsh
-				? /^(?:cd|Set-Location(?: -Path)?) (?<dir>[^\s]+) ?(?:&&|;)\s+(?<suffix>.+)$/i
+				? /^(?:cd(?: \/d)?|Set-Location(?: -Path)?) (?<dir>[^\s]+) ?(?:&&|;)\s+(?<suffix>.+)$/i
 				: /^cd (?<dir>[^\s]+) &&\s+(?<suffix>.+)$/
 		);
 		const cdDir = cdPrefixMatch?.groups?.dir;

src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/runInTerminalTool.test.ts

@@ -500,6 +500,84 @@ suite('RunInTerminalTool', () => {
 
 					strictEqual(result, 'npm test');
 				});
+
+				test('should handle cd /d flag when directory matches cwd', async () => {
+					const testDir = 'C:\\test\\workspace';
+					const options = createRewriteParams(`cd /d ${testDir} && echo hello`, 'session-1');
+					workspaceService.setWorkspace({
+						folders: [{ uri: { fsPath: testDir } }]
+					} as any);
+
+					const result = await runInTerminalTool.rewriteCommandIfNeeded(options, undefined, 'pwsh');
+
+					strictEqual(result, 'echo hello');
+				});
+
+				test('should handle cd /d flag with quoted paths when directory matches cwd', async () => {
+					const testDir = 'C:\\test\\workspace';
+					const options = createRewriteParams(`cd /d "${testDir}" && echo hello`, 'session-1');
+					workspaceService.setWorkspace({
+						folders: [{ uri: { fsPath: testDir } }]
+					} as any);
+
+					const result = await runInTerminalTool.rewriteCommandIfNeeded(options, undefined, 'pwsh');
+
+					strictEqual(result, 'echo hello');
+				});
+
+				test('should handle cd /d flag with quoted paths from issue example', async () => {
+					const testDir = 'd:\\microsoft\\vscode';
+					const options = createRewriteParams(`cd /d "${testDir}" && .\\scripts\\test.bat`, 'session-1');
+					workspaceService.setWorkspace({
+						folders: [{ uri: { fsPath: testDir } }]
+					} as any);
+
+					const result = await runInTerminalTool.rewriteCommandIfNeeded(options, undefined, 'pwsh');
+
+					strictEqual(result, '.\\scripts\\test.bat');
+				});
+
+				test('should not rewrite cd /d when directory does not match cwd', async () => {
+					const testDir = 'C:\\test\\workspace';
+					const differentDir = 'C:\\different\\path';
+					const command = `cd /d ${differentDir} && echo hello`;
+					const options = createRewriteParams(command, 'session-1');
+					workspaceService.setWorkspace({
+						folders: [{ uri: { fsPath: testDir } }]
+					} as any);
+
+					const result = await runInTerminalTool.rewriteCommandIfNeeded(options, undefined, 'pwsh');
+
+					strictEqual(result, command);
+				});
+
+				test('should handle cd /d flag with instance priority', async () => {
+					const instanceDir = 'C:\\instance\\workspace';
+					const workspaceDir = 'C:\\workspace\\service';
+					const command = `cd /d ${instanceDir} && npm test`;
+					const parameters = createRewriteParams(command, 'session-1');
+
+					workspaceService.setWorkspace({
+						folders: [{ uri: { fsPath: workspaceDir } }]
+					} as any);
+					const instance = createInstanceWithCwd({ fsPath: instanceDir } as any);
+
+					const result = await runInTerminalTool.rewriteCommandIfNeeded(parameters, instance, 'pwsh');
+
+					strictEqual(result, 'npm test');
+				});
+
+				test('should handle cd /d flag with semicolon separator', async () => {
+					const testDir = 'C:\\test\\workspace';
+					const options = createRewriteParams(`cd /d ${testDir}; echo hello`, 'session-1');
+					workspaceService.setWorkspace({
+						folders: [{ uri: { fsPath: testDir } }]
+					} as any);
+
+					const result = await runInTerminalTool.rewriteCommandIfNeeded(options, undefined, 'pwsh');
+
+					strictEqual(result, 'echo hello');
+				});
 			});
 		});
 	});