More progress

Author: cte

packages/types/npm/package.metadata.json

@@ -1,6 +1,6 @@
 {
 	"name": "@roo-code/types",
-	"version": "1.51.0",
+	"version": "1.52.0",
 	"description": "TypeScript type definitions for Roo Code.",
 	"publishConfig": {
 		"access": "public",

packages/types/src/message.ts

@@ -44,18 +44,22 @@ export const clineAskSchema = z.enum(clineAsks)
 
 export type ClineAsk = z.infer<typeof clineAskSchema>
 
+// Needs classification:
+// - `followup`
+// - `command_output
+
 /**
  * IdleAsk
  *
  * Asks that put the task into an "idle" state.
  */
 
 export const idleAsks = [
+	"completion_result",
 	"api_req_failed",
-	"auto_approval_max_req_reached",
+	"resume_completed_task",
 	"mistake_limit_reached",
-	"command_output", // Not sure about this one.
-	"completion_result",
+	"auto_approval_max_req_reached",
 ] as const satisfies readonly ClineAsk[]
 
 export type IdleAsk = (typeof idleAsks)[number]
@@ -70,7 +74,7 @@ export function isIdleAsk(ask: ClineAsk): ask is IdleAsk {
  * Asks that put the task into an "resumable" state.
  */
 
-export const resumableAsks = ["resume_task", "resume_completed_task"] as const satisfies readonly ClineAsk[]
+export const resumableAsks = ["resume_task"] as const satisfies readonly ClineAsk[]
 
 export type ResumableAsk = (typeof resumableAsks)[number]
 
@@ -84,7 +88,12 @@ export function isResumableAsk(ask: ClineAsk): ask is ResumableAsk {
  * Asks that put the task into an "user interaction required" state.
  */
 
-export const interactiveAsks = ["command"] as const satisfies readonly ClineAsk[]
+export const interactiveAsks = [
+	"command",
+	"tool",
+	"browser_action_launch",
+	"use_mcp_server",
+] as const satisfies readonly ClineAsk[]
 
 export type InteractiveAsk = (typeof interactiveAsks)[number]
 

packages/types/src/task.ts

@@ -1,7 +1,7 @@
 import { z } from "zod"
 
 import { RooCodeEventName } from "./events.js"
-import { type ClineMessage, type ClineAsk, type TokenUsage } from "./message.js"
+import { type ClineMessage, type TokenUsage } from "./message.js"
 import { type ToolUsage, type ToolName } from "./tool.js"
 import type { StaticAppProperties, GitProperties, TelemetryProperties } from "./telemetry.js"
 
@@ -81,7 +81,7 @@ export type TaskMetadata = z.infer<typeof taskMetadataSchema>
 export interface TaskLike {
 	readonly taskId: string
 	readonly taskStatus: TaskStatus
-	readonly taskAsk: ClineAsk | undefined
+	readonly taskAsk: ClineMessage | undefined
 	readonly metadata: TaskMetadata
 
 	readonly rootTask?: TaskLike

src/core/task/Task.ts

@@ -189,9 +189,9 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 	abort: boolean = false
 
 	// TaskStatus
-	idleAsk?: IdleAsk
-	resumableAsk?: ResumableAsk
-	interactiveAsk?: InteractiveAsk
+	idleAsk?: ClineMessage
+	resumableAsk?: ClineMessage
+	interactiveAsk?: ClineMessage
 
 	didFinishAbortingStream = false
 	abandoned = false
@@ -625,6 +625,16 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 		}
 	}
 
+	private findMessageByTimestamp(ts: number): ClineMessage | undefined {
+		for (let i = this.clineMessages.length - 1; i >= 0; i--) {
+			if (this.clineMessages[i].ts === ts) {
+				return this.clineMessages[i]
+			}
+		}
+
+		return undefined
+	}
+
 	// Note that `partial` has three valid states true (partial message),
 	// false (completion of partial message), undefined (individual complete
 	// message).
@@ -726,36 +736,48 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 		// 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
-		let stateMutationTimeouts: NodeJS.Timeout[] = []
+		const isStatusMutable = !partial && isBlocking
+		let statusMutationTimeouts: NodeJS.Timeout[] = []
 
-		if (isStateMutable) {
+		if (isStatusMutable) {
 			if (isInteractiveAsk(type)) {
-				stateMutationTimeouts.push(
+				statusMutationTimeouts.push(
 					setTimeout(() => {
-						this.interactiveAsk = type
-						this.emit(RooCodeEventName.TaskInteractive, this.taskId)
+						const message = this.findMessageByTimestamp(askTs)
+
+						if (message) {
+							this.interactiveAsk = message
+							this.emit(RooCodeEventName.TaskInteractive, this.taskId)
+						}
 					}, 1_000),
 				)
 			} else if (isResumableAsk(type)) {
-				stateMutationTimeouts.push(
+				statusMutationTimeouts.push(
 					setTimeout(() => {
-						this.resumableAsk = type
-						this.emit(RooCodeEventName.TaskResumable, this.taskId)
+						const message = this.findMessageByTimestamp(askTs)
+
+						if (message) {
+							this.resumableAsk = message
+							this.emit(RooCodeEventName.TaskResumable, this.taskId)
+						}
 					}, 1_000),
 				)
 			} else if (isIdleAsk(type)) {
-				stateMutationTimeouts.push(
+				statusMutationTimeouts.push(
 					setTimeout(() => {
-						this.idleAsk = type
-						this.emit(RooCodeEventName.TaskIdle, this.taskId)
+						const message = this.findMessageByTimestamp(askTs)
+
+						if (message) {
+							this.idleAsk = message
+							this.emit(RooCodeEventName.TaskIdle, this.taskId)
+						}
 					}, 1_000),
 				)
 			}
 		}
 
 		console.log(
-			`[Task#${this.taskId}] pWaitFor askResponse(${type}) -> blocking (isStateMutable = ${isStateMutable}, stateMutationTimeouts = ${stateMutationTimeouts.length})`,
+			`[Task#${this.taskId}] pWaitFor askResponse(${type}) -> blocking (isStatusMutable = ${isStatusMutable}, statusMutationTimeouts = ${statusMutationTimeouts.length})`,
 		)
 
 		await pWaitFor(() => this.askResponse !== undefined || this.lastMessageTs !== askTs, { interval: 100 })
@@ -775,7 +797,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 		this.askResponseImages = undefined
 
 		// Cancel the timeouts if they are still running.
-		stateMutationTimeouts.forEach((timeout) => clearTimeout(timeout))
+		statusMutationTimeouts.forEach((timeout) => clearTimeout(timeout))
 
 		// Switch back to an active state.
 		if (this.idleAsk || this.resumableAsk || this.interactiveAsk) {
@@ -2581,7 +2603,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 		return TaskStatus.Running
 	}
 
-	public get taskAsk(): ClineAsk | undefined {
+	public get taskAsk(): ClineMessage | undefined {
 		return this.idleAsk || this.resumableAsk || this.interactiveAsk
 	}
 }