@nathapp/nax 0.42.2 → 0.42.3

package/dist/nax.js

@@ -18054,6 +18054,13 @@ var init_defaults = __esm(() => {
 });
 
 // src/config/schema.ts
+var exports_schema = {};
+__export(exports_schema, {
+  resolveModel: () => resolveModel,
+  NaxConfigSchema: () => NaxConfigSchema,
+  DEFAULT_CONFIG: () => DEFAULT_CONFIG,
+  AcceptanceConfigSchema: () => AcceptanceConfigSchema
+});
 var init_schema = __esm(() => {
   init_types3();
   init_schemas3();
@@ -18968,8 +18975,6 @@ class SpawnAcpSession {
       "--cwd",
       this.cwd,
       ...this.permissionMode === "approve-all" ? ["--approve-all"] : [],
-      "--format",
-      "json",
       "--model",
       this.model,
       "--timeout",
@@ -19500,10 +19505,15 @@ class AcpAgentAdapter {
   async plan(options) {
     let modelDef = options.modelDef;
     if (!modelDef && options.config?.models) {
-      const { resolveBalancedModelDef: resolveBalancedModelDef2 } = await Promise.resolve().then(() => (init_model_resolution(), exports_model_resolution));
-      try {
-        modelDef = resolveBalancedModelDef2(options.config);
-      } catch {}
+      const tier = options.modelTier ?? "balanced";
+      const { resolveModel: resolveModel2 } = await Promise.resolve().then(() => (init_schema(), exports_schema));
+      const models = options.config.models;
+      const entry = models[tier] ?? models.balanced;
+      if (entry) {
+        try {
+          modelDef = resolveModel2(entry);
+        } catch {}
+      }
     }
     modelDef ??= { provider: "anthropic", model: "claude-sonnet-4-5-20250514" };
     const timeoutSeconds = options.timeoutSeconds ?? options.config?.execution?.sessionTimeoutSeconds ?? 600;
@@ -21849,7 +21859,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.42.2",
+    version: "0.42.3",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -21922,8 +21932,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("9c1f716"))
-        return "9c1f716";
+      if (/^[0-9a-f]{6,10}$/.test("b051dcb"))
+        return "b051dcb";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -65743,7 +65753,8 @@ var _deps2 = {
     const result = Bun.spawnSync(cmd, opts ? { cwd: opts.cwd } : {});
     return { stdout: result.stdout, exitCode: result.exitCode };
   },
-  mkdirp: (path) => Bun.spawn(["mkdir", "-p", path]).exited.then(() => {})
+  mkdirp: (path) => Bun.spawn(["mkdir", "-p", path]).exited.then(() => {}),
+  existsSync: (path) => existsSync9(path)
 };
 async function planCommand(workdir, config2, options) {
   const naxDir = join10(workdir, "nax");
@@ -65759,11 +65770,14 @@ async function planCommand(workdir, config2, options) {
   const pkg = await _deps2.readPackageJson(workdir);
   const projectName = detectProjectName(workdir, pkg);
   const branchName = options.branch ?? `feat/${options.feature}`;
-  const prompt = buildPlanningPrompt(specContent, codebaseContext);
+  const outputDir = join10(naxDir, "features", options.feature);
+  const outputPath = join10(outputDir, "prd.json");
+  await _deps2.mkdirp(outputDir);
   const agentName = config2?.autoMode?.defaultAgent ?? "claude";
   const timeoutSeconds = config2?.execution?.sessionTimeoutSeconds ?? 600;
   let rawResponse;
   if (options.auto) {
+    const prompt = buildPlanningPrompt(specContent, codebaseContext);
     const cliAdapter = _deps2.getAgent(agentName);
     if (!cliAdapter)
       throw new Error(`[plan] No agent adapter found for '${agentName}'`);
@@ -65775,33 +65789,34 @@ async function planCommand(workdir, config2, options) {
       }
     } catch {}
   } else {
+    const prompt = buildPlanningPrompt(specContent, codebaseContext, outputPath);
     const adapter = _deps2.getAgent(agentName, config2);
     if (!adapter)
       throw new Error(`[plan] No agent adapter found for '${agentName}'`);
     const interactionBridge = createCliInteractionBridge();
     logger?.info("plan", "Starting interactive planning session...", { agent: agentName });
     try {
-      const result = await adapter.plan({
+      await adapter.plan({
         prompt,
         workdir,
         interactive: true,
         timeoutSeconds,
         interactionBridge,
         config: config2,
-        modelTier: "balanced",
+        modelTier: config2?.plan?.model ?? "balanced",
         dangerouslySkipPermissions: config2?.execution?.dangerouslySkipPermissions ?? false,
         maxInteractionTurns: config2?.agent?.maxInteractionTurns
       });
-      rawResponse = result.specContent;
     } finally {
       logger?.info("plan", "Interactive session ended");
     }
+    if (!_deps2.existsSync(outputPath)) {
+      throw new Error(`[plan] Agent did not write PRD to ${outputPath}. Check agent logs for errors.`);
+    }
+    rawResponse = await _deps2.readFile(outputPath);
   }
   const finalPrd = validatePlanOutput(rawResponse, options.feature, branchName);
   finalPrd.project = projectName;
-  const outputDir = join10(naxDir, "features", options.feature);
-  const outputPath = join10(outputDir, "prd.json");
-  await _deps2.mkdirp(outputDir);
   await _deps2.writeFile(outputPath, JSON.stringify(finalPrd, null, 2));
   logger?.info("plan", "[OK] PRD written", { outputPath });
   return outputPath;
@@ -65868,7 +65883,7 @@ function buildCodebaseContext2(scan) {
   return sections.join(`
 `);
 }
-function buildPlanningPrompt(specContent, codebaseContext) {
+function buildPlanningPrompt(specContent, codebaseContext, outputFilePath) {
   return `You are a senior software architect generating a product requirements document (PRD) as JSON.
 
 ## Spec
@@ -65924,7 +65939,8 @@ Generate a JSON object with this exact structure (no markdown, no explanation \u
 - three-session-tdd: Complex stories. Full TDD cycle with separate test-writer and implementer sessions.
 - three-session-tdd-lite: Expert/high-risk stories. Full TDD with additional verifier session.
 
-Output ONLY the JSON object. Do not wrap in markdown code blocks.`;
+${outputFilePath ? `Write the PRD JSON directly to this file path: ${outputFilePath}
+Do NOT output the JSON to the conversation. Write the file, then reply with a brief confirmation.` : "Output ONLY the JSON object. Do not wrap in markdown code blocks."}`;
 }
 // src/cli/accept.ts
 init_config();

package/package.json

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

package/src/agents/acp/adapter.ts

@@ -636,14 +636,19 @@ export class AcpAgentAdapter implements AgentAdapter {
   }
 
   async plan(options: PlanOptions): Promise<PlanResult> {
-    // Resolve model: explicit > config.models.balanced > fallback
+    // Resolve model: explicit > config.models[tier] > config.models.balanced > fallback
     let modelDef = options.modelDef;
     if (!modelDef && options.config?.models) {
-      const { resolveBalancedModelDef } = await import("../model-resolution");
-      try {
-        modelDef = resolveBalancedModelDef(options.config as import("../../config").NaxConfig);
-      } catch {
-        // resolveBalancedModelDef can throw if models.balanced missing
+      const tier = options.modelTier ?? "balanced";
+      const { resolveModel } = await import("../../config/schema");
+      const models = options.config.models as Record<string, unknown>;
+      const entry = models[tier] ?? models.balanced;
+      if (entry) {
+        try {
+          modelDef = resolveModel(entry as Parameters<typeof resolveModel>[0]);
+        } catch {
+          // resolveModel can throw on malformed entries
+        }
       }
     }
     modelDef ??= { provider: "anthropic", model: "claude-sonnet-4-5-20250514" };

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

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

package/src/cli/plan.ts

@@ -37,6 +37,7 @@ export const _deps = {
     return { stdout: result.stdout as Buffer, exitCode: result.exitCode };
   },
   mkdirp: (path: string): Promise<void> => Bun.spawn(["mkdir", "-p", path]).exited.then(() => {}),
+  existsSync: (path: string): boolean => existsSync(path),
 };
 
 // ─────────────────────────────────────────────────────────────────────────────
@@ -88,9 +89,11 @@ export async function planCommand(workdir: string, config: NaxConfig, options: P
   const pkg = await _deps.readPackageJson(workdir);
   const projectName = detectProjectName(workdir, pkg);
 
-  // Build prompt
+  // Compute output path early — needed for interactive file-write prompt
   const branchName = options.branch ?? `feat/${options.feature}`;
-  const prompt = buildPlanningPrompt(specContent, codebaseContext);
+  const outputDir = join(naxDir, "features", options.feature);
+  const outputPath = join(outputDir, "prd.json");
+  await _deps.mkdirp(outputDir);
 
   const agentName = config?.autoMode?.defaultAgent ?? "claude";
 
@@ -101,6 +104,7 @@ export async function planCommand(workdir: string, config: NaxConfig, options: P
   let rawResponse: string;
   if (options.auto) {
     // One-shot: use CLI adapter directly — simple completion doesn't need ACP session overhead
+    const prompt = buildPlanningPrompt(specContent, codebaseContext);
     const cliAdapter = _deps.getAgent(agentName);
     if (!cliAdapter) throw new Error(`[plan] No agent adapter found for '${agentName}'`);
     rawResponse = await cliAdapter.complete(prompt, { jsonMode: true });
@@ -114,27 +118,32 @@ export async function planCommand(workdir: string, config: NaxConfig, options: P
       // Not an envelope — use rawResponse as-is
     }
   } else {
-    // Interactive: use protocol-aware adapter (ACP when configured)
+    // Interactive: agent writes PRD JSON directly to outputPath (avoids output truncation)
+    const prompt = buildPlanningPrompt(specContent, codebaseContext, outputPath);
     const adapter = _deps.getAgent(agentName, config);
     if (!adapter) throw new Error(`[plan] No agent adapter found for '${agentName}'`);
     const interactionBridge = createCliInteractionBridge();
     logger?.info("plan", "Starting interactive planning session...", { agent: agentName });
     try {
-      const result = await adapter.plan({
+      await adapter.plan({
         prompt,
         workdir,
         interactive: true,
         timeoutSeconds,
         interactionBridge,
         config,
-        modelTier: "balanced",
+        modelTier: config?.plan?.model ?? "balanced",
         dangerouslySkipPermissions: config?.execution?.dangerouslySkipPermissions ?? false,
         maxInteractionTurns: config?.agent?.maxInteractionTurns,
       });
-      rawResponse = result.specContent;
     } finally {
       logger?.info("plan", "Interactive session ended");
     }
+    // Read back from file written by agent
+    if (!_deps.existsSync(outputPath)) {
+      throw new Error(`[plan] Agent did not write PRD to ${outputPath}. Check agent logs for errors.`);
+    }
+    rawResponse = await _deps.readFile(outputPath);
   }
 
   // Validate and normalize: handles markdown extraction, trailing commas, LLM quirks,
@@ -144,10 +153,7 @@ export async function planCommand(workdir: string, config: NaxConfig, options: P
   // Override project with auto-detected name (validatePlanOutput fills feature/branchName already)
   finalPrd.project = projectName;
 
-  // Write output
-  const outputDir = join(naxDir, "features", options.feature);
-  const outputPath = join(outputDir, "prd.json");
-  await _deps.mkdirp(outputDir);
+  // Write normalized PRD (overwrites agent-written file with validated/normalized version)
   await _deps.writeFile(outputPath, JSON.stringify(finalPrd, null, 2));
 
   logger?.info("plan", "[OK] PRD written", { outputPath });
@@ -256,7 +262,7 @@ function buildCodebaseContext(scan: CodebaseScan): string {
  * - Complexity classification guide
  * - Test strategy guide
  */
-function buildPlanningPrompt(specContent: string, codebaseContext: string): string {
+function buildPlanningPrompt(specContent: string, codebaseContext: string, outputFilePath?: string): string {
   return `You are a senior software architect generating a product requirements document (PRD) as JSON.
 
 ## Spec
@@ -312,5 +318,9 @@ Generate a JSON object with this exact structure (no markdown, no explanation
 - three-session-tdd: Complex stories. Full TDD cycle with separate test-writer and implementer sessions.
 - three-session-tdd-lite: Expert/high-risk stories. Full TDD with additional verifier session.
 
-Output ONLY the JSON object. Do not wrap in markdown code blocks.`;
+${
+  outputFilePath
+    ? `Write the PRD JSON directly to this file path: ${outputFilePath}\nDo NOT output the JSON to the conversation. Write the file, then reply with a brief confirmation.`
+    : "Output ONLY the JSON object. Do not wrap in markdown code blocks."
+}`;
 }