Skip to content

feat(chat): Split commands by additonal operators #6908

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

Merged
zixlin7 merged 1 commit into from
Apr 2, 2025
Merged

feat(chat): Split commands by additonal operators #6908

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
14 changes: 8 additions & 6 deletions packages/core/src/codewhispererChat/tools/executeBash.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ export enum CommandCategory {
Destructive,
}

export const dangerousPatterns = new Set(['<(', '$(', '`', '>', '&&', '||'])
export const dangerousPatterns = new Set(['<(', '$(', '`'])
export const splitOperators = new Set(['|', '&&', '||', '>'])
export const splitOperatorsArray = Array.from(splitOperators)
export const commandCategories = new Map<string, CommandCategory>([
// ReadOnly commands
['ls', CommandCategory.ReadOnly],
Expand Down Expand Up @@ -163,17 +165,17 @@ export class ExecuteBash {
return { requiresAcceptance: true }
}

// Split commands by pipe and process each segment
// Split commands by operators and process each segment
let currentCmd: string[] = []
const allCommands: string[][] = []

for (const arg of args) {
if (arg === '|') {
if (splitOperators.has(arg)) {
if (currentCmd.length > 0) {
allCommands.push(currentCmd)
}
currentCmd = []
} else if (arg.includes('|')) {
} else if (splitOperatorsArray.some((op) => arg.includes(op))) {
return { requiresAcceptance: true }
} else {
currentCmd.push(arg)
Expand Down Expand Up @@ -208,12 +210,12 @@ export class ExecuteBash {
) {
return { requiresAcceptance: true, warning: highRiskCommandWarningMessage }
}
return { requiresAcceptance: false }
continue
default:
return { requiresAcceptance: true, warning: highRiskCommandWarningMessage }
}
}
return { requiresAcceptance: true }
return { requiresAcceptance: false }
} catch (error) {
this.logger.warn(`Error while checking acceptance: ${(error as Error).message}`)
return { requiresAcceptance: true }
Expand Down
7 changes: 6 additions & 1 deletion packages/core/src/test/codewhispererChat/tools/executeBash.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import { strict as assert } from 'assert'
import sinon from 'sinon'
import { ExecuteBash } from '../../../codewhispererChat/tools/executeBash'
import { destructiveCommandWarningMessage, ExecuteBash } from '../../../codewhispererChat/tools/executeBash'
import { ChildProcess } from '../../../shared/utilities/processUtils'

describe('ExecuteBash Tool', () => {
Expand Down Expand Up @@ -46,6 +46,11 @@ describe('ExecuteBash Tool', () => {
const execBash = new ExecuteBash({ command: 'ls && rm -rf /' })
const needsAcceptance = execBash.requiresAcceptance().requiresAcceptance
assert.equal(needsAcceptance, true, 'Should require acceptance for dangerous pattern')
assert.equal(
execBash.requiresAcceptance().warning,
destructiveCommandWarningMessage,
'Warning message should match the destructiveCommandWarningMessage'
)
})

it('set requiresAcceptance=false if it is a read-only command', () => {
Expand Down
Loading