[Fix] Subtasks fail to return when users work across windows

scripts/stryker-diff.mjs

@@ -53,6 +53,12 @@ export const PACKAGE_CONFIGS = [
 		vitestConfig: "vitest.config.ts",
 		vitestRelated: false,
 		discoverRelatedTests: true,
+		testFilesBySource: {
+			"core/webview/ClineProvider.ts": [
+				"__tests__/history-resume-delegation.spec.ts",
+				"__tests__/provider-delegation.spec.ts",
+			],
+		},
 		excludedPaths: ["src/esbuild.mjs", "src/eslint.config.mjs", "src/utils/vitest-verbosity.ts"],
 	},
 ]
@@ -292,7 +298,7 @@ export function parseVitestTestFiles(report, runRoot) {
 	]
 }
 
-export function preferDirectTestFiles(testFiles, sourceFiles) {
+export function preferDirectTestFiles(testFiles, sourceFiles, testFilesBySource = {}) {
 	const sourceNames = sourceFiles.map((sourceFile) =>
 		path.posix.basename(sourceFile, path.posix.extname(sourceFile)).toLowerCase(),
 	)
@@ -304,10 +310,14 @@ export function preferDirectTestFiles(testFiles, sourceFiles) {
 			/\.(?:test|spec)(?:\.[^.]+)?\.[cm]?[jt]sx?$/.test(normalizedTestName)
 		)
 	}
-	if (sourceNames.some((sourceName) => !testFiles.some((testFile) => isDirectMatch(testFile, sourceName)))) {
-		return testFiles
-	}
-	return testFiles.filter((testFile) => sourceNames.some((sourceName) => isDirectMatch(testFile, sourceName)))
+	const hasIndirectSource = sourceNames.some(
+		(sourceName) => !testFiles.some((testFile) => isDirectMatch(testFile, sourceName)),
+	)
+	const selected = hasIndirectSource
+		? testFiles
+		: testFiles.filter((testFile) => sourceNames.some((sourceName) => isDirectMatch(testFile, sourceName)))
+	const configured = sourceFiles.flatMap((sourceFile) => testFilesBySource[sourceFile] ?? [])
+	return [...new Set([...selected, ...configured])]
 }
 
 export function shouldUseVitestRelated(packageEntry) {
@@ -360,6 +370,7 @@ export function discoverRelatedTestFiles(repoRoot, packageEntry, reportDirectory
 	const testFiles = preferDirectTestFiles(
 		parseVitestTestFiles(JSON.parse(fs.readFileSync(outputFile, "utf8")), runRoot),
 		sourceFiles,
+		packageEntry.testFilesBySource,
 	)
 	if (testFiles.length === 0)
 		throw new Error(`${packageEntry.id} has no tests related to the changed executable lines`)

scripts/stryker-diff.test.mjs

@@ -238,6 +238,28 @@ describe("preferDirectTestFiles", () => {
 
 		assert.deepEqual(preferDirectTestFiles(related, ["src/A.ts", "src/B.ts"]), related)
 	})
+
+	it("adds configured suites only for their mutated source and deduplicates them", () => {
+		const extension = PACKAGE_CONFIGS.find(({ id }) => id === "extension")
+		const related = [
+			"core/webview/__tests__/ClineProvider.spec.ts",
+			"__tests__/history-resume-delegation.spec.ts",
+			"__tests__/unrelated.spec.ts",
+		]
+
+		assert.deepEqual(
+			preferDirectTestFiles(related, ["core/webview/ClineProvider.ts"], extension.testFilesBySource),
+			[
+				"core/webview/__tests__/ClineProvider.spec.ts",
+				"__tests__/history-resume-delegation.spec.ts",
+				"__tests__/provider-delegation.spec.ts",
+			],
+		)
+		assert.deepEqual(
+			preferDirectTestFiles(related, ["core/webview/OtherProvider.ts"], extension.testFilesBySource),
+			related,
+		)
+	})
 })
 
 describe("shouldUseVitestRelated", () => {
@@ -249,7 +271,6 @@ describe("shouldUseVitestRelated", () => {
 	})
 })
 
-
 describe("related-test discovery", () => {
 	it("keeps Stryker's temp directory relative to each run root", () => {
 		assert.equal(resolveStrykerTempDir("/repo", "/repo"), ".stryker-tmp")

src/__tests__/delegation-concurrent.spec.ts

@@ -20,6 +20,7 @@ vi.mock("fs", () => ({
 }))
 
 vi.mock("../utils/safeWriteJson", () => ({
+	lockJsonFile: vi.fn().mockResolvedValue(async () => {}),
 	safeWriteJson: vi.fn().mockResolvedValue(undefined),
 }))
 

src/__tests__/helpers/provider-stub.ts

@@ -6,17 +6,22 @@ type ProviderStubFields = {
 	delegationTransitionLocks?: Map<string, Promise<void>>
 	cancelledDelegationChildIds?: Set<string>
 	log?: ReturnType<typeof vi.fn>
-	taskHistoryStore?: { get: (id: string) => unknown }
+	taskHistoryStore?: {
+		get: (id: string) => unknown
+		withTaskFileLock?: <T>(id: string, callback: () => Promise<T>) => Promise<T>
+	}
 	taskRegistry?: TaskRegistry
 	clineStack?: Task[]
 	tasks?: Task[]
 	runDelegationTransition?: unknown
+	runLockedDelegationTransition?: unknown
 	removeClineFromStack?: unknown
 	evictCurrentTask?: unknown
 }
 
 type PrivateProviderMethods = {
 	runDelegationTransition: (this: unknown, ...args: unknown[]) => unknown
+	runLockedDelegationTransition: (this: unknown, ...args: unknown[]) => unknown
 	removeClineFromStack: (this: unknown, ...args: unknown[]) => unknown
 	evictCurrentTask: (this: unknown, ...args: unknown[]) => unknown
 }
@@ -38,6 +43,7 @@ export function makeProviderStub<T extends object>(stub: T): ClineProvider {
 	s.cancelledDelegationChildIds ??= new Set()
 	s.log ??= vi.fn()
 	s.taskHistoryStore ??= { get: () => undefined }
+	s.taskHistoryStore.withTaskFileLock ??= async (_id, callback) => callback()
 
 	// Convert legacy clineStack array into a TaskRegistry
 	if (!s.taskRegistry) {
@@ -49,6 +55,7 @@ export function makeProviderStub<T extends object>(stub: T): ClineProvider {
 	delete s.clineStack
 
 	s.runDelegationTransition ??= proto.runDelegationTransition.bind(s)
+	s.runLockedDelegationTransition ??= proto.runLockedDelegationTransition.bind(s)
 	s.removeClineFromStack ??= proto.removeClineFromStack.bind(s)
 	s.evictCurrentTask ??= proto.evictCurrentTask.bind(s)
 	return s as unknown as ClineProvider