@nathapp/nax 0.46.0 → 0.46.1

package/src/agents/index.ts

@@ -2,15 +2,17 @@ export type { AgentAdapter, AgentCapabilities, AgentResult, AgentRunOptions, Com
 export { CompleteError } from "./types";
 export { ClaudeCodeAdapter } from "./claude";
 export { getAllAgentNames, getAgent, getInstalledAgents, checkAgentHealth } from "./registry";
-export type { ModelCostRates, TokenUsage, CostEstimate, TokenUsageWithConfidence } from "./claude/cost";
+export type { ModelCostRates, TokenUsage, CostEstimate, TokenUsageWithConfidence, SessionTokenUsage } from "./cost";
 export {
   COST_RATES,
+  MODEL_PRICING,
   parseTokenUsage,
   estimateCost,
   estimateCostFromOutput,
   estimateCostByDuration,
   formatCostWithConfidence,
-} from "./claude/cost";
+  estimateCostFromTokenUsage,
+} from "./cost";
 export { validateAgentForTier, validateAgentFeature, describeAgentCapabilities } from "./shared/validation";
 export type { AgentVersionInfo } from "./shared/version-detection";
 export { getAgentVersion, getAgentVersions } from "./shared/version-detection";

package/src/agents/types.ts

@@ -8,6 +8,7 @@
 
 import type { NaxConfig } from "../config";
 import type { ModelDef, ModelTier } from "../config/schema";
+import type { TokenUsage } from "./cost";
 
 // Re-export extended types for backward compatibility
 export type {
@@ -38,6 +39,8 @@ export interface AgentResult {
   durationMs: number;
   /** Estimated cost for this run (USD) */
   estimatedCost: number;
+  /** Token usage for this run (when available) */
+  tokenUsage?: TokenUsage;
   /** Process ID of the spawned agent (for cleanup on failure) */
   pid?: number;
 }

package/src/cli/init.ts

@@ -33,7 +33,21 @@ export interface InitProjectOptions {
 /**
  * Gitignore entries added by nax init
  */
-const NAX_GITIGNORE_ENTRIES = [".nax-verifier-verdict.json", "nax.lock", "nax/**/runs/", "nax/metrics.json"];
+const NAX_GITIGNORE_ENTRIES = [
+  ".nax-verifier-verdict.json",
+  "nax.lock",
+  "nax/**/runs/",
+  "nax/metrics.json",
+  "nax/features/*/status.json",
+  "nax/features/*/plan/",
+  "nax/features/*/acp-sessions.json",
+  "nax/features/*/interactions/",
+  "nax/features/*/progress.txt",
+  "nax/features/*/acceptance-refined.json",
+  ".nax-pids",
+  ".nax-wt/",
+  "~/",
+];
 
 /**
  * Add nax-specific entries to .gitignore if not already present.

package/src/pipeline/stages/acceptance-setup.ts

@@ -106,6 +106,7 @@ export const acceptanceSetupStage: PipelineStage = {
       const result = await _acceptanceSetupDeps.generate(ctx.prd.userStories, refinedCriteria, {
         featureName: ctx.prd.feature,
         workdir: ctx.workdir,
+        featureDir: ctx.featureDir,
         codebaseContext: "",
         modelTier: ctx.config.acceptance.model ?? "fast",
         modelDef: resolveModel(ctx.config.models[ctx.config.acceptance.model ?? "fast"]),

package/src/precheck/checks-git.ts

@@ -32,6 +32,25 @@ export async function checkGitRepoExists(workdir: string): Promise<Check> {
   };
 }
 
+/**
+ * nax runtime files that are allowed to be dirty without blocking the precheck.
+ * These are written during nax execution and should be gitignored by `nax init`.
+ */
+const NAX_RUNTIME_PATTERNS = [
+  /^.{2} nax\.lock$/,
+  /^.{2} nax\/metrics\.json$/,
+  /^.{2} nax\/features\/[^/]+\/status\.json$/,
+  /^.{2} nax\/features\/[^/]+\/runs\//,
+  /^.{2} nax\/features\/[^/]+\/plan\//,
+  /^.{2} nax\/features\/[^/]+\/acp-sessions\.json$/,
+  /^.{2} nax\/features\/[^/]+\/interactions\//,
+  /^.{2} nax\/features\/[^/]+\/progress\.txt$/,
+  /^.{2} nax\/features\/[^/]+\/acceptance-refined\.json$/,
+  /^.{2} \.nax-verifier-verdict\.json$/,
+  /^.{2} \.nax-pids$/,
+  /^.{2} \.nax-wt\//,
+];
+
 /** Check if working tree is clean. Uses: git status --porcelain */
 export async function checkWorkingTreeClean(workdir: string): Promise<Check> {
   const proc = Bun.spawn(["git", "status", "--porcelain"], {
@@ -42,13 +61,20 @@ export async function checkWorkingTreeClean(workdir: string): Promise<Check> {
 
   const output = await new Response(proc.stdout).text();
   const exitCode = await proc.exited;
-  const passed = exitCode === 0 && output.trim() === "";
+
+  // Split without trimming the full output — porcelain lines start with status chars
+  // including leading spaces (e.g. " M file.ts"). trim() would corrupt the first line.
+  const lines = output.trim() === "" ? [] : output.split("\n").filter(Boolean);
+  const nonNaxDirtyFiles = lines.filter((line) => !NAX_RUNTIME_PATTERNS.some((pattern) => pattern.test(line)));
+  const passed = exitCode === 0 && nonNaxDirtyFiles.length === 0;
 
   return {
     name: "working-tree-clean",
     tier: "blocker",
     passed,
-    message: passed ? "Working tree is clean" : "Uncommitted changes detected",
+    message: passed
+      ? "Working tree is clean"
+      : `Uncommitted changes detected: ${nonNaxDirtyFiles.map((l) => l.slice(3)).join(", ")}`,
   };
 }
 

package/src/precheck/checks-warnings.ts

@@ -6,6 +6,7 @@
  */
 
 import { existsSync } from "node:fs";
+import { isAbsolute } from "node:path";
 import type { NaxConfig } from "../config";
 import type { PRD } from "../prd/types";
 import type { Check } from "./types";
@@ -126,7 +127,7 @@ async function hasPackageScript(workdir: string, name: string): Promise<boolean>
 
 /**
  * Check if .gitignore covers nax runtime files.
- * Patterns: nax.lock, runs/, test/tmp/
+ * Patterns: nax.lock, runs/, status.json, .nax-pids, .nax-wt/
  */
 export async function checkGitignoreCoversNax(workdir: string): Promise<Check> {
   const gitignorePath = `${workdir}/.gitignore`;
@@ -143,7 +144,14 @@ export async function checkGitignoreCoversNax(workdir: string): Promise<Check> {
 
   const file = Bun.file(gitignorePath);
   const content = await file.text();
-  const patterns = ["nax.lock", "runs/", "test/tmp/"];
+  const patterns = [
+    "nax.lock",
+    "nax/**/runs/",
+    "nax/metrics.json",
+    "nax/features/*/status.json",
+    ".nax-pids",
+    ".nax-wt/",
+  ];
   const missing = patterns.filter((pattern) => !content.includes(pattern));
   const passed = missing.length === 0;
 
@@ -191,3 +199,23 @@ export async function checkPromptOverrideFiles(config: NaxConfig, workdir: strin
 
   return checks;
 }
+
+/**
+ * Check if HOME env is set and is an absolute path.
+ * An unexpanded "~" in HOME causes agent spawns to create a literal ~/
+ * directory inside the repo cwd instead of resolving to the user home dir.
+ */
+export async function checkHomeEnvValid(): Promise<Check> {
+  const home = process.env.HOME ?? "";
+  const passed = home !== "" && isAbsolute(home);
+  return {
+    name: "home-env-valid",
+    tier: "warning",
+    passed,
+    message: passed
+      ? `HOME env is valid: ${home}`
+      : home === ""
+        ? "HOME env is not set — agent may write files to unexpected locations"
+        : `HOME env is not an absolute path ("${home}") — may cause literal "~" directories in repo`,
+  };
+}

package/src/precheck/checks.ts

@@ -28,6 +28,7 @@ export {
   checkPendingStories,
   checkOptionalCommands,
   checkGitignoreCoversNax,
+  checkHomeEnvValid,
   checkPromptOverrideFiles,
 } from "./checks-warnings";
 

package/src/precheck/index.ts

@@ -20,6 +20,7 @@ import {
   checkGitRepoExists,
   checkGitUserConfigured,
   checkGitignoreCoversNax,
+  checkHomeEnvValid,
   checkLintCommand,
   checkMultiAgentHealth,
   checkOptionalCommands,
@@ -126,6 +127,7 @@ function getEnvironmentWarnings(config: NaxConfig, workdir: string): CheckFn[] {
     () => checkDiskSpace(),
     () => checkOptionalCommands(config, workdir),
     () => checkGitignoreCoversNax(workdir),
+    () => checkHomeEnvValid(),
     () => checkPromptOverrideFiles(config, workdir),
     () => checkMultiAgentHealth(),
   ];