diff --git a/src/agents/sessions/tools/find.fd.test.ts b/src/agents/sessions/tools/find.fd.test.ts
index a269a04e633..55495dfa0cf 100644
--- a/src/agents/sessions/tools/find.fd.test.ts
+++ b/src/agents/sessions/tools/find.fd.test.ts
@@ -17,19 +17,25 @@ vi.mock("../../utils/tools-manager.js", () => ({
 }));
 
 const tempDirs = useAutoCleanupTempDirTracker(afterEach);
-type MockChild = ChildProcessWithoutNullStreams & { stdout: PassThrough; stderr: PassThrough };
+type MockChild = ChildProcessWithoutNullStreams & {
+  stdout: PassThrough;
+  stderr: PassThrough;
+  killMock: ReturnType<typeof vi.fn>;
+};
 
 afterEach(() => {
   vi.clearAllMocks();
 });
 
 function createChild(): MockChild {
+  const kill = vi.fn(() => true);
   return Object.assign(new EventEmitter(), {
     stdin: new PassThrough(),
     stdout: new PassThrough(),
     stderr: new PassThrough(),
     killed: false,
-    kill: vi.fn(() => true),
+    kill,
+    killMock: kill,
   }) as unknown as MockChild;
 }
 
@@ -48,6 +54,23 @@ it("rejects partial fd output when fd exits with an error", async () => {
   await expect(result).rejects.toThrow("fd failed while reading subtree");
 });
 
+it.each(["stdout", "stderr"] as const)(
+  "rejects and stops fd when %s emits an error",
+  async (stream) => {
+    const child = createChild();
+    vi.mocked(spawn).mockReturnValue(child);
+    vi.mocked(ensureTool).mockResolvedValue("fd");
+
+    const tool = createFindToolDefinition("/workspace");
+    const result = tool.execute("call-1", { pattern: "*.ts" }, undefined, undefined, {} as never);
+    await vi.waitFor(() => expect(spawn).toHaveBeenCalledOnce());
+    child[stream].emit("error", new Error(`${stream} EPIPE`));
+
+    await expect(result).rejects.toThrow(`${stream} EPIPE`);
+    expect(child.killMock).toHaveBeenCalledOnce();
+  },
+);
+
 it.each([
   { name: "inside a repository", gitBoundary: true, expected: false },
   { name: "outside a repository", gitBoundary: false, expected: true },
diff --git a/src/agents/sessions/tools/find.ts b/src/agents/sessions/tools/find.ts
index 440e7d2c63f..564a642ba39 100644
--- a/src/agents/sessions/tools/find.ts
+++ b/src/agents/sessions/tools/find.ts
@@ -291,10 +291,23 @@ export function createFindToolDefinition(
             const cleanup = () => {
               rl.close();
             };
+            const onStreamError = (stream: "stdout" | "stderr", error: Error) => {
+              if (settled) {
+                return;
+              }
+              stopChild?.();
+              cleanup();
+              settle(() => reject(new Error(`fd ${stream} error: ${error.message}`)));
+            };
 
             child.stderr?.on("data", (chunk) => {
               stderr = appendBoundedTextTail(stderr, chunk);
             });
+            // Readline re-emits input failures, while the stream listener also catches
+            // implementations that do not. settle() keeps the shared failure path one-shot.
+            rl.on("error", (error) => onStreamError("stdout", error));
+            child.stdout?.on("error", (error) => onStreamError("stdout", error));
+            child.stderr?.on("error", (error) => onStreamError("stderr", error));
 
             rl.on("line", (line) => {
               lines.push(line);