Different approach

Author: cte

packages/types/src/events.ts

@@ -1,6 +1,6 @@
 import { z } from "zod"
 
-import { clineMessageSchema, tokenUsageSchema, clineAskSchema } from "./message.js"
+import { clineMessageSchema, tokenUsageSchema } from "./message.js"
 import { toolNamesSchema, toolUsageSchema } from "./tool.js"
 
 /**
@@ -75,7 +75,7 @@ export const rooCodeEventsSchema = z.object({
 	]),
 	[RooCodeEventName.TaskModeSwitched]: z.tuple([z.string(), z.string()]),
 	[RooCodeEventName.TaskAskResponded]: z.tuple([z.string()]),
-	[RooCodeEventName.TaskAskRequiresInteraction]: z.tuple([z.string(), clineAskSchema]),
+	[RooCodeEventName.TaskAskRequiresInteraction]: z.tuple([z.string(), clineMessageSchema]),
 
 	[RooCodeEventName.TaskToolFailed]: z.tuple([z.string(), toolNamesSchema, z.string()]),
 	[RooCodeEventName.TaskTokenUsageUpdated]: z.tuple([z.string(), tokenUsageSchema]),

packages/types/src/message.ts

@@ -45,10 +45,12 @@ export const clineAskSchema = z.enum(clineAsks)
 export type ClineAsk = z.infer<typeof clineAskSchema>
 
 /**
- * BlockingAsk
+ * IdleAsk
+ *
+ * Asks that put the task into an "idle" state.
  */
 
-export const blockingAsks: ClineAsk[] = [
+export const idleAsks: ClineAsk[] = [
 	"api_req_failed",
 	"mistake_limit_reached",
 	"completion_result",
@@ -58,10 +60,24 @@ export const blockingAsks: ClineAsk[] = [
 	"auto_approval_max_req_reached",
 ] as const
 
-export type BlockingAsk = (typeof blockingAsks)[number]
+export type IdleAsk = (typeof idleAsks)[number]
+
+export function isIdleAsk(ask: ClineAsk): ask is IdleAsk {
+	return idleAsks.includes(ask)
+}
+
+/**
+ * InteractiveAsk
+ *
+ * Asks that put the task into an "user interaction required" state.
+ */
+
+export const interactiveAsks: ClineAsk[] = ["command"] as const
+
+export type InteractiveAsk = (typeof interactiveAsks)[number]
 
-export function isBlockingAsk(ask: ClineAsk): ask is BlockingAsk {
-	return blockingAsks.includes(ask)
+export function isInteractiveAsk(ask: ClineAsk): ask is InteractiveAsk {
+	return interactiveAsks.includes(ask)
 }
 
 /**

packages/types/src/task.ts

@@ -1,7 +1,7 @@
 import { z } from "zod"
 
 import { RooCodeEventName } from "./events.js"
-import { type ClineMessage, type BlockingAsk, type TokenUsage, type ClineAsk } from "./message.js"
+import { type ClineMessage, type IdleAsk, type TokenUsage } from "./message.js"
 import { type ToolUsage, type ToolName } from "./tool.js"
 import type { StaticAppProperties, GitProperties, TelemetryProperties } from "./telemetry.js"
 
@@ -71,7 +71,7 @@ export type TaskMetadata = z.infer<typeof taskMetadataSchema>
 export interface TaskLike {
 	readonly taskId: string
 	readonly rootTask?: TaskLike
-	readonly blockingAsk?: BlockingAsk
+	readonly blockingAsk?: IdleAsk
 	readonly metadata: TaskMetadata
 
 	on<K extends keyof TaskEvents>(event: K, listener: (...args: TaskEvents[K]) => void | Promise<void>): this
@@ -101,7 +101,7 @@ export type TaskEvents = {
 	[RooCodeEventName.Message]: [{ action: "created" | "updated"; message: ClineMessage }]
 	[RooCodeEventName.TaskModeSwitched]: [taskId: string, mode: string]
 	[RooCodeEventName.TaskAskResponded]: []
-	[RooCodeEventName.TaskAskRequiresInteraction]: [taskId: string, askType: ClineAsk]
+	[RooCodeEventName.TaskAskRequiresInteraction]: [taskId: string, askMessage: ClineMessage]
 
 	// Task Analytics
 	[RooCodeEventName.TaskToolFailed]: [taskId: string, tool: ToolName, error: string]

src/core/task/Task.ts

@@ -21,16 +21,18 @@ import {
 	type ClineMessage,
 	type ClineSay,
 	type ClineAsk,
-	type BlockingAsk,
+	type IdleAsk,
+	type InteractiveAsk,
 	type ToolProgressStatus,
 	type HistoryItem,
 	RooCodeEventName,
 	TelemetryEventName,
 	TodoItem,
+	DEFAULT_CONSECUTIVE_MISTAKE_LIMIT,
 	getApiProtocol,
 	getModelId,
-	DEFAULT_CONSECUTIVE_MISTAKE_LIMIT,
-	isBlockingAsk,
+	isIdleAsk,
+	isInteractiveAsk,
 } from "@roo-code/types"
 import { TelemetryService } from "@roo-code/telemetry"
 import { CloudService, ExtensionBridgeService } from "@roo-code/cloud"
@@ -182,7 +184,8 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 	providerRef: WeakRef<ClineProvider>
 	private readonly globalStoragePath: string
 	abort: boolean = false
-	blockingAsk?: BlockingAsk
+	idleAsk?: IdleAsk
+	interactiveAsk?: InteractiveAsk
 	didFinishAbortingStream = false
 	abandoned = false
 	isInitialized = false
@@ -713,12 +716,29 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 			await this.addToClineMessages({ ts: askTs, type: "ask", ask: type, text, isProtected })
 		}
 
-		// Detect if the task will enter an idle state.
-		const isReady = this.askResponse !== undefined || this.lastMessageTs !== askTs
+		// The state is mutable if the message is complete and the task will
+		// block (via the `pWaitFor`).
+		const isBlocking = !(this.askResponse !== undefined || this.lastMessageTs !== askTs)
+		const isStateMutable = !partial && isBlocking
 
-		if (!partial && !isReady && isBlockingAsk(type)) {
-			this.blockingAsk = type
-			this.emit(RooCodeEventName.TaskIdle, this.taskId)
+		// The task will enter an idle state.
+		let goIdleTimeout: NodeJS.Timeout | undefined
+
+		if (isStateMutable && isIdleAsk(type)) {
+			goIdleTimeout = setTimeout(() => {
+				this.idleAsk = undefined
+				this.emit(RooCodeEventName.TaskActive, this.taskId)
+			}, 1000)
+		}
+
+		// The task will enter a "user interaction required" state.
+		let goInteractiveTimeout: NodeJS.Timeout | undefined
+
+		if (isStateMutable && !isInteractiveAsk(type)) {
+			goInteractiveTimeout = setTimeout(() => {
+				this.interactiveAsk = undefined
+				this.emit(RooCodeEventName.TaskActive, this.taskId)
+			}, 1000)
 		}
 
 		console.log(`[Task#${this.taskId}] pWaitFor askResponse(${type}) -> blocking`)
@@ -737,9 +757,22 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 		this.askResponseText = undefined
 		this.askResponseImages = undefined
 
+		// Cancel the timeouts if they are still running.
+		if (goIdleTimeout) {
+			clearTimeout(goIdleTimeout)
+		}
+
+		if (goInteractiveTimeout) {
+			clearTimeout(goInteractiveTimeout)
+		}
+
+		goIdleTimeout = undefined
+		goInteractiveTimeout = undefined
+
 		// Switch back to an active state.
-		if (this.blockingAsk) {
-			this.blockingAsk = undefined
+		if (this.idleAsk || this.interactiveAsk) {
+			this.idleAsk = undefined
+			this.interactiveAsk = undefined
 			this.emit(RooCodeEventName.TaskActive, this.taskId)
 		}
 

src/core/webview/webviewMessageHandler.ts

@@ -348,13 +348,6 @@ export const webviewMessageHandler = async (
 			break
 		case "askResponse":
 			provider.getCurrentTask()?.handleWebviewAskResponse(message.askResponse!, message.text, message.images)
-			break
-		case "askRequiresInteraction":
-			if (message.askType) {
-				const task = provider.getCurrentTask()
-				task?.emit(RooCodeEventName.TaskAskRequiresInteraction, task.taskId, message.askType as ClineAsk)
-			}
-
 			break
 		case "autoCondenseContext":
 			await updateGlobalState("autoCondenseContext", message.bool)

src/shared/WebviewMessage.ts

@@ -6,6 +6,7 @@ import {
 	type ModeConfig,
 	type InstallMarketplaceItemOptions,
 	type MarketplaceItem,
+	type ClineMessage,
 	marketplaceItemSchema,
 } from "@roo-code/types"
 import type { ShareVisibility } from "@roo-code/cloud"
@@ -49,7 +50,6 @@ export interface WebviewMessage {
 		| "webviewDidLaunch"
 		| "newTask"
 		| "askResponse"
-		| "askRequiresInteraction"
 		| "terminalOperation"
 		| "clearTask"
 		| "didShowAnnouncement"
@@ -218,8 +218,8 @@ export interface WebviewMessage {
 	disabled?: boolean
 	context?: string
 	dataUri?: string
+	askMessage?: ClineMessage
 	askResponse?: ClineAskResponse
-	askType?: string
 	apiConfiguration?: ProviderSettings
 	images?: string[]
 	bool?: boolean

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

@@ -265,9 +265,11 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 		if (lastMessage) {
 			switch (lastMessage.type) {
 				case "ask":
-					// Reset user response flag when a new ask arrives to allow auto-approval
+					// Reset user response flag when a new ask arrives to allow
+					// auto-approval.
 					userRespondedRef.current = false
 					const isPartial = lastMessage.partial === true
+
 					switch (lastMessage.ask) {
 						case "api_req_failed":
 							playSound("progress_loop")
@@ -555,6 +557,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 			clearTimeout(autoApproveTimeoutRef.current)
 			autoApproveTimeoutRef.current = null
 		}
+
 		// Reset user response flag for new message
 		userRespondedRef.current = false
 
@@ -591,7 +594,8 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 						return
 					}
 
-					// Mark that user has responded - this prevents any pending auto-approvals
+					// Mark that user has responded - this prevents any pending
+					// auto-approvals.
 					userRespondedRef.current = true
 
 					if (messagesRef.current.length === 0) {
@@ -1593,7 +1597,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 			return
 		}
 
-		// Exit early if user has already responded
+		// Exit early if user has already responded.
 		if (userRespondedRef.current) {
 			return
 		}
@@ -1671,9 +1675,6 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 				setSendingDisabled(true)
 				setClineAsk(undefined)
 				setEnableButtons(false)
-			} else if (lastMessage?.ask) {
-				// Notify the extension host that this ask requires user interaction.
-				vscode.postMessage({ type: "askRequiresInteraction", askType: lastMessage.ask })
 			}
 		}