diff --git a/src/core/message-parsing/FallbackParser.ts b/src/core/message-parsing/FallbackParser.ts
index 998d693b2d..6b47bce75a 100644
--- a/src/core/message-parsing/FallbackParser.ts
+++ b/src/core/message-parsing/FallbackParser.ts
@@ -1,6 +1,6 @@
 import { Directive, ToolDirective } from "./directives"
 import { TextDirective, LogDirective } from "./directives"
-import { toolNames } from "@roo-code/types"
+import { ToolName, toolNames } from "@roo-code/types"
 
 export class FallbackParser {
 	static parse(assistantMessage: string): Directive[] {
@@ -154,7 +154,7 @@ export class FallbackParser {
 
 					const ToolDirective: ToolDirective = {
 						type: "tool_use",
-						name: toolName as any,
+						name: toolName as ToolName,
 						params,
 						partial: !assistantMessage.includes(`</${toolName}>`),
 					}
diff --git a/src/core/message-parsing/handlers/ToolDirectiveHandler.ts b/src/core/message-parsing/handlers/ToolDirectiveHandler.ts
index f27674b5b8..71f6fd39cb 100644
--- a/src/core/message-parsing/handlers/ToolDirectiveHandler.ts
+++ b/src/core/message-parsing/handlers/ToolDirectiveHandler.ts
@@ -3,6 +3,7 @@ import { BaseDirectiveHandler } from "./BaseDirectiveHandler"
 import { ParseContext, CodeBlockState } from "../ParseContext"
 import { ToolDirective, ToolParamName } from "../directives"
 import { CodeBlockStateMachine } from "../CodeBlockStateMachine"
+import { ToolName } from "@roo-code/types"
 
 export class ToolDirectiveHandler extends BaseDirectiveHandler {
 	readonly tagName: string
@@ -23,7 +24,7 @@ export class ToolDirectiveHandler extends BaseDirectiveHandler {
 			this.flushCurrentText(context)
 			this.currentToolDirective = {
 				type: "tool_use",
-				name: this.tagName as any,
+				name: this.tagName as ToolName,
 				params: {},
 				partial: true,
 			}