|
1 | 1 | import * as path from "path" |
2 | 2 |
|
| 3 | +import { RooCodeEventName } from "@roo-code/types" |
3 | 4 | import type { MockedFunction } from "vitest" |
4 | 5 |
|
5 | 6 | import { fileExistsAtPath, createDirectoriesForFile } from "../../../utils/fs" |
@@ -188,6 +189,8 @@ describe("writeToFileTool", () => { |
188 | 189 | } |
189 | 190 | mockCline.say = vi.fn().mockResolvedValue(undefined) |
190 | 191 | mockCline.ask = vi.fn().mockResolvedValue(undefined) |
| 192 | + mockCline.once = vi.fn() |
| 193 | + mockCline.off = vi.fn() |
191 | 194 | mockCline.finalizePartialToolAsk = vi.fn().mockResolvedValue(undefined) |
192 | 195 | mockCline.recordToolError = vi.fn() |
193 | 196 | mockCline.sayAndCreateMissingParamError = vi.fn().mockResolvedValue("Missing param error") |
@@ -457,6 +460,29 @@ describe("writeToFileTool", () => { |
457 | 460 | await executeWriteFileTool({}, { fileExists: false, isPartial: true }) |
458 | 461 | expect(mockCline.ask).toHaveBeenCalledTimes(2) |
459 | 462 | }) |
| 463 | + |
| 464 | + it("cleans per-task partial state when the task aborts before execute finalization", async () => { |
| 465 | + let abortCleanup: (() => void) | undefined |
| 466 | + mockCline.once.mockImplementation((event: RooCodeEventName, listener: () => void) => { |
| 467 | + if (event === RooCodeEventName.TaskAborted) { |
| 468 | + abortCleanup = listener |
| 469 | + } |
| 470 | + return mockCline |
| 471 | + }) |
| 472 | + |
| 473 | + await executeWriteFileTool({}, { fileExists: false, isPartial: true }) |
| 474 | + await executeWriteFileTool({}, { fileExists: false, isPartial: true }) |
| 475 | + expect(mockCline.ask).toHaveBeenCalledTimes(1) |
| 476 | + expect(mockCline.once).toHaveBeenCalledWith(RooCodeEventName.TaskAborted, expect.any(Function)) |
| 477 | + |
| 478 | + abortCleanup?.() |
| 479 | + |
| 480 | + await executeWriteFileTool({}, { fileExists: false, isPartial: true }) |
| 481 | + expect(mockCline.ask).toHaveBeenCalledTimes(1) |
| 482 | + |
| 483 | + await executeWriteFileTool({}, { fileExists: false, isPartial: true }) |
| 484 | + expect(mockCline.ask).toHaveBeenCalledTimes(2) |
| 485 | + }) |
460 | 486 | }) |
461 | 487 |
|
462 | 488 | describe("user interaction", () => { |
@@ -612,22 +638,24 @@ describe("writeToFileTool", () => { |
612 | 638 |
|
613 | 639 | it("continues execute error cleanup when finalizing partial ask fails", async () => { |
614 | 640 | const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {}) |
615 | | - mockedCreateDirectoriesForFile.mockRejectedValue( |
616 | | - Object.assign(new Error("EACCES: permission denied, mkdir '/ro'"), { code: "EACCES" }), |
617 | | - ) |
618 | | - mockCline.finalizePartialToolAsk.mockRejectedValue(new Error("finalize failed")) |
619 | | - |
620 | | - await executeWriteFileTool({}, { fileExists: false }) |
| 641 | + try { |
| 642 | + mockedCreateDirectoriesForFile.mockRejectedValue( |
| 643 | + Object.assign(new Error("EACCES: permission denied, mkdir '/ro'"), { code: "EACCES" }), |
| 644 | + ) |
| 645 | + mockCline.finalizePartialToolAsk.mockRejectedValue(new Error("finalize failed")) |
621 | 646 |
|
622 | | - expect(mockCline.finalizePartialToolAsk).toHaveBeenCalled() |
623 | | - expect(mockHandleError).toHaveBeenCalledWith("writing file", expect.any(Error)) |
624 | | - expect(mockCline.diffViewProvider.reset).toHaveBeenCalled() |
625 | | - expect(consoleErrorSpy).toHaveBeenCalledWith( |
626 | | - "Error finalizing write_to_file partial tool ask:", |
627 | | - expect.any(Error), |
628 | | - ) |
| 647 | + await executeWriteFileTool({}, { fileExists: false }) |
629 | 648 |
|
630 | | - consoleErrorSpy.mockRestore() |
| 649 | + expect(mockCline.finalizePartialToolAsk).toHaveBeenCalled() |
| 650 | + expect(mockHandleError).toHaveBeenCalledWith("writing file", expect.any(Error)) |
| 651 | + expect(mockCline.diffViewProvider.reset).toHaveBeenCalled() |
| 652 | + expect(consoleErrorSpy).toHaveBeenCalledWith( |
| 653 | + "Error finalizing write_to_file partial tool ask:", |
| 654 | + expect.any(Error), |
| 655 | + ) |
| 656 | + } finally { |
| 657 | + consoleErrorSpy.mockRestore() |
| 658 | + } |
631 | 659 | }) |
632 | 660 |
|
633 | 661 | it("keeps partial stream failures isolated per task", async () => { |
@@ -674,23 +702,25 @@ describe("writeToFileTool", () => { |
674 | 702 |
|
675 | 703 | it("continues partial failure cleanup when finalizing partial ask fails", async () => { |
676 | 704 | const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {}) |
677 | | - mockCline.diffViewProvider.open.mockRejectedValue( |
678 | | - Object.assign(new Error("EROFS: read-only file system, mkdir '/scratch'"), { code: "EROFS" }), |
679 | | - ) |
680 | | - mockCline.finalizePartialToolAsk.mockRejectedValue(new Error("finalize failed")) |
681 | | - |
682 | | - await executeWriteFileTool({}, { fileExists: false, isPartial: true }) |
683 | | - await executeWriteFileTool({}, { fileExists: false, isPartial: true }) |
| 705 | + try { |
| 706 | + mockCline.diffViewProvider.open.mockRejectedValue( |
| 707 | + Object.assign(new Error("EROFS: read-only file system, mkdir '/scratch'"), { code: "EROFS" }), |
| 708 | + ) |
| 709 | + mockCline.finalizePartialToolAsk.mockRejectedValue(new Error("finalize failed")) |
684 | 710 |
|
685 | | - expect(mockCline.finalizePartialToolAsk).toHaveBeenCalled() |
686 | | - expect(mockCline.diffViewProvider.reset).toHaveBeenCalled() |
687 | | - expect(mockHandleError).not.toHaveBeenCalled() |
688 | | - expect(consoleErrorSpy).toHaveBeenCalledWith( |
689 | | - "Error finalizing write_to_file partial tool ask:", |
690 | | - expect.any(Error), |
691 | | - ) |
| 711 | + await executeWriteFileTool({}, { fileExists: false, isPartial: true }) |
| 712 | + await executeWriteFileTool({}, { fileExists: false, isPartial: true }) |
692 | 713 |
|
693 | | - consoleErrorSpy.mockRestore() |
| 714 | + expect(mockCline.finalizePartialToolAsk).toHaveBeenCalled() |
| 715 | + expect(mockCline.diffViewProvider.reset).toHaveBeenCalled() |
| 716 | + expect(mockHandleError).not.toHaveBeenCalled() |
| 717 | + expect(consoleErrorSpy).toHaveBeenCalledWith( |
| 718 | + "Error finalizing write_to_file partial tool ask:", |
| 719 | + expect.any(Error), |
| 720 | + ) |
| 721 | + } finally { |
| 722 | + consoleErrorSpy.mockRestore() |
| 723 | + } |
694 | 724 | }) |
695 | 725 |
|
696 | 726 | it.skipIf(process.platform === "win32")( |
|
0 commit comments