@vitest-agent/plugin 2.1.0 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vitest-agent/plugin",
-	"version": "2.1.0",
+	"version": "2.2.0",
 	"private": false,
 	"description": "Vitest plugin for the vitest-agent ecosystem: owns persistence, classification, baselines, trends, and dispatches rendering to a configurable reporter.",
 	"keywords": [
@@ -42,10 +42,10 @@
 		"@effect/platform-node": "4.0.0-beta.107",
 		"@effect/sql-sqlite-node": "4.0.0-beta.107",
 		"@effected/workspaces": "^0.11.1",
-		"@vitest-agent/cli": "2.0.17",
-		"@vitest-agent/mcp": "2.1.2",
-		"@vitest-agent/reporter": "2.0.17",
-		"@vitest-agent/sdk": "2.1.0",
+		"@vitest-agent/cli": "2.1.0",
+		"@vitest-agent/mcp": "2.1.3",
+		"@vitest-agent/reporter": "2.0.18",
+		"@vitest-agent/sdk": "2.2.0",
 		"effect": "4.0.0-beta.107",
 		"magic-string": "^1.1.0"
 	},

package/plugin.js

@@ -9,7 +9,7 @@ import { injectTags } from "./utils/inject-tags.js";
 import { isBenignViteSourceMapWarning } from "./utils/is-benign-vite-source-map-warning.js";
 import { stripConsoleReporters } from "./utils/strip-console-reporters.js";
 import { execSync } from "node:child_process";
-import { AgentConsoleMode, CiConsoleMode, CoverageLevel, EnvironmentDetector, EnvironmentDetectorLive, HumanConsoleMode, formatFatalError, resolveLogLevel } from "@vitest-agent/sdk";
+import { AgentConsoleMode, CiConsoleMode, CoverageLevel, EnvironmentDetector, EnvironmentDetectorLive, HumanConsoleMode, SRC_DIR, TEST_DIR, formatFatalError, isTestFileName, resolveLogLevel } from "@vitest-agent/sdk";
 import { Effect, Schema } from "effect";
 
 //#region src/plugin.ts
@@ -98,10 +98,9 @@ const aggregatedReporterByVitest = /* @__PURE__ */ new WeakSet();
 *
 * @public
 */
-const CURRENT_PLUGIN_VERSION = "2.1.0";
-const TEST_FILE_SUFFIX_RE = /\.(?:test|spec)\.(?:ts|tsx|js|jsx)$/;
-const TEST_FILE_DIR_RE = /\/(?:src|__test__)\//;
-const isTestFile = (id) => TEST_FILE_SUFFIX_RE.test(id) && TEST_FILE_DIR_RE.test(id);
+const CURRENT_PLUGIN_VERSION = "2.2.0";
+const TEST_FILE_DIR_RE = new RegExp(`/(?:${SRC_DIR}|${TEST_DIR})/`);
+const isTestFile = (id) => isTestFileName(id) && TEST_FILE_DIR_RE.test(id);
 /**
 * Map a detected {@link Environment} to its {@link Executor}. Inline copy
 * of the `ExecutorResolverLive` mapping so the plugin can compute it

package/utils/discover-projects.js

@@ -1,5 +1,6 @@
 import { toPosixPath } from "./to-posix-path.js";
 import { DefaultDiscoverStrategy } from "./discover-strategy.js";
+import { NON_DISCOVERABLE_DIRS, SRC_DIR, TEST_DIR } from "@vitest-agent/sdk";
 import { isAbsolute, join, normalize, relative } from "node:path";
 import { readdir, stat } from "node:fs/promises";
 import { findWorkspaceRootSync, getWorkspacePackagesSync } from "@effected/workspaces";
@@ -11,49 +12,6 @@ function recordDiscoveryScanTimestamp() {
 	globalThis[DISCOVERY_LAST_SCAN_SYMBOL] = (/* @__PURE__ */ new Date()).toISOString();
 }
 const _cache = /* @__PURE__ */ new Map();
-const SIGNATURE_SKIP_DIRS = /* @__PURE__ */ new Set([
-	"node_modules",
-	".git",
-	"dist"
-]);
-/**
-* Recursively finds every directory named `__test__` under `root` (issue
-* #184: nested `__test__` dirs like `lib/scripts/__test__/` must invalidate
-* the cache too, not just a package-root `__test__/`) and records every
-* nested `package.json` (path + mtime) as a traversal-boundary marker. Skips
-* `node_modules`, `.git`, and `dist` — see `SIGNATURE_SKIP_DIRS`. Stat-only:
-* entries and mtimes are read, never file content. The root's own
-* `package.json` is excluded — it is not a boundary for its own walk, and
-* version bumps would otherwise churn the signature.
-*/
-async function findNestedTestDirs(root) {
-	const testDirs = [];
-	const boundaries = [];
-	await walkForTestDirs(root, root, testDirs, boundaries);
-	return {
-		testDirs: testDirs.sort(),
-		boundaries: boundaries.sort()
-	};
-}
-async function walkForTestDirs(root, dir, testDirs, boundaries) {
-	let entries;
-	try {
-		entries = await readdir(dir, { withFileTypes: true });
-	} catch {
-		return;
-	}
-	for (const ent of entries) {
-		const fullPath = join(dir, ent.name);
-		if (ent.isDirectory()) {
-			if (SIGNATURE_SKIP_DIRS.has(ent.name)) continue;
-			if (ent.name === "__test__") testDirs.push(fullPath);
-			await walkForTestDirs(root, fullPath, testDirs, boundaries);
-		} else if (ent.isFile() && ent.name === "package.json" && dir !== root) try {
-			const mtimeMs = (await stat(fullPath)).mtimeMs;
-			boundaries.push(`${toPosixPath(relative(root, fullPath))}:${mtimeMs}`);
-		} catch {}
-	}
-}
 /**
 * Computes a cheap signature (relative path + mtimeMs pairs, sorted) for every
 * file nested under `dirPath`. Used to detect added/removed/moved/renamed test
@@ -62,11 +20,10 @@ async function walkForTestDirs(root, dir, testDirs, boundaries) {
 * a stable, comparable signature contribution.
 *
 * Manual per-directory walk (not a single `readdir({ recursive: true })`
-* call) pruning `SIGNATURE_SKIP_DIRS` *before* recursing — same reasoning as
-* `findNestedTestDirs`: a found `__test__` dir can itself contain a fixture
-* `node_modules` (e.g. a subprocess-e2e fixture that installs deps), and
-* Node's recursive `readdir` follows symlinked directories, so an unguarded
-* call would walk into it.
+* call) pruning `NON_DISCOVERABLE_DIRS` *before* recursing: a `src/` or
+* `__test__/` dir can itself contain a fixture `node_modules` (e.g. a
+* subprocess-e2e fixture that installs deps), and Node's recursive `readdir`
+* follows symlinked directories, so an unguarded call would walk into it.
 */
 async function computeDirSignature(dirPath) {
 	const parts = [];
@@ -84,7 +41,7 @@ async function walkDirSignature(root, dir, parts) {
 	for (const ent of entries) {
 		const fullPath = join(dir, ent.name);
 		if (ent.isDirectory()) {
-			if (SIGNATURE_SKIP_DIRS.has(ent.name)) continue;
+			if (NON_DISCOVERABLE_DIRS.has(ent.name)) continue;
 			await walkDirSignature(root, fullPath, parts);
 		} else if (ent.isFile()) {
 			let mtimeMs;
@@ -99,25 +56,22 @@ async function walkDirSignature(root, dir, parts) {
 	}
 }
 /**
-* Computes a cheap whole-workspace directory signature by combining each
-* package's `src/` signature with every nested `__test__/` dir's signature
-* (issue #100, extended by issue #184 to see `__test__` dirs at any depth,
-* not just a package-root `__test__/`). Only entries + mtimes are read — no
-* file content — so this stays fast even for large monorepos. A changed
+* Computes a cheap whole-workspace directory signature from each package's
+* `src/` and `__test__/` directories (issue #100). Only entries + mtimes are
+* read — no file content — so this stays fast for large monorepos. A changed
 * signature means a test file was added, removed, moved, or renamed since
 * the cached result was computed.
+*
+* Only the two anchored directories are fingerprinted. Discovery cannot see a
+* test file anywhere else, so nothing else can change the emitted project list
+* (issue #227).
 */
 async function computeWorkspaceSignature(packages) {
 	const parts = [];
 	for (const pkg of packages) {
-		const srcSig = await computeDirSignature(join(pkg.path, "src"));
-		const { testDirs, boundaries } = await findNestedTestDirs(pkg.path);
-		const testDirParts = [];
-		for (const dir of testDirs) {
-			const sig = await computeDirSignature(dir);
-			testDirParts.push(`${toPosixPath(relative(pkg.path, dir))}=${sig}`);
-		}
-		parts.push(`${pkg.path}::src=${srcSig}::__test__=${testDirParts.join(";")}::boundaries=${boundaries.join(";")}`);
+		const srcSig = await computeDirSignature(join(pkg.path, SRC_DIR));
+		const testSig = await computeDirSignature(join(pkg.path, TEST_DIR));
+		parts.push(`${pkg.path}::src=${srcSig}::__test__=${testSig}`);
 	}
 	return parts.join("\n");
 }

package/utils/discover-strategy.js

@@ -1,5 +1,6 @@
 import { findTestFiles } from "./find-test-files.js";
 import { Tag } from "./tag.js";
+import { NON_DISCOVERABLE_DIRS, SRC_DIR, TEST_DIR, TEST_FILE_GLOB_SUFFIX, TEST_HELPER_DIRS } from "@vitest-agent/sdk";
 import { join, sep } from "node:path";
 import { stat } from "node:fs/promises";
 import { configDefaults } from "vitest/config";
@@ -11,11 +12,6 @@ const SETUP_EXTS = [
 	"js",
 	"jsx"
 ];
-const TEST_DIR_HELPER_DIRS = [
-	"utils",
-	"fixtures",
-	"snapshots"
-];
 async function isFile(p) {
 	try {
 		return (await stat(p)).isFile();
@@ -116,19 +112,19 @@ var DefaultDiscoverStrategy = class extends DiscoverStrategy {
 		return ["unit"];
 	}
 	async buildProject(input) {
-		const srcPrefix = join(input.path, "src");
-		const allFiles = await findTestFiles(input.path, ["src/**/*.{test,spec}.{ts,tsx,js,jsx}", "**/__test__/**/*.{test,spec}.{ts,tsx,js,jsx}"]);
+		const srcPrefix = join(input.path, SRC_DIR);
+		const allFiles = await findTestFiles(input.path, [`${SRC_DIR}/**/${TEST_FILE_GLOB_SUFFIX}`, `${TEST_DIR}/**/${TEST_FILE_GLOB_SUFFIX}`]);
 		if (allFiles.length === 0) return null;
 		const hasSrcTests = allFiles.some((f) => f.startsWith(`${srcPrefix}${sep}`) || f === srcPrefix);
 		const hasTestDirTests = allFiles.some((f) => !(f.startsWith(`${srcPrefix}${sep}`) || f === srcPrefix));
 		const include = [];
-		if (hasSrcTests) include.push(join(input.path, "src/**/*.{test,spec}.{ts,tsx,js,jsx}"));
-		if (hasTestDirTests) include.push(join(input.path, "**/__test__/**/*.{test,spec}.{ts,tsx,js,jsx}"));
-		const exclude = hasTestDirTests ? [
+		if (hasSrcTests) include.push(join(input.path, SRC_DIR, "**", TEST_FILE_GLOB_SUFFIX));
+		if (hasTestDirTests) include.push(join(input.path, TEST_DIR, "**", TEST_FILE_GLOB_SUFFIX));
+		const exclude = [
 			...configDefaults.exclude,
-			join(input.path, "**/dist/**"),
-			...TEST_DIR_HELPER_DIRS.map((d) => join(input.path, `**/__test__/${d}/**`))
-		] : void 0;
+			...[SRC_DIR, TEST_DIR].flatMap((root) => [...NON_DISCOVERABLE_DIRS].map((d) => join(input.path, root, "**", d, "**"))),
+			...hasTestDirTests ? TEST_HELPER_DIRS.map((d) => join(input.path, TEST_DIR, "**", d, "**")) : []
+		];
 		const setupFile = await detectSetupFile(input.path);
 		return {
 			extends: true,
@@ -136,7 +132,7 @@ var DefaultDiscoverStrategy = class extends DiscoverStrategy {
 				name: input.name,
 				environment: "node",
 				include,
-				...exclude ? { exclude } : {},
+				exclude,
 				...setupFile ? { setupFiles: [join(input.path, setupFile)] } : {}
 			}
 		};

package/utils/find-test-files.js

@@ -1,13 +1,9 @@
 import { toPosixPath } from "./to-posix-path.js";
+import { NON_DISCOVERABLE_DIRS } from "@vitest-agent/sdk";
 import { join, relative } from "node:path";
 import { readdir } from "node:fs/promises";
 
 //#region src/utils/find-test-files.ts
-const SKIP_DIRS = /* @__PURE__ */ new Set([
-	"node_modules",
-	".git",
-	"dist"
-]);
 function globToRegex(pattern) {
 	const alts = expandBraces(pattern).map(toRegexFragment);
 	return new RegExp(`^(?:${alts.join("|")})$`);
@@ -90,7 +86,7 @@ async function walkDir(root, dir, matchers, results) {
 	}
 	if (dir !== root && entries.some((ent) => ent.isFile() && ent.name === "package.json")) return;
 	for (const ent of entries) {
-		if (SKIP_DIRS.has(ent.name)) continue;
+		if (NON_DISCOVERABLE_DIRS.has(ent.name)) continue;
 		const fullPath = join(dir, ent.name);
 		if (ent.isDirectory()) await walkDir(root, fullPath, matchers, results);
 		else if (ent.isFile()) {