@nathapp/nax 0.81.0-canary.2 → 0.81.0

package/dist/nax.js

@@ -17148,8 +17148,7 @@ var init_schemas_infra = __esm(() => {
     agents: AgentRoutingConfigSchema.default({ enabled: true, strategy: "off", profiles: [] })
   });
   OptimizerConfigSchema = exports_external.object({
-    enabled: exports_external.boolean(),
-    strategy: exports_external.enum(["rule-based", "llm", "noop"]).optional()
+    enabled: exports_external.boolean()
   });
   PluginConfigEntrySchema = exports_external.object({
     module: exports_external.string().min(1, "plugin.module must be non-empty"),
@@ -18840,6 +18839,21 @@ function _applyRemovedRoutingKeysShim(conf, warn = defaultConfigWarn) {
   }
   return newRouting === routing ? conf : { ...conf, routing: newRouting };
 }
+function _applyRemovedOptimizerKeysShim(conf, warn = defaultConfigWarn) {
+  const optimizer = conf.optimizer;
+  if (!optimizer || typeof optimizer !== "object")
+    return conf;
+  const REMOVED_OPTIMIZER_KEYS = ["strategy", "strategies"];
+  let newOptimizer = optimizer;
+  for (const key of REMOVED_OPTIMIZER_KEYS) {
+    if (key in newOptimizer) {
+      warn(`optimizer.${key} was removed along with the rule-based optimizer and has no effect. Remove it from your config; set optimizer.enabled and provide a plugin optimizer instead.`);
+      const { [key]: _removed, ...rest } = newOptimizer;
+      newOptimizer = rest;
+    }
+  }
+  return newOptimizer === optimizer ? conf : { ...conf, optimizer: newOptimizer };
+}
 function _applyRemovedWorktreeInheritShim(conf, warn = defaultConfigWarn) {
   const execution = conf.execution;
   const worktreeDependencies = execution?.worktreeDependencies;
@@ -18968,7 +18982,17 @@ function _applyFinishAutoFlowShim(conf, warn = defaultConfigWarn) {
 function applyConfigCompatShims(conf, logger, dedupe) {
   const log = dedupe.wrapLogger(logger);
   const warn = dedupe.warn;
-  return _applyFinishAutoFlowShim(_applyRemovedWorktreeInheritShim(_applyLegacyReviewExecutionShim(_applyRemovedRoutingKeysShim(applyRoutingRetryDeprecationWarning(applyBatchModeCompat(applyRemovedStrategyCompat(migrateLegacyReviewModelKey(migrateLegacyTestPattern(conf, log), log), warn), warn), warn), warn), warn), warn), warn);
+  let out = migrateLegacyTestPattern(conf, log);
+  out = migrateLegacyReviewModelKey(out, log);
+  out = applyRemovedStrategyCompat(out, warn);
+  out = applyBatchModeCompat(out, warn);
+  out = applyRoutingRetryDeprecationWarning(out, warn);
+  out = _applyRemovedRoutingKeysShim(out, warn);
+  out = _applyLegacyReviewExecutionShim(out, warn);
+  out = _applyRemovedWorktreeInheritShim(out, warn);
+  out = _applyFinishAutoFlowShim(out, warn);
+  out = _applyRemovedOptimizerKeysShim(out, warn);
+  return out;
 }
 var SECURITY_SENSITIVE_KEY_PATHS, REMOVED_FINISH_KEYS;
 var init_compat_shims = __esm(() => {
@@ -29969,186 +29993,20 @@ class NoopOptimizer {
 }
 var init_noop_optimizer = () => {};
 
-// src/optimizer/rule-based.optimizer.ts
-class RuleBasedOptimizer {
-  name = "rule-based";
-  async optimize(input) {
-    const originalTokens = estimateTokens2(input.prompt);
-    const appliedRules = [];
-    let optimized = input.prompt;
-    const config2 = {
-      ...DEFAULT_CONFIG2,
-      ...input.config.optimizer?.strategies?.["rule-based"]
-    };
-    if (config2.stripWhitespace) {
-      const before = optimized;
-      optimized = this.stripWhitespace(optimized);
-      if (optimized !== before) {
-        appliedRules.push("stripWhitespace");
-      }
-    }
-    if (config2.compactCriteria) {
-      const before = optimized;
-      optimized = this.compactCriteria(optimized);
-      if (optimized !== before) {
-        appliedRules.push("compactCriteria");
-      }
-    }
-    if (config2.deduplicateContext && input.contextMarkdown) {
-      const before = optimized;
-      optimized = this.deduplicateContext(optimized, input.contextMarkdown);
-      if (optimized !== before) {
-        appliedRules.push("deduplicateContext");
-      }
-    }
-    if (config2.maxPromptTokens) {
-      const currentTokens = estimateTokens2(optimized);
-      if (currentTokens > config2.maxPromptTokens) {
-        optimized = this.trimToMaxTokens(optimized, config2.maxPromptTokens);
-        appliedRules.push("maxPromptTokens");
-      }
-    }
-    const optimizedTokens = estimateTokens2(optimized);
-    const savings = originalTokens > 0 ? (originalTokens - optimizedTokens) / originalTokens : 0;
-    return {
-      prompt: optimized,
-      originalTokens,
-      optimizedTokens,
-      savings,
-      appliedRules
-    };
-  }
-  stripWhitespace(prompt) {
-    return prompt.split(`
-`).map((line) => line.trimEnd()).join(`
-`).replace(/\n{3,}/g, `
-
-`);
-  }
-  compactCriteria(prompt) {
-    return prompt.replace(/The user should be able to /gi, "").replace(/The system must /gi, "").replace(/The system should /gi, "").replace(/When the /gi, "").replace(/When a /gi, "").replace(/it should validate all fields/gi, "validate all fields").replace(/display an error message/gi, "show error").replace(/error message/gi, "error");
-  }
-  deduplicateContext(prompt, contextMarkdown) {
-    const contextSectionMatch = prompt.match(/# Context\n([\s\S]*?)(?=\n#|$)/i);
-    if (!contextSectionMatch) {
-      return prompt;
-    }
-    const contextSection = contextSectionMatch[1];
-    const contextLines = contextSection.split(`
-`);
-    const dedupedLines = contextLines.filter((line) => {
-      const trimmed = line.trim();
-      if (!trimmed)
-        return true;
-      return !contextMarkdown.includes(trimmed);
-    });
-    if (dedupedLines.length < contextLines.length) {
-      const newContextSection = dedupedLines.join(`
-`);
-      return prompt.replace(contextSectionMatch[0], `# Context
-${newContextSection}`);
-    }
-    return prompt;
-  }
-  trimToMaxTokens(prompt, maxTokens) {
-    const currentTokens = estimateTokens2(prompt);
-    if (currentTokens <= maxTokens) {
-      return prompt;
-    }
-    const sections = this.extractSections(prompt);
-    const targetChars = maxTokens * 4;
-    const trimmedMessage = `
-... (context trimmed)`;
-    let result = "";
-    let remainingChars = targetChars;
-    if (sections.task) {
-      result += sections.task;
-      remainingChars -= sections.task.length;
-    }
-    if (sections.acceptanceCriteria) {
-      result += sections.acceptanceCriteria;
-      remainingChars -= sections.acceptanceCriteria.length;
-    }
-    const trimmable = sections.context ?? sections.other;
-    if (trimmable && remainingChars > 0) {
-      const reserveForMessage = trimmable.length > remainingChars ? trimmedMessage.length : 0;
-      const maxContextChars = Math.max(0, remainingChars - reserveForMessage);
-      const trimmedContext = trimmable.substring(0, maxContextChars);
-      result += trimmedContext;
-      if (trimmedContext.length < trimmable.length) {
-        result += trimmedMessage;
-      }
-    }
-    return result.trim() ? result : prompt;
-  }
-  extractSections(prompt) {
-    const sections = {};
-    const taskMatch = prompt.match(/# Task\n([\s\S]*?)(?=\n#|$)/i);
-    if (taskMatch) {
-      sections.task = taskMatch[0];
-    }
-    const contextMatch = prompt.match(/# Context\n([\s\S]*?)(?=\n#|$)/i);
-    if (contextMatch) {
-      sections.context = contextMatch[0];
-    }
-    const acMatch = prompt.match(/# Acceptance Criteria\n([\s\S]*?)(?=\n#|$)/i);
-    if (acMatch) {
-      sections.acceptanceCriteria = acMatch[0];
-    }
-    let other = prompt;
-    if (sections.task) {
-      other = other.replace(sections.task, "");
-    }
-    if (sections.context) {
-      other = other.replace(sections.context, "");
-    }
-    if (sections.acceptanceCriteria) {
-      other = other.replace(sections.acceptanceCriteria, "");
-    }
-    if (other.trim()) {
-      sections.other = other;
-    }
-    return sections;
-  }
-}
-var DEFAULT_CONFIG2;
-var init_rule_based_optimizer = __esm(() => {
-  DEFAULT_CONFIG2 = {
-    stripWhitespace: true,
-    compactCriteria: true,
-    deduplicateContext: true,
-    maxPromptTokens: 8000
-  };
-});
-
 // src/optimizer/index.ts
 function resolveOptimizer(config2, pluginRegistry) {
   if (!config2.optimizer?.enabled) {
     return new NoopOptimizer;
   }
-  if (pluginRegistry) {
-    const pluginOptimizers = pluginRegistry.getOptimizers();
-    if (pluginOptimizers.length > 0) {
-      return pluginOptimizers[0];
-    }
-  }
-  const strategy = config2.optimizer.strategy ?? "noop";
-  switch (strategy) {
-    case "rule-based":
-      return new RuleBasedOptimizer;
-    case "noop":
-      return new NoopOptimizer;
-    default:
-      getSafeLogger()?.warn("optimizer", `Unknown optimizer strategy '${strategy}', using noop`);
-      return new NoopOptimizer;
+  const pluginOptimizers = pluginRegistry?.getOptimizers() ?? [];
+  if (pluginOptimizers.length > 0) {
+    return pluginOptimizers[0];
   }
+  return new NoopOptimizer;
 }
 var init_optimizer = __esm(() => {
   init_noop_optimizer();
-  init_rule_based_optimizer();
-  init_logger2();
   init_noop_optimizer();
-  init_rule_based_optimizer();
 });
 
 // src/context/fragments/store.ts
@@ -50783,7 +50641,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.81.0-canary.2",
+    version: "0.81.0",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -50825,6 +50683,8 @@ var init_package = __esm(() => {
       "test:e2e": "timeout -k 5s 180s bun test test/e2e/ --timeout=60000",
       "test:coverage": "bun run scripts/check-coverage.ts",
       "test:coverage:report": "bun run scripts/check-coverage.ts --report",
+      "test:coverage:update": "bun run scripts/check-coverage.ts --update-baseline",
+      "test:coverage:list": "bun run scripts/check-coverage.ts --list",
       "report:test-overlap": "bun run scripts/report-test-overlap.ts",
       "report:dead-tests": "bun run scripts/report-dead-tests.ts",
       "check:test-mocks": "bun scripts/check-inline-test-mocks.ts --strict",
@@ -50898,8 +50758,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("6e101254"))
-        return "6e101254";
+      if (/^[0-9a-f]{6,10}$/.test("a2cc47be"))
+        return "a2cc47be";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -62316,7 +62176,7 @@ async function checkGitignoreCoversNax(workdir) {
     "**/.nax-acceptance*",
     "**/_nax_acceptance_test.py",
     "**/_nax_suggested_test.py",
-    `**/${PROJECT_FEATURES_DIR}/*/`
+    `${PROJECT_FEATURES_DIR}/*/fragments/`
   ];
   const missing = patterns.filter((pattern) => !content.includes(pattern));
   const passed = missing.length === 0;
@@ -66110,7 +65970,7 @@ async function acquireLock(workdir) {
         }
         const tombstonePath = `${lockPath}.stale.${process.pid}.${Date.now()}`;
         try {
-          await rename2(lockPath, tombstonePath);
+          await _lockDeps.rename(lockPath, tombstonePath);
         } catch (renameError) {
           if (renameError.code === "ENOENT") {
             return false;
@@ -66175,8 +66035,12 @@ async function releaseLock(workdir) {
     }
   }
 }
+var _lockDeps;
 var init_lock = __esm(() => {
   init_logger2();
+  _lockDeps = {
+    rename: rename2
+  };
 });
 
 // src/execution/helpers.ts
@@ -75746,7 +75610,7 @@ ${missing.join(`
 `);
   return { created: false, added: [...missing] };
 }
-var NAX_GITIGNORE_ENTRIES, NAX_NAXIGNORE_ENTRIES, NAX_NAXIGNORE_HEADER = `# nax - paths excluded from context, review
+var FEATURE_RUN_ARTIFACTS, NAX_GITIGNORE_ENTRIES, NAX_NAXIGNORE_ENTRIES, NAX_NAXIGNORE_HEADER = `# nax - paths excluded from context, review
 # and verification scanning.
 # gitignore syntax. Also honoured per-package.
 
@@ -75759,24 +75623,32 @@ var NAX_GITIGNORE_ENTRIES, NAX_NAXIGNORE_ENTRIES, NAX_NAXIGNORE_HEADER = `# nax
 `;
 var init_gitignore = __esm(() => {
   init_config();
+  FEATURE_RUN_ARTIFACTS = [
+    "runs/",
+    "plan/",
+    "sessions/",
+    "stories/",
+    "fragments/",
+    "interactions/",
+    "semantic-verdicts/",
+    "status.json",
+    "checkpoint.jsonl",
+    "progress.txt",
+    "acp-sessions.json",
+    "acceptance-refined.json",
+    "*.bak"
+  ].map((artifact) => `**/${PROJECT_FEATURES_DIR}/*/${artifact}`);
   NAX_GITIGNORE_ENTRIES = [
     ".nax-verifier-verdict.json",
     "nax.lock",
     ".nax/**/runs/",
     ".nax/metrics.json",
-    `${PROJECT_FEATURES_DIR}/*/status.json`,
-    `${PROJECT_FEATURES_DIR}/*/plan/`,
-    `${PROJECT_FEATURES_DIR}/*/fragments/`,
-    `${PROJECT_FEATURES_DIR}/*/acp-sessions.json`,
-    `${PROJECT_FEATURES_DIR}/*/interactions/`,
-    `${PROJECT_FEATURES_DIR}/*/progress.txt`,
-    `${PROJECT_FEATURES_DIR}/*/acceptance-refined.json`,
+    ...FEATURE_RUN_ARTIFACTS,
     ".nax-pids",
     ".nax-wt/",
     "**/.nax-acceptance*",
     "**/_nax_acceptance_test.py",
     "**/_nax_suggested_test.py",
-    `**/${PROJECT_FEATURES_DIR}/*/`,
     ".nax/prompt-audit/",
     ".nax/finish-audit/",
     ".nax/mutation-journal/"
@@ -83758,6 +83630,7 @@ __export(exports_execution, {
   _postRunDeps: () => _postRunDeps,
   _pidRegistryDeps: () => _pidRegistryDeps,
   _newPackageSetupDeps: () => _newPackageSetupDeps,
+  _lockDeps: () => _lockDeps,
   StoryOrchestratorBuilder: () => StoryOrchestratorBuilder,
   StatusWriter: () => StatusWriter,
   STRICT_VERDICT_PHASE_NAMES: () => STRICT_VERDICT_PHASE_NAMES,
@@ -85179,8 +85052,7 @@ var init_config_descriptions = __esm(() => {
     "context.autoDetect.maxFiles": "Max files to auto-detect",
     "context.autoDetect.traceImports": "Trace imports to find related files",
     optimizer: "Prompt optimizer configuration",
-    "optimizer.enabled": "Enable prompt optimizer",
-    "optimizer.strategy": "Optimization strategy: rule-based | llm | noop",
+    "optimizer.enabled": "Enable prompt optimizer (pass-through unless a plugin provides one)",
     plugins: "Plugin configurations",
     hooks: "Hooks configuration",
     "hooks.skipGlobal": "Skip loading global hooks",
@@ -117609,6 +117481,7 @@ import { join as join106 } from "path";
 // src/commands/logs-formatter.ts
 init_source();
 init_formatter();
+init_bun_deps();
 import { readdirSync as readdirSync8 } from "fs";
 import { join as join105 } from "path";
 
@@ -117795,13 +117668,57 @@ async function displayLogs(filePath, options) {
     }
   }
 }
-async function followLogs(filePath, options) {
+async function defaultReadRange(filePath, start) {
+  return Bun.file(filePath).slice(start).text();
+}
+async function defaultSize(filePath) {
+  return (await Bun.file(filePath).stat()).size;
+}
+var DEFAULT_FOLLOW_LOGS_DEPS = {
+  emit: (line) => console.log(line),
+  sleep: (ms, signal) => cancellableDelay(ms, signal),
+  readRange: defaultReadRange,
+  size: defaultSize
+};
+async function followLogs(filePath, options, opts) {
+  const deps = { ...DEFAULT_FOLLOW_LOGS_DEPS, ...opts?._deps };
+  const signal = opts?.signal;
   const mode = options.json ? "json" : "normal";
-  const file3 = Bun.file(filePath);
-  const content = await file3.text();
-  const lines = content.trim().split(`
+  if (signal?.aborted)
+    return "cancelled";
+  let lastOffset = await consumeRange(filePath, 0, deps, options, mode);
+  while (true) {
+    if (signal?.aborted)
+      return "cancelled";
+    try {
+      await deps.sleep(500, signal);
+    } catch (err) {
+      if (signal?.aborted)
+        return "cancelled";
+      throw err;
+    }
+    let currentSize;
+    try {
+      currentSize = await deps.size(filePath);
+    } catch {
+      return "cancelled";
+    }
+    if (currentSize > lastOffset) {
+      lastOffset = await consumeRange(filePath, lastOffset, deps, options, mode);
+    } else if (currentSize < lastOffset) {
+      lastOffset = currentSize;
+    }
+  }
+}
+async function consumeRange(filePath, start, deps, options, mode) {
+  const chunk = await deps.readRange(filePath, start);
+  if (!chunk)
+    return start;
+  const lastNewline = chunk.lastIndexOf(`
 `);
-  for (const line of lines) {
+  const complete = lastNewline === -1 ? "" : chunk.slice(0, lastNewline + 1);
+  for (const line of complete.split(`
+`)) {
     if (!line.trim())
       continue;
     try {
@@ -117811,36 +117728,11 @@ async function followLogs(filePath, options) {
       }
       const formatted = formatLogEntry(entry, { mode, useColor: true });
       if (formatted.shouldDisplay && formatted.output) {
-        console.log(formatted.output);
+        deps.emit(formatted.output);
       }
     } catch {}
   }
-  let lastSize = (await Bun.file(filePath).stat()).size;
-  while (true) {
-    await Bun.sleep(500);
-    const currentSize = (await Bun.file(filePath).stat()).size;
-    if (currentSize > lastSize) {
-      const newFile = Bun.file(filePath);
-      const newContent = await newFile.text();
-      const newLines = newContent.slice(lastSize).trim().split(`
-`);
-      for (const line of newLines) {
-        if (!line.trim())
-          continue;
-        try {
-          const entry = JSON.parse(line);
-          if (!shouldDisplayEntry(entry, options)) {
-            continue;
-          }
-          const formatted = formatLogEntry(entry, { mode, useColor: true });
-          if (formatted.shouldDisplay && formatted.output) {
-            console.log(formatted.output);
-          }
-        } catch {}
-      }
-      lastSize = currentSize;
-    }
-  }
+  return start + Buffer.byteLength(complete, "utf8");
 }
 function shouldDisplayEntry(entry, options) {
   if (options.story && entry.storyId !== options.story) {
@@ -117864,7 +117756,7 @@ async function logsCommand(options) {
       return;
     }
     if (options.follow) {
-      await followLogs(runFile2, options);
+      await followLogs(runFile2, options, { signal: options.signal });
     } else {
       await displayLogs(runFile2, options);
     }
@@ -117887,7 +117779,7 @@ async function logsCommand(options) {
     throw new Error("No runs found for this feature");
   }
   if (options.follow) {
-    await followLogs(runFile, options);
+    await followLogs(runFile, options, { signal: options.signal });
     return;
   }
   await displayLogs(runFile, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nathapp/nax",
-  "version": "0.81.0-canary.2",
+  "version": "0.81.0",
   "description": "AI Coding Agent Orchestrator — loops until done",
   "type": "module",
   "bin": {
@@ -42,6 +42,8 @@
     "test:e2e": "timeout -k 5s 180s bun test test/e2e/ --timeout=60000",
     "test:coverage": "bun run scripts/check-coverage.ts",
     "test:coverage:report": "bun run scripts/check-coverage.ts --report",
+    "test:coverage:update": "bun run scripts/check-coverage.ts --update-baseline",
+    "test:coverage:list": "bun run scripts/check-coverage.ts --list",
     "report:test-overlap": "bun run scripts/report-test-overlap.ts",
     "report:dead-tests": "bun run scripts/report-dead-tests.ts",
     "check:test-mocks": "bun scripts/check-inline-test-mocks.ts --strict",