diff --git a/src/core/message-parsing/__tests__/DirectiveStreamingParser.test.ts b/src/core/message-parsing/__tests__/DirectiveStreamingParser.test.ts
deleted file mode 100644
index 2f3f21cd9a..0000000000
--- a/src/core/message-parsing/__tests__/DirectiveStreamingParser.test.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { suite, test, expect } from "vitest"
-import { DirectiveStreamingParser } from "../DirectiveStreamingParser"
-import { ToolDirective, TextDirective, LogDirective } from "../directives"
-
-suite("DirectiveStreamingParser", () => {
-	test("should parse plain text content", () => {
-		const input = "This is a simple text message."
-		const result = DirectiveStreamingParser.parse(input)
-		expect(result).toEqual([
-			{
-				type: "text",
-				content: "This is a simple text message.",
-				partial: true,
-			} as TextDirective,
-		])
-	})
-
-	test("should parse a complete log message", () => {
-		const input = "<log_message><message>Log entry</message><level>info</level></log_message>"
-		const result = DirectiveStreamingParser.parse(input)
-		expect(result).toEqual([
-			{
-				type: "log_message",
-				message: "Log entry",
-				level: "info",
-				partial: false,
-			} as LogDirective,
-		])
-	})
-
-	test("should parse a partial log message", () => {
-		const input = "<log_message><message>Partial log entry</message>"
-		const result = DirectiveStreamingParser.parse(input)
-		expect(result).toEqual([
-			{
-				type: "log_message",
-				message: "Partial log entry",
-				level: "info",
-				partial: true,
-			} as LogDirective,
-		])
-	})
-
-	test("should parse a tool use directive", () => {
-		const input = "<read_file><path>src/app.ts</path></read_file>"
-		const result = DirectiveStreamingParser.parse(input)
-		expect(result).toEqual([
-			{
-				type: "tool_use",
-				name: "read_file",
-				params: { path: "src/app.ts" },
-				partial: false,
-			} as ToolDirective,
-		])
-	})
-
-	test("should parse mixed content with text and tool use", () => {
-		const input =
-			"Some text here<apply_diff><path>src/file.ts</path><diff>diff content</diff></apply_diff>More text"
-		const result = DirectiveStreamingParser.parse(input)
-		expect(result).toEqual([
-			{
-				type: "text",
-				content: "Some text here",
-				partial: false,
-			} as TextDirective,
-			{
-				type: "tool_use",
-				name: "apply_diff",
-				params: { path: "src/file.ts", diff: "diff content" },
-				partial: false,
-			} as ToolDirective,
-			{
-				type: "text",
-				content: "More text",
-				partial: true,
-			} as TextDirective,
-		])
-	})
-
-	test("should handle partial tool use directive", () => {
-		const input = "<write_to_file><path>src/newfile.ts</path><content>Some content"
-		const result = DirectiveStreamingParser.parse(input)
-		expect(result).toEqual([
-			{
-				type: "tool_use",
-				name: "write_to_file",
-				params: { path: "src/newfile.ts", content: "Some content" },
-				partial: true,
-			} as ToolDirective,
-		])
-	})
-})
diff --git a/src/core/message-parsing/__tests__/DirectiveStreamingParser.spec.ts b/src/core/message-parsing/__tests__/directive-streaming-parser.spec.ts
similarity index 73%
rename from src/core/message-parsing/__tests__/DirectiveStreamingParser.spec.ts
rename to src/core/message-parsing/__tests__/directive-streaming-parser.spec.ts
index 2f3f21cd9a..1d6957a827 100644
--- a/src/core/message-parsing/__tests__/DirectiveStreamingParser.spec.ts
+++ b/src/core/message-parsing/__tests__/directive-streaming-parser.spec.ts
@@ -15,32 +15,6 @@ suite("DirectiveStreamingParser", () => {
 		])
 	})
 
-	test("should parse a complete log message", () => {
-		const input = "<log_message><message>Log entry</message><level>info</level></log_message>"
-		const result = DirectiveStreamingParser.parse(input)
-		expect(result).toEqual([
-			{
-				type: "log_message",
-				message: "Log entry",
-				level: "info",
-				partial: false,
-			} as LogDirective,
-		])
-	})
-
-	test("should parse a partial log message", () => {
-		const input = "<log_message><message>Partial log entry</message>"
-		const result = DirectiveStreamingParser.parse(input)
-		expect(result).toEqual([
-			{
-				type: "log_message",
-				message: "Partial log entry",
-				level: "info",
-				partial: true,
-			} as LogDirective,
-		])
-	})
-
 	test("should parse a tool use directive", () => {
 		const input = "<read_file><path>src/app.ts</path></read_file>"
 		const result = DirectiveStreamingParser.parse(input)