code refactor of AssistantMessageParser

Author: qdaxb

src/core/assistant-message/AssistantMessageParser.ts

@@ -76,11 +76,7 @@ export class AssistantMessageParser {
 				} else {
 					// Partial param value is accumulating.
 					// Write the currently accumulated param content in real time
-					const partialValue = currentParamValue
-					this.currentToolUse.params[this.currentParamName] =
-						this.currentParamName === "content"
-							? partialValue.replace(/^\n/, "").replace(/\n$/, "")
-							: partialValue.trim()
+					this.currentToolUse.params[this.currentParamName] = currentParamValue
 					continue
 				}
 			}
@@ -167,6 +163,8 @@ export class AssistantMessageParser {
 							.slice(0, -toolUseOpeningTag.slice(0, -1).length)
 							.trim()
 
+						this.currentTextContent.content = this.currentTextContent.content.trim()
+
 						// No need to push, currentTextContent is already in contentBlocks
 						this.currentTextContent = undefined
 					}
@@ -193,7 +191,7 @@ export class AssistantMessageParser {
 					// Create a new text content block and add it to contentBlocks
 					this.currentTextContent = {
 						type: "text",
-						content: this.accumulator.slice(this.currentTextContentStartIndex).trim(),
+						content: this.accumulator.slice(this.currentTextContentStartIndex),
 						partial: true,
 					}
 
@@ -202,7 +200,7 @@ export class AssistantMessageParser {
 					this.contentBlocks.push(this.currentTextContent)
 				} else {
 					// Update the existing text content
-					this.currentTextContent.content = this.accumulator.slice(this.currentTextContentStartIndex).trim()
+					this.currentTextContent.content = this.accumulator.slice(this.currentTextContentStartIndex)
 				}
 			}
 		}
@@ -222,16 +220,9 @@ export class AssistantMessageParser {
 			if (block.partial) {
 				block.partial = false
 			}
+			if (block.type === "text" && typeof block.content === "string") {
+				block.content = block.content.trim()
+			}
 		}
 	}
-
-	/**
-	 * Process a complete message and return the parsed content blocks.
-	 * @param message The complete message to parse.
-	 * @returns The parsed content blocks.
-	 */
-	public parseCompleteMessage(message: string): AssistantMessageContent[] {
-		this.reset()
-		return this.processChunk(message)
-	}
 }

src/core/assistant-message/__tests__/AssistantMessageParser.spec.ts

@@ -2,6 +2,7 @@
 
 import { describe, it, expect, beforeEach } from "vitest"
 import { AssistantMessageParser } from "../AssistantMessageParser"
+import { AssistantMessageContent } from "../parseAssistantMessage"
 import { TextContent, ToolUse } from "../../../shared/tools"
 import { toolNames } from "@roo-code/types"
 
@@ -11,17 +12,32 @@ import { toolNames } from "@roo-code/types"
 const isEmptyTextContent = (block: any) => block.type === "text" && (block as TextContent).content === ""
 
 /**
- * Helper to simulate streaming by feeding the parser random-sized chunks (1-10 chars).
+ * Helper to simulate streaming by feeding the parser deterministic "random"-sized chunks (1-10 chars).
+ * Uses a seeded pseudo-random number generator for deterministic chunking.
  */
+
+// Simple linear congruential generator (LCG) for deterministic pseudo-random numbers
+function createSeededRandom(seed: number) {
+	let state = seed
+	return {
+		next: () => {
+			// LCG parameters from Numerical Recipes
+			state = (state * 1664525 + 1013904223) % 0x100000000
+			return state / 0x100000000
+		},
+	}
+}
+
 function streamChunks(
 	parser: AssistantMessageParser,
 	message: string,
 ): ReturnType<AssistantMessageParser["getContentBlocks"]> {
-	let result: any[] = []
+	let result: AssistantMessageContent[] = []
 	let i = 0
+	const rng = createSeededRandom(42) // Fixed seed for deterministic tests
 	while (i < message.length) {
-		// Random chunk size between 1 and 10, but not exceeding message length
-		const chunkSize = Math.min(message.length - i, Math.floor(Math.random() * 10) + 1)
+		// Deterministic chunk size between 1 and 10, but not exceeding message length
+		const chunkSize = Math.min(message.length - i, Math.floor(rng.next() * 10) + 1)
 		const chunk = message.slice(i, i + chunkSize)
 		result = parser.processChunk(chunk)
 		i += chunkSize