More progress

Author: cte

packages/types/src/__tests__/message.test.ts

@@ -0,0 +1,14 @@
+// pnpm --filter @roo-code/types test src/__tests__/message.test.ts
+
+import { clineAsks, isIdleAsk, isInteractiveAsk, isResumableAsk, isNonBlockingAsk } from "../message.js"
+
+describe("ask messages", () => {
+	test("all ask messages are classified", () => {
+		for (const ask of clineAsks) {
+			expect(
+				isIdleAsk(ask) || isInteractiveAsk(ask) || isResumableAsk(ask) || isNonBlockingAsk(ask),
+				`${ask} is not classified`,
+			).toBe(true)
+		}
+	})
+})

packages/types/src/message.ts

@@ -43,10 +43,6 @@ export const clineAsks = [
 export const clineAskSchema = z.enum(clineAsks)
 
 export type ClineAsk = z.infer<typeof clineAskSchema>
-
-// Needs classification:
-// - `followup`
-
 /**
  * IdleAsk
  *
@@ -101,6 +97,21 @@ export function isInteractiveAsk(ask: ClineAsk): ask is InteractiveAsk {
 	return (interactiveAsks as readonly ClineAsk[]).includes(ask)
 }
 
+/**
+ * NonBlockingAsk
+ *
+ * Asks that are not associated with an actual approval, and are only used
+ * to update chat messages.
+ */
+
+export const nonBlockingAsks = ["command_output"] as const satisfies readonly ClineAsk[]
+
+export type NonBlockingAsk = (typeof nonBlockingAsks)[number]
+
+export function isNonBlockingAsk(ask: ClineAsk): ask is NonBlockingAsk {
+	return (nonBlockingAsks as readonly ClineAsk[]).includes(ask)
+}
+
 /**
  * ClineSay
  */

src/core/auto-approval/index.ts

@@ -1,4 +1,4 @@
-import type { ClineAsk, McpServerUse } from "@roo-code/types"
+import { type ClineAsk, type McpServerUse, isNonBlockingAsk } from "@roo-code/types"
 
 import type { ClineSayTool, ExtensionState } from "../../shared/ExtensionMessage"
 
@@ -40,7 +40,7 @@ export async function isAutoApproved({
 	text?: string
 	isProtected?: boolean
 }): Promise<boolean> {
-	if (ask === "command_output" || ask === "api_req_failed") {
+	if (isNonBlockingAsk(ask)) {
 		return true
 	}