@wrongstack/core 0.275.1 → 0.276.2

package/dist/types/index.js

@@ -1,6 +1,6 @@
 import { randomBytes, createCipheriv, createDecipheriv, randomUUID, scryptSync } from 'crypto';
 import * as fs from 'fs/promises';
-import * as path6 from 'path';
+import * as path7 from 'path';
 import * as os from 'os';
 import * as fs2 from 'fs';
 import { readFileSync, statSync } from 'fs';
@@ -46,9 +46,9 @@ var ToolErrorCategory = /* @__PURE__ */ ((ToolErrorCategory2) => {
 // src/types/tool-markers.ts
 var MALFORMED_ARG_MARKERS = ["__raw", "__raw_arguments", "_raw"];
 async function atomicWrite(targetPath, content, opts = {}) {
-  const dir = path6.dirname(targetPath);
+  const dir = path7.dirname(targetPath);
   await fs.mkdir(dir, { recursive: true });
-  const tmp = path6.join(dir, `.${path6.basename(targetPath)}.${randomBytes(6).toString("hex")}.tmp`);
+  const tmp = path7.join(dir, `.${path7.basename(targetPath)}.${randomBytes(6).toString("hex")}.tmp`);
   try {
     if (typeof content === "string") {
       await fs.writeFile(tmp, content, { flag: "wx", encoding: opts.encoding ?? "utf8" });
@@ -107,7 +107,7 @@ async function renameWithRetry(from, to) {
       if (!code || !TRANSIENT_RENAME_CODES.has(code) || i === delays.length) {
         throw err;
       }
-      await new Promise((resolve7) => setTimeout(resolve7, delays[i]));
+      await new Promise((resolve8) => setTimeout(resolve8, delays[i]));
     }
   }
   throw lastErr;
@@ -599,6 +599,25 @@ function compileUserRegex(pattern, flags) {
     };
   }
 }
+function sessionScopedPath(dir, sessionId, suffix) {
+  if (!sessionId || sessionId.includes("\\") || sessionId.includes("..")) {
+    throw invalid(sessionId);
+  }
+  const resolved = path7.resolve(dir, `${sessionId}${suffix}`);
+  const rel = path7.relative(path7.resolve(dir), resolved);
+  if (rel.startsWith("..") || path7.isAbsolute(rel)) {
+    throw invalid(sessionId);
+  }
+  return resolved;
+}
+function invalid(sessionId) {
+  return new FsError({
+    message: `Invalid sessionId: ${sessionId}`,
+    code: ERROR_CODES.FS_DELETE_FAILED,
+    path: sessionId,
+    context: { reason: "path_traversal" }
+  });
+}
 
 // src/utils/string.ts
 function truncate(s, max) {
@@ -1506,8 +1525,8 @@ function resolveToolResultRenderMode(modes, toolName) {
 }
 function wstackGlobalRoot() {
   const fromEnv = process.env["WRONGSTACK_HOME"];
-  if (fromEnv && fromEnv.trim().length > 0) return path6.resolve(fromEnv);
-  return path6.join(os.homedir(), ".wrongstack");
+  if (fromEnv && fromEnv.trim().length > 0) return path7.resolve(fromEnv);
+  return path7.join(os.homedir(), ".wrongstack");
 }
 
 // src/types/errors.ts
@@ -1564,6 +1583,7 @@ var ERROR_CODES = {
   SDD_NOT_READY: "SDD_NOT_READY",
   // General
   VALIDATION_ERROR: "VALIDATION_ERROR",
+  PARSE_FAILED: "PARSE_FAILED",
   UNKNOWN: "UNKNOWN"
 };
 var WrongStackError = class extends Error {
@@ -1738,6 +1758,22 @@ var ToolValidationError = class extends WrongStackError {
     this.name = "ToolValidationError";
   }
 };
+var ParseError = class extends WrongStackError {
+  source;
+  constructor(opts) {
+    super({
+      message: opts.message,
+      code: ERROR_CODES.PARSE_FAILED,
+      subsystem: "general",
+      severity: "error",
+      recoverable: false,
+      context: { source: opts.source, ...opts.context },
+      cause: opts.cause
+    });
+    this.name = "ParseError";
+    this.source = opts.source;
+  }
+};
 function isWrongStackError(err) {
   return err instanceof WrongStackError;
 }
@@ -1765,6 +1801,9 @@ function isToolValidationError(err) {
 function isFetchError(err) {
   return err instanceof FetchError;
 }
+function isParseError(err) {
+  return err instanceof ParseError;
+}
 function isSddError(err) {
   return err instanceof SddError;
 }
@@ -2112,7 +2151,7 @@ var DefaultSecretVault = class {
     const oldVersion = this._keyVersion;
     const newKey = randomBytes(KEY_BYTES);
     const newVersion = oldVersion + 1;
-    fs2.mkdirSync(path6.dirname(this.keyFile), { recursive: true });
+    fs2.mkdirSync(path7.dirname(this.keyFile), { recursive: true });
     const passphrase = getVaultPassphrase();
     if (passphrase) {
       fs2.writeFileSync(this.keyFile, wrapDataKey(newKey, newVersion, passphrase), { mode: 384 });
@@ -2196,7 +2235,7 @@ var DefaultSecretVault = class {
     } catch (err) {
       if (err.code !== "ENOENT") throw err;
     }
-    fs2.mkdirSync(path6.dirname(this.keyFile), { recursive: true });
+    fs2.mkdirSync(path7.dirname(this.keyFile), { recursive: true });
     const key = randomBytes(KEY_BYTES);
     const passphrase = getVaultPassphrase();
     const initialBytes = passphrase ? wrapDataKey(key, 1, passphrase) : key;
@@ -2295,7 +2334,7 @@ async function rewriteConfigEncrypted(configPath, vault, patch) {
   }
   const merged = deepMerge(current, patch ?? {});
   const encrypted = encryptConfigSecrets(merged, vault);
-  await fs.mkdir(path6.dirname(configPath), { recursive: true });
+  await fs.mkdir(path7.dirname(configPath), { recursive: true });
   await atomicWrite(configPath, JSON.stringify(encrypted, null, 2), { mode: 384 });
   await restrictFilePermissions(configPath);
 }
@@ -2521,7 +2560,7 @@ var DefaultLogger = class _DefaultLogger {
     this.stderr = opts.stderr !== false;
     this.maxFileBytes = opts.maxFileBytes ?? 10 * 1024 * 1024;
     if (this.file) {
-      const dir = path6.dirname(this.file);
+      const dir = path7.dirname(this.file);
       this._tail = this._tail.then(async () => {
         await fs.mkdir(dir, { recursive: true });
       }).catch(() => void 0);
@@ -2668,6 +2707,7 @@ var DefaultTokenCounter = class {
   registry;
   providerId;
   events;
+  sessionId;
   priceCache = /* @__PURE__ */ new Map();
   /** Most recently accounted request's tokens. Used for per-request context pressure. */
   lastInput = 0;
@@ -2676,8 +2716,13 @@ var DefaultTokenCounter = class {
     this.registry = opts.registry;
     this.providerId = opts.providerId;
     this.events = opts.events;
+    this.sessionId = opts.sessionId;
+  }
+  setSessionId(sessionId) {
+    this.sessionId = sessionId;
   }
   account(usage, model) {
+    const eventSessionId = this.currentSessionId();
     this.input += usage.input;
     this.output += usage.output;
     this.cacheRead += usage.cacheRead ?? 0;
@@ -2687,7 +2732,7 @@ var DefaultTokenCounter = class {
     const price = model ? this.priceCache.get(model) : void 0;
     if (price) {
       this.applyPrice(usage, price);
-      this.emitAccounted();
+      this.emitAccounted(eventSessionId);
       return;
     }
     if (this.registry && this.providerId && model) {
@@ -2701,18 +2746,22 @@ var DefaultTokenCounter = class {
           this.priceCache.set(model, p);
           this.applyPrice(usage, p);
         }
-        this.emitAccounted();
+        this.emitAccounted(eventSessionId);
       }).catch(() => {
-        this.events?.emit("token.cost_estimate_unavailable", { model: model ?? "<unknown>" });
-        this.emitAccounted();
+        this.events?.emit("token.cost_estimate_unavailable", {
+          ...eventSessionId ? { sessionId: eventSessionId } : {},
+          model: model ?? "<unknown>"
+        });
+        this.emitAccounted(eventSessionId);
         return void 0;
       });
       return;
     }
-    this.emitAccounted();
+    this.emitAccounted(eventSessionId);
   }
   /** Synchronous variant for code paths that have already resolved the model. */
   accountWithModel(usage, resolved) {
+    const eventSessionId = this.currentSessionId();
     this.input += usage.input;
     this.output += usage.output;
     this.cacheRead += usage.cacheRead ?? 0;
@@ -2726,7 +2775,7 @@ var DefaultTokenCounter = class {
     }
     this.priceCache.set(resolved.modelId, price);
     this.applyPrice(usage, price);
-    this.emitAccounted();
+    this.emitAccounted(eventSessionId);
   }
   total() {
     return {
@@ -2739,6 +2788,10 @@ var DefaultTokenCounter = class {
   currentRequestTokens() {
     return { input: this.lastInput, cacheRead: this.lastCacheRead };
   }
+  setCurrentRequestTokens(input, cacheRead) {
+    this.lastInput = input;
+    this.lastCacheRead = cacheRead ?? 0;
+  }
   estimateCost() {
     return {
       input: round4(this.costInput),
@@ -2759,12 +2812,17 @@ var DefaultTokenCounter = class {
   invalidateCache() {
     this.priceCache.clear();
   }
-  emitAccounted() {
+  emitAccounted(sessionId = this.currentSessionId()) {
     this.events?.emit("token.accounted", {
+      ...sessionId ? { sessionId } : {},
       usage: this.total(),
       cost: { input: this.costInput, output: this.costOutput, total: this.costInput + this.costOutput }
     });
   }
+  currentSessionId() {
+    const value = typeof this.sessionId === "function" ? this.sessionId() : this.sessionId;
+    return typeof value === "string" && value.length > 0 ? value : void 0;
+  }
   reset() {
     this.input = 0;
     this.output = 0;
@@ -2818,6 +2876,18 @@ var MEMORY_TYPE_LABELS = {
 };
 
 // src/execution/compaction-core.ts
+var FAILURE_PATTERN = /(error|fail|exception|timeout|enonet|eacces|eperm|enoent|abort)/i;
+var CORRECTION_PATTERN = /\b(wrong|no\b|stop\b|don'?t\b|actually|fix that|undo|revert|forget|ignore|skip)\b/i;
+var ERROR_LANG_PATTERN = /\b(error|exception|fatal|critical|crash|panic|abort|segfault|core dump|undefined is not|null pointer|typeerror|referenceerror|syntaxerror)\b/i;
+var SECURITY_PATTERN = /\b(security|vulnerability|injection|xss|csrf|secret|apikey|api.key|hardcoded|leak|exploit|cve)\b/i;
+var ARCHITECTURE_PATTERN = /\b(architecture|design|approach|strategy|pattern|refactor|migrate|restructure|decision|trade.?off)\b/i;
+var BOILERPLATE_PATTERN = /\b(files_with_matches|count|found \d+ match|directory tree|\.\.\. and \d+ more)\b/i;
+var PATH_HINT_PATTERN = /(?:(?:[A-Za-z]:)?[./\\]?[\w@.-]+(?:[\\/][\w@(). -]+)+\.[A-Za-z0-9]{1,12})/g;
+var PATH_BACKSLASH_PATTERN = /\\/g;
+var PATH_TRIM_PATTERN = /^["'`]+|["'`),;:]+$/g;
+var ERROR_LINE_PATTERN = /\b(error|exception|failed|failure|fatal|panic|timeout|denied|enoent|eacces|eperm)\b/i;
+var NEWLINE_SPLIT_PATTERN = /\r?\n/;
+var WHITESPACE_COLLAPSE_PATTERN = /\s+/g;
 function compactionDebugEnabled() {
   return process.env["NODE_ENV"] === "development" || process.env["WRONGSTACK_DEBUG"] === "1";
 }
@@ -3053,9 +3123,8 @@ function summarizeToolResultElision(block, tokens) {
 function extractPathHints(content) {
   const text = typeof content === "string" ? content : JSON.stringify(content);
   const out = /* @__PURE__ */ new Set();
-  const re = /(?:(?:[A-Za-z]:)?[./\\]?[\w@.-]+(?:[\\/][\w@(). -]+)+\.[A-Za-z0-9]{1,12})/g;
-  for (const match of text.matchAll(re)) {
-    const clean = match[0]?.replace(/\\/g, "/").replace(/^["'`]+|["'`),;:]+$/g, "");
+  for (const match of text.matchAll(PATH_HINT_PATTERN)) {
+    const clean = match[0]?.replace(PATH_BACKSLASH_PATTERN, "/").replace(PATH_TRIM_PATTERN, "");
     if (clean && clean.length <= 220) out.add(clean);
     if (out.size >= 5) break;
   }
@@ -3063,12 +3132,9 @@ function extractPathHints(content) {
 }
 function firstErrorLine(content) {
   const text = typeof content === "string" ? content : JSON.stringify(content);
-  for (const line of text.split(/\r?\n/)) {
-    if (!/\b(error|exception|failed|failure|fatal|panic|timeout|denied|enoent|eacces|eperm)\b/i.test(
-      line
-    ))
-      continue;
-    const trimmed = line.replace(/\s+/g, " ").trim();
+  for (const line of text.split(NEWLINE_SPLIT_PATTERN)) {
+    if (!ERROR_LINE_PATTERN.test(line)) continue;
+    const trimmed = line.replace(WHITESPACE_COLLAPSE_PATTERN, " ").trim();
     if (trimmed) return trimmed.slice(0, 180);
   }
   return void 0;
@@ -3115,9 +3181,9 @@ function scoreMessage(m, context) {
     if (hasToolUse2(m) || hasResult) return 0;
   }
   if (context?.failureCounts && m.role === "user" && hasToolUse2(m) === false) {
-    const isFailure = /error|fail|exception|timeout|enonet|eacces|eperm|enoent|abort/i.test(text);
-    if (isFailure) {
-      const errKey = /(error|fail|exception|timeout|enonet|eacces|eperm|enoent|abort)/i.exec(text)?.[0]?.toLowerCase() ?? "error";
+    const failureMatch = FAILURE_PATTERN.exec(text);
+    if (failureMatch) {
+      const errKey = failureMatch[0]?.toLowerCase() ?? "error";
       const count = (context.failureCounts.get(errKey) ?? 0) + 1;
       context.failureCounts.set(errKey, count);
       if (count >= 5) return 0;
@@ -3125,29 +3191,21 @@ function scoreMessage(m, context) {
     }
   }
   if (m.role === "user") {
-    if (/\b(wrong|no\b|stop\b|don'?t\b|actually|fix that|undo|revert|forget|ignore|skip)\b/i.test(
-      text
-    )) {
+    if (CORRECTION_PATTERN.test(text)) {
       return 5;
     }
   }
-  if (/\b(error|exception|fatal|critical|crash|panic|abort|segfault|core dump|undefined is not|null pointer|typeerror|referenceerror|syntaxerror)\b/i.test(
-    text
-  )) {
+  if (ERROR_LANG_PATTERN.test(text)) {
     return 5;
   }
-  if (/\b(security|vulnerability|injection|xss|csrf|secret|apikey|api.key|hardcoded|leak|exploit|cve)\b/i.test(
-    text
-  )) {
+  if (SECURITY_PATTERN.test(text)) {
     return 5;
   }
-  if (m.role === "assistant" && /\b(architecture|design|approach|strategy|pattern|refactor|migrate|restructure|decision|trade.?off)\b/i.test(
-    text
-  )) {
+  if (m.role === "assistant" && ARCHITECTURE_PATTERN.test(text)) {
     return 5;
   }
   if (hasLargeToolResult(m)) return 1;
-  if (m.role === "user" && !hasToolUse2(m) && /\b(files_with_matches|count|found \d+ match|directory tree|\.\.\. and \d+ more)\b/i.test(text)) {
+  if (m.role === "user" && !hasToolUse2(m) && BOILERPLATE_PATTERN.test(text)) {
     return 1;
   }
   return 3;
@@ -3157,6 +3215,11 @@ function buildSmartDigest(messages) {
   const failureCounts = /* @__PURE__ */ new Map();
   let noiseCount = 0;
   for (const m of messages) {
+    const isPureToolIO = Array.isArray(m.content) && m.content.length > 0 && !hasToolUse2(m) && m.content.every((b) => b.type === "tool_result");
+    if (isPureToolIO) {
+      noiseCount++;
+      continue;
+    }
     const score = scoreMessage(m, { failureCounts });
     const text = extractText(m);
     const toolCount = countToolBlocks(m);
@@ -3369,52 +3432,52 @@ var DefaultPathResolver = class {
   projectRoot;
   cwd;
   constructor(cwd = process.cwd()) {
-    this.cwd = path6.resolve(cwd);
+    this.cwd = path7.resolve(cwd);
     this.projectRoot = this.detectProjectRoot(this.cwd);
   }
   detectProjectRoot(start) {
-    let dir = path6.resolve(start);
-    const root = path6.parse(dir).root;
-    const home = path6.resolve(os.homedir());
-    const startPath = path6.resolve(start);
+    let dir = path7.resolve(start);
+    const root = path7.parse(dir).root;
+    const home = path7.resolve(os.homedir());
+    const startPath = path7.resolve(start);
     while (dir !== root) {
       if (dir === home && dir !== startPath) {
         break;
       }
       for (const marker of PROJECT_MARKERS) {
         try {
-          fs2.accessSync(path6.join(dir, marker));
+          fs2.accessSync(path7.join(dir, marker));
           return dir;
         } catch {
         }
       }
-      const parent = path6.dirname(dir);
+      const parent = path7.dirname(dir);
       if (parent === dir) break;
       dir = parent;
     }
     return startPath;
   }
   resolve(input) {
-    const abs = path6.isAbsolute(input) ? input : path6.resolve(this.cwd, input);
+    const abs = path7.isAbsolute(input) ? input : path7.resolve(this.cwd, input);
     let real;
     try {
       real = fs2.realpathSync(abs);
     } catch {
-      real = path6.normalize(abs);
+      real = path7.normalize(abs);
     }
     return real;
   }
   isInsideRoot(absPath) {
-    const normalized = path6.normalize(absPath);
-    const root = path6.normalize(this.projectRoot);
+    const normalized = path7.normalize(absPath);
+    const root = path7.normalize(this.projectRoot);
     if (normalized === root) return true;
-    const rel = path6.relative(root, normalized);
-    return !rel.startsWith("..") && !path6.isAbsolute(rel);
+    const rel = path7.relative(root, normalized);
+    return !rel.startsWith("..") && !path7.isAbsolute(rel);
   }
   ensureInsideRoot(absPath) {
     const resolved = this.resolve(absPath);
     if (!this.isInsideRoot(resolved)) {
-      const display = path6.isAbsolute(absPath) ? path6.basename(absPath) : absPath;
+      const display = path7.isAbsolute(absPath) ? path7.basename(absPath) : absPath;
       const err = new Error(`Path "${display}" resolves outside the project root`);
       err.fullPath = absPath;
       err.projectRoot = this.projectRoot;
@@ -3463,7 +3526,7 @@ function buildRecoveryStrategies(opts) {
       label: "downgrade_model",
       async attempt(err, ctx) {
         if (!(err instanceof ProviderError)) return null;
-        if (err.status !== 429 && err.status !== 529 && err.status < 500) return null;
+        if (err.status !== 529 && err.status < 500) return null;
         const registry = opts?.modelsRegistry;
         if (!registry) return null;
         try {
@@ -3486,7 +3549,7 @@ function buildRecoveryStrategies(opts) {
           });
           if (candidates.length === 0) return null;
           const fallback = candidates.reduce(
-            (prev, curr) => (curr.cost?.input ?? 0) < (prev.cost?.input ?? 0) ? curr : prev
+            (prev, curr) => (curr.cost?.input ?? Number.POSITIVE_INFINITY) < (prev.cost?.input ?? Number.POSITIVE_INFINITY) ? curr : prev
           );
           return {
             action: "retry",
@@ -3769,13 +3832,27 @@ var PATTERNS = [
     // Min 12 chars: some OAuth providers issue shorter-lived tokens (< 20
     // chars). A 12-char base64 string has ~71 bits of entropy — above the
     // threshold where random strings are unlikely to produce false matches.
-    regex: /(?:^|[^A-Za-z0-9_.~+/-])Bearer\s+[A-Za-z0-9._~+/-]{12,512}=*(?:$|[^A-Za-z0-9_.~+/-])/g
+    // The trailing boundary is a NON-consuming lookahead: two adjacent bearer
+    // tokens sharing a single delimiter (`Bearer a… Bearer b…`) must both be
+    // redacted. A consuming trailing delimiter would eat the separator the
+    // next match needs for its leading anchor, leaking the second token.
+    regex: /(?:^|[^A-Za-z0-9_.~+/-])Bearer\s+[A-Za-z0-9._~+/-]{12,512}=*(?=$|[^A-Za-z0-9_.~+/-])/g
   },
   {
     type: "high_entropy_env",
     // Anchored with alternation instead of lookbehind to avoid backtracking.
     // Value bounded at 512 chars.
-    regex: /(?:^|\s)([A-Z_]{4,}(?:KEY|TOKEN|SECRET|PASSWORD|PWD))\s*[:=]\s*['"]?([A-Za-z0-9_/+=-]{20,512})['"]?(?:\s|$)/g
+    // The trailing boundary is a NON-consuming lookahead so two secrets
+    // separated by a single delimiter (one space OR one newline, e.g.
+    // `printenv` / `.env` dumps: `API_KEY=… \n SESSION_TOKEN=…`) are BOTH
+    // redacted. A consuming trailing `\s` would swallow the separator the
+    // next match needs for its leading anchor, so every other secret would
+    // leak in plaintext.
+    // The leading delimiter is CAPTURED (group 1) and re-emitted by the
+    // replacement so the separator between adjacent secrets is preserved
+    // rather than collapsed. Capture groups are therefore: 1=leading
+    // delimiter, 2=key name, 3=value.
+    regex: /(^|\s)([A-Z_]{4,}(?:KEY|TOKEN|SECRET|PASSWORD|PWD))\s*[:=]\s*['"]?([A-Za-z0-9_/+=-]{20,512})['"]?(?=\s|$)/g
   }
 ];
 var SIMPLE_PATTERNS = PATTERNS.filter((p) => p.type !== "high_entropy_env");
@@ -3783,6 +3860,7 @@ var COMBINED_REGEX = new RegExp(SIMPLE_PATTERNS.map((p) => `(${p.regex.source})`
 var HIGH_ENTROPY_REGEX = PATTERNS.find((p) => p.type === "high_entropy_env").regex;
 var COMBINED_REPLACEMENTS = SIMPLE_PATTERNS.map((p) => `[REDACTED:${p.type}]`);
 var SCRUB_CHUNK_BYTES = 64 * 1024;
+var SCRUB_OVERLAP_BYTES = 1024;
 function hasCredentialAnchors(text) {
   return text.includes("-----BEGIN") || // Private keys (most unique → cheap reject)
   text.includes("sk-") || // Anthropic + OpenAI keys
@@ -3817,8 +3895,16 @@ var DefaultSecretScrubber = class {
     while (i < text.length) {
       let end = Math.min(i + SCRUB_CHUNK_BYTES, text.length);
       if (end < text.length) {
-        const nl = text.lastIndexOf("\n", end);
-        if (nl > i + SCRUB_CHUNK_BYTES / 2) end = nl + 1;
+        const limit = Math.min(end + SCRUB_OVERLAP_BYTES, text.length);
+        let safe = -1;
+        for (let j = end; j < limit; j++) {
+          const ch = text.charCodeAt(j);
+          if (ch === 32 || ch === 9 || ch === 10 || ch === 13) {
+            safe = j;
+            break;
+          }
+        }
+        end = safe === -1 ? end : safe + 1;
       }
       out.push(this.scrubOne(text.slice(i, end)));
       i = end;
@@ -3836,8 +3922,8 @@ var DefaultSecretScrubber = class {
         return replacement !== void 0 ? replacement : match;
       }
     );
-    out = out.replace(HIGH_ENTROPY_REGEX, (_match, group1, _group2) => {
-      return `${group1}=[REDACTED:high_entropy_env]`;
+    out = out.replace(HIGH_ENTROPY_REGEX, (_match, lead, key, _value) => {
+      return `${lead}${key}=[REDACTED:high_entropy_env]`;
     });
     return out;
   }
@@ -3898,6 +3984,14 @@ var DefaultModelsRegistry = class {
   payload;
   /** Memoised overlay payload (in-memory / fetched / file). */
   overlayPayload;
+  /**
+   * Extra providers injected at runtime via `mergeOverlay()` — e.g. an
+   * openai-compatible server (omniroute, LiteLLM, …) auto-discovered from its
+   * `/v1/models` endpoint at boot. Applied LAST (on top of base + curated
+   * overlay) and re-applied across `refresh()` so the discovered catalog
+   * survives a models.dev refetch.
+   */
+  extraOverlay;
   fetchedAt;
   cacheFile;
   url;
@@ -3922,7 +4016,7 @@ var DefaultModelsRegistry = class {
     this.overlay = opts.overlay;
     this.overlayUrl = opts.overlayUrl;
     this.overlayFile = opts.overlayFile;
-    this.overlayCacheFile = opts.overlayCacheFile ?? (opts.overlayUrl ? path6.join(path6.dirname(opts.cacheFile), "models-overlay-cache.json") : void 0);
+    this.overlayCacheFile = opts.overlayCacheFile ?? (opts.overlayUrl ? path7.join(path7.dirname(opts.cacheFile), "models-overlay-cache.json") : void 0);
   }
   async load(opts = {}) {
     if (this.payload && !opts.force) return this.payload;
@@ -3933,9 +4027,22 @@ var DefaultModelsRegistry = class {
     }
     const overlay = await this.loadOverlay(opts);
     const base = await this.loadBase(opts, Object.keys(overlay).length > 0);
-    this.payload = mergeModelsPayload(base, overlay);
+    this.payload = this.withExtraOverlay(mergeModelsPayload(base, overlay));
     return this.payload;
   }
+  /**
+   * Merge an additional provider payload on top of the resolved catalog. Used
+   * for runtime-discovered openai-compatible providers. Remembered so it is
+   * re-applied across `refresh()`. A no-op for an empty payload.
+   */
+  mergeOverlay(payload) {
+    if (!hasEntries(payload)) return;
+    this.extraOverlay = this.extraOverlay ? mergeModelsPayload(this.extraOverlay, payload) : payload;
+    if (this.payload) this.payload = mergeModelsPayload(this.payload, this.extraOverlay);
+  }
+  withExtraOverlay(payload) {
+    return this.extraOverlay ? mergeModelsPayload(payload, this.extraOverlay) : payload;
+  }
   /**
    * Load the models.dev base payload: fresh cache → network → stale cache.
    * On total failure, degrade to `{}` (so a non-empty overlay still drives
@@ -3984,7 +4091,11 @@ var DefaultModelsRegistry = class {
       });
       clearTimeout(timeout);
       if (!res.ok) {
-        throw new Error(`ModelsRegistry: HTTP ${res.status} fetching ${this.url}`);
+        throw new FetchError({
+          message: `ModelsRegistry: HTTP ${res.status} fetching ${this.url}`,
+          status: res.status,
+          context: { url: this.url, op: "refreshModels" }
+        });
       }
       const json = await res.json();
       this.fetchedAt = /* @__PURE__ */ new Date();
@@ -3998,7 +4109,11 @@ var DefaultModelsRegistry = class {
     } catch (err) {
       clearTimeout(timeout);
       if (err instanceof Error && err.name === "AbortError") {
-        throw new Error(`ModelsRegistry: fetch timed out after ${this.refreshTimeoutMs}ms`);
+        throw new FetchError({
+          message: `ModelsRegistry: fetch timed out after ${this.refreshTimeoutMs}ms`,
+          status: 408,
+          context: { url: this.url, op: "refreshModels", timedOut: true }
+        });
       }
       throw err;
     }
@@ -4034,7 +4149,11 @@ var DefaultModelsRegistry = class {
         method: "GET",
         headers: { accept: "application/json" }
       });
-      if (!res.ok) throw new Error(`HTTP ${res.status}`);
+      if (!res.ok) throw new FetchError({
+        message: `HTTP ${res.status}`,
+        status: res.status,
+        context: { url: this.url, op: "refreshModels" }
+      });
       const json = await res.json();
       const envelope = {
         fetchedAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -4068,7 +4187,7 @@ var DefaultModelsRegistry = class {
   async refresh() {
     const base = await this.refreshBase();
     const overlay = await this.loadOverlay({ force: true });
-    this.payload = mergeModelsPayload(base, overlay);
+    this.payload = this.withExtraOverlay(mergeModelsPayload(base, overlay));
     return this.payload;
   }
   async listProviders() {
@@ -4146,7 +4265,7 @@ var DefaultModelsRegistry = class {
   }
   /** Used by `wstack models refresh` to expose where the cache lives. */
   cacheLocation() {
-    return path6.resolve(this.cacheFile);
+    return path7.resolve(this.cacheFile);
   }
 };
 function formatAge(seconds) {
@@ -4165,18 +4284,18 @@ function hasEntries(payload) {
 function modePrompt(id) {
   for (const dir of modePromptDirCandidates()) {
     try {
-      return readFileSync(path6.join(dir, `${id}.md`), "utf8").trimEnd();
+      return readFileSync(path7.join(dir, `${id}.md`), "utf8").trimEnd();
     } catch {
     }
   }
   return "";
 }
 function modePromptDirCandidates() {
-  const here = path6.dirname(fileURLToPath(import.meta.url));
+  const here = path7.dirname(fileURLToPath(import.meta.url));
   const candidates = [
-    path6.resolve(here, "../../instructions/modes"),
-    path6.resolve(here, "../instructions/modes"),
-    path6.resolve(here, "instructions/modes")
+    path7.resolve(here, "../../instructions/modes"),
+    path7.resolve(here, "../instructions/modes"),
+    path7.resolve(here, "instructions/modes")
   ];
   return candidates.sort((a, b) => Number(!isDirectory(a)) - Number(!isDirectory(b)));
 }
@@ -4293,7 +4412,7 @@ var DEFAULT_MODES = [
     description: "Current-data research \u2014 search web, verify, inject findings into context",
     prompt: modePrompt("research-web"),
     tags: ["research", "web", "current-data", "up-to-date"],
-    toolPreferences: ["web_search", "web_fetch", "search", "fetch", "context_manager"],
+    toolPreferences: ["search/fetch", "search/fetch", "search", "fetch", "context_manager"],
     suggestedSkills: ["research-web", "tech-stack", "node-modern", "security-scanner", "react-modern"]
   }
 ];
@@ -4479,7 +4598,7 @@ var InMemoryAgentBridge = class {
       });
     }
     this.inflightGuards.add(correlationId);
-    return new Promise((resolve7, reject) => {
+    return new Promise((resolve8, reject) => {
       const timer = setTimeout(() => {
         this.inflightGuards.delete(correlationId);
         this.pendingRequests.delete(correlationId);
@@ -4498,7 +4617,7 @@ var InMemoryAgentBridge = class {
         return;
       }
       this.pendingRequests.set(correlationId, {
-        resolve: resolve7,
+        resolve: resolve8,
         reject,
         timer
       });
@@ -4741,6 +4860,64 @@ var ToolExecutor = class _ToolExecutor {
     const mode = resolveToolResultRenderMode(modes, toolName);
     renderer.setResultRenderMode(toolName, mode);
   }
+  toolLogBase(ctx, use, toolName, durationMs) {
+    return {
+      event: "tool.execution",
+      traceId: ctx.traceId,
+      sessionId: ctx.session.id,
+      agentId: ctx.agentId ?? "<unknown>",
+      toolName,
+      toolUseId: use.id,
+      durationMs
+    };
+  }
+  logToolSuccess(ctx, use, toolName, durationMs, outputChars) {
+    this.opts.events?.emit("tool.completed", {
+      name: toolName,
+      id: use.id,
+      sessionId: ctx.session.id,
+      ...ctx.traceId ? { traceId: ctx.traceId } : {},
+      agentId: ctx.agentId ?? "<unknown>",
+      durationMs,
+      outputChars
+    });
+    this.opts.logger?.info("tool execution completed", {
+      ...this.toolLogBase(ctx, use, toolName, durationMs),
+      outcome: "success",
+      isError: false,
+      outputChars
+    });
+  }
+  logToolFailure(ctx, use, toolName, durationMs, err) {
+    const { category, retryable, detail } = classifyToolError(err);
+    const structured = isWrongStackError(err);
+    const structuredError = structured ? {
+      errorCode: err.code,
+      errorSubsystem: err.subsystem,
+      errorSeverity: err.severity
+    } : {};
+    this.opts.events?.emit("tool.failed", {
+      name: toolName,
+      id: use.id,
+      sessionId: ctx.session.id,
+      ...ctx.traceId ? { traceId: ctx.traceId } : {},
+      agentId: ctx.agentId ?? "<unknown>",
+      durationMs,
+      category,
+      retryable,
+      ...detail ? { detail } : {},
+      ...structuredError
+    });
+    this.opts.logger?.warn("tool execution failed", {
+      ...this.toolLogBase(ctx, use, toolName, durationMs),
+      outcome: "failure",
+      isError: true,
+      errorCategory: category,
+      retryable,
+      errorDetail: detail,
+      ...structuredError
+    });
+  }
   /**
    * Execute a batch of tool uses using the configured strategy.
    * Returns the execution results and the remaining output budget.
@@ -4871,7 +5048,8 @@ ${errorDetails}`,
         "tool.has_dangerous_capabilities": toolCapsForAudit.length > 0
       });
       try {
-        let { block: result, bytes } = await this.executeTool(tool, use, ctx, budget);
+        const producedText = await this.produceToolOutput(tool, use, ctx, budget);
+        let { block: result, bytes } = this.settleToolOutput(tool, use, producedText, budget);
         budget -= bytes;
         if (this.opts.hookRunner?.has("PostToolUse")) {
           const post = await this.opts.hookRunner.postToolUse(
@@ -4888,13 +5066,18 @@ ${post.additionalContext}`;
             budget = Math.max(0, budget - Buffer.byteLength(appended, "utf8"));
           }
         }
+        const outputChars = typeof result.content === "string" ? result.content.length : 0;
         span?.setAttribute("tool.is_error", !!result.is_error);
-        span?.setAttribute(
-          "tool.output_bytes",
-          typeof result.content === "string" ? result.content.length : 0
-        );
+        span?.setAttribute("tool.output_bytes", outputChars);
+        this.logToolSuccess(ctx, use, tool.name, Date.now() - start, outputChars);
         return { result, tool, durationMs: Date.now() - start };
       } catch (err) {
+        if (isWrongStackError(err)) {
+          if (err instanceof Error) span?.recordError(err);
+          span?.setAttribute("tool.is_error", true);
+          this.logToolFailure(ctx, use, tool.name, Date.now() - start, err);
+          throw err;
+        }
         const msg = toErrorMessage(err);
         const scrubbed = this.opts.secretScrubber.scrub(msg);
         const { category, retryable, detail } = classifyToolError(err);
@@ -4912,6 +5095,7 @@ ${post.additionalContext}`;
         span?.setAttribute("tool.error_category", category);
         span?.setAttribute("tool.error_retryable", retryable);
         if (detail) span?.setAttribute("tool.error_detail", detail);
+        this.logToolFailure(ctx, use, tool.name, Date.now() - start, err);
         return { result, tool, durationMs: Date.now() - start };
       } finally {
         span?.end();
@@ -4921,7 +5105,8 @@ ${post.additionalContext}`;
       try {
         return await runOne(use);
       } catch (err) {
-        const msg = toErrorMessage(err);
+        const isStructured = isWrongStackError(err);
+        const msg = isStructured ? err.describe() : toErrorMessage(err);
         const scrubbed = this.opts.secretScrubber.scrub(msg);
         const { category, retryable, detail } = classifyToolError(err);
         const tool = this.registry.get(use.name);
@@ -4931,7 +5116,7 @@ ${post.additionalContext}`;
         const result = {
           type: "tool_result",
           tool_use_id: use.id,
-          content: `Tool "${use.name}" execution failed: ${scrubbed}`,
+          content: isStructured ? scrubbed : `Tool "${use.name}" execution failed: ${scrubbed}`,
           is_error: true
         };
         budget = this.budgetForString(result.content, budget);
@@ -4974,7 +5159,23 @@ ${post.additionalContext}`;
    * to call a tool" and "tool.executed".
    */
   async executeTool(tool, use, ctx, budget) {
+    const text = await this.produceToolOutput(tool, use, ctx, budget);
+    return this.settleToolOutput(tool, use, text, budget);
+  }
+  /**
+   * Async "produce" phase: run the tool, serialize, scrub, and spill an
+   * oversized output to a disk artifact. Returns the pre-cap text. This is
+   * the long-running, concurrency-safe part — it touches NO shared budget
+   * state, so multiple invocations can run in parallel without racing.
+   *
+   * The `budgetHint` only gates the disk-spill threshold (a heuristic for
+   * "is this output large enough to persist"); it is NOT the output cap.
+   * The authoritative cap is applied synchronously in settleToolOutput()
+   * against the live budget.
+   */
+  async produceToolOutput(tool, use, ctx, budgetHint) {
     this.opts.events?.emit("tool.started", {
+      sessionId: ctx.session.id,
       name: tool.name,
       id: use.id,
       input: use.input
@@ -4983,8 +5184,20 @@ ${post.additionalContext}`;
     const output = await this.runWithTimeout(tool, use.input, ctx.signal, ctx, use.id);
     const text = this.serializer.serialize(output, { toolName: tool.name, input: use.input, tool });
     const scrubbed = this.opts.secretScrubber.scrub(text);
-    const withArtifact = await maybePersistLargeToolOutput(tool.name, scrubbed, budget);
-    const { text: capped, newBudget } = this.serializer.enforceCap(withArtifact, budget);
+    return maybePersistLargeToolOutput(tool.name, scrubbed, budgetHint);
+  }
+  /**
+   * Synchronous "settle" phase: enforce the output cap against the CURRENT
+   * budget, render, and build the result block. This MUST stay synchronous
+   * (no awaits) so that, in the parallel/smart strategies, two tools settling
+   * one after another against the shared closure budget can't interleave a
+   * stale read with a write. The first to settle consumes its bytes; the next
+   * settles against the reduced budget; once the budget hits 0, enforceCap
+   * truncates — making the per-iteration cap genuinely CUMULATIVE across
+   * parallel tools instead of degrading into a per-tool cap.
+   */
+  settleToolOutput(tool, use, text, budget) {
+    const { text: capped, newBudget } = this.serializer.enforceCap(text, budget);
     this.hintRenderMode(tool.name);
     this.opts.renderer?.writeToolResult(tool.name, capped, false);
     return {
@@ -5037,7 +5250,12 @@ ${post.additionalContext}`;
     let finalOutput;
     let sawFinal = false;
     if (!tool.executeStream) {
-      throw new Error(`Tool "${tool.name}" does not support streaming execution`);
+      throw new ToolError({
+        message: `Tool "${tool.name}" does not support streaming execution`,
+        code: "TOOL_EXECUTION_FAILED",
+        toolName: tool.name,
+        context: { reason: "streaming_not_supported" }
+      });
     }
     const stream = tool.executeStream(input, ctx, { signal });
     const iter = stream[Symbol.asyncIterator]();
@@ -5047,6 +5265,7 @@ ${post.additionalContext}`;
     let lastProgressEmitAt = 0;
     const emitProgress = (ev) => {
       this.opts.events?.emit("tool.progress", {
+        sessionId: ctx.session.id,
         name: tool.name,
         id: toolUseId ?? "<unknown>",
         event: ev
@@ -5102,7 +5321,12 @@ ${progressTail}`;
       await iter.return?.(void 0);
     }
     if (!sawFinal) {
-      throw new Error(`tool "${tool.name}" executeStream completed without a 'final' event`);
+      throw new ToolError({
+        message: `tool "${tool.name}" executeStream completed without a 'final' event`,
+        code: "TOOL_EXECUTION_FAILED",
+        toolName: tool.name,
+        context: { reason: "missing_final_event" }
+      });
     }
     return finalOutput;
   }
@@ -5226,6 +5450,15 @@ function classifyToolError(err) {
   if (err instanceof Error && err.message.includes("validation")) {
     return { category: "validation" /* VALIDATION */, retryable: false, detail: "validation" };
   }
+  if (err instanceof WrongStackError) {
+    const wse = err;
+    const category = wse.severity === "warning" ? "transient" /* TRANSIENT */ : "fatal" /* FATAL */;
+    return {
+      category,
+      retryable: wse.recoverable,
+      detail: `${wse.code} [${wse.subsystem}]`
+    };
+  }
   return {
     category: "fatal" /* FATAL */,
     retryable: false,
@@ -5253,11 +5486,11 @@ async function maybePersistLargeToolOutput(toolName, content, budget) {
     return content;
   }
   try {
-    const dir = path6.join(wstackGlobalRoot(), "tool-output");
+    const dir = path7.join(wstackGlobalRoot(), "tool-output");
     await fs.mkdir(dir, { recursive: true });
     const safeTool = toolName.replace(/[^a-zA-Z0-9._-]+/g, "_").slice(0, 40) || "tool";
     const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-    const filePath = path6.join(dir, `${stamp}-${safeTool}-${randomUUID()}.log`);
+    const filePath = path7.join(dir, `${stamp}-${safeTool}-${randomUUID()}.log`);
     await fs.writeFile(filePath, content, "utf8");
     return content + `
 [full tool output: ${bytes} bytes at ${filePath}; read/grep that file selectively instead of re-running or requesting more output]`;
@@ -5617,11 +5850,11 @@ var Context = class {
    * Returns the resolved absolute path.
    */
   setWorkingDir(dir) {
-    const resolved = path6.isAbsolute(dir) ? path6.resolve(dir) : path6.resolve(this.projectRoot, dir);
+    const resolved = path7.isAbsolute(dir) ? path7.resolve(dir) : path7.resolve(this.projectRoot, dir);
     if (!this.allowOutsideProjectRoot) {
-      const root = path6.resolve(this.projectRoot);
-      const rel = path6.relative(root, resolved);
-      if (rel.startsWith("..") || path6.isAbsolute(rel)) {
+      const root = path7.resolve(this.projectRoot);
+      const rel = path7.relative(root, resolved);
+      if (rel.startsWith("..") || path7.isAbsolute(rel)) {
         throw new Error(
           `Working directory "${resolved}" is outside project root "${root}"`
         );
@@ -5668,7 +5901,7 @@ var DefaultSessionReader = class _DefaultSessionReader {
     if (!rootDir) {
       return await this.store.load(sessionId);
     }
-    const sessionPath = path6.join(rootDir, `${sessionId}.jsonl`);
+    const sessionPath = sessionScopedPath(rootDir, sessionId, ".jsonl");
     let mtimeMs = null;
     try {
       const stat4 = await fs.stat(sessionPath);
@@ -6029,6 +6262,6 @@ function renderPlainText(meta, events) {
   return lines.join("\n");
 }
 
-export { AgentError, BUILTIN_PROMPT_CATEGORIES, CONTEXT_WINDOW_MODES, ConfigError, Context, DEFAULT_AUTONOMY_CONFIG, DEFAULT_CIRCUIT_BREAKER_CONFIG, DEFAULT_CONTEXT_CONFIG, DEFAULT_CONTEXT_WINDOW_MODE_ID, DEFAULT_MODES, DEFAULT_RECOVERY_STRATEGIES, DEFAULT_SESSION_LOGGING_CONFIG, DEFAULT_SESSION_PRUNE_DAYS, DEFAULT_SPEC_TEMPLATE, DEFAULT_TOOLS_CONFIG, DEFAULT_TUI_THINKING_WORD, DESIGN_STACKS, DefaultErrorHandler, DefaultLogger, DefaultModelsRegistry, DefaultPathResolver, DefaultRetryPolicy, DefaultSecretScrubber, DefaultSecretVault, DefaultSessionReader, DefaultTokenCounter, ERROR_CODES, FetchError, FsError, HybridCompactor, InMemoryAgentBridge, InMemoryBridgeTransport, MALFORMED_ARG_MARKERS, MAX_TUI_THINKING_WORD_LENGTH, MEMORY_TYPE_LABELS, PROMPT_CATEGORY_LABELS, PluginError, ProviderError, SddError, SessionError, StreamHangError, ToolError, ToolErrorCategory, ToolExecutor, ToolValidationError, WrongStackError, asBlocks, asText, buildRecoveryStrategies, classifyFamily, computeTaskProgress, createMessage, decryptConfigSecrets, diffRegistry, encryptConfigSecrets, findCriticalPath, formatContextWindowModeList, getContextWindowMode, isAgentError, isBuiltinCategory, isConfigError, isContextWindowModeId, isDesignStack, isFetchError, isFsError, isImageBlock, isPluginError, isSddError, isSecretField, isSessionError, isTextBlock, isThinkingBlock, isToolError, isToolResultBlock, isToolUseBlock, isToolValidationError, isWrongStackError, listContextWindowModes, migratePlaintextSecrets, noOpLogger, normalizeTokenSavingTier, normalizeTuiThinkingWord, resolveContextWindowPolicy, rewriteConfigEncrypted, rotateConfigKeys, toWrongStackError, topologicalSort, validateRegistryManifest };
+export { AgentError, BUILTIN_PROMPT_CATEGORIES, CONTEXT_WINDOW_MODES, ConfigError, Context, DEFAULT_AUTONOMY_CONFIG, DEFAULT_CIRCUIT_BREAKER_CONFIG, DEFAULT_CONTEXT_CONFIG, DEFAULT_CONTEXT_WINDOW_MODE_ID, DEFAULT_MODES, DEFAULT_RECOVERY_STRATEGIES, DEFAULT_SESSION_LOGGING_CONFIG, DEFAULT_SESSION_PRUNE_DAYS, DEFAULT_SPEC_TEMPLATE, DEFAULT_TOOLS_CONFIG, DEFAULT_TUI_THINKING_WORD, DESIGN_STACKS, DefaultErrorHandler, DefaultLogger, DefaultModelsRegistry, DefaultPathResolver, DefaultRetryPolicy, DefaultSecretScrubber, DefaultSecretVault, DefaultSessionReader, DefaultTokenCounter, ERROR_CODES, FetchError, FsError, HybridCompactor, InMemoryAgentBridge, InMemoryBridgeTransport, MALFORMED_ARG_MARKERS, MAX_TUI_THINKING_WORD_LENGTH, MEMORY_TYPE_LABELS, PROMPT_CATEGORY_LABELS, ParseError, PluginError, ProviderError, SddError, SessionError, StreamHangError, ToolError, ToolErrorCategory, ToolExecutor, ToolValidationError, WrongStackError, asBlocks, asText, buildRecoveryStrategies, classifyFamily, classifyToolError, computeTaskProgress, createMessage, decryptConfigSecrets, diffRegistry, encryptConfigSecrets, findCriticalPath, formatContextWindowModeList, getContextWindowMode, isAgentError, isBuiltinCategory, isConfigError, isContextWindowModeId, isDesignStack, isFetchError, isFsError, isImageBlock, isParseError, isPluginError, isSddError, isSecretField, isSessionError, isTextBlock, isThinkingBlock, isToolError, isToolResultBlock, isToolUseBlock, isToolValidationError, isWrongStackError, listContextWindowModes, migratePlaintextSecrets, noOpLogger, normalizeTokenSavingTier, normalizeTuiThinkingWord, resolveContextWindowPolicy, rewriteConfigEncrypted, rotateConfigKeys, toWrongStackError, topologicalSort, validateRegistryManifest };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map