@nathapp/nax 0.82.0-canary.1 → 0.82.0-canary.2

package/dist/nax.js

@@ -2801,6 +2801,8 @@ function shouldDisplay(entry, mode) {
   }
   if (mode === "verbose")
     return true;
+  if (entry.stage === "coding-tool" && entry.message === "invoked" && entry.data?.outcome === "ok")
+    return false;
   if (entry.stage === "story.start" || entry.stage === "iteration.start")
     return true;
   return entry.level !== "debug";
@@ -4864,6 +4866,9 @@ var init_glob = __esm(() => {
 });
 
 // src/tools/grep.ts
+function containsRegexMetacharacter(pattern) {
+  return REGEX_METACHARACTERS.test(pattern);
+}
 function buildGrepArgv(binary, pattern, path) {
   const target = path ?? ".";
   if (binary === "rg") {
@@ -4877,10 +4882,11 @@ function truncate2(body, maxBytes) {
   return `${Buffer.from(body, "utf8").subarray(0, maxBytes).toString("utf8")}
 ... [truncated at ${maxBytes} bytes]`;
 }
-var GREP_TIMEOUT_MS = 15000, _grepDeps, grepTool;
+var GREP_TIMEOUT_MS = 15000, REGEX_METACHARACTERS, _grepDeps, grepTool;
 var init_grep = __esm(() => {
   init_bounded_io();
   init_bun_deps();
+  REGEX_METACHARACTERS = /[.*+?^${}()|[\]\\]/;
   _grepDeps = { which, spawn };
   grepTool = {
     name: "Grep",
@@ -4918,8 +4924,15 @@ var init_grep = __esm(() => {
       const exitCode = await proc.exited;
       clearTimeout(timer);
       const stdout = await stdoutText;
-      if (exitCode === 1 && stdout.trim() === "")
-        return { content: `no matches for "${pattern}"` };
+      if (exitCode === 1 && stdout.trim() === "") {
+        const base = `no matches for "${pattern}"`;
+        if (containsRegexMetacharacter(pattern)) {
+          return {
+            content: `${base}. The search was performed literally and regex metacharacters were not interpreted.`
+          };
+        }
+        return { content: base };
+      }
       if (exitCode !== 0 && stdout.trim() === "") {
         return { content: (await stderrText).trim() || `${binary} exited ${exitCode}`, isError: true };
       }
@@ -20734,7 +20747,7 @@ var init_schemas_execution = __esm(() => {
 });
 
 // src/config/schemas-infra.ts
-var PlanConfigSchema, AcceptanceFixConfigSchema, AcceptanceConfigSchema, LlmRoutingConfigSchema, AgentRoutingProfileSchema, AgentRoutingConfigSchema, RoutingConfigSchema, OptimizerConfigSchema, PluginConfigEntrySchema, HooksConfigSchema, InteractionConfigSchema, StorySizeGateConfigSchema, PromptAuditConfigSchema, FallbackTargetSchema, AgentFallbackConfigSchema, DEFAULT_AGENT_IDLE_WATCHDOG_CONFIG, AgentIdleWatchdogConfigSchema, AgentAcpConfigSchema, AgentTimeoutRetryConfigSchema, DEFAULT_AGENT_TIMEOUT_RETRY_CONFIG, AgentConfigSchema, PrecheckConfigSchema, PromptsConfigSchema, ProjectProfileSchema, VALID_AGENT_TYPES, GenerateConfigSchema, CuratorThresholdsSchema, CuratorConfigSchema;
+var PlanConfigSchema, AcceptanceFixConfigSchema, AcceptanceConfigSchema, LlmRoutingConfigSchema, AgentRoutingProfileSchema, AgentRoutingConfigSchema, RoutingConfigSchema, OptimizerConfigSchema, PluginConfigEntrySchema, HooksConfigSchema, InteractionConfigSchema, StorySizeGateConfigSchema, PromptAuditConfigSchema, FallbackTargetSchema, AgentFallbackConfigSchema, DEFAULT_AGENT_IDLE_WATCHDOG_CONFIG, AgentIdleWatchdogConfigSchema, AgentAcpConfigSchema, AgentNativeTransportRetryConfigSchema, AgentNativeConfigSchema, AgentTimeoutRetryConfigSchema, DEFAULT_AGENT_TIMEOUT_RETRY_CONFIG, AgentConfigSchema, PrecheckConfigSchema, PromptsConfigSchema, ProjectProfileSchema, VALID_AGENT_TYPES, GenerateConfigSchema, CuratorThresholdsSchema, CuratorConfigSchema;
 var init_schemas_infra = __esm(() => {
   init_zod();
   init_schemas_model();
@@ -20916,6 +20929,13 @@ var init_schemas_infra = __esm(() => {
     trackedSpawnDeadlineMs: exports_external.number().int().positive().default(1e4),
     trackedSpawnStartupDeadlineMs: exports_external.number().int().positive().default(30000)
   });
+  AgentNativeTransportRetryConfigSchema = exports_external.object({
+    maxAttempts: exports_external.number().int().min(1).default(3),
+    baseDelayMs: exports_external.number().int().positive().default(2000)
+  });
+  AgentNativeConfigSchema = exports_external.object({
+    transportRetry: AgentNativeTransportRetryConfigSchema.default({ maxAttempts: 3, baseDelayMs: 2000 })
+  });
   AgentTimeoutRetryConfigSchema = exports_external.object({
     maxAttempts: exports_external.number().int().nonnegative().default(1),
     budgetMultiplier: exports_external.number().gt(0).max(1).default(0.5)
@@ -20941,6 +20961,7 @@ var init_schemas_infra = __esm(() => {
       trackedSpawnDeadlineMs: 1e4,
       trackedSpawnStartupDeadlineMs: 30000
     }),
+    native: AgentNativeConfigSchema.default({ transportRetry: { maxAttempts: 3, baseDelayMs: 2000 } }),
     idleWatchdog: AgentIdleWatchdogConfigSchema.default(DEFAULT_AGENT_IDLE_WATCHDOG_CONFIG),
     timeoutRetry: AgentTimeoutRetryConfigSchema.default(DEFAULT_AGENT_TIMEOUT_RETRY_CONFIG)
   });
@@ -21462,6 +21483,7 @@ var init_schemas3 = __esm(() => {
       promptAudit: { enabled: false },
       fallback: { enabled: false, map: {}, maxHopsPerStory: 2, onQualityFailure: false, rebuildContext: true },
       acp: { promptRetries: 0, trackedSpawnDeadlineMs: 1e4, trackedSpawnStartupDeadlineMs: 30000 },
+      native: { transportRetry: { maxAttempts: 3, baseDelayMs: 2000 } },
       idleWatchdog: DEFAULT_AGENT_IDLE_WATCHDOG_CONFIG,
       timeoutRetry: DEFAULT_AGENT_TIMEOUT_RETRY_CONFIG
     }),
@@ -22946,21 +22968,24 @@ function estimateCostUsd(usage, rates) {
 }
 function buildRateCard(catalog, override) {
   if (override !== undefined)
-    return override;
+    return { rates: override, source: "config-override" };
   return {
-    inputPer1M: catalog.input,
-    outputPer1M: catalog.output,
-    cacheReadPer1M: catalog.cacheRead,
-    cacheCreationPer1M: catalog.cacheWrite,
-    ...catalog.tiers !== undefined ? {
-      tiers: catalog.tiers.map((tier) => ({
-        inputPer1M: tier.input,
-        outputPer1M: tier.output,
-        cacheReadPer1M: tier.cacheRead,
-        cacheCreationPer1M: tier.cacheWrite,
-        inputTokensAbove: tier.inputTokensAbove
-      }))
-    } : {}
+    rates: {
+      inputPer1M: catalog.input,
+      outputPer1M: catalog.output,
+      cacheReadPer1M: catalog.cacheRead,
+      cacheCreationPer1M: catalog.cacheWrite,
+      ...catalog.tiers !== undefined ? {
+        tiers: catalog.tiers.map((tier) => ({
+          inputPer1M: tier.input,
+          outputPer1M: tier.output,
+          cacheReadPer1M: tier.cacheRead,
+          cacheCreationPer1M: tier.cacheWrite,
+          inputTokensAbove: tier.inputTokensAbove
+        }))
+      } : {}
+    },
+    source: "catalog-rates"
   };
 }
 function resolveContextWindow(override, realWindow) {
@@ -23000,12 +23025,15 @@ var ID_LENGTH = 32;
 var init_session_affinity = () => {};
 
 // src/agents/native/session/transcript-store.ts
-import { mkdir as mkdir3, readdir, readFile as readFile4, rm, stat as stat2, writeFile as writeFile4 } from "fs/promises";
+import { mkdir as mkdir3, readdir, readFile as readFile4, rename as rename2, rm, stat as stat2, writeFile as writeFile4 } from "fs/promises";
 import { join as join8 } from "path";
 function transcriptPath(dir, sessionName) {
   return join8(dir, `${sessionName}.transcript.json`);
 }
-async function loadTranscript(dir, sessionName) {
+function isLegacyTranscript(parsed) {
+  return Array.isArray(parsed);
+}
+async function loadTranscript(dir, sessionName, owner) {
   let raw;
   try {
     raw = await readFile4(transcriptPath(dir, sessionName), "utf8");
@@ -23014,17 +23042,46 @@ async function loadTranscript(dir, sessionName) {
       return [];
     throw err;
   }
+  let parsed;
   try {
-    return JSON.parse(raw);
+    parsed = JSON.parse(raw);
   } catch (err) {
     throw new NaxError(`transcript for session "${sessionName}" is unreadable: ${err instanceof Error ? err.message : String(err)}`, "TRANSCRIPT_CORRUPT", {
       stage: "native-session"
     });
   }
+  if (isLegacyTranscript(parsed)) {
+    return owner === undefined ? parsed : [];
+  }
+  const file2 = parsed;
+  if (owner !== undefined && file2.owner !== owner) {
+    getLogger().debug("native-session", "Ignoring a transcript owned by another invocation", {
+      sessionName,
+      storedOwner: file2.owner,
+      owner
+    });
+    return [];
+  }
+  return file2.messages ?? [];
 }
-async function saveTranscript(dir, sessionName, messages) {
+async function saveTranscript(dir, sessionName, messages, owner) {
   await mkdir3(dir, { recursive: true });
-  await writeFile4(transcriptPath(dir, sessionName), JSON.stringify(messages, null, 2), "utf8");
+  const file2 = {
+    ...owner !== undefined ? { owner } : {},
+    savedAt: new Date().toISOString(),
+    messages: [...messages]
+  };
+  await writeFile4(transcriptPath(dir, sessionName), JSON.stringify(file2, null, 2), "utf8");
+}
+async function retainTranscript(dir, sessionName) {
+  const stamp = new Date().toISOString().replace(/[:.]/g, "-");
+  try {
+    await rename2(transcriptPath(dir, sessionName), join8(dir, `${sessionName}.transcript.failed-${stamp}.json`));
+  } catch (err) {
+    if (err.code === "ENOENT")
+      return;
+    throw err;
+  }
 }
 async function deleteTranscript(dir, sessionName) {
   await rm(transcriptPath(dir, sessionName), { force: true });
@@ -23038,7 +23095,7 @@ async function pruneRetainedTranscripts(dir, maxRetained = MAX_RETAINED_TRANSCRI
       return;
     throw err;
   }
-  const transcriptFiles = entries.filter((name) => name.endsWith(".transcript.json"));
+  const transcriptFiles = entries.filter((name) => name.includes(".transcript.") && name.endsWith(".json"));
   if (transcriptFiles.length <= maxRetained)
     return;
   const withMtimes = await Promise.all(transcriptFiles.map(async (name) => {
@@ -23079,8 +23136,16 @@ async function openNativeSession(name, opts) {
   }
   nativeTranscriptDirs.set(name, opts.transcriptDir);
   nativeSessionTimeouts.set(name, opts.timeoutSeconds);
+  if (opts.transcriptOwner !== undefined)
+    nativeSessionTranscriptOwners.set(name, opts.transcriptOwner);
+  else
+    nativeSessionTranscriptOwners.delete(name);
+  if (opts.resume !== true)
+    await deleteTranscript(opts.transcriptDir, name);
   if (opts.compaction !== undefined)
     nativeSessionCompaction.set(name, opts.compaction);
+  if (opts.transportRetry !== undefined)
+    nativeSessionTransportRetry.set(name, opts.transportRetry);
   nativeSessionStreamHooks.set(name, {
     ...opts.onStreamActivity !== undefined ? { onStreamActivity: opts.onStreamActivity } : {},
     ...opts.onActiveCall !== undefined ? { onActiveCall: opts.onActiveCall } : {}
@@ -23098,6 +23163,7 @@ async function closeNativeSession(handle, failed) {
   const treatAsFailed = failed ?? nativeSessionFailed.has(handle.id);
   if (dir !== undefined) {
     if (treatAsFailed) {
+      await retainTranscript(dir, handle.id);
       await pruneRetainedTranscripts(dir);
     } else {
       await deleteTranscript(dir, handle.id);
@@ -23105,12 +23171,14 @@ async function closeNativeSession(handle, failed) {
   }
   nativeTranscriptDirs.delete(handle.id);
   nativeSessionTimeouts.delete(handle.id);
+  nativeSessionTranscriptOwners.delete(handle.id);
   nativeSessionStreamHooks.delete(handle.id);
   nativeSessionFailed.delete(handle.id);
   nativeSessionCompaction.delete(handle.id);
+  nativeSessionTransportRetry.delete(handle.id);
   nativeSessionLastUsage.delete(handle.id);
 }
-var nativeTranscriptDirs, nativeSessionTimeouts, nativeSessionStreamHooks, nativeSessionFailed, nativeSessionCompaction, nativeSessionLastUsage;
+var nativeTranscriptDirs, nativeSessionTimeouts, nativeSessionStreamHooks, nativeSessionFailed, nativeSessionTranscriptOwners, nativeSessionCompaction, nativeSessionTransportRetry, nativeSessionLastUsage;
 var init_session = __esm(() => {
   init_errors();
   init_models();
@@ -23120,7 +23188,9 @@ var init_session = __esm(() => {
   nativeSessionTimeouts = new Map;
   nativeSessionStreamHooks = new Map;
   nativeSessionFailed = new Set;
+  nativeSessionTranscriptOwners = new Map;
   nativeSessionCompaction = new Map;
+  nativeSessionTransportRetry = new Map;
   nativeSessionLastUsage = new Map;
 });
 
@@ -23273,6 +23343,78 @@ function codingToolsToDefinitions(tools) {
   }));
 }
 
+// src/agents/native/session/turn-retry.ts
+function isRetryableTransportFault(err) {
+  if (typeof err !== "object" || err === null || !("protocolError" in err))
+    return false;
+  const { protocolError } = err;
+  return typeof protocolError?.kind === "string" && RETRYABLE_KINDS.has(protocolError.kind);
+}
+function canAttemptTurnRetry(retryIndex, config2) {
+  return retryIndex < config2.maxAttempts - 1;
+}
+function backoffMs(retryIndex, baseDelayMs, random) {
+  const half = baseDelayMs * 2 ** retryIndex / 2;
+  return Math.floor(half + random() * half);
+}
+function turnRetryDelayMs(err, retryIndex, config2, random = Math.random, remainingMs) {
+  const { retryAfter } = err.protocolError;
+  const delayMs = retryAfter !== undefined ? retryAfter * 1000 : backoffMs(retryIndex, config2.baseDelayMs, random);
+  return remainingMs === undefined ? delayMs : Math.min(delayMs, remainingMs);
+}
+function abortError(signal) {
+  return signal.reason ?? new DOMException("Aborted", "AbortError");
+}
+function abortableSleep(ms, sleep2, signal) {
+  if (signal === undefined)
+    return sleep2(ms);
+  if (signal.aborted)
+    return Promise.reject(abortError(signal));
+  return new Promise((resolve6, reject) => {
+    const onAbort = () => reject(abortError(signal));
+    signal.addEventListener("abort", onAbort, { once: true });
+    sleep2(ms).then(() => {
+      signal.removeEventListener("abort", onAbort);
+      resolve6();
+    }, reject);
+  });
+}
+function realSleep(ms) {
+  return new Promise((resolve6) => setTimeout(resolve6, ms));
+}
+async function retryTransportFault(firstError, deps) {
+  const { sleep: sleep2 } = deps;
+  const random = deps.random ?? Math.random;
+  let err = firstError;
+  let retryIndex = 0;
+  for (;; ) {
+    if (!isRetryableTransportFault(err))
+      throw err;
+    if (!canAttemptTurnRetry(retryIndex, deps.config))
+      throw err;
+    if (deps.deadline?.expired() === true || deps.signal?.aborted === true)
+      throw err;
+    const fault = err;
+    const delayMs = turnRetryDelayMs(fault, retryIndex, deps.config, random, deps.deadline?.remainingMs());
+    deps.onRetry?.(retryIndex + 1, delayMs, fault);
+    try {
+      await abortableSleep(delayMs, sleep2, deps.signal);
+    } catch {
+      throw fault;
+    }
+    try {
+      return await deps.attempt();
+    } catch (nextErr) {
+      err = nextErr;
+      retryIndex += 1;
+    }
+  }
+}
+var RETRYABLE_KINDS;
+var init_turn_retry = __esm(() => {
+  RETRYABLE_KINDS = new Set(["transport", "overloaded"]);
+});
+
 // src/agents/native/session/turn-loop.ts
 function readNativeTurnFailureUsage(err) {
   return typeof err === "object" && err !== null ? failureUsageByError.get(err) : undefined;
@@ -23290,7 +23432,8 @@ async function runNativeTurn(handle, prompt, opts, deps) {
       stage: "native-session"
     });
   }
-  let messages = [...await loadTranscript(dir, handle.id)];
+  const transcriptOwner = nativeSessionTranscriptOwners.get(handle.id);
+  let messages = [...await loadTranscript(dir, handle.id, transcriptOwner)];
   messages.push({ role: "user", content: prompt });
   const codingTools = opts.codingTools ?? [];
   const codingToolNames = new Set(codingTools.map((t) => t.name));
@@ -23369,25 +23512,43 @@ async function runNativeTurn(handle, prompt, opts, deps) {
         res = await deps.complete(messages, tools);
       } catch (err) {
         if (!isContextOverflow(err) || summarizeFailed || deps.summarize === undefined || deps.contextWindow === undefined || deps.compaction === undefined || !deps.compaction.enabled) {
-          throw err;
+          if (deps.transportRetry === undefined)
+            throw err;
+          res = await retryTransportFault(err, {
+            attempt: () => deps.complete(messages, tools),
+            config: deps.transportRetry,
+            deadline: deps.deadline,
+            signal: opts.signal,
+            sleep: deps.sleep ?? realSleep,
+            onRetry: (retryNumber, delayMs, fault) => {
+              getSafeLogger()?.warn("native-adapter", "retrying after a transport fault", {
+                sessionName: handle.id,
+                retryNumber,
+                delayMs,
+                kind: fault.protocolError.kind
+              });
+              deps.onActivity?.({ kind: "usage", inputTokens: 0, outputTokens: 0, costUsd: 0 });
+            }
+          });
+        } else {
+          const plan = prepareCompaction(messages, keepBudget(deps.contextWindow, deps.compaction, true));
+          if (plan === undefined)
+            throw err;
+          const summary = await deps.summarize(plan.toSummarize, plan.previousSummary);
+          messages = applyCompaction(messages, plan, summary.text);
+          inputTokens += summary.usage.inputTokens;
+          outputTokens += summary.usage.outputTokens;
+          costUsd += summary.costUsd;
+          deps.onActivity?.({
+            kind: "usage",
+            inputTokens: summary.usage.inputTokens,
+            outputTokens: summary.usage.outputTokens,
+            costUsd: summary.costUsd
+          });
+          lastUsage = undefined;
+          anchorIndex = undefined;
+          res = await deps.complete(messages, tools);
         }
-        const plan = prepareCompaction(messages, keepBudget(deps.contextWindow, deps.compaction, true));
-        if (plan === undefined)
-          throw err;
-        const summary = await deps.summarize(plan.toSummarize, plan.previousSummary);
-        messages = applyCompaction(messages, plan, summary.text);
-        inputTokens += summary.usage.inputTokens;
-        outputTokens += summary.usage.outputTokens;
-        costUsd += summary.costUsd;
-        deps.onActivity?.({
-          kind: "usage",
-          inputTokens: summary.usage.inputTokens,
-          outputTokens: summary.usage.outputTokens,
-          costUsd: summary.costUsd
-        });
-        lastUsage = undefined;
-        anchorIndex = undefined;
-        res = await deps.complete(messages, tools);
       }
       roundTrips += 1;
       inputTokens += res.usage.inputTokens;
@@ -23481,7 +23642,7 @@ async function runNativeTurn(handle, prompt, opts, deps) {
       }
     }
   } catch (err) {
-    await saveTranscript(dir, handle.id, messages).catch((saveErr) => {
+    await saveTranscript(dir, handle.id, messages, transcriptOwner).catch((saveErr) => {
       getSafeLogger()?.warn("native-adapter", "could not persist the transcript of a failed turn", {
         sessionName: handle.id,
         error: saveErr instanceof Error ? saveErr.message : String(saveErr)
@@ -23507,7 +23668,7 @@ async function runNativeTurn(handle, prompt, opts, deps) {
       timedOut
     });
   }
-  await saveTranscript(dir, handle.id, messages);
+  await saveTranscript(dir, handle.id, messages, transcriptOwner);
   return {
     output,
     tokenUsage: {
@@ -23521,7 +23682,8 @@ async function runNativeTurn(handle, prompt, opts, deps) {
     ...codingTools.length > 0 ? { codingToolUse: { advertised: codingTools.length, called: codingToolsCalled } } : {},
     ...completedNormally ? {} : { turnIncomplete: true },
     ...timedOut ? { timedOut: true } : {},
-    ...interactions.length > 0 ? { interactions } : {}
+    ...interactions.length > 0 ? { interactions } : {},
+    ...deps.pricingSource !== undefined ? { pricingSource: deps.pricingSource } : {}
   };
 }
 var failureUsageByError;
@@ -23532,6 +23694,7 @@ var init_turn_loop = __esm(() => {
   init_ask_human();
   init_session();
   init_transcript_store();
+  init_turn_retry();
   failureUsageByError = new WeakMap;
 });
 
@@ -23587,20 +23750,23 @@ class NativeAgentAdapter {
     const controller = new AbortController;
     const timer = options.timeoutMs !== undefined ? setTimeout(() => controller.abort(), options.timeoutMs) : undefined;
     try {
+      const sessionId = nativeSessionId(this.oneShotKey);
       const result = await client.complete(resolved, {
         messages: [{ role: "user", content: prompt }],
         ...options.maxTokens !== undefined ? { maxTokens: options.maxTokens } : {},
-        sessionId: nativeSessionId(this.oneShotKey),
+        sessionId,
         signal: controller.signal,
         ...thinking !== undefined ? { thinking } : {}
       });
       const tokenUsage = toNaxTokenUsage(result.usage);
       const catalog = client.pricing(resolved);
-      const rates = buildRateCard(catalog, options.modelDef.pricing);
+      const { rates, source: pricingSource } = buildRateCard(catalog, options.modelDef.pricing);
       return {
         output: result.text,
         tokenUsage,
-        estimatedCostUsd: estimateCostUsd(tokenUsage, rates)
+        estimatedCostUsd: estimateCostUsd(tokenUsage, rates),
+        sessionId,
+        pricingSource
       };
     } catch (err) {
       if (isProtocolStreamError(err)) {
@@ -23626,7 +23792,7 @@ class NativeAgentAdapter {
     const client = await getNativeClient();
     const resolved = await client.model(provider, model);
     const catalog = client.pricing(resolved);
-    const rates = buildRateCard(catalog, handle.modelDef?.pricing);
+    const { rates, source: pricingSource } = buildRateCard(catalog, handle.modelDef?.pricing);
     const storedTimeoutSeconds = nativeSessionTimeouts.get(handle.id);
     if (storedTimeoutSeconds === undefined) {
       getSafeLogger()?.warn("native-adapter", "session has no recorded timeout; falling back to the default budget", {
@@ -23655,6 +23821,8 @@ class NativeAgentAdapter {
         deadline,
         contextWindow: resolveContextWindow(handle.modelDef?.contextWindow, resolved.contextWindow),
         ...nativeSessionCompaction.get(handle.id) !== undefined ? { compaction: nativeSessionCompaction.get(handle.id) } : {},
+        ...nativeSessionTransportRetry.get(handle.id) !== undefined ? { transportRetry: nativeSessionTransportRetry.get(handle.id) } : {},
+        pricingSource,
         onActivity: (activity) => {
           hooks?.onStreamActivity?.(buildNativeStreamEvent(eventBase, activity, Date.now()));
         },
@@ -28085,6 +28253,33 @@ var init_acp = __esm(() => {
   init_token_mapper();
 });
 
+// src/agents/transport-failure-message.ts
+function isTransportFailureMessage(message) {
+  if (!message)
+    return false;
+  const haystack = message.toLowerCase();
+  return TRANSPORT_FAULT_MARKERS.some((marker) => haystack.includes(marker));
+}
+var TRANSPORT_FAULT_MARKERS;
+var init_transport_failure_message = __esm(() => {
+  TRANSPORT_FAULT_MARKERS = [
+    "idle timeout exceeded",
+    "stream idle timeout",
+    "upstream timeout",
+    "bad gateway",
+    "service unavailable",
+    "gateway timeout",
+    "econnreset",
+    "econnrefused",
+    "econnaborted",
+    "etimedout",
+    "socket hang up",
+    "premature close",
+    "terminated: other side closed",
+    "network error"
+  ];
+});
+
 // src/agents/complete-exception-classifier.ts
 function classifyCompleteException(err) {
   const fullMessage = errorMessage(err);
@@ -28111,13 +28306,14 @@ function classifyCompleteException(err) {
     case "crash":
       return { category: "quality", outcome: "fail-adapter-error", retriable: false, message };
     default:
-      return { category: "quality", outcome: "fail-unknown", retriable: false, message };
+      return isTransportFailureMessage(fullMessage) ? { category: "availability", outcome: "fail-service-down", retriable: true, message } : { category: "quality", outcome: "fail-unknown", retriable: false, message };
   }
 }
 var MAX_FAILURE_MESSAGE_CHARS = 500;
 var init_complete_exception_classifier = __esm(() => {
   init_errors();
   init_acp();
+  init_transport_failure_message();
 });
 
 // src/runtime/no-op-interaction-handler.ts
@@ -28581,6 +28777,7 @@ function buildSessionTurnEvent(input) {
     exactCostUsd: result.exactCostUsd,
     durationMs: Date.now() - startedAt,
     timestamp: Date.now(),
+    ...result.pricingSource !== undefined ? { pricingSource: result.pricingSource } : {},
     roundTrips: result.internalRoundTrips ?? 1,
     roundTripUnit: input.agentName === NATIVE_AGENT ? "model-call" : "agent-run",
     protocolIds: {
@@ -28614,6 +28811,8 @@ function buildCompleteEvent(input) {
     exactCostUsd: input.exactCostUsd,
     durationMs: Date.now() - input.startedAt,
     timestamp: Date.now(),
+    ...input.sessionId !== undefined ? { sessionId: input.sessionId } : {},
+    ...input.pricingSource !== undefined ? { pricingSource: input.pricingSource } : {},
     ...options.callId !== undefined ? { callId: options.callId } : {},
     ...options.scopeId !== undefined ? { scopeId: options.scopeId } : {}
   };
@@ -29467,7 +29666,9 @@ class AgentManager {
         estimatedCostUsd: outcome.result.estimatedCostUsd,
         exactCostUsd: outcome.result.exactCostUsd,
         profile: this._config.profile,
-        startedAt: start
+        startedAt: start,
+        sessionId: outcome.result.sessionId,
+        ...outcome.result.pricingSource !== undefined ? { pricingSource: outcome.result.pricingSource } : {}
       });
       this._dispatchEvents.emitDispatch(event);
       return outcome;
@@ -40143,6 +40344,15 @@ var init_naming = __esm(() => {
   init_session_name();
 });
 
+// src/session/turn-config-selection.ts
+function selectNativeTurnConfig(config2) {
+  const retry = config2?.agent?.native?.transportRetry;
+  return {
+    compaction: config2?.execution?.compaction,
+    transportRetry: { maxAttempts: retry?.maxAttempts ?? 3, baseDelayMs: retry?.baseDelayMs ?? 2000 }
+  };
+}
+
 // src/runtime/session-role.ts
 function isSessionRole(s) {
   if (KNOWN_SESSION_ROLES.includes(s))
@@ -40493,14 +40703,13 @@ class SessionManager {
       throw new NaxError(`SessionManager.openSession: no adapter found for agent "${opts.agentName}"`, "ADAPTER_NOT_FOUND", { stage: "session", agentName: opts.agentName });
     }
     const resolvedPermissions = resolvePermissions(opts.config ?? this._config, opts.pipelineStage);
-    const compaction = (opts.config ?? this._config)?.execution?.compaction;
     const existingDescriptor = this._findByName(name);
     const resume = existingDescriptor !== undefined;
     const handle = await adapter.openSession(name, {
       agentName: opts.agentName,
       workdir: opts.workdir,
       resolvedPermissions,
-      compaction,
+      ...selectNativeTurnConfig(opts.config ?? this._config),
       ...selectModel(opts),
       timeoutSeconds: opts.timeoutSeconds,
       onPidSpawned: this._pidRegistry ? (pid) => this._pidRegistry?.register(pid) : undefined,
@@ -40511,6 +40720,7 @@ class SessionManager {
       onActiveCall: this._buildOnActiveCall(name),
       onStreamActivity: this._onStreamActivity,
       transcriptDir: opts.transcriptDir ?? deriveNativeTranscriptDir({ featureName: opts.featureName, transcriptRoot: this._transcriptRoot }),
+      ...opts.transcriptOwner !== undefined ? { transcriptOwner: opts.transcriptOwner } : {},
       ...trackedSpawnDeadlines(this._config)
     });
     this._liveHandles.set(name, handle);
@@ -40686,7 +40896,7 @@ function recordAgentHandoff(sessionManager, sessionName, newAgent, reason) {
 }
 
 // src/session/scratch-purge.ts
-import { mkdir as mkdir6, rename as rename2, rm as rm2 } from "fs/promises";
+import { mkdir as mkdir6, rename as rename3, rm as rm2 } from "fs/promises";
 import { dirname as dirname7, join as join18 } from "path";
 async function purgeStaleScratch(projectDir, featureName, retentionDays, archiveInsteadOfDelete = false) {
   const sessionsDir = join18(featureDir(projectDir, featureName), "sessions");
@@ -40741,7 +40951,7 @@ var init_scratch_purge = __esm(() => {
     remove: (path5) => rm2(path5, { recursive: true, force: true }),
     move: async (src, dest) => {
       await mkdir6(dirname7(dest), { recursive: true });
-      await rename2(src, dest);
+      await rename3(src, dest);
     },
     now: () => Date.now()
   };
@@ -43667,7 +43877,7 @@ __export(exports_tracker, {
   saveRunMetrics: () => saveRunMetrics,
   toFallbackHops: () => toFallbackHops
 });
-import { rename as rename3 } from "fs/promises";
+import { rename as rename4 } from "fs/promises";
 import path5 from "path";
 function _resetRunTruncationWarningForTests() {
   hasWarnedAboutRunTruncation = false;
@@ -43878,7 +44088,7 @@ async function loadExistingMetricsOrQuarantine(metricsPath) {
   } catch (err) {
     const quarantinePath = `${metricsPath}.corrupt-${new Date().toISOString().replace(/[:.]/g, "-")}`;
     try {
-      await rename3(metricsPath, quarantinePath);
+      await rename4(metricsPath, quarantinePath);
     } catch (renameErr) {
       getLogger().warn("metrics", "Failed to quarantine corrupt metrics.json \u2014 leaving in place", {
         metricsPath,
@@ -47687,6 +47897,7 @@ function buildHopCallback(ctx, sessionId, _initialOptions) {
       role: resolvedRunOptions.sessionRole ?? "implementer",
       pipelineStage: stage
     });
+    const transcriptOwner = resolvedRunOptions.scopeId ?? resolvedRunOptions.callId;
     const pinnedModelDef = pinnedModelAgent === undefined || pinnedModelAgent === agentName ? resolvedRunOptions.modelDef : undefined;
     let handle;
     if (hopKind.kind === "stale-retry") {
@@ -47711,6 +47922,7 @@ function buildHopCallback(ctx, sessionId, _initialOptions) {
           timeoutSeconds: resolvedRunOptions.timeoutSeconds ?? config2.execution?.sessionTimeoutSeconds ?? DEFAULT_CONFIG.execution.sessionTimeoutSeconds,
           featureName,
           storyId: story.id,
+          ...transcriptOwner !== undefined ? { transcriptOwner } : {},
           signal: resolvedRunOptions.abortSignal
         });
       }
@@ -47729,6 +47941,7 @@ function buildHopCallback(ctx, sessionId, _initialOptions) {
         timeoutSeconds: resolvedRunOptions.timeoutSeconds ?? config2.execution?.sessionTimeoutSeconds ?? DEFAULT_CONFIG.execution.sessionTimeoutSeconds,
         featureName,
         storyId: story.id,
+        ...transcriptOwner !== undefined ? { transcriptOwner } : {},
         signal: resolvedRunOptions.abortSignal
       });
     }
@@ -51833,7 +52046,7 @@ function allowPatternToRegex(pattern) {
       }
       continue;
     }
-    source += REGEX_METACHARACTERS.includes(char) ? `\\${char}` : char;
+    source += REGEX_METACHARACTERS2.includes(char) ? `\\${char}` : char;
   }
   return new RegExp(`^${source}$`);
 }
@@ -51896,7 +52109,7 @@ async function verifyImplementerIsolation(workdir, beforeRef, testFilePatterns =
     description: "Implementer should not modify test files"
   };
 }
-var GIT_TIMEOUT_MS2 = 1e4, _isolationDeps, SRC_PATTERNS, REGEX_METACHARACTERS = `.+?^\${}()|[]\\/`, LITE_STUB_ADDED_LINES_CEILING = 20;
+var GIT_TIMEOUT_MS2 = 1e4, _isolationDeps, SRC_PATTERNS, REGEX_METACHARACTERS2 = `.+?^\${}()|[]\\/`, LITE_STUB_ADDED_LINES_CEILING = 20;
 var init_isolation = __esm(() => {
   init_errors();
   init_logger2();
@@ -59976,7 +60189,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.82.0-canary.1",
+    version: "0.82.0-canary.2",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -60044,7 +60257,7 @@ var init_package = __esm(() => {
       "spec:lint": "bun run scripts/spec-lint.ts"
     },
     dependencies: {
-      "@nathapp/nax-ai": "0.1.7",
+      "@nathapp/nax-ai": "0.1.8",
       "@types/react": "^19.2.14",
       chalk: "^5.6.2",
       commander: "^13.1.0",
@@ -60097,8 +60310,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("b2b9889d"))
-        return "b2b9889d";
+      if (/^[0-9a-f]{6,10}$/.test("c2ee0b93"))
+        return "c2ee0b93";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -60661,7 +60874,8 @@ function attachAuditSubscriber(bus, auditor, runId) {
         roundTrips: event.roundTrips,
         roundTripUnit: event.roundTripUnit,
         ...event.interactions?.length ? { interactions: event.interactions } : {}
-      }
+      },
+      ...event.kind === "complete" && event.sessionId !== undefined ? { sessionId: event.sessionId } : {}
     };
     auditor.record(entry);
   });
@@ -60742,7 +60956,7 @@ function attachCostSubscriber(bus, aggregator, runId, projectKey) {
       exactCostUsd,
       costUsd: exactCostUsd,
       confidence,
-      pricingSource: hasWireExactCost ? "wire" : resolvePricingSource(event.model),
+      pricingSource: hasWireExactCost ? "wire" : event.pricingSource ?? resolvePricingSource(event.model),
       durationMs: event.durationMs
     };
     aggregator.record(costEvent);
@@ -61016,8 +61230,9 @@ function deriveAuditSuffix(entry) {
     const stage = entry.stage ?? "run";
     return `${stage}-t${String(entry.turn).padStart(2, "0")}`;
   }
-  if (entry.callType === "complete")
-    return "complete";
+  if (entry.callType === "complete") {
+    return entry.stage ? `${entry.stage}-complete` : "complete";
+  }
   return entry.stage ?? entry.callType;
 }
 function buildTxtContent(entry) {
@@ -61803,6 +62018,7 @@ function createSessionRunHop(sessionManager, getAgentManager) {
       role: options.sessionRole,
       pipelineStage: options.pipelineStage
     });
+    const transcriptOwner = options.scopeId ?? options.callId;
     const handle = await sessionManager.openSession(sessionName, {
       agentName,
       role: options.sessionRole,
@@ -61813,6 +62029,7 @@ function createSessionRunHop(sessionManager, getAgentManager) {
       timeoutSeconds: options.timeoutSeconds,
       featureName: options.featureName,
       storyId: options.storyId,
+      ...transcriptOwner !== undefined ? { transcriptOwner } : {},
       signal: options.abortSignal,
       onSessionEstablished: options.onSessionEstablished
     });
@@ -61965,10 +62182,7 @@ function createRuntime(config2, workdir, opts) {
   let promptAuditor;
   if (opts?.promptAuditor) {
     promptAuditor = opts.promptAuditor;
-  } else if (auditEnabled) {
-    if (!opts?.featureName) {
-      throw new NaxError("createRuntime: featureName is required when promptAudit.enabled is true", "AUDIT_FEATURE_NAME_REQUIRED", { stage: "runtime" });
-    }
+  } else if (auditEnabled && opts?.featureName) {
     promptAuditor = new PromptAuditor(runId, auditDir, opts.featureName);
   } else {
     promptAuditor = createNoOpPromptAuditor();
@@ -62103,7 +62317,6 @@ var init_runtime2 = __esm(() => {
   init_factory();
   init_manager();
   init_config();
-  init_errors();
   init_pid_registry();
   init_findings();
   init_logger2();
@@ -76881,7 +77094,7 @@ var init_escalation = __esm(() => {
 });
 
 // src/execution/lock.ts
-import { rename as rename4, unlink as unlink4 } from "fs/promises";
+import { rename as rename5, unlink as unlink4 } from "fs/promises";
 import path22 from "path";
 function getSafeLogger5() {
   try {
@@ -76998,7 +77211,7 @@ var _lockDeps;
 var init_lock = __esm(() => {
   init_logger2();
   _lockDeps = {
-    rename: rename4
+    rename: rename5
   };
 });
 
@@ -80527,7 +80740,7 @@ var init_plugins2 = __esm(() => {
 });
 
 // src/execution/status-file.ts
-import { rename as rename5, unlink as unlink5 } from "fs/promises";
+import { rename as rename6, unlink as unlink5 } from "fs/promises";
 import { resolve as resolve19 } from "path";
 function countProgress(prd) {
   const stories = prd.userStories;
@@ -80582,7 +80795,7 @@ async function writeStatusFile(filePath, status) {
     await unlink5(tmpPath);
   } catch {}
   await Bun.write(tmpPath, JSON.stringify(status, null, 2));
-  await rename5(tmpPath, resolvedPath);
+  await rename6(tmpPath, resolvedPath);
 }
 var init_status_file = () => {};
 
@@ -80882,7 +81095,7 @@ var init_common = __esm(() => {
 });
 
 // src/plugins/builtin/curator/rollup-prune.ts
-import { appendFile as appendFile5, rename as rename6, unlink as unlink6, writeFile as writeFile7 } from "fs/promises";
+import { appendFile as appendFile5, rename as rename7, unlink as unlink6, writeFile as writeFile7 } from "fs/promises";
 async function scanProjectRunIds(rollupPath, projectKey) {
   const maxTsByRunId = new Map;
   for await (const line of streamJsonlLines(Bun.file(rollupPath))) {
@@ -80954,7 +81167,7 @@ async function pruneRollupUnlocked(input) {
         await flush();
     }
     await flush();
-    await rename6(tmpPath, rollupPath);
+    await rename7(tmpPath, rollupPath);
   } catch (err) {
     await unlink6(tmpPath).catch(() => {});
     throw err;
@@ -81691,7 +81904,7 @@ __export(exports_migrate, {
   migrateCommand: () => migrateCommand
 });
 import { existsSync as existsSync33 } from "fs";
-import { mkdir as mkdir18, readdir as readdir7, rename as rename7 } from "fs/promises";
+import { mkdir as mkdir18, readdir as readdir7, rename as rename8 } from "fs/promises";
 import path25 from "path";
 async function detectGeneratedContent(naxDir) {
   if (!existsSync33(naxDir))
@@ -81780,7 +81993,7 @@ async function migrateCommand(options) {
     const archiveBase = path25.join(globalConfigDir(), "_archive");
     const archiveDest = path25.join(archiveBase, `${options.reclaim}-${Date.now()}`);
     await mkdir18(archiveBase, { recursive: true });
-    await rename7(src, archiveDest);
+    await rename8(src, archiveDest);
     logger.info("migrate", `Reclaimed: archived to ${archiveDest}`, { storyId: "_migrate" });
     return;
   }
@@ -81859,7 +82072,7 @@ async function migrateCommand(options) {
   Remove the destination or run nax migrate --dry-run to inspect.`, "MIGRATE_CONFLICT", { stage: "migrate", src: candidate.srcPath, dest });
     }
     try {
-      await rename7(candidate.srcPath, dest);
+      await rename8(candidate.srcPath, dest);
     } catch (err) {
       const isXdev = err instanceof Error && "code" in err && err.code === "EXDEV";
       if (isXdev) {
@@ -84941,7 +85154,7 @@ var init_queue_file_lock = __esm(() => {
 });
 
 // src/execution/queue-handler.ts
-import { rename as rename8, unlink as unlink9 } from "fs/promises";
+import { rename as rename9, unlink as unlink9 } from "fs/promises";
 import path28 from "path";
 function getSafeLogger7() {
   try {
@@ -84961,7 +85174,7 @@ async function claimCommandsLocked(queuePath, processingPath, logger) {
     return null;
   }
   try {
-    await rename8(queuePath, processingPath);
+    await rename9(queuePath, processingPath);
   } catch (error48) {
     logger?.warn("queue", "Failed to rename queue file for processing", {
       error: error48.message
@@ -90803,7 +91016,7 @@ async function promptsCommand(options) {
     throw new Error(`Feature "${feature}" not found or missing prd.json`);
   }
   const prd = await loadPRD(prdPath);
-  const runtime = _promptsMainDeps.createRuntime(config2, workdir);
+  const runtime = _promptsMainDeps.createRuntime(config2, workdir, { featureName: feature });
   try {
     const stories = storyId ? prd.userStories.filter((s) => s.id === storyId) : prd.userStories;
     if (stories.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nathapp/nax",
-  "version": "0.82.0-canary.1",
+  "version": "0.82.0-canary.2",
   "description": "AI Coding Agent Orchestrator — loops until done",
   "type": "module",
   "bin": {
@@ -68,7 +68,7 @@
     "spec:lint": "bun run scripts/spec-lint.ts"
   },
   "dependencies": {
-    "@nathapp/nax-ai": "0.1.7",
+    "@nathapp/nax-ai": "0.1.8",
     "@types/react": "^19.2.14",
     "chalk": "^5.6.2",
     "commander": "^13.1.0",