Skip to content

fix(chat): Fix unwanted destructive warning for the commands which not in the destructive commands list #7103

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
wants to merge 4 commits into
base: feature/agentic-chat
Choose a base branch
from
Open

fix(chat): Fix unwanted destructive warning for the commands which not in the destructive commands list #7103

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f52b16a
remove destructive warning for the commands not in the list
Randall-Jiang Apr 18, 2025
2781764
change the test case
Randall-Jiang Apr 18, 2025
0dc4ce8
fix the test fail
Randall-Jiang Apr 18, 2025
0997a16
add test for cmd outside workspace
Randall-Jiang Apr 18, 2025
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: 7 additions & 4 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 @@ -189,24 +189,24 @@ export class ExecuteBash {
if (cmdArgs.length === 0) {
return { requiresAcceptance: true }
}

let hasOutsideWorkspacePath = false
// For each command, validate arguments for path safety within workspace
for (const arg of cmdArgs) {
if (this.looksLikePath(arg)) {
// If not absolute, resolve using workingDirectory if available.
let fullPath = arg
if (!path.isAbsolute(arg) && this.workingDirectory) {
fullPath = path.join(this.workingDirectory, arg)
}
const workspaceFolders = vscode.workspace.workspaceFolders
if (!workspaceFolders || workspaceFolders.length === 0) {
return { requiresAcceptance: true, warning: destructiveCommandWarningMessage }
hasOutsideWorkspacePath = true
continue
}
const isInWorkspace = workspaceFolders.some((folder) =>
isInDirectory(folder.uri.fsPath, fullPath)
)
if (!isInWorkspace) {
return { requiresAcceptance: true, warning: destructiveCommandWarningMessage }
hasOutsideWorkspacePath = true
}
}
}
Expand All @@ -220,6 +220,9 @@ export class ExecuteBash {
case CommandCategory.Mutate:
return { requiresAcceptance: true, warning: mutateCommandWarningMessage }
case CommandCategory.ReadOnly:
if (hasOutsideWorkspacePath) {
return { requiresAcceptance: true }
}
continue
default:
return { requiresAcceptance: true }
Expand Down