@nathapp/nax 0.75.6 → 0.76.0

package/dist/nax.js

@@ -17823,6 +17823,7 @@ var init_schemas3 = __esm(() => {
         enabled: exports_external.boolean().default(false),
         flowPath: exports_external.string().default("flows/nax-finish/nax-finish.flow.ts"),
         defaultAgent: exports_external.string().nullable().default(null),
+        model: exports_external.string().min(1, "model must be non-empty").nullable().default(null),
         reviewers: exports_external.object({
           spec: exports_external.string().nullable().default(null),
           quality: exports_external.string().nullable().default(null)
@@ -17839,6 +17840,7 @@ var init_schemas3 = __esm(() => {
         enabled: false,
         flowPath: "flows/nax-finish/nax-finish.flow.ts",
         defaultAgent: null,
+        model: null,
         reviewers: { spec: null, quality: null },
         escalate: { telegram: true },
         notify: { mode: "escalation" },
@@ -17849,6 +17851,7 @@ var init_schemas3 = __esm(() => {
         enabled: false,
         flowPath: "flows/nax-finish/nax-finish.flow.ts",
         defaultAgent: null,
+        model: null,
         reviewers: { spec: null, quality: null },
         escalate: { telegram: true },
         notify: { mode: "escalation" },
@@ -19639,6 +19642,13 @@ function reshapeSelector(name, fn) {
   return { name, select: fn };
 }
 
+// src/config/project-key.ts
+import { basename as basename3 } from "path";
+function getProjectKey(config2, projectDir) {
+  return config2.name?.trim() || basename3(projectDir);
+}
+var init_project_key = () => {};
+
 // src/config/selectors.ts
 var reviewConfigSelector, planConfigSelector, decomposeConfigSelector, rectifyConfigSelector, acceptanceConfigSelector, acceptanceFixConfigSelector, acceptanceGenConfigSelector, tddConfigSelector, debateConfigSelector, routingConfigSelector, verifyConfigSelector, mutationCheckConfigSelector, rectificationGateConfigSelector, agentConfigSelector, agentManagerConfigSelector, interactionConfigSelector, precheckConfigSelector, qualityConfigSelector, autofixConfigSelector, executionGatesConfigSelector, testPatternConfigSelector, contextConfigSelector, contextToolRuntimeConfigSelector, promptLoaderConfigSelector, llmRoutingConfigSelector, finishConfigSelector;
 var init_selectors = __esm(() => {
@@ -19659,7 +19669,7 @@ var init_selectors = __esm(() => {
   mutationCheckConfigSelector = reshapeSelector("mutation-check", (c) => c.execution?.mutationCheck);
   rectificationGateConfigSelector = pickSelector("rectification-gate", "execution", "models", "agent", "quality", "review");
   agentConfigSelector = pickSelector("agent", "agent");
-  agentManagerConfigSelector = pickSelector("agent-manager", "agent", "execution");
+  agentManagerConfigSelector = pickSelector("agent-manager", "agent", "execution", "profile");
   interactionConfigSelector = pickSelector("interaction", "interaction");
   precheckConfigSelector = pickSelector("precheck", "precheck", "quality", "execution", "prompts", "review", "project");
   qualityConfigSelector = pickSelector("quality", "quality", "execution");
@@ -19670,7 +19680,7 @@ var init_selectors = __esm(() => {
   contextToolRuntimeConfigSelector = pickSelector("context-tool-runtime", "context", "execution", "project", "quality");
   promptLoaderConfigSelector = pickSelector("prompt-loader", "prompts", "context", "project");
   llmRoutingConfigSelector = pickSelector("llm-routing", "routing", "models", "agent", "tdd", "execution", "precheck");
-  finishConfigSelector = pickSelector("finish", "finish", "interaction", "quality");
+  finishConfigSelector = pickSelector("finish", "finish", "interaction", "quality", "agent");
 });
 
 // src/config/loader-runtime.ts
@@ -19950,6 +19960,7 @@ __export(exports_config, {
   interactionConfigSelector: () => interactionConfigSelector,
   globalConfigPath: () => globalConfigPath,
   globalConfigDir: () => globalConfigDir,
+  getProjectKey: () => getProjectKey,
   getAcQualityRules: () => getAcQualityRules,
   finishConfigSelector: () => finishConfigSelector,
   findProjectDir: () => findProjectDir,
@@ -20001,6 +20012,7 @@ var init_config = __esm(() => {
   init_path_security();
   init_paths();
   init_profile();
+  init_project_key();
   init_selectors();
   init_test_strategy();
 });
@@ -20113,6 +20125,11 @@ function estimateCostFromTokenUsage(usage, model) {
   const cacheCreationCost = (usage.cacheCreationInputTokens ?? 0) * cacheCreationRate;
   return inputCost + outputCost + cacheReadCost + cacheCreationCost;
 }
+function resolvePricingSource(model) {
+  if (model === undefined || model === "" || model === "unknown")
+    return "unknown-model";
+  return MODEL_PRICING[model] ? "model-rates" : "fallback-rates";
+}
 var init_calculate = __esm(() => {
   init_pricing();
 });
@@ -21116,6 +21133,8 @@ class AcpSessionHandleImpl {
   id;
   agentName;
   protocolIds;
+  modelDef;
+  modelTier;
   _client;
   _session;
   _sessionName;
@@ -21133,6 +21152,8 @@ class AcpSessionHandleImpl {
     this._resumed = opts.resumed;
     this._timeoutSeconds = opts.timeoutSeconds;
     this._modelDef = opts.modelDef;
+    this.modelDef = opts.modelDef;
+    this.modelTier = opts.modelTier;
     this._permissionMode = opts.permissionMode;
   }
 }
@@ -21518,6 +21539,7 @@ class AcpAgentAdapter {
         resumed: ensured.resumed,
         timeoutSeconds,
         modelDef,
+        modelTier: opts.modelTier,
         permissionMode: resolvedPermissions.mode
       });
     } catch (error48) {
@@ -22113,6 +22135,92 @@ function formatSessionName(req) {
 }
 var init_session_name = () => {};
 
+// src/agents/manager-dispatch.ts
+function modelAttribution(src) {
+  return {
+    ...src.modelDef?.model !== undefined ? { model: src.modelDef.model } : {},
+    ...src.modelTier !== undefined ? { modelTier: src.modelTier } : {}
+  };
+}
+function buildSessionTurnEvent(input) {
+  const { handle, result, opts, startedAt } = input;
+  return {
+    kind: "session-turn",
+    sessionName: handle.id,
+    sessionRole: input.sessionRole,
+    prompt: input.prompt,
+    response: result.output,
+    agentName: input.agentName,
+    ...modelAttribution(handle),
+    ...input.profile !== undefined ? { profile: input.profile } : {},
+    stage: input.stage,
+    storyId: opts.storyId,
+    featureName: opts.featureName,
+    workdir: opts.workdir,
+    projectDir: opts.projectDir,
+    resolvedPermissions: input.resolvedPermissions,
+    tokenUsage: result.tokenUsage,
+    estimatedCostUsd: result.estimatedCostUsd,
+    exactCostUsd: result.exactCostUsd,
+    durationMs: Date.now() - startedAt,
+    timestamp: Date.now(),
+    turn: result.internalRoundTrips ?? 1,
+    protocolIds: {
+      sessionId: handle.protocolIds?.sessionId ?? null,
+      recordId: handle.protocolIds?.recordId ?? null
+    },
+    ...result.interactions?.length ? { interactions: result.interactions } : {},
+    origin: "runAsSession",
+    ...opts.callId !== undefined ? { callId: opts.callId } : {},
+    ...opts.scopeId !== undefined ? { scopeId: opts.scopeId } : {}
+  };
+}
+function buildCompleteEvent(input) {
+  const { options } = input;
+  return {
+    kind: "complete",
+    sessionName: input.sessionName,
+    sessionRole: options.sessionRole ?? "auto",
+    prompt: input.prompt,
+    response: input.response,
+    agentName: input.agentName,
+    ...modelAttribution(options),
+    ...input.profile !== undefined ? { profile: input.profile } : {},
+    stage: input.stage,
+    storyId: options.storyId,
+    featureName: options.featureName,
+    workdir: options.workdir,
+    resolvedPermissions: input.resolvedPermissions,
+    tokenUsage: input.tokenUsage,
+    estimatedCostUsd: input.estimatedCostUsd,
+    exactCostUsd: input.exactCostUsd,
+    durationMs: Date.now() - input.startedAt,
+    timestamp: Date.now(),
+    ...options.callId !== undefined ? { callId: options.callId } : {},
+    ...options.scopeId !== undefined ? { scopeId: options.scopeId } : {}
+  };
+}
+function buildDispatchErrorEvent(input) {
+  return {
+    kind: "error",
+    origin: input.origin,
+    agentName: input.agentName,
+    stage: input.stage,
+    storyId: input.storyId,
+    errorCode: input.error instanceof NaxError ? input.error.code : "DISPATCH_ERROR",
+    errorMessage: errorMessage(input.error),
+    prompt: input.prompt,
+    durationMs: Date.now() - input.startedAt,
+    timestamp: Date.now(),
+    resolvedPermissions: input.resolvedPermissions,
+    ...input.callId !== undefined ? { callId: input.callId } : {},
+    ...input.scopeId !== undefined ? { scopeId: input.scopeId } : {}
+  };
+}
+var init_manager_dispatch = __esm(() => {
+  init_errors();
+});
+
 // src/agents/retry/default-strategy.ts
 var MAX_RETRIES = 3, defaultRetryStrategy;
 var init_default_strategy = __esm(() => {
@@ -22740,52 +22848,33 @@ class AgentManager {
         ...rawResult,
         protocolIds: rawResult.protocolIds ?? handle.protocolIds
       };
-      const event = {
-        kind: "session-turn",
-        sessionName: handle.id,
+      const event = buildSessionTurnEvent({
+        handle,
         sessionRole,
         prompt,
-        response: result.output,
+        result,
         agentName,
         stage,
-        storyId: opts.storyId,
-        featureName: opts.featureName,
-        workdir: opts.workdir,
-        projectDir: opts.projectDir,
+        opts,
         resolvedPermissions,
-        tokenUsage: result.tokenUsage,
-        estimatedCostUsd: result.estimatedCostUsd,
-        exactCostUsd: result.exactCostUsd,
-        durationMs: Date.now() - start,
-        timestamp: Date.now(),
-        turn: result.internalRoundTrips ?? 1,
-        protocolIds: {
-          sessionId: handle.protocolIds?.sessionId ?? null,
-          recordId: handle.protocolIds?.recordId ?? null
-        },
-        ...result.interactions?.length ? { interactions: result.interactions } : {},
-        origin: "runAsSession",
-        ...opts.callId !== undefined ? { callId: opts.callId } : {},
-        ...opts.scopeId !== undefined ? { scopeId: opts.scopeId } : {}
-      };
+        profile: this._config.profile,
+        startedAt: start
+      });
       this._dispatchEvents.emitDispatch(event);
       return result;
     } catch (err) {
-      const errEvent = {
-        kind: "error",
+      const errEvent = buildDispatchErrorEvent({
         origin: "runAsSession",
         agentName,
         stage,
         storyId: opts.storyId,
-        errorCode: err instanceof NaxError ? err.code : "DISPATCH_ERROR",
-        errorMessage: errorMessage(err),
+        error: err,
         prompt,
-        durationMs: Date.now() - start,
-        timestamp: Date.now(),
         resolvedPermissions,
-        ...opts.callId !== undefined ? { callId: opts.callId } : {},
-        ...opts.scopeId !== undefined ? { scopeId: opts.scopeId } : {}
-      };
+        callId: opts.callId,
+        scopeId: opts.scopeId,
+        startedAt: start
+      });
       this._dispatchEvents.emitDispatchError(errEvent);
       throw err;
     }
@@ -22804,44 +22893,35 @@ class AgentManager {
     const start = Date.now();
     try {
       const outcome = await this.completeWithFallback(prompt, augmented, agentName);
-      const event = {
-        kind: "complete",
+      const event = buildCompleteEvent({
         sessionName,
-        sessionRole: options.sessionRole ?? "auto",
         prompt,
         response: outcome.result.output,
         agentName,
         stage,
-        storyId: options.storyId,
-        featureName: options.featureName,
-        workdir: options.workdir,
+        options,
         resolvedPermissions,
         tokenUsage: outcome.result.tokenUsage,
         estimatedCostUsd: outcome.result.estimatedCostUsd,
         exactCostUsd: outcome.result.exactCostUsd,
-        durationMs: Date.now() - start,
-        timestamp: Date.now(),
-        ...options.callId !== undefined ? { callId: options.callId } : {},
-        ...options.scopeId !== undefined ? { scopeId: options.scopeId } : {}
-      };
+        profile: this._config.profile,
+        startedAt: start
+      });
       this._dispatchEvents.emitDispatch(event);
       return outcome.result;
     } catch (err) {
-      const errEvent = {
-        kind: "error",
+      const errEvent = buildDispatchErrorEvent({
         origin: "completeAs",
         agentName,
         stage,
         storyId: options.storyId,
-        errorCode: err instanceof NaxError ? err.code : "DISPATCH_ERROR",
-        errorMessage: errorMessage(err),
+        error: err,
         prompt,
-        durationMs: Date.now() - start,
-        timestamp: Date.now(),
         resolvedPermissions,
-        ...options.callId !== undefined ? { callId: options.callId } : {},
-        ...options.scopeId !== undefined ? { scopeId: options.scopeId } : {}
-      };
+        callId: options.callId,
+        scopeId: options.scopeId,
+        startedAt: start
+      });
       this._dispatchEvents.emitDispatchError(errEvent);
       throw err;
     }
@@ -22864,6 +22944,7 @@ var init_manager = __esm(() => {
   init_dispatch_events();
   init_session_name();
   init_bun_deps();
+  init_manager_dispatch();
   init_registry();
   init_default_strategy();
   init_hop_retry_policy();
@@ -23553,6 +23634,56 @@ var init_digest = __esm(() => {
   SCOPE_ORDER2 = ["project", "feature", "story", "session", "retrieved"];
 });
 
+// src/context/engine/manifest-builder.ts
+function buildManifest(inputs) {
+  const {
+    requestId,
+    request,
+    packed,
+    usedTokens,
+    digestTokens: digestTokens2,
+    buildMs,
+    providerResults,
+    roleFiltered,
+    belowMin,
+    dedupeDropped,
+    budgetExcludedIds,
+    floorPackedIds,
+    floorOverageIds
+  } = inputs;
+  const staleChunkIds = packed.filter((c) => c.staleCandidate).map((c) => c.id);
+  const chunkSummaries = {};
+  const chunkTokens = {};
+  for (const c of packed) {
+    chunkSummaries[c.id] = c.content.slice(0, CHUNK_SUMMARY_CHARS);
+    chunkTokens[c.id] = c.tokens;
+  }
+  return {
+    requestId,
+    stage: request.stage,
+    totalBudgetTokens: request.budgetTokens,
+    usedTokens: usedTokens + digestTokens2,
+    includedChunks: packed.map((c) => c.id),
+    excludedChunks: [
+      ...roleFiltered.map((c) => ({ id: c.id, reason: "role-filter" })),
+      ...belowMin.map((c) => ({ id: c.id, reason: "below-min-score" })),
+      ...dedupeDropped.map((id) => ({ id, reason: "dedupe" })),
+      ...budgetExcludedIds.map((id) => ({ id, reason: "budget" }))
+    ],
+    floorItems: floorPackedIds,
+    floorOverageItems: floorOverageIds.length > 0 ? floorOverageIds : undefined,
+    digestTokens: digestTokens2,
+    buildMs,
+    providerResults,
+    repoRoot: request.repoRoot,
+    packageDir: request.packageDir,
+    ...Object.keys(chunkSummaries).length > 0 && { chunkSummaries },
+    ...Object.keys(chunkTokens).length > 0 && { chunkTokens },
+    ...staleChunkIds.length > 0 && { staleChunks: staleChunkIds }
+  };
+}
+var CHUNK_SUMMARY_CHARS = 300;
+
 // src/context/engine/packing.ts
 function packChunks(chunks, budgetTokens, availableBudgetTokens) {
   const effectiveBudget = availableBudgetTokens !== undefined ? Math.min(budgetTokens, availableBudgetTokens) : budgetTokens;
@@ -25773,7 +25904,7 @@ async function captureWorkingTreeChanges(workdir, baseRef, scopePrefix) {
     return [];
   const runDiff = async (args) => {
     const fullArgs = scopePrefix ? [...args, "--", `${scopePrefix}/`] : args;
-    const { stdout, exitCode } = await gitWithTimeout(fullArgs, workdir, TIMEOUT_RETRY_GIT_TIMEOUT_MS);
+    const { stdout, exitCode } = await gitWithTimeout(fullArgs, workdir, _gitDeps.timeoutRetryGitTimeoutMs);
     if (exitCode !== 0)
       return [];
     return stdout.trim().split(`
@@ -25822,16 +25953,20 @@ async function captureDiffSummary(workdir, baseRef, scopePrefix) {
     return "";
   }
 }
-var _gitDeps, GIT_TIMEOUT_MS = 1e4, TIMEOUT_RETRY_GIT_TIMEOUT_MS = 3000;
+var GIT_TIMEOUT_MS = 1e4, TIMEOUT_RETRY_GIT_TIMEOUT_MS = 3000, _gitDeps;
 var init_git = __esm(() => {
   init_logger2();
   init_bun_deps();
-  _gitDeps = { spawn, getSafeLogger };
+  _gitDeps = {
+    spawn,
+    getSafeLogger,
+    timeoutRetryGitTimeoutMs: TIMEOUT_RETRY_GIT_TIMEOUT_MS
+  };
 });
 
 // src/utils/path-filters.ts
 import { join as join8, relative as relative2 } from "path";
-function basename3(path) {
+function basename4(path) {
   const stripped = path.startsWith("./") ? path.slice(2) : path;
   const idx = stripped.lastIndexOf("/");
   return idx === -1 ? stripped : stripped.slice(idx + 1);
@@ -25961,7 +26096,7 @@ function isNaxInternalPath(path) {
     return true;
   if (path.includes("/.nax/"))
     return true;
-  return LOCKFILE_BASENAMES.has(basename3(path));
+  return LOCKFILE_BASENAMES.has(basename4(path));
 }
 function filterNaxInternalPaths(paths, ignoreMatchers = []) {
   return paths.filter((path) => !isNaxInternalPath(path) && !ignoreMatchers.some((matcher) => matcher.test(path)));
@@ -26005,8 +26140,8 @@ async function getGitRootMemo(workdir) {
   return result ?? null;
 }
 function extractBasenamePattern(pattern) {
-  const basename4 = pattern.slice(pattern.lastIndexOf("/") + 1);
-  const parts = basename4.split("*");
+  const basename5 = pattern.slice(pattern.lastIndexOf("/") + 1);
+  const parts = basename5.split("*");
   if (parts.length !== 2)
     return null;
   const [prefix, suffix] = parts;
@@ -26018,8 +26153,8 @@ function extractSearchTerms(sourceFile) {
   const withoutPrefix = sourceFile.replace(/^(?:.*\/)?src\//, "");
   const withoutExt = withoutPrefix.replace(/\.[^.]+$/, "");
   const parts = withoutExt.split("/");
-  const basename4 = parts[parts.length - 1];
-  return [`/${basename4}`, withoutExt];
+  const basename5 = parts[parts.length - 1];
+  return [`/${basename5}`, withoutExt];
 }
 async function importGrepFallback(sourceFiles, workdir, testFilePatterns, maxScanFiles = MAX_GREP_TEST_FILES) {
   if (sourceFiles.length === 0 || testFilePatterns.length === 0)
@@ -27839,33 +27974,21 @@ class ContextOrchestrator {
     const digest = buildDigest(packed);
     const dTokens = digestTokens(digest);
     const buildMs = _orchestratorDeps.now() - startMs;
-    const staleChunkIds = packed.filter((c) => c.staleCandidate).map((c) => c.id);
-    const chunkSummaries = {};
-    for (const c of packed) {
-      chunkSummaries[c.id] = c.content.slice(0, 300);
-    }
-    const manifest = {
+    const manifest = buildManifest({
       requestId,
-      stage: request.stage,
-      totalBudgetTokens: request.budgetTokens,
-      usedTokens: usedTokens + dTokens,
-      includedChunks: packed.map((c) => c.id),
-      excludedChunks: [
-        ...roleFiltered.map((c) => ({ id: c.id, reason: "role-filter" })),
-        ...belowMin.map((c) => ({ id: c.id, reason: "below-min-score" })),
-        ...dedupeDropped.map((id) => ({ id, reason: "dedupe" })),
-        ...budgetExcludedIds.map((id) => ({ id, reason: "budget" }))
-      ],
-      floorItems: floorPackedIds,
-      floorOverageItems: floorOverageIds.length > 0 ? floorOverageIds : undefined,
+      request,
+      packed,
+      usedTokens,
       digestTokens: dTokens,
       buildMs,
       providerResults,
-      repoRoot: request.repoRoot,
-      packageDir: request.packageDir,
-      ...Object.keys(chunkSummaries).length > 0 && { chunkSummaries },
-      ...staleChunkIds.length > 0 && { staleChunks: staleChunkIds }
-    };
+      roleFiltered,
+      belowMin,
+      dedupeDropped,
+      budgetExcludedIds,
+      floorPackedIds,
+      floorOverageIds
+    });
     logger.debug("context-v2", "Bundle assembled", {
       storyId: request.storyId,
       stage: request.stage,
@@ -27922,6 +28045,7 @@ class ContextOrchestrator {
       ...prior.manifest,
       requestId: _orchestratorDeps.uuid(),
       includedChunks: packedChunks.map((c) => c.id),
+      chunkTokens: Object.fromEntries(packedChunks.map((c) => [c.id, c.tokens])),
       usedTokens: Math.max(0, prior.manifest.usedTokens - prior.manifest.digestTokens + dTokens + extraTokens),
       digestTokens: dTokens,
       buildMs: 0,
@@ -27959,7 +28083,7 @@ var init_orchestrator = __esm(() => {
 });
 
 // src/context/rules/canonical-loader.ts
-import { basename as basename4, join as join12 } from "path";
+import { basename as basename5, join as join12 } from "path";
 function parseRuleAllowMarker(line) {
   const allowed = new Set;
   RULE_ALLOW_MARKER.lastIndex = 0;
@@ -28099,7 +28223,7 @@ async function loadCanonicalRules(workdir, options = {}) {
   const filePaths = allFilePaths.filter((filePath) => {
     const normalized = filePath.replaceAll("\\", "/");
     const normalizedRulesDir = rulesDir.replaceAll("\\", "/");
-    const relativePath = normalized.startsWith(`${normalizedRulesDir}/`) ? normalized.slice(normalizedRulesDir.length + 1) : basename4(normalized);
+    const relativePath = normalized.startsWith(`${normalizedRulesDir}/`) ? normalized.slice(normalizedRulesDir.length + 1) : basename5(normalized);
     return relativePath.split("/").length <= 2;
   });
   if (allFilePaths.length > filePaths.length) {
@@ -28115,8 +28239,8 @@ async function loadCanonicalRules(workdir, options = {}) {
   for (const filePath of filePaths) {
     const normalizedPath = filePath.replaceAll("\\", "/");
     const normalizedRulesDir = rulesDir.replaceAll("\\", "/");
-    const relativePath = normalizedPath.startsWith(`${normalizedRulesDir}/`) ? normalizedPath.slice(normalizedRulesDir.length + 1) : basename4(normalizedPath);
-    const fileName = basename4(filePath);
+    const relativePath = normalizedPath.startsWith(`${normalizedRulesDir}/`) ? normalizedPath.slice(normalizedRulesDir.length + 1) : basename5(normalizedPath);
+    const fileName = basename5(filePath);
     let content;
     try {
       content = await _canonicalLoaderDeps.readFile(filePath);
@@ -29778,8 +29902,8 @@ function deriveTestPatterns(contextFiles, resolvedGlobs) {
   const suffixes = resolvedGlobs ? extractGlobSuffixes(resolvedGlobs) : DEFAULT_TS_DERIVE_SUFFIXES;
   const effectiveSuffixes = suffixes.length > 0 ? suffixes : DEFAULT_TS_DERIVE_SUFFIXES;
   for (const filePath of contextFiles) {
-    const basename5 = path.basename(filePath);
-    const basenameNoExt = basename5.replace(/\.[^.]+$/, "");
+    const basename6 = path.basename(filePath);
+    const basenameNoExt = basename6.replace(/\.[^.]+$/, "");
     for (const suffix of effectiveSuffixes) {
       patterns.add(`${basenameNoExt}${suffix}`);
     }
@@ -29841,8 +29965,8 @@ async function scanTestFiles(options) {
   const files = [];
   for await (const filePath of glob.scan({ cwd: scanDir, absolute: false })) {
     if (allowedBasenames !== null) {
-      const basename5 = path.basename(filePath);
-      if (!allowedBasenames.has(basename5)) {
+      const basename6 = path.basename(filePath);
+      if (!allowedBasenames.has(basename6)) {
         continue;
       }
     }
@@ -31601,6 +31725,11 @@ isolation scope: Only create or modify files in the test/ directory. Tests must
 isolation scope: Create test files in test/. MAY read src/ files and MAY import from src/ to ensure correct types/interfaces. May create minimal stubs in src/ if needed to make imports work, but do NOT implement real logic.${footer}`;
   }
   if (role === "implementer") {
+    if (mode === "lite") {
+      return `${header}
+
+isolation scope: Implement source code in src/ to make tests pass. You MAY add tests for acceptance criteria that have no coverage yet; do NOT weaken, delete, or skip existing tests. Run tests frequently to track progress.${footer}`;
+    }
     return `${header}
 
 isolation scope: Implement source code in src/ to make tests pass. Do not modify test files. Run tests frequently to track progress.${footer}`;
@@ -32167,12 +32296,36 @@ Include the story ID when known \u2014 \`feat(<story-id>): <description>\`.
 When the story is ambiguous, pick an interpretation, proceed, and document the choice in the commit body under \`Assumptions:\`. Do not invent requirements; do not silently choose when the story is genuinely under-specified \u2014 note it.`;
 }
 
+// src/prompts/sections/test-quality.ts
+function buildTestQualitySection(role, variant, storyId) {
+  const authors = AUTHORING_ROLES.has(role) || role === "implementer" && variant === "lite";
+  if (!authors)
+    return "";
+  const storyIdLine = storyId ? `
+- Test names must use THIS story's ID (${storyId}) \u2014 never a sibling story's ID copied from a nearby test.` : "";
+  return `# Review-Proof Tests
+
+An adversarial reviewer will audit your tests after implementation and BLOCK the story on any test-gap finding. Each block costs a full rectification round. Write tests that survive that audit the first time:
+
+- Every acceptance criterion needs a test that INVOKES the code at runtime and asserts its observable behavior (return value, thrown error, rendered/mounted output, emitted event, persisted state).
+- NEVER write source-inspection tests \u2014 asserting that a file contains a pattern, string, or symbol proves nothing about behavior and WILL be blocked as test-gap.
+- No placeholder or tautological tests: \`expect(true).toBe(true)\`, asserting on literals, empty bodies, \`.skip\`/\`.todo\` on an AC-covering test \u2014 all blocked as test-gap.
+- Every new exported symbol an AC depends on must be exercised by at least one test.
+- Cover the boundary and error paths the reviewer probes: empty/null/zero/negative inputs, and failure modes (errors must surface, not be swallowed).
+- For UI/page-level ACs, mount the page/component and simulate the interaction \u2014 a test that only exercises the underlying unit reads as no coverage for the AC's wiring.${storyIdLine}`;
+}
+var AUTHORING_ROLES;
+var init_test_quality = __esm(() => {
+  AUTHORING_ROLES = new Set(["test-writer", "single-session", "tdd-simple", "batch"]);
+});
+
 // src/prompts/sections/index.ts
 var init_sections2 = __esm(() => {
   init_hermetic();
   init_role_task();
   init_story();
   init_acceptance();
+  init_test_quality();
 });
 
 // src/prompts/loader.ts
@@ -32315,7 +32468,7 @@ class TddPromptBuilder {
     if (this.role === "verifier" && this.story_) {
       acc.add(this.s("verdict", buildVerdictSection(this.story_)));
     }
-    const isolation = this.options.isolation;
+    const isolation = this.role === "implementer" && this.options.variant === "lite" ? "lite" : this.options.isolation;
     acc.add(this.s("isolation", buildIsolationSection(this.role, isolation, this.testCommand_)));
     const tddLang = buildTddLanguageSection(this.loaderConfig_?.project?.language);
     if (tddLang)
@@ -32331,6 +32484,9 @@ class TddPromptBuilder {
     const guardrails = buildBehavioralGuardrailsSection(this.role, guardrailLevel, guardrailVariant, guardrailIsolation);
     if (guardrails)
       acc.add(this.s("guardrails", guardrails));
+    const testQuality = buildTestQualitySection(this.role, this.options.variant, this.story_?.id);
+    if (testQuality)
+      acc.add(this.s("test-quality", testQuality));
     if (this.role !== "verifier") {
       const selfVerify = buildSelfVerificationSection(this.role, this.selfVerification_);
       if (selfVerify)
@@ -32782,6 +32938,32 @@ var init_debate_builder = __esm(() => {
   RE_REVIEW_JSON_DIRECTIVE = `Respond with JSON: { passed: boolean; findings: Array<${FINDING_SCHEMA}>; findingReasoning: { [ruleId: string]: string }; deltaSummary: string }`;
 });
 
+// src/review/semantic-categories.ts
+function isSemanticCategory(value) {
+  return SEMANTIC_CATEGORY_SET.has(value);
+}
+function normalizeSemanticCategory(raw) {
+  if (typeof raw !== "string")
+    return "";
+  const normalized = raw.trim().toLowerCase();
+  if (normalized === "")
+    return "";
+  return isSemanticCategory(normalized) ? normalized : "other";
+}
+var SEMANTIC_CATEGORIES, SEMANTIC_CATEGORY_SET, SEMANTIC_CATEGORY_ENUM_LINE;
+var init_semantic_categories = __esm(() => {
+  SEMANTIC_CATEGORIES = [
+    "unimplemented",
+    "partial",
+    "contradiction",
+    "dead-path",
+    "unwired",
+    "other"
+  ];
+  SEMANTIC_CATEGORY_SET = new Set(SEMANTIC_CATEGORIES);
+  SEMANTIC_CATEGORY_ENUM_LINE = SEMANTIC_CATEGORIES.map((c) => `"${c}"`).join(" | ");
+});
+
 // src/prompts/builders/prior-iterations-builder.ts
 function buildPriorIterationsBlock(iterations) {
   if (iterations.length === 0)
@@ -32840,9 +33022,13 @@ function renderVerdictTemplate(iterations) {
 When outcome is "unchanged", the prior hypothesis is FALSIFIED \u2014 the change did not affect what was tested. Choose a different category before producing a new verdict. Do NOT repeat fixes listed above.` : "";
   return [
     `**Required:** before adding any new finding, classify each of the ${total} prior finding(s) above as one of:`,
-    "- `addressed` \u2014 the current diff resolves it (cite the diff line that fixes it in your `message` field)",
-    "- `still-blocking` \u2014 the implementer did not fix it; re-flag it with the IDENTICAL `file`, `line`, `category`, and substantively the same `message` wording",
-    `- \`never-an-issue\` \u2014 your prior judgment was wrong; explain why in \`message\` and emit severity \`"info"\``,
+    "- `addressed` \u2014 the current diff resolves it; record it in `acks` (not `findings`), citing the diff line that fixes it in `note`",
+    "- `still-blocking` \u2014 the implementer did not fix it; re-flag it in `findings` with the IDENTICAL `file`, `line`, `category`, and substantively the same `message` wording",
+    "- `never-an-issue` \u2014 your prior judgment was wrong; record it in `acks` (not `findings`) and explain why in `note`",
+    "",
+    "Do NOT emit an acknowledgement as a finding. A resolved or withdrawn prior finding is not a defect \u2014",
+    "reporting it as one inflates the finding count and buries the real defects. Only `still-blocking` belongs in `findings`.",
+    "",
     `Then surface any genuinely new findings.${unchangedNote}`
   ].join(`
 `);
@@ -32906,13 +33092,36 @@ Flag issues only when you have confirmed:
 3. New code has dead paths that will never execute (stubs, noops, unreachable branches)
 4. New code is not wired into callers/exports (verified by grepping for usage)
 
-Do NOT flag: style issues, naming conventions, import ordering, file length, or anything lint handles.`, SEMANTIC_OUTPUT_SCHEMA = `Respond with JSON only \u2014 no explanation text before or after:
+Do NOT flag: style issues, naming conventions, import ordering, file length, or anything lint handles.
+
+**Finding categories \u2014 every finding MUST carry exactly one \`category\`:**
+- \`unimplemented\` \u2014 an AC has no implementation at all.
+- \`partial\` \u2014 an AC is implemented for some inputs or paths, but not everything it specifies.
+- \`contradiction\` \u2014 the implementation does the opposite of what the AC specifies, or something the AC forbids.
+- \`dead-path\` \u2014 a stub, noop, or unreachable branch that will never execute.
+- \`unwired\` \u2014 new code exists but is not reachable: not exported, not called, not registered.
+- \`other\` \u2014 genuinely AC-related, but none of the above.
+
+Pick the most specific axis that fits. Do not invent categories outside this list \u2014 an unrecognised value is recorded as \`other\` and loses its signal.`, SEMANTIC_OUTPUT_SCHEMA, ReviewPromptBuilder;
+var init_review_builder = __esm(() => {
+  init_semantic_categories();
+  init_sections2();
+  SEMANTIC_ROLE = "You are a semantic code reviewer with access to the repository files. " + "Your job is to walk each acceptance criterion (AC) and judge whether the production code fulfills it \u2014 fully, partially, or not at all. " + "Test coverage gaps and convention/lint issues are out of scope \u2014 adversarial review and lint/typecheck handle those.";
+  SEMANTIC_OUTPUT_SCHEMA = `Respond with JSON only \u2014 no explanation text before or after:
 {
   "passed": boolean,
   "inspectedFiles": ["relative/path/you/actually/opened.ts"],
+  "acks": [
+    {
+      "priorFinding": "<short identifier \u2014 file:line or a few words of its message>",
+      "status": "addressed" | "never-an-issue",
+      "note": "<why: the diff line that fixes it, or why the prior judgment was wrong>"
+    }
+  ],
   "findings": [
     {
       "severity": "error" | "warning" | "info" | "unverifiable",
+      "category": ${SEMANTIC_CATEGORY_ENUM_LINE},
       "file": "path/to/file",
       "line": 42,
       "issue": "description of the issue",
@@ -32930,14 +33139,13 @@ Do NOT flag: style issues, naming conventions, import ordering, file length, or
 }
 
 Notes:
+- \`acks\` records prior findings you are NOT re-flagging \u2014 resolved by the diff, or withdrawn. Omit it (or use \`[]\`) when there are no prior findings. An acknowledgement must never appear in \`findings\`.
+- \`category\` is required on every finding \u2014 one of the axes listed above.
 - \`acIndex\` is required when severity is "error" (1-based, into the Acceptance Criteria list above).
 - \`acQuote\` is optional advisory metadata for human auditors \u2014 not validated.
 - Omit both for "warning", "info", "unverifiable".
 - \`inspectedFiles\` must list the relative paths you actually opened while reviewing. A \`passed:true\` verdict with an empty or absent \`inspectedFiles\` is invalid \u2014 walk each AC against the real files before passing.
-If all ACs are correctly implemented after inspecting the code, respond with { "passed": true, "inspectedFiles": ["..."], "findings": [] }.`, ReviewPromptBuilder;
-var init_review_builder = __esm(() => {
-  init_sections2();
-  SEMANTIC_ROLE = "You are a semantic code reviewer with access to the repository files. " + "Your job is to walk each acceptance criterion (AC) and judge whether the production code fulfills it \u2014 fully, partially, or not at all. " + "Test coverage gaps and convention/lint issues are out of scope \u2014 adversarial review and lint/typecheck handle those.";
+If all ACs are correctly implemented after inspecting the code, respond with { "passed": true, "inspectedFiles": ["..."], "findings": [] }.`;
   ReviewPromptBuilder = class ReviewPromptBuilder {
     buildSemanticReviewPrompt(story, semanticConfig, options) {
       const acList = story.acceptanceCriteria.map((ac, i) => `${i + 1}. ${ac}`).join(`
@@ -32987,7 +33195,7 @@ Respond with a condensed summary:
 - ${advisoryClause}
 - Keep \`verifiedBy\` for every finding. If \`verifiedBy.observed\` is long, abbreviate it to one line \u2014 never drop the field.
 Output ONLY a complete, valid JSON object. It must start with { and end with }.
-Schema: {"passed": boolean, "findings": [{"severity": string, "category": string, "file": string, "line": number, "issue": string, "suggestion": string, "verifiedBy": {"command": string, "file": string, "line": number, "observed": string}}]}`;
+Schema: {"passed": boolean, "findings": [{"severity": string, "category": ${SEMANTIC_CATEGORY_ENUM_LINE}, "file": string, "line": number, "issue": string, "suggestion": string, "verifiedBy": {"command": string, "file": string, "line": number, "observed": string}}]}`;
     }
     static demandInspection() {
       return `Your previous review returned \`passed:true\` with no findings and an empty (or absent) \`inspectedFiles\` list. That means you did not open any of the changed files \u2014 a verdict reached without reading the code is not valid.
@@ -33042,6 +33250,7 @@ ${drops.map((d, i) => `${i + 1}. [${d.finding.severity}] ${d.finding.issue}`).jo
 Please re-review the code and re-issue any valid findings. For each finding you re-issue:
 - You MUST include a valid \`acIndex\` (1-based index into the AC list below)
 - You MUST include a \`verifiedBy\` field with verified evidence
+- You MUST include a \`category\`: ${SEMANTIC_CATEGORY_ENUM_LINE}
 
 ## Acceptance Criteria
 ${acList}
@@ -33176,6 +33385,7 @@ What new exported units lack corresponding test files?
 - Bodies that always pass: \`expect(true).toBe(true)\`, \`expect(x).toBe(x)\`, \`expect(1).toBe(1)\`, an empty test body, or \`assert(true)\`.
 - Tests skipped/disabled (\`it.skip\`, \`test.todo\`, \`xit\`, commented-out assertions) that an AC depends on.
 - Assertions that never exercise the implementation (e.g. asserting on a literal, not on a value the production code produced).
+- Source-inspection tests: reading a source file and asserting it contains a pattern, string, or symbol instead of invoking the code and asserting its runtime behavior.
 
 For each such finding: set \`acIndex\` to the AC the fake test purports to cover, \`acQuote\` to a verbatim substring of that AC, and \`verifiedBy.observed\` to the placeholder line itself (e.g. \`expect(true).toBe(true)\`). Do **not** downgrade these to \`warning\` \u2014 a green suite built on placeholder assertions is a failing implementation with hidden evidence.
 
@@ -33199,6 +33409,13 @@ Respond with ONLY a JSON object \u2014 no preamble, no explanation outside the J
 {
   "passed": true | false,
   "inspectedFiles": ["relative/path/you/actually/opened.ts"],
+  "acks": [
+    {
+      "priorFinding": "<short identifier of the prior finding \u2014 its file:line or a few words of its message>",
+      "status": "addressed" | "never-an-issue",
+      "note": "<why: the diff line that fixes it, or why the prior judgment was wrong>"
+    }
+  ],
   "findings": [
     {
       "severity": "error" | "warning" | "info" | "unverifiable",
@@ -33225,6 +33442,8 @@ Respond with ONLY a JSON object \u2014 no preamble, no explanation outside the J
 
 **No rubber-stamping:** \`inspectedFiles\` must list the relative paths you actually opened with your tools while reviewing. A \`passed:true\` verdict with an empty or absent \`inspectedFiles\` is invalid \u2014 it means you never looked at the code. Fetch the diff and open the changed files before forming any verdict.
 
+\`acks\` records prior findings you are NOT re-flagging \u2014 resolved by the diff, or withdrawn. Omit it (or use \`[]\`) when there are no prior findings. An acknowledgement must never appear in \`findings\`.
+
 Severity guide:
 - \`"error"\`: confident this will cause real failure or regression
 - \`"warning"\`: fragile or incomplete but may ship without immediate breakage
@@ -33769,8 +33988,8 @@ function stripMarkdownInline(s) {
 function extractLocusKeywords(finding) {
   const keywords = [];
   if (finding.file) {
-    const basename5 = finding.file.split("/").pop() ?? "";
-    const stem = basename5.replace(/\.[^.]+$/, "");
+    const basename6 = finding.file.split("/").pop() ?? "";
+    const stem = basename6.replace(/\.[^.]+$/, "");
     for (const part of stem.split(/[-_]/)) {
       if (part.length >= 3)
         keywords.push(part.toLowerCase());
@@ -35919,6 +36138,35 @@ var init_acceptance_fix = __esm(() => {
   };
 });
 
+// src/review/acks.ts
+function extractAcks(raw) {
+  if (!Array.isArray(raw))
+    return [];
+  const acks = [];
+  for (const entry of raw) {
+    if (acks.length >= MAX_ACKS)
+      break;
+    if (typeof entry === "string") {
+      if (entry !== "")
+        acks.push({ priorFinding: entry, status: "unknown" });
+      continue;
+    }
+    if (typeof entry !== "object" || entry === null)
+      continue;
+    const e = entry;
+    const known = e.status === "addressed" || e.status === "never-an-issue";
+    const note = typeof e.note === "string" ? e.note.slice(0, MAX_NOTE_CHARS) : "";
+    acks.push({
+      priorFinding: typeof e.priorFinding === "string" ? e.priorFinding : "",
+      status: known ? e.status : "unknown",
+      ...note !== "" && { note },
+      ...!known && typeof e.status === "string" && { rawStatus: e.status }
+    });
+  }
+  return acks;
+}
+var MAX_ACKS = 50, MAX_NOTE_CHARS = 500;
+
 // src/review/ac-structural-counterfactual.ts
 function analyzeStructuralCounterfactual(finding, acceptanceCriteria, diffFiles) {
   const acIndexInRange = typeof finding.acIndex === "number" && finding.acIndex >= 1 && finding.acIndex <= acceptanceCriteria.length;
@@ -35956,7 +36204,12 @@ function validateAdversarialShape(parsed) {
     return null;
   if (!Array.isArray(obj.findings))
     return null;
-  return { passed: obj.passed, findings: obj.findings };
+  const acks = extractAcks(obj.acks);
+  return {
+    passed: obj.passed,
+    findings: obj.findings,
+    ...acks.length > 0 && { acks }
+  };
 }
 function formatFindings(findings) {
   return findings.map((f) => `[${f.severity}][${f.category}] ${f.file}:${f.line} \u2014 ${f.issue}
@@ -36011,7 +36264,21 @@ function validateLLMShape(parsed) {
     return null;
   if (!Array.isArray(obj.findings))
     return null;
-  return { passed: obj.passed, findings: obj.findings };
+  const acks = extractAcks(obj.acks);
+  return {
+    passed: obj.passed,
+    findings: obj.findings.filter(isFindingShaped).map(withNormalizedCategory),
+    ...acks.length > 0 && { acks }
+  };
+}
+function isFindingShaped(f) {
+  return typeof f === "object" && f !== null && !Array.isArray(f);
+}
+function withNormalizedCategory(f) {
+  const category = normalizeSemanticCategory(f.category);
+  if (category === "")
+    return f;
+  return { ...f, category };
 }
 function parseLLMResponse(raw) {
   try {
@@ -36067,7 +36334,7 @@ function llmFindingToFinding(f, opts = {}) {
   return {
     source: "semantic-review",
     severity: normalizeSeverity2(f.severity),
-    category: "",
+    category: normalizeSemanticCategory(f.category),
     file: f.file,
     line: f.line,
     message: f.issue,
@@ -36082,6 +36349,7 @@ function toReviewFindings(findings, opts = {}) {
 var UNVERIFIED_FINDING_PATTERNS;
 var init_semantic_helpers = __esm(() => {
   init_category_fix_target();
+  init_semantic_categories();
   init_severity();
   UNVERIFIED_FINDING_PATTERNS = [
     "cannot verify",
@@ -36448,6 +36716,7 @@ async function performSemanticReground(turn, firstParsed, drops, ctx) {
       output: JSON.stringify({
         passed: false,
         findings: secondParsed.findings,
+        ...secondParsed.acks && { acks: secondParsed.acks },
         _repromptInfo: { dropCount, outcome: "recovered-blocking", costUsd }
       }),
       estimatedCostUsd: costUsd
@@ -36460,6 +36729,7 @@ async function performSemanticReground(turn, firstParsed, drops, ctx) {
       output: JSON.stringify({
         passed: true,
         findings: [...firstAdvisory, ...secondAdvisory],
+        ...secondParsed.acks && { acks: secondParsed.acks },
         _repromptInfo: { dropCount, outcome: "recovered-advisory-only", costUsd }
       }),
       estimatedCostUsd: costUsd
@@ -36558,7 +36828,7 @@ var FAIL_OPEN, SEMANTIC_REQUOTE_RECOVERED_EVENT = "review.semantic.finding.requo
     const passed = !requoted.findings.some((finding) => isBlockingSeverity(finding.severity, ctx.input.blockingThreshold ?? "error"));
     return {
       ...turn,
-      output: JSON.stringify({ passed, findings: requoted.findings }),
+      output: JSON.stringify({ passed, findings: requoted.findings, ...parsed.acks && { acks: parsed.acks } }),
       estimatedCostUsd: (turn.estimatedCostUsd ?? 0) + requoted.extraCostUsd
     };
   }
@@ -36635,7 +36905,8 @@ var init_semantic_review = __esm(() => {
           findings: parsed.findings,
           normalizedFindings: [],
           acDropped: [],
-          repromptEvent
+          repromptEvent,
+          ...parsed.acks && { acks: parsed.acks }
         };
       }
       const unparsedPreview = previewOutput(output, UNPARSED_PREVIEW_BYTES);
@@ -36686,7 +36957,7 @@ var init_semantic_review = __esm(() => {
   };
 });
 
-// src/operations/adversarial-review.ts
+// src/operations/adversarial-reprompt-marker.ts
 function withRepromptMarker2(output, info) {
   const parsed = tryParseLLMJson(output);
   if (!parsed || typeof parsed !== "object")
@@ -36709,6 +36980,9 @@ function extractRepromptInfo2(raw) {
     outcome: i.outcome
   };
 }
+var init_adversarial_reprompt_marker = () => {};
+
+// src/operations/adversarial-review.ts
 async function requoteBlockingAdversarialFindings(findings, ctx) {
   const threshold = ctx.input.blockingThreshold ?? "error";
   const maxRequotes = ctx.input.adversarialConfig.substantiation?.maxRequotes ?? DEFAULT_MAX_REQUOTES2;
@@ -36823,6 +37097,7 @@ async function performAdversarialReground(turn, firstParsed, drops, ctx) {
       output: JSON.stringify({
         passed: false,
         findings: secondParsed.findings,
+        ...secondParsed.acks && { acks: secondParsed.acks },
         _repromptInfo: { dropCount, outcome: "recovered-blocking", costUsd }
       }),
       estimatedCostUsd: costUsd
@@ -36835,6 +37110,7 @@ async function performAdversarialReground(turn, firstParsed, drops, ctx) {
       output: JSON.stringify({
         passed: true,
         findings: [...firstAdvisory, ...secondAdvisory],
+        ...secondParsed.acks && { acks: secondParsed.acks },
         _repromptInfo: { dropCount, outcome: "recovered-advisory-only", costUsd }
       }),
       estimatedCostUsd: costUsd
@@ -36884,6 +37160,7 @@ var init_adversarial_review = __esm(() => {
   init_recurrence_demotion();
   init_requote_response();
   init__review_fallback();
+  init_adversarial_reprompt_marker();
   FAIL_OPEN2 = {
     passed: true,
     findings: [],
@@ -36928,7 +37205,7 @@ var init_adversarial_review = __esm(() => {
         const passed = !requoted.findings.some((finding) => isBlockingSeverity(finding.severity, ctx.input.blockingThreshold ?? "error"));
         return {
           ...turn,
-          output: JSON.stringify({ passed, findings: requoted.findings }),
+          output: JSON.stringify({ passed, findings: requoted.findings, ...parsed.acks && { acks: parsed.acks } }),
           estimatedCostUsd: (turn.estimatedCostUsd ?? 0) + requoted.extraCostUsd
         };
       }
@@ -36963,7 +37240,8 @@ var init_adversarial_review = __esm(() => {
           findings: parsed.findings,
           normalizedFindings: [],
           acDropped: [],
-          repromptEvent
+          repromptEvent,
+          ...parsed.acks && { acks: parsed.acks }
         };
       }
       if (/"passed"\s*:\s*false/.test(output) && !/"findings"\s*:\s*\[\s*\{/.test(output)) {
@@ -42299,12 +42577,50 @@ function recordAdversarialAudit(opts) {
     blockingThreshold: opts.blockingThreshold,
     result: opts.result,
     advisoryFindings: opts.advisoryFindings,
+    acks: opts.acks,
     diffAvailable: opts.diffAvailable,
     adversarialDropAnalysis: opts.adversarialDropAnalysis,
     adversarialAcceptAnalysis: opts.adversarialAcceptAnalysis
   });
 }
 
+// src/review/adversarial-counterfactual-telemetry.ts
+function buildCounterfactualTelemetry({
+  acDropped,
+  blockingFindings,
+  acceptanceCriteria,
+  diffFiles
+}) {
+  const adversarialDropAnalysis = acDropped.map((d) => ({
+    finding: {
+      file: d.finding.file ?? "<unknown>",
+      line: d.finding.line ?? 0,
+      severity: d.finding.severity,
+      category: d.finding.category ?? "<unknown>",
+      issue: d.finding.issue
+    },
+    dropCode: d.code,
+    acIndex: d.finding.acIndex,
+    rawCategory: d.finding.category ?? "",
+    counterfactual: analyzeStructuralCounterfactual({ acIndex: d.finding.acIndex, category: d.finding.category, file: d.finding.file }, acceptanceCriteria, diffFiles)
+  }));
+  const adversarialAcceptAnalysis = blockingFindings.map((f) => ({
+    finding: {
+      file: f.file,
+      line: f.line,
+      severity: f.severity,
+      category: f.category
+    },
+    acIndex: f.acIndex,
+    rawCategory: f.category,
+    counterfactual: analyzeStructuralCounterfactual({ acIndex: f.acIndex, category: f.category, file: f.file }, acceptanceCriteria, diffFiles)
+  }));
+  return { adversarialDropAnalysis, adversarialAcceptAnalysis };
+}
+var init_adversarial_counterfactual_telemetry = __esm(() => {
+  init_ac_structural_counterfactual();
+});
+
 // src/review/diff-utils.ts
 var {spawn: spawn3 } = globalThis.Bun;
 async function resolveNaxIgnorePathspecExcludes(workdir, options) {
@@ -42703,7 +43019,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.75.6",
+    version: "0.76.0",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -42807,8 +43123,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("064f9083"))
-        return "064f9083";
+      if (/^[0-9a-f]{6,10}$/.test("e7721ea5"))
+        return "e7721ea5";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -42855,6 +43171,7 @@ function toPersistedEntry(entry, epochMs) {
     blockingThreshold: entry.blockingThreshold ?? "error",
     result: entry.result,
     advisoryFindings: entry.advisoryFindings ?? null,
+    acks: entry.acks ?? null,
     acDropped: entry.acDropped ?? null,
     ...entry.parsed ? {} : { unparsedPreview: entry.unparsedPreview ?? null },
     diffAvailable: entry.diffAvailable ?? null,
@@ -43225,6 +43542,7 @@ async function runAdversarialReview(opts) {
     ...tagCoverageGap(toAdversarialReviewFindings(demoted, { isTestFile: testFileMatch }))
   ];
   const acDropped = opResult.acDropped ?? [];
+  const acks = opResult.acks;
   let diffFiles;
   let diffAvailable;
   if (diff && diff.length > 0) {
@@ -43242,30 +43560,12 @@ async function runAdversarialReview(opts) {
       diffAvailable = true;
     }
   }
-  const adversarialDropAnalysis = acDropped.map((d) => ({
-    finding: {
-      file: d.finding.file ?? "<unknown>",
-      line: d.finding.line ?? 0,
-      severity: d.finding.severity,
-      category: d.finding.category ?? "<unknown>",
-      issue: d.finding.issue
-    },
-    dropCode: d.code,
-    acIndex: d.finding.acIndex,
-    rawCategory: d.finding.category ?? "",
-    counterfactual: analyzeStructuralCounterfactual({ acIndex: d.finding.acIndex, category: d.finding.category, file: d.finding.file }, story.acceptanceCriteria, diffFiles)
-  }));
-  const adversarialAcceptAnalysis = blockingFindings.map((f) => ({
-    finding: {
-      file: f.file,
-      line: f.line,
-      severity: f.severity,
-      category: f.category
-    },
-    acIndex: f.acIndex,
-    rawCategory: f.category,
-    counterfactual: analyzeStructuralCounterfactual({ acIndex: f.acIndex, category: f.category, file: f.file }, story.acceptanceCriteria, diffFiles)
-  }));
+  const { adversarialDropAnalysis, adversarialAcceptAnalysis } = buildCounterfactualTelemetry({
+    acDropped,
+    blockingFindings,
+    acceptanceCriteria: story.acceptanceCriteria,
+    diffFiles
+  });
   if (advisoryFindings.length > 0) {
     logger?.debug("review", `Adversarial review: ${advisoryFindings.length} advisory findings (below threshold '${threshold}')`, {
       storyId: story.id,
@@ -43307,7 +43607,8 @@ async function runAdversarialReview(opts) {
       advisoryFindings: advisoryFindings.length > 0 ? advisoryReviewFindings : undefined,
       diffAvailable,
       adversarialDropAnalysis,
-      adversarialAcceptAnalysis
+      adversarialAcceptAnalysis,
+      acks
     });
     const output = blockingFindings.length > 0 ? `Adversarial review failed:
 
@@ -43341,6 +43642,7 @@ ${formatFindings(blockingFindings)}` : "Adversarial review failed (no findings)"
         storyId: story.id,
         featureName,
         parsed: true,
+        acks,
         failOpen: false,
         passed: true,
         passReason: "ac_quote_not_substring_demoted",
@@ -43378,6 +43680,7 @@ ${formatFindings(blockingFindings)}` : "Adversarial review failed (no findings)"
       storyId: story.id,
       featureName,
       parsed: true,
+      acks,
       failOpen: false,
       passed: false,
       blockingThreshold: threshold,
@@ -43408,6 +43711,7 @@ ${dropSummary}`,
     storyId: story.id,
     featureName,
     parsed: true,
+    acks,
     failOpen: false,
     passed: true,
     blockingThreshold: threshold,
@@ -43438,7 +43742,7 @@ var init_adversarial = __esm(() => {
   init_logger2();
   init_adversarial_review();
   init_call();
-  init_ac_structural_counterfactual();
+  init_adversarial_counterfactual_telemetry();
   init_adversarial_helpers();
   init_diff_utils();
   init_finding_projection();
@@ -43898,7 +44202,8 @@ function recordSemanticDebateAudit(opts) {
     passed: opts.passed,
     blockingThreshold: opts.blockingThreshold,
     result: opts.result,
-    advisoryFindings: opts.advisoryFindings
+    advisoryFindings: opts.advisoryFindings,
+    acks: opts.acks
   });
 }
 async function runSemanticDebate(opts) {
@@ -43952,12 +44257,16 @@ async function runSemanticDebate(opts) {
   const debateCost = debateResult.totalCostUsd ?? 0;
   const resolverPassed = debateResult.outcome === "passed";
   const allFindings = [];
+  const acks = [];
   for (const p of debateResult.proposals) {
     const parsed = parseLLMResponse(p.output);
     if (parsed) {
       allFindings.push(...parsed.findings);
+      if (parsed.acks)
+        acks.push(...parsed.acks.slice(0, MAX_ACKS - acks.length));
     }
   }
+  const debateAcks = acks.length > 0 ? acks : undefined;
   const seen = new Set;
   const deduped = [];
   for (const f of allFindings) {
@@ -43991,6 +44300,7 @@ async function runSemanticDebate(opts) {
         storyId: story.id,
         featureName,
         parsed: true,
+        acks: debateAcks,
         passed: false,
         blockingThreshold: debateThreshold,
         result: {
@@ -44023,6 +44333,7 @@ ${formatFindings2(debateBlocking)}`,
       storyId: story.id,
       featureName,
       parsed: true,
+      acks: debateAcks,
       passed: true,
       blockingThreshold: debateThreshold,
       result: {
@@ -44049,6 +44360,7 @@ ${formatFindings2(debateBlocking)}`,
     storyId: story.id,
     featureName,
     parsed: true,
+    acks: debateAcks,
     passed: true,
     blockingThreshold: debateThreshold,
     result: {
@@ -44092,7 +44404,8 @@ function recordSemanticAudit(opts) {
     passed: opts.passed,
     blockingThreshold: opts.blockingThreshold,
     result: opts.result,
-    advisoryFindings: opts.advisoryFindings
+    advisoryFindings: opts.advisoryFindings,
+    acks: opts.acks
   });
 }
 async function runSemanticReview(opts) {
@@ -44370,6 +44683,7 @@ async function runSemanticReview(opts) {
   }
   const threshold = blockingThreshold ?? "error";
   const allFindings = opResult.findings;
+  const acks = opResult.acks;
   const blockingFindings = allFindings.filter((f) => isBlockingSeverity(f.severity, threshold));
   const advisoryFindings = allFindings.filter((f) => !isBlockingSeverity(f.severity, threshold));
   if (advisoryFindings.length > 0) {
@@ -44407,6 +44721,7 @@ ${formatFindings2(blockingFindings)}`;
       failOpen: false,
       passed: false,
       blockingThreshold: threshold,
+      acks,
       result: {
         passed: false,
         findings: llmFindingsToReviewFindings(allFindings, { source: "semantic-review", isTestFile: testFileMatch })
@@ -44437,6 +44752,7 @@ ${formatFindings2(blockingFindings)}`;
       storyId: story.id,
       featureName,
       parsed: true,
+      acks,
       failOpen: false,
       passed: false,
       blockingThreshold: threshold,
@@ -44462,6 +44778,7 @@ ${formatFindings2(blockingFindings)}`;
     storyId: story.id,
     featureName,
     parsed: true,
+    acks,
     failOpen: false,
     passed: true,
     blockingThreshold: threshold,
@@ -44840,6 +45157,7 @@ var init_review = __esm(() => {
   init_runner2();
   init_requote_response();
   init_severity();
+  init_semantic_categories();
 });
 
 // src/prompts/builders/rectifier-builder-helpers.ts
@@ -46857,6 +47175,7 @@ function buildHopCallback(ctx, sessionId, _initialOptions) {
           workdir,
           pipelineStage: stage,
           modelDef,
+          ...resolvedRunOptions.modelDef !== undefined ? {} : { modelTier: effectiveTier },
           timeoutSeconds: resolvedRunOptions.timeoutSeconds ?? config2.execution?.sessionTimeoutSeconds ?? DEFAULT_CONFIG.execution.sessionTimeoutSeconds,
           featureName,
           storyId: story.id,
@@ -46864,6 +47183,7 @@ function buildHopCallback(ctx, sessionId, _initialOptions) {
         });
       }
     } else {
+      const pinned = hopKind.kind === "primary" && resolvedRunOptions.modelDef !== undefined;
       const modelDef = hopKind.kind === "primary" ? resolvedRunOptions.modelDef ?? resolveModelForAgent(config2.models, agentName, effectiveTier, defaultAgent) : resolveModelForAgent(config2.models, agentName, effectiveTier, defaultAgent);
       handle = await sessionManager.openSession(sessionName, {
         agentName,
@@ -46871,6 +47191,7 @@ function buildHopCallback(ctx, sessionId, _initialOptions) {
         workdir,
         pipelineStage: stage,
         modelDef,
+        ...pinned ? {} : { modelTier: effectiveTier },
         timeoutSeconds: resolvedRunOptions.timeoutSeconds ?? config2.execution?.sessionTimeoutSeconds ?? DEFAULT_CONFIG.execution.sessionTimeoutSeconds,
         featureName,
         storyId: story.id,
@@ -47033,6 +47354,7 @@ async function callOp(ctx, op, input) {
     const sessionName = sessionRole2 && ctx.packageDir ? computeAcpHandle(ctx.packageDir, ctx.featureName, ctx.storyId, sessionRole2) : undefined;
     const completeOptions = {
       modelDef: resolved.modelDef,
+      ...resolved.modelTier !== undefined ? { modelTier: resolved.modelTier } : {},
       jsonMode: completeOp.jsonMode ?? false,
       pipelineStage: op.stage,
       storyId: ctx.storyId,
@@ -48088,7 +48410,7 @@ var init_agent_stream_logging = __esm(() => {
 });
 
 // src/runtime/middleware/cost.ts
-function attachCostSubscriber(bus, aggregator, runId) {
+function attachCostSubscriber(bus, aggregator, runId, projectKey) {
   const offDispatch = bus.onDispatch((event) => {
     const tu = event.tokenUsage;
     const wireExactCostUsd = event.exactCostUsd;
@@ -48101,9 +48423,15 @@ function attachCostSubscriber(bus, aggregator, runId) {
     const costEvent = {
       ts: event.timestamp,
       runId,
+      ...projectKey !== undefined ? { projectKey } : {},
+      schemaVersion: COST_ROW_SCHEMA_VERSION,
       agentName: event.agentName,
-      model: "unknown",
+      model: event.model ?? "unknown",
+      ...event.modelTier !== undefined ? { modelTier: event.modelTier } : {},
+      ...event.profile !== undefined ? { profile: event.profile } : {},
       stage: event.stage,
+      sessionRole: event.sessionRole,
+      ...event.featureName !== undefined ? { featureName: event.featureName } : {},
       storyId: event.storyId,
       callId: event.callId,
       scopeId: event.scopeId,
@@ -48117,14 +48445,18 @@ function attachCostSubscriber(bus, aggregator, runId) {
       exactCostUsd,
       costUsd: exactCostUsd,
       confidence,
+      pricingSource: hasWireExactCost ? "wire" : resolvePricingSource(event.model),
       durationMs: event.durationMs
     };
     aggregator.record(costEvent);
   });
   const offError = bus.onDispatchError((event) => {
     const errorEvent = {
+      kind: "error",
       ts: event.timestamp,
       runId,
+      ...projectKey !== undefined ? { projectKey } : {},
+      schemaVersion: COST_ROW_SCHEMA_VERSION,
       agentName: event.agentName,
       stage: event.stage,
       storyId: event.storyId,
@@ -48153,6 +48485,10 @@ function attachCostSubscriber(bus, aggregator, runId) {
     offCompleted();
   };
 }
+var COST_ROW_SCHEMA_VERSION = 2;
+var init_cost2 = __esm(() => {
+  init_agents();
+});
 
 // src/runtime/middleware/audit.ts
 function attachAuditSubscriber(bus, auditor, runId) {
@@ -48251,6 +48587,7 @@ function attachReviewAuditSubscriber(bus, auditor, runId) {
       blockingThreshold: event.blockingThreshold,
       result: event.result,
       advisoryFindings: event.advisoryFindings,
+      acks: event.acks ? [...event.acks] : undefined,
       acDropped: event.acDropped ? [...event.acDropped] : undefined,
       unparsedPreview: event.unparsedPreview,
       diffAvailable: event.diffAvailable,
@@ -48268,7 +48605,7 @@ function attachReviewAuditSubscriber(bus, auditor, runId) {
 function scheduleTickIfNeeded(tickRef, tick, intervalMs) {
   if (tickRef.handle !== null)
     return;
-  tickRef.handle = setTimeout(tick, intervalMs);
+  tickRef.handle = _idleWatchdogDeps.setTimeout(tick, intervalMs);
 }
 function handleObserveTimeout(state, reason, idleDurationMs, nonToolCallIdleMs) {
   if (state.warnedForCurrentIdlePeriod)
@@ -48296,7 +48633,7 @@ async function handleCancelTimeout(state, reason, controllerRegistry, maxRetryAt
     return;
   }
   state.cancelAttempts++;
-  state.lastActivityAt = Date.now();
+  state.lastActivityAt = _idleWatchdogDeps.now();
   getSafeLogger()?.warn("idle-watchdog", reason === "tool_call_only_idle_timeout_exceeded" ? "Canceling tool-call-only idle call" : "Canceling idle call", {
     storyId: state.storyId,
     key: reason,
@@ -48330,17 +48667,17 @@ function handleWarnThenCancelTimeout(state, reason, controllerRegistry, maxRetry
   });
   state.inGracePeriod = true;
   state.graceReason = reason;
-  state.graceTimer = setTimeout(async () => {
+  state.graceTimer = _idleWatchdogDeps.setTimeout(async () => {
     if (!activeStates.has(state.callId))
       return;
     state.inGracePeriod = false;
     state.graceTimer = undefined;
     state.graceReason = undefined;
-    const currentReason = getTimeoutReason(state, Date.now(), idleTimeoutMs, toolCallOnlyTimeoutMs);
+    const currentReason = getTimeoutReason(state, _idleWatchdogDeps.now(), idleTimeoutMs, toolCallOnlyTimeoutMs);
     if (currentReason !== reason)
       return;
     state.cancelAttempts++;
-    state.lastActivityAt = Date.now();
+    state.lastActivityAt = _idleWatchdogDeps.now();
     const cancel = controllerRegistry.get(state.callId);
     if (cancel)
       await cancel().catch(() => {});
@@ -48348,7 +48685,7 @@ function handleWarnThenCancelTimeout(state, reason, controllerRegistry, maxRetry
 }
 function clearGrace(state) {
   if (state.inGracePeriod && state.graceTimer !== undefined) {
-    clearTimeout(state.graceTimer);
+    _idleWatchdogDeps.clearTimeout(state.graceTimer);
     state.graceTimer = undefined;
     state.inGracePeriod = false;
     state.graceReason = undefined;
@@ -48384,7 +48721,7 @@ function attachAgentIdleWatchdog(agentStreamEvents, controllerRegistry, config2)
   const tickRef = { handle: null };
   function tick() {
     tickRef.handle = null;
-    const now = Date.now();
+    const now = _idleWatchdogDeps.now();
     for (const [, state] of activeStates) {
       if (state.inGracePeriod)
         continue;
@@ -48407,7 +48744,7 @@ function attachAgentIdleWatchdog(agentStreamEvents, controllerRegistry, config2)
   const unsubscribe = agentStreamEvents.onAgentStream((event) => {
     switch (event.kind) {
       case "agent.call_started": {
-        const now = Date.now();
+        const now = _idleWatchdogDeps.now();
         activeStates.set(event.callId, {
           callId: event.callId,
           agentName: event.agentName,
@@ -48479,11 +48816,11 @@ function attachAgentIdleWatchdog(agentStreamEvents, controllerRegistry, config2)
         const state = activeStates.get(event.callId);
         if (state) {
           if (state.graceTimer !== undefined)
-            clearTimeout(state.graceTimer);
+            _idleWatchdogDeps.clearTimeout(state.graceTimer);
           activeStates.delete(event.callId);
         }
         if (activeStates.size === 0 && tickRef.handle !== null) {
-          clearTimeout(tickRef.handle);
+          _idleWatchdogDeps.clearTimeout(tickRef.handle);
           tickRef.handle = null;
         }
         break;
@@ -48494,17 +48831,23 @@ function attachAgentIdleWatchdog(agentStreamEvents, controllerRegistry, config2)
     unsubscribe();
     for (const state of activeStates.values()) {
       if (state.graceTimer !== undefined)
-        clearTimeout(state.graceTimer);
+        _idleWatchdogDeps.clearTimeout(state.graceTimer);
     }
     activeStates.clear();
     if (tickRef.handle !== null) {
-      clearTimeout(tickRef.handle);
+      _idleWatchdogDeps.clearTimeout(tickRef.handle);
       tickRef.handle = null;
     }
   };
 }
+var _idleWatchdogDeps;
 var init_idle_watchdog = __esm(() => {
   init_logger2();
+  _idleWatchdogDeps = {
+    setTimeout: (fn, ms) => setTimeout(fn, ms),
+    clearTimeout: (id) => clearTimeout(id),
+    now: () => Date.now()
+  };
 });
 
 // src/runtime/middleware/index.ts
@@ -48512,6 +48855,7 @@ var init_middleware = __esm(() => {
   init_cancellation();
   init_logging();
   init_agent_stream_logging();
+  init_cost2();
   init_idle_watchdog();
 });
 
@@ -49069,6 +49413,11 @@ var init_manager_sweep = __esm(() => {
   DEFAULT_ORPHAN_TTL_MS = 4 * 60 * 60 * 1000;
 });
 
+// src/session/model-selection.ts
+function selectModel(opts) {
+  return { modelDef: opts.modelDef, ...opts.modelTier ? { modelTier: opts.modelTier } : {} };
+}
+
 // src/session/naming.ts
 var exports_naming = {};
 __export(exports_naming, {
@@ -49374,7 +49723,7 @@ class SessionManager {
       agentName: opts.agentName,
       workdir: opts.workdir,
       resolvedPermissions,
-      modelDef: opts.modelDef,
+      ...selectModel(opts),
       timeoutSeconds: opts.timeoutSeconds,
       onPidSpawned: this._pidRegistry ? (pid) => this._pidRegistry?.register(pid) : undefined,
       onPidExited: this._pidRegistry ? (pid) => this._pidRegistry?.unregister(pid) : undefined,
@@ -49649,8 +49998,8 @@ async function triageFlakyFindings(input) {
       result.push({ ...f });
     return { findings: result, quarantineReport: { keys, reasons } };
   }
-  const changedTestSet = new Set(diff.changedTestFiles.map(basename5));
-  const mappedTestSet = new Set(diff.mappedTestFiles.map(basename5));
+  const changedTestSet = new Set(diff.changedTestFiles.map(basename6));
+  const mappedTestSet = new Set(diff.mappedTestFiles.map(basename6));
   const candidates = findings.filter((f) => isProbeCandidate(f, changedTestSet, mappedTestSet));
   if (candidates.length > flakeDetection.maxProbesPerGate) {
     logger?.info("flake-triage", `Skipping flake triage \u2014 ${candidates.length} candidates exceed maxProbesPerGate=${flakeDetection.maxProbesPerGate}`);
@@ -49714,7 +50063,7 @@ async function triageFlakyFindings(input) {
   }
   return { findings: result, quarantineReport: { keys, reasons } };
 }
-function basename5(path7) {
+function basename6(path7) {
   const i = path7.lastIndexOf("/");
   return i === -1 ? path7 : path7.slice(i + 1);
 }
@@ -49725,7 +50074,7 @@ function isProbeCandidate(finding, changedTestSet, mappedTestSet) {
     return false;
   if (!finding.rule)
     return false;
-  const base = basename5(finding.file);
+  const base = basename6(finding.file);
   if (changedTestSet.has(base) || changedTestSet.has(finding.file))
     return false;
   if (mappedTestSet.has(base) || mappedTestSet.has(finding.file))
@@ -49859,6 +50208,7 @@ __export(exports_runtime, {
   attachAgentIdleWatchdog: () => attachAgentIdleWatchdog,
   _reviewAuditDeps: () => _reviewAuditDeps,
   _promptAuditorDeps: () => _promptAuditorDeps,
+  _idleWatchdogDeps: () => _idleWatchdogDeps,
   _costAggDeps: () => _costAggDeps,
   ReviewAuditor: () => ReviewAuditor,
   PromptAuditor: () => PromptAuditor,
@@ -49868,7 +50218,7 @@ __export(exports_runtime, {
   CostAggregator: () => CostAggregator,
   AgentStreamEventBus: () => AgentStreamEventBus
 });
-import { basename as basename6, join as join31 } from "path";
+import { basename as basename7, join as join31 } from "path";
 function createRuntime(config2, workdir, opts) {
   const runId = crypto.randomUUID();
   const controller = new AbortController;
@@ -49880,7 +50230,7 @@ function createRuntime(config2, workdir, opts) {
   const configLoader = createConfigLoader(config2);
   const dispatchEvents = new DispatchEventBus;
   const agentStreamEvents = opts?.agentStreamEvents ?? new AgentStreamEventBus;
-  const projectKey = config2.name?.trim() || basename6(workdir);
+  const projectKey = config2.name?.trim() || basename7(workdir);
   const outputDir = projectOutputDir(projectKey, config2.outputDir);
   const globalDir = globalOutputDir();
   const curatorRollupPathValue = curatorRollupPath(globalDir, config2.curator?.rollupPath);
@@ -49935,7 +50285,7 @@ function createRuntime(config2, workdir, opts) {
     agentManager.configureRuntime({ pidRegistry });
   }
   const offLogging = attachLoggingSubscriber(dispatchEvents, runId);
-  const offCost = attachCostSubscriber(dispatchEvents, costAggregator, runId);
+  const offCost = attachCostSubscriber(dispatchEvents, costAggregator, runId, getProjectKey(config2, workdir));
   const offAudit = attachAuditSubscriber(dispatchEvents, promptAuditor, runId);
   const offReviewAudit = attachReviewAuditSubscriber(dispatchEvents, reviewAuditor, runId);
   const offAgentStreamLogging = attachAgentStreamLogging(agentStreamEvents, runId);
@@ -52864,7 +53214,8 @@ var init_telegram = __esm(() => {
   init_zod();
   init_logger2();
   _telegramPluginDeps = {
-    fetch: globalThis.fetch.bind(globalThis)
+    fetch: globalThis.fetch.bind(globalThis),
+    basePollBackoffMs: 1000
   };
   NUMERIC_CHAT_ID = /^-?\d+$/;
   TelegramConfigSchema = exports_external.object({
@@ -52878,7 +53229,7 @@ var init_telegram = __esm(() => {
     chatId = null;
     pendingMessages = new Map;
     lastUpdateId = 0;
-    backoffMs = 1000;
+    backoffMs = _telegramPluginDeps.basePollBackoffMs;
     maxBackoffMs = 30000;
     static MAX_DRAIN_PAGES = 10;
     static INTERACTIVE_REQUEST_TYPES = new Set([
@@ -52988,7 +53339,7 @@ ${partLabel}${chunks[i]}`;
               this.clearInlineKeyboard(update.callback_query.message.message_id);
             }
             this.pendingMessages.delete(requestId);
-            this.backoffMs = 1000;
+            this.backoffMs = _telegramPluginDeps.basePollBackoffMs;
             return response;
           }
           if (update.callback_query) {
@@ -53059,7 +53410,7 @@ ${partLabel}${chunks[i]}`;
             rejected: raw.length - updates.length
           });
         }
-        this.backoffMs = 1000;
+        this.backoffMs = _telegramPluginDeps.basePollBackoffMs;
         return { ok: true, updates, rawCount: raw.length };
       } catch (err) {
         this.backoffMs = Math.min(this.backoffMs * 2, this.maxBackoffMs);
@@ -55871,10 +56222,10 @@ __export(exports_status_cost, {
   displayCostMetrics: () => displayCostMetrics,
   _costReportEmitDeps: () => _costReportEmitDeps
 });
-import { basename as basename7 } from "path";
+import { basename as basename8 } from "path";
 async function resolveProject(workdir) {
   const config2 = await loadConfig(workdir).catch(() => null);
-  const project = config2?.name?.trim() || basename7(workdir);
+  const project = config2?.name?.trim() || basename8(workdir);
   const outputDir = projectOutputDir(project, config2?.outputDir);
   return { project, outputDir };
 }
@@ -56139,7 +56490,7 @@ __export(exports_status_features, {
   _statusFeaturesDeps: () => _statusFeaturesDeps
 });
 import { existsSync as existsSync17, readdirSync as readdirSync3 } from "fs";
-import { basename as basename8, join as join45, resolve as resolve14 } from "path";
+import { basename as basename9, join as join45, resolve as resolve14 } from "path";
 function isPidAlive(pid) {
   try {
     process.kill(pid, 0);
@@ -56162,7 +56513,7 @@ async function loadStatusFile(featureDir) {
 }
 async function loadProjectStatusFile(projectDir) {
   const config2 = await _statusFeaturesDeps.loadConfig(projectDir).catch(() => null);
-  const projectKey = config2?.name?.trim() || basename8(projectDir);
+  const projectKey = config2?.name?.trim() || basename9(projectDir);
   const outputDir = _statusFeaturesDeps.projectOutputDir(projectKey, config2?.outputDir);
   const statusPath = join45(outputDir, "status.json");
   if (!existsSync17(statusPath)) {
@@ -56233,7 +56584,7 @@ async function getFeatureSummary(featureName, featureDir) {
 }
 async function displayAllFeatures(projectDir) {
   const config2 = await _statusFeaturesDeps.loadConfig(projectDir).catch(() => null);
-  const projectKey = config2?.name?.trim() || basename8(projectDir);
+  const projectKey = config2?.name?.trim() || basename9(projectDir);
   const outputDir = _statusFeaturesDeps.projectOutputDir(projectKey, config2?.outputDir);
   const featuresDir = join45(outputDir, "features");
   if (!existsSync17(featuresDir)) {
@@ -56456,7 +56807,7 @@ async function displayFeatureStatus(options = {}) {
     if (options.dir) {
       const projectDir = resolve14(options.dir);
       const config2 = await _statusFeaturesDeps.loadConfig(projectDir).catch(() => null);
-      const projectKey = config2?.name?.trim() || basename8(projectDir);
+      const projectKey = config2?.name?.trim() || basename9(projectDir);
       const outputDir = _statusFeaturesDeps.projectOutputDir(projectKey, config2?.outputDir);
       featureDir = join45(outputDir, "features", options.feature);
     } else {
@@ -57087,7 +57438,7 @@ var init_acceptance3 = __esm(() => {
       const allOutputParts = [];
       let anyError = false;
       let errorExitCode = 0;
-      let hardeningRetries = 0;
+      let hardeningPromoted = 0;
       for (const { testPath, packageDir, testFramework, commandOverride } of testGroups) {
         const testFile = Bun.file(testPath);
         const exists = await testFile.exists();
@@ -57188,7 +57539,7 @@ ${stderr}`;
               runtime: ctx.runtime,
               abortSignal: ctx.abortSignal
             });
-            hardeningRetries = result.promoted.length;
+            hardeningPromoted = result.promoted.length;
           } catch (err) {
             logger.debug("acceptance", "Hardening pass failed (non-blocking)", {
               storyId: ctx.story.id,
@@ -57201,7 +57552,8 @@ ${stderr}`;
           packageDir: ctx.workdir,
           passed: true,
           failedACs: [],
-          retries: hardeningRetries,
+          retries: ctx.acceptanceRetries ?? 0,
+          hardeningPromoted,
           durationMs
         });
         return { action: "continue" };
@@ -57217,7 +57569,8 @@ ${stderr}`;
         packageDir: ctx.workdir,
         passed: false,
         failedACs: allFailedACs,
-        retries: hardeningRetries,
+        retries: ctx.acceptanceRetries ?? 0,
+        hardeningPromoted,
         durationMs
       });
       if (anyError) {
@@ -62791,7 +63144,8 @@ var init_gitignore = __esm(() => {
     "**/_nax_acceptance_test.py",
     "**/_nax_suggested_test.py",
     "**/.nax/features/*/",
-    ".nax/prompt-audit/"
+    ".nax/prompt-audit/",
+    ".nax/finish-audit/"
   ];
 });
 
@@ -62804,7 +63158,7 @@ __export(exports_init_context, {
   generatePackageContextTemplate: () => generatePackageContextTemplate,
   generateContextTemplate: () => generateContextTemplate
 });
-import { basename as basename10, join as join54 } from "path";
+import { basename as basename11, join as join54 } from "path";
 async function bunFileExists(path16) {
   return Bun.file(path16).exists();
 }
@@ -62899,7 +63253,7 @@ async function scanProject(projectRoot) {
   const readmeSnippet = await readReadmeSnippet(projectRoot);
   const entryPoints = await detectEntryPoints(projectRoot);
   const configFiles = await detectConfigFiles(projectRoot);
-  const projectName = packageManifest?.name || basename10(projectRoot);
+  const projectName = packageManifest?.name || basename11(projectRoot);
   return {
     projectName,
     fileTree,
@@ -64322,7 +64676,8 @@ async function collectFromMetrics(context) {
       const success2 = boolValue(story.success, false);
       const storyId = stringValue(story.storyId ?? story.id, "unknown");
       const obs = {
-        schemaVersion: 1,
+        schemaVersion: OBSERVATION_SCHEMA_VERSION,
+        projectKey: context.projectKey,
         runId: context.runId,
         featureId: stringValue(currentRun.feature, context.feature),
         storyId,
@@ -64342,6 +64697,24 @@ async function collectFromMetrics(context) {
   } catch {}
   return observations;
 }
+function withinRun(timestamp, runStartedAt) {
+  if (runStartedAt === undefined)
+    return true;
+  const ts = typeof timestamp === "string" ? Date.parse(timestamp) : Number.NaN;
+  if (Number.isNaN(ts))
+    return true;
+  return ts >= runStartedAt;
+}
+async function writtenThisRun(filePath, runStartedAt) {
+  if (runStartedAt === undefined)
+    return true;
+  try {
+    const stat = await Bun.file(filePath).stat();
+    return stat.mtimeMs >= runStartedAt;
+  } catch {
+    return true;
+  }
+}
 function findingRuleId(finding) {
   return stringValue(finding.ruleId ?? finding.rule ?? finding.checkId ?? finding.category, "unknown");
 }
@@ -64367,17 +64740,22 @@ async function collectFromReviewAudit(context) {
         const audit = asRecord3(await readJsonFile(fullPath));
         if (!audit)
           continue;
+        const featureId = stringValue(audit.featureName ?? audit.featureId, context.feature);
+        if (context.runStartedAt !== undefined && featureId !== context.feature)
+          continue;
+        if (!withinRun(audit.timestamp, context.runStartedAt))
+          continue;
         const result = asRecord3(audit.result);
         const findings = asArray(result?.findings);
         const storyId = stringValue(audit.storyId, "unknown");
-        const featureId = stringValue(audit.featureName ?? audit.featureId, context.feature);
         for (const rawFinding of findings) {
           const finding = asRecord3(rawFinding);
           if (!finding)
             continue;
           const ruleId = findingRuleId(finding);
           const obs = {
-            schemaVersion: 1,
+            schemaVersion: OBSERVATION_SCHEMA_VERSION,
+            projectKey: context.projectKey,
             runId: context.runId,
             featureId,
             storyId,
@@ -64388,6 +64766,7 @@ async function collectFromReviewAudit(context) {
               ruleId,
               checkId: ruleId,
               severity: stringValue(finding.severity, "info"),
+              category: optionalString(finding.category),
               file: stringValue(finding.file),
               line: numberValue(finding.line, 0),
               message: findingMessage(finding)
@@ -64403,6 +64782,7 @@ async function collectFromReviewAudit(context) {
 async function collectFromContextManifests(context) {
   const observations = [];
   const featuresDir = path18.join(context.workdir, ".nax", "features");
+  let skippedManifests = 0;
   try {
     const glob = new Bun.Glob("*/stories/*/context-manifest-*.json");
     for await (const file3 of glob.scan({ cwd: featuresDir, absolute: false })) {
@@ -64411,15 +64791,21 @@ async function collectFromContextManifests(context) {
         const parts = file3.split("/");
         const featureId = parts[0] ?? context.feature;
         const storyId = parts[2] ?? "unknown";
+        if (!await writtenThisRun(fullPath, context.runStartedAt)) {
+          skippedManifests += 1;
+          continue;
+        }
         const manifest = asRecord3(await readJsonFile(fullPath));
         if (!manifest)
           continue;
         const ts = now();
         const chunkSummaries = asRecord3(manifest.chunkSummaries) ?? {};
+        const chunkTokens = asRecord3(manifest.chunkTokens) ?? {};
         for (const chunkId of asArray(manifest.includedChunks)) {
           const id = String(chunkId);
           const obs = {
-            schemaVersion: 1,
+            schemaVersion: OBSERVATION_SCHEMA_VERSION,
+            projectKey: context.projectKey,
             runId: context.runId,
             featureId,
             storyId,
@@ -64429,7 +64815,7 @@ async function collectFromContextManifests(context) {
             payload: {
               chunkId: id,
               label: stringValue(chunkSummaries[id], id),
-              tokens: 0
+              tokens: numberValue(chunkTokens[id], 0)
             }
           };
           observations.push(obs);
@@ -64440,7 +64826,8 @@ async function collectFromContextManifests(context) {
             continue;
           const id = stringValue(excluded.id, "unknown");
           const obs = {
-            schemaVersion: 1,
+            schemaVersion: OBSERVATION_SCHEMA_VERSION,
+            projectKey: context.projectKey,
             runId: context.runId,
             featureId,
             storyId,
@@ -64460,7 +64847,8 @@ async function collectFromContextManifests(context) {
           if (!provider || stringValue(provider.status) !== "empty")
             continue;
           const obs = {
-            schemaVersion: 1,
+            schemaVersion: OBSERVATION_SCHEMA_VERSION,
+            projectKey: context.projectKey,
             runId: context.runId,
             featureId,
             storyId,
@@ -64491,7 +64879,8 @@ function entryFeatureId(context, entry, data) {
 function collectPullCall(context, entry, data) {
   const toolName = stringValue(data.tool ?? data.toolName, "unknown");
   return {
-    schemaVersion: 1,
+    schemaVersion: OBSERVATION_SCHEMA_VERSION,
+    projectKey: context.projectKey,
     runId: context.runId,
     featureId: entryFeatureId(context, entry, data),
     storyId: entryStoryId(entry, data),
@@ -64510,7 +64899,8 @@ function collectPullCall(context, entry, data) {
 }
 function collectAcceptanceVerdict(context, entry, data) {
   return {
-    schemaVersion: 1,
+    schemaVersion: OBSERVATION_SCHEMA_VERSION,
+    projectKey: context.projectKey,
     runId: context.runId,
     featureId: entryFeatureId(context, entry, data),
     storyId: entryStoryId(entry, data),
@@ -64528,7 +64918,8 @@ function collectAcceptanceVerdict(context, entry, data) {
 }
 function collectRectify(context, entry, data) {
   return {
-    schemaVersion: 1,
+    schemaVersion: OBSERVATION_SCHEMA_VERSION,
+    projectKey: context.projectKey,
     runId: context.runId,
     featureId: entryFeatureId(context, entry, data),
     storyId: entryStoryId(entry, data),
@@ -64543,7 +64934,8 @@ function collectRectify(context, entry, data) {
 }
 function collectEscalation(context, entry, data) {
   return {
-    schemaVersion: 1,
+    schemaVersion: OBSERVATION_SCHEMA_VERSION,
+    projectKey: context.projectKey,
     runId: context.runId,
     featureId: entryFeatureId(context, entry, data),
     storyId: entryStoryId(entry, data),
@@ -64559,7 +64951,8 @@ function collectEscalation(context, entry, data) {
 function collectFixCycleIteration(context, entry, data) {
   const outcome = optionalString(data.outcome);
   return {
-    schemaVersion: 1,
+    schemaVersion: OBSERVATION_SCHEMA_VERSION,
+    projectKey: context.projectKey,
     runId: context.runId,
     featureId: entryFeatureId(context, entry, data),
     storyId: entryStoryId(entry, data),
@@ -64579,7 +64972,8 @@ function collectFixCycleIteration(context, entry, data) {
 }
 function collectFixCycleExit(context, entry, data) {
   return {
-    schemaVersion: 1,
+    schemaVersion: OBSERVATION_SCHEMA_VERSION,
+    projectKey: context.projectKey,
     runId: context.runId,
     featureId: entryFeatureId(context, entry, data),
     storyId: entryStoryId(entry, data),
@@ -64594,7 +64988,8 @@ function collectFixCycleExit(context, entry, data) {
 }
 function collectFixCycleRetry(context, entry, data) {
   return {
-    schemaVersion: 1,
+    schemaVersion: OBSERVATION_SCHEMA_VERSION,
+    projectKey: context.projectKey,
     runId: context.runId,
     featureId: entryFeatureId(context, entry, data),
     storyId: entryStoryId(entry, data),
@@ -64648,6 +65043,7 @@ async function collectObservations(context) {
   ]);
   return [...metricsObs, ...auditObs, ...manifestObs, ...jsonlObs];
 }
+var OBSERVATION_SCHEMA_VERSION = 3;
 var init_collect = () => {};
 
 // src/plugins/builtin/curator/heuristics.ts
@@ -64664,6 +65060,12 @@ function mergeThresholds(thresholds) {
 function uniqueStoryIds(storyIds) {
   return [...new Set(storyIds)];
 }
+function crossFeatureKey(category, message) {
+  return `${category ?? ""}|${normalizeIssueText(message).slice(0, CROSS_FEATURE_MESSAGE_PREFIX)}`;
+}
+function truncate3(s, max) {
+  return s.length > max ? `${s.slice(0, max - 1)}\u2026` : s;
+}
 function firstLine2(message) {
   return message.split(`
 `)[0] ?? message;
@@ -64672,37 +65074,45 @@ function h1RepeatedReviewFinding(observations, threshold) {
   const findings = observations.filter((o) => o.kind === "review-finding");
   const groups = new Map;
   for (const obs of findings) {
-    const ruleId = obs.payload.ruleId;
-    const message = obs.payload.message;
-    const existing = groups.get(ruleId);
-    if (existing) {
-      existing.storyIds.push(obs.storyId);
-      const sampleKey = firstLine2(message);
-      if (existing.samples.length < 2 && sampleKey && !existing.samples.includes(sampleKey)) {
-        existing.samples.push(sampleKey);
-      }
-    } else {
-      const sampleKey = firstLine2(message);
-      groups.set(ruleId, { storyIds: [obs.storyId], samples: sampleKey ? [sampleKey] : [] });
+    const { file: file3, category, message } = obs.payload;
+    if (!file3 && !category)
+      continue;
+    const key = crossFeatureKey(category, message);
+    let group = groups.get(key);
+    if (!group) {
+      group = { featureIds: new Set, sites: new Set, files: new Set, samples: [] };
+      groups.set(key, group);
+      group.category = category;
     }
+    group.featureIds.add(obs.featureId);
+    group.sites.add(`${obs.featureId}/${obs.storyId}`);
+    if (file3)
+      group.files.add(file3);
+    const sample = firstLine2(message);
+    if (sample && group.samples.length < 2 && !group.samples.includes(sample))
+      group.samples.push(sample);
   }
   const proposals = [];
-  for (const [ruleId, { storyIds, samples }] of groups.entries()) {
-    if (storyIds.length < threshold)
+  for (const group of groups.values()) {
+    const featureCount = group.featureIds.size;
+    if (featureCount < threshold)
       continue;
-    const count = storyIds.length;
-    const severity2 = count >= 4 ? "HIGH" : "MED";
-    const unique = uniqueStoryIds(storyIds);
-    const sampleSection = samples.length > 0 ? `
-  Examples: ${samples.join(" | ")}` : "";
+    const features = [...group.featureIds];
+    const sites = [...group.sites];
+    const files = [...group.files];
+    const gist = group.samples[0] ? truncate3(group.samples[0], DESCRIPTION_GIST_CHARS) : "(no description)";
+    const categoryLabel = group.category ? `${group.category}: ` : "";
+    const fileSection = files.length > 0 ? ` Files: ${files.slice(0, MAX_EVIDENCE_FILES).join(", ")}.` : "";
+    const sampleSection = group.samples.length > 0 ? `
+  Examples: ${group.samples.join(" | ")}` : "";
     proposals.push({
       id: "H1",
-      severity: severity2,
+      severity: featureCount >= threshold * HIGH_SEVERITY_MULTIPLE ? "HIGH" : "MED",
       target: { canonicalFile: ".nax/rules/curator-suggestions.md", action: "add" },
-      description: `Repeated review finding: ${ruleId} appeared ${count}x across stories`,
-      evidence: `Rule ${ruleId} fired ${count}\xD7 in stories: ${unique.join(", ")}${sampleSection}`,
+      description: `Recurring across ${featureCount} features \u2014 ${categoryLabel}${gist}`,
+      evidence: `Seen in ${featureCount} features: ${features.join(", ")} (sites: ${sites.join(", ")}).${fileSection}${sampleSection}`,
       sourceKinds: ["review-finding"],
-      storyIds: unique
+      storyIds: sites
     });
   }
   return proposals;
@@ -64873,8 +65283,9 @@ function runHeuristics(observations, thresholds) {
     ...h6FixCycleUnchanged(observations, t.unchangedOutcome)
   ];
 }
-var DEFAULT_THRESHOLDS2;
+var DEFAULT_THRESHOLDS2, HIGH_SEVERITY_MULTIPLE = 2, DESCRIPTION_GIST_CHARS = 90, MAX_EVIDENCE_FILES = 4, CROSS_FEATURE_MESSAGE_PREFIX = 48;
 var init_heuristics = __esm(() => {
+  init_review();
   DEFAULT_THRESHOLDS2 = {
     repeatedFinding: 2,
     emptyKeyword: 2,
@@ -64947,7 +65358,7 @@ function renderProposals(proposals, runId, observationCount) {
         const storyList = p.storyIds.join(", ");
         lines.push(`- [ ] [${p.severity}] ${p.id}: ${p.description} \u2014 stories: ${storyList}`);
         if (p.evidence) {
-          lines.push(`  _Evidence: ${p.evidence}_`);
+          lines.push(`  _Evidence: ${p.evidence.replace(/\s*\n\s*/g, " \xB7 ")}_`);
         }
       }
       lines.push("");
@@ -64957,6 +65368,26 @@ function renderProposals(proposals, runId, observationCount) {
 `);
 }
 
+// src/plugins/builtin/curator/jsonl-stream.ts
+async function* streamJsonlLines(file3) {
+  const decoder = new TextDecoder;
+  let carry = "";
+  for await (const chunk of file3.stream()) {
+    carry += decoder.decode(chunk, { stream: true });
+    let nl = carry.indexOf(`
+`);
+    while (nl !== -1) {
+      yield carry.slice(0, nl);
+      carry = carry.slice(nl + 1);
+      nl = carry.indexOf(`
+`);
+    }
+  }
+  carry += decoder.decode();
+  if (carry.length > 0)
+    yield carry;
+}
+
 // src/plugins/builtin/curator/rollup.ts
 import { appendFile as appendFile3, mkdir as mkdir9, writeFile } from "fs/promises";
 import * as path19 from "path";
@@ -64977,7 +65408,72 @@ async function appendToRollup(observations, rollupPath) {
     await appendFile3(rollupPath, newLines);
   } catch {}
 }
-var init_rollup = () => {};
+function emptyWindow() {
+  return { observations: [], runIds: [], truncated: false, unattributedRows: 0 };
+}
+async function parseTail(file3, startedMidFile, projectKey) {
+  const observations = [];
+  let unattributed = 0;
+  let first = true;
+  for await (const line of streamJsonlLines(file3)) {
+    if (first) {
+      first = false;
+      if (startedMidFile)
+        continue;
+    }
+    if (!line.trim())
+      continue;
+    try {
+      const obs = JSON.parse(line);
+      if (obs.projectKey === projectKey)
+        observations.push(obs);
+      else if (!obs.projectKey)
+        unattributed += 1;
+    } catch {}
+  }
+  return { observations, unattributed };
+}
+function newestRunIds(observations, windowRuns) {
+  const keep = new Set;
+  for (let i = observations.length - 1;i >= 0 && keep.size < windowRuns; i -= 1) {
+    const runId = observations[i]?.runId;
+    if (runId)
+      keep.add(runId);
+  }
+  return keep;
+}
+async function readHeuristicWindow(rollupPath, windowRuns, options) {
+  const maxTail = Math.max(1, options.maxTailBytes ?? MAX_WINDOW_TAIL_BYTES);
+  try {
+    const file3 = Bun.file(rollupPath);
+    if (!await file3.exists())
+      return emptyWindow();
+    const size = file3.size;
+    let tail = Math.max(1, Math.min(options.tailBytes ?? INITIAL_WINDOW_TAIL_BYTES, maxTail));
+    while (true) {
+      const start = Math.max(0, size - tail);
+      const { observations, unattributed } = await parseTail(start > 0 ? file3.slice(start) : file3, start > 0, options.projectKey);
+      const keep = newestRunIds(observations, windowRuns);
+      const exhausted = start === 0;
+      if (keep.size >= windowRuns || exhausted || tail >= maxTail) {
+        return {
+          observations: observations.filter((o) => keep.has(o.runId)),
+          runIds: [...keep],
+          truncated: keep.size < windowRuns && !exhausted,
+          unattributedRows: unattributed
+        };
+      }
+      tail = Math.max(1, Math.min(tail * 2, maxTail));
+    }
+  } catch {
+    return emptyWindow();
+  }
+}
+var INITIAL_WINDOW_TAIL_BYTES, MAX_WINDOW_TAIL_BYTES;
+var init_rollup = __esm(() => {
+  INITIAL_WINDOW_TAIL_BYTES = 8 * 1024 * 1024;
+  MAX_WINDOW_TAIL_BYTES = 64 * 1024 * 1024;
+});
 
 // src/plugins/builtin/curator/index.ts
 import { mkdir as mkdir10 } from "fs/promises";
@@ -65022,11 +65518,12 @@ function getCuratorThresholds(context) {
     unchangedOutcome: raw.unchangedOutcome ?? DEFAULT_THRESHOLDS3.unchangedOutcome
   };
 }
-var PLUGIN_NAME3 = "nax-curator", PLUGIN_VERSION3 = "0.1.0", DEFAULT_THRESHOLDS3, curatorAction, curatorPlugin;
+var PLUGIN_NAME3 = "nax-curator", PLUGIN_VERSION3 = "0.1.0", DEFAULT_THRESHOLDS3, curatorAction, HEURISTIC_WINDOW_RUNS = 20, curatorPlugin;
 var init_curator = __esm(() => {
   init_collect();
   init_heuristics();
   init_rollup();
+  init_rollup();
   DEFAULT_THRESHOLDS3 = {
     repeatedFinding: 2,
     emptyKeyword: 2,
@@ -65059,12 +65556,22 @@ var init_curator = __esm(() => {
           await Bun.write(observationsPath, observations.map((o) => JSON.stringify(o)).join(`
 `) + (observations.length > 0 ? `
 ` : ""));
+          await appendToRollup(observations, rollupPath);
           const thresholds = getCuratorThresholds(context);
-          const proposals = runHeuristics(observations, thresholds);
+          const window2 = await readHeuristicWindow(rollupPath, HEURISTIC_WINDOW_RUNS, {
+            projectKey: curatorContext.projectKey
+          });
+          if (window2.truncated) {
+            context.logger.warn("Curator window truncated at the byte ceiling", {
+              runsFound: window2.runIds.length,
+              runsRequested: HEURISTIC_WINDOW_RUNS,
+              unattributedRows: window2.unattributedRows
+            });
+          }
+          const proposals = runHeuristics(window2.observations.length > 0 ? window2.observations : observations, thresholds);
           const markdown = renderProposals(proposals, context.runId, observations.length);
           const proposalsMdPath = path20.join(runDir, "curator-proposals.md");
           await Bun.write(proposalsMdPath, markdown);
-          await appendToRollup(observations, rollupPath);
         }
         return {
           success: true,
@@ -65097,15 +65604,21 @@ function selectFinish(config2) {
     return;
   return finishConfigSelector.select(config2)?.finish;
 }
+function resolveFlowAgent(config2, explicit) {
+  if (typeof explicit === "string" && explicit.length > 0)
+    return explicit;
+  return resolveDefaultAgent(config2 ?? {});
+}
 function getFinishAutoFlowConfig(ctx) {
   const autoFlow = selectFinish(ctx.config)?.autoFlow;
   if (!autoFlow)
-    return DEFAULT_FINISH_AUTO_FLOW_CONFIG;
+    return { ...DEFAULT_FINISH_AUTO_FLOW_CONFIG, defaultAgent: resolveFlowAgent(ctx.config, null) };
   const defaults = DEFAULT_FINISH_AUTO_FLOW_CONFIG;
   return {
     enabled: autoFlow.enabled === true,
     flowPath: autoFlow.flowPath ?? defaults.flowPath,
-    defaultAgent: autoFlow.defaultAgent ?? null,
+    defaultAgent: resolveFlowAgent(ctx.config, autoFlow.defaultAgent),
+    model: autoFlow.model ?? null,
     reviewers: {
       spec: autoFlow.reviewers?.spec ?? null,
       quality: autoFlow.reviewers?.quality ?? null
@@ -65129,11 +65642,12 @@ function telegramCreds(config2) {
 }
 var DEFAULT_FINISH_AUTO_FLOW_CONFIG;
 var init_config2 = __esm(() => {
+  init_agents();
   init_config();
   DEFAULT_FINISH_AUTO_FLOW_CONFIG = {
     enabled: false,
     flowPath: "flows/nax-finish/nax-finish.flow.ts",
-    defaultAgent: null,
+    model: null,
     reviewers: { spec: null, quality: null },
     escalate: { telegram: true },
     notify: { mode: "escalation" },
@@ -65228,14 +65742,21 @@ async function defaultRun2(cmd, opts) {
       clearTimeout(timer);
   }
 }
-async function defaultReadResult(workdir) {
-  const f = Bun.file(path21.join(workdir, ".nax", "nax-finish-result.json"));
+function finishAuditDir(ctx) {
+  const root = ctx.outputDir ?? path21.join(ctx.workdir, ".nax");
+  return path21.join(root, "finish-audit", ctx.feature);
+}
+function finishResultPath(ctx, runId) {
+  return path21.join(finishAuditDir(ctx), `${runId}.result.json`);
+}
+async function defaultReadResult(resultPath) {
+  const f = Bun.file(resultPath);
   if (!await f.exists())
     return null;
   return JSON.parse(await f.text());
 }
-async function defaultClearResult(workdir) {
-  const file3 = Bun.file(path21.join(workdir, ".nax", "nax-finish-result.json"));
+async function defaultClearResult(resultPath) {
+  const file3 = Bun.file(resultPath);
   if (await file3.exists())
     await file3.delete();
 }
@@ -65260,18 +65781,19 @@ async function resolveFlowPath(workdir, flowPath, deps = _naxFinishDeps) {
   }
   return null;
 }
-function buildFlowArgv(flowPath, inputJson, defaultAgent, stepMs) {
-  const stepTimeout = stepMs && stepMs > 0 ? ["--timeout", String(Math.ceil(stepMs / 1000))] : [];
+function buildFlowArgv(flowPath, inputJson, opts = {}) {
+  const stepTimeout = opts.stepMs && opts.stepMs > 0 ? ["--timeout", String(Math.ceil(opts.stepMs / 1000))] : [];
   return [
     "acpx",
     "--approve-all",
     ...stepTimeout,
+    ...opts.model ? ["--model", opts.model] : [],
     "flow",
     "run",
     flowPath,
     "--input-json",
     inputJson,
-    ...defaultAgent ? ["--default-agent", defaultAgent] : []
+    ...opts.defaultAgent ? ["--default-agent", opts.defaultAgent] : []
   ];
 }
 function buildFlowEnv(cfg) {
@@ -65309,22 +65831,29 @@ async function executeFinishFlow(options) {
       escalateTelegram
     };
   }
-  await _naxFinishDeps.clearResult(ctx.workdir);
+  const resultPath = finishResultPath(ctx, ctx.runId);
+  await _naxFinishDeps.clearResult(resultPath);
   const input = {
     feature: ctx.feature,
     workdir: ctx.workdir,
     branch: ctx.branch,
     prdPath: ctx.prdPath,
+    auditDir: finishAuditDir(ctx),
+    runId: ctx.runId,
     escalateTelegram,
     timeouts: { acceptanceMs: cfg.timeouts.acceptanceMs, gateMs: cfg.timeouts.gateMs }
   };
-  const cmd = buildFlowArgv(flowPath, JSON.stringify(input), cfg.defaultAgent, cfg.timeouts.stepMs);
+  const cmd = buildFlowArgv(flowPath, JSON.stringify(input), {
+    defaultAgent: cfg.defaultAgent,
+    stepMs: cfg.timeouts.stepMs,
+    model: cfg.model
+  });
   const res = await _naxFinishDeps.run(cmd, {
     cwd: ctx.workdir,
     env: buildFlowEnv(cfg),
     timeoutMs: cfg.timeouts.flowMs
   });
-  const result = await _naxFinishDeps.readResult(ctx.workdir);
+  const result = await _naxFinishDeps.readResult(resultPath);
   if (!result)
     return missingResultOutcome(ctx, res, escalateTelegram);
   return {
@@ -65702,7 +66231,7 @@ function startHeartbeat(opts) {
   let stopped = false;
   let timer;
   const armTimer = () => {
-    timer = setTimeout(() => {
+    timer = _heartbeatDeps.setTimeout(() => {
       try {
         Promise.resolve(onTick(getSnapshot())).catch((err) => getSafeLogger()?.warn(STAGE2, "Heartbeat tick failed", {
           error: err instanceof Error ? err.message : String(err)
@@ -65721,7 +66250,7 @@ function startHeartbeat(opts) {
     stop() {
       stopped = true;
       if (timer !== undefined)
-        clearTimeout(timer);
+        _heartbeatDeps.clearTimeout(timer);
     }
   };
 }
@@ -65765,10 +66294,14 @@ function buildHeartbeatMetricsPayload(p) {
     ]
   };
 }
-var STAGE2 = "otel-reporter-heartbeat";
+var STAGE2 = "otel-reporter-heartbeat", _heartbeatDeps;
 var init_heartbeat = __esm(() => {
   init_logger2();
   init_otlp();
+  _heartbeatDeps = {
+    setTimeout: (fn, ms) => setTimeout(fn, ms),
+    clearTimeout: (id) => clearTimeout(id)
+  };
 });
 
 // src/plugins/builtin/otel-reporter/ids.ts
@@ -65798,7 +66331,7 @@ function toLogRecord(entry) {
   const nonScalars = {};
   for (const [key, value] of Object.entries(data)) {
     if (typeof value === "string") {
-      attributes.push(attr(`nax.data.${key}`, truncate3(value)));
+      attributes.push(attr(`nax.data.${key}`, truncate4(value)));
     } else if (typeof value === "number") {
       if (Number.isFinite(value)) {
         attributes.push(attr(`nax.data.${key}`, value));
@@ -65812,7 +66345,7 @@ function toLogRecord(entry) {
     }
   }
   if (Object.keys(nonScalars).length > 0) {
-    attributes.push(attr("nax.data_json", truncate3(JSON.stringify(nonScalars))));
+    attributes.push(attr("nax.data_json", truncate4(JSON.stringify(nonScalars))));
   }
   return {
     body: { stringValue: entry.message },
@@ -65835,7 +66368,7 @@ function buildLogsPayload(entries, resource) {
     ]
   };
 }
-function truncate3(value) {
+function truncate4(value) {
   if (value.length <= DATA_JSON_MAX)
     return value;
   const marker = TRUNCATION_MARKER;
@@ -66803,11 +67336,11 @@ function getSafeLogger6() {
   return getSafeLogger();
 }
 function extractPluginName(pluginPath) {
-  const basename12 = path22.basename(pluginPath);
-  if (basename12 === "index.ts" || basename12 === "index.js" || basename12 === "index.mjs") {
+  const basename13 = path22.basename(pluginPath);
+  if (basename13 === "index.ts" || basename13 === "index.js" || basename13 === "index.mjs") {
     return path22.basename(path22.dirname(pluginPath));
   }
-  return basename12.replace(/\.(ts|js|mjs)$/, "");
+  return basename13.replace(/\.(ts|js|mjs)$/, "");
 }
 async function loadPlugins(globalDir, projectDir, configPlugins, projectRoot, disabledPlugins, isTestFileFn, reporters) {
   const loadedPlugins = [];
@@ -67480,9 +68013,9 @@ var init_hooks = __esm(() => {
 // src/execution/crash-heartbeat.ts
 import { appendFileSync as appendFileSync2 } from "fs";
 async function heartbeatLoop(gen, statusWriter, getTotalCost, getIterations, jsonlFilePath) {
-  const logger = _heartbeatDeps.getSafeLogger();
+  const logger = _heartbeatDeps2.getSafeLogger();
   while (gen === _heartbeatGen && _heartbeatActive) {
-    await _heartbeatDeps.sleep(60000);
+    await _heartbeatDeps2.sleep(60000);
     if (gen !== _heartbeatGen || !_heartbeatActive)
       break;
     try {
@@ -67511,11 +68044,11 @@ async function heartbeatLoop(gen, statusWriter, getTotalCost, getIterations, jso
   }
 }
 function startHeartbeat2(statusWriter, getTotalCost, getIterations, jsonlFilePath) {
-  const logger = _heartbeatDeps.getSafeLogger();
+  const logger = _heartbeatDeps2.getSafeLogger();
   _heartbeatActive = true;
   const gen = ++_heartbeatGen;
   heartbeatLoop(gen, statusWriter, getTotalCost, getIterations, jsonlFilePath).catch((err) => {
-    _heartbeatDeps.getSafeLogger()?.warn("crash-recovery", "Heartbeat loop crashed; status updates stopped", {
+    _heartbeatDeps2.getSafeLogger()?.warn("crash-recovery", "Heartbeat loop crashed; status updates stopped", {
       error: err instanceof Error ? err.message : String(err)
     });
   });
@@ -67528,10 +68061,10 @@ function stopHeartbeat() {
     getSafeLogger()?.debug("crash-recovery", "Heartbeat stopped");
   }
 }
-var _heartbeatDeps, _heartbeatGen = 0, _heartbeatActive = false;
+var _heartbeatDeps2, _heartbeatGen = 0, _heartbeatActive = false;
 var init_crash_heartbeat = __esm(() => {
   init_logger2();
-  _heartbeatDeps = {
+  _heartbeatDeps2 = {
     sleep: async (ms) => Bun.sleep(ms),
     getSafeLogger
   };
@@ -68306,6 +68839,7 @@ function buildAcceptanceContext(ctx, prd) {
     agentManager: ctx.agentManager,
     sessionManager: ctx.sessionManager,
     acceptanceTestPaths: ctx.acceptanceTestPaths,
+    acceptanceRetries: ctx.acceptanceRetries ?? 0,
     runtime: ctx.runtime,
     abortSignal: ctx.abortSignal
   };
@@ -68402,8 +68936,9 @@ async function runAcceptanceLoop(ctx) {
   logger?.info("acceptance", "All stories complete, running acceptance validation");
   const { acceptanceStage: acceptanceStage2 } = await _runAcceptanceTestsOnceDeps.importAcceptanceStage();
   while (acceptanceRetries < maxRetries) {
+    const attemptCtx = { ...ctx, acceptanceRetries };
     const firstStory = prd.userStories[0];
-    const acceptanceContext = buildAcceptanceContext(ctx, prd);
+    const acceptanceContext = buildAcceptanceContext(attemptCtx, prd);
     const acceptanceResult = await acceptanceStage2.execute(acceptanceContext);
     if (acceptanceResult.action === "continue") {
       logger?.info("acceptance", "Acceptance validation passed!");
@@ -68494,17 +69029,14 @@ async function runAcceptanceLoop(ctx) {
         confidence: diagnosis.confidence,
         attempt: acceptanceRetries
       });
-      const cycleResult = await runAcceptanceFixCycle(ctx, prd, pkgFailures, diagnosis, effectivePath, testCommand, {
-        packageDir: pkg.packageDir,
-        testPath: effectivePath
-      });
+      const cycleResult = await runAcceptanceFixCycle(attemptCtx, prd, pkgFailures, diagnosis, effectivePath, testCommand, { packageDir: pkg.packageDir, testPath: effectivePath });
       totalCost2 += cycleResult.costUsd ?? 0;
       totalInternalIterations += cycleResult.iterations.length;
       const pkgResolved = cycleResult.exitReason === "resolved" || cycleResult.finalFindings.length === 0;
       if (!pkgResolved)
         remainingFindings.push(...cycleResult.finalFindings);
     }
-    const finalCheck = await runAcceptanceTestsOnce(ctx, prd);
+    const finalCheck = await runAcceptanceTestsOnce(attemptCtx, prd);
     const success2 = finalCheck.passed && remainingFindings.length === 0;
     const failureMessages = !success2 ? finalCheck.failedACs.length > 0 ? finalCheck.failedACs : remainingFindings.length > 0 ? remainingFindings.map((f) => f.message) : ["acceptance validation failed (unknown cause)"] : undefined;
     return buildResult(success2, prd, totalCost2, iterations, storiesCompleted, prdDirty, failureMessages, acceptanceRetries + totalInternalIterations);
@@ -69812,10 +70344,10 @@ var init_ensure_package_dirs = __esm(() => {
 
 // src/pipeline/subscribers/events-writer.ts
 import { appendFile as appendFile5, mkdir as mkdir13 } from "fs/promises";
-import { basename as basename15, join as join86 } from "path";
+import { basename as basename16, join as join86 } from "path";
 function wireEventsWriter(bus, feature, runId, workdir) {
   const logger = getSafeLogger();
-  const project = basename15(workdir);
+  const project = basename16(workdir);
   const eventsDir = join86(getEventsRootDir(), project);
   const eventsFile = join86(eventsDir, "events.jsonl");
   let dirReady = false;
@@ -69998,10 +70530,10 @@ var init_interaction2 = __esm(() => {
 
 // src/pipeline/subscribers/registry.ts
 import { mkdir as mkdir14, writeFile as writeFile2 } from "fs/promises";
-import { basename as basename16, join as join87 } from "path";
+import { basename as basename17, join as join87 } from "path";
 function wireRegistry(bus, feature, runId, workdir, outputDir) {
   const logger = getSafeLogger();
-  const project = basename16(workdir);
+  const project = basename17(workdir);
   const runDir = join87(getRunsDir(), `${project}-${feature}-${runId}`);
   const metaFile = join87(runDir, "meta.json");
   const unsub = bus.on("run:started", (_ev) => {
@@ -73921,7 +74453,8 @@ function buildPostRunContext(opts, durationMs, logger) {
     projectKey,
     curatorRollupPath: curatorRollupPath2,
     logFilePath,
-    config: config2
+    config: config2,
+    startTime
   } = opts;
   const counts = countStories(prd);
   return {
@@ -73932,6 +74465,7 @@ function buildPostRunContext(opts, durationMs, logger) {
     branch,
     version: version2,
     totalDurationMs: durationMs,
+    runStartedAt: startTime,
     totalCost: totalCost2,
     storySummary: {
       completed: storiesCompleted,
@@ -103897,6 +104431,88 @@ var init_bakeoff = __esm(() => {
   init_report2();
 });
 
+// src/plugins/builtin/curator/rollup-prune.ts
+import { rename as rename4, unlink as unlink4, writeFile as writeFile3 } from "fs/promises";
+import { appendFile as appendFile6 } from "fs/promises";
+async function scanProjectRunIds(rollupPath, projectKey) {
+  const maxTsByRunId = new Map;
+  for await (const line of streamJsonlLines(Bun.file(rollupPath))) {
+    if (!line.trim())
+      continue;
+    let obs;
+    try {
+      obs = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    if (obs.projectKey !== projectKey)
+      continue;
+    const existing = maxTsByRunId.get(obs.runId);
+    if (existing === undefined || obs.ts > existing)
+      maxTsByRunId.set(obs.runId, obs.ts);
+  }
+  return [...maxTsByRunId.entries()].sort((a, b) => a[1] > b[1] ? -1 : a[1] < b[1] ? 1 : 0).map(([runId]) => runId);
+}
+async function pruneRollup(input) {
+  const { rollupPath, projectKey, keepRunIds, dropUnattributed = false } = input;
+  const tmpPath = `${rollupPath}.gc-tmp`;
+  const result2 = { kept: 0, dropped: 0, keptOtherProjects: 0, keptUnattributed: 0 };
+  let buffer = "";
+  const flush = async () => {
+    if (buffer.length === 0)
+      return;
+    await appendFile6(tmpPath, buffer);
+    buffer = "";
+  };
+  try {
+    await writeFile3(tmpPath, "");
+    for await (const line of streamJsonlLines(Bun.file(rollupPath))) {
+      if (!line.trim())
+        continue;
+      let obs = null;
+      try {
+        obs = JSON.parse(line);
+      } catch {
+        obs = null;
+      }
+      let keep;
+      if (obs === null) {
+        keep = !dropUnattributed;
+        if (keep)
+          result2.keptUnattributed++;
+      } else if (obs.projectKey === undefined) {
+        keep = !dropUnattributed;
+        if (keep)
+          result2.keptUnattributed++;
+      } else if (obs.projectKey !== projectKey) {
+        keep = true;
+        result2.keptOtherProjects++;
+      } else {
+        keep = keepRunIds.has(obs.runId);
+      }
+      if (!keep) {
+        result2.dropped++;
+        continue;
+      }
+      result2.kept++;
+      buffer += `${line}
+`;
+      if (buffer.length >= FLUSH_BYTES)
+        await flush();
+    }
+    await flush();
+    await rename4(tmpPath, rollupPath);
+  } catch (err) {
+    await unlink4(tmpPath).catch(() => {});
+    throw err;
+  }
+  return result2;
+}
+var FLUSH_BYTES;
+var init_rollup_prune = __esm(() => {
+  FLUSH_BYTES = 4 * 1024 * 1024;
+});
+
 // src/commands/curator.ts
 var exports_curator = {};
 __export(exports_curator, {
@@ -103904,14 +104520,12 @@ __export(exports_curator, {
   curatorGc: () => curatorGc,
   curatorDryrun: () => curatorDryrun,
   curatorCommit: () => curatorCommit,
+  _testing: () => _testing,
   _curatorCmdDeps: () => _curatorCmdDeps
 });
 import { readdirSync as readdirSync9 } from "fs";
-import { unlink as unlink4 } from "fs/promises";
-import { basename as basename18, join as join100 } from "path";
-function getProjectKey(config2, projectDir) {
-  return config2.name?.trim() || basename18(projectDir);
-}
+import { unlink as unlink5 } from "fs/promises";
+import { join as join100 } from "path";
 function listRunIds(runsDir) {
   try {
     return readdirSync9(runsDir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name).sort();
@@ -104153,34 +104767,25 @@ async function curatorGc(options) {
   const config2 = await _curatorCmdDeps.loadConfig(resolved.projectDir);
   const gDir = _curatorCmdDeps.globalOutputDir();
   const rollupPath = _curatorCmdDeps.curatorRollupPath(gDir, config2.curator?.rollupPath);
-  const rollupText = await _curatorCmdDeps.readFile(rollupPath).catch(() => null);
-  if (rollupText === null) {
+  if (!await _curatorCmdDeps.fileExists(rollupPath)) {
     console.log(`[gc] No rollup file found at ${rollupPath}. Nothing to prune.`);
     return;
   }
-  const lines = rollupText.trim().split(`
-`).filter(Boolean);
-  const observations = lines.map((l) => JSON.parse(l));
-  const maxTsByRunId = new Map;
-  for (const obs of observations) {
-    const existing = maxTsByRunId.get(obs.runId);
-    if (!existing || obs.ts > existing) {
-      maxTsByRunId.set(obs.runId, obs.ts);
-    }
-  }
+  const projectKey = getProjectKey(config2, resolved.projectDir);
+  const uniqueRunIds = await _curatorCmdDeps.scanProjectRunIds(rollupPath, projectKey);
   const keep = options.keep ?? DEFAULT_KEEP;
-  const uniqueRunIds = [...maxTsByRunId.entries()].sort((a, b) => a[1] > b[1] ? -1 : a[1] < b[1] ? 1 : 0).map(([runId]) => runId);
-  if (uniqueRunIds.length <= keep) {
-    console.log(`[gc] ${uniqueRunIds.length} unique run(s) in rollup \u2014 at or below keep=${keep}. Nothing to prune.`);
+  const sweep = options.sweepUnattributed === true;
+  if (uniqueRunIds.length <= keep && !sweep) {
+    console.log(`[gc] ${uniqueRunIds.length} unique run(s) for ${projectKey} in rollup \u2014 at or below keep=${keep}. Nothing to prune.`);
     return;
   }
   const keepSet = new Set(uniqueRunIds.slice(0, keep));
-  const filtered = observations.filter((obs) => keepSet.has(obs.runId));
-  const newContent = `${filtered.map((obs) => JSON.stringify(obs)).join(`
-`)}
-`;
-  await _curatorCmdDeps.writeFile(rollupPath, newContent);
-  const projectKey = getProjectKey(config2, resolved.projectDir);
+  const result2 = await _curatorCmdDeps.pruneRollup({
+    rollupPath,
+    projectKey,
+    keepRunIds: keepSet,
+    dropUnattributed: sweep
+  });
   const outputDir = _curatorCmdDeps.projectOutputDir(projectKey, config2.outputDir);
   const perRunsDir = join100(outputDir, "runs");
   for (const runId of uniqueRunIds) {
@@ -104190,12 +104795,20 @@ async function curatorGc(options) {
       await _curatorCmdDeps.removeFile(join100(runDir, "curator-proposals.md"));
     }
   }
-  console.log(`[gc] Pruned rollup to ${keep} most recent runs (was ${uniqueRunIds.length}).`);
+  const droppedRuns = Math.max(0, uniqueRunIds.length - keepSet.size);
+  console.log(`[gc] Pruned rollup for ${projectKey}: kept ${keepSet.size} of ${uniqueRunIds.length} run(s), dropped ${result2.dropped} row(s).`);
+  console.log(`[gc] Preserved ${result2.keptOtherProjects} row(s) from other projects and ${result2.keptUnattributed} unattributed row(s).`);
+  if (!sweep && result2.keptUnattributed > 0) {
+    console.log(`[gc] ${result2.keptUnattributed} unattributed row(s) predate project scoping (#1429) and can never be read back. Run with --sweep-unattributed to drop them machine-wide.`);
+  }
+  if (droppedRuns === 0 && sweep)
+    console.log("[gc] No run-level pruning was needed; only the unattributed sweep ran.");
 }
-var _curatorCmdDeps, DEFAULT_KEEP = 50;
+var _curatorCmdDeps, _testing, DEFAULT_KEEP = 50;
 var init_curator2 = __esm(() => {
   init_config();
   init_heuristics();
+  init_rollup_prune();
   init_paths2();
   init_common();
   _curatorCmdDeps = {
@@ -104205,6 +104818,9 @@ var init_curator2 = __esm(() => {
     globalOutputDir: () => globalOutputDir(),
     curatorRollupPath: (gDir, override) => curatorRollupPath(gDir, override),
     readFile: async (p) => Bun.file(p).text(),
+    fileExists: async (p) => Bun.file(p).exists(),
+    scanProjectRunIds: (rollupPath, projectKey) => scanProjectRunIds(rollupPath, projectKey),
+    pruneRollup: (input) => pruneRollup(input),
     writeFile: async (p, content) => {
       await Bun.write(p, content);
     },
@@ -104215,7 +104831,7 @@ var init_curator2 = __esm(() => {
     },
     removeFile: async (p) => {
       try {
-        await unlink4(p);
+        await unlink5(p);
       } catch {}
     },
     openInEditor: async (filePath) => {
@@ -104226,13 +104842,14 @@ var init_curator2 = __esm(() => {
       }
     }
   };
+  _testing = { parseCheckedProposals };
 });
 
 // bin/nax.ts
 init_source();
 import { existsSync as existsSync39, mkdirSync as mkdirSync8 } from "fs";
 import { homedir as homedir3 } from "os";
-import { basename as basename19, join as join101 } from "path";
+import { basename as basename20, join as join101 } from "path";
 
 // node_modules/commander/esm.mjs
 var import__ = __toESM(require_commander(), 1);
@@ -104889,12 +105506,12 @@ init_errors();
 init_logger2();
 init_runtime();
 import { existsSync as existsSync18, readdirSync as readdirSync4 } from "fs";
-import { basename as basename9, join as join46 } from "path";
+import { basename as basename10, join as join46 } from "path";
 async function resolveOutputDir(workdir, override) {
   if (override)
     return override;
   const config2 = await loadConfig(workdir).catch(() => null);
-  const projectKey = config2?.name?.trim() || basename9(workdir);
+  const projectKey = config2?.name?.trim() || basename10(workdir);
   return projectOutputDir(projectKey, config2?.outputDir);
 }
 async function parseRunLog(logPath) {
@@ -105929,7 +106546,7 @@ async function contextInspectCommand(options) {
 init_canonical_loader();
 init_errors();
 import { mkdir as mkdir11 } from "fs/promises";
-import { basename as basename13, join as join72 } from "path";
+import { basename as basename14, join as join72 } from "path";
 var _rulesCLIDeps = {
   readFile: async (path24) => Bun.file(path24).text(),
   writeFile: async (path24, content) => {
@@ -106014,6 +106631,32 @@ function neutralizeContent(content) {
   apply(/\p{Extended_Pictographic}/gu, "");
   return { content: result.trim(), replacements };
 }
+function translateLegacyFrontmatter(content) {
+  const fm = /^---\n([\s\S]*?)\n---\n/.exec(content);
+  if (!fm?.[1])
+    return { content, translated: false };
+  const block = fm[1];
+  if (!/^paths:/m.test(block) || /^appliesTo:/m.test(block))
+    return { content, translated: false };
+  const rewritten = block.replace(/^paths:/m, "appliesTo:");
+  const head = content.slice(0, fm.index);
+  const tail = content.slice(fm.index + fm[0].length);
+  return { content: `${head}---
+${rewritten}
+---
+${tail}`, translated: true };
+}
+function withReviewNotice(content, replacements) {
+  if (replacements <= 0)
+    return content;
+  const notice = `<!-- NOTE: ${replacements} neutralization(s) applied \u2014 review before committing -->
+
+`;
+  const fm = /^---\n[\s\S]*?\n---\n/.exec(content);
+  if (!fm)
+    return notice + content;
+  return content.slice(0, fm[0].length) + notice + content.slice(fm[0].length).replace(/^\n+/, "");
+}
 async function collectMigrationSources(workdir) {
   const sources = [];
   const claudeMdPath = join72(workdir, "CLAUDE.md");
@@ -106029,7 +106672,7 @@ async function collectMigrationSources(workdir) {
     try {
       const content = await _rulesCLIDeps.readFile(filePath);
       if (content.trim()) {
-        sources.push({ sourcePath: filePath, targetFileName: basename13(filePath), content });
+        sources.push({ sourcePath: filePath, targetFileName: basename14(filePath), content });
       }
     } catch {}
   }
@@ -106060,11 +106703,9 @@ async function rulesMigrateCommand(options) {
       skipped++;
       continue;
     }
-    const { content: neutralized, replacements } = neutralizeContent(content);
-    const notice = replacements > 0 ? `<!-- NOTE: ${replacements} neutralization(s) applied \u2014 review before committing -->
-
-` : "";
-    const output = notice + neutralized;
+    const { content: scoped2 } = translateLegacyFrontmatter(content);
+    const { content: neutralized, replacements } = neutralizeContent(scoped2);
+    const output = withReviewNotice(neutralized, replacements);
     if (options.dryRun) {
       console.log(`[dry-run] Would write ${targetFileName} from ${sourcePath} (${replacements} replacements)`);
     } else {
@@ -106140,6 +106781,7 @@ async function resolveRunProfileOverride(opts) {
 }
 // src/cli/features-resolve.ts
 init_config();
+init_test_runners();
 import { existsSync as existsSync28, readdirSync as readdirSync6 } from "fs";
 import { join as join74, relative as relative17 } from "path";
 
@@ -106198,6 +106840,15 @@ async function resolveGroupCommand(repoRoot, packageDir, rootCommand) {
 }
 
 // src/cli/features-resolve.ts
+async function resolveTestPatterns(workdir) {
+  try {
+    const config2 = await loadConfig(workdir);
+    const resolved = await resolveTestFilePatterns(config2, workdir);
+    return { regex: resolved.regex.map((r) => r.source), resolution: resolved.resolution };
+  } catch {
+    return;
+  }
+}
 async function isNonEmptyFile(absolutePath) {
   if (!existsSync28(absolutePath))
     return false;
@@ -106302,6 +106953,7 @@ async function resolveFeatureSpec(name, workdir) {
         featureName: name,
         specSource: source2,
         acceptance: await resolveFeatureAcceptance(name, workdir),
+        testPatterns: await resolveTestPatterns(workdir),
         message: `resolved spec: ${source2.path}`
       };
     }
@@ -106348,6 +107000,7 @@ async function resolveFeatureSpec(name, workdir) {
       featureName: onlyName,
       specSource: source,
       acceptance: await resolveFeatureAcceptance(onlyName, workdir),
+      testPatterns: await resolveTestPatterns(workdir),
       message: `resolved spec: ${source.path}`
     };
   }
@@ -106367,7 +107020,7 @@ init_runtime();
 init_json_file();
 init_routing();
 import { mkdirSync as mkdirSync6 } from "fs";
-import { basename as basename14, join as join75 } from "path";
+import { basename as basename15, join as join75 } from "path";
 var _routingCalibrateDeps = {
   loadRunMetrics: (outputDir) => loadRunMetrics(outputDir),
   readConfig: (workdir) => loadConfig(workdir),
@@ -106425,7 +107078,7 @@ async function runRoutingCalibrateCli(options, deps = _routingCalibrateDeps) {
 function resolveOutputDir2(workdir, override, prior) {
   if (override)
     return override;
-  const key = prior?.name?.trim() || basename14(workdir);
+  const key = prior?.name?.trim() || basename15(workdir);
   return projectOutputDir(key, prior?.outputDir);
 }
 function mergeComplexityRouting(prior, adjustments) {
@@ -107411,7 +108064,7 @@ init_errors();
 init_checkpoint();
 init_runtime();
 import { existsSync as existsSync37 } from "fs";
-import { basename as basename17, join as join95 } from "path";
+import { basename as basename18, join as join95 } from "path";
 async function defaultCheckpointExists(featureDir) {
   if (!featureDir || !existsSync37(featureDir))
     return false;
@@ -107490,7 +108143,7 @@ function registerResumeCommand(program2) {
         const globalNaxDir = globalConfigDir();
         const hooks = await loadHooksConfig2(naxDir, globalNaxDir);
         applyResumeModeDeps2(opts.featureDir ?? "", "auto");
-        const projectKey = config2.name?.trim() || basename17(cmdOpts.dir);
+        const projectKey = config2.name?.trim() || basename18(cmdOpts.dir);
         const outputDir = projectOutputDir(projectKey, config2.outputDir);
         const statusFilePath = join95(outputDir, "status.json");
         const result = await run2({
@@ -115941,7 +116594,7 @@ program2.command("run").description("Run the orchestration loop for a feature").
     process.exit(1);
   }
   resetLogger();
-  const projectKey = config2.name?.trim() || basename19(workdir);
+  const projectKey = config2.name?.trim() || basename20(workdir);
   const outputDir = projectOutputDir(projectKey, config2.outputDir);
   const runsDir = join101(outputDir, "features", options.feature, "runs");
   mkdirSync8(runsDir, { recursive: true });
@@ -116562,12 +117215,13 @@ curator.command("dryrun").description("Re-run heuristics on an existing observat
     process.exit(1);
   }
 });
-curator.command("gc").description("Prune old rows from the curator rollup JSONL").option("-p, --project <path>", "Project directory (default: CWD)").option("--keep <N>", "Number of most recent runIds to keep (default: 50)", "50").action(async (options) => {
+curator.command("gc").description("Prune old rows from the curator rollup JSONL").option("-p, --project <path>", "Project directory (default: CWD)").option("--keep <N>", "Number of most recent runIds to keep (default: 50)", "50").option("--sweep-unattributed", "Also drop rows with no projectKey (pre-#1429 history, unreadable by any project). Machine-wide \u2014 affects every project sharing the rollup.").action(async (options) => {
   const { curatorGc: curatorGc2 } = await Promise.resolve().then(() => (init_curator2(), exports_curator));
   try {
     await curatorGc2({
       project: options.project,
-      keep: options.keep !== undefined ? Number.parseInt(options.keep, 10) : undefined
+      keep: options.keep !== undefined ? Number.parseInt(options.keep, 10) : undefined,
+      sweepUnattributed: options.sweepUnattributed === true
     });
   } catch (err) {
     console.error(source_default.red(`Error: ${err.message}`));