fix: handle built-in windows commands in validation check

Author: tsmithsz

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/executeBash.test.ts

@@ -2,11 +2,9 @@ import { strict as assert } from 'assert'
 import * as mockfs from 'mock-fs'
 import * as sinon from 'sinon'
 import { ExecuteBash } from './executeBash'
-import { Features } from '@aws/language-server-runtimes/server-interface/server'
 import { TestFeatures } from '@aws/language-server-runtimes/testing'
 import { TextDocument } from 'vscode-languageserver-textdocument'
 import { URI } from 'vscode-uri'
-import { InitializeParams } from '@aws/language-server-runtimes/protocol'
 
 describe('ExecuteBash Tool', () => {
     let features: TestFeatures

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/executeBash.ts

@@ -559,25 +559,67 @@ export class ExecuteBash {
         return [str, false]
     }
 
-    private static async whichCommand(logger: Logging, cmd: string): Promise<string> {
-        const { command, args } = IS_WINDOWS_PLATFORM
-            ? { command: 'where', args: [cmd] }
-            : { command: 'sh', args: ['-c', `command -v ${cmd}`] }
-        const cp = new processUtils.ChildProcess(logger, command, args, {
-            collect: true,
-            waitForStreams: true,
-        })
-        const result = await cp.run()
+    private static async whichCommand(logger: Logging, cmd: string): Promise<void> {
+        if (IS_WINDOWS_PLATFORM) {
+            await this.resolveWindowsCommand(logger, cmd)
+        } else {
+            await this.resolveUnixCommand(logger, cmd)
+        }
+    }
+
+    private static async resolveWindowsCommand(logger: Logging, cmd: string): Promise<void> {
+        // 1. Check for external command or alias
+        try {
+            const whereProc = new processUtils.ChildProcess(logger, 'where', [cmd], {
+                collect: true,
+                waitForStreams: true,
+            })
+            const result = await whereProc.run()
+            const output = result.stdout.trim()
+
+            if (result.exitCode === 0 && output) {
+                return
+            }
+        } catch (err) {
+            logger.debug(`'where ${cmd}' failed: ${(err as Error).message}`)
+        }
 
-        if (result.exitCode !== 0) {
-            throw new Error(`Command '${cmd}' not found on PATH.`)
+        // 2. Check for built-in command
+        try {
+            const helpProc = new processUtils.ChildProcess(logger, 'cmd.exe', ['/c', 'help', cmd], {
+                collect: true,
+                waitForStreams: true,
+            })
+            const result = await helpProc.run()
+            const output = result.stdout.trim()
+
+            if (output && !output.includes('This command is not supported by the help utility')) {
+                return
+            }
+        } catch (err) {
+            logger.debug(`'help ${cmd}' failed: ${(err as Error).message}`)
         }
 
-        const output = result.stdout.trim()
-        if (!output) {
-            throw new Error(`Command '${cmd}' found but '${command} ${args.join(' ')}' returned empty output.`)
+        throw new Error(`Command '${cmd}' not found as executable or Windows built-in command`)
+    }
+
+    private static async resolveUnixCommand(logger: Logging, cmd: string): Promise<void> {
+        try {
+            const proc = new processUtils.ChildProcess(logger, 'sh', ['-c', `command -v ${cmd}`], {
+                collect: true,
+                waitForStreams: true,
+            })
+            const result = await proc.run()
+            const output = result.stdout.trim()
+
+            if (result.exitCode === 0 && output) {
+                return
+            }
+        } catch (err) {
+            logger.debug(`'command -v ${cmd}' failed: ${(err as Error).message}`)
         }
-        return output
+
+        throw new Error(`Command '${cmd}' not found as executable or shell built-in`)
     }
 
     public async queueDescription(command: string, updates: WritableStream) {

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/split.test.ts

@@ -0,0 +1,56 @@
+import { strict as assert } from 'assert'
+import { split } from 'shlex'
+
+describe('shlex.split for Windows command parsing', () => {
+    it('should correctly split a git commit command with quotes', () => {
+        const command = 'git commit -m "test commit"'
+        const result = split(command)
+        assert.deepEqual(result, ['git', 'commit', '-m', 'test commit'])
+    })
+
+    it('should handle AWS CLI commands with JSON payloads', () => {
+        const command =
+            'aws lambda invoke --function-name test --payload \'{"firstName": "John", "lastName": "Smith"}\' output.json'
+        const result = split(command)
+        assert.deepEqual(result, [
+            'aws',
+            'lambda',
+            'invoke',
+            '--function-name',
+            'test',
+            '--payload',
+            '{"firstName": "John", "lastName": "Smith"}',
+            'output.json',
+        ])
+    })
+
+    it('should handle multiline commands', () => {
+        const command = `aws lambda invoke \\
+      --function-name test \\
+      --payload '{"firstName": "John", "lastName": "Smith"}' \\
+      output.json`
+        const result = split(command)
+        assert.deepEqual(result, [
+            'aws',
+            'lambda',
+            'invoke',
+            '--function-name',
+            'test',
+            '--payload',
+            '{"firstName": "John", "lastName": "Smith"}',
+            'output.json',
+        ])
+    })
+
+    it('should handle PowerShell commands with complex quoting', () => {
+        const command = 'powershell -Command "& {Get-Process | Where-Object {$_.CPU -gt 10}}"'
+        const result = split(command)
+        assert.deepEqual(result, ['powershell', '-Command', '& {Get-Process | Where-Object {$_.CPU -gt 10}}'])
+    })
+
+    it('should handle commands with environment variables', () => {
+        const command = 'echo %PATH% && echo $HOME'
+        const result = split(command)
+        assert.deepEqual(result, ['echo', '%PATH%', '&&', 'echo', '$HOME'])
+    })
+})