@nathapp/nax 0.63.0-canary.2 → 0.63.0-canary.4

package/dist/nax.js

@@ -32984,14 +32984,82 @@ function resolveImport(specifier, fromFile, workdir) {
   }
   return null;
 }
-function siblingTestPath(filePath) {
-  const srcMatch = filePath.match(/^src\/(.+)\.(ts|tsx|js|jsx)$/);
-  if (!srcMatch)
+function decomposeTestGlob(pattern) {
+  const lastStar = pattern.lastIndexOf("*");
+  if (lastStar === -1)
+    return null;
+  const suffix = pattern.slice(lastStar + 1);
+  if (suffix.length === 0)
     return null;
-  const ext = srcMatch[2] ?? "ts";
-  return `test/unit/${srcMatch[1]}.test.${ext}`;
+  const firstStar = pattern.indexOf("*");
+  let prefix = pattern.slice(0, firstStar);
+  if (prefix.endsWith("/"))
+    prefix = prefix.slice(0, -1);
+  return { prefix, suffix };
+}
+function deriveSiblingTestCandidates(filePath, patterns) {
+  const srcExtMatch = filePath.match(/\.[^.]+$/);
+  if (!srcExtMatch)
+    return [];
+  const srcExt = srcExtMatch[0];
+  const stemWithPath = filePath.slice(0, -srcExt.length);
+  for (const pattern of patterns) {
+    const decomposed = decomposeTestGlob(pattern);
+    if (decomposed && filePath.endsWith(decomposed.suffix))
+      return [];
+    if (decomposed) {
+      const markerFromSuffix = stripExt(decomposed.suffix);
+      if (markerFromSuffix.length > 0 && stemWithPath.endsWith(markerFromSuffix))
+        return [];
+    }
+  }
+  if (stemWithPath.endsWith(".test") || stemWithPath.endsWith(".spec"))
+    return [];
+  const srcPrefixed = stemWithPath.startsWith("src/");
+  const srcInMiddleIdx = stemWithPath.indexOf("/src/");
+  let innerStem = null;
+  let pkgPrefix = "";
+  if (srcPrefixed) {
+    innerStem = stemWithPath.slice("src/".length);
+  } else if (srcInMiddleIdx >= 0) {
+    pkgPrefix = `${stemWithPath.slice(0, srcInMiddleIdx)}/`;
+    innerStem = stemWithPath.slice(srcInMiddleIdx + "/src/".length);
+  }
+  const candidates = [];
+  const seen = new Set;
+  const push = (path8) => {
+    if (path8 === filePath)
+      return;
+    if (!seen.has(path8)) {
+      seen.add(path8);
+      candidates.push(path8);
+    }
+  };
+  for (const pattern of patterns) {
+    const decomposed = decomposeTestGlob(pattern);
+    if (!decomposed)
+      continue;
+    const { prefix, suffix } = decomposed;
+    const suffixExt = (suffix.match(/\.[^.]+$/) ?? [""])[0];
+    const marker = suffixExt ? suffix.slice(0, -suffixExt.length) : suffix;
+    if (marker.length === 0)
+      continue;
+    const effectiveSuffix = `${marker}${srcExt}`;
+    push(`${stemWithPath}${effectiveSuffix}`);
+    if (innerStem !== null && prefix.length > 0) {
+      push(`${pkgPrefix}${prefix}/${innerStem}${effectiveSuffix}`);
+    }
+  }
+  return candidates;
+}
+function stripExt(s) {
+  const m = s.match(/\.[^.]+$/);
+  return m ? s.slice(0, -m[0].length) : s;
+}
+function isTestFile2(filePath, regex) {
+  return regex.some((re) => re.test(filePath));
 }
-async function collectNeighbors(filePath, workdir, extraGlobWorkdirs) {
+async function collectNeighbors(filePath, workdir, extraGlobWorkdirs, siblingTestContext) {
   const neighbors = new Set;
   if (await _codeNeighborDeps.fileExists(join20(workdir, filePath))) {
     const content = await _codeNeighborDeps.readFile(join20(workdir, filePath));
@@ -33032,9 +33100,24 @@ async function collectNeighbors(filePath, workdir, extraGlobWorkdirs) {
       await scanForReverseDeps(extraDir);
     }
   }
-  const testPath = siblingTestPath(filePath);
-  if (testPath)
-    neighbors.add(testPath);
+  if (siblingTestContext && !isTestFile2(filePath, siblingTestContext.regex)) {
+    const candidates = deriveSiblingTestCandidates(filePath, siblingTestContext.globs);
+    let chosen = null;
+    for (const candidate of candidates) {
+      if (await _codeNeighborDeps.fileExists(join20(workdir, candidate))) {
+        chosen = candidate;
+        break;
+      }
+    }
+    if (chosen === null) {
+      const colocated = candidates[0];
+      const mirrored = candidates.find((c, i) => i > 0 && c !== colocated);
+      if (mirrored)
+        chosen = mirrored;
+    }
+    if (chosen !== null && chosen !== filePath)
+      neighbors.add(chosen);
+  }
   return [...neighbors].slice(0, MAX_NEIGHBORS_PER_FILE);
 }
 async function resolveExtraGlobWorkdirs(neighborScope, crossPackageDepth, repoRoot, packageDir) {
@@ -33068,9 +33151,13 @@ class CodeNeighborProvider {
       return { chunks: [], pullTools: [] };
     }
     const filesToProcess = touchedFiles.filter(isRelativeAndSafe).slice(0, MAX_FILES);
+    const siblingTestContext = request.resolvedTestPatterns ? {
+      globs: request.resolvedTestPatterns.globs,
+      regex: request.resolvedTestPatterns.regex
+    } : undefined;
     const sections2 = [];
     for (const file3 of filesToProcess) {
-      const neighbors = await collectNeighbors(file3, workdir, extraGlobWorkdirs);
+      const neighbors = await collectNeighbors(file3, workdir, extraGlobWorkdirs, siblingTestContext);
       if (neighbors.length > 0) {
         sections2.push(`### ${file3}
 ${neighbors.map((n) => `- ${n}`).join(`
@@ -33434,7 +33521,7 @@ class PullToolBudget {
     return this.sessionCalls;
   }
 }
-async function handleQueryNeighbor(input, repoRoot, budget, maxTokensPerCall = DEFAULT_MAX_TOKENS_PER_CALL) {
+async function handleQueryNeighbor(input, repoRoot, budget, maxTokensPerCall = DEFAULT_MAX_TOKENS_PER_CALL, resolvedTestPatterns) {
   budget.consume();
   const provider = new CodeNeighborProvider;
   const request = {
@@ -33444,7 +33531,8 @@ async function handleQueryNeighbor(input, repoRoot, budget, maxTokensPerCall = D
     stage: "pull-tool",
     role: "implementer",
     budgetTokens: maxTokensPerCall,
-    touchedFiles: [input.filePath]
+    touchedFiles: [input.filePath],
+    ...resolvedTestPatterns && { resolvedTestPatterns }
   };
   const result = await provider.fetch(request);
   const content = result.chunks.map((c) => c.content).join(`
@@ -35110,6 +35198,21 @@ function createContextToolRuntime(options) {
   const budgets = new Map;
   const runCounter = options.runCounter ?? createRunCallCounter();
   const maxCallsPerRun = config2.context?.v2?.pull?.maxCallsPerRun ?? 50;
+  let resolvedTestPatternsPromise = null;
+  async function getResolvedTestPatterns() {
+    if (resolvedTestPatternsPromise === null) {
+      resolvedTestPatternsPromise = resolveTestFilePatterns(config2, repoRoot, story.workdir || undefined, {
+        storyId: story.id
+      }).catch((err) => {
+        getLogger().warn("context", "Pull-tool runtime: failed to resolve test patterns", {
+          storyId: story.id,
+          error: errorMessage(err)
+        });
+        return;
+      });
+    }
+    return resolvedTestPatternsPromise;
+  }
   function getBudget(tool) {
     const existing = budgets.get(tool.name);
     if (existing)
@@ -35125,8 +35228,10 @@ function createContextToolRuntime(options) {
         throw new Error(`Unknown context tool: ${name}`);
       }
       switch (name) {
-        case "query_neighbor":
-          return handleQueryNeighbor(input, repoRoot, getBudget(tool), tool.maxTokensPerCall);
+        case "query_neighbor": {
+          const patterns = await getResolvedTestPatterns();
+          return handleQueryNeighbor(input, repoRoot, getBudget(tool), tool.maxTokensPerCall, patterns);
+        }
         case "query_feature_context":
           return handleQueryFeatureContext(input, story, config2, repoRoot, getBudget(tool), tool.maxTokensPerCall);
         default:
@@ -35136,6 +35241,8 @@ function createContextToolRuntime(options) {
   };
 }
 var init_tool_runtime = __esm(() => {
+  init_logger2();
+  init_resolver();
   init_pull_tools();
 });
 
@@ -38367,6 +38474,17 @@ async function runV2Path(ctx) {
     }
   }
   const touchedFiles = getContextFiles(ctx.story);
+  let resolvedTestPatterns;
+  try {
+    resolvedTestPatterns = await resolveTestFilePatterns(ctx.config, ctx.workdir, ctx.story.workdir || undefined, {
+      storyId: ctx.story.id
+    });
+  } catch (err) {
+    logger.warn("context", "Failed to resolve test-file patterns \u2014 providers will skip sibling-test hints", {
+      storyId: ctx.story.id,
+      error: errorMessage(err)
+    });
+  }
   const request = {
     storyId: ctx.story.id,
     featureId: ctx.featureDir?.replace(/\/$/, "").split("/").pop(),
@@ -38388,7 +38506,8 @@ async function runV2Path(ctx) {
     agentId: agentName,
     availableBudgetTokens: estimateAvailableBudgetTokens(agentName, ctx.prompt),
     deterministic: ctx.config.context.v2.deterministic,
-    planDigestBoost: getStageContextConfig(ctx.routing?.testStrategy ?? "").planDigestBoost
+    planDigestBoost: getStageContextConfig(ctx.routing?.testStrategy ?? "").planDigestBoost,
+    ...resolvedTestPatterns && { resolvedTestPatterns }
   };
   const pluginConfigs = ctx.config.context.v2.pluginProviders ?? [];
   const pluginProviders = pluginConfigs.length > 0 ? await _contextStageDeps.loadPlugins(pluginConfigs, ctx.projectDir ?? ctx.workdir) : [];
@@ -38507,6 +38626,7 @@ var init_context2 = __esm(() => {
   init_logger2();
   init_prd();
   init_scratch_writer();
+  init_resolver();
   _contextStageDeps = {
     createOrchestrator: createDefaultOrchestrator,
     loadPlugins: loadPluginProviders,
@@ -43430,7 +43550,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.63.0-canary.2",
+    version: "0.63.0-canary.4",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -43510,8 +43630,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("acd83bd2"))
-        return "acd83bd2";
+      if (/^[0-9a-f]{6,10}$/.test("543ca776"))
+        return "543ca776";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -45198,6 +45318,7 @@ class SessionManager {
         continue;
       const updated = { ...session, state: "COMPLETED", lastActivityAt: now };
       this._sessions.set(id, updated);
+      this._persistDescriptor(updated);
       closed.push({ ...updated });
       getLogger().debug("session", "Session closed by closeStory", {
         storyId,

package/package.json

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