feat: Add 'Add & Run' button to command approval UI

src/core/assistant-message/presentAssistantMessage.ts

@@ -271,7 +271,14 @@ export async function presentAssistantMessage(cline: Task) {
 					isProtected || false,
 				)
 
-				if (response !== "yesButtonClicked") {
+				if (response === "yesButtonClicked" || response === "addAndRunButtonClicked") {
+					// Handle yesButtonClicked or addAndRunButtonClicked with text.
+					if (text) {
+						await cline.say("user_feedback", text, images)
+						pushToolResult(formatResponse.toolResult(formatResponse.toolApprovedWithFeedback(text), images))
+					}
+					return true
+				} else {
 					// Handle both messageResponse and noButtonClicked with text.
 					if (text) {
 						await cline.say("user_feedback", text, images)
@@ -282,14 +289,6 @@ export async function presentAssistantMessage(cline: Task) {
 					cline.didRejectTool = true
 					return false
 				}
-
-				// Handle yesButtonClicked with text.
-				if (text) {
-					await cline.say("user_feedback", text, images)
-					pushToolResult(formatResponse.toolResult(formatResponse.toolApprovedWithFeedback(text), images))
-				}
-
-				return true
 			}
 
 			const askFinishSubTaskApproval = async () => {

src/core/tools/executeCommandTool.ts

@@ -14,9 +14,41 @@ import { unescapeHtmlEntities } from "../../utils/text-normalization"
 import { ExitCodeDetails, RooTerminalCallbacks, RooTerminalProcess } from "../../integrations/terminal/types"
 import { TerminalRegistry } from "../../integrations/terminal/TerminalRegistry"
 import { Terminal } from "../../integrations/terminal/Terminal"
+import { t } from "../../i18n"
+import { extractCommandPattern } from "../../shared/extract-command-pattern"
 
 class ShellIntegrationError extends Error {}
 
+/**
+ * Adds a command pattern to the whitelist
+ */
+async function addCommandToWhitelist(cline: Task, command: string): Promise<void> {
+	const clineProvider = cline.providerRef.deref()
+	if (!clineProvider) {
+		console.error("Provider reference is undefined, cannot add command to whitelist")
+		return
+	}
+
+	const state = await clineProvider.getState()
+	const currentCommands = state.allowedCommands ?? []
+
+	// Extract the base command pattern for whitelisting
+	const commandPattern = extractCommandPattern(command)
+
+	// Add command pattern to whitelist if not already present
+	if (commandPattern && !currentCommands.includes(commandPattern)) {
+		const newCommands = [...currentCommands, commandPattern]
+		await clineProvider.setValue("allowedCommands", newCommands)
+
+		// Notify webview of the updated commands
+		await clineProvider.postMessageToWebview({
+			type: "invoke",
+			invoke: "setChatBoxMessage",
+			text: t("tools:executeCommand.patternAddedToWhitelist", { pattern: commandPattern }),
+		})
+	}
+}
+
 export async function executeCommandTool(
 	cline: Task,
 	block: ToolUse,
@@ -51,9 +83,32 @@ export async function executeCommandTool(
 			cline.consecutiveMistakeCount = 0
 
 			command = unescapeHtmlEntities(command) // Unescape HTML entities.
-			const didApprove = await askApproval("command", command)
 
-			if (!didApprove) {
+			// We need to capture the actual response to check if "Add & Run" was clicked
+			// Note: We cannot use the provided askApproval function here because we need to
+			// differentiate between "yesButtonClicked" and "addAndRunButtonClicked" responses
+			const { response, text, images } = await cline.ask("command", command)
+
+			if (response === "yesButtonClicked" || response === "addAndRunButtonClicked") {
+				// Handle yesButtonClicked or addAndRunButtonClicked with text (following askApproval pattern)
+				if (text) {
+					await cline.say("user_feedback", text, images)
+					pushToolResult(formatResponse.toolResult(formatResponse.toolApprovedWithFeedback(text), images))
+				}
+
+				// Check if user selected "Add & Run" to add command to whitelist
+				if (response === "addAndRunButtonClicked") {
+					await addCommandToWhitelist(cline, command)
+				}
+			} else {
+				// Handle both messageResponse and noButtonClicked with text (following askApproval pattern)
+				if (text) {
+					await cline.say("user_feedback", text, images)
+					pushToolResult(formatResponse.toolResult(formatResponse.toolDeniedWithFeedback(text), images))
+				} else {
+					pushToolResult(formatResponse.toolDenied())
+				}
+				cline.didRejectTool = true
 				return
 			}
 

src/i18n/locales/ca/tools.json

@@ -12,5 +12,8 @@
 		"errors": {
 			"policy_restriction": "No s'ha pogut crear una nova tasca a causa de restriccions de política."
 		}
+	},
+	"executeCommand": {
+		"patternAddedToWhitelist": "Command pattern \"{{pattern}}\" has been added to the allowed commands list."
 	}
 }

src/i18n/locales/de/tools.json

@@ -12,5 +12,8 @@
 		"errors": {
 			"policy_restriction": "Neue Aufgabe konnte aufgrund von Richtlinienbeschränkungen nicht erstellt werden."
 		}
+	},
+	"executeCommand": {
+		"patternAddedToWhitelist": "Command pattern \"{{pattern}}\" has been added to the allowed commands list."
 	}
 }

src/i18n/locales/en/tools.json

@@ -12,5 +12,8 @@
 		"errors": {
 			"policy_restriction": "Failed to create new task due to policy restrictions."
 		}
+	},
+	"executeCommand": {
+		"patternAddedToWhitelist": "Command pattern '{{pattern}}' added to whitelist"
 	}
 }

src/i18n/locales/es/tools.json

@@ -12,5 +12,8 @@
 		"errors": {
 			"policy_restriction": "No se pudo crear una nueva tarea debido a restricciones de política."
 		}
+	},
+	"executeCommand": {
+		"patternAddedToWhitelist": "Command pattern \"{{pattern}}\" has been added to the allowed commands list."
 	}
 }

src/i18n/locales/fr/tools.json

@@ -12,5 +12,8 @@
 		"errors": {
 			"policy_restriction": "Impossible de créer une nouvelle tâche en raison de restrictions de politique."
 		}
+	},
+	"executeCommand": {
+		"patternAddedToWhitelist": "Command pattern \"{{pattern}}\" has been added to the allowed commands list."
 	}
 }

src/i18n/locales/hi/tools.json

@@ -12,5 +12,8 @@
 		"errors": {
 			"policy_restriction": "नीति प्रतिबंधों के कारण नया कार्य बनाने में विफल।"
 		}
+	},
+	"executeCommand": {
+		"patternAddedToWhitelist": "Command pattern \"{{pattern}}\" has been added to the allowed commands list."
 	}
 }

src/i18n/locales/id/tools.json

@@ -15,5 +15,8 @@
 		"errors": {
 			"policy_restriction": "Gagal membuat tugas baru karena pembatasan kebijakan."
 		}
+	},
+	"executeCommand": {
+		"patternAddedToWhitelist": "Command pattern \"{{pattern}}\" has been added to the allowed commands list."
 	}
 }

src/i18n/locales/it/tools.json

@@ -12,5 +12,8 @@
 		"errors": {
 			"policy_restriction": "Impossibile creare una nuova attività a causa di restrizioni di policy."
 		}
+	},
+	"executeCommand": {
+		"patternAddedToWhitelist": "Command pattern \"{{pattern}}\" has been added to the allowed commands list."
 	}
 }

src/i18n/locales/ja/tools.json

@@ -12,5 +12,8 @@
 		"errors": {
 			"policy_restriction": "ポリシー制限により新しいタスクを作成できませんでした。"
 		}
+	},
+	"executeCommand": {
+		"patternAddedToWhitelist": "Command pattern \"{{pattern}}\" has been added to the allowed commands list."
 	}
 }

src/i18n/locales/ko/tools.json

@@ -12,5 +12,8 @@
 		"errors": {
 			"policy_restriction": "정책 제한으로 인해 새 작업을 생성하지 못했습니다."
 		}
+	},
+	"executeCommand": {
+		"patternAddedToWhitelist": "Command pattern \"{{pattern}}\" has been added to the allowed commands list."
 	}
 }

src/i18n/locales/nl/tools.json

@@ -12,5 +12,8 @@
 		"errors": {
 			"policy_restriction": "Kan geen nieuwe taak aanmaken vanwege beleidsbeperkingen."
 		}
+	},
+	"executeCommand": {
+		"patternAddedToWhitelist": "Command pattern \"{{pattern}}\" has been added to the allowed commands list."
 	}
 }

src/i18n/locales/pl/tools.json

@@ -12,5 +12,8 @@
 		"errors": {
 			"policy_restriction": "Nie udało się utworzyć nowego zadania z powodu ograniczeń polityki."
 		}
+	},
+	"executeCommand": {
+		"patternAddedToWhitelist": "Command pattern \"{{pattern}}\" has been added to the allowed commands list."
 	}
 }

src/i18n/locales/pt-BR/tools.json

@@ -12,5 +12,8 @@
 		"errors": {
 			"policy_restriction": "Falha ao criar nova tarefa devido a restrições de política."
 		}
+	},
+	"executeCommand": {
+		"patternAddedToWhitelist": "Command pattern \"{{pattern}}\" has been added to the allowed commands list."
 	}
 }

src/i18n/locales/ru/tools.json

@@ -12,5 +12,8 @@
 		"errors": {
 			"policy_restriction": "Не удалось создать новую задачу из-за ограничений политики."
 		}
+	},
+	"executeCommand": {
+		"patternAddedToWhitelist": "Command pattern \"{{pattern}}\" has been added to the allowed commands list."
 	}
 }

src/i18n/locales/tr/tools.json

@@ -12,5 +12,8 @@
 		"errors": {
 			"policy_restriction": "Politika kısıtlamaları nedeniyle yeni görev oluşturulamadı."
 		}
+	},
+	"executeCommand": {
+		"patternAddedToWhitelist": "Command pattern \"{{pattern}}\" has been added to the allowed commands list."
 	}
 }

src/i18n/locales/vi/tools.json

@@ -12,5 +12,8 @@
 		"errors": {
 			"policy_restriction": "Không thể tạo nhiệm vụ mới do hạn chế chính sách."
 		}
+	},
+	"executeCommand": {
+		"patternAddedToWhitelist": "Command pattern \"{{pattern}}\" has been added to the allowed commands list."
 	}
 }

src/i18n/locales/zh-CN/tools.json

@@ -12,5 +12,8 @@
 		"errors": {
 			"policy_restriction": "由于策略限制，无法创建新任务。"
 		}
+	},
+	"executeCommand": {
+		"patternAddedToWhitelist": "Command pattern \"{{pattern}}\" has been added to the allowed commands list."
 	}
 }

src/i18n/locales/zh-TW/tools.json

@@ -12,5 +12,8 @@
 		"errors": {
 			"policy_restriction": "由於政策限制，無法建立新工作。"
 		}
+	},
+	"executeCommand": {
+		"patternAddedToWhitelist": "Command pattern \"{{pattern}}\" has been added to the allowed commands list."
 	}
 }

src/package.json

@@ -407,6 +407,7 @@
 		"sanitize-filename": "^1.6.3",
 		"say": "^0.16.0",
 		"serialize-error": "^12.0.0",
+		"shell-quote": "1.8.3",
 		"simple-git": "^3.27.0",
 		"sound-play": "^1.1.0",
 		"stream-json": "^1.8.0",
@@ -439,6 +440,7 @@
 		"@types/node-ipc": "^9.2.3",
 		"@types/proper-lockfile": "^4.1.4",
 		"@types/ps-tree": "^1.1.6",
+		"@types/shell-quote": "^1.7.5",
 		"@types/stream-json": "^1.7.8",
 		"@types/string-similarity": "^4.0.2",
 		"@types/tmp": "^0.2.6",

src/shared/ExtensionMessage.ts

@@ -112,7 +112,13 @@ export interface ExtensionMessage {
 		| "didBecomeVisible"
 		| "focusInput"
 		| "switchTab"
-	invoke?: "newChat" | "sendMessage" | "primaryButtonClick" | "secondaryButtonClick" | "setChatBoxMessage"
+	invoke?:
+		| "newChat"
+		| "sendMessage"
+		| "primaryButtonClick"
+		| "secondaryButtonClick"
+		| "tertiaryButtonClick"
+		| "setChatBoxMessage"
 	state?: ExtensionState
 	images?: string[]
 	filePaths?: string[]

src/shared/WebviewMessage.ts

@@ -12,7 +12,12 @@ import { marketplaceItemSchema } from "@roo-code/types"
 
 import { Mode } from "./modes"
 
-export type ClineAskResponse = "yesButtonClicked" | "noButtonClicked" | "messageResponse" | "objectResponse"
+export type ClineAskResponse =
+	| "yesButtonClicked"
+	| "noButtonClicked"
+	| "addAndRunButtonClicked"
+	| "messageResponse"
+	| "objectResponse"
 
 export type PromptMode = Mode | "enhance"