@nathapp/nax 0.40.0 → 0.41.0

package/src/execution/lifecycle/run-setup.ts

@@ -22,6 +22,7 @@ import type { InteractionChain } from "../../interaction";
 import { initInteractionChain } from "../../interaction";
 import { getSafeLogger } from "../../logger";
 import { pipelineEventBus } from "../../pipeline/event-bus";
+import type { AgentGetFn } from "../../pipeline/types";
 import { loadPlugins } from "../../plugins/loader";
 import type { PluginRegistry } from "../../plugins/registry";
 import type { PRD } from "../../prd";
@@ -53,6 +54,8 @@ export interface RunSetupOptions {
   // BUG-017: Additional getters for run.complete event on SIGTERM
   getStoriesCompleted: () => number;
   getTotalStories: () => number;
+  /** Protocol-aware agent resolver — passed from runner.ts registry */
+  agentGetFn?: AgentGetFn;
 }
 
 export interface RunSetupResult {
@@ -206,6 +209,7 @@ export async function setupRun(options: RunSetupOptions): Promise<RunSetupResult
       prdPath,
       workdir,
       dryRun,
+      agentGetFn: options.agentGetFn,
     });
     prd = initResult.prd;
     const counts = initResult.storyCounts;

package/src/execution/runner-completion.ts

@@ -11,9 +11,11 @@ import { fireHook } from "../hooks";
 import { getSafeLogger } from "../logger";
 import type { StoryMetrics } from "../metrics";
 import type { PipelineEventEmitter } from "../pipeline/events";
+import type { AgentGetFn } from "../pipeline/types";
 import type { PluginRegistry } from "../plugins/registry";
 import { isComplete } from "../prd";
 import type { PRD } from "../prd";
+import { autoCommitIfDirty } from "../utils/git";
 import { stopHeartbeat, writeExitSummary } from "./crash-recovery";
 import { hookCtx } from "./story-context";
 
@@ -42,6 +44,10 @@ export interface RunnerCompletionOptions {
   statusWriter: any;
   pluginRegistry: PluginRegistry;
   eventEmitter?: PipelineEventEmitter;
+  /** Protocol-aware agent resolver */
+  agentGetFn?: AgentGetFn;
+  /** Path to prd.json — required for acceptance fix story writes */
+  prdPath: string;
 }
 
 /**
@@ -67,7 +73,7 @@ export async function runCompletionPhase(options: RunnerCompletionOptions): Prom
     const acceptanceResult = await runAcceptanceLoop({
       config: options.config,
       prd: options.prd,
-      prdPath: "", // Not needed for this extraction
+      prdPath: options.prdPath,
       workdir: options.workdir,
       featureDir: options.featureDir,
       hooks: options.hooks,
@@ -79,6 +85,7 @@ export async function runCompletionPhase(options: RunnerCompletionOptions): Prom
       pluginRegistry: options.pluginRegistry,
       eventEmitter: options.eventEmitter,
       statusWriter: options.statusWriter,
+      agentGetFn: options.agentGetFn,
     });
 
     Object.assign(options, {
@@ -153,6 +160,9 @@ export async function runCompletionPhase(options: RunnerCompletionOptions): Prom
     durationMs,
   );
 
+  // Commit status.json and any other nax runtime files left dirty at run end
+  await autoCommitIfDirty(options.workdir, "run.complete", "run-summary", options.feature);
+
   return {
     durationMs,
     runCompletedAt,

package/src/execution/runner-execution.ts

@@ -10,6 +10,7 @@ import type { LoadedHooksConfig } from "../hooks";
 import { getSafeLogger } from "../logger";
 import type { StoryMetrics } from "../metrics";
 import type { PipelineEventEmitter } from "../pipeline/events";
+import type { AgentGetFn } from "../pipeline/types";
 import type { PluginRegistry } from "../plugins/registry";
 import type { PRD } from "../prd";
 import { tryLlmBatchRoute } from "../routing/batch-route";
@@ -17,6 +18,7 @@ import { clearCache as clearLlmCache, routeBatch as llmRouteBatch } from "../rou
 import { precomputeBatchPlan } from "./batching";
 import { getAllReadyStories } from "./helpers";
 import type { ParallelExecutorOptions, ParallelExecutorResult } from "./parallel-executor";
+import type { PidRegistry } from "./pid-registry";
 
 /**
  * Options for the execution phase.
@@ -42,6 +44,10 @@ export interface RunnerExecutionOptions {
   headless: boolean;
   parallel?: number;
   runParallelExecution?: (options: ParallelExecutorOptions, prd: PRD) => Promise<ParallelExecutorResult>;
+  /** Protocol-aware agent resolver — created once in runner.ts from createAgentRegistry(config) */
+  agentGetFn?: AgentGetFn;
+  /** PID registry for crash recovery — passed to agent.run() to register child processes. */
+  pidRegistry?: PidRegistry;
 }
 
 /**
@@ -198,6 +204,8 @@ export async function runExecutionPhase(
       runId: options.runId,
       startTime: options.startTime,
       batchPlan,
+      agentGetFn: options.agentGetFn,
+      pidRegistry: options.pidRegistry,
     },
     prd,
   );

package/src/execution/runner-setup.ts

@@ -7,6 +7,7 @@
 
 import type { NaxConfig } from "../config";
 import type { LoadedHooksConfig } from "../hooks";
+import type { AgentGetFn } from "../pipeline/types";
 
 /**
  * Options for the setup phase.
@@ -31,6 +32,8 @@ export interface RunnerSetupOptions {
   getIterations: () => number;
   getStoriesCompleted: () => number;
   getTotalStories: () => number;
+  /** Protocol-aware agent resolver — created from createAgentRegistry(config) in runner.ts */
+  agentGetFn?: AgentGetFn;
 }
 
 /**
@@ -76,6 +79,7 @@ export async function runSetupPhase(options: RunnerSetupOptions): Promise<Runner
     // BUG-017: Pass getters for run.complete event on SIGTERM
     getStoriesCompleted: options.getStoriesCompleted,
     getTotalStories: options.getTotalStories,
+    agentGetFn: options.agentGetFn,
   });
 
   return setupResult;

package/src/execution/runner.ts

@@ -13,6 +13,7 @@
  * - runner-completion.ts: Acceptance loop, hooks, metrics
  */
 
+import { createAgentRegistry } from "../agents/registry";
 import type { NaxConfig } from "../config";
 import type { LoadedHooksConfig } from "../hooks";
 import { fireHook } from "../hooks";
@@ -116,6 +117,10 @@ export async function run(options: RunOptions): Promise<RunResult> {
 
   const logger = getSafeLogger();
 
+  // Create protocol-aware agent registry (ACP wiring — ACP-003/registry-wiring)
+  const registry = createAgentRegistry(config);
+  const agentGetFn = registry.getAgent.bind(registry);
+
   // Declare prd before crash handler setup to avoid TDZ if SIGTERM arrives during setup
   // biome-ignore lint/suspicious/noExplicitAny: PRD type initialized during setup
   let prd: any | undefined;
@@ -137,6 +142,7 @@ export async function run(options: RunOptions): Promise<RunResult> {
     skipPrecheck,
     headless,
     formatterMode,
+    agentGetFn,
     getTotalCost: () => totalCost,
     getIterations: () => iterations,
     // BUG-017: Pass getters for run.complete event on SIGTERM
@@ -170,6 +176,8 @@ export async function run(options: RunOptions): Promise<RunResult> {
         headless,
         parallel,
         runParallelExecution: _runnerDeps.runParallelExecution ?? undefined,
+        agentGetFn,
+        pidRegistry,
       },
       prd,
       pluginRegistry,
@@ -198,6 +206,7 @@ export async function run(options: RunOptions): Promise<RunResult> {
       hooks,
       feature,
       workdir,
+      prdPath,
       statusFile,
       logFilePath,
       runId,
@@ -214,6 +223,7 @@ export async function run(options: RunOptions): Promise<RunResult> {
       statusWriter,
       pluginRegistry,
       eventEmitter,
+      agentGetFn,
     });
 
     const { durationMs } = completionResult;

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

@@ -89,6 +89,8 @@ export const acceptanceSetupStage: PipelineStage = {
           storyId: ctx.prd.userStories[0]?.id ?? "US-001",
           codebaseContext: "",
           config: ctx.config,
+          testStrategy: ctx.config.acceptance.testStrategy,
+          testFramework: ctx.config.acceptance.testFramework,
         });
       } else {
         refinedCriteria = allCriteria.map((c) => ({
@@ -108,6 +110,8 @@ export const acceptanceSetupStage: PipelineStage = {
         modelTier: ctx.config.acceptance.model ?? "fast",
         modelDef: resolveModel(ctx.config.models[ctx.config.acceptance.model ?? "fast"]),
         config: ctx.config,
+        testStrategy: ctx.config.acceptance.testStrategy,
+        testFramework: ctx.config.acceptance.testFramework,
       });
 
       await _acceptanceSetupDeps.writeFile(testPath, result.testCode);

package/src/pipeline/stages/execution.ts

@@ -107,7 +107,7 @@ export const executionStage: PipelineStage = {
     const logger = getLogger();
 
     // HARD FAILURE: No agent available — cannot proceed without an agent
-    const agent = _executionDeps.getAgent(ctx.config.autoMode.defaultAgent);
+    const agent = (ctx.agentGetFn ?? _executionDeps.getAgent)(ctx.config.autoMode.defaultAgent);
     if (!agent) {
       return {
         action: "fail",
@@ -133,6 +133,7 @@ export const executionStage: PipelineStage = {
         config: ctx.config,
         workdir: ctx.workdir,
         modelTier: ctx.routing.modelTier,
+        featureName: ctx.prd.feature,
         contextMarkdown: ctx.contextMarkdown,
         constitution: ctx.constitution?.content,
         dryRun: false,
@@ -217,6 +218,37 @@ export const executionStage: PipelineStage = {
       modelDef: resolveModel(ctx.config.models[ctx.routing.modelTier]),
       timeoutSeconds: ctx.config.execution.sessionTimeoutSeconds,
       dangerouslySkipPermissions: ctx.config.execution.dangerouslySkipPermissions,
+      pidRegistry: ctx.pidRegistry,
+      featureName: ctx.prd.feature,
+      storyId: ctx.story.id,
+      // No sessionRole for single-session strategies (no role suffix in session name)
+      interactionBridge: (() => {
+        const plugin = ctx.interaction?.getPrimary();
+        if (!plugin) return undefined;
+        const QUESTION_PATTERNS = [/\?/, /\bwhich\b/i, /\bshould i\b/i, /\bunclear\b/i, /\bplease clarify\b/i];
+        return {
+          detectQuestion: async (text: string) => QUESTION_PATTERNS.some((p) => p.test(text)),
+          onQuestionDetected: async (text: string) => {
+            const requestId = `ix-acp-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`;
+            await plugin.send({
+              id: requestId,
+              type: "input",
+              featureName: ctx.prd.feature,
+              storyId: ctx.story.id,
+              stage: "execution",
+              summary: text,
+              fallback: "continue",
+              createdAt: Date.now(),
+            });
+            try {
+              const response = await plugin.receive(requestId, 120_000);
+              return response.value ?? "continue";
+            } catch {
+              return "continue";
+            }
+          },
+        };
+      })(),
     });
 
     ctx.agentResult = result;

package/src/pipeline/stages/routing.ts

@@ -44,7 +44,13 @@ import type { PipelineContext, PipelineStage, RoutingResult, StageResult } from
  * Used as the default implementation in _routingDeps.runDecompose.
  * In production, replace with an LLM-backed adapter.
  */
-async function runDecompose(story: UserStory, prd: PRD, config: NaxConfig, _workdir: string): Promise<DecomposeResult> {
+async function runDecompose(
+  story: UserStory,
+  prd: PRD,
+  config: NaxConfig,
+  _workdir: string,
+  agentGetFn?: import("../types").AgentGetFn,
+): Promise<DecomposeResult> {
   const naxDecompose = config.decompose;
   const builderConfig: BuilderDecomposeConfig = {
     maxSubStories: naxDecompose?.maxSubstories ?? 5,
@@ -52,10 +58,15 @@ async function runDecompose(story: UserStory, prd: PRD, config: NaxConfig, _work
     maxRetries: naxDecompose?.maxRetries ?? 2,
   };
 
-  // Stub adapter — replaced in tests via _routingDeps injection.
+  // Resolve the default agent adapter for LLM-backed decompose.
+  // Falls back to agent.complete() with JSON mode — works with both CLI and ACP adapters.
+  const agent = (agentGetFn ?? getAgent)(config.autoMode.defaultAgent);
+  if (!agent) {
+    throw new Error(`[decompose] Agent "${config.autoMode.defaultAgent}" not found — cannot decompose`);
+  }
   const adapter = {
-    async decompose(_prompt: string): Promise<string> {
-      throw new Error("[decompose] No LLM adapter configured for story decomposition");
+    async decompose(prompt: string): Promise<string> {
+      return agent.complete(prompt, { jsonMode: true });
     },
   };
 
@@ -71,7 +82,7 @@ export const routingStage: PipelineStage = {
 
     // Resolve agent adapter for LLM routing (shared with execution)
     const agentName = ctx.config.execution?.agent ?? "claude";
-    const adapter = _routingDeps.getAgent(agentName);
+    const adapter = (ctx.agentGetFn ?? _routingDeps.getAgent)(agentName);
 
     // Staleness detection (RRP-003):
     // - story.routing absent                   → cache miss (no prior routing)
@@ -173,7 +184,7 @@ export const routingStage: PipelineStage = {
             `Story ${ctx.story.id} is oversized (${acCount} ACs) but decompose is disabled — continuing with original`,
           );
         } else if (decomposeConfig.trigger === "auto") {
-          const result = await _routingDeps.runDecompose(ctx.story, ctx.prd, ctx.config, ctx.workdir);
+          const result = await _routingDeps.runDecompose(ctx.story, ctx.prd, ctx.config, ctx.workdir, ctx.agentGetFn);
           if (result.validation.valid) {
             _routingDeps.applyDecomposition(ctx.prd, result);
             if (ctx.prdPath) {
@@ -193,7 +204,7 @@ export const routingStage: PipelineStage = {
             ctx.interaction!,
           );
           if (action === "decompose") {
-            const result = await _routingDeps.runDecompose(ctx.story, ctx.prd, ctx.config, ctx.workdir);
+            const result = await _routingDeps.runDecompose(ctx.story, ctx.prd, ctx.config, ctx.workdir, ctx.agentGetFn);
             if (result.validation.valid) {
               _routingDeps.applyDecomposition(ctx.prd, result);
               if (ctx.prdPath) {

package/src/pipeline/types.ts

@@ -8,6 +8,7 @@ import type { AgentResult } from "../agents/types";
 import type { NaxConfig } from "../config/schema";
 import type { ConstitutionResult } from "../constitution/types";
 import type { BuiltContext } from "../context/types";
+import type { PidRegistry } from "../execution/pid-registry";
 import type { HooksConfig } from "../hooks/types";
 import type { InteractionChain } from "../interaction/chain";
 import type { StoryMetrics } from "../metrics/types";
@@ -52,6 +53,8 @@ export interface RoutingResult {
  * };
  * ```
  */
+export type AgentGetFn = (name: string) => import("../agents/types").AgentAdapter | undefined;
+
 export interface PipelineContext {
   /** Ngent configuration */
   config: NaxConfig;
@@ -73,6 +76,13 @@ export interface PipelineContext {
   hooks: HooksConfig;
   /** Plugin registry (optional, for plugin-provided extensions) */
   plugins?: PluginRegistry;
+  /**
+   * Protocol-aware agent resolver. When set (ACP mode), returns AcpAgentAdapter;
+   * falls back to standalone getAgent (CLI mode) when absent.
+   */
+  agentGetFn?: AgentGetFn;
+  /** PID registry for crash recovery — passed through to agent.run() for child process registration. */
+  pidRegistry?: PidRegistry;
   /** Interaction chain (optional, for human-in-the-loop triggers) */
   interaction?: InteractionChain;
   /** Constitution result (set by constitutionStage) */

package/src/tdd/orchestrator.ts

@@ -28,6 +28,8 @@ export interface ThreeSessionTddOptions {
   config: NaxConfig;
   workdir: string;
   modelTier: ModelTier;
+  /** Feature name — used for ACP session naming (nax-<hash>-<feature>-<story>-<role>) */
+  featureName?: string;
   contextMarkdown?: string;
   constitution?: string;
   dryRun?: boolean;
@@ -45,6 +47,7 @@ export async function runThreeSessionTdd(options: ThreeSessionTddOptions): Promi
     config,
     workdir,
     modelTier,
+    featureName,
     contextMarkdown,
     constitution,
     dryRun = false,
@@ -135,6 +138,7 @@ export async function runThreeSessionTdd(options: ThreeSessionTddOptions): Promi
       lite,
       lite,
       constitution,
+      featureName,
     );
     sessions.push(session1);
   }
@@ -240,6 +244,7 @@ export async function runThreeSessionTdd(options: ThreeSessionTddOptions): Promi
     lite,
     lite,
     constitution,
+    featureName,
   );
   sessions.push(session2);
 
@@ -269,6 +274,7 @@ export async function runThreeSessionTdd(options: ThreeSessionTddOptions): Promi
     contextMarkdown,
     lite,
     logger,
+    featureName,
   );
 
   // Session 3: Verifier
@@ -286,6 +292,7 @@ export async function runThreeSessionTdd(options: ThreeSessionTddOptions): Promi
     false,
     false,
     constitution,
+    featureName,
   );
   sessions.push(session3);
 

package/src/tdd/rectification-gate.ts

@@ -34,6 +34,7 @@ export async function runFullSuiteGate(
   contextMarkdown: string | undefined,
   lite: boolean,
   logger: ReturnType<typeof getLogger>,
+  featureName?: string,
 ): Promise<boolean> {
   const rectificationEnabled = config.execution.rectification?.enabled ?? false;
   if (!rectificationEnabled) return false;
@@ -67,6 +68,7 @@ export async function runFullSuiteGate(
         rectificationConfig,
         testCmd,
         fullSuiteTimeout,
+        featureName,
       );
     }
 
@@ -118,6 +120,7 @@ async function runRectificationLoop(
   rectificationConfig: NonNullable<NaxConfig["execution"]["rectification"]>,
   testCmd: string,
   fullSuiteTimeout: number,
+  featureName?: string,
 ): Promise<boolean> {
   const rectificationState: RectificationState = {
     attempt: 0,
@@ -156,6 +159,9 @@ async function runRectificationLoop(
       modelDef: resolveModel(config.models[implementerTier]),
       timeoutSeconds: config.execution.sessionTimeoutSeconds,
       dangerouslySkipPermissions: config.execution.dangerouslySkipPermissions,
+      featureName,
+      storyId: story.id,
+      sessionRole: "implementer",
     });
 
     if (!rectifyResult.success && rectifyResult.pid) {

package/src/tdd/session-runner.ts

@@ -84,6 +84,7 @@ export async function runTddSession(
   lite = false,
   skipIsolation = false,
   constitution?: string,
+  featureName?: string,
 ): Promise<TddSessionResult> {
   const startTime = Date.now();
 
@@ -130,6 +131,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