feat: Add in-dialog command whitelisting with LLM suggestions (#5480)

packages/types/src/global-settings.ts

@@ -48,6 +48,7 @@ export const globalSettingsSchema = z.object({
 	alwaysAllowFollowupQuestions: z.boolean().optional(),
 	followupAutoApproveTimeoutMs: z.number().optional(),
 	alwaysAllowUpdateTodoList: z.boolean().optional(),
+	disableLlmCommandSuggestions: z.boolean().optional(),
 	allowedCommands: z.array(z.string()).optional(),
 	deniedCommands: z.array(z.string()).optional(),
 	allowedMaxRequests: z.number().nullish(),

pr_fix_implementation_summary.md

@@ -0,0 +1,77 @@
+# PR #5491 Fix Implementation Summary
+
+## Overview
+
+Implemented a feature flag to disable LLM-based command suggestions in response to reviewer feedback about avoiding reliance on LLMs for command whitelist suggestions.
+
+## Changes Made
+
+### 1. Configuration Setting Added
+
+- **File**: `src/package.json`
+- Added new setting: `roo-cline.disableLlmCommandSuggestions`
+- Type: boolean, default: false
+- Description: "Disable LLM-generated command suggestions and use only programmatic pattern generation"
+
+### 2. Localization
+
+- **File**: `src/package.nls.json`
+- Added description for the new setting
+
+### 3. Tool Prompt Conditional Logic
+
+- **File**: `src/core/prompts/tools/execute-command.ts`
+- Modified `getExecuteCommandDescription` to conditionally include suggestions section
+- When `disableLlmCommandSuggestions` is true, the suggestions parameter is omitted from the tool description
+
+### 4. Tool Implementation Update
+
+- **File**: `src/core/tools/executeCommandTool.ts`
+- Added check for `disableLlmCommandSuggestions` setting
+- When enabled, suggestions from LLM are ignored even if provided
+
+### 5. Settings Propagation
+
+- **File**: `src/core/task/Task.ts`
+- Updated to pass the `disableLlmCommandSuggestions` setting through the system prompt generation
+
+### 6. Test Coverage
+
+- **File**: `src/core/tools/__tests__/executeCommandTool.spec.ts`
+- Added comprehensive test suite for the new setting
+- Tests verify suggestions are ignored when setting is enabled
+- Tests verify suggestions work normally when setting is disabled or not set
+
+- **File**: `src/core/prompts/tools/__tests__/execute-command.spec.ts`
+- Added tests for conditional prompt generation
+- Verifies suggestions section is excluded when setting is enabled
+
+## How It Works
+
+1. **When `disableLlmCommandSuggestions` is false (default)**:
+
+    - LLM receives instructions to provide command suggestions
+    - Tool processes suggestions and shows them to the user
+    - Existing behavior is preserved
+
+2. **When `disableLlmCommandSuggestions` is true**:
+    - LLM does not receive instructions about suggestions
+    - Even if LLM provides suggestions, they are ignored
+    - Falls back to programmatic pattern generation only
+
+## Benefits
+
+1. **Addresses Reviewer Concern**: Removes reliance on LLM for command suggestions when desired
+2. **Backward Compatible**: Default behavior unchanged, existing users unaffected
+3. **User Control**: Users can choose between LLM suggestions or deterministic patterns
+4. **Token Savings**: When enabled, reduces token usage by not including suggestion instructions
+5. **Deterministic Behavior**: Provides predictable command pattern generation when needed
+
+## Testing
+
+All tests pass:
+
+- Execute command tool tests: 23 passed
+- Execute command prompt tests: 4 passed
+
+The implementation is complete and ready for review.

src/core/prompts/tools/__tests__/execute-command.spec.ts

@@ -0,0 +1,75 @@
+import { describe, it, expect } from "vitest"
+import { getExecuteCommandDescription } from "../execute-command"
+import { ToolArgs } from "../types"
+
+describe("getExecuteCommandDescription", () => {
+	const baseArgs: ToolArgs = {
+		cwd: "/test/path",
+		supportsComputerUse: false,
+	}
+
+	it("should include suggestions section when disableLlmCommandSuggestions is false", () => {
+		const args: ToolArgs = {
+			...baseArgs,
+			settings: {
+				disableLlmCommandSuggestions: false,
+			},
+		}
+
+		const description = getExecuteCommandDescription(args)
+
+		// Check that the description includes the suggestions parameter
+		expect(description).toContain("<suggestions>")
+		expect(description).toContain("- suggestions: (optional) Command patterns for the user to allow/deny")
+		expect(description).toContain("Suggestion Guidelines")
+		// Check for chained command guidance
+		expect(description).toContain("For chained commands")
+		expect(description).toContain("cd backend && npm install")
+	})
+
+	it("should include suggestions section when disableLlmCommandSuggestions is not set", () => {
+		const args: ToolArgs = {
+			...baseArgs,
+			settings: {},
+		}
+
+		const description = getExecuteCommandDescription(args)
+
+		// Check that the description includes the suggestions parameter
+		expect(description).toContain("<suggestions>")
+		expect(description).toContain("- suggestions: (optional) Command patterns for the user to allow/deny")
+		expect(description).toContain("Suggestion Guidelines")
+	})
+
+	it("should exclude suggestions section when disableLlmCommandSuggestions is true", () => {
+		const args: ToolArgs = {
+			...baseArgs,
+			settings: {
+				disableLlmCommandSuggestions: true,
+			},
+		}
+
+		const description = getExecuteCommandDescription(args)
+
+		// Check that the description does NOT include the suggestions parameter
+		expect(description).not.toContain("<suggestions>")
+		expect(description).not.toContain("- suggestions: (optional) Command patterns for the user to allow/deny")
+		expect(description).not.toContain("Suggestion Guidelines")
+	})
+
+	it("should include basic command and cwd parameters regardless of settings", () => {
+		const args: ToolArgs = {
+			...baseArgs,
+			settings: {
+				disableLlmCommandSuggestions: true,
+			},
+		}
+
+		const description = getExecuteCommandDescription(args)
+
+		// Check that basic parameters are always included
+		expect(description).toContain("- command: (required)")
+		expect(description).toContain("- cwd: (optional)")
+		expect(description).toContain("execute_command")
+	})
+})

src/core/prompts/tools/execute-command.ts

@@ -1,11 +1,20 @@
 import { ToolArgs } from "./types"
 
 export function getExecuteCommandDescription(args: ToolArgs): string | undefined {
-	return `## execute_command
+	const disableLlmSuggestions = args.settings?.disableLlmCommandSuggestions ?? false
+
+	const baseDescription = `## execute_command
 Description: Request to execute a CLI command on the system. Use this when you need to perform system operations or run specific commands to accomplish any step in the user's task. You must tailor your command to the user's system and provide a clear explanation of what the command does. For command chaining, use the appropriate chaining syntax for the user's shell. Prefer to execute complex CLI commands over creating executable scripts, as they are more flexible and easier to run. Prefer relative commands and paths that avoid location sensitivity for terminal consistency, e.g: \`touch ./testdata/example.file\`, \`dir ./examples/model1/data/yaml\`, or \`go test ./cmd/front --config ./cmd/front/config.yml\`. If directed by the user, you may open a terminal in a different directory by using the \`cwd\` parameter.
+
 Parameters:
 - command: (required) The CLI command to execute. This should be valid for the current operating system. Ensure the command is properly formatted and does not contain any harmful instructions.
-- cwd: (optional) The working directory to execute the command in (default: ${args.cwd})
+- cwd: (optional) The working directory to execute the command in (default: ${args.cwd})`
+
+	if (disableLlmSuggestions) {
+		return (
+			baseDescription +
+			`
+
 Usage:
 <execute_command>
 <command>Your command here</command>
@@ -17,9 +26,64 @@ Example: Requesting to execute npm run dev
 <command>npm run dev</command>
 </execute_command>
 
-Example: Requesting to execute ls in a specific directory if directed
+Example: Requesting to execute ls in a specific directory
+<execute_command>
+<command>ls -la</command>
+<cwd>/home/user/projects</cwd>
+</execute_command>`
+		)
+	}
+
+	return (
+		baseDescription +
+		`
+- suggestions: (optional) Command patterns for the user to allow/deny for future auto-approval. Use <suggest> tags.
+
+**Suggestion Guidelines:**
+- Suggestions use prefix matching (case-insensitive)
+- For simple commands: Include the base command (e.g., "npm", "git") and optionally a more specific pattern
+- For chained commands (using &&, ||, ;, |): Include patterns for EACH individual command in the chain
+  - Example: For "cd backend && npm install", suggest: "cd backend && npm install", "cd", "npm install", "npm"
+- Include 2-4 relevant patterns total
+- Only suggest "*" (allow all) if explicitly requested by the user
+
+Usage:
+<execute_command>
+<command>Your command here</command>
+<cwd>Working directory path (optional)</cwd>
+<suggestions>
+<suggest>pattern 1</suggest>
+<suggest>pattern 2</suggest>
+</suggestions>
+</execute_command>
+
+Example: Requesting to execute npm run dev
+<execute_command>
+<command>npm run dev</command>
+<suggestions>
+<suggest>npm run</suggest>
+<suggest>npm</suggest>
+</suggestions>
+</execute_command>
+
+Example: Requesting to execute a chained command
+<execute_command>
+<command>cd backend && npm install</command>
+<suggestions>
+<suggest>cd backend && npm install</suggest>
+<suggest>cd</suggest>
+<suggest>npm install</suggest>
+<suggest>npm</suggest>
+</suggestions>
+</execute_command>
+
+Example: Requesting to execute ls in a specific directory
 <execute_command>
 <command>ls -la</command>
 <cwd>/home/user/projects</cwd>
+<suggestions>
+<suggest>ls</suggest>
+</suggestions>
 </execute_command>`
+	)
 }

src/core/task/Task.ts

@@ -2,6 +2,7 @@ import * as path from "path"
 import os from "os"
 import crypto from "crypto"
 import EventEmitter from "events"
+import * as vscode from "vscode"
 
 import { Anthropic } from "@anthropic-ai/sdk"
 import delay from "delay"
@@ -1648,6 +1649,7 @@ export class Task extends EventEmitter<ClineEvents> {
 				maxReadFileLine !== -1,
 				{
 					maxConcurrentFileReads,
+					disableLlmCommandSuggestions: state?.disableLlmCommandSuggestions ?? false,
 				},
 			)
 		})()