@nathapp/nax 0.62.0-canary.8 → 0.62.0

package/dist/nax.js

@@ -5404,79 +5404,25 @@ var init_extglob = __esm(() => {
   ];
 });
 
-// src/test-runners/detect/framework-configs.ts
+// src/test-runners/detect/framework-configs-deps.ts
+var _frameworkConfigDeps;
+var init_framework_configs_deps = __esm(() => {
+  _frameworkConfigDeps = {
+    readText: async (path) => {
+      const f = Bun.file(path);
+      if (!await f.exists())
+        return null;
+      return f.text();
+    },
+    parseToml: (text) => Bun.TOML.parse(text),
+    parseYaml: (text) => Bun.YAML.parse(text)
+  };
+});
+
+// src/test-runners/detect/framework-configs-python.ts
 function filterExcluded(patterns) {
   return patterns.filter((p) => !EXCLUDE_DIRS.some((d) => p.includes(`/${d}/`) || p.startsWith(`${d}/`)));
 }
-function normalize(patterns) {
-  return filterExcluded(expandExtglobAll(patterns));
-}
-async function parseVitestConfig(workdir) {
-  const candidates = ["vitest.config.ts", "vitest.config.mts", "vitest.config.js", "vitest.config.mjs"];
-  for (const name of candidates) {
-    const path = `${workdir}/${name}`;
-    const text = await _frameworkConfigDeps.readText(path);
-    if (!text)
-      continue;
-    const includeMatch = text.match(/include\s*:\s*\[([^\]]+)\]/s);
-    if (includeMatch) {
-      const patterns = extractStringLiterals(includeMatch[1]);
-      if (patterns.length > 0) {
-        return { type: "framework-config", path, patterns: normalize(patterns) };
-      }
-    }
-    return { type: "framework-config", path, patterns: [] };
-  }
-  return null;
-}
-async function parseJestConfig(workdir) {
-  const candidates = ["jest.config.ts", "jest.config.js", "jest.config.cjs", "jest.config.mjs", "jest.config.json"];
-  for (const name of candidates) {
-    const path = `${workdir}/${name}`;
-    const text = await _frameworkConfigDeps.readText(path);
-    if (!text)
-      continue;
-    if (name.endsWith(".json")) {
-      try {
-        const config = JSON.parse(text);
-        const patterns2 = extractJestPatternsFromObject(config);
-        return { type: "framework-config", path, patterns: normalize(patterns2) };
-      } catch {}
-    }
-    const patterns = extractJestPatterns(text);
-    return { type: "framework-config", path, patterns: normalize(patterns) };
-  }
-  const pkgPath = `${workdir}/package.json`;
-  const pkgText = await _frameworkConfigDeps.readText(pkgPath);
-  if (pkgText) {
-    try {
-      const pkg = JSON.parse(pkgText);
-      const jestConfig = pkg.jest;
-      if (jestConfig) {
-        const patterns = extractJestPatternsFromObject(jestConfig);
-        if (patterns.length > 0) {
-          return { type: "framework-config", path: `${pkgPath}#jest`, patterns: normalize(patterns) };
-        }
-      }
-    } catch {}
-  }
-  return null;
-}
-function extractJestPatterns(text) {
-  const matchMatch = text.match(/testMatch\s*:\s*\[([^\]]+)\]/s);
-  if (matchMatch) {
-    const patterns = extractStringLiterals(matchMatch[1]);
-    if (patterns.length > 0)
-      return patterns;
-  }
-  return [];
-}
-function extractJestPatternsFromObject(config) {
-  const testMatch = config.testMatch;
-  if (Array.isArray(testMatch))
-    return testMatch.filter((p) => typeof p === "string");
-  return [];
-}
 async function parsePyprojectToml(workdir) {
   const path = `${workdir}/pyproject.toml`;
   const text = await _frameworkConfigDeps.readText(path);
@@ -5510,7 +5456,7 @@ async function parsePyprojectToml(workdir) {
     if (patterns.length === 0) {
       patterns.push("test_*.py", "*_test.py");
     }
-    return { type: "framework-config", path, patterns: normalize(patterns) };
+    return { type: "framework-config", framework: "pytest", path, patterns: filterExcluded(patterns) };
   } catch {
     return null;
   }
@@ -5541,10 +5487,94 @@ async function parsePytestIni(workdir) {
     }
     if (patterns.length === 0)
       patterns.push("test_*.py", "*_test.py");
-    return { type: "framework-config", path, patterns: normalize(patterns) };
+    return { type: "framework-config", framework: "pytest", path, patterns: filterExcluded(patterns) };
   }
   return null;
 }
+var EXCLUDE_DIRS;
+var init_framework_configs_python = __esm(() => {
+  init_framework_configs_deps();
+  EXCLUDE_DIRS = ["node_modules", "dist", "build", ".nax", "coverage", ".git"];
+});
+
+// src/test-runners/detect/framework-configs.ts
+function filterExcluded2(patterns) {
+  return patterns.filter((p) => !EXCLUDE_DIRS2.some((d) => p.includes(`/${d}/`) || p.startsWith(`${d}/`)));
+}
+function normalize(patterns) {
+  return filterExcluded2(expandExtglobAll(patterns));
+}
+async function parseVitestConfig(workdir) {
+  const candidates = ["vitest.config.ts", "vitest.config.mts", "vitest.config.js", "vitest.config.mjs"];
+  for (const name of candidates) {
+    const path = `${workdir}/${name}`;
+    const text = await _frameworkConfigDeps.readText(path);
+    if (!text)
+      continue;
+    const includeMatch = text.match(/include\s*:\s*\[([^\]]+)\]/s);
+    if (includeMatch) {
+      const patterns = extractStringLiterals(includeMatch[1]);
+      if (patterns.length > 0) {
+        return { type: "framework-config", framework: "vitest", path, patterns: normalize(patterns) };
+      }
+    }
+    return { type: "framework-config", framework: "vitest", path, patterns: [] };
+  }
+  return null;
+}
+async function parseJestConfig(workdir) {
+  const candidates = ["jest.config.ts", "jest.config.js", "jest.config.cjs", "jest.config.mjs", "jest.config.json"];
+  for (const name of candidates) {
+    const path = `${workdir}/${name}`;
+    const text = await _frameworkConfigDeps.readText(path);
+    if (!text)
+      continue;
+    if (name.endsWith(".json")) {
+      try {
+        const config = JSON.parse(text);
+        const patterns2 = extractJestPatternsFromObject(config);
+        return { type: "framework-config", framework: "jest", path, patterns: normalize(patterns2) };
+      } catch {}
+    }
+    const patterns = extractJestPatterns(text);
+    return { type: "framework-config", framework: "jest", path, patterns: normalize(patterns) };
+  }
+  const pkgPath = `${workdir}/package.json`;
+  const pkgText = await _frameworkConfigDeps.readText(pkgPath);
+  if (pkgText) {
+    try {
+      const pkg = JSON.parse(pkgText);
+      const jestConfig = pkg.jest;
+      if (jestConfig) {
+        const patterns = extractJestPatternsFromObject(jestConfig);
+        if (patterns.length > 0) {
+          return {
+            type: "framework-config",
+            framework: "jest",
+            path: `${pkgPath}#jest`,
+            patterns: normalize(patterns)
+          };
+        }
+      }
+    } catch {}
+  }
+  return null;
+}
+function extractJestPatterns(text) {
+  const matchMatch = text.match(/testMatch\s*:\s*\[([^\]]+)\]/s);
+  if (matchMatch) {
+    const patterns = extractStringLiterals(matchMatch[1]);
+    if (patterns.length > 0)
+      return patterns;
+  }
+  return [];
+}
+function extractJestPatternsFromObject(config) {
+  const testMatch = config.testMatch;
+  if (Array.isArray(testMatch))
+    return testMatch.filter((p) => typeof p === "string");
+  return [];
+}
 async function parseMochaConfig(workdir) {
   const candidates = [".mocharc.js", ".mocharc.cjs", ".mocharc.yaml", ".mocharc.yml", ".mocharc.json"];
   for (const name of candidates) {
@@ -5561,15 +5591,16 @@ async function parseMochaConfig(workdir) {
       } else {
         const specMatch = text.match(/spec\s*:\s*['"]([^'"]+)['"]/);
         if (specMatch) {
-          return { type: "framework-config", path, patterns: normalize([specMatch[1]]) };
+          return { type: "framework-config", framework: "mocha", path, patterns: normalize([specMatch[1]]) };
         }
-        continue;
+        return { type: "framework-config", framework: "mocha", path, patterns: [] };
       }
       const spec = config.spec;
       const patterns = Array.isArray(spec) ? spec.filter((p) => typeof p === "string") : typeof spec === "string" ? [spec] : [];
       if (patterns.length > 0) {
-        return { type: "framework-config", path, patterns: normalize(patterns) };
+        return { type: "framework-config", framework: "mocha", path, patterns: normalize(patterns) };
       }
+      return { type: "framework-config", framework: "mocha", path, patterns: [] };
     } catch {}
   }
   return null;
@@ -5591,9 +5622,9 @@ async function parsePlaywrightConfig(workdir) {
       patterns.push(...extracted);
     }
     if (patterns.length > 0) {
-      return { type: "framework-config", path, patterns: normalize(patterns) };
+      return { type: "framework-config", framework: "playwright", path, patterns: normalize(patterns) };
     }
-    return { type: "framework-config", path, patterns: ["**/*.spec.ts", "**/*.spec.js"] };
+    return { type: "framework-config", framework: "playwright", path, patterns: [] };
   }
   return null;
 }
@@ -5606,9 +5637,14 @@ async function parseCypressConfig(workdir) {
       continue;
     const specMatch = text.match(/specPattern\s*:\s*['"]([^'"]+)['"]/);
     if (specMatch) {
-      return { type: "framework-config", path, patterns: normalize([specMatch[1]]) };
+      return { type: "framework-config", framework: "cypress", path, patterns: normalize([specMatch[1]]) };
     }
-    return { type: "framework-config", path, patterns: normalize(["cypress/e2e/**/*.cy.{js,ts}"]) };
+    return {
+      type: "framework-config",
+      framework: "cypress",
+      path,
+      patterns: normalize(["cypress/e2e/**/*.cy.{js,ts}"])
+    };
   }
   return null;
 }
@@ -5638,11 +5674,11 @@ async function parseViteConfig(workdir) {
       if (includeMatch) {
         const patterns = extractStringLiterals(includeMatch[1]);
         if (patterns.length > 0) {
-          return { type: "framework-config", path, patterns: normalize(patterns) };
+          return { type: "framework-config", framework: "vitest", path, patterns: normalize(patterns) };
         }
       }
     }
-    return { type: "framework-config", path, patterns: [] };
+    return { type: "framework-config", framework: "vitest", path, patterns: [] };
   }
   return null;
 }
@@ -5660,6 +5696,7 @@ async function parseBunfig(workdir) {
   }
   return {
     type: "framework-config",
+    framework: "bun",
     path,
     patterns: normalize([
       "**/*.test.{ts,tsx,js,jsx,mjs,cjs}",
@@ -5703,20 +5740,13 @@ async function detectFromFrameworkConfigs(workdir) {
   ]);
   return results.filter((r) => r !== null);
 }
-var EXCLUDE_DIRS, _frameworkConfigDeps;
+var EXCLUDE_DIRS2;
 var init_framework_configs = __esm(() => {
   init_extglob();
-  EXCLUDE_DIRS = ["node_modules", "dist", "build", ".nax", "coverage", ".git"];
-  _frameworkConfigDeps = {
-    readText: async (path) => {
-      const f = Bun.file(path);
-      if (!await f.exists())
-        return null;
-      return f.text();
-    },
-    parseToml: (text) => Bun.TOML.parse(text),
-    parseYaml: (text) => Bun.YAML.parse(text)
-  };
+  init_framework_configs_deps();
+  init_framework_configs_python();
+  init_framework_configs_deps();
+  EXCLUDE_DIRS2 = ["node_modules", "dist", "build", ".nax", "coverage", ".git"];
 });
 
 // src/test-runners/detect/framework-defaults.ts
@@ -5724,58 +5754,71 @@ async function detectFromPackageJson(workdir) {
   const path = `${workdir}/package.json`;
   const text = await _frameworkDefaultsDeps.readText(path);
   if (!text)
-    return null;
+    return [];
   let pkg;
   try {
     pkg = JSON.parse(text);
   } catch {
-    return null;
+    return [];
   }
   const devDeps = pkg.devDependencies ?? {};
   const deps = pkg.dependencies ?? {};
   const allDeps = { ...deps, ...devDeps };
-  for (const [framework, patterns] of Object.entries(JS_FRAMEWORK_DEFAULTS)) {
-    if (framework in allDeps) {
-      return { type: "manifest", path, patterns: expandExtglobAll(patterns) };
+  const results = [];
+  for (const { depKey, framework, patterns } of JS_FRAMEWORK_DEFAULTS) {
+    if (depKey in allDeps) {
+      results.push({ type: "manifest", framework, path, patterns: expandExtglobAll(patterns) });
     }
   }
+  if (results.length > 0)
+    return results;
   const scripts = pkg.scripts;
   const testScript = typeof scripts?.test === "string" ? scripts.test : "";
   if (testScript.includes("bun test")) {
-    return { type: "manifest", path, patterns: expandExtglobAll(BUN_TEST_DEFAULTS) };
+    return [{ type: "manifest", framework: "bun", path, patterns: expandExtglobAll(BUN_TEST_DEFAULTS) }];
   }
-  return null;
+  return [];
 }
 async function detectFromGoMod(workdir) {
   const path = `${workdir}/go.mod`;
   if (!await _frameworkDefaultsDeps.fileExists(path))
     return null;
-  return { type: "manifest", path, patterns: ["**/*_test.go"] };
+  return { type: "manifest", framework: "go", path, patterns: ["**/*_test.go"] };
 }
 async function detectFromCargoToml(workdir) {
   const path = `${workdir}/Cargo.toml`;
   if (!await _frameworkDefaultsDeps.fileExists(path))
     return null;
-  return { type: "manifest", path, patterns: ["tests/**/*.rs", "src/**/*.rs"] };
+  return { type: "manifest", framework: "rust", path, patterns: ["tests/**/*.rs", "src/**/*.rs"] };
 }
 async function detectFromPyprojectDeps(workdir) {
   const path = `${workdir}/pyproject.toml`;
   const text = await _frameworkDefaultsDeps.readText(path);
   if (!text)
     return null;
-  if (text.includes("pytest")) {
-    return { type: "manifest", path, patterns: ["test_*.py", "*_test.py", "tests/**/*.py"] };
-  }
-  return null;
+  const PYTEST_DEP_RE = /(?:^[ \t]*["']?pytest(?![-\w]))|(?:["']pytest(?![-\w])(?:[>=~!<][^"']*)?["'])/m;
+  if (!PYTEST_DEP_RE.test(text))
+    return null;
+  return {
+    type: "manifest",
+    framework: "pytest",
+    path,
+    patterns: ["test_*.py", "*_test.py", "tests/**/*.py"]
+  };
 }
 async function detectFromFrameworkDefaults(workdir) {
-  const results = await Promise.all([
+  const [pkgJsonSources, goSource, cargoSource, pyprojectSource] = await Promise.all([
     detectFromPackageJson(workdir),
     detectFromGoMod(workdir),
     detectFromCargoToml(workdir),
     detectFromPyprojectDeps(workdir)
   ]);
-  return results.filter((r) => r !== null);
+  return [
+    ...pkgJsonSources,
+    ...goSource ? [goSource] : [],
+    ...cargoSource ? [cargoSource] : [],
+    ...pyprojectSource ? [pyprojectSource] : []
+  ];
 }
 var _frameworkDefaultsDeps, JS_FRAMEWORK_DEFAULTS, BUN_TEST_DEFAULTS;
 var init_framework_defaults = __esm(() => {
@@ -5789,14 +5832,18 @@ var init_framework_defaults = __esm(() => {
     },
     fileExists: async (path) => Bun.file(path).exists()
   };
-  JS_FRAMEWORK_DEFAULTS = {
-    vitest: ["**/*.{test,spec}.?(c|m)[jt]s?(x)"],
-    jest: ["**/__tests__/**/*.[jt]s?(x)", "**/?(*.)+(spec|test).[jt]s?(x)"],
-    mocha: ["test/**/*.{js,mjs,cjs}", "**/*.spec.{js,ts}"],
-    jasmine: ["spec/**/*.js"],
-    "@playwright/test": ["**/*.spec.ts", "**/*.spec.js"],
-    cypress: ["cypress/e2e/**/*.cy.{js,jsx,ts,tsx}"]
-  };
+  JS_FRAMEWORK_DEFAULTS = [
+    { depKey: "vitest", framework: "vitest", patterns: ["**/*.{test,spec}.?(c|m)[jt]s?(x)"] },
+    {
+      depKey: "jest",
+      framework: "jest",
+      patterns: ["**/__tests__/**/*.[jt]s?(x)", "**/?(*.)+(spec|test).[jt]s?(x)"]
+    },
+    { depKey: "mocha", framework: "mocha", patterns: ["test/**/*.{js,mjs,cjs}", "**/*.spec.{js,ts}"] },
+    { depKey: "jasmine", framework: "jasmine", patterns: ["spec/**/*.js"] },
+    { depKey: "@playwright/test", framework: "playwright", patterns: ["**/*.spec.ts", "**/*.spec.js"] },
+    { depKey: "cypress", framework: "cypress", patterns: ["cypress/e2e/**/*.cy.{js,jsx,ts,tsx}"] }
+  ];
   BUN_TEST_DEFAULTS = [
     "**/*.test.{ts,tsx,js,jsx,mjs,cjs}",
     "**/*_test.{ts,tsx,js,jsx,mjs,cjs}",
@@ -5848,7 +5895,9 @@ async function detectForDirectory(workdir) {
   const logger = getSafeLogger();
   const tier1Sources = await detectFromFrameworkConfigs(workdir);
   const tier1Patterns = tier1Sources.flatMap((s) => [...s.patterns]);
-  const tier2Sources = await detectFromFrameworkDefaults(workdir);
+  const tier1FrameworksWithPatterns = new Set(tier1Sources.filter((s) => s.patterns.length > 0 && s.framework !== undefined).map((s) => s.framework));
+  const tier2SourcesAll = await detectFromFrameworkDefaults(workdir);
+  const tier2Sources = tier2SourcesAll.filter((s) => !s.framework || !tier1FrameworksWithPatterns.has(s.framework));
   const tier2Patterns = tier2Sources.flatMap((s) => [...s.patterns]);
   const tier3Source = await detectFromFileScan(workdir);
   const tier3Patterns = tier3Source ? [...tier3Source.patterns] : [];
@@ -39351,7 +39400,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.62.0-canary.8",
+    version: "0.62.0",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -39431,8 +39480,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("3ae84665"))
-        return "3ae84665";
+      if (/^[0-9a-f]{6,10}$/.test("2aa5324d"))
+        return "2aa5324d";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nathapp/nax",
-  "version": "0.62.0-canary.8",
+  "version": "0.62.0",
   "description": "AI Coding Agent Orchestrator — loops until done",
   "type": "module",
   "bin": {