@@ -1,4 +1,5 @@
 import { LLMock } from "@copilotkit/aimock"
+import { READ_FILES_TOOL_NAME } from "@roo-code/types"
 
 import {
 	isToolResultExpectation,
@@ -15,6 +16,51 @@ type ReadFileResultFixture = {
 }
 
 export function addReadFileResultFixtures(mock: InstanceType<typeof LLMock>) {
+	const batchCallId = "call_native_read_files_batch_001"
+	mock.addFixture({
+		match: { userMessage: "NATIVE_READ_FILES_BATCH_SMOKE" },
+		response: {
+			toolCalls: [
+				{
+					name: READ_FILES_TOOL_NAME,
+					id: batchCallId,
+					arguments: JSON.stringify({
+						entries: [
+							{ path: "batch-read-slice.txt", offset: 2, limit: 1 },
+							{
+								path: "batch-read-block.ts",
+								mode: "indentation",
+								indentation: { anchor_line: 2, include_header: false },
+							},
+						],
+					}),
+				},
+			],
+		},
+	})
+	mock.addFixture({
+		match: {
+			predicate: (req) =>
+				toolResultContains(req, batchCallId, [
+					'Entry 1: "batch-read-slice.txt"',
+					'Entry 2: "batch-read-block.ts"',
+					"2 | second",
+					"return 'hello'",
+				]),
+		},
+		response: {
+			toolCalls: [
+				{
+					name: "attempt_completion",
+					id: "call_native_read_files_batch_002",
+					arguments: JSON.stringify({
+						result: "NATIVE_READ_FILES_BATCH_OK: second and hello were returned in one batch result.",
+					}),
+				},
+			],
+		},
+	})
+
 	const fixtures: ReadFileResultFixture[] = [
 		{
 			toolCallId: "call_read_file_simple_001",
 
@@ -0,0 +1,59 @@
+import * as assert from "node:assert/strict"
+import * as fs from "node:fs/promises"
+import path from "node:path"
+import * as vscode from "vscode"
+import { RooCodeEventName, type ClineMessage } from "@roo-code/types"
+import { waitFor } from "../utils"
+import { setDefaultSuiteTimeout } from "../test-utils"
+
+suite("Zoo Code native batch reading", function () {
+	setDefaultSuiteTimeout(this)
+
+	test("returns slice and structural reads in one native tool result", async () => {
+		const workspace = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath
+		assert.ok(workspace, "Expected the test workspace")
+		const slicePath = path.join(workspace, "batch-read-slice.txt")
+		const blockPath = path.join(workspace, "batch-read-block.ts")
+		await fs.writeFile(slicePath, "first\nsecond")
+		await fs.writeFile(blockPath, "function greet() {\n    return 'hello'\n}")
+		const api = globalThis.api
+		const messages: ClineMessage[] = []
+		const onMessage = ({ message }: { message: ClineMessage }) => messages.push(message)
+		api.on(RooCodeEventName.Message, onMessage)
+		try {
+			await api.clearCurrentTask()
+			await api.startNewTask({
+				configuration: {
+					mode: "code",
+					autoApprovalEnabled: true,
+					alwaysAllowReadOnly: true,
+					alwaysAllowReadOnlyOutsideWorkspace: true,
+				},
+				text: "NATIVE_READ_FILES_BATCH_SMOKE: Read the two known files in one native batch call using independent slice and structural parameters.",
+			})
+			await waitFor(
+				() =>
+					messages.some(
+						(message) =>
+							message.say === "completion_result" && message.text?.includes("NATIVE_READ_FILES_BATCH_OK"),
+					),
+				{ timeout: 60_000 },
+			)
+			assert.ok(
+				messages.some(
+					(message) => message.say === "completion_result" && message.text?.includes("second and hello"),
+				),
+				"The mock only completes after a single batch tool result contains both file reads",
+			)
+			assert.deepEqual(
+				messages.filter((message) => message.say === "error").map((message) => message.text),
+				[],
+			)
+		} finally {
+			api.off(RooCodeEventName.Message, onMessage)
+			await api.clearCurrentTask()
+			await fs.rm(slicePath, { force: true })
+			await fs.rm(blockPath, { force: true })
+		}
+	})
+})