split autoapprove subtask settings into two (create and complete)

Author: Cdddo

e2e/src/suite/subtasks.test.ts

@@ -20,7 +20,8 @@ suite("Roo Code Subtasks", () => {
 		await api.setConfiguration({
 			mode: "ask",
 			alwaysAllowModeSwitch: true,
-			alwaysAllowSubtasks: true,
+			alwaysAllowSubtaskCreation: true,
+			alwaysAllowSubtaskCompletion: true,
 			autoApprovalEnabled: true,
 			enableCheckpoints: false,
 		})

evals/packages/types/src/roo-code-defaults.ts

@@ -34,7 +34,8 @@ export const rooCodeDefaults: RooCodeSettings = {
 	requestDelaySeconds: 5,
 	alwaysAllowMcp: true,
 	alwaysAllowModeSwitch: true,
-	alwaysAllowSubtasks: true,
+	alwaysAllowSubtaskCreation: true,
+	alwaysAllowSubtaskCompletion: true,
 	alwaysAllowExecute: true,
 	allowedCommands: ["*"],
 

evals/packages/types/src/roo-code.ts

@@ -492,7 +492,8 @@ export const globalSettingsSchema = z.object({
 	requestDelaySeconds: z.number().optional(),
 	alwaysAllowMcp: z.boolean().optional(),
 	alwaysAllowModeSwitch: z.boolean().optional(),
-	alwaysAllowSubtasks: z.boolean().optional(),
+	alwaysAllowSubtaskCreation: z.boolean().optional(),
+	alwaysAllowSubtaskCompletion: z.boolean().optional(),
 	alwaysAllowExecute: z.boolean().optional(),
 	allowedCommands: z.array(z.string()).optional(),
 
@@ -561,7 +562,8 @@ const globalSettingsRecord: GlobalSettingsRecord = {
 	requestDelaySeconds: undefined,
 	alwaysAllowMcp: undefined,
 	alwaysAllowModeSwitch: undefined,
-	alwaysAllowSubtasks: undefined,
+	alwaysAllowSubtaskCreation: undefined,
+	alwaysAllowSubtaskCompletion: undefined,
 	alwaysAllowExecute: undefined,
 	allowedCommands: undefined,
 

src/core/webview/ClineProvider.ts

@@ -1180,7 +1180,8 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			alwaysAllowBrowser,
 			alwaysAllowMcp,
 			alwaysAllowModeSwitch,
-			alwaysAllowSubtasks,
+			alwaysAllowSubtaskCreation,
+			alwaysAllowSubtaskCompletion,
 			soundEnabled,
 			ttsEnabled,
 			ttsSpeed,
@@ -1237,7 +1238,8 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			alwaysAllowBrowser: alwaysAllowBrowser ?? false,
 			alwaysAllowMcp: alwaysAllowMcp ?? false,
 			alwaysAllowModeSwitch: alwaysAllowModeSwitch ?? false,
-			alwaysAllowSubtasks: alwaysAllowSubtasks ?? false,
+			alwaysAllowSubtaskCreation: alwaysAllowSubtaskCreation ?? false,
+			alwaysAllowSubtaskCompletion: alwaysAllowSubtaskCompletion ?? false,
 			uriScheme: vscode.env.uriScheme,
 			currentTaskItem: this.getCurrentCline()?.taskId
 				? (taskHistory || []).find((item: HistoryItem) => item.id === this.getCurrentCline()?.taskId)
@@ -1330,7 +1332,8 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			alwaysAllowBrowser: stateValues.alwaysAllowBrowser ?? false,
 			alwaysAllowMcp: stateValues.alwaysAllowMcp ?? false,
 			alwaysAllowModeSwitch: stateValues.alwaysAllowModeSwitch ?? false,
-			alwaysAllowSubtasks: stateValues.alwaysAllowSubtasks ?? false,
+			alwaysAllowSubtaskCreation: stateValues.alwaysAllowSubtaskCreation ?? false,
+			alwaysAllowSubtaskCompletion: stateValues.alwaysAllowSubtaskCompletion ?? false,
 			taskHistory: stateValues.taskHistory,
 			allowedCommands: stateValues.allowedCommands,
 			soundEnabled: stateValues.soundEnabled ?? false,

src/core/webview/webviewMessageHandler.ts

@@ -281,8 +281,12 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 			await updateGlobalState("alwaysAllowModeSwitch", message.bool)
 			await provider.postStateToWebview()
 			break
-		case "alwaysAllowSubtasks":
-			await updateGlobalState("alwaysAllowSubtasks", message.bool)
+		case "alwaysAllowSubtaskCreation":
+			await updateGlobalState("alwaysAllowSubtaskCreation", message.bool)
+			await provider.postStateToWebview()
+			break
+		case "alwaysAllowSubtaskCompletion":
+			await updateGlobalState("alwaysAllowSubtaskCompletion", message.bool)
 			await provider.postStateToWebview()
 			break
 		case "askResponse":

src/exports/roo-code.d.ts

@@ -245,7 +245,8 @@ type GlobalSettings = {
 	requestDelaySeconds?: number | undefined
 	alwaysAllowMcp?: boolean | undefined
 	alwaysAllowModeSwitch?: boolean | undefined
-	alwaysAllowSubtasks?: boolean | undefined
+	alwaysAllowSubtaskCreation?: boolean | undefined
+	alwaysAllowSubtaskCompletion?: boolean | undefined
 	alwaysAllowExecute?: boolean | undefined
 	allowedCommands?: string[] | undefined
 	browserToolEnabled?: boolean | undefined

src/schemas/index.ts

@@ -506,7 +506,8 @@ export const globalSettingsSchema = z.object({
 	requestDelaySeconds: z.number().optional(),
 	alwaysAllowMcp: z.boolean().optional(),
 	alwaysAllowModeSwitch: z.boolean().optional(),
-	alwaysAllowSubtasks: z.boolean().optional(),
+	alwaysAllowSubtaskCreation: z.boolean().optional(),
+	alwaysAllowSubtaskCompletion: z.boolean().optional(),
 	alwaysAllowExecute: z.boolean().optional(),
 	allowedCommands: z.array(z.string()).optional(),
 
@@ -577,7 +578,8 @@ const globalSettingsRecord: GlobalSettingsRecord = {
 	requestDelaySeconds: undefined,
 	alwaysAllowMcp: undefined,
 	alwaysAllowModeSwitch: undefined,
-	alwaysAllowSubtasks: undefined,
+	alwaysAllowSubtaskCreation: undefined,
+	alwaysAllowSubtaskCompletion: undefined,
 	alwaysAllowExecute: undefined,
 	allowedCommands: undefined,
 

src/shared/ExtensionMessage.ts

@@ -133,7 +133,8 @@ export type ExtensionState = Pick<
 	// | "requestDelaySeconds" // Optional in GlobalSettings, required here.
 	| "alwaysAllowMcp"
 	| "alwaysAllowModeSwitch"
-	| "alwaysAllowSubtasks"
+	| "alwaysAllowSubtaskCreation"
+	| "alwaysAllowSubtaskCompletion"
 	| "alwaysAllowExecute"
 	| "allowedCommands"
 	| "browserToolEnabled"

src/shared/WebviewMessage.ts

@@ -54,7 +54,8 @@ export interface WebviewMessage {
 		| "alwaysAllowBrowser"
 		| "alwaysAllowMcp"
 		| "alwaysAllowModeSwitch"
-		| "alwaysAllowSubtasks"
+		| "alwaysAllowSubtaskCreation"
+		| "alwaysAllowSubtaskCompletion"
 		| "playSound"
 		| "playTts"
 		| "stopTts"

webview-ui/src/components/chat/AutoApproveMenu.tsx

@@ -33,8 +33,10 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => {
 		setAlwaysAllowMcp,
 		alwaysAllowModeSwitch,
 		setAlwaysAllowModeSwitch,
-		alwaysAllowSubtasks,
-		setAlwaysAllowSubtasks,
+		alwaysAllowSubtaskCreation,
+		setAlwaysAllowSubtaskCreation,
+		alwaysAllowSubtaskCompletion,
+		setAlwaysAllowSubtaskCompletion,
 		alwaysApproveResubmit,
 		setAlwaysApproveResubmit,
 		autoApprovalEnabled,
@@ -87,11 +89,18 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => {
 			description: t("chat:autoApprove.actions.switchModes.description"),
 		},
 		{
-			id: "subtasks",
-			label: t("chat:autoApprove.actions.subtasks.label"),
-			shortName: t("chat:autoApprove.actions.subtasks.shortName"),
-			enabled: alwaysAllowSubtasks ?? false,
-			description: t("chat:autoApprove.actions.subtasks.description"),
+			id: "subtaskCreation",
+			label: t("chat:autoApprove.actions.subtaskCreation.label"),
+			shortName: t("chat:autoApprove.actions.subtaskCreation.shortName"),
+			enabled: alwaysAllowSubtaskCreation ?? false,
+			description: t("chat:autoApprove.actions.subtaskCreation.description"),
+		},
+		{
+			id: "subtaskCompletion",
+			label: t("chat:autoApprove.actions.subtaskCompletion.label"),
+			shortName: t("chat:autoApprove.actions.subtaskCompletion.shortName"),
+			enabled: alwaysAllowSubtaskCompletion ?? false,
+			description: t("chat:autoApprove.actions.subtaskCompletion.description"),
 		},
 		{
 			id: "retryRequests",
@@ -148,11 +157,17 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => {
 		vscode.postMessage({ type: "alwaysAllowModeSwitch", bool: newValue })
 	}, [alwaysAllowModeSwitch, setAlwaysAllowModeSwitch])
 
-	const handleSubtasksChange = useCallback(() => {
-		const newValue = !(alwaysAllowSubtasks ?? false)
-		setAlwaysAllowSubtasks(newValue)
-		vscode.postMessage({ type: "alwaysAllowSubtasks", bool: newValue })
-	}, [alwaysAllowSubtasks, setAlwaysAllowSubtasks])
+	const handleSubtaskCreationChange = useCallback(() => {
+		const newValue = !(alwaysAllowSubtaskCreation ?? false)
+		setAlwaysAllowSubtaskCreation(newValue)
+		vscode.postMessage({ type: "alwaysAllowSubtaskCreation", bool: newValue })
+	}, [alwaysAllowSubtaskCreation, setAlwaysAllowSubtaskCreation])
+
+	const handleSubtaskCompletionChange = useCallback(() => {
+		const newValue = !(alwaysAllowSubtaskCompletion ?? false)
+		setAlwaysAllowSubtaskCompletion(newValue)
+		vscode.postMessage({ type: "alwaysAllowSubtaskCompletion", bool: newValue })
+	}, [alwaysAllowSubtaskCompletion, setAlwaysAllowSubtaskCompletion])
 
 	const handleRetryChange = useCallback(() => {
 		const newValue = !(alwaysApproveResubmit ?? false)
@@ -176,7 +191,8 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => {
 		useBrowser: handleBrowserChange,
 		useMcp: handleMcpChange,
 		switchModes: handleModeSwitchChange,
-		subtasks: handleSubtasksChange,
+		subtaskCreation: handleSubtaskCreationChange,
+		subtaskCompletion: handleSubtaskCompletionChange,
 		retryRequests: handleRetryChange,
 	}