@nathapp/nax 0.61.0 → 0.61.2-canary.1

package/dist/nax.js

@@ -3657,6 +3657,18 @@ function parseAcpxJsonLine(line, state) {
           };
         }
       }
+      if (event.error && typeof event.error === "object") {
+        const err = event.error;
+        let errorMsg = typeof err.message === "string" ? err.message : JSON.stringify(event.error);
+        if (err.data && typeof err.data === "object") {
+          const data = err.data;
+          const suffix = [data.acpxCode, data.detailCode].filter(Boolean).join("/");
+          if (suffix)
+            errorMsg = `${errorMsg} [${suffix}]`;
+        }
+        if (!state.error)
+          state.error = errorMsg;
+      }
       return;
     }
     if (event.content && typeof event.content === "string")
@@ -3807,12 +3819,15 @@ class SpawnAcpSession {
         Promise.race([stderrPromise, drainB.promise]).finally(() => drainB.cancel())
       ]);
       if (exitCode !== 0) {
+        const parsedOnError = finalizeParseState(parseState);
+        const errorContent = parsedOnError.error || stderr || `Exit code ${exitCode}`;
         getSafeLogger()?.warn("acp-adapter", `Session prompt exited with code ${exitCode}`, {
           exitCode,
-          stderr: stderr.slice(0, 500)
+          error: errorContent.slice(0, 500),
+          ...stderr && stderr !== errorContent ? { banner: stderr.trim().slice(0, 200) } : {}
         });
         return {
-          messages: [{ role: "assistant", content: stderr || `Exit code ${exitCode}` }],
+          messages: [{ role: "assistant", content: errorContent }],
           stopReason: "error"
         };
       }
@@ -18070,6 +18085,7 @@ function isLegacyFlatModels(val) {
 var TokenPricingSchema, ModelDefSchema, ModelEntrySchema, PerAgentModelMapSchema, ModelMapSchema, ModelTierSchema, TierConfigSchema, AutoModeConfigSchema, RectificationConfigSchema, RegressionGateConfigSchema, SmartTestRunnerConfigSchema, SMART_TEST_RUNNER_DEFAULT, smartTestRunnerFieldSchema, ExecutionConfigSchema, QualityConfigSchema, TddConfigSchema, ConstitutionConfigSchema, AnalyzeConfigSchema, SemanticReviewConfigSchema, ReviewDialogueConfigSchema, ReviewConfigSchema, PlanConfigSchema, AcceptanceFixConfigSchema, AcceptanceConfigSchema, TestCoverageConfigSchema, ContextAutoDetectConfigSchema, ContextConfigSchema, LlmRoutingConfigSchema, RoutingConfigSchema, OptimizerConfigSchema, PluginConfigEntrySchema, HooksConfigSchema, InteractionConfigSchema, StorySizeGateConfigSchema, PromptAuditConfigSchema, AgentConfigSchema, PrecheckConfigSchema, PromptsConfigSchema, ProjectProfileSchema, VALID_AGENT_TYPES, GenerateConfigSchema, DebaterPersonaEnum, DebaterSchema, toObject = (val) => val === undefined || val === null ? {} : val, RESOLVER_TYPES, makeResolverSchema = (defaultType) => exports_external.preprocess(toObject, exports_external.object({
   type: exports_external.enum(RESOLVER_TYPES).default(defaultType),
   agent: exports_external.string().min(1).optional(),
+  model: exports_external.string().min(1).optional(),
   tieBreaker: exports_external.string().min(1).optional(),
   maxPromptTokens: exports_external.number().int().positive().optional()
 })), DebateStageConfigSchema = (defaults) => exports_external.preprocess(toObject, exports_external.object({
@@ -19086,7 +19102,10 @@ class AcpAgentAdapter {
       try {
         const result = await this._runWithClient(options, startTime, currentAgent);
         if (!result.success) {
-          getSafeLogger()?.warn("acp-adapter", `Run failed for ${currentAgent}`, { exitCode: result.exitCode });
+          getSafeLogger()?.warn("acp-adapter", `Run failed for ${currentAgent}`, {
+            exitCode: result.exitCode,
+            ...result.output ? { output: result.output.slice(0, 500) } : {}
+          });
           if (result.sessionError && _acpAdapterDeps.shouldRetrySessionError && !sessionErrorRetried) {
             sessionErrorRetried = true;
             getSafeLogger()?.warn("acp-adapter", "Session error \u2014 retrying with fresh session", {
@@ -21694,12 +21713,16 @@ async function resolveOutcome(proposalOutputs, critiqueOutputs, stageConfig, con
     const adapter = _debateSessionDeps.getAgent(agentName, config2);
     if (adapter) {
       const synthesisSessionName = workdir !== undefined ? buildSessionName(workdir, featureName, storyId, "synthesis") : undefined;
+      const resolverDebater = { agent: agentName, model: resolverConfig.model };
+      const resolverTier = resolverConfig.model && MODEL_SHORTHAND_TIERS[resolverConfig.model.toLowerCase()] || modelTierFromDebater(resolverDebater);
+      const resolverModelDef = resolveModelDefForDebater(resolverDebater, resolverTier, config2);
       const resolverResult = await synthesisResolver(proposalOutputs, critiqueOutputs, {
         adapter,
         promptSuffix,
         debaters,
         completeOptions: {
-          model: resolveDebaterModel({ agent: agentName }, config2),
+          model: resolverModelDef.model,
+          modelTier: resolverTier,
           config: config2,
           storyId,
           featureName,
@@ -21720,12 +21743,16 @@ async function resolveOutcome(proposalOutputs, critiqueOutputs, stageConfig, con
   if (resolverConfig.type === "custom") {
     const agentName = resolverConfig.agent ?? RESOLVER_FALLBACK_AGENT;
     const judgeSessionName = workdir !== undefined ? buildSessionName(workdir, featureName, storyId, "judge") : undefined;
+    const resolverDebater = { agent: agentName, model: resolverConfig.model };
+    const resolverTier = resolverConfig.model && MODEL_SHORTHAND_TIERS[resolverConfig.model.toLowerCase()] || modelTierFromDebater(resolverDebater);
+    const resolverModelDef = resolveModelDefForDebater(resolverDebater, resolverTier, config2);
     const resolverResult = await judgeResolver(proposalOutputs, critiqueOutputs, resolverConfig, {
       getAgent: (name) => _debateSessionDeps.getAgent(name, config2),
       defaultAgentName: RESOLVER_FALLBACK_AGENT,
       debaters,
       completeOptions: {
-        model: resolveDebaterModel({ agent: agentName }, config2),
+        model: resolverModelDef.model,
+        modelTier: resolverTier,
         config: config2,
         storyId,
         featureName,
@@ -22719,7 +22746,8 @@ The spec above is the authoritative source for acceptance criteria.
 - If a debater proposed criteria beyond the spec (observable edge cases, error-path behaviors), place those in a separate \`suggestedCriteria\` array on the same story object. Each element of \`suggestedCriteria\` MUST be a plain string \u2014 never an object or structured value.
 - \`suggestedCriteria\` MUST contain only behavioral acceptance criteria \u2014 observable outputs, return values, state changes, or error conditions a test can assert. DO NOT include: implementation details (imports, internal structure), design suggestions ("consider X"), "not required" notes, or any criterion that cannot be expressed as a test assertion.
 - Never silently merge debater-invented criteria into \`acceptanceCriteria\`. The distinction matters: \`acceptanceCriteria\` drives automated testing; \`suggestedCriteria\` gates a hardening pass.
-- Preserve the spec's AC wording. You may refine for clarity but must not change semantics.` : "";
+- Preserve the spec's AC wording. You may refine for clarity but must not change semantics.
+- Preserve each story's \`routing\` object unchanged \u2014 especially \`routing.complexity\` and \`routing.testStrategy\`. These are required by the schema and must not be dropped or modified during synthesis.` : "";
   const planSynthesisSuffix = `IMPORTANT: Your response must be a single valid JSON object in PRD format (with project, feature, branchName, userStories array, etc.). Do NOT wrap it in markdown fences. Output raw JSON only.${specAnchor}`;
   const outcome = await resolveOutcome(proposalOutputs, critiqueOutputs, ctx.stageConfig, ctx.config, ctx.storyId, resolverTimeoutMs, opts.workdir, opts.feature, undefined, undefined, planSynthesisSuffix, successful.map((p) => p.debater));
   const winningOutput = outcome.output ?? successful[0].output;
@@ -32371,7 +32399,8 @@ async function runTddSession(role, agent, story, config2, workdir, modelTier, be
       role,
       storyId: story.id,
       durationMs: Date.now() - startTime,
-      exitCode: result.exitCode
+      exitCode: result.exitCode,
+      ...result.output ? { output: result.output.slice(0, 500) } : {}
     });
   }
   await _sessionRunnerDeps.autoCommitIfDirty(workdir, "tdd", role, story.id);
@@ -36647,7 +36676,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.61.0",
+    version: "0.61.2-canary.1",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -36727,8 +36756,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("de7efdbe"))
-        return "de7efdbe";
+      if (/^[0-9a-f]{6,10}$/.test("7e54444a"))
+        return "7e54444a";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -41071,6 +41100,68 @@ var init_run_initialization = __esm(() => {
   };
 });
 
+// src/execution/lifecycle/paused-story-prompts.ts
+var exports_paused_story_prompts = {};
+__export(exports_paused_story_prompts, {
+  promptForPausedStories: () => promptForPausedStories
+});
+async function promptForPausedStories(prd, chain, featureName) {
+  const logger = getSafeLogger();
+  const summary = { resumed: [], skipped: [], kept: [] };
+  const pausedStories = prd.userStories.filter((s) => s.status === "paused");
+  for (const story of pausedStories) {
+    const lastReason = (story.priorErrors?.slice(-1)[0] ?? "no reason recorded").replace(/\n/g, " ").slice(0, 200);
+    logger?.info("run-initialization", "Paused story found \u2014 prompting user", {
+      storyId: story.id,
+      attempts: story.attempts
+    });
+    const response = await chain.prompt({
+      id: `ix-${story.id}-paused-resume`,
+      type: "choose",
+      featureName,
+      storyId: story.id,
+      stage: "pre-flight",
+      summary: `Story ${story.id} is paused \u2014 how to proceed?`,
+      detail: `"${story.title}"
+Last reason: ${lastReason}
+Attempts so far: ${story.attempts}`,
+      options: [
+        { key: "resume", label: "Resume", description: "Reset to pending and retry on this run" },
+        { key: "skip", label: "Skip", description: "Mark as skipped, won't be retried" },
+        { key: "keep", label: "Keep paused", description: "Leave paused, skip for this run" }
+      ],
+      timeout: 300000,
+      fallback: "continue",
+      createdAt: Date.now()
+    });
+    const effectiveAction = chain.applyFallback(response, "continue");
+    const resolvedKey = effectiveAction === "approve" ? "keep" : response.action;
+    switch (resolvedKey) {
+      case "resume": {
+        story.status = "pending";
+        summary.resumed.push(story.id);
+        logger?.info("run-initialization", "User resumed paused story", { storyId: story.id });
+        break;
+      }
+      case "skip": {
+        story.status = "skipped";
+        summary.skipped.push(story.id);
+        logger?.info("run-initialization", "User skipped paused story", { storyId: story.id });
+        break;
+      }
+      default: {
+        summary.kept.push(story.id);
+        logger?.info("run-initialization", "Keeping story paused", { storyId: story.id });
+        break;
+      }
+    }
+  }
+  return summary;
+}
+var init_paused_story_prompts = __esm(() => {
+  init_logger2();
+});
+
 // src/execution/lifecycle/run-setup.ts
 var exports_run_setup = {};
 __export(exports_run_setup, {
@@ -41199,7 +41290,16 @@ async function setupRun(options) {
       agentGetFn: options.agentGetFn
     });
     prd = initResult.prd;
-    const counts = initResult.storyCounts;
+    statusWriter.setPrd(prd);
+    let counts = initResult.storyCounts;
+    if (counts.paused > 0 && interactionChain !== null) {
+      const { promptForPausedStories: promptForPausedStories2 } = await Promise.resolve().then(() => (init_paused_story_prompts(), exports_paused_story_prompts));
+      const pausedSummary = await promptForPausedStories2(prd, interactionChain, feature);
+      if (pausedSummary.resumed.length > 0 || pausedSummary.skipped.length > 0) {
+        await savePRD(prd, prdPath);
+        counts = countStories(prd);
+      }
+    }
     return {
       statusWriter,
       pidRegistry,

package/package.json

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