Skip to content

Commit d95df41

Browse files
committed
fix(task): cover cleanup completion branches
1 parent 444e9c7 commit d95df41

2 files changed

Lines changed: 30 additions & 15 deletions

File tree

‎src/core/task/Task.ts‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2516,7 +2516,6 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
25162516

25172517
public dispose(): Promise<void> {
25182518
console.log(`[Task#dispose] disposing task ${this.taskId}.${this.instanceId}`)
2519-
const pendingCleanup: Promise<void>[] = []
25202519

25212520
// Stop the idle telemetry check and report any unflushed activity as a
25222521
// shutdown installment, so a task torn down mid-work (panel closed, task
@@ -2564,16 +2563,14 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
25642563
}
25652564

25662565
// Cleanup command output artifacts
2567-
pendingCleanup.push(
2568-
getTaskDirectoryPath(this.globalStoragePath, this.taskId)
2569-
.then((taskDir) => {
2570-
const outputDir = path.join(taskDir, "command-output")
2571-
return OutputInterceptor.cleanup(outputDir)
2572-
})
2573-
.catch((error) => {
2574-
console.error("Error cleaning up command output artifacts:", error)
2575-
}),
2576-
)
2566+
let pendingCleanup = getTaskDirectoryPath(this.globalStoragePath, this.taskId)
2567+
.then((taskDir) => {
2568+
const outputDir = path.join(taskDir, "command-output")
2569+
return OutputInterceptor.cleanup(outputDir)
2570+
})
2571+
.catch((error) => {
2572+
console.error("Error cleaning up command output artifacts:", error)
2573+
})
25772574

25782575
try {
25792576
if (this.rooIgnoreController) {
@@ -2594,13 +2591,14 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
25942591
try {
25952592
// If we're not streaming then `abortStream` won't be called.
25962593
if (this.isStreaming && this.diffViewProvider.isEditing) {
2597-
pendingCleanup.push(this.diffViewProvider.revertChanges().catch(console.error))
2594+
const pendingReversion = this.diffViewProvider.revertChanges().catch(console.error)
2595+
pendingCleanup = pendingCleanup.then(() => pendingReversion)
25982596
}
25992597
} catch (error) {
26002598
console.error("Error reverting diff changes:", error)
26012599
}
26022600

2603-
return Promise.all(pendingCleanup).then(() => undefined)
2601+
return pendingCleanup
26042602
}
26052603

26062604
// Subtasks

‎src/core/task/__tests__/Task.dispose.test.ts‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import path from "node:path"
2+
13
import { type ProviderSettings, RooCodeEventName } from "@roo-code/types"
24

35
import { Task } from "../Task"
@@ -107,26 +109,41 @@ describe("Task dispose method", () => {
107109
resolveTaskDirectory!("/test/path/tasks/test-task")
108110
await disposal
109111

110-
expect(OutputInterceptor.cleanup).toHaveBeenCalledWith("/test/path/tasks/test-task/command-output")
112+
expect(OutputInterceptor.cleanup).toHaveBeenCalledWith(
113+
path.join("/test/path/tasks/test-task", "command-output"),
114+
)
111115
expect(disposalComplete).toBe(true)
112116
})
113117

118+
test("should report command output cleanup failures before disposal completes", async () => {
119+
const cleanupError = new Error("cleanup failed")
120+
const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {})
121+
vi.mocked(getTaskDirectoryPath).mockRejectedValueOnce(cleanupError)
122+
123+
await task.dispose()
124+
125+
expect(consoleErrorSpy).toHaveBeenCalledWith("Error cleaning up command output artifacts:", cleanupError)
126+
consoleErrorSpy.mockRestore()
127+
})
128+
114129
test("should expose completion of deferred diff reversion", async () => {
115130
let resolveReversion: () => void
116131
const reversion = new Promise<void>((resolve) => {
117132
resolveReversion = resolve
118133
})
119134
task.isStreaming = true
120135
task.diffViewProvider.isEditing = true
121-
vi.spyOn(task.diffViewProvider, "revertChanges").mockReturnValue(reversion)
136+
const revertChangesSpy = vi.spyOn(task.diffViewProvider, "revertChanges").mockReturnValue(reversion)
122137

123138
const disposal = task.dispose()
139+
await vi.waitFor(() => expect(OutputInterceptor.cleanup).toHaveBeenCalled())
124140
let disposalComplete = false
125141
void disposal.then(() => {
126142
disposalComplete = true
127143
})
128144
await Promise.resolve()
129145
expect(disposalComplete).toBe(false)
146+
expect(revertChangesSpy).toHaveBeenCalledOnce()
130147

131148
resolveReversion!()
132149
await disposal

0 commit comments

Comments
 (0)