@nathapp/nax 0.49.1 → 0.49.6

package/dist/nax.js

@@ -3267,10 +3267,10 @@ Security-critical functions (authentication, cryptography, tokens, sessions, cre
 password hashing, access control) must be classified at MINIMUM "medium" complexity
 regardless of LOC count. These require at minimum "tdd-simple" test strategy.`, TEST_STRATEGY_GUIDE = `## Test Strategy Guide
 
-- test-after: Simple changes with well-understood behavior. Write tests after implementation.
-- tdd-simple: Medium complexity. Write key tests first, implement, then fill coverage.
-- 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.`, GROUPING_RULES = `## Grouping Rules
+- test-after: Simple changes with well-understood behavior. Write tests after implementation in a single session.
+- tdd-simple: Medium complexity. Write failing tests first, then implement to pass them \u2014 all in one session.
+- three-session-tdd: Complex stories. 3 sessions: (1) test-writer writes failing tests \u2014 no src/ changes allowed, (2) implementer makes them pass without modifying test files, (3) verifier confirms correctness.
+- three-session-tdd-lite: Expert/high-risk stories. 3 sessions: (1) test-writer writes failing tests and may create minimal src/ stubs for imports, (2) implementer makes tests pass and may add missing coverage or replace stubs, (3) verifier confirms correctness.`, GROUPING_RULES = `## Grouping Rules
 
 - Combine small, related tasks into a single "simple" or "medium" story.
 - Do NOT create separate stories for every single file or function unless complex.
@@ -3667,6 +3667,16 @@ function buildAllowedEnv(options) {
 async function executeOnce(binary, options, pidRegistry) {
   const cmd = _runOnceDeps.buildCmd(binary, options);
   const startTime = Date.now();
+  if (options.sessionRole || options.acpSessionName || options.keepSessionOpen) {
+    const logger2 = getLogger();
+    logger2.debug("agent", "CLI mode: session options received (unused)", {
+      sessionRole: options.sessionRole,
+      acpSessionName: options.acpSessionName,
+      keepSessionOpen: options.keepSessionOpen,
+      featureName: options.featureName,
+      storyId: options.storyId
+    });
+  }
   const proc = Bun.spawn(cmd, {
     cwd: options.workdir,
     stdout: "pipe",
@@ -19276,7 +19286,6 @@ class SpawnAcpClient {
   model;
   cwd;
   timeoutSeconds;
-  permissionMode;
   env;
   pidRegistry;
   constructor(cmdStr, cwd, timeoutSeconds, pidRegistry) {
@@ -19290,7 +19299,6 @@ class SpawnAcpClient {
     this.agentName = lastToken;
     this.cwd = cwd || process.cwd();
     this.timeoutSeconds = timeoutSeconds || 1800;
-    this.permissionMode = "approve-reads";
     this.env = buildAllowedEnv2();
     this.pidRegistry = pidRegistry;
   }
@@ -19432,7 +19440,13 @@ async function closeAcpSession(session) {
 function acpSessionsPath(workdir, featureName) {
   return join3(workdir, "nax", "features", featureName, "acp-sessions.json");
 }
-async function saveAcpSession(workdir, featureName, storyId, sessionName) {
+function sidecarSessionName(entry) {
+  return typeof entry === "string" ? entry : entry.sessionName;
+}
+function sidecarAgentName(entry) {
+  return typeof entry === "string" ? "claude" : entry.agentName;
+}
+async function saveAcpSession(workdir, featureName, storyId, sessionName, agentName = "claude") {
   try {
     const path = acpSessionsPath(workdir, featureName);
     let data = {};
@@ -19440,7 +19454,7 @@ async function saveAcpSession(workdir, featureName, storyId, sessionName) {
       const existing = await Bun.file(path).text();
       data = JSON.parse(existing);
     } catch {}
-    data[storyId] = sessionName;
+    data[storyId] = { sessionName, agentName };
     await Bun.write(path, JSON.stringify(data, null, 2));
   } catch (err) {
     getSafeLogger()?.warn("acp-adapter", "Failed to save session to sidecar", { error: String(err) });
@@ -19467,7 +19481,8 @@ async function readAcpSession(workdir, featureName, storyId) {
     const path = acpSessionsPath(workdir, featureName);
     const existing = await Bun.file(path).text();
     const data = JSON.parse(existing);
-    return data[storyId] ?? null;
+    const entry = data[storyId];
+    return entry ? sidecarSessionName(entry) : null;
   } catch {
     return null;
   }
@@ -19486,24 +19501,34 @@ async function sweepFeatureSessions(workdir, featureName) {
     return;
   const logger = getSafeLogger();
   logger?.info("acp-adapter", `[sweep] Closing ${entries.length} open sessions for feature: ${featureName}`);
-  const cmdStr = "acpx claude";
-  const client = _acpAdapterDeps.createClient(cmdStr, workdir);
-  try {
-    await client.start();
-    for (const [, sessionName] of entries) {
-      try {
-        if (client.loadSession) {
-          const session = await client.loadSession(sessionName, "claude", "approve-reads");
-          if (session) {
-            await session.close().catch(() => {});
+  const byAgent = new Map;
+  for (const [, entry] of entries) {
+    const agent = sidecarAgentName(entry);
+    const name = sidecarSessionName(entry);
+    if (!byAgent.has(agent))
+      byAgent.set(agent, []);
+    byAgent.get(agent)?.push(name);
+  }
+  for (const [agentName, sessionNames] of byAgent) {
+    const cmdStr = `acpx ${agentName}`;
+    const client = _acpAdapterDeps.createClient(cmdStr, workdir);
+    try {
+      await client.start();
+      for (const sessionName of sessionNames) {
+        try {
+          if (client.loadSession) {
+            const session = await client.loadSession(sessionName, agentName, "approve-reads");
+            if (session) {
+              await session.close().catch(() => {});
+            }
           }
+        } catch (err) {
+          logger?.warn("acp-adapter", `[sweep] Failed to close session ${sessionName}`, { error: String(err) });
         }
-      } catch (err) {
-        logger?.warn("acp-adapter", `[sweep] Failed to close session ${sessionName}`, { error: String(err) });
       }
+    } finally {
+      await client.close().catch(() => {});
     }
-  } finally {
-    await client.close().catch(() => {});
   }
   try {
     await Bun.write(path, JSON.stringify({}, null, 2));
@@ -19644,7 +19669,7 @@ class AcpAgentAdapter {
     });
     const session = await ensureAcpSession(client, sessionName, this.name, permissionMode);
     if (options.featureName && options.storyId) {
-      await saveAcpSession(options.workdir, options.featureName, options.storyId, sessionName);
+      await saveAcpSession(options.workdir, options.featureName, options.storyId, sessionName, this.name);
     }
     let lastResponse = null;
     let timedOut = false;
@@ -19702,13 +19727,15 @@ class AcpAgentAdapter {
       }
       runState.succeeded = !timedOut && lastResponse?.stopReason === "end_turn";
     } finally {
-      if (runState.succeeded) {
+      if (runState.succeeded && !options.keepSessionOpen) {
         await closeAcpSession(session);
         if (options.featureName && options.storyId) {
           await clearAcpSession(options.workdir, options.featureName, options.storyId);
         }
-      } else {
+      } else if (!runState.succeeded) {
         getSafeLogger()?.info("acp-adapter", "Keeping session open for retry", { sessionName });
+      } else {
+        getSafeLogger()?.debug("acp-adapter", "Keeping session open (keepSessionOpen=true)", { sessionName });
       }
       await client.close().catch(() => {});
     }
@@ -20726,6 +20753,18 @@ function mergePackageConfig(root, packageOverride) {
       ...packageOverride.review,
       commands: {
         ...root.review.commands,
+        ...packageOverride.quality?.commands?.lint !== undefined && {
+          lint: packageOverride.quality.commands.lint
+        },
+        ...packageOverride.quality?.commands?.lintFix !== undefined && {
+          lintFix: packageOverride.quality.commands.lintFix
+        },
+        ...packageOverride.quality?.commands?.typecheck !== undefined && {
+          typecheck: packageOverride.quality.commands.typecheck
+        },
+        ...packageOverride.quality?.commands?.test !== undefined && {
+          test: packageOverride.quality.commands.test
+        },
         ...packageOverride.review?.commands
       }
     },
@@ -22250,7 +22289,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.49.1",
+    version: "0.49.6",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -22323,8 +22362,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("635a552"))
-        return "635a552";
+      if (/^[0-9a-f]{6,10}$/.test("a1f7e2d"))
+        return "a1f7e2d";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -23309,6 +23348,7 @@ class WebhookInteractionPlugin {
   server = null;
   serverStartPromise = null;
   pendingResponses = new Map;
+  receiveCallbacks = new Map;
   async init(config2) {
     const cfg = WebhookConfigSchema.parse(config2);
     this.config = {
@@ -23358,27 +23398,39 @@ class WebhookInteractionPlugin {
   }
   async receive(requestId, timeout = 60000) {
     await this.startServer();
-    const startTime = Date.now();
-    let backoffMs = 100;
-    const maxBackoffMs = 2000;
-    while (Date.now() - startTime < timeout) {
-      const response = this.pendingResponses.get(requestId);
-      if (response) {
-        this.pendingResponses.delete(requestId);
-        return response;
-      }
-      await _webhookPluginDeps.sleep(backoffMs);
-      backoffMs = Math.min(backoffMs * 2, maxBackoffMs);
+    const early = this.pendingResponses.get(requestId);
+    if (early) {
+      this.pendingResponses.delete(requestId);
+      return early;
     }
-    return {
-      requestId,
-      action: "skip",
-      respondedBy: "timeout",
-      respondedAt: Date.now()
-    };
+    return new Promise((resolve7) => {
+      const timer = setTimeout(() => {
+        this.receiveCallbacks.delete(requestId);
+        resolve7({
+          requestId,
+          action: "skip",
+          respondedBy: "timeout",
+          respondedAt: Date.now()
+        });
+      }, timeout);
+      this.receiveCallbacks.set(requestId, (response) => {
+        clearTimeout(timer);
+        this.receiveCallbacks.delete(requestId);
+        resolve7(response);
+      });
+    });
   }
   async cancel(requestId) {
     this.pendingResponses.delete(requestId);
+    this.receiveCallbacks.delete(requestId);
+  }
+  deliverResponse(requestId, response) {
+    const cb = this.receiveCallbacks.get(requestId);
+    if (cb) {
+      cb(response);
+    } else {
+      this.pendingResponses.set(requestId, response);
+    }
   }
   async startServer() {
     if (this.server)
@@ -23431,7 +23483,7 @@ class WebhookInteractionPlugin {
       try {
         const parsed = JSON.parse(body);
         const response = InteractionResponseSchema.parse(parsed);
-        this.pendingResponses.set(requestId, response);
+        this.deliverResponse(requestId, response);
       } catch {
         return new Response("Bad Request: Invalid response format", { status: 400 });
       }
@@ -23439,7 +23491,7 @@ class WebhookInteractionPlugin {
       try {
         const parsed = await req.json();
         const response = InteractionResponseSchema.parse(parsed);
-        this.pendingResponses.set(requestId, response);
+        this.deliverResponse(requestId, response);
       } catch {
         return new Response("Bad Request: Invalid response format", { status: 400 });
       }
@@ -23466,12 +23518,9 @@ class WebhookInteractionPlugin {
     }
   }
 }
-var _webhookPluginDeps, WebhookConfigSchema, InteractionResponseSchema;
+var WebhookConfigSchema, InteractionResponseSchema;
 var init_webhook = __esm(() => {
   init_zod();
-  _webhookPluginDeps = {
-    sleep: (ms) => Bun.sleep(ms)
-  };
   WebhookConfigSchema = exports_external.object({
     url: exports_external.string().url().optional(),
     callbackPort: exports_external.number().int().min(1024).max(65535).optional(),
@@ -24357,6 +24406,8 @@ async function resolveCommand(check2, config2, executionConfig, workdir) {
 }
 async function runCheck(check2, command, workdir) {
   const startTime = Date.now();
+  const logger = getSafeLogger();
+  logger?.info("review", `Running ${check2} check`, { check: check2, command, workdir });
   try {
     const parts = command.split(/\s+/);
     const executable = parts[0];
@@ -24395,6 +24446,17 @@ async function runCheck(check2, command, workdir) {
     const stderr = await new Response(proc.stderr).text();
     const output = [stdout, stderr].filter(Boolean).join(`
 `);
+    if (exitCode !== 0) {
+      logger?.warn("review", `${check2} check failed`, {
+        check: check2,
+        command,
+        workdir,
+        exitCode,
+        output: output.slice(0, 2000)
+      });
+    } else {
+      logger?.debug("review", `${check2} check passed`, { check: check2, command, durationMs: Date.now() - startTime });
+    }
     return {
       check: check2,
       command,
@@ -24680,8 +24742,8 @@ async function recheckReview(ctx) {
   const { reviewStage: reviewStage2 } = await Promise.resolve().then(() => (init_review(), exports_review));
   if (!reviewStage2.enabled(ctx))
     return true;
-  const result = await reviewStage2.execute(ctx);
-  return result.action === "continue";
+  await reviewStage2.execute(ctx);
+  return ctx.reviewResult?.success === true;
 }
 function collectFailedChecks(ctx) {
   return (ctx.reviewResult?.checks ?? []).filter((c) => !c.success);
@@ -24793,11 +24855,18 @@ var init_autofix = __esm(() => {
       const lintFixCmd = effectiveConfig.quality.commands.lintFix;
       const formatFixCmd = effectiveConfig.quality.commands.formatFix;
       const effectiveWorkdir = ctx.story.workdir ? join18(ctx.workdir, ctx.story.workdir) : ctx.workdir;
-      if (lintFixCmd || formatFixCmd) {
+      const failedCheckNames = new Set((reviewResult.checks ?? []).filter((c) => !c.success).map((c) => c.check));
+      const hasLintFailure = failedCheckNames.has("lint");
+      logger.info("autofix", "Starting autofix", {
+        storyId: ctx.story.id,
+        failedChecks: [...failedCheckNames],
+        workdir: effectiveWorkdir
+      });
+      if (hasLintFailure && (lintFixCmd || formatFixCmd)) {
         if (lintFixCmd) {
           pipelineEventBus.emit({ type: "autofix:started", storyId: ctx.story.id, command: lintFixCmd });
           const lintResult = await _autofixDeps.runCommand(lintFixCmd, effectiveWorkdir);
-          logger.debug("autofix", `lintFix exit=${lintResult.exitCode}`, { storyId: ctx.story.id });
+          logger.debug("autofix", `lintFix exit=${lintResult.exitCode}`, { storyId: ctx.story.id, command: lintFixCmd });
           if (lintResult.exitCode !== 0) {
             logger.warn("autofix", "lintFix command failed \u2014 may not have fixed all issues", {
               storyId: ctx.story.id,
@@ -24808,7 +24877,10 @@ var init_autofix = __esm(() => {
         if (formatFixCmd) {
           pipelineEventBus.emit({ type: "autofix:started", storyId: ctx.story.id, command: formatFixCmd });
           const fmtResult = await _autofixDeps.runCommand(formatFixCmd, effectiveWorkdir);
-          logger.debug("autofix", `formatFix exit=${fmtResult.exitCode}`, { storyId: ctx.story.id });
+          logger.debug("autofix", `formatFix exit=${fmtResult.exitCode}`, {
+            storyId: ctx.story.id,
+            command: formatFixCmd
+          });
           if (fmtResult.exitCode !== 0) {
             logger.warn("autofix", "formatFix command failed \u2014 may not have fixed all issues", {
               storyId: ctx.story.id,
@@ -24819,11 +24891,12 @@ var init_autofix = __esm(() => {
         const recheckPassed = await _autofixDeps.recheckReview(ctx);
         pipelineEventBus.emit({ type: "autofix:completed", storyId: ctx.story.id, fixed: recheckPassed });
         if (recheckPassed) {
-          if (ctx.reviewResult)
-            ctx.reviewResult = { ...ctx.reviewResult, success: true };
           logger.info("autofix", "Mechanical autofix succeeded \u2014 retrying review", { storyId: ctx.story.id });
           return { action: "retry", fromStage: "review" };
         }
+        logger.info("autofix", "Mechanical autofix did not resolve all failures \u2014 proceeding to agent rectification", {
+          storyId: ctx.story.id
+        });
       }
       const agentFixed = await _autofixDeps.runAgentRectification(ctx);
       if (agentFixed) {
@@ -26013,13 +26086,13 @@ function isSourceFile(filePath) {
   return SRC_PATTERNS.some((pattern) => pattern.test(filePath));
 }
 async function getChangedFiles2(workdir, fromRef = "HEAD") {
-  const proc = Bun.spawn(["git", "diff", "--name-only", fromRef], {
+  const proc = _isolationDeps.spawn(["git", "diff", "--name-only", fromRef], {
     cwd: workdir,
     stdout: "pipe",
     stderr: "pipe"
   });
+  const output = await Bun.readableStreamToText(proc.stdout);
   await proc.exited;
-  const output = await new Response(proc.stdout).text();
   return output.trim().split(`
 `).filter(Boolean);
 }
@@ -26066,8 +26139,9 @@ async function verifyImplementerIsolation(workdir, beforeRef) {
     description: "Implementer should not modify test files"
   };
 }
-var TEST_PATTERNS, SRC_PATTERNS;
+var _isolationDeps, TEST_PATTERNS, SRC_PATTERNS;
 var init_isolation = __esm(() => {
+  _isolationDeps = { spawn: Bun.spawn };
   TEST_PATTERNS = [/^test\//, /^tests\//, /^__tests__\//, /\.spec\.\w+$/, /\.test\.\w+$/, /\.e2e-spec\.\w+$/];
   SRC_PATTERNS = [/^src\//, /^lib\//, /^packages\//];
 });
@@ -26265,7 +26339,7 @@ async function executeWithTimeout(command, timeoutSeconds, env2, options) {
   const shell = options?.shell ?? "/bin/sh";
   const gracePeriodMs = options?.gracePeriodMs ?? 5000;
   const drainTimeoutMs = options?.drainTimeoutMs ?? 2000;
-  const proc = Bun.spawn([shell, "-c", command], {
+  const proc = _executorDeps.spawn([shell, "-c", command], {
     stdout: "pipe",
     stderr: "pipe",
     env: env2 || normalizeEnvironment(process.env),
@@ -26359,8 +26433,9 @@ function buildTestCommand(baseCommand, options) {
   }
   return command;
 }
-var DEFAULT_STRIP_ENV_VARS;
+var _executorDeps, DEFAULT_STRIP_ENV_VARS;
 var init_executor = __esm(() => {
+  _executorDeps = { spawn: Bun.spawn };
   DEFAULT_STRIP_ENV_VARS = ["CLAUDECODE", "REPL_ID", "AGENT"];
 });
 
@@ -26660,15 +26735,15 @@ var init_verification = __esm(() => {
 // src/tdd/cleanup.ts
 async function getPgid(pid) {
   try {
-    const proc = Bun.spawn(["ps", "-o", "pgid=", "-p", String(pid)], {
+    const proc = _cleanupDeps.spawn(["ps", "-o", "pgid=", "-p", String(pid)], {
       stdout: "pipe",
       stderr: "pipe"
     });
+    const output = await Bun.readableStreamToText(proc.stdout);
     const exitCode = await proc.exited;
     if (exitCode !== 0) {
       return null;
     }
-    const output = await new Response(proc.stdout).text();
     const pgid = Number.parseInt(output.trim(), 10);
     return Number.isNaN(pgid) ? null : pgid;
   } catch {
@@ -26682,7 +26757,7 @@ async function cleanupProcessTree(pid, gracePeriodMs = 3000) {
       return;
     }
     try {
-      process.kill(-pgid, "SIGTERM");
+      _cleanupDeps.kill(-pgid, "SIGTERM");
     } catch (error48) {
       const err = error48;
       if (err.code !== "ESRCH") {
@@ -26690,11 +26765,11 @@ async function cleanupProcessTree(pid, gracePeriodMs = 3000) {
       }
       return;
     }
-    await Bun.sleep(gracePeriodMs);
+    await _cleanupDeps.sleep(gracePeriodMs);
     const pgidAfterWait = await getPgid(pid);
     if (pgidAfterWait && pgidAfterWait === pgid) {
       try {
-        process.kill(-pgid, "SIGKILL");
+        _cleanupDeps.kill(-pgid, "SIGKILL");
       } catch {}
     }
   } catch (error48) {
@@ -26705,8 +26780,14 @@ async function cleanupProcessTree(pid, gracePeriodMs = 3000) {
     });
   }
 }
+var _cleanupDeps;
 var init_cleanup = __esm(() => {
   init_logger2();
+  _cleanupDeps = {
+    spawn: Bun.spawn,
+    sleep: Bun.sleep,
+    kill: process.kill.bind(process)
+  };
 });
 
 // src/tdd/prompts.ts
@@ -26729,10 +26810,12 @@ async function runFullSuiteGate(story, config2, workdir, agent, implementerTier,
     storyId: story.id,
     timeout: fullSuiteTimeout
   });
-  const fullSuiteResult = await executeWithTimeout(testCmd, fullSuiteTimeout, undefined, { cwd: workdir });
+  const fullSuiteResult = await _rectificationGateDeps.executeWithTimeout(testCmd, fullSuiteTimeout, undefined, {
+    cwd: workdir
+  });
   const fullSuitePassed = fullSuiteResult.success && fullSuiteResult.exitCode === 0;
   if (!fullSuitePassed && fullSuiteResult.output) {
-    const testSummary = parseBunTestOutput(fullSuiteResult.output);
+    const testSummary = _rectificationGateDeps.parseBunTestOutput(fullSuiteResult.output);
     if (testSummary.failed > 0) {
       return await runRectificationLoop(story, config2, workdir, agent, implementerTier, contextMarkdown, lite, logger, testSummary, rectificationConfig, testCmd, fullSuiteTimeout, featureName);
     }
@@ -26773,8 +26856,14 @@ async function runRectificationLoop(story, config2, workdir, agent, implementerT
     failedTests: testSummary.failed,
     passedTests: testSummary.passed
   });
-  while (shouldRetryRectification(rectificationState, rectificationConfig)) {
+  const rectificationSessionName = buildSessionName(workdir, featureName, story.id, "implementer");
+  logger.debug("tdd", "Rectification session name (shared across all attempts)", {
+    storyId: story.id,
+    sessionName: rectificationSessionName
+  });
+  while (_rectificationGateDeps.shouldRetryRectification(rectificationState, rectificationConfig)) {
     rectificationState.attempt++;
+    const isLastAttempt = rectificationState.attempt >= rectificationConfig.maxRetries;
     logger.info("tdd", `-> Implementer rectification attempt ${rectificationState.attempt}/${rectificationConfig.maxRetries}`, { storyId: story.id, currentFailures: rectificationState.currentFailures });
     const rectificationPrompt = buildImplementerRectificationPrompt(testSummary.failures, story, contextMarkdown, rectificationConfig);
     const rectifyBeforeRef = await captureGitRef(workdir) ?? "HEAD";
@@ -26790,7 +26879,9 @@ async function runRectificationLoop(story, config2, workdir, agent, implementerT
       maxInteractionTurns: config2.agent?.maxInteractionTurns,
       featureName,
       storyId: story.id,
-      sessionRole: "implementer"
+      sessionRole: "implementer",
+      acpSessionName: rectificationSessionName,
+      keepSessionOpen: !isLastAttempt
     });
     if (!rectifyResult.success && rectifyResult.pid) {
       await cleanupProcessTree(rectifyResult.pid);
@@ -26818,7 +26909,9 @@ async function runRectificationLoop(story, config2, workdir, agent, implementerT
       });
       break;
     }
-    const retryFullSuite = await executeWithTimeout(testCmd, fullSuiteTimeout, undefined, { cwd: workdir });
+    const retryFullSuite = await _rectificationGateDeps.executeWithTimeout(testCmd, fullSuiteTimeout, undefined, {
+      cwd: workdir
+    });
     const retrySuitePassed = retryFullSuite.success && retryFullSuite.exitCode === 0;
     if (retrySuitePassed) {
       logger.info("tdd", "Full suite gate passed after rectification!", {
@@ -26828,7 +26921,7 @@ async function runRectificationLoop(story, config2, workdir, agent, implementerT
       return true;
     }
     if (retryFullSuite.output) {
-      const newTestSummary = parseBunTestOutput(retryFullSuite.output);
+      const newTestSummary = _rectificationGateDeps.parseBunTestOutput(retryFullSuite.output);
       rectificationState.currentFailures = newTestSummary.failed;
       testSummary.failures = newTestSummary.failures;
       testSummary.failed = newTestSummary.failed;
@@ -26840,7 +26933,9 @@ async function runRectificationLoop(story, config2, workdir, agent, implementerT
       remainingFailures: rectificationState.currentFailures
     });
   }
-  const finalFullSuite = await executeWithTimeout(testCmd, fullSuiteTimeout, undefined, { cwd: workdir });
+  const finalFullSuite = await _rectificationGateDeps.executeWithTimeout(testCmd, fullSuiteTimeout, undefined, {
+    cwd: workdir
+  });
   const finalSuitePassed = finalFullSuite.success && finalFullSuite.exitCode === 0;
   if (!finalSuitePassed) {
     logger.warn("tdd", "[WARN] Full suite gate failed after rectification exhausted", {
@@ -26853,13 +26948,20 @@ async function runRectificationLoop(story, config2, workdir, agent, implementerT
   logger.info("tdd", "Full suite gate passed", { storyId: story.id });
   return true;
 }
+var _rectificationGateDeps;
 var init_rectification_gate = __esm(() => {
+  init_adapter2();
   init_config();
   init_git();
   init_verification();
   init_cleanup();
   init_isolation();
   init_prompts();
+  _rectificationGateDeps = {
+    executeWithTimeout,
+    parseBunTestOutput,
+    shouldRetryRectification
+  };
 });
 
 // src/prompts/sections/conventions.ts
@@ -27349,7 +27451,7 @@ ${tail}`;
 async function rollbackToRef(workdir, ref) {
   const logger = getLogger();
   logger.warn("tdd", "Rolling back git changes", { ref });
-  const resetProc = Bun.spawn(["git", "reset", "--hard", ref], {
+  const resetProc = _sessionRunnerDeps.spawn(["git", "reset", "--hard", ref], {
     cwd: workdir,
     stdout: "pipe",
     stderr: "pipe"
@@ -27360,7 +27462,7 @@ async function rollbackToRef(workdir, ref) {
     logger.error("tdd", "Failed to rollback git changes", { ref, stderr });
     throw new Error(`Git rollback failed: ${stderr}`);
   }
-  const cleanProc = Bun.spawn(["git", "clean", "-fd"], {
+  const cleanProc = _sessionRunnerDeps.spawn(["git", "clean", "-fd"], {
     cwd: workdir,
     stdout: "pipe",
     stderr: "pipe"
@@ -27375,19 +27477,24 @@ async function rollbackToRef(workdir, ref) {
 async function runTddSession(role, agent, story, config2, workdir, modelTier, beforeRef, contextMarkdown, lite = false, skipIsolation = false, constitution, featureName) {
   const startTime = Date.now();
   let prompt;
-  switch (role) {
-    case "test-writer":
-      prompt = await PromptBuilder.for("test-writer", { isolation: lite ? "lite" : "strict" }).withLoader(workdir, config2).story(story).context(contextMarkdown).constitution(constitution).testCommand(config2.quality?.commands?.test).build();
-      break;
-    case "implementer":
-      prompt = await PromptBuilder.for("implementer", { variant: lite ? "lite" : "standard" }).withLoader(workdir, config2).story(story).context(contextMarkdown).constitution(constitution).testCommand(config2.quality?.commands?.test).build();
-      break;
-    case "verifier":
-      prompt = await PromptBuilder.for("verifier").withLoader(workdir, config2).story(story).context(contextMarkdown).constitution(constitution).testCommand(config2.quality?.commands?.test).build();
-      break;
+  if (_sessionRunnerDeps.buildPrompt) {
+    prompt = await _sessionRunnerDeps.buildPrompt(role, config2, story, workdir, contextMarkdown, lite, constitution);
+  } else {
+    switch (role) {
+      case "test-writer":
+        prompt = await PromptBuilder.for("test-writer", { isolation: lite ? "lite" : "strict" }).withLoader(workdir, config2).story(story).context(contextMarkdown).constitution(constitution).testCommand(config2.quality?.commands?.test).build();
+        break;
+      case "implementer":
+        prompt = await PromptBuilder.for("implementer", { variant: lite ? "lite" : "standard" }).withLoader(workdir, config2).story(story).context(contextMarkdown).constitution(constitution).testCommand(config2.quality?.commands?.test).build();
+        break;
+      case "verifier":
+        prompt = await PromptBuilder.for("verifier").withLoader(workdir, config2).story(story).context(contextMarkdown).constitution(constitution).testCommand(config2.quality?.commands?.test).build();
+        break;
+    }
   }
   const logger = getLogger();
   logger.info("tdd", `-> Session: ${role}`, { role, storyId: story.id, lite });
+  const keepSessionOpen = role === "implementer" && (config2.execution.rectification?.enabled ?? false);
   const result = await agent.run({
     prompt,
     workdir,
@@ -27400,10 +27507,11 @@ async function runTddSession(role, agent, story, config2, workdir, modelTier, be
     maxInteractionTurns: config2.agent?.maxInteractionTurns,
     featureName,
     storyId: story.id,
-    sessionRole: role
+    sessionRole: role,
+    keepSessionOpen
   });
   if (!result.success && result.pid) {
-    await cleanupProcessTree(result.pid);
+    await _sessionRunnerDeps.cleanupProcessTree(result.pid);
   }
   if (result.success) {
     logger.info("tdd", `Session complete: ${role}`, {
@@ -27425,12 +27533,12 @@ async function runTddSession(role, agent, story, config2, workdir, modelTier, be
   if (!skipIsolation) {
     if (role === "test-writer") {
       const allowedPaths = config2.tdd.testWriterAllowedPaths ?? ["src/index.ts", "src/**/index.ts"];
-      isolation = await verifyTestWriterIsolation(workdir, beforeRef, allowedPaths);
+      isolation = await _sessionRunnerDeps.verifyTestWriterIsolation(workdir, beforeRef, allowedPaths);
     } else if (role === "implementer" || role === "verifier") {
-      isolation = await verifyImplementerIsolation(workdir, beforeRef);
+      isolation = await _sessionRunnerDeps.verifyImplementerIsolation(workdir, beforeRef);
     }
   }
-  const filesChanged = await getChangedFiles2(workdir, beforeRef);
+  const filesChanged = await _sessionRunnerDeps.getChangedFiles(workdir, beforeRef);
   const durationMs = Date.now() - startTime;
   if (isolation && !isolation.passed) {
     logger.error("tdd", "Isolation violated", {
@@ -27473,10 +27581,18 @@ var init_session_runner = __esm(() => {
   init_logger2();
   init_prompts2();
   init_git();
+  init_git();
   init_cleanup();
   init_isolation();
   _sessionRunnerDeps = {
-    autoCommitIfDirty
+    autoCommitIfDirty,
+    spawn: Bun.spawn,
+    getChangedFiles: getChangedFiles2,
+    verifyTestWriterIsolation,
+    verifyImplementerIsolation,
+    captureGitRef,
+    cleanupProcessTree,
+    buildPrompt: null
   };
 });
 
@@ -28957,7 +29073,7 @@ class AcceptanceStrategy {
     }
     const start = Date.now();
     const timeoutMs = ctx.timeoutSeconds * 1000;
-    const proc = Bun.spawn(["bun", "test", testPath], {
+    const proc = _acceptanceDeps.spawn(["bun", "test", testPath], {
       cwd: ctx.workdir,
       stdout: "pipe",
       stderr: "pipe"
@@ -29025,8 +29141,10 @@ ${stderr}`;
     });
   }
 }
+var _acceptanceDeps;
 var init_acceptance3 = __esm(() => {
   init_logger2();
+  _acceptanceDeps = { spawn: Bun.spawn };
 });
 
 // src/verification/strategies/regression.ts
@@ -29553,7 +29671,7 @@ var init_routing2 = __esm(() => {
         logger.debug("routing", ctx.routing.reasoning);
       }
       const decomposeConfig = ctx.config.decompose;
-      if (decomposeConfig) {
+      if (decomposeConfig && ctx.story.status !== "decomposed") {
         const acCount = ctx.story.acceptanceCriteria.length;
         const complexity = ctx.routing.complexity;
         const isOversized = acCount > decomposeConfig.maxAcceptanceCriteria && (complexity === "complex" || complexity === "expert");
@@ -34256,6 +34374,7 @@ async function handlePipelineFailure(ctx, pipelineResult) {
   const logger = getSafeLogger();
   let prd = ctx.prd;
   let prdDirty = false;
+  const costDelta = pipelineResult.context.agentResult?.estimatedCost || 0;
   switch (pipelineResult.finalAction) {
     case "pause":
       markStoryPaused(prd, ctx.story.id);
@@ -34322,7 +34441,7 @@ async function handlePipelineFailure(ctx, pipelineResult) {
       break;
     }
   }
-  return { prd, prdDirty };
+  return { prd, prdDirty, costDelta };
 }
 var init_pipeline_result_handler = __esm(() => {
   init_logger2();
@@ -34427,7 +34546,7 @@ async function runIteration(ctx, prd, selection, iterations, totalCost, allStory
   return {
     prd: r.prd,
     storiesCompletedDelta: 0,
-    costDelta: 0,
+    costDelta: r.costDelta,
     prdDirty: r.prdDirty,
     finalAction: pipelineResult.finalAction,
     reason: pipelineResult.reason
@@ -34465,7 +34584,7 @@ function buildPreviewRouting(story, config2) {
 function selectNextStories(prd, config2, batchPlan, currentBatchIndex, lastStoryId, useBatch) {
   if (useBatch && currentBatchIndex < batchPlan.length) {
     const batch = batchPlan[currentBatchIndex];
-    const storiesToExecute = batch.stories.filter((s) => !s.passes && s.status !== "passed" && s.status !== "skipped" && s.status !== "blocked" && s.status !== "failed" && s.status !== "paused");
+    const storiesToExecute = batch.stories.filter((s) => !s.passes && s.status !== "passed" && s.status !== "skipped" && s.status !== "blocked" && s.status !== "failed" && s.status !== "paused" && s.status !== "decomposed");
     if (storiesToExecute.length === 0) {
       return { selection: null, nextBatchIndex: currentBatchIndex + 1 };
     }
@@ -68218,6 +68337,45 @@ class PipelineEventEmitter {
 init_stages();
 init_prd();
 
+// src/cli/prompts-shared.ts
+function buildFrontmatter(story, ctx, role) {
+  const lines = [];
+  lines.push(`storyId: ${story.id}`);
+  lines.push(`title: "${story.title}"`);
+  lines.push(`testStrategy: ${ctx.routing.testStrategy}`);
+  lines.push(`modelTier: ${ctx.routing.modelTier}`);
+  if (role) {
+    lines.push(`role: ${role}`);
+  }
+  const builtContext = ctx.builtContext;
+  const contextTokens = builtContext?.totalTokens ?? 0;
+  const promptTokens = ctx.prompt ? Math.ceil(ctx.prompt.length / 3) : 0;
+  lines.push(`contextTokens: ${contextTokens}`);
+  lines.push(`promptTokens: ${promptTokens}`);
+  if (story.dependencies && story.dependencies.length > 0) {
+    lines.push(`dependencies: [${story.dependencies.join(", ")}]`);
+  }
+  lines.push("contextElements:");
+  if (builtContext) {
+    for (const element of builtContext.elements) {
+      lines.push(`  - type: ${element.type}`);
+      if (element.storyId) {
+        lines.push(`    storyId: ${element.storyId}`);
+      }
+      if (element.filePath) {
+        lines.push(`    filePath: ${element.filePath}`);
+      }
+      lines.push(`    tokens: ${element.tokens}`);
+    }
+  }
+  if (builtContext?.truncated) {
+    lines.push("truncated: true");
+  }
+  return `${lines.join(`
+`)}
+`;
+}
+
 // src/cli/prompts-tdd.ts
 init_prompts2();
 import { join as join28 } from "path";
@@ -68363,43 +68521,6 @@ ${"=".repeat(80)}`);
   });
   return processedStories;
 }
-function buildFrontmatter(story, ctx, role) {
-  const lines = [];
-  lines.push(`storyId: ${story.id}`);
-  lines.push(`title: "${story.title}"`);
-  lines.push(`testStrategy: ${ctx.routing.testStrategy}`);
-  lines.push(`modelTier: ${ctx.routing.modelTier}`);
-  if (role) {
-    lines.push(`role: ${role}`);
-  }
-  const builtContext = ctx.builtContext;
-  const contextTokens = builtContext?.totalTokens ?? 0;
-  const promptTokens = ctx.prompt ? Math.ceil(ctx.prompt.length / 3) : 0;
-  lines.push(`contextTokens: ${contextTokens}`);
-  lines.push(`promptTokens: ${promptTokens}`);
-  if (story.dependencies && story.dependencies.length > 0) {
-    lines.push(`dependencies: [${story.dependencies.join(", ")}]`);
-  }
-  lines.push("contextElements:");
-  if (builtContext) {
-    for (const element of builtContext.elements) {
-      lines.push(`  - type: ${element.type}`);
-      if (element.storyId) {
-        lines.push(`    storyId: ${element.storyId}`);
-      }
-      if (element.filePath) {
-        lines.push(`    filePath: ${element.filePath}`);
-      }
-      lines.push(`    tokens: ${element.tokens}`);
-    }
-  }
-  if (builtContext?.truncated) {
-    lines.push("truncated: true");
-  }
-  return `${lines.join(`
-`)}
-`;
-}
 // src/cli/prompts-init.ts
 import { existsSync as existsSync19, mkdirSync as mkdirSync4 } from "fs";
 import { join as join30 } from "path";