@nathapp/nax 0.62.0-canary.7 → 0.62.0

package/dist/nax.js

@@ -4976,21 +4976,54 @@ Rules:`, STEP3_SHARED_RULES = `- **One test per AC**, named exactly "AC-N: <desc
 var init_acceptance_builder = () => {};
 
 // src/test-runners/conventions.ts
-function suffixRegex(pattern) {
-  const lastStar = pattern.lastIndexOf("*");
-  if (lastStar === -1)
+function globToRegex(pattern) {
+  if (pattern.length === 0)
     return null;
-  const suffix = pattern.slice(lastStar + 1);
-  if (suffix.length === 0)
+  if (/^\*+\/?$/.test(pattern))
     return null;
-  const escaped = suffix.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  return new RegExp(`${escaped}$`);
+  let regex = "";
+  let i = 0;
+  while (i < pattern.length) {
+    const c = pattern[i];
+    if (c === "*") {
+      if (pattern[i + 1] === "*") {
+        const beforeSlash = i > 0 && pattern[i - 1] === "/";
+        const afterSlash = pattern[i + 2] === "/";
+        if (beforeSlash && afterSlash) {
+          regex = `${regex.slice(0, -1)}(?:.*\\/)?`;
+          i += 3;
+        } else if (afterSlash) {
+          regex += "(?:.*\\/)?";
+          i += 3;
+        } else {
+          regex += ".*";
+          i += 2;
+        }
+        continue;
+      }
+      regex += "[^/]*";
+      i++;
+      continue;
+    }
+    if (c === "?") {
+      regex += "[^/]";
+      i++;
+      continue;
+    }
+    if (".+^${}()|[]\\".includes(c)) {
+      regex += `\\${c}`;
+    } else {
+      regex += c;
+    }
+    i++;
+  }
+  return new RegExp(`(?:^|/)${regex}$`);
 }
 function globsToTestRegex(patterns) {
   const regexes = [];
   const seen = new Set;
   for (const pattern of patterns) {
-    const re = suffixRegex(pattern);
+    const re = globToRegex(pattern);
     if (re && !seen.has(re.source)) {
       regexes.push(re);
       seen.add(re.source);
@@ -5294,68 +5327,101 @@ var init_file_scan = __esm(() => {
   };
 });
 
-// src/test-runners/detect/framework-configs.ts
-function filterExcluded(patterns) {
-  return patterns.filter((p) => !EXCLUDE_DIRS.some((d) => p.includes(`/${d}/`) || p.startsWith(`${d}/`)));
-}
-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: filterExcluded(patterns) };
-      }
+// src/test-runners/detect/extglob.ts
+function hasCharRange(pattern) {
+  return /\[[^\]]*-[^\]]*\]/.test(pattern);
+}
+function hasUnsupported(pattern) {
+  return pattern.includes("!(") || hasCharRange(pattern);
+}
+function expandLeftmost(pattern) {
+  let earliest = null;
+  for (const spec of CONSTRUCTS) {
+    const m = pattern.match(spec.re);
+    if (m?.index !== undefined) {
+      if (earliest === null || m.index < (earliest.match.index ?? Number.POSITIVE_INFINITY)) {
+        earliest = { match: m, spec };
+      }
+    }
+  }
+  if (!earliest)
+    return [pattern];
+  const full = earliest.match[0];
+  const body = earliest.match[1];
+  const start = earliest.match.index;
+  const before = pattern.slice(0, start);
+  const after = pattern.slice(start + full.length);
+  let alternatives = earliest.spec.charClass ? [...body] : body.split(earliest.spec.separator);
+  if (earliest.spec.withEmpty)
+    alternatives = ["", ...alternatives];
+  return alternatives.map((alt) => `${before}${alt}${after}`);
+}
+function expandExtglob(pattern) {
+  if (hasUnsupported(pattern))
+    return [pattern];
+  let variants = [pattern];
+  for (let pass = 0;pass < MAX_PASSES; pass++) {
+    const next = [];
+    let changed = false;
+    for (const v of variants) {
+      const expanded = expandLeftmost(v);
+      if (expanded.length > 1 || expanded[0] !== v)
+        changed = true;
+      next.push(...expanded);
+      if (next.length > MAX_VARIANTS)
+        break;
     }
-    return { type: "framework-config", path, patterns: [] };
+    variants = [...new Set(next)];
+    if (!changed)
+      break;
+    if (variants.length > MAX_VARIANTS)
+      break;
   }
-  return null;
+  return variants;
 }
-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;
-    const patterns = extractJestPatterns(text);
-    return { type: "framework-config", path, patterns: filterExcluded(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: filterExcluded(patterns) };
-        }
+function expandExtglobAll(patterns) {
+  const seen = new Set;
+  const result = [];
+  for (const p of patterns) {
+    for (const expanded of expandExtglob(p)) {
+      if (!seen.has(expanded)) {
+        seen.add(expanded);
+        result.push(expanded);
       }
-    } 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 [];
+  return result;
 }
-function extractJestPatternsFromObject(config) {
-  const testMatch = config.testMatch;
-  if (Array.isArray(testMatch))
-    return testMatch.filter((p) => typeof p === "string");
-  return [];
+var MAX_VARIANTS = 64, MAX_PASSES = 10, CONSTRUCTS;
+var init_extglob = __esm(() => {
+  CONSTRUCTS = [
+    { re: /\{([^{}]+)\}/, withEmpty: false, charClass: false, separator: "," },
+    { re: /\?\(([^()]*)\)/, withEmpty: true, charClass: false, separator: "|" },
+    { re: /\*\(([^()]*)\)/, withEmpty: true, charClass: false, separator: "|" },
+    { re: /\+\(([^()]*)\)/, withEmpty: false, charClass: false, separator: "|" },
+    { re: /@\(([^()]*)\)/, withEmpty: false, charClass: false, separator: "|" },
+    { re: /\[([^\]]+)\]/, withEmpty: false, charClass: true, separator: "" }
+  ];
+});
+
+// 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}/`)));
 }
 async function parsePyprojectToml(workdir) {
   const path = `${workdir}/pyproject.toml`;
@@ -5390,7 +5456,7 @@ async function parsePyprojectToml(workdir) {
     if (patterns.length === 0) {
       patterns.push("test_*.py", "*_test.py");
     }
-    return { type: "framework-config", path, patterns: filterExcluded(patterns) };
+    return { type: "framework-config", framework: "pytest", path, patterns: filterExcluded(patterns) };
   } catch {
     return null;
   }
@@ -5421,10 +5487,94 @@ async function parsePytestIni(workdir) {
     }
     if (patterns.length === 0)
       patterns.push("test_*.py", "*_test.py");
-    return { type: "framework-config", path, patterns: filterExcluded(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) {
@@ -5441,15 +5591,16 @@ async function parseMochaConfig(workdir) {
       } else {
         const specMatch = text.match(/spec\s*:\s*['"]([^'"]+)['"]/);
         if (specMatch) {
-          return { type: "framework-config", path, patterns: [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: filterExcluded(patterns) };
+        return { type: "framework-config", framework: "mocha", path, patterns: normalize(patterns) };
       }
+      return { type: "framework-config", framework: "mocha", path, patterns: [] };
     } catch {}
   }
   return null;
@@ -5471,9 +5622,9 @@ async function parsePlaywrightConfig(workdir) {
       patterns.push(...extracted);
     }
     if (patterns.length > 0) {
-      return { type: "framework-config", path, patterns: filterExcluded(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;
 }
@@ -5486,9 +5637,14 @@ async function parseCypressConfig(workdir) {
       continue;
     const specMatch = text.match(/specPattern\s*:\s*['"]([^'"]+)['"]/);
     if (specMatch) {
-      return { type: "framework-config", path, patterns: [specMatch[1]] };
+      return { type: "framework-config", framework: "cypress", path, patterns: normalize([specMatch[1]]) };
     }
-    return { type: "framework-config", path, patterns: ["cypress/e2e/**/*.cy.{js,ts}"] };
+    return {
+      type: "framework-config",
+      framework: "cypress",
+      path,
+      patterns: normalize(["cypress/e2e/**/*.cy.{js,ts}"])
+    };
   }
   return null;
 }
@@ -5503,10 +5659,79 @@ function extractStringLiterals(body) {
   }
   return patterns;
 }
+async function parseViteConfig(workdir) {
+  const candidates = ["vite.config.ts", "vite.config.mts", "vite.config.js", "vite.config.mjs"];
+  for (const name of candidates) {
+    const path = `${workdir}/${name}`;
+    const text = await _frameworkConfigDeps.readText(path);
+    if (!text)
+      continue;
+    if (!/\btest\s*:\s*\{/.test(text))
+      continue;
+    const testBlock = extractBalancedBlock(text, /\btest\s*:\s*\{/);
+    if (testBlock) {
+      const includeMatch = testBlock.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 parseBunfig(workdir) {
+  const path = `${workdir}/bunfig.toml`;
+  const text = await _frameworkConfigDeps.readText(path);
+  if (!text)
+    return null;
+  try {
+    const parsed = _frameworkConfigDeps.parseToml(text);
+    if (!parsed?.test || typeof parsed.test !== "object")
+      return null;
+  } catch {
+    return null;
+  }
+  return {
+    type: "framework-config",
+    framework: "bun",
+    path,
+    patterns: normalize([
+      "**/*.test.{ts,tsx,js,jsx,mjs,cjs}",
+      "**/*_test.{ts,tsx,js,jsx,mjs,cjs}",
+      "**/*.spec.{ts,tsx,js,jsx,mjs,cjs}",
+      "**/*_spec.{ts,tsx,js,jsx,mjs,cjs}"
+    ])
+  };
+}
+function extractBalancedBlock(text, anchor) {
+  const m = text.match(anchor);
+  if (!m || m.index === undefined)
+    return null;
+  const openIdx = text.indexOf("{", m.index);
+  if (openIdx === -1)
+    return null;
+  let depth = 0;
+  for (let i = openIdx;i < text.length; i++) {
+    const c = text[i];
+    if (c === "{")
+      depth++;
+    else if (c === "}") {
+      depth--;
+      if (depth === 0)
+        return text.slice(openIdx + 1, i);
+    }
+  }
+  return null;
+}
 async function detectFromFrameworkConfigs(workdir) {
   const results = await Promise.all([
     parseVitestConfig(workdir),
+    parseViteConfig(workdir),
     parseJestConfig(workdir),
+    parseBunfig(workdir),
     parsePyprojectToml(workdir),
     parsePytestIni(workdir),
     parseMochaConfig(workdir),
@@ -5515,19 +5740,13 @@ async function detectFromFrameworkConfigs(workdir) {
   ]);
   return results.filter((r) => r !== null);
 }
-var EXCLUDE_DIRS, _frameworkConfigDeps;
+var EXCLUDE_DIRS2;
 var init_framework_configs = __esm(() => {
-  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_extglob();
+  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
@@ -5535,61 +5754,75 @@ 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 };
+  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: 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(() => {
+  init_extglob();
   _frameworkDefaultsDeps = {
     readText: async (path) => {
       const f = Bun.file(path);
@@ -5599,15 +5832,24 @@ 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}"]
-  };
-  BUN_TEST_DEFAULTS = ["**/*.test.{ts,tsx,js,jsx}"];
+  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}",
+    "**/*.spec.{ts,tsx,js,jsx,mjs,cjs}",
+    "**/*_spec.{ts,tsx,js,jsx,mjs,cjs}"
+  ];
 });
 
 // src/test-runners/detect/index.ts
@@ -5653,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] : [];
@@ -7191,6 +7435,7 @@ function buildAuditContent(entry, epochMs) {
   const lines = [
     `Timestamp: ${ts}`,
     `Session:   ${entry.sessionName}`,
+    ...entry.recordId ? [`RecordId:  ${entry.recordId}`] : [],
     ...entry.sessionId ? [`SessionId: ${entry.sessionId}`] : [],
     `Type:      ${typeLabel}`,
     `StoryId:   ${entry.storyId ?? "(none)"}`,
@@ -7445,6 +7690,7 @@ class SpawnAcpSession {
   pidRegistry;
   activeProc = null;
   id;
+  recordId;
   constructor(opts) {
     this.agentName = opts.agentName;
     this.sessionName = opts.sessionName;
@@ -7455,6 +7701,7 @@ class SpawnAcpSession {
     this.env = opts.env;
     this.pidRegistry = opts.pidRegistry;
     this.id = opts.id;
+    this.recordId = opts.recordId;
   }
   async prompt(text) {
     const cmd = [
@@ -7602,7 +7849,7 @@ class SpawnAcpSession {
     await this.trackedSpawn(cmd);
   }
 }
-function parseSessionId(stdout) {
+function parseSessionIds(stdout) {
   for (const line of stdout.split(`
 `).reverse()) {
     const trimmed = line.trim();
@@ -7610,12 +7857,17 @@ function parseSessionId(stdout) {
       continue;
     try {
       const parsed = JSON.parse(trimmed);
-      const id = parsed.acpxSessionId;
-      if (typeof id === "string" && id.length > 0)
-        return id;
+      const sessionId = parsed.acpxSessionId;
+      const recordId = parsed.acpxRecordId;
+      if (typeof sessionId === "string" && sessionId.length > 0) {
+        return {
+          sessionId,
+          recordId: typeof recordId === "string" && recordId.length > 0 ? recordId : undefined
+        };
+      }
     } catch {}
   }
-  return;
+  return { sessionId: undefined, recordId: undefined };
 }
 
 class SpawnAcpClient {
@@ -7672,6 +7924,7 @@ class SpawnAcpClient {
     if (exitCode !== 0) {
       throw new Error(`[acp-adapter] Failed to create session: ${stderr || `exit code ${exitCode}`}`);
     }
+    const { sessionId, recordId } = parseSessionIds(stdout);
     return new SpawnAcpSession({
       agentName: opts.agentName,
       sessionName,
@@ -7681,7 +7934,8 @@ class SpawnAcpClient {
       permissionMode: opts.permissionMode,
       env: this.env,
       pidRegistry: this.pidRegistry,
-      id: parseSessionId(stdout)
+      id: sessionId,
+      recordId
     });
   }
   async loadSession(sessionName, agentName, permissionMode) {
@@ -7690,6 +7944,7 @@ class SpawnAcpClient {
     if (exitCode !== 0) {
       return null;
     }
+    const { sessionId, recordId } = parseSessionIds(stdout);
     return new SpawnAcpSession({
       agentName,
       sessionName,
@@ -7699,7 +7954,8 @@ class SpawnAcpClient {
       permissionMode,
       env: this.env,
       pidRegistry: this.pidRegistry,
-      id: parseSessionId(stdout)
+      id: sessionId,
+      recordId
     });
   }
   async closeSession(sessionName, agentName) {
@@ -22981,6 +23237,7 @@ class AcpAgentAdapter {
           writePromptAudit({
             prompt: currentPrompt,
             sessionName,
+            recordId: session.recordId,
             sessionId: session.id,
             workdir: options.workdir,
             projectDir: options.projectDir,
@@ -23135,6 +23392,7 @@ class AcpAgentAdapter {
           writePromptAudit({
             prompt,
             sessionName: completeSessionName,
+            recordId: session.recordId,
             sessionId: session.id,
             workdir: workdir ?? process.cwd(),
             auditDir: _completeAuditConfig.agent.promptAudit.dir,
@@ -23711,7 +23969,7 @@ function migrateLegacyTestPattern(raw, logger) {
 
 // src/config/path-security.ts
 import { existsSync as existsSync3, lstatSync, realpathSync } from "fs";
-import { basename, isAbsolute as isAbsolute3, normalize, resolve as resolve2 } from "path";
+import { basename, isAbsolute as isAbsolute3, normalize as normalize2, resolve as resolve2 } from "path";
 function validateDirectory(dirPath, baseDir) {
   const resolved = resolve2(dirPath);
   if (!existsSync3(resolved)) {
@@ -23741,8 +23999,8 @@ function validateDirectory(dirPath, baseDir) {
   return realPath;
 }
 function isWithinDirectory(targetPath, basePath) {
-  const normalizedTarget = normalize(targetPath);
-  const normalizedBase = normalize(basePath);
+  const normalizedTarget = normalize2(targetPath);
+  const normalizedBase = normalize2(basePath);
   if (!isAbsolute3(normalizedTarget) || !isAbsolute3(normalizedBase)) {
     return false;
   }
@@ -38362,14 +38620,14 @@ var init_init_context = __esm(() => {
 
 // src/utils/path-security.ts
 import { realpathSync as realpathSync3 } from "fs";
-import { dirname as dirname4, isAbsolute as isAbsolute5, join as join28, normalize as normalize2, resolve as resolve7 } from "path";
+import { dirname as dirname4, isAbsolute as isAbsolute5, join as join28, normalize as normalize3, resolve as resolve7 } from "path";
 function safeRealpathForComparison(p) {
   try {
     return realpathSync3(p);
   } catch {
     const parent = dirname4(p);
     if (parent === p)
-      return normalize2(p);
+      return normalize3(p);
     const resolvedParent = safeRealpathForComparison(parent);
     return join28(resolvedParent, p.split("/").pop() ?? "");
   }
@@ -38380,7 +38638,7 @@ function validateModulePath(modulePath, allowedRoots) {
   }
   const resolvedRoots = allowedRoots.map((r) => safeRealpathForComparison(resolve7(r)));
   if (isAbsolute5(modulePath)) {
-    const normalized = normalize2(modulePath);
+    const normalized = normalize3(modulePath);
     const resolved = safeRealpathForComparison(normalized);
     const isWithin = resolvedRoots.some((root) => resolved.startsWith(`${root}/`) || resolved === root);
     if (isWithin) {
@@ -39142,7 +39400,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.62.0-canary.7",
+    version: "0.62.0",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -39222,8 +39480,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("bea17955"))
-        return "bea17955";
+      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.7",
+  "version": "0.62.0",
   "description": "AI Coding Agent Orchestrator — loops until done",
   "type": "module",
   "bin": {