feat: add custom denial messages for auto-denied commands #8704
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -36,7 +36,7 @@ type AutoApproveSettingsProps = HTMLAttributes<HTMLDivElement> & { | |||||
| allowedCommands?: string[] | ||||||
| allowedMaxRequests?: number | undefined | ||||||
| allowedMaxCost?: number | undefined | ||||||
| deniedCommands?: string[] | { command: string; message?: string }[] | ||||||
| setCachedStateField: SetCachedStateField< | ||||||
| | "alwaysAllowReadOnly" | ||||||
| | "alwaysAllowReadOnlyOutsideWorkspace" | ||||||
|
|
@@ -86,6 +86,7 @@ export const AutoApproveSettings = ({ | |||||
| const { t } = useAppTranslation() | ||||||
| const [commandInput, setCommandInput] = useState("") | ||||||
| const [deniedCommandInput, setDeniedCommandInput] = useState("") | ||||||
| const [deniedMessageInput, setDeniedMessageInput] = useState("") | ||||||
| const { autoApprovalEnabled, setAutoApprovalEnabled } = useExtensionState() | ||||||
|
|
||||||
| const toggles = useAutoApprovalToggles() | ||||||
|
|
@@ -106,10 +107,20 @@ export const AutoApproveSettings = ({ | |||||
| const handleAddDeniedCommand = () => { | ||||||
| const currentCommands = deniedCommands ?? [] | ||||||
|
|
||||||
| // Normalize to always work with objects | ||||||
| const normalizedCommands = currentCommands.map((cmd) => (typeof cmd === "string" ? { command: cmd } : cmd)) | ||||||
|
|
||||||
| // Check if command already exists | ||||||
| const exists = normalizedCommands.some((item) => item.command === deniedCommandInput) | ||||||
|
|
||||||
| if (deniedCommandInput && !exists) { | ||||||
| const newCommand = deniedMessageInput.trim() | ||||||
| ? { command: deniedCommandInput, message: deniedMessageInput.trim() } | ||||||
| : { command: deniedCommandInput } | ||||||
| const newCommands = [...normalizedCommands, newCommand] | ||||||
| setCachedStateField("deniedCommands", newCommands) | ||||||
| setDeniedCommandInput("") | ||||||
| setDeniedMessageInput("") | ||||||
| vscode.postMessage({ type: "deniedCommands", commands: newCommands }) | ||||||
| } | ||||||
| } | ||||||
|
|
@@ -361,45 +372,84 @@ export const AutoApproveSettings = ({ | |||||
| </div> | ||||||
| </div> | ||||||
|
|
||||||
| <div className="space-y-2"> | ||||||
| <div className="flex gap-2"> | ||||||
| <Input | ||||||
| value={deniedCommandInput} | ||||||
| onChange={(e: any) => setDeniedCommandInput(e.target.value)} | ||||||
| onKeyDown={(e: any) => { | ||||||
|
There was a problem hiding this comment. Consider using proper event types instead of
Suggested change
|
||||||
| if (e.key === "Enter" && !e.shiftKey) { | ||||||
| e.preventDefault() | ||||||
| handleAddDeniedCommand() | ||||||
| } | ||||||
| }} | ||||||
| placeholder={t("settings:autoApprove.execute.deniedCommandPlaceholder")} | ||||||
| className="grow" | ||||||
| data-testid="denied-command-input" | ||||||
| /> | ||||||
| <Button | ||||||
| className="h-8" | ||||||
| onClick={handleAddDeniedCommand} | ||||||
| data-testid="add-denied-command-button"> | ||||||
| {t("settings:autoApprove.execute.addButton")} | ||||||
| </Button> | ||||||
| </div> | ||||||
| <Input | ||||||
| value={deniedMessageInput} | ||||||
| onChange={(e: any) => setDeniedMessageInput(e.target.value)} | ||||||
| onKeyDown={(e: any) => { | ||||||
| if (e.key === "Enter" && !e.shiftKey) { | ||||||
| e.preventDefault() | ||||||
| handleAddDeniedCommand() | ||||||
| } | ||||||
| }} | ||||||
| placeholder={t("settings:autoApprove.execute.customMessagePlaceholder", { | ||||||
| defaultValue: "Custom message (optional, e.g., 'Use uv run python instead')", | ||||||
|
There was a problem hiding this comment. Remove the inline fallback English string (
Suggested change
This comment was generated because it violated a code review rule: irule_C0ez7Rji6ANcGkkX. |
||||||
| })} | ||||||
| className="w-full text-sm" | ||||||
| data-testid="denied-message-input" | ||||||
| /> | ||||||
| </div> | ||||||
|
|
||||||
| <div className="flex flex-col gap-2"> | ||||||
| {(deniedCommands ?? []).map((cmd, index) => { | ||||||
| const commandStr = typeof cmd === "string" ? cmd : cmd.command | ||||||
| const messageStr = typeof cmd === "string" ? null : cmd.message | ||||||
|
|
||||||
| return ( | ||||||
| <div | ||||||
| key={index} | ||||||
| className="flex flex-col gap-1 p-2 rounded border border-vscode-panel-border bg-vscode-editor-background"> | ||||||
| <div className="flex items-center justify-between"> | ||||||
| <code className="text-sm">{commandStr}</code> | ||||||
| <Button | ||||||
| variant="ghost" | ||||||
| size="sm" | ||||||
| data-testid={`remove-denied-command-${index}`} | ||||||
| onClick={() => { | ||||||
| const newCommands = (deniedCommands ?? []).filter( | ||||||
| (_, i) => i !== index, | ||||||
| ) | ||||||
| setCachedStateField("deniedCommands", newCommands) | ||||||
| vscode.postMessage({ | ||||||
| type: "deniedCommands", | ||||||
| commands: newCommands, | ||||||
| }) | ||||||
| }}> | ||||||
| <X className="h-4 w-4" /> | ||||||
| </Button> | ||||||
| </div> | ||||||
| {messageStr && ( | ||||||
| <div className="text-xs text-vscode-descriptionForeground mt-1"> | ||||||
| {t("settings:autoApprove.execute.customMessage", { | ||||||
| defaultValue: "Custom message:", | ||||||
| })}{" "} | ||||||
| {messageStr} | ||||||
| </div> | ||||||
| )} | ||||||
| </div> | ||||||
| ) | ||||||
| })} | ||||||
| </div> | ||||||
| </div> | ||||||
| )} | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The type checking logic assumes that if the first element is an object, all elements are objects (line 1688). This is unsafe for arrays with mixed types. If
globalStateCommandscontains a mix like["cmd1", {command: "cmd2"}], this code would incorrectly cast the entire array as objects, causing runtime errors when accessing.commandon string elements. While the zod schema should prevent mixed arrays, defensive coding would handle this gracefully. Consider checking each element individually or usingArray.every()to verify all elements match the expected type before casting.