Skip to content

fix(amazonq): make cmd.exe builtin detection locale-independent #2790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
peschuster wants to merge 1 commit into
base: main
Choose a base branch
from
+68 −17
Open

fix(amazonq): make cmd.exe builtin detection locale-independent #2790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/executeBash.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,17 @@ describe('ExecuteBash Tool', () => {
)
})

it('pass validation for a cmd.exe builtin without an executable on PATH', async function () {
// Builtins like 'assoc' have no .exe that 'where' can resolve, so they must be
// recognized as internal commands. This is only meaningful on Windows.
if (process.platform !== 'win32') {
this.skip()
return
}
const execBash = new ExecuteBash(features)
await execBash.validate({ command: 'assoc' })
})

it('validate and invokes the command', async () => {
const execBash = new ExecuteBash(features)

Expand Down
74 changes: 57 additions & 17 deletions server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/executeBash.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,8 +751,64 @@ export class ExecuteBash {
}
}

// cmd.exe internal commands that have no executable on PATH, so 'where' cannot find them.
// Kept as a static set because probing 'cmd.exe /c help <cmd>' is locale-dependent: the
// "not supported" marker is localized (e.g. German Windows), which made every unknown
// command pass validation on non-English systems.
private static readonly CMD_BUILTINS = new Set([
'assoc',
'break',
'call',
'cd',
'chdir',
'cls',
'color',
'copy',
'date',
'del',
'dir',
'dpath',
'echo',
'endlocal',
'erase',
'exit',
'for',
'ftype',
'goto',
'if',
'md',
'mkdir',
'mklink',
'move',
'path',
'pause',
'popd',
'prompt',
'pushd',
'rd',
'rem',
'ren',
'rename',
'rmdir',
'set',
'setlocal',
'shift',
'start',
'time',
'title',
'type',
'ver',
'verify',
'vol',
])

private static async resolveWindowsCommand(logger: Logging, cmd: string): Promise<void> {
// 1. Check for external command or alias
// 1. Check for built-in command
if (ExecuteBash.CMD_BUILTINS.has(cmd.toLowerCase())) {
return
}

// 2. Check for external command or alias
try {
const whereProc = new processUtils.ChildProcess(logger, 'where', [cmd], {
collect: true,
Expand All @@ -768,22 +824,6 @@ export class ExecuteBash {
logger.debug(`'where ${cmd}' failed: ${(err as Error).message}`)
}

// 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}`)
}

throw new Error(`Command '${cmd}' not found as executable or Windows built-in command`)
}

Expand Down