@nathapp/nax 0.42.4 → 0.42.5

package/dist/nax.js

@@ -3244,7 +3244,10 @@ async function executeComplete(binary, prompt, options) {
   if (options?.jsonMode) {
     cmd.push("--output-format", "json");
   }
-  const proc = _completeDeps.spawn(cmd, { stdout: "pipe", stderr: "pipe" });
+  const spawnOpts = { stdout: "pipe", stderr: "pipe" };
+  if (options?.workdir)
+    spawnOpts.cwd = options.workdir;
+  const proc = _completeDeps.spawn(cmd, spawnOpts);
   const exitCode = await proc.exited;
   const stdout = await new Response(proc.stdout).text();
   const stderr = await new Response(proc.stderr).text();
@@ -19053,7 +19056,11 @@ class SpawnAcpClient {
     const parts = cmdStr.split(/\s+/);
     const modelIdx = parts.indexOf("--model");
     this.model = modelIdx >= 0 && parts[modelIdx + 1] ? parts[modelIdx + 1] : "default";
-    this.agentName = parts[parts.length - 1] || "claude";
+    const lastToken = parts[parts.length - 1];
+    if (!lastToken || lastToken.startsWith("-")) {
+      throw new Error(`[acp-adapter] Could not parse agentName from cmdStr: "${cmdStr}"`);
+    }
+    this.agentName = lastToken;
     this.cwd = cwd || process.cwd();
     this.timeoutSeconds = timeoutSeconds || 1800;
     this.env = buildAllowedEnv2();
@@ -19061,8 +19068,8 @@ class SpawnAcpClient {
   async start() {}
   async createSession(opts) {
     const sessionName = opts.sessionName || `nax-${Date.now()}`;
-    const cmd = ["acpx", "--cwd", this.cwd, opts.agentName, "sessions", "new", "--name", sessionName];
-    getSafeLogger()?.debug("acp-adapter", `Creating new session: ${sessionName}`);
+    const cmd = ["acpx", "--cwd", this.cwd, opts.agentName, "sessions", "ensure", "--name", sessionName];
+    getSafeLogger()?.debug("acp-adapter", `Ensuring session: ${sessionName}`);
     const proc = _spawnClientDeps.spawn(cmd, { stdout: "pipe", stderr: "pipe" });
     const exitCode = await proc.exited;
     if (exitCode !== 0) {
@@ -19079,15 +19086,15 @@ class SpawnAcpClient {
       env: this.env
     });
   }
-  async loadSession(sessionName) {
-    const cmd = ["acpx", "--cwd", this.cwd, this.agentName, "sessions", "ensure", "--name", sessionName];
+  async loadSession(sessionName, agentName) {
+    const cmd = ["acpx", "--cwd", this.cwd, agentName, "sessions", "ensure", "--name", sessionName];
     const proc = _spawnClientDeps.spawn(cmd, { stdout: "pipe", stderr: "pipe" });
     const exitCode = await proc.exited;
     if (exitCode !== 0) {
       return null;
     }
     return new SpawnAcpSession({
-      agentName: this.agentName,
+      agentName,
       sessionName,
       cwd: this.cwd,
       model: this.model,
@@ -19177,9 +19184,12 @@ function buildSessionName(workdir, featureName, storyId, sessionRole) {
   return parts.join("-");
 }
 async function ensureAcpSession(client, sessionName, agentName, permissionMode) {
+  if (!agentName) {
+    throw new Error("[acp-adapter] agentName is required for ensureAcpSession");
+  }
   if (client.loadSession) {
     try {
-      const existing = await client.loadSession(sessionName);
+      const existing = await client.loadSession(sessionName, agentName);
       if (existing) {
         getSafeLogger()?.debug("acp-adapter", `Resumed existing session: ${sessionName}`);
         return existing;
@@ -19445,10 +19455,11 @@ class AcpAgentAdapter {
     const model = _options?.model ?? "default";
     const timeoutMs = _options?.timeoutMs ?? 120000;
     const permissionMode = _options?.dangerouslySkipPermissions ? "approve-all" : "default";
+    const workdir = _options?.workdir;
     let lastError;
     for (let attempt = 0;attempt < MAX_RATE_LIMIT_RETRIES; attempt++) {
       const cmdStr = `acpx --model ${model} ${this.name}`;
-      const client = _acpAdapterDeps.createClient(cmdStr);
+      const client = _acpAdapterDeps.createClient(cmdStr, workdir);
       await client.start();
       let session = null;
       try {
@@ -21859,7 +21870,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.42.4",
+    version: "0.42.5",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -21932,8 +21943,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("35ef278"))
-        return "35ef278";
+      if (/^[0-9a-f]{6,10}$/.test("7b603fa"))
+        return "7b603fa";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -65781,7 +65792,7 @@ 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 });
+    rawResponse = await cliAdapter.complete(prompt, { jsonMode: true, workdir });
     try {
       const envelope = JSON.parse(rawResponse);
       if (envelope?.type === "result" && typeof envelope?.result === "string") {
@@ -65805,7 +65816,8 @@ async function planCommand(workdir, config2, options) {
         config: config2,
         modelTier: config2?.plan?.model ?? "balanced",
         dangerouslySkipPermissions: config2?.execution?.dangerouslySkipPermissions ?? false,
-        maxInteractionTurns: config2?.agent?.maxInteractionTurns
+        maxInteractionTurns: config2?.agent?.maxInteractionTurns,
+        featureName: options.feature
       });
     } finally {
       logger?.info("plan", "Interactive session ended");

package/package.json

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

package/src/agents/acp/adapter.ts

@@ -92,7 +92,7 @@ export interface AcpClient {
   start(): Promise<void>;
   createSession(opts: { agentName: string; permissionMode: string; sessionName?: string }): Promise<AcpSession>;
   /** Resume an existing named session. Returns null if the session is not found. */
-  loadSession?(sessionName: string): Promise<AcpSession | null>;
+  loadSession?(sessionName: string, agentName: string): Promise<AcpSession | null>;
   close(): Promise<void>;
 }
 
@@ -180,10 +180,14 @@ export async function ensureAcpSession(
   agentName: string,
   permissionMode: string,
 ): Promise<AcpSession> {
+  if (!agentName) {
+    throw new Error("[acp-adapter] agentName is required for ensureAcpSession");
+  }
+
   // Try to resume existing session first
   if (client.loadSession) {
     try {
-      const existing = await client.loadSession(sessionName);
+      const existing = await client.loadSession(sessionName, agentName);
       if (existing) {
         getSafeLogger()?.debug("acp-adapter", `Resumed existing session: ${sessionName}`);
         return existing;
@@ -554,12 +558,13 @@ export class AcpAgentAdapter implements AgentAdapter {
     const model = _options?.model ?? "default";
     const timeoutMs = _options?.timeoutMs ?? 120_000; // 2-min safety net by default
     const permissionMode = _options?.dangerouslySkipPermissions ? "approve-all" : "default";
+    const workdir = _options?.workdir;
 
     let lastError: Error | undefined;
 
     for (let attempt = 0; attempt < MAX_RATE_LIMIT_RETRIES; attempt++) {
       const cmdStr = `acpx --model ${model} ${this.name}`;
-      const client = _acpAdapterDeps.createClient(cmdStr);
+      const client = _acpAdapterDeps.createClient(cmdStr, workdir);
       await client.start();
 
       let session: AcpSession | null = null;

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

@@ -211,7 +211,7 @@ class SpawnAcpSession implements AcpSession {
  * The cmdStr is parsed to extract --model and agent name:
  *   "acpx --model claude-sonnet-4-5 claude" → model=claude-sonnet-4-5, agent=claude
  *
- * createSession() spawns: acpx --cwd <dir> <agent> sessions new --name <name>
+ * createSession() spawns: acpx <agent> sessions ensure --name <name>
  * loadSession() tries to resume an existing named session.
  */
 export class SpawnAcpClient implements AcpClient {
@@ -226,8 +226,12 @@ export class SpawnAcpClient implements AcpClient {
     const parts = cmdStr.split(/\s+/);
     const modelIdx = parts.indexOf("--model");
     this.model = modelIdx >= 0 && parts[modelIdx + 1] ? parts[modelIdx + 1] : "default";
-    // Agent name is the last non-flag token
-    this.agentName = parts[parts.length - 1] || "claude";
+    // Agent name is the last non-flag token — must be present and not a flag
+    const lastToken = parts[parts.length - 1];
+    if (!lastToken || lastToken.startsWith("-")) {
+      throw new Error(`[acp-adapter] Could not parse agentName from cmdStr: "${cmdStr}"`);
+    }
+    this.agentName = lastToken;
     this.cwd = cwd || process.cwd();
     this.timeoutSeconds = timeoutSeconds || 1800;
     this.env = buildAllowedEnv();
@@ -244,9 +248,9 @@ export class SpawnAcpClient implements AcpClient {
   }): Promise<AcpSession> {
     const sessionName = opts.sessionName || `nax-${Date.now()}`;
 
-    // Create new session via CLI (sessions new = always creates; sessions ensure = lookup only)
-    const cmd = ["acpx", "--cwd", this.cwd, opts.agentName, "sessions", "new", "--name", sessionName];
-    getSafeLogger()?.debug("acp-adapter", `Creating new session: ${sessionName}`);
+    // Ensure session exists via CLI
+    const cmd = ["acpx", "--cwd", this.cwd, opts.agentName, "sessions", "ensure", "--name", sessionName];
+    getSafeLogger()?.debug("acp-adapter", `Ensuring session: ${sessionName}`);
 
     const proc = _spawnClientDeps.spawn(cmd, { stdout: "pipe", stderr: "pipe" });
     const exitCode = await proc.exited;
@@ -267,9 +271,9 @@ export class SpawnAcpClient implements AcpClient {
     });
   }
 
-  async loadSession(sessionName: string): Promise<AcpSession | null> {
+  async loadSession(sessionName: string, agentName: string): Promise<AcpSession | null> {
     // Try to ensure session exists — if it does, acpx returns success
-    const cmd = ["acpx", "--cwd", this.cwd, this.agentName, "sessions", "ensure", "--name", sessionName];
+    const cmd = ["acpx", "--cwd", this.cwd, agentName, "sessions", "ensure", "--name", sessionName];
 
     const proc = _spawnClientDeps.spawn(cmd, { stdout: "pipe", stderr: "pipe" });
     const exitCode = await proc.exited;
@@ -279,7 +283,7 @@ export class SpawnAcpClient implements AcpClient {
     }
 
     return new SpawnAcpSession({
-      agentName: this.agentName,
+      agentName,
       sessionName,
       cwd: this.cwd,
       model: this.model,

package/src/agents/claude-complete.ts

@@ -51,7 +51,9 @@ export async function executeComplete(binary: string, prompt: string, options?:
     cmd.push("--output-format", "json");
   }
 
-  const proc = _completeDeps.spawn(cmd, { stdout: "pipe", stderr: "pipe" });
+  const spawnOpts: { stdout: "pipe"; stderr: "pipe"; cwd?: string } = { stdout: "pipe", stderr: "pipe" };
+  if (options?.workdir) spawnOpts.cwd = options.workdir;
+  const proc = _completeDeps.spawn(cmd, spawnOpts);
   const exitCode = await proc.exited;
 
   const stdout = await new Response(proc.stdout).text();

package/src/agents/types.ts

@@ -102,6 +102,12 @@ export interface CompleteOptions {
   model?: string;
   /** Whether to skip permission prompts (maps to permissionMode in ACP) */
   dangerouslySkipPermissions?: boolean;
+  /**
+   * Working directory for the completion call.
+   * Used by ACP adapter to set --cwd on the spawned acpx session.
+   * CLI adapter uses this as the process cwd when spawning the agent binary.
+   */
+  workdir?: string;
   /**
    * Timeout for the completion call in milliseconds.
    * Adapters that support it (e.g. ACP) will enforce this as a hard deadline.

package/src/cli/plan.ts

@@ -107,7 +107,7 @@ export async function planCommand(workdir: string, config: NaxConfig, options: P
     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 });
+    rawResponse = await cliAdapter.complete(prompt, { jsonMode: true, workdir });
     // CLI adapter returns {"type":"result","result":"..."} envelope — unwrap it
     try {
       const envelope = JSON.parse(rawResponse) as Record<string, unknown>;
@@ -135,6 +135,7 @@ export async function planCommand(workdir: string, config: NaxConfig, options: P
         modelTier: config?.plan?.model ?? "balanced",
         dangerouslySkipPermissions: config?.execution?.dangerouslySkipPermissions ?? false,
         maxInteractionTurns: config?.agent?.maxInteractionTurns,
+        featureName: options.feature,
       });
     } finally {
       logger?.info("plan", "Interactive session ended");