Roo to main

packages/types/src/global-settings.ts

@@ -310,7 +310,6 @@ export const isGlobalStateKey = (key: string): key is Keys<GlobalState> =>
 // Default settings when running evals (unless overridden).
 export const EVALS_SETTINGS: RooCodeSettings = {
 	apiProvider: "openrouter",
-	openRouterUseMiddleOutTransform: false,
 	zgsmCodeMode: "vibe",
 	lastShownAnnouncementId: "jul-09-2025-3-23-0",
 

packages/types/src/index.ts

@@ -18,7 +18,6 @@ export * from "./message.js"
 export * from "./mode.js"
 export * from "./model.js"
 export * from "./provider-settings.js"
-export * from "./single-file-read-models.js"
 export * from "./task.js"
 export * from "./todo.js"
 export * from "./telemetry.js"

packages/types/src/provider-settings.ts

@@ -222,7 +222,6 @@ const openRouterSchema = baseProviderSettingsSchema.extend({
 	openRouterModelId: z.string().optional(),
 	openRouterBaseUrl: z.string().optional(),
 	openRouterSpecificProvider: z.string().optional(),
-	openRouterUseMiddleOutTransform: z.boolean().optional(),
 })
 
 const bedrockSchema = apiModelIdProviderModelSchema.extend({

src/api/providers/__tests__/openrouter.spec.ts

@@ -308,38 +308,11 @@ describe("OpenRouterHandler", () => {
 					stream_options: { include_usage: true },
 					temperature: 0,
 					top_p: undefined,
-					transforms: ["middle-out"],
 				}),
 				{ headers: { "x-anthropic-beta": "fine-grained-tool-streaming-2025-05-14" } },
 			)
 		})
 
-		it("supports the middle-out transform", async () => {
-			const handler = new OpenRouterHandler({
-				...mockOptions,
-				openRouterUseMiddleOutTransform: true,
-			})
-			const mockStream = {
-				async *[Symbol.asyncIterator]() {
-					yield {
-						id: "test-id",
-						choices: [{ delta: { content: "test response" } }],
-					}
-				},
-			}
-
-			const mockCreate = vitest.fn().mockResolvedValue(mockStream)
-			;(OpenAI as any).prototype.chat = {
-				completions: { create: mockCreate },
-			} as any
-
-			await handler.createMessage("test", []).next()
-
-			expect(mockCreate).toHaveBeenCalledWith(expect.objectContaining({ transforms: ["middle-out"] }), {
-				headers: { "x-anthropic-beta": "fine-grained-tool-streaming-2025-05-14" },
-			})
-		})
-
 		it("adds cache control for supported models", async () => {
 			const handler = new OpenRouterHandler({
 				...mockOptions,

src/api/providers/openrouter.ts

@@ -293,8 +293,6 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
 			}
 		}
 
-		const transforms = (this.options.openRouterUseMiddleOutTransform ?? true) ? ["middle-out"] : undefined
-
 		// https://openrouter.ai/docs/transforms
 		const completionParams: OpenRouterChatCompletionParams = {
 			model: modelId,
@@ -313,7 +311,6 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
 						allow_fallbacks: false,
 					},
 				}),
-			...(transforms && { transforms }),
 			...(reasoning && { reasoning }),
 			...(metadata?.tools && { tools: this.convertToolsForOpenAI(metadata.tools) }),
 			...(metadata?.tool_choice && { tool_choice: metadata.tool_choice }),

src/api/providers/zgsm.ts

@@ -554,7 +554,6 @@ export class ZgsmAiHandler extends BaseProvider implements SingleCompletionHandl
 			finishReason?: ChatCompletionChunk.Choice["finish_reason"]
 			activeToolCallIds?: Set<string>
 		}
-
 		// chunk
 		for await (const chunk of stream) {
 			// Check if request was aborted
@@ -580,29 +579,40 @@ export class ZgsmAiHandler extends BaseProvider implements SingleCompletionHandl
 				) {
 					const batchedContent = contentBuffer.join("")
 					for (const processedChunk of matcher.update(batchedContent)) {
+						if (this.abortController?.signal.aborted) {
+							break
+						}
+						// eslint-disable-next-line @typescript-eslint/no-unused-expressions
+						isDev &&
+							this.logger.info(
+								`[ResponseID ${this.options.zgsmModelId} sse rendering]:`,
+								requestId,
+								batchedContent,
+							)
 						yield processedChunk
 					}
 					contentBuffer.length = 0 // Clear buffer
-					// eslint-disable-next-line @typescript-eslint/no-unused-expressions
-					isDev &&
-						this.logger.info(
-							`[ResponseID ${this.options.zgsmModelId} sse rendering]:`,
-							requestId,
-							batchedContent,
-						)
+
 					time = now
 				}
 			}
 
 			// Process reasoning content
 			if ("reasoning_content" in delta && delta.reasoning_content) {
+				// eslint-disable-next-line @typescript-eslint/no-unused-expressions
+				isDev &&
+					this.logger.warn(
+						`[ResponseID ${this.options.zgsmModelId} sse "reasoning_content":`,
+						requestId,
+						delta.reasoning_content,
+					)
 				yield {
 					type: "reasoning",
-					text: (delta.reasoning_content as string | undefined) || "",
+					text: delta.reasoning_content as string,
 				}
 			}
 
-			yield* this.processToolCalls(delta, finishReason, activeToolCallIds, contentBuffer.length > 0)
+			yield* this.processToolCalls(delta, finishReason, activeToolCallIds, requestId, contentBuffer.length > 0)
 
 			// Cache usage information
 			if (chunk.usage) {
@@ -618,25 +628,25 @@ export class ZgsmAiHandler extends BaseProvider implements SingleCompletionHandl
 		// Process remaining content
 		if (contentBuffer.length > 0) {
 			const remainingContent = contentBuffer.join("")
-			// eslint-disable-next-line @typescript-eslint/no-unused-expressions
-			isDev &&
-				this.logger.info(
-					`[ResponseID ${this.options.zgsmModelId} sse render end]:`,
-					requestId,
-					remainingContent,
-				)
 			for (const processedChunk of matcher.update(remainingContent)) {
+				if (this.abortController?.signal.aborted) {
+					break
+				}
 				yield processedChunk
 			}
 			contentBuffer.length = 0 // Clear buffer
-			yield* this.processToolCalls(lastDeltaInfo.delta, lastDeltaInfo.finishReason, activeToolCallIds)
+			yield* this.processToolCalls(lastDeltaInfo.delta, lastDeltaInfo.finishReason, activeToolCallIds, requestId)
 		}
 
 		// Output final results
 		for (const chunk of matcher.final()) {
+			if (this.abortController?.signal.aborted) {
+				break
+			}
 			yield chunk
 		}
-
+		// eslint-disable-next-line @typescript-eslint/no-unused-expressions
+		isDev && this.logger.info(`[ResponseID ${this.options.zgsmModelId} sse render end]:`, requestId)
 		// Process usage metrics
 		if (lastUsage) {
 			yield this.processUsageMetrics(lastUsage, modelInfo)
@@ -666,6 +676,7 @@ export class ZgsmAiHandler extends BaseProvider implements SingleCompletionHandl
 		delta: OpenAI.Chat.Completions.ChatCompletionChunk.Choice.Delta | undefined,
 		finishReason: string | null | undefined,
 		activeToolCallIds: Set<string>,
+		requestId?: string,
 		skip: boolean = false,
 	): Generator<
 		| { type: "tool_call_partial"; index: number; id?: string; name?: string; arguments?: string }
@@ -680,6 +691,14 @@ export class ZgsmAiHandler extends BaseProvider implements SingleCompletionHandl
 				if (toolCall.id) {
 					activeToolCallIds.add(toolCall.id)
 				}
+				// eslint-disable-next-line @typescript-eslint/no-unused-expressions
+				isDev &&
+					this.logger.warn(
+						`[ResponseID ${this.options.zgsmModelId} sse "toolCall arguments":`,
+						requestId,
+						toolCall.function?.name,
+						toolCall.function?.arguments,
+					)
 				yield {
 					type: "tool_call_partial",
 					index: toolCall.index,
@@ -892,6 +911,10 @@ export class ZgsmAiHandler extends BaseProvider implements SingleCompletionHandl
 	}
 
 	private async *handleStreamResponse(stream: AsyncIterable<OpenAI.Chat.Completions.ChatCompletionChunk>): ApiStream {
+		// Check if request was aborted
+		if (this.abortController?.signal.aborted) {
+			return
+		}
 		const activeToolCallIds = new Set<string>()
 
 		for await (const chunk of stream) {

src/core/assistant-message/presentAssistantMessage.ts

@@ -20,8 +20,7 @@ import { Task } from "../task/Task"
 import { fetchInstructionsTool } from "../tools/FetchInstructionsTool"
 import { listFilesTool } from "../tools/ListFilesTool"
 import { readFileTool } from "../tools/ReadFileTool"
-import { getSimpleReadFileToolDescription, simpleReadFileTool } from "../tools/simpleReadFileTool"
-import { shouldUseSingleFileRead, TOOL_PROTOCOL } from "@roo-code/types"
+import { TOOL_PROTOCOL } from "@roo-code/types"
 import { writeToFileTool } from "../tools/WriteToFileTool"
 import { applyDiffTool } from "../tools/MultiApplyDiffTool"
 import { searchAndReplaceTool } from "../tools/SearchAndReplaceTool"
@@ -369,18 +368,12 @@ export async function presentAssistantMessage(cline: Task) {
 					case "execute_command":
 						return `[${block.name} for '${block.params.command}']`
 					case "read_file":
-						// Check if this model should use the simplified description
-						const modelId = cline.api.getModel().id
-						if (shouldUseSingleFileRead(modelId)) {
-							return getSimpleReadFileToolDescription(block.name, block.params)
-						} else {
-							// Prefer native typed args when available; fall back to legacy params
-							// Check if nativeArgs exists (native protocol)
-							if (block.nativeArgs) {
-								return readFileTool.getReadFileToolDescription(block.name, block.nativeArgs)
-							}
-							return readFileTool.getReadFileToolDescription(block.name, block.params)
+						// Prefer native typed args when available; fall back to legacy params
+						// Check if nativeArgs exists (native protocol)
+						if (block.nativeArgs) {
+							return readFileTool.getReadFileToolDescription(block.name, block.nativeArgs)
 						}
+						return readFileTool.getReadFileToolDescription(block.name, block.params)
 					case "fetch_instructions":
 						return `[${block.name} for '${block.params.task}']`
 					case "write_to_file":
@@ -931,29 +924,14 @@ export async function presentAssistantMessage(cline: Task) {
 					})
 					break
 				case "read_file":
-					// Check if this model should use the simplified single-file read tool
-					// Only use simplified tool for XML protocol - native protocol works with standard tool
-					const modelId = cline.api.getModel().id
-					if (shouldUseSingleFileRead(modelId) && toolProtocol !== TOOL_PROTOCOL.NATIVE) {
-						await simpleReadFileTool(
-							cline,
-							block,
-							askApproval,
-							handleError,
-							pushToolResult,
-							removeClosingTag,
-							toolProtocol,
-						)
-					} else {
-						// Type assertion is safe here because we're in the "read_file" case
-						await readFileTool.handle(cline, block as ToolUse<"read_file">, {
-							askApproval,
-							handleError,
-							pushToolResult,
-							removeClosingTag,
-							toolProtocol,
-						})
-					}
+					// Type assertion is safe here because we're in the "read_file" case
+					await readFileTool.handle(cline, block as ToolUse<"read_file">, {
+						askApproval,
+						handleError,
+						pushToolResult,
+						removeClosingTag,
+						toolProtocol,
+					})
 					break
 				case "fetch_instructions":
 					await fetchInstructionsTool.handle(cline, block as ToolUse<"fetch_instructions">, {

src/core/prompts/responses.ts

@@ -62,11 +62,15 @@ export const formatResponse = {
 		return `Access to ${path} is blocked by the .rooignore file settings. You must try to continue in the task without using this file, or ask the user to update the .rooignore file.`
 	},
 
-	noToolsUsed: (protocol?: ToolProtocol) => {
+	noToolsUsed: (protocol?: ToolProtocol, preUserContent?: string, preAssistantMessage?: string) => {
 		const instructions = getToolInstructionsReminder(protocol)
 
 		return `[ERROR] You did not use a tool in your previous response! Please retry with a tool use.
 
+# Previous response history part of content
+${preUserContent ? `\nUser said: ${(preUserContent.length > 300 ? `${preUserContent.slice(0, 300)}...` : preUserContent).trim()}` : ""}
+${preAssistantMessage ? `\nAssistant said: ${(preAssistantMessage.length > 300 ? `${preAssistantMessage.slice(0, 300)}...` : preAssistantMessage).trim()}` : ""}
+
 ${instructions}
 
 # Next Steps

src/core/prompts/tools/index.ts

@@ -1,5 +1,4 @@
 import type { ToolName, ModeConfig } from "@roo-code/types"
-import { shouldUseSingleFileRead } from "@roo-code/types"
 
 import { TOOL_GROUPS, ALWAYS_AVAILABLE_TOOLS, DiffStrategy } from "../../../shared/tools"
 import { Mode, getModeConfig, getGroupName } from "../../../shared/modes"
@@ -12,7 +11,6 @@ import { CodeIndexManager } from "../../../services/code-index/manager"
 import { ToolArgs } from "./types"
 import { getExecuteCommandDescription } from "./execute-command"
 import { getReadFileDescription } from "./read-file"
-import { getSimpleReadFileDescription } from "./simple-read-file"
 import { getFetchInstructionsDescription } from "./fetch-instructions"
 import { getWriteToFileDescription } from "./write-to-file"
 import { getSearchFilesDescription } from "./search-files"
@@ -33,14 +31,7 @@ import { getGenerateImageDescription } from "./generate-image"
 // Map of tool names to their description functions
 const toolDescriptionMap: Record<string, (args: ToolArgs) => string | undefined> = {
 	execute_command: (args) => getExecuteCommandDescription(args),
-	read_file: (args) => {
-		// Check if the current model should use the simplified read_file tool
-		const modelId = args.settings?.modelId
-		if (modelId && shouldUseSingleFileRead(modelId)) {
-			return getSimpleReadFileDescription(args)
-		}
-		return getReadFileDescription(args)
-	},
+	read_file: (args) => getReadFileDescription(args),
 	fetch_instructions: (args) => getFetchInstructionsDescription(args.settings?.enableMcpServerCreation),
 	write_to_file: (args) => getWriteToFileDescription(args),
 	search_files: (args) => getSearchFilesDescription(args),
@@ -164,7 +155,6 @@ export function getToolDescriptionsForMode(
 export {
 	getExecuteCommandDescription,
 	getReadFileDescription,
-	getSimpleReadFileDescription,
 	getFetchInstructionsDescription,
 	getWriteToFileDescription,
 	getSearchFilesDescription,