@nathapp/nax 0.40.1 → 0.42.0

package/src/tdd/session-runner.ts

@@ -10,8 +10,17 @@ import { resolveModel } from "../config";
 import { getLogger } from "../logger";
 import type { UserStory } from "../prd";
 import { PromptBuilder } from "../prompts";
-import { autoCommitIfDirty } from "../utils/git";
+import { autoCommitIfDirty as _autoCommitIfDirtyFn } from "../utils/git";
 import { cleanupProcessTree } from "./cleanup";
+
+/**
+ * Injectable dependencies for session-runner — allows tests to mock
+ * autoCommitIfDirty without going through internal git deps.
+ * @internal
+ */
+export const _sessionRunnerDeps = {
+  autoCommitIfDirty: _autoCommitIfDirtyFn,
+};
 import { getChangedFiles, verifyImplementerIsolation, verifyTestWriterIsolation } from "./isolation";
 import type { IsolationCheck } from "./types";
 import type { TddSessionResult, TddSessionRole } from "./types";
@@ -84,6 +93,7 @@ export async function runTddSession(
   lite = false,
   skipIsolation = false,
   constitution?: string,
+  featureName?: string,
 ): Promise<TddSessionResult> {
   const startTime = Date.now();
 
@@ -130,6 +140,9 @@ export async function runTddSession(
     modelDef: resolveModel(config.models[modelTier]),
     timeoutSeconds: config.execution.sessionTimeoutSeconds,
     dangerouslySkipPermissions: config.execution.dangerouslySkipPermissions,
+    featureName,
+    storyId: story.id,
+    sessionRole: role,
   });
 
   // BUG-21 Fix: Clean up orphaned child processes if agent failed
@@ -154,7 +167,7 @@ export async function runTddSession(
   }
 
   // BUG-058: Auto-commit if agent left uncommitted changes
-  await autoCommitIfDirty(workdir, "tdd", role, story.id);
+  await _sessionRunnerDeps.autoCommitIfDirty(workdir, "tdd", role, story.id);
 
   // Check isolation based on role and skipIsolation flag.
   let isolation: IsolationCheck | undefined;

package/src/utils/git.ts

@@ -153,6 +153,36 @@ export function detectMergeConflict(output: string): boolean {
 export async function autoCommitIfDirty(workdir: string, stage: string, role: string, storyId: string): Promise<void> {
   const logger = getSafeLogger();
   try {
+    // Guard: only auto-commit if workdir IS the git repository root.
+    // Without this, a workdir nested inside another git repo (e.g. a temp dir
+    // created inside the nax repo during tests) would cause git to walk up and
+    // commit files from the parent repo instead.
+    const topLevelProc = _gitDeps.spawn(["git", "rev-parse", "--show-toplevel"], {
+      cwd: workdir,
+      stdout: "pipe",
+      stderr: "pipe",
+    });
+    const gitRoot = (await new Response(topLevelProc.stdout).text()).trim();
+    await topLevelProc.exited;
+
+    // Normalize paths to handle symlinks (e.g. /tmp → /private/tmp on macOS)
+    const { realpathSync } = await import("node:fs");
+    const realWorkdir = (() => {
+      try {
+        return realpathSync(workdir);
+      } catch {
+        return workdir;
+      }
+    })();
+    const realGitRoot = (() => {
+      try {
+        return realpathSync(gitRoot);
+      } catch {
+        return gitRoot;
+      }
+    })();
+    if (realWorkdir !== realGitRoot) return;
+
     const statusProc = _gitDeps.spawn(["git", "status", "--porcelain"], {
       cwd: workdir,
       stdout: "pipe",

package/src/verification/runners.ts

@@ -113,8 +113,17 @@ export async function scoped(options: VerificationGateOptions): Promise<Verifica
   return runVerificationCore({ ...options, command: scopedCommand });
 }
 
+/**
+ * Injectable dependencies for regression() — allows tests to replace
+ * the 2s agent-cleanup sleep with a no-op without touching production behaviour.
+ * @internal
+ */
+export const _regressionRunnerDeps = {
+  sleep: (ms: number): Promise<void> => Bun.sleep(ms),
+};
+
 /** Quick smoke test — no asset verification, 2s delay to let agent processes terminate. */
 export async function regression(options: VerificationGateOptions): Promise<VerificationResult> {
-  await Bun.sleep(2000);
+  await _regressionRunnerDeps.sleep(2000);
   return runVerificationCore({ ...options, expectedFiles: undefined });
 }