@nathapp/nax 0.49.0 → 0.49.1

package/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.49.1] - 2026-03-18
+
+### Fixed
+- **ACP zero cost:** `acpx prompt` was called without `--format json`, causing it to output plain text instead of JSON-RPC NDJSON. Cost and token usage were always 0. Fix: pass `--format json` as a global flag so the parser receives `usage_update` (exact cost in USD) and `result.usage` (token breakdown).
+- **Decompose session name / model:** Decompose one-shots used an auto-generated timestamp session name and passed the tier string (`"balanced"`) as the model instead of the resolved model ID. Fix: session name is now `nax-decompose-<story-id>` and model tier is resolved via `resolveModel()` before the `complete()` call.
+- **`autoCommitIfDirty` skipping monorepo subdirs:** The working-directory guard rejected any workdir that wasn't exactly the git root, silently skipping commits for monorepo package subdirs. Fix: allow subdirs (`startsWith(gitRoot + '/')`); use `git add .` for subdirs vs `git add -A` at root.
+- **`complete()` missing model in `generateFromPRD()` and `plan` auto mode:** `generator.ts` ignored `options.modelDef.model`; `plan.ts` auto path didn't call `resolveModel()`. Both now pass the correct resolved model to `adapter.complete()`.
+
 ## [0.46.2] - 2026-03-17
 
 ### Fixed

package/dist/nax.js

@@ -18729,7 +18729,10 @@ describe("${options.featureName} - Acceptance Tests", () => {
 
 IMPORTANT: Output raw TypeScript code only. Do NOT use markdown code fences (\`\`\`typescript or \`\`\`). Start directly with the import statement.`;
   logger.info("acceptance", "Generating tests from PRD refined criteria", { count: refinedCriteria.length });
-  const rawOutput = await _generatorPRDDeps.adapter.complete(prompt, { config: options.config });
+  const rawOutput = await _generatorPRDDeps.adapter.complete(prompt, {
+    model: options.modelDef.model,
+    config: options.config
+  });
   const testCode = extractTestCode(rawOutput);
   const refinedJsonContent = JSON.stringify(refinedCriteria.map((c, i) => ({
     acId: `AC-${i + 1}`,
@@ -19170,6 +19173,8 @@ class SpawnAcpSession {
       "acpx",
       "--cwd",
       this.cwd,
+      "--format",
+      "json",
       ...this.permissionMode === "approve-all" ? ["--approve-all"] : [],
       "--model",
       this.model,
@@ -19742,7 +19747,11 @@ class AcpAgentAdapter {
       await client.start();
       let session = null;
       try {
-        session = await client.createSession({ agentName: this.name, permissionMode });
+        session = await client.createSession({
+          agentName: this.name,
+          permissionMode,
+          sessionName: _options?.sessionName
+        });
         let timeoutId;
         const timeoutPromise = new Promise((_, reject) => {
           timeoutId = setTimeout(() => reject(new Error(`complete() timed out after ${timeoutMs}ms`)), timeoutMs);
@@ -22241,7 +22250,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.49.0",
+    version: "0.49.1",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -22314,8 +22323,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("6a5bc7a"))
-        return "6a5bc7a";
+      if (/^[0-9a-f]{6,10}$/.test("635a552"))
+        return "635a552";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -26178,7 +26187,9 @@ async function autoCommitIfDirty(workdir, stage, role, storyId) {
         return gitRoot;
       }
     })();
-    if (realWorkdir !== realGitRoot)
+    const isAtRoot = realWorkdir === realGitRoot;
+    const isSubdir = realGitRoot && realWorkdir.startsWith(`${realGitRoot}/`);
+    if (!isAtRoot && !isSubdir)
       return;
     const statusProc = _gitDeps.spawn(["git", "status", "--porcelain"], {
       cwd: workdir,
@@ -26195,7 +26206,8 @@ async function autoCommitIfDirty(workdir, stage, role, storyId) {
       dirtyFiles: statusOutput.trim().split(`
 `).length
     });
-    const addProc = _gitDeps.spawn(["git", "add", "-A"], { cwd: workdir, stdout: "pipe", stderr: "pipe" });
+    const addArgs = isSubdir ? ["git", "add", "."] : ["git", "add", "-A"];
+    const addProc = _gitDeps.spawn(addArgs, { cwd: workdir, stdout: "pipe", stderr: "pipe" });
     await addProc.exited;
     const commitProc = _gitDeps.spawn(["git", "commit", "-m", `chore(${storyId}): auto-commit after ${role} session`], {
       cwd: workdir,
@@ -29440,9 +29452,24 @@ async function runDecompose(story, prd, config2, _workdir, agentGetFn) {
   if (!agent) {
     throw new Error(`[decompose] Agent "${config2.autoMode.defaultAgent}" not found \u2014 cannot decompose`);
   }
+  const decomposeTier = naxDecompose?.model ?? "balanced";
+  let decomposeModel;
+  try {
+    const { resolveModel: resolveModel2 } = await Promise.resolve().then(() => (init_schema(), exports_schema));
+    const models = config2.models;
+    const entry = models[decomposeTier] ?? models.balanced;
+    if (entry)
+      decomposeModel = resolveModel2(entry).model;
+  } catch {}
+  const storySessionName = `nax-decompose-${story.id.toLowerCase()}`;
   const adapter = {
     async decompose(prompt) {
-      return agent.complete(prompt, { jsonMode: true, config: config2 });
+      return agent.complete(prompt, {
+        model: decomposeModel,
+        jsonMode: true,
+        config: config2,
+        sessionName: storySessionName
+      });
     }
   };
   return DecomposeBuilder.for(story).prd(prd).config(builderConfig).decompose(adapter);
@@ -67305,7 +67332,16 @@ async function planCommand(workdir, config2, options) {
     const cliAdapter = _deps2.getAgent(agentName);
     if (!cliAdapter)
       throw new Error(`[plan] No agent adapter found for '${agentName}'`);
-    rawResponse = await cliAdapter.complete(prompt, { jsonMode: true, workdir, config: config2 });
+    let autoModel;
+    try {
+      const planTier = config2?.plan?.model ?? "balanced";
+      const { resolveModel: resolveModel2 } = await Promise.resolve().then(() => (init_schema(), exports_schema));
+      const models = config2?.models;
+      const entry = models?.[planTier] ?? models?.balanced;
+      if (entry)
+        autoModel = resolveModel2(entry).model;
+    } catch {}
+    rawResponse = await cliAdapter.complete(prompt, { model: autoModel, jsonMode: true, workdir, config: config2 });
     try {
       const envelope = JSON.parse(rawResponse);
       if (envelope?.type === "result" && typeof envelope?.result === "string") {

package/package.json

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

package/src/acceptance/generator.ts

@@ -108,7 +108,10 @@ IMPORTANT: Output raw TypeScript code only. Do NOT use markdown code fences (\`\
 
   logger.info("acceptance", "Generating tests from PRD refined criteria", { count: refinedCriteria.length });
 
-  const rawOutput = await _generatorPRDDeps.adapter.complete(prompt, { config: options.config });
+  const rawOutput = await _generatorPRDDeps.adapter.complete(prompt, {
+    model: options.modelDef.model,
+    config: options.config,
+  });
   const testCode = extractTestCode(rawOutput);
 
   const refinedJsonContent = JSON.stringify(

package/src/agents/acp/adapter.ts

@@ -694,8 +694,13 @@ export class AcpAgentAdapter implements AgentAdapter {
 
       let session: AcpSession | null = null;
       try {
-        // complete() is one-shot — ephemeral session, no session name, no sidecar
-        session = await client.createSession({ agentName: this.name, permissionMode });
+        // complete() is one-shot — ephemeral session, no sidecar
+        // Use caller-provided sessionName if available (aids tracing), otherwise timestamp-based
+        session = await client.createSession({
+          agentName: this.name,
+          permissionMode,
+          sessionName: _options?.sessionName,
+        });
 
         // Enforce timeout via Promise.race — session.prompt() can hang indefinitely
         let timeoutId: ReturnType<typeof setTimeout> | undefined;

package/src/agents/acp/parser.ts

@@ -70,7 +70,7 @@ export function parseAcpxJsonOutput(rawOutput: string): {
           }
         }
 
-        // Final result with token breakdown (camelCase from acpx)
+        // Final result with token breakdown
         if (event.id !== undefined && event.result && typeof event.result === "object") {
           const result = event.result as Record<string, unknown>;
 

package/src/agents/acp/spawn-client.ts

@@ -135,6 +135,8 @@ class SpawnAcpSession implements AcpSession {
       "acpx",
       "--cwd",
       this.cwd,
+      "--format",
+      "json",
       ...(this.permissionMode === "approve-all" ? ["--approve-all"] : []),
       "--model",
       this.model,

package/src/agents/types.ts

@@ -127,6 +127,12 @@ export interface CompleteOptions {
    * Pass when available so complete() honours permissionProfile / dangerouslySkipPermissions.
    */
   config?: NaxConfig;
+  /**
+   * Named session to use for this completion call.
+   * If omitted, a timestamp-based ephemeral session name is generated.
+   * Pass a meaningful name (e.g. "nax-decompose-us-001") to aid debugging.
+   */
+  sessionName?: string;
 }
 
 /**

package/src/cli/plan.ts

@@ -138,7 +138,17 @@ export async function planCommand(workdir: string, config: NaxConfig, options: P
     const prompt = buildPlanningPrompt(specContent, codebaseContext, undefined, relativePackages, packageDetails);
     const cliAdapter = _deps.getAgent(agentName);
     if (!cliAdapter) throw new Error(`[plan] No agent adapter found for '${agentName}'`);
-    rawResponse = await cliAdapter.complete(prompt, { jsonMode: true, workdir, config });
+    let autoModel: string | undefined;
+    try {
+      const planTier = config?.plan?.model ?? "balanced";
+      const { resolveModel } = await import("../config/schema");
+      const models = config?.models as Record<string, unknown> | undefined;
+      const entry = models?.[planTier] ?? models?.balanced;
+      if (entry) autoModel = resolveModel(entry as Parameters<typeof resolveModel>[0]).model;
+    } catch {
+      // fall through — complete() will use its own fallback
+    }
+    rawResponse = await cliAdapter.complete(prompt, { model: autoModel, jsonMode: true, workdir, config });
     // CLI adapter returns {"type":"result","result":"..."} envelope — unwrap it
     try {
       const envelope = JSON.parse(rawResponse) as Record<string, unknown>;

package/src/pipeline/stages/routing.ts

@@ -65,9 +65,28 @@ async function runDecompose(
   if (!agent) {
     throw new Error(`[decompose] Agent "${config.autoMode.defaultAgent}" not found — cannot decompose`);
   }
+
+  // Resolve decompose model: config.decompose.model tier → actual model string
+  const decomposeTier = naxDecompose?.model ?? "balanced";
+  let decomposeModel: string | undefined;
+  try {
+    const { resolveModel } = await import("../../config/schema");
+    const models = config.models as Record<string, unknown>;
+    const entry = models[decomposeTier] ?? models.balanced;
+    if (entry) decomposeModel = resolveModel(entry as Parameters<typeof resolveModel>[0]).model;
+  } catch {
+    // resolveModel can throw on malformed entries — fall through to let complete() handle it
+  }
+
+  const storySessionName = `nax-decompose-${story.id.toLowerCase()}`;
   const adapter = {
     async decompose(prompt: string): Promise<string> {
-      return agent.complete(prompt, { jsonMode: true, config });
+      return agent.complete(prompt, {
+        model: decomposeModel,
+        jsonMode: true,
+        config,
+        sessionName: storySessionName,
+      });
     },
   };
 

package/src/utils/git.ts

@@ -181,7 +181,11 @@ export async function autoCommitIfDirty(workdir: string, stage: string, role: st
         return gitRoot;
       }
     })();
-    if (realWorkdir !== realGitRoot) return;
+    // Allow: workdir IS the git root, or workdir is a subdirectory (monorepo package)
+    // Reject: workdir has no git repo at all (realGitRoot would be empty/error)
+    const isAtRoot = realWorkdir === realGitRoot;
+    const isSubdir = realGitRoot && realWorkdir.startsWith(`${realGitRoot}/`);
+    if (!isAtRoot && !isSubdir) return;
 
     const statusProc = _gitDeps.spawn(["git", "status", "--porcelain"], {
       cwd: workdir,
@@ -199,7 +203,11 @@ export async function autoCommitIfDirty(workdir: string, stage: string, role: st
       dirtyFiles: statusOutput.trim().split("\n").length,
     });
 
-    const addProc = _gitDeps.spawn(["git", "add", "-A"], { cwd: workdir, stdout: "pipe", stderr: "pipe" });
+    // Use "git add ." when workdir is a monorepo package subdir — only stages files under
+    // that package, preventing accidental cross-package commits.
+    // Use "git add -A" at repo root to capture renames/deletions across the full tree.
+    const addArgs = isSubdir ? ["git", "add", "."] : ["git", "add", "-A"];
+    const addProc = _gitDeps.spawn(addArgs, { cwd: workdir, stdout: "pipe", stderr: "pipe" });
     await addProc.exited;
 
     const commitProc = _gitDeps.spawn(["git", "commit", "-m", `chore(${storyId}): auto-commit after ${role} session`], {