test(importRooTaskHistory): check that only one import writes atomically

Author: edelauna

src/core/task-persistence/__tests__/importRooTaskHistory.spec.ts

@@ -561,4 +561,48 @@ describe("importRooTaskHistory", () => {
 			code: "ENOTDIR",
 		})
 	})
+
+	it("imports the complete file set when two calls run concurrently against the same Roo task", async () => {
+		const zooGlobalStoragePath = path.join(tempRoot, "globalStorage", "zoocodeorganization.zoo-code")
+		const rooDefaultStorageRoot = path.join(tempRoot, "globalStorage", "rooveterinaryinc.roo-cline")
+
+		mockStorageConfiguration()
+
+		await fs.mkdir(path.join(rooDefaultStorageRoot, "tasks", "task-concurrent"), { recursive: true })
+		await fs.writeFile(
+			path.join(rooDefaultStorageRoot, "tasks", "task-concurrent", "history_item.json"),
+			makeHistoryItem("task-concurrent"),
+		)
+		await fs.writeFile(
+			path.join(rooDefaultStorageRoot, "tasks", "task-concurrent", "ui_messages.json"),
+			"concurrent-ui",
+		)
+		await fs.writeFile(
+			path.join(rooDefaultStorageRoot, "tasks", "task-concurrent", "api_conversation_history.json"),
+			"concurrent-api",
+		)
+
+		const [result1, result2] = await Promise.all([
+			importRooTaskHistory(zooGlobalStoragePath),
+			importRooTaskHistory(zooGlobalStoragePath),
+		])
+
+		// Exactly one call should win the atomic rename; the other should skip gracefully.
+		expect(result1.importedTaskCount + result2.importedTaskCount).toBe(1)
+
+		const destTaskDir = path.join(zooGlobalStoragePath, "tasks", "task-concurrent")
+
+		// The winning import must have written all three files completely.
+		expect(await fs.readFile(path.join(destTaskDir, "history_item.json"), "utf8")).toBe(
+			makeHistoryItem("task-concurrent"),
+		)
+		expect(await fs.readFile(path.join(destTaskDir, "ui_messages.json"), "utf8")).toBe("concurrent-ui")
+		expect(await fs.readFile(path.join(destTaskDir, "api_conversation_history.json"), "utf8")).toBe(
+			"concurrent-api",
+		)
+
+		// No staging directories should be left behind.
+		const tasksEntries = await fs.readdir(path.join(zooGlobalStoragePath, "tasks"))
+		expect(tasksEntries.filter((e) => e.startsWith("_staging_"))).toHaveLength(0)
+	})
 })

src/core/task-persistence/importRooTaskHistory.ts

@@ -280,10 +280,10 @@ export const importRooTaskHistory = async (
 			continue
 		}
 
-		// Stage into a temp directory, then atomically rename to avoid leaving
-		// partial task directories that a retry would skip as already-present.
-		const stagingDirectory = path.join(destinationTasksRoot, `_staging_${taskPlan.taskId}`)
-		await fs.rm(stagingDirectory, { recursive: true, force: true })
+		// Stage into a unique temp directory, then atomically rename to avoid
+		// leaving partial task directories that a retry would skip as already-present.
+		// Using mkdtemp ensures concurrent imports for the same task ID don't collide.
+		const stagingDirectory = await fs.mkdtemp(path.join(destinationTasksRoot, `_staging_${taskPlan.taskId}_`))
 		stagingFileCount = 0
 
 		try {