npm - @massa-ai/mcp-client - Versions diffs - 1.60.1 → 1.62.0 - Mend

@massa-ai/mcp-client 1.60.1 → 1.62.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/config-cli.js CHANGED Viewed

@@ -997,7 +997,7 @@ function getConfigForEnv() {
   } else {
     console.error(`[getConfigForEnv] embedding.provider "${provider}" has no env-projection branch \u2014 no embedding env vars were set`);
   }
-  env.LOG_LEVEL = config.logging.level;
+  env.MASSA_AI_LOG_LEVEL = config.logging.level;
   env.ENABLE_METRICS = String(config.logging.enableMetrics);
   return env;
 }
@@ -1571,7 +1571,7 @@ var init_config = __esm(() => {
       corsOrigins: envList("MASSA_AI_API_CORS_ORIGINS", fileConfig.security?.corsOrigins ?? [])
     },
     logging: {
-      level: process.env.LOG_LEVEL || fileConfig.logging?.level || "info",
+      level: process.env.MASSA_AI_LOG_LEVEL || fileConfig.logging?.level || "info",
       enableMetrics: process.env.ENABLE_METRICS === "true" || process.env.ENABLE_METRICS === undefined && !!fileConfig.logging?.enableMetrics,
       file: process.env.MASSA_AI_LOG_FILE || fileConfig.logging?.file || path4.join(resolvedDataDir, "logs", "massa-ai.log"),
       enableFileSink: envBool("MASSA_AI_LOG_ENABLE_FILE_SINK", fileConfig.logging?.enableFileSink ?? true),
@@ -1904,6 +1904,32 @@ var init_log_buffer = __esm(() => {
 });
 // ../../packages/shared/dist/utils/logger.js
+function formatAgo(ms) {
+  const totalSeconds = Math.floor(ms / 1000);
+  if (totalSeconds < 60)
+    return `${totalSeconds}s`;
+  return `${Math.floor(totalSeconds / 60)}m`;
+}
+function capErrorText(value) {
+  if (value.length <= MAX_ERROR_TEXT_CHARS)
+    return value;
+  const truncatedChars = value.length - MAX_ERROR_TEXT_CHARS;
+  return `${value.slice(0, MAX_ERROR_TEXT_CHARS)}\u2026(truncated ${truncatedChars} chars)`;
+}
+function pickErrorFields(err, includeStack) {
+  const out = { name: err.name, message: capErrorText(err.message) };
+  if (includeStack)
+    out.stack = err.stack;
+  const code = err.code;
+  if (code !== undefined)
+    out.code = code;
+  const cause = err.cause;
+  if (cause !== undefined) {
+    out.cause = capErrorText(cause instanceof Error ? cause.message : String(cause));
+  }
+  return out;
+}
 class Logger {
   _level;
   _enableMetrics;
@@ -1912,6 +1938,7 @@ class Logger {
   _maxFileSizeBytes;
   _maxFiles;
   _initialized = false;
+  repeats = new Map;
   constructor() {}
   ensureInitialized() {
     if (!this._initialized) {
@@ -1972,13 +1999,70 @@ class Logger {
   shouldLog(level) {
     return level >= this.level;
   }
+  serializeMetaErrors(meta) {
+    if (!meta)
+      return meta;
+    let out;
+    for (const [key, value] of Object.entries(meta)) {
+      if (value instanceof Error) {
+        if (!out)
+          out = { ...meta };
+        out[key] = pickErrorFields(value, false);
+      }
+    }
+    return out ?? meta;
+  }
+  applyRepeatAccounting(level, message, meta) {
+    if (level !== LogLevel.WARN && level !== LogLevel.ERROR)
+      return meta;
+    const label = typeof meta?.label === "string" ? meta.label : "";
+    const key = `${level}|${message}|${label}`;
+    const now = Date.now();
+    const existing = this.repeats.get(key);
+    if (!existing || now - existing.firstSeenAt > REPEAT_WINDOW_MS) {
+      if (this.repeats.size >= MAX_REPEAT_KEYS)
+        this.repeats.clear();
+      this.repeats.set(key, { firstSeenAt: now, count: 1 });
+      return meta;
+    }
+    existing.count += 1;
+    return {
+      ...meta,
+      occurrences: existing.count,
+      firstSeenAgo: formatAgo(now - existing.firstSeenAt)
+    };
+  }
+  _resetRepeatsForTesting() {
+    this.repeats.clear();
+  }
+  safeStringifyMeta(meta) {
+    const seen = new WeakSet;
+    try {
+      return JSON.stringify(meta, (_key, value) => {
+        if (typeof value === "bigint")
+          return value.toString();
+        if (typeof value === "object" && value !== null) {
+          if (seen.has(value))
+            return "[Circular]";
+          seen.add(value);
+        }
+        return value;
+      });
+    } catch (err) {
+      return JSON.stringify({
+        metaUnserializable: err instanceof Error ? err.message : String(err)
+      });
+    }
+  }
   formatMessage(level, message, meta, timestamp = new Date().toISOString()) {
-    const metaStr = meta ? ` ${JSON.stringify(meta)}` : "";
+    const metaStr = meta ? ` ${this.safeStringifyMeta(meta)}` : "";
     return `[${timestamp}] [${level}] ${message}${metaStr}`;
   }
   emit(level, message, meta) {
+    const serializedMeta = this.serializeMetaErrors(meta);
+    const finalMeta = this.applyRepeatAccounting(level, message, serializedMeta);
     const ts = new Date().toISOString();
-    const line = this.formatMessage(LOG_LEVEL_LABELS[level], message, meta, ts);
+    const line = this.formatMessage(LOG_LEVEL_LABELS[level], message, finalMeta, ts);
     console.error(line);
     if (this.enableFileSink) {
       const filePath = this.logFilePath;
@@ -1990,7 +2074,7 @@ class Logger {
       ts,
       level: LOG_LEVEL_BUFFER_TAGS[level],
       message,
-      ...meta ? { meta } : {}
+      ...finalMeta ? { meta: finalMeta } : {}
     });
   }
   debug(message, meta) {
@@ -2012,11 +2096,7 @@ class Logger {
     if (this.shouldLog(LogLevel.ERROR)) {
       const errorMeta = error ? {
         ...meta,
-        error: {
-          name: error.name,
-          message: error.message,
-          stack: error.stack
-        }
+        error: error instanceof Error ? pickErrorFields(error, true) : { message: String(error) }
       } : meta;
       this.emit(LogLevel.ERROR, message, errorMeta);
     }
@@ -2047,7 +2127,7 @@ class Logger {
     return childLogger;
   }
 }
-var LogLevel, LOG_LEVEL_LABELS, LOG_LEVEL_BUFFER_TAGS, logger;
+var LogLevel, LOG_LEVEL_LABELS, LOG_LEVEL_BUFFER_TAGS, REPEAT_WINDOW_MS, MAX_REPEAT_KEYS = 500, MAX_ERROR_TEXT_CHARS = 300, logger;
 var init_logger = __esm(() => {
   init_config();
   init_log_sink();
@@ -2070,6 +2150,7 @@ var init_logger = __esm(() => {
     [LogLevel.WARN]: "warn",
     [LogLevel.ERROR]: "error"
   };
+  REPEAT_WINDOW_MS = 15 * 60 * 1000;
   logger = new Logger;
 });
@@ -2125,8 +2206,9 @@ var init_metrics = __esm(() => {
         }
       } catch (error) {
         const err = error instanceof Error ? error : new Error(String(error));
-        logger.warn(`Failed to fetch pricing for ${modelId}`, {
-          error: { name: err.name, message: err.message }
+        logger.warn("MetricsCollector: failed to fetch pricing", {
+          modelId,
+          error: err
         });
       }
       const fallback = FALLBACK_PRICING[modelId];
@@ -2134,7 +2216,7 @@ var init_metrics = __esm(() => {
         logger.debug(`Using fallback pricing for ${modelId}`);
         return fallback;
       }
-      logger.warn(`Unknown model ${modelId}, using gpt-4 pricing as default`);
+      logger.warn("MetricsCollector: unknown model, using gpt-4 pricing as default", { modelId });
       return FALLBACK_PRICING["gpt-4"];
     }
     static calculateCost(inputTokens, outputTokens, model) {
@@ -2313,7 +2395,9 @@ class SmartRateLimiter {
     const hasRequestCapacity = this.requestLimiter.tryConsume(1);
     const hasTokenCapacity = this.tokenLimiter.tryConsume(estimatedTokens);
     if (!hasRequestCapacity) {
-      logger.warn("Request rate limit exceeded");
+      logger.warn("Request rate limit exceeded", {
+        availableTokens: this.requestLimiter.getAvailableTokens()
+      });
       return false;
     }
     if (!hasTokenCapacity) {
@@ -2365,12 +2449,12 @@ import path6 from "path";
 function isHost(v) {
   return typeof v === "string" && HOSTS.includes(v);
 }
-function fileLayout(host, activeDir, activeGlob, variantsRoot) {
+function fileLayout(host, activeDir, activeExt, variantsRoot) {
   return {
     host,
     route: "files",
     activeDir,
-    activeGlob,
+    activeExt,
     variantsRoot,
     variantDir: (profile) => path6.join(variantsRoot, profile)
   };
@@ -2384,19 +2468,19 @@ function resolveHostLayout(host, opts = {}) {
     case "claude": {
       const marketplaceRoot = opts.marketplaceRoot?.claude;
       if (override === undefined && marketplaceRoot !== undefined) {
-        return fileLayout(host, path6.join(marketplaceRoot, "agents"), "massa-ai-*.md", path6.join(marketplaceRoot, "agent-profiles"));
+        return fileLayout(host, path6.join(marketplaceRoot, "agents"), ".md", path6.join(marketplaceRoot, "agent-profiles"));
       }
       const root = override ?? path6.join(targetHome, ".claude");
-      return fileLayout(host, path6.join(root, "agents"), "massa-ai-*.md", path6.join(root, "massa-ai", "agent-profiles"));
+      return fileLayout(host, path6.join(root, "agents"), ".md", path6.join(root, "massa-ai", "agent-profiles"));
     }
     case "codex": {
       const root = override ?? path6.join(targetHome, ".codex");
-      return fileLayout(host, path6.join(root, "agents"), "massa-ai-*.toml", path6.join(root, "massa-ai", "agent-profiles"));
+      return fileLayout(host, path6.join(root, "agents"), ".toml", path6.join(root, "massa-ai", "agent-profiles"));
     }
     case "opencode": {
       const root = override ?? path6.join(targetHome, ".config", "opencode");
       const pluginsDir = path6.join(root, "plugins", "massa-ai");
-      return fileLayout(host, path6.join(root, "agents"), "massa-ai-*.md", path6.join(pluginsDir, "agent-profiles"));
+      return fileLayout(host, path6.join(root, "agents"), ".md", path6.join(pluginsDir, "agent-profiles"));
     }
   }
 }
@@ -2730,6 +2814,90 @@ function readInstalledPluginVersion(opts = {}) {
 var DEFAULT_PLUGIN_KEY = "massa-ai@massa-ai";
 var init_claude_marketplace = () => {};
+// ../../packages/shared/dist/profile-switch/ownership.js
+import fs6 from "fs";
+import path10 from "path";
+function isLegacyAgentName(fileName) {
+  const base = path10.basename(fileName).replace(/\.[^.]*$/, "");
+  return base.startsWith("massa-ai-") && LEGACY_AGENT_NAMES.includes(base.slice("massa-ai-".length));
+}
+function hasOwnedMarker(content) {
+  const lines = content.split(`
+`);
+  if (lines[0] !== "---")
+    return false;
+  const close = lines.indexOf("---", 1);
+  return close !== -1 && lines[close + 1] === OWNED_MARKER_MD;
+}
+function isRegularFile(filePath) {
+  try {
+    return fs6.lstatSync(filePath).isFile();
+  } catch {
+    return false;
+  }
+}
+function isOwnedAgentFile(filePath) {
+  if (!isRegularFile(filePath))
+    return false;
+  if (!filePath.endsWith(".toml") && isLegacyAgentName(filePath))
+    return true;
+  let content;
+  try {
+    content = fs6.readFileSync(filePath, "utf8");
+  } catch {
+    return false;
+  }
+  if (filePath.endsWith(".toml"))
+    return content.split(`
+`)[0] === OWNED_MARKER_TOML;
+  return hasOwnedMarker(content);
+}
+function isOwnedAgentLink(linkPath) {
+  try {
+    if (!fs6.lstatSync(linkPath).isSymbolicLink())
+      return false;
+  } catch {
+    return false;
+  }
+  if (isLegacyAgentName(linkPath))
+    return true;
+  const base = path10.basename(linkPath);
+  const target = fs6.readlinkSync(linkPath);
+  if (target.endsWith(`/opencode-plugin/agents/${base}`))
+    return true;
+  const escaped = base.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  if (new RegExp(`/plugins/massa-ai/agent-profiles/.*/${escaped}$`).test(target))
+    return true;
+  try {
+    return fs6.statSync(linkPath).isFile() && hasOwnedMarker(fs6.readFileSync(linkPath, "utf8"));
+  } catch {
+    return false;
+  }
+}
+var OWNED_MARKER_MD = "<!-- massa-ai-owned: true -->", OWNED_MARKER_TOML = "# massa-ai-owned", LEGACY_AGENT_NAMES;
+var init_ownership = __esm(() => {
+  LEGACY_AGENT_NAMES = [
+    "architecture-specialist",
+    "audit-specialist",
+    "builder",
+    "context-curator",
+    "designer",
+    "documentation-agent",
+    "furps-analyst",
+    "investigator",
+    "judge",
+    "meta-judge",
+    "mobile-specialist",
+    "navigator",
+    "plan-critic",
+    "planner",
+    "requirements-analyst",
+    "reviewer",
+    "test-engineer",
+    "verification-agent"
+  ];
+});
 // ../../packages/shared/dist/profile-switch/frontmatter.js
 function parseFrontmatter(raw2) {
   const match = /^---\r?\n([\s\S]*?)\r?\n---\r?\n([\s\S]*)$/.exec(raw2);
@@ -2787,12 +2955,12 @@ function unquoteScalar(s) {
 }
 // ../../packages/shared/dist/profile-switch/doctor.js
-import fs6 from "fs";
+import fs7 from "fs";
 import os6 from "os";
-import path10 from "path";
+import path11 from "path";
 function readTextFile(filePath) {
   try {
-    return fs6.readFileSync(filePath, "utf8");
+    return fs7.readFileSync(filePath, "utf8");
   } catch {
     return null;
   }
@@ -2808,7 +2976,7 @@ function readJsonFile(filePath) {
   }
 }
 function readPluginVersion(pluginRoot) {
-  const manifest = readJsonFile(path10.join(pluginRoot, ".claude-plugin", "plugin.json"));
+  const manifest = readJsonFile(path11.join(pluginRoot, ".claude-plugin", "plugin.json"));
   return typeof manifest?.version === "string" ? manifest.version : null;
 }
 function detectEnvOverride(env) {
@@ -2821,19 +2989,19 @@ function detectEnvOverride(env) {
   return null;
 }
 function readRoles(liveRoot, activeProfile) {
-  const agentsDir = path10.join(liveRoot, "agents");
+  const agentsDir = path11.join(liveRoot, "agents");
   let entries;
   try {
-    entries = fs6.readdirSync(agentsDir, { withFileTypes: true });
+    entries = fs7.readdirSync(agentsDir, { withFileTypes: true });
   } catch {
     return [];
   }
   const roles = [];
   for (const entry of entries) {
-    if (!entry.isFile() || !entry.name.startsWith("massa-ai-") || !entry.name.endsWith(".md")) {
+    if (!entry.name.endsWith(".md") || !isOwnedAgentFile(path11.join(agentsDir, entry.name))) {
       continue;
     }
-    const activeRaw = readTextFile(path10.join(agentsDir, entry.name));
+    const activeRaw = readTextFile(path11.join(agentsDir, entry.name));
     let model = null;
     let effort = null;
     if (activeRaw !== null) {
@@ -2845,7 +3013,7 @@ function readRoles(liveRoot, activeProfile) {
     }
     let staleVariant = false;
     if (activeProfile && activeRaw !== null) {
-      const variantRaw = readTextFile(path10.join(liveRoot, "agent-profiles", activeProfile, entry.name));
+      const variantRaw = readTextFile(path11.join(liveRoot, "agent-profiles", activeProfile, entry.name));
       if (variantRaw !== null) {
         staleVariant = variantRaw !== activeRaw;
       }
@@ -2856,7 +3024,8 @@ function readRoles(liveRoot, activeProfile) {
 }
 function runtimeDriftReport(opts = {}) {
   const targetHome = opts.targetHome ?? os6.homedir();
-  const stateFilePath = opts.stateFilePath ?? path10.join(targetHome, ".config", "massa-ai", "install-state.json");
+  const host = opts.host ?? "claude";
+  const stateFilePath = opts.stateFilePath ?? path11.join(targetHome, ".config", "massa-ai", "install-state.json");
   let state = opts.state ?? null;
   if (state === null) {
     try {
@@ -2865,9 +3034,24 @@ function runtimeDriftReport(opts = {}) {
       state = null;
     }
   }
-  const platform = state?.platforms?.claude;
+  const platform = state?.platforms?.[host];
   const stateVersion = typeof platform?.plugin?.version === "string" ? platform.plugin.version : null;
   const activeProfile = platform?.modelProfile?.profile ?? null;
+  if (host !== "claude") {
+    return {
+      host,
+      route: "unresolved",
+      liveRoot: null,
+      sourceVersion: null,
+      stateVersion,
+      pinnedVersion: null,
+      activeProfile,
+      roles: [],
+      envOverride: detectEnvOverride(opts.env ?? process.env),
+      versionDrift: false,
+      profileMaterialized: false
+    };
+  }
   const install = resolveClaudeMarketplaceInstall({ targetHome, pluginKey: opts.pluginKey });
   const liveRoot = install?.root ?? null;
   const sourceVersion = liveRoot === null ? null : readPluginVersion(liveRoot);
@@ -2890,13 +3074,14 @@ function runtimeDriftReport(opts = {}) {
 var ENV_OVERRIDE_VARS;
 var init_doctor = __esm(() => {
   init_claude_marketplace();
+  init_ownership();
   init_state();
   ENV_OVERRIDE_VARS = ["CLAUDE_CODE_SUBAGENT_MODEL"];
 });
 // ../../packages/shared/dist/profile-switch/engine.js
-import fs7 from "fs";
-import path11 from "path";
+import fs8 from "fs";
+import path12 from "path";
 import os7 from "os";
 import crypto4 from "crypto";
 import { execFileSync as execFileSync2 } from "child_process";
@@ -2906,7 +3091,7 @@ function namedError3(name, message) {
   return err;
 }
 function defaultStatePath(targetHome) {
-  return path11.join(targetHome, ".config", "massa-ai", "install-state.json");
+  return path12.join(targetHome, ".config", "massa-ai", "install-state.json");
 }
 function resolveCommon(opts) {
   const targetHome = opts.targetHome ?? os7.homedir();
@@ -2917,7 +3102,7 @@ function marketplaceRoots(targetHome, state) {
   return state.platforms.claude?.installRoute === "marketplace" ? { claude: resolveClaudeMarketplaceRoot({ targetHome }) ?? undefined } : {};
 }
 function claudeMarketplaceUnresolvedReason(targetHome) {
-  const registryPath = path11.join(targetHome, ".claude", "plugins", "installed_plugins.json");
+  const registryPath = path12.join(targetHome, ".claude", "plugins", "installed_plugins.json");
   return `claude installRoute is "marketplace" but no install root could be resolved from ${registryPath} ` + "\u2014 re-run the Claude plugin installer, or verify the plugin registry file";
 }
 function listProfiles(opts = {}) {
@@ -2939,7 +3124,7 @@ function listProfiles(opts = {}) {
         installed: false,
         skipped: false,
         skipReason: null,
-        activeProfile: platform2.modelProfile?.profile ?? opts.hostDefaults?.[host] ?? "balanced",
+        activeProfile: platform2.modelProfile?.profile ?? "balanced",
         bundleVersion: platform2.plugin?.version ?? null,
         availableProfiles: [],
         ...claudeDriftFields(host)
@@ -2958,7 +3143,7 @@ function listProfiles(opts = {}) {
         ...claudeDriftFields(host)
       };
     }
-    const installed = fs7.existsSync(layout.activeDir);
+    const installed = fs8.existsSync(layout.activeDir);
     const availableProfiles = listVariantProfiles(layout);
     const platform = state.platforms[host];
     return {
@@ -2966,7 +3151,7 @@ function listProfiles(opts = {}) {
       installed,
       skipped: false,
       skipReason: null,
-      activeProfile: platform?.modelProfile?.profile ?? opts.hostDefaults?.[host] ?? "balanced",
+      activeProfile: platform?.modelProfile?.profile ?? "balanced",
       bundleVersion: platform?.plugin?.version ?? null,
       availableProfiles,
       ...claudeDriftFields(host)
@@ -2975,20 +3160,20 @@ function listProfiles(opts = {}) {
   return { hosts };
 }
 function listVariantProfiles(layout) {
-  if (!fs7.existsSync(layout.variantsRoot))
+  if (!fs8.existsSync(layout.variantsRoot))
     return [];
-  return fs7.readdirSync(layout.variantsRoot, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name).sort();
+  return fs8.readdirSync(layout.variantsRoot, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name).sort();
 }
-function matchesGlob(filename, glob) {
-  const starIdx = glob.indexOf("*");
-  if (starIdx === -1)
-    return filename === glob;
-  const prefix = glob.slice(0, starIdx);
-  const suffix = glob.slice(starIdx + 1);
-  return filename.length >= prefix.length + suffix.length && filename.startsWith(prefix) && filename.endsWith(suffix);
+function matchingFileNames(dir, ext) {
+  return fs8.readdirSync(dir, { withFileTypes: true }).filter((e) => e.isFile() && e.name.endsWith(ext) && !isLegacyAgentName(e.name) && isOwnedAgentFile(path12.join(dir, e.name))).map((e) => e.name);
 }
-function matchingFileNames(dir, glob) {
-  return fs7.readdirSync(dir, { withFileTypes: true }).filter((e) => e.isFile() && matchesGlob(e.name, glob)).map((e) => e.name);
+function destIsAbsent(dest) {
+  try {
+    fs8.lstatSync(dest);
+    return false;
+  } catch {
+    return true;
+  }
 }
 function detectGitAvailability(dir) {
   try {
@@ -3014,7 +3199,7 @@ function gitTrackedFileNames(dir, filenames) {
   }
 }
 function checkTrackedPathGuard(activeDir, filenames) {
-  if (filenames.length === 0 || !fs7.existsSync(activeDir))
+  if (filenames.length === 0 || !fs8.existsSync(activeDir))
     return GUARD_PASS;
   const availability = detectGitAvailability(activeDir);
   if (availability === "no-git")
@@ -3025,53 +3210,45 @@ function checkTrackedPathGuard(activeDir, filenames) {
   if (tracked.size === 0)
     return GUARD_PASS;
   const offending = filenames.find((name) => tracked.has(name));
-  return { blocked: true, path: path11.join(activeDir, offending), unchecked: false };
+  return { blocked: true, path: path12.join(activeDir, offending), unchecked: false };
 }
 function assertStateWritable(stateFilePath) {
-  const dir = path11.dirname(stateFilePath);
+  const dir = path12.dirname(stateFilePath);
   try {
-    fs7.mkdirSync(dir, { recursive: true });
+    fs8.mkdirSync(dir, { recursive: true });
   } catch (err) {
     throw UnwritableInstallStateError(stateFilePath, err.message);
   }
-  const checkPath = fs7.existsSync(stateFilePath) ? stateFilePath : dir;
+  const checkPath = fs8.existsSync(stateFilePath) ? stateFilePath : dir;
   try {
-    fs7.accessSync(checkPath, fs7.constants.W_OK);
+    fs8.accessSync(checkPath, fs8.constants.W_OK);
   } catch (err) {
     throw UnwritableInstallStateError(stateFilePath, err.message);
   }
 }
 function copyFileRouteVariant(layout, variantDir) {
-  fs7.mkdirSync(layout.activeDir, { recursive: true });
+  fs8.mkdirSync(layout.activeDir, { recursive: true });
   let changed = 0;
-  for (const entry of fs7.readdirSync(variantDir, { withFileTypes: true })) {
-    if (!entry.isFile() || !matchesGlob(entry.name, layout.activeGlob))
+  for (const name of matchingFileNames(variantDir, layout.activeExt)) {
+    const dest = path12.join(layout.activeDir, name);
+    if (!destIsAbsent(dest) && !isOwnedAgentFile(dest))
       continue;
-    fs7.copyFileSync(path11.join(variantDir, entry.name), path11.join(layout.activeDir, entry.name));
+    fs8.copyFileSync(path12.join(variantDir, name), dest);
     changed++;
   }
   return changed;
 }
 function repointOpencodeVariant(layout, variantDir) {
-  fs7.mkdirSync(layout.activeDir, { recursive: true });
+  fs8.mkdirSync(layout.activeDir, { recursive: true });
   let changed = 0;
-  for (const entry of fs7.readdirSync(variantDir, { withFileTypes: true })) {
-    if (!entry.isFile() || !matchesGlob(entry.name, layout.activeGlob))
-      continue;
-    const dest = path11.join(layout.activeDir, entry.name);
-    const target = path11.resolve(path11.join(variantDir, entry.name));
-    let destExists = true;
-    let destIsSymlink = false;
-    try {
-      destIsSymlink = fs7.lstatSync(dest).isSymbolicLink();
-    } catch {
-      destExists = false;
-    }
-    if (destExists && !destIsSymlink)
+  for (const name of matchingFileNames(variantDir, layout.activeExt)) {
+    const dest = path12.join(layout.activeDir, name);
+    const target = path12.resolve(path12.join(variantDir, name));
+    if (!destIsAbsent(dest) && !isOwnedAgentLink(dest))
       continue;
     const tmp = `${dest}.massa-ai-switch.${crypto4.randomUUID()}`;
-    fs7.symlinkSync(target, tmp);
-    fs7.renameSync(tmp, dest);
+    fs8.symlinkSync(target, tmp);
+    fs8.renameSync(tmp, dest);
     changed++;
   }
   return changed;
@@ -3111,13 +3288,13 @@ function switchProfile(opts) {
   if (fileHosts.length === 0) {
     return { profile: opts.profile, dryRun, hosts: orderRows(universe, skipRows), restartRequired: false };
   }
-  const installedFileHosts = fileHosts.filter((h) => fs7.existsSync(h.layout.activeDir));
+  const installedFileHosts = fileHosts.filter((h) => fs8.existsSync(h.layout.activeDir));
   if (installedFileHosts.length === 0)
     throw NoHostsDetectedError();
   const withAvailability = fileHosts.map((h) => {
-    const variantsRootExists = fs7.existsSync(h.layout.variantsRoot);
+    const variantsRootExists = fs8.existsSync(h.layout.variantsRoot);
     const variantDir = h.layout.variantDir(opts.profile);
-    const available = variantsRootExists && fs7.existsSync(variantDir) && fs7.statSync(variantDir).isDirectory();
+    const available = variantsRootExists && fs8.existsSync(variantDir) && fs8.statSync(variantDir).isDirectory();
     return { ...h, variantsRootExists, variantDir, available };
   });
   if (!withAvailability.some((h) => h.available)) {
@@ -3156,7 +3333,7 @@ function switchProfile(opts) {
         rows.push({ host: h.host, status: "would-switch" });
         continue;
       }
-      const candidateNames = matchingFileNames(h.variantDir, h.layout.activeGlob);
+      const candidateNames = matchingFileNames(h.variantDir, h.layout.activeExt);
       const guard = checkTrackedPathGuard(h.layout.activeDir, candidateNames);
       if (guard.blocked) {
         rows.push({
@@ -3198,6 +3375,7 @@ var init_engine = __esm(() => {
   init_state();
   init_lock();
   init_claude_marketplace();
+  init_ownership();
   init_doctor();
   SwitchEngineError = class SwitchEngineError extends Error {
     constructor(message) {
@@ -3215,25 +3393,25 @@ function reportSucceeded(report) {
 }
 // ../../packages/shared/dist/profile-switch/variant-sync.js
-import fs8 from "fs";
-import path12 from "path";
+import fs9 from "fs";
+import path13 from "path";
 import os8 from "os";
 import crypto5 from "crypto";
 function defaultStatePath2(targetHome) {
-  return path12.join(targetHome, ".config", "massa-ai", "install-state.json");
+  return path13.join(targetHome, ".config", "massa-ai", "install-state.json");
 }
 function marketplaceRoots2(targetHome, state) {
   return state.platforms.claude?.installRoute === "marketplace" ? { claude: resolveClaudeMarketplaceRoot({ targetHome }) ?? undefined } : {};
 }
 function writeFileIntoDirAtomically(destDir, destName, content) {
   const unique = `${process.pid}.${++tempFileCounter2}.${crypto5.randomBytes(6).toString("hex")}`;
-  const tempFile = path12.join(destDir, `.${destName}.${unique}.tmp`);
+  const tempFile = path13.join(destDir, `.${destName}.${unique}.tmp`);
   try {
-    fs8.writeFileSync(tempFile, content);
-    fs8.renameSync(tempFile, path12.join(destDir, destName));
+    fs9.writeFileSync(tempFile, content);
+    fs9.renameSync(tempFile, path13.join(destDir, destName));
   } catch (error) {
     try {
-      fs8.unlinkSync(tempFile);
+      fs9.unlinkSync(tempFile);
     } catch {}
     throw error;
   }
@@ -3241,20 +3419,20 @@ function writeFileIntoDirAtomically(destDir, destName, content) {
 function isSafeDirName(name) {
   if (name === "." || name === "..")
     return false;
-  if (name.includes("/") || name.includes("\\") || name.includes(path12.sep))
+  if (name.includes("/") || name.includes("\\") || name.includes(path13.sep))
     return false;
-  return path12.basename(name) === name;
+  return path13.basename(name) === name;
 }
 function syncHost(host, sourceRoot, targetHome, marketplaceRoot) {
   const layout = resolveHostLayout(host, { targetHome, marketplaceRoot });
   if (layout.route === "skip") {
     return { host, status: "skipped", profiles: [], retained: [], files: 0, reason: layout.reason };
   }
-  const srcDir = path12.join(sourceRoot, "apps", `${host}-plugin`, "agent-profiles");
-  if (!fs8.existsSync(srcDir) || !fs8.statSync(srcDir).isDirectory()) {
+  const srcDir = path13.join(sourceRoot, "apps", `${host}-plugin`, "agent-profiles");
+  if (!fs9.existsSync(srcDir) || !fs9.statSync(srcDir).isDirectory()) {
     return { host, status: "skipped", profiles: [], retained: [], files: 0, reason: "no generated variants for this host" };
   }
-  if (!fs8.existsSync(layout.variantsRoot)) {
+  if (!fs9.existsSync(layout.variantsRoot)) {
     return {
       host,
       status: "skipped",
@@ -3266,24 +3444,24 @@ function syncHost(host, sourceRoot, targetHome, marketplaceRoot) {
   }
   const profiles = [];
   let files = 0;
-  for (const entry of fs8.readdirSync(srcDir, { withFileTypes: true })) {
+  for (const entry of fs9.readdirSync(srcDir, { withFileTypes: true })) {
     if (!entry.isDirectory())
       continue;
     if (!isSafeDirName(entry.name))
       continue;
-    const srcProfileDir = path12.join(srcDir, entry.name);
-    const destProfileDir = path12.join(layout.variantsRoot, entry.name);
-    fs8.mkdirSync(destProfileDir, { recursive: true });
-    for (const fileEntry of fs8.readdirSync(srcProfileDir, { withFileTypes: true })) {
+    const srcProfileDir = path13.join(srcDir, entry.name);
+    const destProfileDir = path13.join(layout.variantsRoot, entry.name);
+    fs9.mkdirSync(destProfileDir, { recursive: true });
+    for (const fileEntry of fs9.readdirSync(srcProfileDir, { withFileTypes: true })) {
       if (!fileEntry.isFile())
         continue;
-      const content = fs8.readFileSync(path12.join(srcProfileDir, fileEntry.name));
+      const content = fs9.readFileSync(path13.join(srcProfileDir, fileEntry.name));
       writeFileIntoDirAtomically(destProfileDir, fileEntry.name, content);
       files++;
     }
     profiles.push(entry.name);
   }
-  const retained = fs8.readdirSync(layout.variantsRoot, { withFileTypes: true }).filter((e) => e.isDirectory() && !profiles.includes(e.name)).map((e) => e.name).sort();
+  const retained = fs9.readdirSync(layout.variantsRoot, { withFileTypes: true }).filter((e) => e.isDirectory() && !profiles.includes(e.name)).map((e) => e.name).sort();
   return { host, status: "synced", profiles: profiles.sort(), retained, files };
 }
 function syncGeneratedVariants(opts) {
@@ -3318,14 +3496,14 @@ var init_variant_sync = __esm(() => {
 });
 // ../../packages/shared/dist/profile-switch/repo-root.js
-import fs9 from "fs";
-import path13 from "path";
+import fs10 from "fs";
+import path14 from "path";
 function findRepoRootWithMarker(startDir, marker, maxLevels) {
   let dir = startDir;
   for (let i = 0;i <= maxLevels; i++) {
-    if (fs9.existsSync(path13.join(dir, marker)))
+    if (fs10.existsSync(path14.join(dir, marker)))
       return dir;
-    const parent = path13.dirname(dir);
+    const parent = path14.dirname(dir);
     if (parent === dir)
       break;
     dir = parent;
@@ -3335,6 +3513,9 @@ function findRepoRootWithMarker(startDir, marker, maxLevels) {
 var init_repo_root = () => {};
 // ../../packages/shared/dist/bootstrap/rules.js
+function isRetiredRuleId(value) {
+  return RETIRED_RULE_IDS.includes(value);
+}
 function isBootstrapRuleId(value) {
   return typeof value === "string" && BOOTSTRAP_RULE_IDS.includes(value);
 }
@@ -3353,12 +3534,14 @@ function assertKnownRuleId(id) {
   if (!isBootstrapRuleId(id))
     throw UnknownRuleError(id, BOOTSTRAP_RULE_IDS);
 }
-var BOOTSTRAP_RULE_IDS, BOOTSTRAP_RULES, RULES_BY_ID, BootstrapRuleError, UnknownRuleError = (id, known = BOOTSTRAP_RULE_IDS) => namedError4("UnknownRuleError", `unknown bootstrap rule "${id}" \u2014 valid ids: ${known.join(", ")}`);
+var BOOTSTRAP_RULE_IDS, RETIRED_RULE_IDS, BOOTSTRAP_RULES, RULES_BY_ID, BootstrapRuleError, UnknownRuleError = (id, known = BOOTSTRAP_RULE_IDS) => {
+  const what = isRetiredRuleId(id) ? `bootstrap rule "${id}" was retired and can no longer be toggled` : `unknown bootstrap rule "${id}"`;
+  return namedError4("UnknownRuleError", `${what} \u2014 valid ids: ${known.join(", ")}`);
+};
 var init_rules = __esm(() => {
   BOOTSTRAP_RULE_IDS = [
     "caveman",
     "massa-ai-router",
-    "persona-router",
     "dedupe-guardrails",
     "plan-challenge",
     "conversation-feedback",
@@ -3366,6 +3549,7 @@ var init_rules = __esm(() => {
     "english-code",
     "code-comments"
   ];
+  RETIRED_RULE_IDS = ["persona-router"];
   BOOTSTRAP_RULES = [
     {
       id: "caveman",
@@ -3377,11 +3561,6 @@ var init_rules = __esm(() => {
       defaultEnabled: true,
       description: "Load the massa-ai skill as the workflow router before substantive work."
     },
-    {
-      id: "persona-router",
-      defaultEnabled: true,
-      description: "Select one cataloged specialist persona after massa-ai context is available."
-    },
     {
       id: "dedupe-guardrails",
       defaultEnabled: true,
@@ -3423,7 +3602,7 @@ var init_rules = __esm(() => {
 });
 // ../../packages/shared/dist/bootstrap/state.js
-import fs10 from "fs";
+import fs11 from "fs";
 function isPlainObject2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -3444,6 +3623,8 @@ function resolveBootstrapState(doc) {
     return { state, ignoredStateKeys: [BOOTSTRAP_STATE_PATH] };
   }
   for (const [key, value] of Object.entries(rules)) {
+    if (isRetiredRuleId(key))
+      continue;
     if (!isBootstrapRuleId(key) || typeof value !== "boolean") {
       ignored.push(key);
       continue;
@@ -3454,7 +3635,7 @@ function resolveBootstrapState(doc) {
 }
 function readConfigBytes() {
   try {
-    return fs10.readFileSync(getConfigPath(), "utf-8");
+    return fs11.readFileSync(getConfigPath(), "utf-8");
   } catch (error) {
     if (error?.code === "ENOENT")
       return "";
@@ -3509,7 +3690,7 @@ var init_state2 = __esm(() => {
 });
 // ../../packages/shared/dist/bootstrap/render.js
-import path14 from "path";
+import path15 from "path";
 function wrapBootstrapBlock(body) {
   return `${BOOTSTRAP_BLOCK_START}
 ${body.replace(/\n+$/, "")}
@@ -3522,19 +3703,19 @@ function ruleMarker(id, suffix) {
 function resolveHostRoot(host, targetHome, hostRoot) {
   requireAbsoluteTargetHome(targetHome);
   if (hostRoot === undefined)
-    return path14.join(targetHome, ...HOST_CONFIG_DIR[host]);
-  const relative = path14.relative(targetHome, hostRoot);
-  if (!path14.isAbsolute(hostRoot) || relative === "" || relative.startsWith("..") || path14.isAbsolute(relative)) {
+    return path15.join(targetHome, ...HOST_CONFIG_DIR[host]);
+  const relative = path15.relative(targetHome, hostRoot);
+  if (!path15.isAbsolute(hostRoot) || relative === "" || relative.startsWith("..") || path15.isAbsolute(relative)) {
     throw new BootstrapRenderError("HostRootOutsideTargetHomeError", `hostRoot must be an absolute directory inside targetHome, got "${hostRoot}" for targetHome "${targetHome}"`, [hostRoot, targetHome]);
   }
   return hostRoot;
 }
 function bootstrapContractPath(host, targetHome, hostRoot) {
-  return path14.join(resolveHostRoot(host, targetHome, hostRoot), CONTRACT_FILENAME);
+  return path15.join(resolveHostRoot(host, targetHome, hostRoot), CONTRACT_FILENAME);
 }
 function bootstrapStateFilePath(targetHome) {
   requireAbsoluteTargetHome(targetHome);
-  return path14.join(targetHome, ".config", "massa-ai", "config.json");
+  return path15.join(targetHome, ".config", "massa-ai", "config.json");
 }
 function renderBootstrap(options) {
   const { source, state, host, targetHome, hostRoot } = options;
@@ -3557,7 +3738,7 @@ ${body}`;
   return { contract, pointer };
 }
 function requireAbsoluteTargetHome(targetHome) {
-  if (!path14.isAbsolute(targetHome)) {
+  if (!path15.isAbsolute(targetHome)) {
     throw new BootstrapRenderError("TargetHomeNotAbsoluteError", `targetHome must be an absolute path, got "${targetHome}"`, [targetHome]);
   }
 }
@@ -3734,14 +3915,14 @@ var init_report = __esm(() => {
 });
 // ../../packages/shared/dist/bootstrap/engine.js
-import fs11 from "fs";
-import path15 from "path";
+import fs12 from "fs";
+import path16 from "path";
 function applyBootstrapState(options) {
   const { targetHome } = options;
   const dryRun = options.dryRun ?? false;
   const warn = options.onWarning ?? ((message) => console.warn(message));
   const configPath = bootstrapStateFilePath(targetHome);
-  const installStatePath = path15.join(path15.dirname(configPath), INSTALL_STATE_FILENAME);
+  const installStatePath = path16.join(path16.dirname(configPath), INSTALL_STATE_FILENAME);
   const { platforms } = readInstallState(installStatePath);
   const installed = HOSTS.filter((host) => platforms[host] !== undefined);
   if (installed.length === 0) {
@@ -3834,22 +4015,22 @@ function applyHost(input) {
 }
 function wiringArtifact(host, targetHome, hostRoot) {
   const root = resolveHostRoot(host, targetHome, hostRoot);
-  const contractPath = path15.join(root, CONTRACT_FILENAME);
+  const contractPath = path16.join(root, CONTRACT_FILENAME);
   switch (host) {
     case "claude":
-      return { file: path15.join(root, "CLAUDE.md"), token: `@${CONTRACT_FILENAME}` };
+      return { file: path16.join(root, "CLAUDE.md"), token: `@${CONTRACT_FILENAME}` };
     case "codex":
     case "cursor":
-      return { file: path15.join(root, "AGENTS.md"), token: contractPath };
+      return { file: path16.join(root, "AGENTS.md"), token: contractPath };
     case "opencode":
       return { file: openCodeConfigPath(root), token: `"${contractPath}"` };
   }
 }
 function openCodeConfigPath(root) {
-  const json = path15.join(root, "opencode.json");
-  if (fs11.existsSync(json))
+  const json = path16.join(root, "opencode.json");
+  if (fs12.existsSync(json))
     return json;
-  return path15.join(root, "opencode.jsonc");
+  return path16.join(root, "opencode.jsonc");
 }
 function isWired(host, targetHome, hostRoot) {
   const artifact = wiringArtifact(host, targetHome, hostRoot);
@@ -3862,7 +4043,7 @@ function notWiredReason(host, targetHome, hostRoot) {
 }
 function readFileOrNull(filePath) {
   try {
-    return fs11.readFileSync(filePath, "utf-8");
+    return fs12.readFileSync(filePath, "utf-8");
   } catch {
     return null;
   }
@@ -3944,8 +4125,10 @@ var init_dist = __esm(() => {
   init_state();
   init_lock();
   init_engine();
+  init_ownership();
   init_variant_sync();
   init_repo_root();
+  init_doctor();
   init_bootstrap();
   init_types();
   init_interfaces();
@@ -5468,7 +5651,7 @@ var import_brace_expansion, minimatch = (p, pattern, options = {}) => {
 }, qmarksTestNoExtDot = ([$0]) => {
   const len = $0.length;
   return (f) => f.length === len && f !== "." && f !== "..";
-}, defaultPlatform, path16, sep, GLOBSTAR, qmark2 = "[^/]", star2, twoStarDot = "(?:(?!(?:\\/|^)(?:\\.{1,2})($|\\/)).)*?", twoStarNoDot = "(?:(?!(?:\\/|^)\\.).)*?", filter = (pattern, options = {}) => (p) => minimatch(p, pattern, options), ext = (a, b = {}) => Object.assign({}, a, b), defaults = (def) => {
+}, defaultPlatform, path17, sep, GLOBSTAR, qmark2 = "[^/]", star2, twoStarDot = "(?:(?!(?:\\/|^)(?:\\.{1,2})($|\\/)).)*?", twoStarNoDot = "(?:(?!(?:\\/|^)\\.).)*?", filter = (pattern, options = {}) => (p) => minimatch(p, pattern, options), ext = (a, b = {}) => Object.assign({}, a, b), defaults = (def) => {
   if (!def || typeof def !== "object" || !Object.keys(def).length) {
     return minimatch;
   }
@@ -5526,11 +5709,11 @@ var init_esm = __esm(() => {
   starRE = /^\*+$/;
   qmarksRE = /^\?+([^+@!?\*\[\(]*)?$/;
   defaultPlatform = typeof process === "object" && process ? typeof process.env === "object" && process.env && process.env.__MINIMATCH_TESTING_PLATFORM__ || process.platform : "posix";
-  path16 = {
+  path17 = {
     win32: { sep: "\\" },
     posix: { sep: "/" }
   };
-  sep = defaultPlatform === "win32" ? path16.win32.sep : path16.posix.sep;
+  sep = defaultPlatform === "win32" ? path17.win32.sep : path17.posix.sep;
   minimatch.sep = sep;
   GLOBSTAR = Symbol("globstar **");
   minimatch.GLOBSTAR = GLOBSTAR;
@@ -7496,12 +7679,12 @@ var init_esm4 = __esm(() => {
     childrenCache() {
       return this.#children;
     }
-    resolve(path17) {
-      if (!path17) {
+    resolve(path18) {
+      if (!path18) {
         return this;
       }
-      const rootPath = this.getRootString(path17);
-      const dir = path17.substring(rootPath.length);
+      const rootPath = this.getRootString(path18);
+      const dir = path18.substring(rootPath.length);
       const dirParts = dir.split(this.splitSep);
       const result = rootPath ? this.getRoot(rootPath).#resolveParts(dirParts) : this.#resolveParts(dirParts);
       return result;
@@ -8029,8 +8212,8 @@ var init_esm4 = __esm(() => {
     newChild(name, type = UNKNOWN, opts = {}) {
       return new PathWin32(name, type, this.root, this.roots, this.nocase, this.childrenCache(), opts);
     }
-    getRootString(path17) {
-      return win32.parse(path17).root;
+    getRootString(path18) {
+      return win32.parse(path18).root;
     }
     getRoot(rootPath) {
       rootPath = uncToDrive(rootPath.toUpperCase());
@@ -8055,8 +8238,8 @@ var init_esm4 = __esm(() => {
     constructor(name, type = UNKNOWN, root, roots, nocase, children, opts) {
       super(name, type, root, roots, nocase, children, opts);
     }
-    getRootString(path17) {
-      return path17.startsWith("/") ? "/" : "";
+    getRootString(path18) {
+      return path18.startsWith("/") ? "/" : "";
     }
     getRoot(_rootPath) {
       return this.root;
@@ -8075,8 +8258,8 @@ var init_esm4 = __esm(() => {
     #children;
     nocase;
     #fs;
-    constructor(cwd = process.cwd(), pathImpl, sep2, { nocase, childrenCacheSize = 16 * 1024, fs: fs12 = defaultFS } = {}) {
-      this.#fs = fsFromOption(fs12);
+    constructor(cwd = process.cwd(), pathImpl, sep2, { nocase, childrenCacheSize = 16 * 1024, fs: fs13 = defaultFS } = {}) {
+      this.#fs = fsFromOption(fs13);
       if (cwd instanceof URL || cwd.startsWith("file://")) {
         cwd = fileURLToPath(cwd);
       }
@@ -8112,11 +8295,11 @@ var init_esm4 = __esm(() => {
       }
       this.cwd = prev;
     }
-    depth(path17 = this.cwd) {
-      if (typeof path17 === "string") {
-        path17 = this.cwd.resolve(path17);
+    depth(path18 = this.cwd) {
+      if (typeof path18 === "string") {
+        path18 = this.cwd.resolve(path18);
       }
-      return path17.depth();
+      return path18.depth();
     }
     childrenCache() {
       return this.#children;
@@ -8532,9 +8715,9 @@ var init_esm4 = __esm(() => {
       process2();
       return results;
     }
-    chdir(path17 = this.cwd) {
+    chdir(path18 = this.cwd) {
       const oldCwd = this.cwd;
-      this.cwd = typeof path17 === "string" ? this.cwd.resolve(path17) : path17;
+      this.cwd = typeof path18 === "string" ? this.cwd.resolve(path18) : path18;
       this.cwd[setAsCwd](oldCwd);
     }
   };
@@ -8551,8 +8734,8 @@ var init_esm4 = __esm(() => {
     parseRootPath(dir) {
       return win32.parse(dir).root.toUpperCase();
     }
-    newRoot(fs12) {
-      return new PathWin32(this.rootPath, IFDIR, undefined, this.roots, this.nocase, this.childrenCache(), { fs: fs12 });
+    newRoot(fs13) {
+      return new PathWin32(this.rootPath, IFDIR, undefined, this.roots, this.nocase, this.childrenCache(), { fs: fs13 });
     }
     isAbsolute(p) {
       return p.startsWith("/") || p.startsWith("\\") || /^[a-z]:(\/|\\)/i.test(p);
@@ -8568,8 +8751,8 @@ var init_esm4 = __esm(() => {
     parseRootPath(_dir) {
       return "/";
     }
-    newRoot(fs12) {
-      return new PathPosix(this.rootPath, IFDIR, undefined, this.roots, this.nocase, this.childrenCache(), { fs: fs12 });
+    newRoot(fs13) {
+      return new PathPosix(this.rootPath, IFDIR, undefined, this.roots, this.nocase, this.childrenCache(), { fs: fs13 });
     }
     isAbsolute(p) {
       return p.startsWith("/");
@@ -8826,8 +9009,8 @@ class MatchRecord {
     this.store.set(target, current === undefined ? n : n & current);
   }
   entries() {
-    return [...this.store.entries()].map(([path17, n]) => [
-      path17,
+    return [...this.store.entries()].map(([path18, n]) => [
+      path18,
       !!(n & 2),
       !!(n & 1)
     ]);
@@ -9031,9 +9214,9 @@ class GlobUtil {
   signal;
   maxDepth;
   includeChildMatches;
-  constructor(patterns, path17, opts) {
+  constructor(patterns, path18, opts) {
     this.patterns = patterns;
-    this.path = path17;
+    this.path = path18;
     this.opts = opts;
     this.#sep = !opts.posix && opts.platform === "win32" ? "\\" : "/";
     this.includeChildMatches = opts.includeChildMatches !== false;
@@ -9052,11 +9235,11 @@ class GlobUtil {
       });
     }
   }
-  #ignored(path17) {
-    return this.seen.has(path17) || !!this.#ignore?.ignored?.(path17);
+  #ignored(path18) {
+    return this.seen.has(path18) || !!this.#ignore?.ignored?.(path18);
   }
-  #childrenIgnored(path17) {
-    return !!this.#ignore?.childrenIgnored?.(path17);
+  #childrenIgnored(path18) {
+    return !!this.#ignore?.childrenIgnored?.(path18);
   }
   pause() {
     this.paused = true;
@@ -9273,8 +9456,8 @@ var init_walker = __esm(() => {
   init_processor();
   GlobWalker = class GlobWalker extends GlobUtil {
     matches = new Set;
-    constructor(patterns, path17, opts) {
-      super(patterns, path17, opts);
+    constructor(patterns, path18, opts) {
+      super(patterns, path18, opts);
     }
     matchEmit(e) {
       this.matches.add(e);
@@ -9311,8 +9494,8 @@ var init_walker = __esm(() => {
   };
   GlobStream = class GlobStream extends GlobUtil {
     results;
-    constructor(patterns, path17, opts) {
-      super(patterns, path17, opts);
+    constructor(patterns, path18, opts) {
+      super(patterns, path18, opts);
       this.results = new Minipass({
         signal: this.signal,
         objectMode: true
@@ -9740,20 +9923,20 @@ var require_ignore = __commonJS((exports, module) => {
   var throwError = (message, Ctor) => {
     throw new Ctor(message);
   };
-  var checkPath = (path17, originalPath, doThrow) => {
-    if (!isString(path17)) {
+  var checkPath = (path18, originalPath, doThrow) => {
+    if (!isString(path18)) {
       return doThrow(`path must be a string, but got \`${originalPath}\``, TypeError);
     }
-    if (!path17) {
+    if (!path18) {
       return doThrow(`path must not be empty`, TypeError);
     }
-    if (checkPath.isNotRelative(path17)) {
+    if (checkPath.isNotRelative(path18)) {
       const r = "`path.relative()`d";
       return doThrow(`path should be a ${r} string, but got "${originalPath}"`, RangeError);
     }
     return true;
   };
-  var isNotRelative = (path17) => REGEX_TEST_INVALID_PATH.test(path17);
+  var isNotRelative = (path18) => REGEX_TEST_INVALID_PATH.test(path18);
   checkPath.isNotRelative = isNotRelative;
   checkPath.convert = (p) => p;
@@ -9796,7 +9979,7 @@ var require_ignore = __commonJS((exports, module) => {
     addPattern(pattern) {
       return this.add(pattern);
     }
-    _testOne(path17, checkUnignored) {
+    _testOne(path18, checkUnignored) {
       let ignored = false;
       let unignored = false;
       this._rules.forEach((rule) => {
@@ -9804,7 +9987,7 @@ var require_ignore = __commonJS((exports, module) => {
         if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) {
           return;
         }
-        const matched = rule.regex.test(path17);
+        const matched = rule.regex.test(path18);
         if (matched) {
           ignored = !negative;
           unignored = negative;
@@ -9816,39 +9999,39 @@ var require_ignore = __commonJS((exports, module) => {
       };
     }
     _test(originalPath, cache, checkUnignored, slices) {
-      const path17 = originalPath && checkPath.convert(originalPath);
-      checkPath(path17, originalPath, this._allowRelativePaths ? RETURN_FALSE : throwError);
-      return this._t(path17, cache, checkUnignored, slices);
+      const path18 = originalPath && checkPath.convert(originalPath);
+      checkPath(path18, originalPath, this._allowRelativePaths ? RETURN_FALSE : throwError);
+      return this._t(path18, cache, checkUnignored, slices);
     }
-    _t(path17, cache, checkUnignored, slices) {
-      if (path17 in cache) {
-        return cache[path17];
+    _t(path18, cache, checkUnignored, slices) {
+      if (path18 in cache) {
+        return cache[path18];
       }
       if (!slices) {
-        slices = path17.split(SLASH2);
+        slices = path18.split(SLASH2);
       }
       slices.pop();
       if (!slices.length) {
-        return cache[path17] = this._testOne(path17, checkUnignored);
+        return cache[path18] = this._testOne(path18, checkUnignored);
       }
       const parent = this._t(slices.join(SLASH2) + SLASH2, cache, checkUnignored, slices);
-      return cache[path17] = parent.ignored ? parent : this._testOne(path17, checkUnignored);
+      return cache[path18] = parent.ignored ? parent : this._testOne(path18, checkUnignored);
     }
-    ignores(path17) {
-      return this._test(path17, this._ignoreCache, false).ignored;
+    ignores(path18) {
+      return this._test(path18, this._ignoreCache, false).ignored;
     }
     createFilter() {
-      return (path17) => !this.ignores(path17);
+      return (path18) => !this.ignores(path18);
     }
     filter(paths) {
       return makeArray(paths).filter(this.createFilter());
     }
-    test(path17) {
-      return this._test(path17, this._testCache, true);
+    test(path18) {
+      return this._test(path18, this._testCache, true);
     }
   }
   var factory = (options) => new Ignore2(options);
-  var isPathValid = (path17) => checkPath(path17 && checkPath.convert(path17), path17, RETURN_FALSE);
+  var isPathValid = (path18) => checkPath(path18 && checkPath.convert(path18), path18, RETURN_FALSE);
   factory.isPathValid = isPathValid;
   factory.default = factory;
   module.exports = factory;
@@ -9856,7 +10039,7 @@ var require_ignore = __commonJS((exports, module) => {
     const makePosix = (str) => /^\\\\\?\\/.test(str) || /["<>|\u0000-\u001F]+/u.test(str) ? str : str.replace(/\\/g, "/");
     checkPath.convert = makePosix;
     const REGIX_IS_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i;
-    checkPath.isNotRelative = (path17) => REGIX_IS_WINDOWS_PATH_ABSOLUTE.test(path17) || isNotRelative(path17);
+    checkPath.isNotRelative = (path18) => REGIX_IS_WINDOWS_PATH_ABSOLUTE.test(path18) || isNotRelative(path18);
   }
 });
@@ -9918,18 +10101,18 @@ function validatePolicy(policy, opts = {}) {
     }
   }
 }
-function matchesGlob2(path17, pattern) {
+function matchesGlob(path18, pattern) {
   let re = regexCache.get(pattern);
   if (!re) {
     re = globToRegex(pattern);
     regexCache.set(pattern, re);
   }
-  return re.test(path17);
+  return re.test(path18);
 }
 var DEFAULT_POLICY, applyPolicy = (filePath, policy) => {
   const normalized = filePath.trim();
   for (const rule of policy.rules) {
-    if (matchesGlob2(normalized, rule.pattern))
+    if (matchesGlob(normalized, rule.pattern))
       return rule.disposition;
   }
   return "Keep";
@@ -9941,8 +10124,8 @@ var init_capture_policy = __esm(() => {
 });
 // ../../packages/core/dist/services/search/ignore-patterns.js
-import fs12 from "fs/promises";
-import path17 from "path";
+import fs13 from "fs/promises";
+import path18 from "path";
 function buildExtensionGlob(extensions) {
   return extensions.map((ext2) => `**/*${ext2}`);
 }
@@ -9965,8 +10148,8 @@ async function loadProjectIgnore(projectPath) {
   const ig = ignore();
   ig.add(DEFAULT_IGNORES);
   try {
-    const gitignorePath = path17.join(projectPath, ".gitignore");
-    const gitignoreContent = await fs12.readFile(gitignorePath, "utf8");
+    const gitignorePath = path18.join(projectPath, ".gitignore");
+    const gitignoreContent = await fs13.readFile(gitignorePath, "utf8");
     const rules = gitignoreContent.split(`
 `).map((line) => line.trim()).filter((line) => line && !line.startsWith("#"));
     ig.add(rules);
@@ -11565,15 +11748,15 @@ var require_pg_connection_string = __commonJS((exports, module) => {
     if (config2.sslnegotiation === "direct" && config2.ssl === undefined) {
       config2.ssl = true;
     }
-    const fs13 = config2.sslcert || config2.sslkey || config2.sslrootcert ? __require("fs") : null;
+    const fs14 = config2.sslcert || config2.sslkey || config2.sslrootcert ? __require("fs") : null;
     if (config2.sslcert) {
-      config2.ssl.cert = fs13.readFileSync(config2.sslcert).toString();
+      config2.ssl.cert = fs14.readFileSync(config2.sslcert).toString();
     }
     if (config2.sslkey) {
-      config2.ssl.key = fs13.readFileSync(config2.sslkey).toString();
+      config2.ssl.key = fs14.readFileSync(config2.sslkey).toString();
     }
     if (config2.sslrootcert) {
-      config2.ssl.ca = fs13.readFileSync(config2.sslrootcert).toString();
+      config2.ssl.ca = fs14.readFileSync(config2.sslrootcert).toString();
     }
     if (options.useLibpqCompat && config2.uselibpqcompat) {
       throw new Error("Both useLibpqCompat and uselibpqcompat are set. Please use only one of them.");
@@ -13287,7 +13470,7 @@ var require_split2 = __commonJS((exports, module) => {
 // ../../node_modules/pgpass/lib/helper.js
 var require_helper = __commonJS((exports, module) => {
-  var path18 = __require("path");
+  var path19 = __require("path");
   var Stream2 = __require("stream").Stream;
   var split = require_split2();
   var util = __require("util");
@@ -13327,7 +13510,7 @@ var require_helper = __commonJS((exports, module) => {
   };
   exports.getFileName = function(rawEnv) {
     var env = rawEnv || process.env;
-    var file = env.PGPASSFILE || (isWin ? path18.join(env.APPDATA || "./", "postgresql", "pgpass.conf") : path18.join(env.HOME || "./", ".pgpass"));
+    var file = env.PGPASSFILE || (isWin ? path19.join(env.APPDATA || "./", "postgresql", "pgpass.conf") : path19.join(env.HOME || "./", ".pgpass"));
     return file;
   };
   exports.usePgPass = function(stats, fname) {
@@ -13451,16 +13634,16 @@ var require_helper = __commonJS((exports, module) => {
 // ../../node_modules/pgpass/lib/index.js
 var require_lib = __commonJS((exports, module) => {
-  var path18 = __require("path");
-  var fs13 = __require("fs");
+  var path19 = __require("path");
+  var fs14 = __require("fs");
   var helper = require_helper();
   module.exports = function(connInfo, cb) {
     var file = helper.getFileName();
-    fs13.stat(file, function(err, stat) {
+    fs14.stat(file, function(err, stat) {
       if (err || !helper.usePgPass(stat, file)) {
         return cb(undefined);
       }
-      var st = fs13.createReadStream(file);
+      var st = fs14.createReadStream(file);
       helper.getPassword(connInfo, st, cb);
     });
   };
@@ -15098,7 +15281,7 @@ class ProjectIdentityAliasResolver {
       this.cache.set(projectId, { canonical, expiresAt: this.now() + this.ttlMs });
       return canonical;
     } catch (error) {
-      logger.warn("[project-identity] alias resolution failed; using original id", safeErrorSummary(error));
+      logger.warn("[project-identity] alias resolution failed; using original id", { projectId, ...safeErrorSummary(error) });
       return projectId;
     }
   }
@@ -15159,8 +15342,8 @@ var init_alias_resolver = __esm(() => {
 });
 // ../../packages/core/dist/services/search/index-manager.js
-import fs13 from "fs";
-import path18 from "path";
+import fs14 from "fs";
+import path19 from "path";
 class IndexManager {
   metadataCache = new Map;
@@ -15253,9 +15436,9 @@ class IndexManager {
       const fileMetadata = {};
       let totalSize = 0;
       for (const filePath of indexedFiles) {
-        const fullPath = path18.join(projectPath, filePath);
+        const fullPath = path19.join(projectPath, filePath);
         try {
-          const stat = await fs13.promises.stat(fullPath);
+          const stat = await fs14.promises.stat(fullPath);
           fileMetadata[filePath] = {
             path: filePath,
             mtime: stat.mtimeMs,
@@ -15306,9 +15489,9 @@ class IndexManager {
         if (ig.ignores(match2)) {
           continue;
         }
-        const fullPath = path18.join(projectPath, match2);
+        const fullPath = path19.join(projectPath, match2);
         try {
-          const stat = await fs13.promises.stat(fullPath);
+          const stat = await fs14.promises.stat(fullPath);
           files.set(match2, {
             path: match2,
             mtime: stat.mtimeMs,
@@ -15759,10 +15942,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path19) {
-  if (!path19)
+function getElementAtPath(obj, path20) {
+  if (!path20)
     return obj;
-  return path19.reduce((acc, key) => acc?.[key], obj);
+  return path20.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -16090,11 +16273,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path19, issues) {
+function prefixIssues(path20, issues) {
   return issues.map((iss) => {
     var _a3;
     (_a3 = iss).path ?? (_a3.path = []);
-    iss.path.unshift(path19);
+    iss.path.unshift(path20);
     return iss;
   });
 }
@@ -16307,16 +16490,16 @@ function flattenError(error, mapper = (issue2) => issue2.message) {
 }
 function formatError(error, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error2, path19 = []) => {
+  const processError = (error2, path20 = []) => {
     for (const issue2 of error2.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path19, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path20, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path19, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path20, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path19, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path20, ...issue2.path]);
       } else {
-        const fullpath = [...path19, ...issue2.path];
+        const fullpath = [...path20, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -16343,17 +16526,17 @@ function formatError(error, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error2, path19 = []) => {
+  const processError = (error2, path20 = []) => {
     var _a3, _b;
     for (const issue2 of error2.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path19, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path20, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path19, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path20, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path19, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path20, ...issue2.path]);
       } else {
-        const fullpath = [...path19, ...issue2.path];
+        const fullpath = [...path20, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -16385,8 +16568,8 @@ function treeifyError(error, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path19 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path19) {
+  const path20 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path20) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -29389,13 +29572,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path19 = ref.slice(1).split("/").filter(Boolean);
-  if (path19.length === 0) {
+  const path20 = ref.slice(1).split("/").filter(Boolean);
+  if (path20.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path19[0] === defsKey) {
-    const key = path19[1];
+  if (path20[0] === defsKey) {
+    const key = path20[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -30884,8 +31067,8 @@ class ParseStatus {
   }
 }
 var makeIssue = (params) => {
-  const { data, path: path19, errorMaps, issueData } = params;
-  const fullPath = [...path19, ...issueData.path || []];
+  const { data, path: path20, errorMaps, issueData } = params;
+  const fullPath = [...path20, ...issueData.path || []];
   const fullIssue = {
     ...issueData,
     path: fullPath
@@ -30930,11 +31113,11 @@ var init_errorUtil = __esm(() => {
 // ../../node_modules/zod/v3/types.js
 class ParseInputLazyPath {
-  constructor(parent, value, path19, key) {
+  constructor(parent, value, path20, key) {
     this._cachedPath = [];
     this.parent = parent;
     this.data = value;
-    this._path = path19;
+    this._path = path20;
     this._key = key;
   }
   get path() {
@@ -36999,23 +37182,23 @@ var require_auth_config = __commonJS((exports, module) => {
     writeAuthConfig: () => writeAuthConfig
   });
   module.exports = __toCommonJS2(auth_config_exports);
-  var fs14 = __toESM2(__require("fs"));
-  var path19 = __toESM2(__require("path"));
+  var fs15 = __toESM2(__require("fs"));
+  var path20 = __toESM2(__require("path"));
   var import_token_util = require_token_util();
   function getAuthConfigPath() {
     const dataDir = (0, import_token_util.getVercelDataDir)();
     if (!dataDir) {
       throw new Error(`Unable to find Vercel CLI data directory. Your platform: ${process.platform}. Supported: darwin, linux, win32.`);
     }
-    return path19.join(dataDir, "auth.json");
+    return path20.join(dataDir, "auth.json");
   }
   function readAuthConfig() {
     try {
       const authPath = getAuthConfigPath();
-      if (!fs14.existsSync(authPath)) {
+      if (!fs15.existsSync(authPath)) {
         return null;
       }
-      const content = fs14.readFileSync(authPath, "utf8");
+      const content = fs15.readFileSync(authPath, "utf8");
       if (!content) {
         return null;
       }
@@ -37026,11 +37209,11 @@ var require_auth_config = __commonJS((exports, module) => {
   }
   function writeAuthConfig(config3) {
     const authPath = getAuthConfigPath();
-    const authDir = path19.dirname(authPath);
-    if (!fs14.existsSync(authDir)) {
-      fs14.mkdirSync(authDir, { mode: 504, recursive: true });
+    const authDir = path20.dirname(authPath);
+    if (!fs15.existsSync(authDir)) {
+      fs15.mkdirSync(authDir, { mode: 504, recursive: true });
     }
-    fs14.writeFileSync(authPath, JSON.stringify(config3, null, 2), { mode: 384 });
+    fs15.writeFileSync(authPath, JSON.stringify(config3, null, 2), { mode: 384 });
   }
   function isValidAccessToken(authConfig, expirationBufferMs = 0) {
     if (!authConfig.token)
@@ -37205,8 +37388,8 @@ var require_token_util = __commonJS((exports, module) => {
     saveToken: () => saveToken
   });
   module.exports = __toCommonJS2(token_util_exports);
-  var path19 = __toESM2(__require("path"));
-  var fs14 = __toESM2(__require("fs"));
+  var path20 = __toESM2(__require("path"));
+  var fs15 = __toESM2(__require("fs"));
   var import_token_error = require_token_error();
   var import_token_io = require_token_io();
   var import_auth_config = require_auth_config();
@@ -37218,7 +37401,7 @@ var require_token_util = __commonJS((exports, module) => {
     if (!dataDir) {
       return null;
     }
-    return path19.join(dataDir, vercelFolder);
+    return path20.join(dataDir, vercelFolder);
   }
   async function getVercelToken2(options) {
     const authConfig = (0, import_auth_config.readAuthConfig)();
@@ -37286,11 +37469,11 @@ var require_token_util = __commonJS((exports, module) => {
     if (!dir) {
       throw new import_token_error.VercelOidcTokenError("Unable to find project root directory. Have you linked your project with `vc link?`");
     }
-    const prjPath = path19.join(dir, ".vercel", "project.json");
-    if (!fs14.existsSync(prjPath)) {
+    const prjPath = path20.join(dir, ".vercel", "project.json");
+    if (!fs15.existsSync(prjPath)) {
       throw new import_token_error.VercelOidcTokenError("project.json not found, have you linked your project with `vc link?`");
     }
-    const prj = JSON.parse(fs14.readFileSync(prjPath, "utf8"));
+    const prj = JSON.parse(fs15.readFileSync(prjPath, "utf8"));
     if (typeof prj.projectId !== "string" && typeof prj.orgId !== "string") {
       throw new TypeError("Expected a string-valued projectId property. Try running `vc link` to re-link your project.");
     }
@@ -37301,11 +37484,11 @@ var require_token_util = __commonJS((exports, module) => {
     if (!dir) {
       throw new import_token_error.VercelOidcTokenError("Unable to find user data directory. Please reach out to Vercel support.");
     }
-    const tokenPath = path19.join(dir, "com.vercel.token", `${projectId}.json`);
+    const tokenPath = path20.join(dir, "com.vercel.token", `${projectId}.json`);
     const tokenJson = JSON.stringify(token);
-    fs14.mkdirSync(path19.dirname(tokenPath), { mode: 504, recursive: true });
-    fs14.writeFileSync(tokenPath, tokenJson);
-    fs14.chmodSync(tokenPath, 432);
+    fs15.mkdirSync(path20.dirname(tokenPath), { mode: 504, recursive: true });
+    fs15.writeFileSync(tokenPath, tokenJson);
+    fs15.chmodSync(tokenPath, 432);
     return;
   }
   function loadToken(projectId) {
@@ -37313,11 +37496,11 @@ var require_token_util = __commonJS((exports, module) => {
     if (!dir) {
       throw new import_token_error.VercelOidcTokenError("Unable to find user data directory. Please reach out to Vercel support.");
     }
-    const tokenPath = path19.join(dir, "com.vercel.token", `${projectId}.json`);
-    if (!fs14.existsSync(tokenPath)) {
+    const tokenPath = path20.join(dir, "com.vercel.token", `${projectId}.json`);
+    if (!fs15.existsSync(tokenPath)) {
       return null;
     }
-    const token = JSON.parse(fs14.readFileSync(tokenPath, "utf8"));
+    const token = JSON.parse(fs15.readFileSync(tokenPath, "utf8"));
     assertVercelOidcTokenResponse(token);
     return token;
   }
@@ -48159,37 +48342,37 @@ function createOpenAI(options = {}) {
   }, `ai-sdk/openai/${VERSION4}`);
   const createChatModel = (modelId) => new OpenAIChatLanguageModel(modelId, {
     provider: `${providerName}.chat`,
-    url: ({ path: path19 }) => `${baseURL}${path19}`,
+    url: ({ path: path20 }) => `${baseURL}${path20}`,
     headers: getHeaders,
     fetch: options.fetch
   });
   const createCompletionModel = (modelId) => new OpenAICompletionLanguageModel(modelId, {
     provider: `${providerName}.completion`,
-    url: ({ path: path19 }) => `${baseURL}${path19}`,
+    url: ({ path: path20 }) => `${baseURL}${path20}`,
     headers: getHeaders,
     fetch: options.fetch
   });
   const createEmbeddingModel = (modelId) => new OpenAIEmbeddingModel(modelId, {
     provider: `${providerName}.embedding`,
-    url: ({ path: path19 }) => `${baseURL}${path19}`,
+    url: ({ path: path20 }) => `${baseURL}${path20}`,
     headers: getHeaders,
     fetch: options.fetch
   });
   const createImageModel = (modelId) => new OpenAIImageModel(modelId, {
     provider: `${providerName}.image`,
-    url: ({ path: path19 }) => `${baseURL}${path19}`,
+    url: ({ path: path20 }) => `${baseURL}${path20}`,
     headers: getHeaders,
     fetch: options.fetch
   });
   const createTranscriptionModel = (modelId) => new OpenAITranscriptionModel(modelId, {
     provider: `${providerName}.transcription`,
-    url: ({ path: path19 }) => `${baseURL}${path19}`,
+    url: ({ path: path20 }) => `${baseURL}${path20}`,
     headers: getHeaders,
     fetch: options.fetch
   });
   const createSpeechModel = (modelId) => new OpenAISpeechModel(modelId, {
     provider: `${providerName}.speech`,
-    url: ({ path: path19 }) => `${baseURL}${path19}`,
+    url: ({ path: path20 }) => `${baseURL}${path20}`,
     headers: getHeaders,
     fetch: options.fetch
   });
@@ -48202,7 +48385,7 @@ function createOpenAI(options = {}) {
   const createResponsesModel = (modelId) => {
     return new OpenAIResponsesLanguageModel(modelId, {
       provider: `${providerName}.responses`,
-      url: ({ path: path19 }) => `${baseURL}${path19}`,
+      url: ({ path: path20 }) => `${baseURL}${path20}`,
       headers: getHeaders,
       fetch: options.fetch,
       fileIdPrefixes: ["file-"]
@@ -52643,7 +52826,7 @@ async function _checkJsonSchemaSupport() {
   } catch (e) {
     _jsonSchemaSupported = false;
     logger.warn("json_schema: version check error \u2014 falling back to json_object", {
-      error: e.message
+      error: e
     });
     return false;
   }
@@ -52691,7 +52874,7 @@ function hostPort(url2) {
     return null;
   }
 }
-function resolveInferenceSpec(baseUrl) {
+function resolveMatchedProviderSpec(baseUrl) {
   const target = hostPort(baseUrl);
   if (target) {
     const match2 = inferenceProviderList().find((spec) => hostPort(spec.defaultLlmBaseUrl) === target);
@@ -52709,7 +52892,13 @@ function resolveInferenceSpec(baseUrl) {
   if (embeddingProvider && LOCAL_INFERENCE_IDS.includes(embeddingProvider)) {
     return INFERENCE_PROVIDERS[embeddingProvider];
   }
-  return INFERENCE_PROVIDERS.ollama;
+  return;
+}
+function resolveInferenceSpec(baseUrl) {
+  return resolveMatchedProviderSpec(baseUrl) ?? INFERENCE_PROVIDERS.ollama;
+}
+function resolveProviderIdForLogging(baseUrl) {
+  return resolveMatchedProviderSpec(baseUrl)?.id ?? "unknown";
 }
 function _wrapFetchDisableThink(baseFetch) {
   const wrapped = async (input, init) => {
@@ -52852,12 +53041,40 @@ function _isAbortOrTimeoutError(err) {
   }
   return false;
 }
-async function llmComplete(prompt, opts = {}) {
+function summarizeZodIssues(error51, maxIssues = 5) {
+  return error51.issues.slice(0, maxIssues).map((issue2) => `${issue2.path.join(".") || "(root)"}: ${issue2.message}`).join("; ");
+}
+function recordLlmFailure(label, role, model, baseUrl, timeoutMs, elapsedMs, err) {
+  const consecutiveFailures = (llmFailureStreaks.get(label) ?? 0) + 1;
+  llmFailureStreaks.set(label, consecutiveFailures);
+  logger.warn("LLM call failed \u2014 using non-LLM fallback", {
+    label,
+    role,
+    model,
+    provider: resolveProviderIdForLogging(baseUrl),
+    timeoutMs,
+    elapsedMs,
+    timedOut: _isAbortOrTimeoutError(err),
+    error: err,
+    consecutiveFailures
+  });
+  return consecutiveFailures;
+}
+function recordLlmSuccess(label, model) {
+  const priorFailures = llmFailureStreaks.get(label) ?? 0;
+  if (priorFailures > 0) {
+    logger.info("LLM call recovered", { label, model, afterFailures: priorFailures });
+  }
+  llmFailureStreaks.set(label, 0);
+}
+async function llmComplete(prompt, opts) {
   if (!isLlmEnabled()) {
     return { ok: false, error: "llm disabled" };
   }
   const llm = getLlmConfig({ modelRole: opts.modelRole });
+  const role = opts.modelRole ?? "instruct";
   const timeoutMs = opts.timeoutMs ?? llm.timeoutMs;
+  const startedAt = Date.now();
   try {
     const result = await generateText({
       model: buildProvider(llm),
@@ -52868,14 +53085,17 @@ async function llmComplete(prompt, opts = {}) {
       abortSignal: timeoutSignal(timeoutMs)
     });
     const text2 = result.text ?? "";
-    if (text2.length > 0)
+    if (text2.length > 0) {
+      recordLlmSuccess(opts.label, llm.model);
       return { ok: true, value: text2 };
+    }
     if (llm.disableThink) {
       const reasoning = _reasoningToText(result);
       if (reasoning.length > 0) {
         logger.warn("llmComplete: empty content \u2014 recovered from reasoning channel", {
           reasoningLen: reasoning.length
         });
+        recordLlmSuccess(opts.label, llm.model);
         return { ok: true, value: reasoning };
       }
       logger.warn("llm reasoning-recovery empty", {
@@ -52883,21 +53103,22 @@ async function llmComplete(prompt, opts = {}) {
         finishReason: result?.finishReason ?? null
       });
     }
-    logger.warn("llmComplete: empty content and no reasoning \u2014 degrading", {});
-    return { ok: false, error: "empty content (thinking model)" };
+    const emptyErr = new Error("empty content (thinking model)");
+    recordLlmFailure(opts.label, role, llm.model, llm.baseUrl, timeoutMs, Date.now() - startedAt, emptyErr);
+    return { ok: false, error: emptyErr.message };
   } catch (e) {
-    logger.warn("llmComplete failed \u2014 degrading to non-LLM path", {
-      error: e.message
-    });
+    recordLlmFailure(opts.label, role, llm.model, llm.baseUrl, timeoutMs, Date.now() - startedAt, e);
     return { ok: false, error: e.message };
   }
 }
-async function llmObject(prompt, schema, opts = {}) {
+async function llmObject(prompt, schema, opts) {
   if (!isLlmEnabled()) {
     return { ok: false, error: "llm disabled" };
   }
   const llm = getLlmConfig({ modelRole: opts.modelRole });
+  const role = opts.modelRole ?? "instruct";
   const timeoutMs = opts.timeoutMs ?? llm.timeoutMs;
+  const startedAt = Date.now();
   let result = null;
   try {
     const useJsonSchema = llm.disableThink && await _checkJsonSchemaSupport();
@@ -52912,7 +53133,8 @@ async function llmObject(prompt, schema, opts = {}) {
         maxOutputTokens: llm.maxOutputTokens,
         abortSignal: timeoutSignal(timeoutMs)
       });
-      logger.info("json_schema: constrained decoding used", {});
+      logger.debug("json_schema: constrained decoding used", { label: opts.label, model: llm.model });
+      recordLlmSuccess(opts.label, llm.model);
       return { ok: true, value: result.object };
     }
     result = await generateObject({
@@ -52926,7 +53148,8 @@ async function llmObject(prompt, schema, opts = {}) {
     });
     const validated = schema.safeParse(result.object);
     if (validated.success) {
-      logger.info("json_schema: fallback to json_object \u2014 validated", {});
+      logger.debug("json_schema: fallback to json_object \u2014 validated", { label: opts.label, model: llm.model });
+      recordLlmSuccess(opts.label, llm.model);
       return { ok: true, value: validated.data };
     }
     if (llm.disableThink) {
@@ -52939,15 +53162,17 @@ async function llmObject(prompt, schema, opts = {}) {
             logger.warn("llmObject: recovered object from reasoning channel (fallback path)", {
               reasoningLen: reasoning.length
             });
+            recordLlmSuccess(opts.label, llm.model);
             return { ok: true, value: recovered.data };
           }
         }
       }
     }
-    logger.warn("llmObject: fallback validation failed", {
-      zodError: validated.error.issues.map((i) => i.message).join("; ")
+    const validationErr = new Error("schema validation failed (fallback path)", {
+      cause: summarizeZodIssues(validated.error)
     });
-    return { ok: false, error: "schema validation failed (fallback path)" };
+    recordLlmFailure(opts.label, role, llm.model, llm.baseUrl, timeoutMs, Date.now() - startedAt, validationErr);
+    return { ok: false, error: validationErr.message };
   } catch (e) {
     if (llm.disableThink && !_isAbortOrTimeoutError(e)) {
       const reasoning = _reasoningToText(result).length > 0 ? _reasoningToText(result) : _reasoningToText(e);
@@ -52959,6 +53184,7 @@ async function llmObject(prompt, schema, opts = {}) {
             logger.warn("llmObject: recovered object from reasoning channel", {
               reasoningLen: reasoning.length
             });
+            recordLlmSuccess(opts.label, llm.model);
             return { ok: true, value: validated.data };
           }
         }
@@ -52968,19 +53194,18 @@ async function llmObject(prompt, schema, opts = {}) {
         finishReason: e?.finishReason ?? null
       });
     }
-    logger.warn("llmObject failed \u2014 degrading to non-LLM path", {
-      error: e.message
-    });
+    recordLlmFailure(opts.label, role, llm.model, llm.baseUrl, timeoutMs, Date.now() - startedAt, e);
     return { ok: false, error: e.message };
   }
 }
-var _jsonSchemaSupported = null, testEnabledOverride = null, testBaseUrlOverride = null, llm;
+var _jsonSchemaSupported = null, testEnabledOverride = null, testBaseUrlOverride = null, llmFailureStreaks, llm;
 var init_llm_client = __esm(() => {
   init_dist6();
   init_dist7();
   init_dist();
   init_config();
   init_inference_providers();
+  llmFailureStreaks = new Map;
   llm = {
     complete: llmComplete,
     object: llmObject,
@@ -61993,7 +62218,7 @@ class MetricsCollector2 {
     try {
       writeFileSync(this.metricsPath, JSON.stringify(this.currentMetrics, null, 2));
     } catch (error51) {
-      logger.error("[Metrics] Failed to save:", error51);
+      logger.error("Metrics: failed to save", error51, { path: this.metricsPath });
     }
   }
   reset() {
@@ -62168,7 +62393,8 @@ class EmbeddingRateLimiter {
         }
       }
       if (this.config.requestsPerDay && this.dailyRequestsWindow.length >= this.config.requestsPerDay) {
-        logger.warn(`[${this.providerId}] RPD limit reached, waiting 60s`, {
+        logger.warn("EmbeddingRateLimiter: RPD limit reached, waiting 60s", {
+          providerId: this.providerId,
           rpd: this.config.requestsPerDay,
           current: this.dailyRequestsWindow.length
         });
@@ -64814,26 +65040,26 @@ var require_process = __commonJS((exports, module) => {
 // ../../node_modules/detect-libc/lib/filesystem.js
 var require_filesystem = __commonJS((exports, module) => {
-  var fs14 = __require("fs");
+  var fs15 = __require("fs");
   var LDD_PATH = "/usr/bin/ldd";
   var SELF_PATH = "/proc/self/exe";
   var MAX_LENGTH = 2048;
-  var readFileSync2 = (path19) => {
-    const fd = fs14.openSync(path19, "r");
+  var readFileSync2 = (path20) => {
+    const fd = fs15.openSync(path20, "r");
     const buffer = Buffer.alloc(MAX_LENGTH);
-    const bytesRead = fs14.readSync(fd, buffer, 0, MAX_LENGTH, 0);
-    fs14.close(fd, () => {});
+    const bytesRead = fs15.readSync(fd, buffer, 0, MAX_LENGTH, 0);
+    fs15.close(fd, () => {});
     return buffer.subarray(0, bytesRead);
   };
-  var readFile = (path19) => new Promise((resolve4, reject) => {
-    fs14.open(path19, "r", (err, fd) => {
+  var readFile = (path20) => new Promise((resolve4, reject) => {
+    fs15.open(path20, "r", (err, fd) => {
       if (err) {
         reject(err);
       } else {
         const buffer = Buffer.alloc(MAX_LENGTH);
-        fs14.read(fd, buffer, 0, MAX_LENGTH, 0, (_, bytesRead) => {
+        fs15.read(fd, buffer, 0, MAX_LENGTH, 0, (_, bytesRead) => {
           resolve4(buffer.subarray(0, bytesRead));
-          fs14.close(fd, () => {});
+          fs15.close(fd, () => {});
         });
       }
     });
@@ -64938,11 +65164,11 @@ var require_detect_libc = __commonJS((exports, module) => {
     }
     return null;
   };
-  var familyFromInterpreterPath = (path19) => {
-    if (path19) {
-      if (path19.includes("/ld-musl-")) {
+  var familyFromInterpreterPath = (path20) => {
+    if (path20) {
+      if (path20.includes("/ld-musl-")) {
         return MUSL;
-      } else if (path19.includes("/ld-linux-")) {
+      } else if (path20.includes("/ld-linux-")) {
         return GLIBC;
       }
     }
@@ -64987,8 +65213,8 @@ var require_detect_libc = __commonJS((exports, module) => {
     cachedFamilyInterpreter = null;
     try {
       const selfContent = await readFile(SELF_PATH);
-      const path19 = interpreterPath(selfContent);
-      cachedFamilyInterpreter = familyFromInterpreterPath(path19);
+      const path20 = interpreterPath(selfContent);
+      cachedFamilyInterpreter = familyFromInterpreterPath(path20);
     } catch (e) {}
     return cachedFamilyInterpreter;
   };
@@ -64999,8 +65225,8 @@ var require_detect_libc = __commonJS((exports, module) => {
     cachedFamilyInterpreter = null;
     try {
       const selfContent = readFileSync2(SELF_PATH);
-      const path19 = interpreterPath(selfContent);
-      cachedFamilyInterpreter = familyFromInterpreterPath(path19);
+      const path20 = interpreterPath(selfContent);
+      cachedFamilyInterpreter = familyFromInterpreterPath(path20);
     } catch (e) {}
     return cachedFamilyInterpreter;
   };
@@ -66662,18 +66888,18 @@ var require_sharp = __commonJS((exports, module) => {
     `@img/sharp-${runtimePlatform}/sharp.node`,
     "@img/sharp-wasm32/sharp.node"
   ];
-  var path19;
+  var path20;
   var sharp;
   var errors4 = [];
-  for (path19 of paths) {
+  for (path20 of paths) {
     try {
-      sharp = __require(path19);
+      sharp = __require(path20);
       break;
     } catch (err) {
       errors4.push(err);
     }
   }
-  if (sharp && path19.startsWith("@img/sharp-linux-x64") && !sharp._isUsingX64V2()) {
+  if (sharp && path20.startsWith("@img/sharp-linux-x64") && !sharp._isUsingX64V2()) {
     const err = new Error("Prebuilt binaries for linux-x64 require v2 microarchitecture");
     err.code = "Unsupported CPU";
     errors4.push(err);
@@ -69535,15 +69761,15 @@ var require_color = __commonJS((exports, module) => {
     };
   }
   function wrapConversion(toModel, graph) {
-    const path19 = [graph[toModel].parent, toModel];
+    const path20 = [graph[toModel].parent, toModel];
     let fn = conversions_default[graph[toModel].parent][toModel];
     let cur = graph[toModel].parent;
     while (graph[cur].parent) {
-      path19.unshift(graph[cur].parent);
+      path20.unshift(graph[cur].parent);
       fn = link(conversions_default[graph[cur].parent][cur], fn);
       cur = graph[cur].parent;
     }
-    fn.conversion = path19;
+    fn.conversion = path20;
     return fn;
   }
   function route(fromModel) {
@@ -70148,7 +70374,7 @@ var require_output = __commonJS((exports, module) => {
     Copyright 2013 Lovell Fuller and others.
     SPDX-License-Identifier: Apache-2.0
   */
-  var path19 = __require("path");
+  var path20 = __require("path");
   var is = require_is();
   var sharp = require_sharp();
   var formats = new Map([
@@ -70179,9 +70405,9 @@ var require_output = __commonJS((exports, module) => {
     let err;
     if (!is.string(fileOut)) {
       err = new Error("Missing output file path");
-    } else if (is.string(this.options.input.file) && path19.resolve(this.options.input.file) === path19.resolve(fileOut)) {
+    } else if (is.string(this.options.input.file) && path20.resolve(this.options.input.file) === path20.resolve(fileOut)) {
       err = new Error("Cannot use same file for input and output");
-    } else if (jp2Regex.test(path19.extname(fileOut)) && !this.constructor.format.jp2k.output.file) {
+    } else if (jp2Regex.test(path20.extname(fileOut)) && !this.constructor.format.jp2k.output.file) {
       err = errJp2Save();
     }
     if (err) {
@@ -77428,11 +77654,11 @@ var init_transformers_node = __esm(() => {
             throw new Error(`The number of external data chunks (${num_chunks}) exceeds the maximum allowed value (${_utils_hub_js__WEBPACK_IMPORTED_MODULE_5__.MAX_EXTERNAL_DATA_CHUNKS}).`);
           }
           for (let i = 0;i < num_chunks; ++i) {
-            const path19 = `${baseName}_data${i === 0 ? "" : "_" + i}`;
-            const fullPath = `${options.subfolder ?? ""}/${path19}`;
+            const path20 = `${baseName}_data${i === 0 ? "" : "_" + i}`;
+            const fullPath = `${options.subfolder ?? ""}/${path20}`;
             externalDataPromises.push(new Promise(async (resolve4, reject) => {
               const data = await (0, _utils_hub_js__WEBPACK_IMPORTED_MODULE_5__.getModelFile)(pretrained_model_name_or_path, fullPath, true, options, return_path);
-              resolve4(data instanceof Uint8Array ? { path: path19, data } : path19);
+              resolve4(data instanceof Uint8Array ? { path: path20, data } : path20);
             }));
           }
         } else if (session_options.externalData !== undefined) {
@@ -90496,7 +90722,7 @@ ${fake_token_around_image}` + `${global_img_token}` + image_token.repeat(image_s
           const blob = new Blob([wav], { type: "audio/wav" });
           return blob;
         }
-        async save(path19) {
+        async save(path20) {
           let fn;
           if (_env_js__WEBPACK_IMPORTED_MODULE_3__.apis.IS_BROWSER_ENV) {
             if (_env_js__WEBPACK_IMPORTED_MODULE_3__.apis.IS_WEBWORKER_ENV) {
@@ -90504,14 +90730,14 @@ ${fake_token_around_image}` + `${global_img_token}` + image_token.repeat(image_s
             }
             fn = _core_js__WEBPACK_IMPORTED_MODULE_2__.saveBlob;
           } else if (_env_js__WEBPACK_IMPORTED_MODULE_3__.apis.IS_FS_AVAILABLE) {
-            fn = async (path20, blob) => {
+            fn = async (path21, blob) => {
               let buffer = await blob.arrayBuffer();
-              node_fs__WEBPACK_IMPORTED_MODULE_5__["default"].writeFileSync(path20, Buffer.from(buffer));
+              node_fs__WEBPACK_IMPORTED_MODULE_5__["default"].writeFileSync(path21, Buffer.from(buffer));
             };
           } else {
             throw new Error("Unable to save because filesystem is disabled in this environment.");
           }
-          await fn(path19, this.toBlob());
+          await fn(path20, this.toBlob());
         }
       }
     },
@@ -90607,11 +90833,11 @@ ${fake_token_around_image}` + `${global_img_token}` + image_token.repeat(image_s
       function calculateReflectOffset(i, w) {
         return Math.abs((i + w) % (2 * w) - w);
       }
-      function saveBlob(path19, blob) {
+      function saveBlob(path20, blob) {
         const dataURL = URL.createObjectURL(blob);
         const downloadLink = document.createElement("a");
         downloadLink.href = dataURL;
-        downloadLink.download = path19;
+        downloadLink.download = path20;
         downloadLink.click();
         downloadLink.remove();
         URL.revokeObjectURL(dataURL);
@@ -91212,8 +91438,8 @@ ${fake_token_around_image}` + `${global_img_token}` + image_token.repeat(image_s
       }
       class FileCache {
-        constructor(path19) {
-          this.path = path19;
+        constructor(path20) {
+          this.path = path20;
         }
         async match(request) {
           let filePath = node_path__WEBPACK_IMPORTED_MODULE_1__["default"].join(this.path, request);
@@ -91969,20 +92195,20 @@ ${fake_token_around_image}` + `${global_img_token}` + image_token.repeat(image_s
           }
           return this;
         }
-        async save(path19) {
+        async save(path20) {
           if (IS_BROWSER_OR_WEBWORKER) {
             if (_env_js__WEBPACK_IMPORTED_MODULE_2__.apis.IS_WEBWORKER_ENV) {
               throw new Error("Unable to save an image from a Web Worker.");
             }
-            const extension = path19.split(".").pop().toLowerCase();
+            const extension = path20.split(".").pop().toLowerCase();
             const mime = CONTENT_TYPE_MAP.get(extension) ?? "image/png";
             const blob = await this.toBlob(mime);
-            (0, _core_js__WEBPACK_IMPORTED_MODULE_0__.saveBlob)(path19, blob);
+            (0, _core_js__WEBPACK_IMPORTED_MODULE_0__.saveBlob)(path20, blob);
           } else if (!_env_js__WEBPACK_IMPORTED_MODULE_2__.apis.IS_FS_AVAILABLE) {
             throw new Error("Unable to save the image because filesystem is disabled in this environment.");
           } else {
             const img = this.toSharp();
-            return await img.toFile(path19);
+            return await img.toFile(path20);
           }
         }
         toSharp() {
@@ -95471,16 +95697,16 @@ class LocalTransformersEmbeddingProvider {
       const out = await extractor("test", { pooling: "mean", normalize: true });
       const vec = Array.from(out.data);
       if (!Array.isArray(vec) || vec.length !== this.dimensions) {
-        logger.error(`[${this.id}] Invalid embedding dimensions`, undefined, { expected: this.dimensions, got: vec.length });
+        logger.error("LocalTransformersProvider: invalid embedding dimensions", undefined, { providerId: this.id, expected: this.dimensions, got: vec.length });
         return false;
       }
       if (vec.some((v) => typeof v !== "number" || isNaN(v))) {
-        logger.error(`[${this.id}] Invalid embedding values (not numbers)`);
+        logger.error("LocalTransformersProvider: invalid embedding values (not numbers)", undefined, { providerId: this.id });
         return false;
       }
       return true;
     } catch (error51) {
-      logger.error(`[${this.id}] Local provider unavailable`, error51);
+      logger.error("LocalTransformersProvider: provider unavailable", error51, { providerId: this.id });
       return false;
     }
   }
@@ -95520,7 +95746,13 @@ async function withRetry(fn, config3, context2) {
       lastError2 = error51;
       if (attempt < config3.maxRetries) {
         const delay2 = getRetryDelay(attempt, config3);
-        logger.warn(`[EmbeddingProvider] ${context2} failed (attempt ${attempt + 1}/${config3.maxRetries + 1}), retrying in ${delay2}ms`, { error: lastError2.message });
+        logger.warn("EmbeddingProvider: operation failed, retrying", {
+          context: context2,
+          attempt: attempt + 1,
+          maxAttempts: config3.maxRetries + 1,
+          delayMs: delay2,
+          error: lastError2
+        });
         await sleep(delay2);
       }
     }
@@ -95836,7 +96068,7 @@ var init_provider = __esm(() => {
             return output;
           }, this.retryConfig, `[${this.id}] embedBatchDirect (${texts.length} texts)`), this.timeout, `[${this.id}] embedBatchDirect`);
         } catch (error51) {
-          logger.warn(`[${this.id}] Ollama batch endpoint unavailable, falling back to sequential embeds: ${error51.message}`);
+          logger.warn("EmbeddingProvider: Ollama batch endpoint unavailable, falling back to sequential embeds", { providerId: this.id, textCount: texts.length, error: error51 });
           const embeddings = [];
           let consecutiveFailures = 0;
           for (const text2 of texts) {
@@ -95875,11 +96107,11 @@ var init_provider = __esm(() => {
             });
             clearTimeout(timeoutId);
             if (!response.ok) {
-              logger.error(`[${this.id}] Ollama API returned ${response.status}`);
+              logger.error("EmbeddingProvider: Ollama API returned non-OK status", undefined, { providerId: this.id, status: response.status });
               return false;
             }
           } catch {
-            logger.error(`[${this.id}] Ollama service unreachable`, undefined, { baseURL: this.baseURL, timeoutMs: 2000 });
+            logger.error("EmbeddingProvider: Ollama service unreachable", undefined, { providerId: this.id, baseURL: this.baseURL, timeoutMs: 2000 });
             return false;
           }
         }
@@ -95889,16 +96121,16 @@ var init_provider = __esm(() => {
           if (Array.isArray(embedding)) {
             this.lastDimensionMismatch = new DimensionMismatchError(this.id, this.dimensions, embedding.length);
           }
-          logger.error(`[${this.id}] Invalid embedding dimensions`, undefined, { expected: this.dimensions, got: embedding.length });
+          logger.error("EmbeddingProvider: invalid embedding dimensions", undefined, { providerId: this.id, expected: this.dimensions, got: embedding.length });
           return false;
         }
         if (!embedding.every((v) => typeof v === "number" && !isNaN(v))) {
-          logger.error(`[${this.id}] Invalid embedding values (not numbers)`);
+          logger.error("EmbeddingProvider: invalid embedding values (not numbers)", undefined, { providerId: this.id });
           return false;
         }
         return true;
       } catch (error51) {
-        logger.error(`[${this.id}] Provider unavailable`, error51);
+        logger.error("EmbeddingProvider: provider unavailable", error51, { providerId: this.id });
         return false;
       }
     }
@@ -101516,10 +101748,10 @@ Note that ${s.bold("include")} statements only accept relation fields.`, a;
       super(t, "P2023", r);
     }
   };
-  var fs14 = new WeakMap;
+  var fs15 = new WeakMap;
   function Ep(e) {
-    let t = fs14.get(e);
-    return t || (t = Object.entries(e), fs14.set(e, t)), t;
+    let t = fs15.get(e);
+    return t || (t = Object.entries(e), fs15.set(e, t)), t;
   }
   function hs(e, t, r) {
     switch (t.type) {
@@ -105487,7 +105719,7 @@ var require_prisma = __commonJS((exports) => {
   Prisma.JsonNull = JsonNull2;
   Prisma.AnyNull = AnyNull2;
   Prisma.NullTypes = NullTypes2;
-  var path19 = __require("path");
+  var path20 = __require("path");
   exports.Prisma.TransactionIsolationLevel = makeStrictEnum2({
     ReadUncommitted: "ReadUncommitted",
     ReadCommitted: "ReadCommitted",
@@ -108114,7 +108346,7 @@ function getPrismaClient2() {
     const pg2 = _adapters.loadPg();
     const { PrismaPg: PrismaPg2 } = _adapters.loadPrismaPg();
     const pool = new pg2.Pool({ connectionString: databaseUrl, max: 10, idleTimeoutMillis: 30000, connectionTimeoutMillis: 5000 });
-    pool.on("error", (error51) => logger.error("Unexpected PG pool error", error51));
+    pool.on("error", (error51) => logger.error("prisma-client: unexpected PG pool error", error51, { poolMax: 10 }));
     prismaPool = pool;
     prismaInstance = new import_prisma.PrismaClient({ adapter: new PrismaPg2(pool) });
     logger.info("Prisma Client initialized with PostgreSQL");
@@ -108423,7 +108655,10 @@ var init_config2 = __esm(() => {
     "local"
   ]);
   if (!SELECTABLE_PROVIDERS.has(selectedProvider)) {
-    logger.warn(`[EmbeddingConfig] selected provider "${selectedProvider}" has no runtime entry \u2014 falling back to priority order`, { source: process.env.EMBEDDING_PROVIDER ? "EMBEDDING_PROVIDER env" : "config.json embedding.provider" });
+    logger.warn("EmbeddingConfig: selected provider has no runtime entry, falling back to priority order", {
+      selectedProvider,
+      source: process.env.EMBEDDING_PROVIDER ? "EMBEDDING_PROVIDER env" : "config.json embedding.provider"
+    });
   }
   embeddingProviders = {
     google: (() => {
@@ -108463,7 +108698,12 @@ var init_config2 = __esm(() => {
       const envDimensions = Number.isInteger(rawEnvDimensions) && rawEnvDimensions > 0 ? rawEnvDimensions : undefined;
       const resolvedDimensions = resolveEmbeddingDimensions(model, file2?.dimensions, envDimensions);
       if (resolvedDimensions.correctedFrom !== undefined) {
-        logger.warn(`[ollama] config.json records embedding.dimensions ${resolvedDimensions.correctedFrom} for model ` + `"${model}", which emits ${resolvedDimensions.dimensions}. Using ${resolvedDimensions.dimensions}. ` + "Update embedding.dimensions in config.json (or set OLLAMA_EMBEDDING_DIMENSIONS) to silence this.");
+        logger.warn("EmbeddingConfig: ollama config.json dimensions mismatch corrected", {
+          provider: "ollama",
+          model,
+          configuredDimensions: resolvedDimensions.correctedFrom,
+          correctedDimensions: resolvedDimensions.dimensions
+        });
       }
       return {
         provider: "ollama",
@@ -108615,8 +108855,8 @@ class EmbeddingService {
         dimensions: this.provider.dimensions
       });
     } catch (error51) {
-      logger.error("Failed to initialize embedding service", error51);
-      logger.warn("Embedding service will use fallback mode");
+      logger.error("Failed to initialize embedding service", error51, { stage: "initialize" });
+      logger.warn("Embedding service will use fallback mode", { stage: "initialize" });
     }
   }
   async ensureInitialized() {
@@ -108698,7 +108938,7 @@ async function tryCreateProvider(config3, providerId, skipHealthCheck) {
   return { provider };
 }
 function refuseOnDimensionMismatch(providerId, mismatch) {
-  logger.error(`[${providerId}] Configured embedding provider failed with a dimension mismatch \u2014 refusing to ` + `fall through to another provider (that would silently degrade retrieval quality). ` + `configured dimensions ${mismatch.expected} \u2260 model output ${mismatch.got} \u2014 fix ` + "`embedding.dimensions` in config.json or OLLAMA_EMBEDDING_DIMENSIONS to match the model actually pulled.");
+  logger.error("EmbeddingProvider: configured provider failed with a dimension mismatch, refusing to fall through", mismatch, { providerId, configuredDimensions: mismatch.expected, modelDimensions: mismatch.got });
   throw mismatch;
 }
 async function createEmbeddingProvider(options = {}) {
@@ -108797,6 +109037,7 @@ Write the hypothetical implementation paragraph.`;
 }
 async function rewriteQuery(query, surface, opts = {}) {
   const res = await surface.object(rewritePrompt(query), QueryRewriteSchema, {
+    label: "query-rewrite",
     system: REWRITE_SYSTEM,
     timeoutMs: opts.timeoutMs
   });
@@ -108809,6 +109050,7 @@ async function rewriteQuery(query, surface, opts = {}) {
 }
 async function hyde(query, surface, embedFn, opts = {}) {
   const text2 = await surface.complete(hydePrompt(query), {
+    label: "hyde",
     system: HYDE_SYSTEM,
     timeoutMs: opts.timeoutMs
   });
@@ -108822,7 +109064,7 @@ async function hyde(query, surface, embedFn, opts = {}) {
     return vec;
   } catch (e) {
     logger.warn("hyde embed failed \u2014 skipping HyDE stream", {
-      error: e.message
+      error: e
     });
     return null;
   }
@@ -110550,7 +110792,7 @@ class KeywordSearchPg {
       `);
       this.trigramAvailable = true;
     } catch (error51) {
-      logger.warn("pg_trgm unavailable \u2014 trigram RRF stream disabled on PG", { err: error51.message });
+      logger.warn("pg_trgm unavailable \u2014 trigram RRF stream disabled on PG", { error: error51 });
       this.trigramAvailable = false;
     }
     logger.info("PostgreSQL keyword search initialized", {
@@ -111089,7 +111331,8 @@ var init_postgres_vector_store = __esm(() => {
         this.schemaDimensions = providerDimensions;
         const { rows } = await client.query(`SELECT tablename FROM pg_tables WHERE tablename = $1`, [this.tableName]);
         if (rows.length === 0) {
-          logger.warn(`Table ${this.tableName} not found. Creating fallback table.`, {
+          logger.warn("PostgresVectorStore: table not found, creating fallback table", {
+            tableName: this.tableName,
             note: 'Run "prisma migrate deploy" to create tables via migrations'
           });
           await this.createFallbackTable(client, providerDimensions);
@@ -111126,10 +111369,12 @@ var init_postgres_vector_store = __esm(() => {
           if (projects.length === 0)
             continue;
           const otherDim = tablename.match(/_([0-9]+)d$/)?.[1];
-          logger.warn(`[vector] Orphaned chunks detected: ${tablename} has data for projects not in ${this.tableName}. Embedding model likely changed from ${otherDim}d \u2192 ${currentDim}d. Reindex required.`, {
+          logger.warn("PostgresVectorStore: orphaned chunks detected, embedding model likely changed, reindex required", {
             currentTable: this.tableName,
             currentCount,
+            currentDim,
             orphanedTable: tablename,
+            orphanedDim: otherDim,
             affectedProjects: projects.map((p) => ({ projectId: p.project_id, chunks: p.n }))
           });
         }
@@ -111273,7 +111518,7 @@ var init_postgres_vector_store = __esm(() => {
           logger.warn("[postgres] Sub-batch embedding failed, falling back per-document", {
             subBatchIndex: Math.floor(i / EMBED_SUB_BATCH_SIZE),
             count: subBatch.length,
-            error: error51.message
+            error: error51
           });
         }
         if (embeddings) {
@@ -111285,7 +111530,7 @@ var init_postgres_vector_store = __esm(() => {
             logger.warn("[postgres] Sub-batch insert failed, falling back per-document", {
               subBatchIndex: Math.floor(i / EMBED_SUB_BATCH_SIZE),
               count: subBatch.length,
-              error: error51.message
+              error: error51
             });
           }
         }
@@ -111298,7 +111543,7 @@ var init_postgres_vector_store = __esm(() => {
             totalFailed++;
             logger.warn("[postgres] Skipping document due to embedding/insert error", {
               id: doc2.id,
-              error: singleError.message
+              error: singleError
             });
           }
         }
@@ -111970,7 +112215,9 @@ class SearchAnalyticsPg {
   }
   trackSearch(event) {
     this.trackSearchAsync(event).catch((err) => {
-      logger.error("Failed to track search event", err);
+      logger.error("Failed to track search event", err, {
+        projectId: event.projectId
+      });
     });
   }
   async trackSearchAsync(event) {
@@ -111995,7 +112242,9 @@ class SearchAnalyticsPg {
         event.score || null
       ]);
     } catch (error51) {
-      logger.error("Failed to track search event in PostgreSQL", error51);
+      logger.error("Failed to track search event in PostgreSQL", error51, {
+        projectId: event.projectId
+      });
     }
   }
   async recordQuery(query, projectId, resultsCount = 0, duration3 = 0, cacheHit = false) {
@@ -114596,7 +114845,11 @@ class GraphStorePg {
       `;
       return rows[0] ? rowToEdge(rows[0]) : null;
     } catch (error51) {
-      logger.error("Failed to create edge", error51);
+      logger.error("Failed to create edge", error51, {
+        sourceId: edge.sourceId,
+        targetId: edge.targetId,
+        relationType: edge.relationType
+      });
       return null;
     }
   }
@@ -115192,7 +115445,7 @@ class PgSynapseSessionStore {
       } catch (e) {
         this.hydrateFailedAt = Date.now();
         logger.warn("PgSynapseSessionStore hydrate failed (best-effort)", {
-          error: e.message
+          error: e
         });
       } finally {
         this.hydrating = null;
@@ -115327,7 +115580,7 @@ class PgSynapseSessionStore {
     const next = prev.then(fn).catch((e) => {
       logger.warn("PgSynapseSessionStore write failed (best-effort)", {
         key,
-        error: e.message
+        error: e
       });
     });
     this.inflight.set(key, next);
@@ -115433,7 +115686,7 @@ class SessionRegistry {
     try {
       this.store?.save(session);
     } catch (error51) {
-      logger.warn("[SessionRegistry] store save failed:", { error: error51.message });
+      logger.warn("SessionRegistry: store save failed", { sessionId: session.sessionId, error: error51 });
     }
     return session;
   }
@@ -115441,7 +115694,7 @@ class SessionRegistry {
     try {
       await this.store?.ensureReady();
     } catch (error51) {
-      logger.warn("[SessionRegistry] store ensureReady failed:", { error: error51.message });
+      logger.warn("SessionRegistry: store ensureReady failed", { error: error51 });
     }
   }
   async getAsync(sessionId, now2 = Date.now()) {
@@ -115462,7 +115715,7 @@ class SessionRegistry {
           session = loaded;
         }
       } catch (error51) {
-        logger.warn("[SessionRegistry] store load failed:", { error: error51.message });
+        logger.warn("SessionRegistry: store load failed", { sessionId, error: error51 });
       }
     }
     if (!session)
@@ -115472,7 +115725,7 @@ class SessionRegistry {
       try {
         this.store?.delete(sessionId);
       } catch (error51) {
-        logger.warn("[SessionRegistry] store delete (expired) failed:", { error: error51.message });
+        logger.warn("SessionRegistry: store delete (expired) failed", { sessionId, error: error51 });
       }
       return null;
     }
@@ -115494,7 +115747,7 @@ class SessionRegistry {
     try {
       this.store?.save(session);
     } catch (error51) {
-      logger.warn("[SessionRegistry] store save (updateTaskContext) failed:", { error: error51.message });
+      logger.warn("SessionRegistry: store save (updateTaskContext) failed", { sessionId, error: error51 });
     }
     return session;
   }
@@ -115521,7 +115774,7 @@ class SessionRegistry {
     try {
       this.store?.recordAccess(sessionId, memoryId, nextCount);
     } catch (error51) {
-      logger.warn("[SessionRegistry] store recordAccess failed:", { error: error51.message });
+      logger.warn("SessionRegistry: store recordAccess failed", { sessionId, memoryId, error: error51 });
     }
   }
   delete(sessionId) {
@@ -115529,7 +115782,7 @@ class SessionRegistry {
     try {
       this.store?.delete(sessionId);
     } catch (error51) {
-      logger.warn("[SessionRegistry] store delete failed:", { error: error51.message });
+      logger.warn("SessionRegistry: store delete failed", { sessionId, error: error51 });
     }
     return removed;
   }
@@ -115557,7 +115810,7 @@ function getSessionRegistry() {
       const { getSessionStore: getSessionStore2 } = (init_session_store(), __toCommonJS(exports_session_store));
       store2 = getSessionStore2();
     } catch (error51) {
-      logger.warn("[SessionRegistry] store init failed, falling back to MemorySessionStore:", { error: error51.message });
+      logger.warn("SessionRegistry: store init failed, falling back to MemorySessionStore", { error: error51 });
       const { MemorySessionStore: MemorySessionStore2 } = (init_session_store(), __toCommonJS(exports_session_store));
       store2 = new MemorySessionStore2;
     }
@@ -116374,19 +116627,22 @@ class LLMJudgeReranker {
     const tail = results.slice(k);
     const prompt = buildPrompt(query, head);
     let verdict;
+    let verdictError;
     try {
-      const res = await this.llm.object(prompt, RerankVerdictSchema, { modelRole: "code" });
+      const res = await this.llm.object(prompt, RerankVerdictSchema, { label: "reranker", modelRole: "code" });
       verdict = res.ok ? res.value ?? null : null;
+      verdictError = res.ok ? undefined : res.error;
     } catch (e) {
       logger.warn("LLMJudgeReranker threw \u2014 degrading to input order", {
         query,
-        error: e.message
+        error: e
       });
       return results;
     }
     if (!verdict) {
       logger.warn("LLMJudgeReranker got {ok:false} \u2014 degrading to input order", {
-        query
+        query,
+        error: verdictError
       });
       return results;
     }
@@ -117185,10 +117441,10 @@ var init_chunker_code = __esm(() => {
 });
 // ../../packages/core/dist/services/search/smart-chunker.js
-import path19 from "path";
+import path20 from "path";
 function smartChunk(content, filePath, config3 = {}) {
   const cfg = { ...DEFAULT_CONFIG, ...config3 };
-  const ext2 = path19.extname(filePath).toLowerCase();
+  const ext2 = path20.extname(filePath).toLowerCase();
   const relativePath = filePath;
   const fileImports = isCodeFile(ext2) ? extractFileImports(content, ext2) : undefined;
   let chunks;
@@ -117526,8 +117782,8 @@ var init_embedding_freshness = __esm(() => {
 });
 // ../../packages/core/dist/services/search/project-indexer.js
-import fs14 from "fs/promises";
-import path20 from "path";
+import fs15 from "fs/promises";
+import path21 from "path";
 import { randomUUID as randomUUID3 } from "crypto";
 async function runWithIndexLock(lockMap, projectId, work) {
   const prevLock = lockMap.get(projectId);
@@ -117570,7 +117826,7 @@ async function indexProjectInternal(deps, projectPath, projectId, options = {})
       dot: false
     });
     const filteredFiles = files.filter((file2) => {
-      const relativePath = path20.relative(projectPath, file2);
+      const relativePath = path21.relative(projectPath, file2);
       const shouldIgnore = ig.ignores(relativePath);
       if (shouldIgnore) {
         logger.debug("Ignoring file per .gitignore during indexing", {
@@ -117610,7 +117866,7 @@ async function indexProjectInternal(deps, projectPath, projectId, options = {})
         });
       }
     }
-    const indexedFilesList = filteredFiles.map((f) => path20.relative(projectPath, f));
+    const indexedFilesList = filteredFiles.map((f) => path21.relative(projectPath, f));
     await deps.indexManager.updateIndexMetadata(projectId, projectPath, indexedFilesList);
     logger.info("Project indexing completed", {
       projectId,
@@ -117740,7 +117996,7 @@ async function ensureFreshIndex(deps, projectId, projectPath, options = {}) {
   let errors4 = 0;
   for (const relativeFilePath of filesToReindex) {
     try {
-      const fullPath = path20.join(projectPath, relativeFilePath);
+      const fullPath = path21.join(projectPath, relativeFilePath);
       const result = await deps.indexFile(fullPath, projectId, projectPath, centralityMap);
       filesIndexed++;
       chunksIndexed += result.chunks;
@@ -117800,8 +118056,8 @@ async function checkSearchAdmission(deps, projectId, projectPath) {
 }
 async function indexFile(deps, filePath, projectId, projectRoot, centralityMap) {
   projectId = await getProjectIdentityAliasResolver().resolve(projectId);
-  const content = await fs14.readFile(filePath, "utf-8");
-  const relativePath = path20.relative(projectRoot, filePath);
+  const content = await fs15.readFile(filePath, "utf-8");
+  const relativePath = path21.relative(projectRoot, filePath);
   const maxFileSize = config.get("security").maxFileSize || 1024 * 1024;
   if (content.length > maxFileSize) {
     logger.warn("File too large, skipping", {
@@ -117821,7 +118077,7 @@ async function indexFile(deps, filePath, projectId, projectRoot, centralityMap)
       chunkIndex: i,
       totalChunks: chunks.length,
       type: chunk.type,
-      language: path20.extname(filePath).slice(1),
+      language: path21.extname(filePath).slice(1),
       lineStart: chunk.lineStart,
       lineEnd: chunk.lineEnd,
       label: chunk.label,
@@ -118232,7 +118488,7 @@ class TaskEnvelopeService {
         errors4.push("prime");
         logger.warn("synapse_task_begin: prime sub-step failed", {
           sessionId,
-          error: err instanceof Error ? err.message : String(err)
+          error: err
         });
       }
     }
@@ -118255,7 +118511,7 @@ class TaskEnvelopeService {
       errors4.push("search");
       logger.warn("synapse_task_begin: search sub-step failed", {
         sessionId,
-        error: err instanceof Error ? err.message : String(err)
+        error: err
       });
     }
     if (firstHitFile) {
@@ -118278,7 +118534,7 @@ class TaskEnvelopeService {
         errors4.push("prefetch");
         logger.warn("synapse_task_begin: prefetch sub-step failed", {
           sessionId,
-          error: err instanceof Error ? err.message : String(err)
+          error: err
         });
       }
     }
@@ -118289,7 +118545,7 @@ class TaskEnvelopeService {
         errors4.push("access");
         logger.warn("synapse_task_begin: access sub-step failed", {
           sessionId,
-          error: err instanceof Error ? err.message : String(err)
+          error: err
         });
       }
     }
@@ -118632,7 +118888,7 @@ async function applySynapseState(deps, baseResults, query, projectId, sessionId,
     logger.warn("Synapse session lookup failed \u2014 using stateless search", {
       sessionId,
       projectId,
-      error: error51.message
+      error: error51
     });
     return baseResults;
   }
@@ -118653,7 +118909,7 @@ async function applySynapseState(deps, baseResults, query, projectId, sessionId,
     logger.warn("Synapse processing failed \u2014 using stateless search", {
       sessionId,
       projectId,
-      error: error51.message
+      error: error51
     });
     return baseResults;
   }
@@ -119548,7 +119804,7 @@ class RelationExtractor {
     } catch (error51) {
       logger.warn("RelationExtractor: extraction failed", {
         memoryId,
-        error: error51.message
+        error: error51
       });
     }
     return edgesCreated;
@@ -119995,7 +120251,7 @@ class MemoryGraphService {
     } catch (error51) {
       logger.warn("Graph update failed after memory store", {
         memoryId,
-        error: error51.message
+        error: error51
       });
     }
   }
@@ -120011,7 +120267,7 @@ class MemoryGraphService {
     } catch (error51) {
       logger.warn("Graph cleanup failed after memory delete", {
         memoryId,
-        error: error51.message
+        error: error51
       });
     }
   }
@@ -120160,7 +120416,7 @@ async function consolidateWindow(candidates, llm2, opts = {}) {
   if (!llm2.isEnabled())
     return null;
   const prompt = buildPrompt2(window2);
-  const result = await llm2.object(prompt, ConsolidatedBatchSchema);
+  const result = await llm2.object(prompt, ConsolidatedBatchSchema, { label: "memory-consolidation" });
   if (!result.ok || !result.value)
     return null;
   const batch = {
@@ -120261,7 +120517,7 @@ class MemoryConsolidationJob {
     } catch (error51) {
       logger.warn("Memory consolidation skipped", {
         trigger,
-        error: error51.message
+        error: error51
       });
     } finally {
       this.running = false;
@@ -120284,7 +120540,7 @@ class MemoryConsolidationJob {
       candidates = await Promise.resolve(repo.listConsolidationCandidates(staleSinceMs, 500));
     } catch (e) {
       logger.warn("consolidation: candidate list failed (decay)", {
-        error: e.message
+        error: e
       });
       return 0;
     }
@@ -120306,7 +120562,7 @@ class MemoryConsolidationJob {
       } catch (e) {
         logger.warn("consolidation: decay write failed", {
           id: row.id,
-          error: e.message
+          error: e
         });
       }
     }
@@ -120335,14 +120591,14 @@ class MemoryConsolidationJob {
           } catch (e) {
             logger.warn("consolidation: soft-delete failed", {
               id: row.id,
-              error: e.message
+              error: e
             });
           }
         }
       }
     } catch (e) {
       logger.warn("consolidation: prune scan failed", {
-        error: e.message
+        error: e
       });
     }
     return pruned;
@@ -120353,7 +120609,7 @@ class MemoryConsolidationJob {
       candidates = await Promise.resolve(repo.listConsolidationCandidates(staleSinceMs, 200));
     } catch (e) {
       logger.warn("consolidation: candidate list failed (merge)", {
-        error: e.message
+        error: e
       });
       return { merged: 0, batchesCreated: 0 };
     }
@@ -120379,7 +120635,7 @@ class MemoryConsolidationJob {
     } catch (e) {
       logger.warn("consolidation: merge insert failed", {
         batchId: batch.id,
-        error: e.message
+        error: e
       });
       return { merged: 0, batchesCreated: 0 };
     }
@@ -120392,7 +120648,7 @@ class MemoryConsolidationJob {
         logger.warn("consolidation: addSupercedesEdge failed", {
           newId,
           sourceId,
-          error: e.message
+          error: e
         });
       }
     }
@@ -120432,7 +120688,7 @@ class MemoryConsolidationJob {
       return result;
     } catch (e) {
       logger.warn("consolidation: promote (PG) failed", {
-        error: e.message
+        error: e
       });
       return 0;
     }
@@ -120471,19 +120727,22 @@ class SalienceJudge {
     }
     const prompt = buildPrompt3(trimmed, type);
     let verdict;
+    let verdictError;
     try {
-      const res = await this.llm.object(prompt, SalienceSchema);
+      const res = await this.llm.object(prompt, SalienceSchema, { label: "salience-judge" });
       verdict = res.ok ? res.value ?? null : null;
+      verdictError = res.ok ? undefined : res.error;
     } catch (e) {
       logger.warn("SalienceJudge threw \u2014 degrading to neutral default", {
         type,
-        error: e.message
+        error: e
       });
       return { salience: NEUTRAL_SALIENCE, source: "default" };
     }
     if (!verdict) {
       logger.warn("SalienceJudge got {ok:false} \u2014 degrading to neutral default", {
-        type
+        type,
+        error: verdictError
       });
       return { salience: NEUTRAL_SALIENCE, source: "default" };
     }
@@ -120698,7 +120957,8 @@ class MemoryController {
         }
       } catch (err) {
         logger.warn("Graph enrichment failed", {
-          error: err.message
+          projectId,
+          error: err
         });
       }
     }
@@ -120900,7 +121160,7 @@ class CodeCompressor {
             }
             const prompt = buildLlmCompressPrompt(content, language3, targetRatio, preservedElements);
             try {
-              const res = await this.llmCompleteFn(prompt, { timeoutMs, modelRole: "code" });
+              const res = await this.llmCompleteFn(prompt, { label: "code-compressor", timeoutMs, modelRole: "code" });
               if (res.ok && typeof res.value === "string" && res.value.trim().length > 0 && res.value.length <= content.length) {
                 compressed = res.value;
                 compressionSource = "llm";
@@ -120940,7 +121200,10 @@ class CodeCompressor {
       });
       return compressedContent;
     } catch (error51) {
-      logger.error("Code compression failed", error51);
+      logger.error("Code compression failed", error51, {
+        strategy: useStrategy,
+        originalLength: content.length
+      });
       return CompressedContent.identity(content);
     }
   }
@@ -121250,9 +121513,9 @@ class TokenMetrics {
       }
       throw new Error("Model not found in models.dev");
     } catch (error51) {
-      logger.warn("Failed to fetch pricing from models.dev, using fallback", {
+      logger.warn("TokenMetrics: failed to fetch pricing from models.dev, using fallback", {
         modelId,
-        error: error51 instanceof Error ? error51.message : String(error51)
+        error: error51
       });
       const fallback = FALLBACK_PRICING2[modelId] || FALLBACK_PRICING2["gpt-4"];
       this.pricingCache.set(modelId, {
@@ -122372,16 +122635,16 @@ function detectRoutes(httpEdges, defs, opts = {}) {
   const seen = new Set;
   const out = [];
   for (const e of httpEdges) {
-    const path21 = e.route;
-    if (!path21)
+    const path22 = e.route;
+    if (!path22)
       continue;
     const method = (e.method ?? "ANY").toUpperCase();
-    const key = method + " " + path21;
+    const key = method + " " + path22;
     if (seen.has(key))
       continue;
     seen.add(key);
     out.push({
-      path: path21,
+      path: path22,
       method: e.method,
       file: e.fromFile,
       handler: e.targetFqn ?? e.symbolName
@@ -122392,12 +122655,12 @@ function detectRoutes(httpEdges, defs, opts = {}) {
       continue;
     const parsed = parseRouteName(d.name);
     const method = parsed?.method ?? "ANY";
-    const path21 = parsed?.path ?? d.name;
-    const key = method + " " + path21;
+    const path22 = parsed?.path ?? d.name;
+    const key = method + " " + path22;
     if (seen.has(key))
       continue;
     seen.add(key);
-    out.push({ path: path21, method: parsed?.method, file: d.filePath, handler: d.name });
+    out.push({ path: path22, method: parsed?.method, file: d.filePath, handler: d.name });
   }
   for (const d of defs) {
     const parsed = parseRouteName(d.name);
@@ -122618,8 +122881,8 @@ __export(exports_symbol_graph_service, {
   symbolGraphService: () => symbolGraphService,
   SymbolGraphService: () => SymbolGraphService
 });
-import path21 from "path";
-import fs15 from "fs/promises";
+import path22 from "path";
+import fs16 from "fs/promises";
 class SymbolGraphService {
   identityLookup;
@@ -122790,9 +123053,9 @@ class SymbolGraphService {
       return null;
     const workspace = graphSnapshot.workspace;
     const arch = await this.computeArchitectureMapSafe(graphSnapshot.architecture).catch((err) => {
-      logger.warn("getProjectMap: architecture map failed; skipping", {
+      logger.warn("SymbolGraphService: getProjectMap architecture map failed, skipping", {
         projectId,
-        error: err?.message?.slice(0, 160)
+        error: err
       });
       return null;
     });
@@ -122947,7 +123210,7 @@ class SymbolGraphService {
   async readSnippet(relativePath, lineStart, lineEnd, projectId) {
     try {
       const absolutePath = await this.resolveToAbsolute(relativePath, projectId);
-      const content = await fs15.readFile(absolutePath, "utf-8");
+      const content = await fs16.readFile(absolutePath, "utf-8");
       const lines = content.split(`
 `);
       return lines.slice(Math.max(0, lineStart - 1), Math.min(lines.length, lineEnd)).join(`
@@ -122959,7 +123222,7 @@ class SymbolGraphService {
   async readContext(relativePath, lineNumber, contextLines, projectId) {
     try {
       const absolutePath = await this.resolveToAbsolute(relativePath, projectId);
-      const content = await fs15.readFile(absolutePath, "utf-8");
+      const content = await fs16.readFile(absolutePath, "utf-8");
       const lines = content.split(`
 `);
       const start = Math.max(0, lineNumber - contextLines - 1);
@@ -122972,7 +123235,7 @@ class SymbolGraphService {
   }
   async resolveToAbsolute(relativePath, projectId) {
     const root = await this.getProjectRoot(projectId);
-    return root ? path21.resolve(root, relativePath) : relativePath;
+    return root ? path22.resolve(root, relativePath) : relativePath;
   }
   async getProjectRoot(projectId) {
     const cached2 = this.projectRootCache.get(projectId);
@@ -123067,7 +123330,7 @@ class ContextController {
           });
         }
       } catch (err) {
-        logger.warn("Graph prefilter failed", { query, error: err.message });
+        logger.warn("ContextController: graph prefilter failed", { projectId, query, error: err });
       }
     }
     const [searchResult, memories] = await Promise.all([
@@ -123221,9 +123484,11 @@ class ContextController {
       });
       return result.memories;
     } catch (error51) {
-      logger.warn("Memory search failed, continuing without memories", {
-        error: error51.message,
-        query: query.slice(0, 30)
+      logger.warn("ContextController: memory search failed, continuing without memories", {
+        projectId: opts.projectId,
+        sessionId: opts.sessionId,
+        query: query.slice(0, 30),
+        error: error51
       });
       return [];
     }
@@ -123545,7 +123810,7 @@ function warnSandboxUnavailable() {
     return;
   _warnedAboutNoSandbox = true;
   const missingTool = process.platform === "darwin" ? "sandbox-exec" : "docker";
-  logger.warn(`sandbox: MASSA_AI_EXECUTOR_SANDBOX=auto found no '${missingTool}' on this platform, ` + `so code is executing with best-effort containment and no OS-level isolation. ` + `Install '${missingTool}', or set MASSA_AI_EXECUTOR_SANDBOX=on to fail loudly instead of falling back.`, { missingTool, platform: process.platform, effectiveMode: "none" });
+  logger.warn("Sandbox: no sandbox tool found for auto mode, falling back to best-effort containment", { missingTool, platform: process.platform, effectiveMode: "none" });
 }
 function getSandboxMode() {
   const env4 = process.env.MASSA_AI_EXECUTOR_SANDBOX ?? "auto";
@@ -124460,7 +124725,10 @@ class ExecutorController {
         }
       };
     } catch (error51) {
-      logger.error("batch_execute failed", error51);
+      logger.error("batch_execute failed", error51, {
+        commandCount: commands.length,
+        concurrency: effectiveConcurrency
+      });
       return {
         success: false,
         error: `batch_execute failed: ${error51.message}`
@@ -124750,31 +125018,31 @@ class TracePathService {
     const chains = [];
     const seen = new Set;
     let walks = 0;
-    const walk = (fqn, path22) => {
+    const walk = (fqn, path23) => {
       if (chains.length >= CHAIN_CAP)
         return;
       if (walks >= MAX_WALKS)
         return;
       walks++;
-      const key = path22.join("\u2192");
+      const key = path23.join("\u2192");
       if (seen.has(key))
         return;
       seen.add(key);
       const next = adj.get(fqn);
       if (!next || next.length === 0 || !whoHasChild.has(fqn)) {
-        if (path22.length > 1)
-          chains.push(path22.map((n) => this.fqnToName(n)).join(" \u2192 "));
+        if (path23.length > 1)
+          chains.push(path23.map((n) => this.fqnToName(n)).join(" \u2192 "));
         return;
       }
       for (const child of next) {
         if (chains.length >= CHAIN_CAP || walks >= MAX_WALKS)
           return;
-        if (path22.includes(child)) {
-          const cycled = [...path22, `${this.fqnToName(child)}\u21BA`];
+        if (path23.includes(child)) {
+          const cycled = [...path23, `${this.fqnToName(child)}\u21BA`];
           chains.push(cycled.map((n) => n).join(" \u2192 "));
           continue;
         }
-        walk(child, [...path22, child]);
+        walk(child, [...path23, child]);
       }
     };
     for (const seed of seeds) {
@@ -126797,9 +127065,9 @@ var init_inference_probe = __esm(() => {
 });
 // ../../packages/core/dist/services/health/local-health-checker.js
-import fs16 from "fs/promises";
+import fs17 from "fs/promises";
 import { existsSync as existsSync3 } from "fs";
-import path22 from "path";
+import path23 from "path";
 class LocalHealthChecker {
   dataDir = config.get("dataDir");
@@ -126877,10 +127145,10 @@ class LocalHealthChecker {
     const start = Date.now();
     try {
       if (!existsSync3(this.dataDir))
-        await fs16.mkdir(this.dataDir, { recursive: true });
-      const probe = path22.join(this.dataDir, ".health-check-test");
-      await fs16.writeFile(probe, "ok");
-      await fs16.unlink(probe);
+        await fs17.mkdir(this.dataDir, { recursive: true });
+      const probe = path23.join(this.dataDir, ".health-check-test");
+      await fs17.writeFile(probe, "ok");
+      await fs17.unlink(probe);
       return { available: true, latency: Date.now() - start, details: { path: this.dataDir, writable: true } };
     } catch (error51) {
       return { available: false, latency: Date.now() - start, error: `Data directory error: ${error51.message}` };
@@ -127016,7 +127284,7 @@ class PgJobStore {
           } catch (e) {
             this.recovered = true;
             logger.warn("PgJobStore markStaleRunningFailed failed (best-effort)", {
-              error: e.message
+              error: e
             });
           }
         }
@@ -127042,7 +127310,7 @@ class PgJobStore {
         logger.info("PgJobStore hydrated", { rows: this.mirror.size });
       } catch (e) {
         logger.warn("PgJobStore hydrate failed (best-effort)", {
-          error: e.message
+          error: e
         });
       } finally {
         this.hydrating = null;
@@ -127065,7 +127333,7 @@ class PgJobStore {
     next.catch((e) => {
       logger.warn("PgJobStore.save failed (best-effort)", {
         jobId: job.jobId,
-        error: e.message
+        error: e
       });
     });
   }
@@ -127197,7 +127465,7 @@ class PgJobStore {
         }
       } catch (e) {
         logger.warn("PgJobStore markStaleRunningFailed failed (best-effort)", {
-          error: e.message
+          error: e
         });
       }
     })();
@@ -127387,7 +127655,13 @@ class IndexJobTracker {
       const stale = hbMs != null && hbMs < cutoff || hbMs == null && startedMs != null && startedMs < cutoff;
       if (!stale)
         continue;
-      logger.warn(`indexJobTracker: reaping stale running job ${job.jobId} (heartbeatAt=${job.heartbeatAt?.toISOString() ?? "n/a"}, startedAt=${job.startedAt?.toISOString() ?? "n/a"}, staleMs=${staleMs})`, { jobId: job.jobId, projectId: job.projectId, staleMs });
+      logger.warn("indexJobTracker: reaping stale running job", {
+        jobId: job.jobId,
+        projectId: job.projectId,
+        staleMs,
+        heartbeatAt: job.heartbeatAt?.toISOString() ?? "n/a",
+        startedAt: job.startedAt?.toISOString() ?? "n/a"
+      });
       this.jobs.set(job.jobId, job);
       const reapedPrevStatus = job.status;
       this.setResult(job.jobId, undefined, "heartbeat stale (possible crash/OOM)");
@@ -127412,7 +127686,7 @@ class IndexJobTracker {
     try {
       this.store?.save(job);
     } catch (err) {
-      logger.warn(`indexJobTracker: job store write failed for ${jobId} on setResult`, { jobId, error: err?.message ?? String(err) });
+      logger.warn("indexJobTracker: job store write failed on setResult", { jobId, error: err });
     }
     if (prevStatus === "pending") {
       this.publishStateChange(job, prevStatus);
@@ -127442,7 +127716,7 @@ class IndexJobTracker {
       const survivors = remaining.slice(0, this.MAX_JOBS);
       const overflow = remaining.slice(this.MAX_JOBS);
       for (const job of overflow) {
-        logger.warn(`indexJobTracker: evicting non-terminal job ${job.jobId} (status=${job.status}) to honor MAX_JOBS cap \u2014 caller may lose visibility`, { jobId: job.jobId, projectId: job.projectId, status: job.status });
+        logger.warn("indexJobTracker: evicting non-terminal job to honor MAX_JOBS cap \u2014 caller may lose visibility", { jobId: job.jobId, projectId: job.projectId, status: job.status });
         this.jobs.delete(job.jobId);
       }
     }
@@ -127679,7 +127953,7 @@ class PgScheduledJobStore {
         logger.info("PgScheduledJobStore hydrated", { rows: this.mirror.size });
       } catch (e) {
         logger.warn("PgScheduledJobStore hydrate failed (best-effort)", {
-          error: e.message
+          error: e
         });
       } finally {
         this.hydrating = null;
@@ -127693,9 +127967,10 @@ class PgScheduledJobStore {
       try {
         await action();
       } catch (e) {
-        logger.warn(`PgScheduledJobStore.${operation} failed (best-effort)`, {
+        logger.warn("PgScheduledJobStore mutation failed (best-effort)", {
           id,
-          error: e.message
+          operation,
+          error: e
         });
       }
     };
@@ -127948,7 +128223,7 @@ class Scheduler {
     this.timer = setInterval(() => {
       this.tick().catch((e) => {
         logger.warn("Scheduler tick failed (swallowed)", {
-          error: e.message
+          error: e
         });
       });
     }, this.tickIntervalMs);
@@ -128063,7 +128338,7 @@ class Scheduler {
         logger.warn("Scheduler: job handler threw (caught)", {
           id: job.id,
           jobKind: job.jobKind,
-          error: errMsg
+          error: e
         });
       } finally {
         if (succeeded) {
@@ -128082,7 +128357,7 @@ class Scheduler {
         } catch (e) {
           logger.warn("Scheduler: persist after fire failed", {
             id: job.id,
-            error: e.message
+            error: e
           });
         }
         this.running.delete(job.jobKind);
@@ -128102,6 +128377,8 @@ class Scheduler {
         enabled: j.enabled,
         nextRunAt: j.nextRunAt,
         lastRunAt: j.lastRunAt,
+        lastSuccessAt: j.lastSuccessAt ?? null,
+        consecutiveFailures: j.consecutiveFailures ?? 0,
         due: j.enabled && j.nextRunAt <= now2,
         currentlyRunning: this.running.has(j.jobKind)
       }))
@@ -128603,7 +128880,7 @@ class PgObservationStore {
       } catch (e) {
         this.hydrateFailedAt = Date.now();
         logger.warn("PgObservationStore hydrate failed (best-effort)", {
-          error: e.message
+          error: e
         });
       } finally {
         this.hydrating = null;
@@ -128654,7 +128931,7 @@ class PgObservationStore {
     const next = prev.then(fn).catch((e) => {
       logger.warn("PgObservationStore.insert failed (best-effort)", {
         id: key,
-        error: e.message
+        error: e
       });
     });
     this.inflight.set(key, next);
@@ -128968,7 +129245,7 @@ async function enrichWithLlm(candidates, observations, surface) {
   const prompt = buildEnrichmentPrompt(candidates, observations);
   let enrichment = null;
   try {
-    const res = await surface.object(prompt, ProposalEnrichmentSchema);
+    const res = await surface.object(prompt, ProposalEnrichmentSchema, { label: "auto-improve" });
     if (!res.ok || !res.value || !Array.isArray(res.value.items)) {
       return { candidates, used: false };
     }
@@ -129164,7 +129441,7 @@ async function runOnce(job, projectId) {
   try {
     observations = job.observationStore.listRecent(projectId, job.maxWindow);
   } catch (e) {
-    logger.warn("auto-improve: listRecent failed", { projectId, error: e.message });
+    logger.warn("auto-improve: listRecent failed", { projectId, error: e });
     return noop2;
   }
   if (observations.length < 2)
@@ -129179,7 +129456,7 @@ async function runOnce(job, projectId) {
     if (res.used)
       source = "llm";
   } catch (e) {
-    logger.warn("auto-improve: enrichWithLlm threw (silent)", { projectId, error: e.message });
+    logger.warn("auto-improve: enrichWithLlm threw (silent)", { projectId, error: e });
   }
   const seen = new Set;
   const unique = candidates.filter((c) => {
@@ -129227,7 +129504,7 @@ async function runOnce(job, projectId) {
       } catch (e) {
         if (e instanceof SearchServiceError)
           throw e;
-        logger.warn("proposal:auto-approved:threw", { id: r.id, projectId, error: e.message });
+        logger.warn("proposal:auto-approved:threw", { id: r.id, projectId, error: e });
       }
     }
     result.proposalsApplied = applied;
@@ -129256,7 +129533,7 @@ async function approve(job, id, projectId, source = "rule-based") {
     appliedMemoryId = await applyProposal(job, row);
   } catch (e) {
     const reason = e instanceof ApplyRejection ? e.reason : "apply-failed";
-    logger.warn("proposal:apply-failed", { id, projectId: row.projectId, reason, error: e.message });
+    logger.warn("proposal:apply-failed", { id, projectId: row.projectId, reason, error: e });
     return { ok: false, reason };
   }
   let updated;
@@ -129391,9 +129668,9 @@ class AutoImproveJob {
         return;
       this.newSinceRun = 0;
       this.lastRunAt = now2;
-      this.runOnce(projectId).catch((e) => logger.warn("auto-improve: runOnce failed (silent)", { projectId, error: e.message }));
+      this.runOnce(projectId).catch((e) => logger.warn("auto-improve: runOnce failed (silent)", { projectId, error: e }));
     } catch (e) {
-      logger.warn("auto-improve: maybeRun swallowed", { projectId, error: e.message });
+      logger.warn("auto-improve: maybeRun swallowed", { projectId, error: e });
     }
   }
   async runOnce(projectId) {
@@ -129493,13 +129770,13 @@ class ObservationConsolidationJob {
       this.runOnce(projectId).catch((e) => {
         logger.warn("observation consolidation: runOnce failed (silent)", {
           projectId,
-          error: e.message
+          error: e
         });
       });
     } catch (e) {
       logger.warn("observation consolidation: maybeRun swallowed", {
         projectId,
-        error: e.message
+        error: e
       });
     }
   }
@@ -129523,7 +129800,7 @@ class ObservationConsolidationJob {
     } catch (e) {
       logger.warn("observation consolidation: listRecent failed", {
         projectId,
-        error: e.message
+        error: e
       });
       return noop2;
     }
@@ -129534,7 +129811,7 @@ class ObservationConsolidationJob {
     const prompt = buildObservationPrompt(window2);
     let batch;
     try {
-      const res = await this.llm.object(prompt, ConsolidatedBatchSchema);
+      const res = await this.llm.object(prompt, ConsolidatedBatchSchema, { label: "observation-consolidation" });
       if (!res.ok || !res.value) {
         return noop2;
       }
@@ -129550,7 +129827,7 @@ class ObservationConsolidationJob {
     } catch (e) {
       logger.warn("observation consolidation: llm.object threw (silent)", {
         projectId,
-        error: e.message
+        error: e
       });
       return noop2;
     }
@@ -129579,7 +129856,7 @@ class ObservationConsolidationJob {
     } catch (e) {
       logger.warn("observation consolidation: summary insert failed", {
         batchId: batch.id,
-        error: e.message
+        error: e
       });
       return noop2;
     }
@@ -129690,7 +129967,7 @@ class PgCheckpointStore {
       } catch (e) {
         this.hydrateFailedAt = Date.now();
         logger.warn("PgCheckpointStore hydrate failed (best-effort)", {
-          error: e.message
+          error: e
         });
       } finally {
         this.hydrating = null;
@@ -129884,8 +130161,9 @@ class PgCheckpointStore {
       }
       return existing;
     } catch (e) {
-      logger.warn("countExistingMemoryIds failed (best-effort: assuming all exist)", {
-        error: e.message
+      logger.warn("PgCheckpointStore: countExistingMemoryIds failed (best-effort, assuming all exist)", {
+        memoryIdCount: memoryIds.length,
+        error: e
       });
       return memoryIds;
     }
@@ -129952,7 +130230,7 @@ class PgCheckpointStore {
     const next = prev.then(fn).catch((e) => {
       logger.warn("PgCheckpointStore write failed (best-effort)", {
         key,
-        error: e.message
+        error: e
       });
     });
     this.inflight.set(key, next);
@@ -130171,9 +130449,9 @@ var init_scheduler2 = __esm(() => {
 });
 // ../../packages/core/dist/services/pricing/models-dev-client.js
-import fs17 from "fs/promises";
+import fs18 from "fs/promises";
 import { existsSync as existsSync4 } from "fs";
-import path23 from "path";
+import path24 from "path";
 function getModelsDevClient() {
   if (!clientInstance) {
     clientInstance = new ModelsDevClient;
@@ -130193,7 +130471,7 @@ var init_models_dev_client = __esm(() => {
     memoryCacheTimestamp = 0;
     getLocalCachePath() {
       const dataDir = config.get("dataDir");
-      return path23.join(dataDir, ModelsDevClient.LOCAL_CACHE_FILE);
+      return path24.join(dataDir, ModelsDevClient.LOCAL_CACHE_FILE);
     }
     async loadLocalCache() {
       const cachePath = this.getLocalCachePath();
@@ -130201,7 +130479,7 @@ var init_models_dev_client = __esm(() => {
         if (!existsSync4(cachePath)) {
           return null;
         }
-        const content = await fs17.readFile(cachePath, "utf-8");
+        const content = await fs18.readFile(cachePath, "utf-8");
         const data = JSON.parse(content);
         const age = Date.now() - data.timestamp;
         if (age > ModelsDevClient.LOCAL_CACHE_TTL) {
@@ -130228,21 +130506,22 @@ var init_models_dev_client = __esm(() => {
     async saveLocalCache(models) {
       const cachePath = this.getLocalCachePath();
       try {
-        const dir = path23.dirname(cachePath);
-        await fs17.mkdir(dir, { recursive: true });
+        const dir = path24.dirname(cachePath);
+        await fs18.mkdir(dir, { recursive: true });
         const data = {
           timestamp: Date.now(),
           version: "1.0.0",
           models: Object.fromEntries(models)
         };
-        await fs17.writeFile(cachePath, JSON.stringify(data), "utf-8");
+        await fs18.writeFile(cachePath, JSON.stringify(data), "utf-8");
         logger.debug("Saved pricing to local cache", {
           models: models.size,
           path: cachePath
         });
       } catch (error51) {
-        logger.warn("Failed to save local pricing cache", {
-          error: error51.message
+        logger.warn("ModelsDevClient: failed to save local pricing cache", {
+          path: cachePath,
+          error: error51
         });
       }
     }
@@ -130464,7 +130743,7 @@ var init_models_dev_client = __esm(() => {
           return value;
         }
       }
-      logger.warn(`Model pricing not found: ${modelId}`);
+      logger.warn("ModelsDevClient: model pricing not found", { modelId });
       return null;
     }
     async searchModels(query) {
@@ -130564,12 +130843,13 @@ var init_models_dev_client = __esm(() => {
       const cachePath = this.getLocalCachePath();
       try {
         if (existsSync4(cachePath)) {
-          await fs17.unlink(cachePath);
+          await fs18.unlink(cachePath);
           logger.debug("Local pricing cache file deleted");
         }
       } catch (error51) {
-        logger.warn("Failed to delete local pricing cache", {
-          error: error51.message
+        logger.warn("ModelsDevClient: failed to delete local pricing cache", {
+          path: cachePath,
+          error: error51
         });
       }
     }
@@ -131167,8 +131447,8 @@ function stripNul(content) {
 }
 // ../../packages/core/dist/services/etl/stages/discover.js
-import fs18 from "fs/promises";
-import path24 from "path";
+import fs19 from "fs/promises";
+import path25 from "path";
 import { createHash as createHash8 } from "crypto";
 class DiscoverStage {
@@ -131194,7 +131474,7 @@ class DiscoverStage {
         dot: false,
         absolute: false
       });
-      relPaths = found.map((p) => path24.isAbsolute(p) ? path24.relative(ctx.projectPath, p) : p).filter((p) => !ig.ignores(p) && applyPolicy(p, policy) !== "Drop");
+      relPaths = found.map((p) => path25.isAbsolute(p) ? path25.relative(ctx.projectPath, p) : p).filter((p) => !ig.ignores(p) && applyPolicy(p, policy) !== "Drop");
     }
     if (ctx.resumeCursor?.path) {
       const cursorPath = ctx.resumeCursor.path;
@@ -131253,10 +131533,10 @@ class DiscoverStage {
     return discovered;
   }
   async processFile(ctx, relativePath, forceReindex) {
-    const absolutePath = path24.join(ctx.projectPath, relativePath);
+    const absolutePath = path25.join(ctx.projectPath, relativePath);
     try {
-      const stat = await fs18.stat(absolutePath);
-      const content = stripNul(await fs18.readFile(absolutePath, "utf-8"));
+      const stat = await fs19.stat(absolutePath);
+      const content = stripNul(await fs19.readFile(absolutePath, "utf-8"));
       const contentHash = createHash8("sha256").update(content).digest("hex");
       let needsReparse = forceReindex;
       if (!forceReindex) {
@@ -131274,8 +131554,9 @@ class DiscoverStage {
       };
     } catch (err) {
       logger.warn("DiscoverStage: failed to stat/read file", {
+        projectId: ctx.projectId,
         relativePath,
-        error: err.message
+        error: err
       });
       throw new Error(`required_file_unreadable:${relativePath}:${err.message}`);
     }
@@ -131299,8 +131580,8 @@ class DiscoverStage {
       ig.add(pattern);
     }
     try {
-      const gitignorePath = path24.join(projectPath, ".gitignore");
-      const gitignoreContent = await fs18.readFile(gitignorePath, "utf8");
+      const gitignorePath = path25.join(projectPath, ".gitignore");
+      const gitignoreContent = await fs19.readFile(gitignorePath, "utf8");
       const rules = gitignoreContent.split(`
 `).map((line) => line.trim()).filter((line) => line && !line.startsWith("#"));
       ig.add(rules);
@@ -132655,8 +132936,8 @@ function rustUseLeaves(node, source, prefix = []) {
   }
   if (node.type === "use_wildcard")
     return [{ path: [...prefix, "*"], glob: true }];
-  const path25 = rustPathSegments(node, source);
-  return path25.length ? [{ path: [...prefix, ...path25] }] : [];
+  const path26 = rustPathSegments(node, source);
+  return path26.length ? [{ path: [...prefix, ...path26] }] : [];
 }
 function functionalCaptures(captures, source, family) {
   if (family !== "clojure")
@@ -133628,8 +133909,8 @@ var init_structural_runtime = __esm(() => {
 });
 // ../../packages/core/dist/services/etl/stages/parse.js
-import path25 from "path";
-import fs19 from "fs/promises";
+import path26 from "path";
+import fs20 from "fs/promises";
 function resolveChunkerMaxChars() {
   const global2 = Number(process.env.EMBEDDING_MAX_CHARS);
   if (Number.isFinite(global2) && global2 > 0)
@@ -133657,8 +133938,8 @@ class ParseStage {
     const results = new Map;
     let processed = 0;
     const phases = [
-      files.filter((file2) => path25.extname(file2.relativePath).toLowerCase() !== ".h"),
-      files.filter((file2) => path25.extname(file2.relativePath).toLowerCase() === ".h")
+      files.filter((file2) => path26.extname(file2.relativePath).toLowerCase() !== ".h"),
+      files.filter((file2) => path26.extname(file2.relativePath).toLowerCase() === ".h")
     ];
     const batches = phases.flatMap((phase) => Array.from({ length: Math.ceil(phase.length / BATCH_SIZE) }, (_, index) => phase.slice(index * BATCH_SIZE, (index + 1) * BATCH_SIZE)));
     for (const batch of batches) {
@@ -133696,19 +133977,19 @@ class ParseStage {
     return files.map((file2) => results.get(file2.relativePath));
   }
   recordHeaderImporterEvidence(ctx, files, parsedFiles) {
-    const knownHeaders = new Set(files.filter((file2) => path25.extname(file2.relativePath).toLowerCase() === ".h").map((file2) => path25.posix.normalize(file2.relativePath)));
+    const knownHeaders = new Set(files.filter((file2) => path26.extname(file2.relativePath).toLowerCase() === ".h").map((file2) => path26.posix.normalize(file2.relativePath)));
     const mutable = {
       ...ctx.structuralHeaderEvidenceByFile
     };
     for (const parsed of parsedFiles) {
-      const extension = path25.extname(parsed.file.relativePath).toLowerCase();
+      const extension = path26.extname(parsed.file.relativePath).toLowerCase();
       const key = extension === ".c" ? "cImporters" : [".cpp", ".hpp"].includes(extension) ? "cppImporters" : undefined;
       if (!key)
         continue;
       for (const imported of parsed.rawImports) {
         if (!["c_include", "cpp_include"].includes(imported.form) || imported.specifier.startsWith("<"))
           continue;
-        const header = path25.posix.normalize(path25.posix.join(path25.posix.dirname(parsed.file.relativePath), imported.specifier));
+        const header = path26.posix.normalize(path26.posix.join(path26.posix.dirname(parsed.file.relativePath), imported.specifier));
         if (!knownHeaders.has(header))
           continue;
         const existing = mutable[header] ?? {};
@@ -133719,9 +134000,9 @@ class ParseStage {
   }
   async parseFile(ctx, file2) {
     if (!file2.needsReparse) {
-      const extension = path25.extname(file2.relativePath).toLowerCase();
+      const extension = path26.extname(file2.relativePath).toLowerCase();
       if ([".c", ".cpp", ".hpp"].includes(extension)) {
-        const content = file2.snapshotContent ?? await fs19.readFile(file2.absolutePath, "utf8");
+        const content = file2.snapshotContent ?? await fs20.readFile(file2.absolutePath, "utf8");
         const outcome = await this.runtime.parse({ extension, source: Buffer.from(content) });
         if (outcome.status === "failed")
           throw new StructuralEtlParseError(file2.relativePath, outcome.failureKind, `Structural evidence parse failed (${outcome.failureKind})`, outcome.diagnosticCount, outcome.diagnostics.slice(0, 10));
@@ -133733,8 +134014,8 @@ class ParseStage {
       return { file: file2, chunks: [], symbols: [], rawImports: [], rawEdges: [] };
     }
     try {
-      const content = file2.snapshotContent ?? await fs19.readFile(file2.absolutePath, "utf-8");
-      const ext2 = path25.extname(file2.relativePath).toLowerCase();
+      const content = file2.snapshotContent ?? await fs20.readFile(file2.absolutePath, "utf-8");
+      const ext2 = path26.extname(file2.relativePath).toLowerCase();
       const chunkerMaxChars = resolveChunkerMaxChars();
       const chunks = smartChunk(content, file2.relativePath, chunkerMaxChars ? { maxChunkChars: chunkerMaxChars } : {});
       let symbols;
@@ -133800,8 +134081,9 @@ class ParseStage {
         timestamp: Date.now()
       });
       logger.warn("ParseStage: failed to parse file", {
+        projectId: ctx.projectId,
         filePath: file2.relativePath,
-        error: err.message
+        error: err
       });
       if (err instanceof StructuralEtlParseError)
         throw err;
@@ -134288,7 +134570,7 @@ var init_resolver = __esm(() => {
 });
 // ../../packages/core/dist/services/structural/resolvers/typescript.js
-import path26 from "path";
+import path27 from "path";
 function candidates(identities) {
   return Object.freeze(identities.map((identity) => Object.freeze({
     fqn: identity.fqn,
@@ -134383,7 +134665,7 @@ function probe(base, known, dialect = "typescript") {
   const bases = /\.[cm]?jsx?$/u.test(base) ? [base.replace(/\.[cm]?jsx?$/u, ".ts"), base.replace(/\.[cm]?jsx?$/u, ".tsx"), base] : [base];
   for (const candidateBase of bases)
     for (const suffix of DIALECT_PROBES[dialect] ?? [""]) {
-      const value = path26.posix.normalize(`${candidateBase}${suffix}`);
+      const value = path27.posix.normalize(`${candidateBase}${suffix}`);
       if (!value.startsWith("../") && value !== ".." && known.has(value))
         return value;
     }
@@ -134392,7 +134674,7 @@ function probe(base, known, dialect = "typescript") {
 function resolveStructuralSpecifier(specifier, fromFile, build, dialect = "typescript") {
   const known = new Set(build.knownFiles.map(normalizeStructuralFile));
   if (specifier.startsWith("./") || specifier.startsWith("../")) {
-    return probe(path26.posix.join(path26.posix.dirname(fromFile), specifier), known, dialect);
+    return probe(path27.posix.join(path27.posix.dirname(fromFile), specifier), known, dialect);
   }
   const aliases = build.pathAliasesByFile?.[normalizeStructuralFile(fromFile)] ?? build.pathAliases ?? [];
   for (const alias of aliases) {
@@ -134656,7 +134938,7 @@ var init_scripting2 = __esm(() => {
 });
 // ../../packages/core/dist/services/structural/resolvers/systems.js
-import path27 from "path";
+import path28 from "path";
 var DIALECTS, SYSTEMS_LANGUAGE_RESOLVER;
 var init_systems2 = __esm(() => {
   init_typescript2();
@@ -134675,7 +134957,7 @@ var init_systems2 = __esm(() => {
           const bindings = item.bindings.map((binding) => binding.imported === "*" && binding.local === "*" && unresolvedTarget && !unresolvedTarget.qualifier ? { ...binding, imported: unresolvedTarget.name, local: unresolvedTarget.name } : binding);
           if (item.specifier === "crate" || item.specifier.startsWith("crate/")) {
             const crateRoot = file2.file.startsWith("src/") ? "src" : "";
-            return { ...item, bindings, specifier: `./${path27.posix.relative(path27.posix.dirname(file2.file), path27.posix.join(crateRoot, item.specifier.replace(/^crate\/?/u, "")))}` };
+            return { ...item, bindings, specifier: `./${path28.posix.relative(path28.posix.dirname(file2.file), path28.posix.join(crateRoot, item.specifier.replace(/^crate\/?/u, "")))}` };
           }
           if (item.specifier === "self" || item.specifier.startsWith("self/"))
             return { ...item, bindings, specifier: `./${item.specifier.replace(/^self\/?/u, "")}` };
@@ -134773,8 +135055,8 @@ var init_data_document2 = __esm(() => {
 });
 // ../../packages/core/dist/services/etl/stages/resolve.js
-import path28 from "path";
-import fs20 from "fs";
+import path29 from "path";
+import fs21 from "fs";
 class ResolveStage {
   symbolRepository;
@@ -134798,7 +135080,7 @@ class ResolveStage {
     const structuralDocuments = files.flatMap((file2) => {
       if (!file2.structure)
         return [];
-      const language = resolveStructuralLanguage(path28.extname(file2.file.relativePath));
+      const language = resolveStructuralLanguage(path29.extname(file2.file.relativePath));
       if (language.status !== "supported")
         throw new Error(`structural_manifest_missing:${file2.file.relativePath}`);
       return [{
@@ -134810,13 +135092,13 @@ class ResolveStage {
       }];
     });
     const currentStructuralFiles = new Set(structuralDocuments.map((document2) => document2.file));
-    const skippedStructuralFiles = new Set(files.filter((item) => !item.file.needsReparse && STRUCTURAL_SEED_EXTENSIONS.has(path28.extname(item.file.relativePath).toLowerCase())).map((item) => item.file.relativePath));
+    const skippedStructuralFiles = new Set(files.filter((item) => !item.file.needsReparse && STRUCTURAL_SEED_EXTENSIONS.has(path29.extname(item.file.relativePath).toLowerCase())).map((item) => item.file.relativePath));
     const pathAliasesByFile = Object.fromEntries([...knownRelPaths].map((file2) => [
       file2,
       this.structuralAliasesFor(file2, rootAliases, monorepoPackages)
     ]));
     const buildMetadata = { knownFiles: [...knownRelPaths], pathAliasesByFile };
-    const seedRows = repositoryDefinitions.filter((definition) => STRUCTURAL_SEED_EXTENSIONS.has(path28.extname(definition.file_path).toLowerCase())).filter((definition) => knownRelPaths.has(definition.file_path) && skippedStructuralFiles.has(definition.file_path)).filter((definition) => !currentStructuralFiles.has(definition.file_path));
+    const seedRows = repositoryDefinitions.filter((definition) => STRUCTURAL_SEED_EXTENSIONS.has(path29.extname(definition.file_path).toLowerCase())).filter((definition) => knownRelPaths.has(definition.file_path) && skippedStructuralFiles.has(definition.file_path)).filter((definition) => !currentStructuralFiles.has(definition.file_path));
     const seedIds = new Set;
     for (const definition of seedRows) {
       if (seedIds.has(definition.id))
@@ -134909,7 +135191,7 @@ class ResolveStage {
     if (parsed.file !== definition.file_path) {
       throw new Error(`structural_repository_seed_file_mismatch:${definition.id}`);
     }
-    const language = resolveStructuralLanguage(path28.extname(definition.file_path));
+    const language = resolveStructuralLanguage(path29.extname(definition.file_path));
     if (language.status !== "supported")
       throw new Error(`structural_repository_seed_language:${definition.id}`);
     let identity;
@@ -134961,7 +135243,7 @@ class ResolveStage {
     });
   }
   resolveFile(parsed, projectPath, knownRelPaths, rootAliases, monorepoPackages, symbolIndex, knownFqns) {
-    const fromDir = path28.dirname(path28.join(projectPath, parsed.file.relativePath));
+    const fromDir = path29.dirname(path29.join(projectPath, parsed.file.relativePath));
     const packageAliases = this.getPackageAliases(parsed.file.relativePath, monorepoPackages);
     const allAliases = [...packageAliases, ...rootAliases];
     const resolvedImports = parsed.rawImports.map((raw2) => {
@@ -135032,12 +135314,12 @@ class ResolveStage {
         index.set(def.name, `${def.file_path}#${def.name}`);
       }
     } catch (err) {
-      const skippedStructural = files.some((file2) => !file2.file.needsReparse && STRUCTURAL_SEED_EXTENSIONS.has(path28.extname(file2.file.relativePath).toLowerCase()));
+      const skippedStructural = files.some((file2) => !file2.file.needsReparse && STRUCTURAL_SEED_EXTENSIONS.has(path29.extname(file2.file.relativePath).toLowerCase()));
       if (skippedStructural)
         throw new Error("structural_repository_seed_failed", { cause: err });
       logger.warn("buildSymbolIndex: repo seed failed, in-batch only", {
         projectId,
-        error: err?.message
+        error: err
       });
     }
     const inBatch = new Map;
@@ -135056,7 +135338,7 @@ class ResolveStage {
   }
   resolveSpecifier(specifier, fromDir, projectPath, knownRelPaths, aliases) {
     if (specifier.startsWith("./") || specifier.startsWith("../")) {
-      const resolved = this.probeExtensions(path28.resolve(fromDir, specifier), projectPath, knownRelPaths);
+      const resolved = this.probeExtensions(path29.resolve(fromDir, specifier), projectPath, knownRelPaths);
       return { resolvedPath: resolved, external: false };
     }
     for (const alias of aliases) {
@@ -135064,8 +135346,8 @@ class ResolveStage {
         const suffix = specifier.slice(alias.prefix.length);
         for (const target of alias.targets) {
           const cleanTarget = target.replace(/\/\*$/, "");
-          const basePath = alias.packagePath ? path28.join(projectPath, alias.packagePath) : projectPath;
-          const absPath = path28.join(basePath, cleanTarget + suffix);
+          const basePath = alias.packagePath ? path29.join(projectPath, alias.packagePath) : projectPath;
+          const absPath = path29.join(basePath, cleanTarget + suffix);
           const resolved = this.probeExtensions(absPath, projectPath, knownRelPaths);
           if (resolved)
             return { resolvedPath: resolved, external: false };
@@ -135081,7 +135363,7 @@ class ResolveStage {
       ...TS_EXTENSIONS.map((ext2) => absPath.replace(/\.[^.]+$/, ext2))
     ];
     for (const candidate2 of candidates2) {
-      const rel = path28.relative(projectPath, candidate2).replace(/\\/g, "/");
+      const rel = path29.relative(projectPath, candidate2).replace(/\\/g, "/");
       if (knownRelPaths.has(rel))
         return rel;
     }
@@ -135089,9 +135371,9 @@ class ResolveStage {
   }
   loadTsConfigPaths(projectPath, packageBase) {
     const aliases = [];
-    const tsconfigPath = path28.join(projectPath, "tsconfig.json");
+    const tsconfigPath = path29.join(projectPath, "tsconfig.json");
     try {
-      const raw2 = fs20.readFileSync(tsconfigPath, "utf-8");
+      const raw2 = fs21.readFileSync(tsconfigPath, "utf-8");
       const stripped = raw2.replace(/\/\/[^\n]*/g, "").replace(/\/\*[\s\S]*?\*\//g, "");
       const tsconfig = JSON.parse(stripped);
       const paths = tsconfig?.compilerOptions?.paths ?? {};
@@ -135120,7 +135402,7 @@ class ResolveStage {
       }
     }
     for (const packageRelPath of packagePaths) {
-      const absPackagePath = path28.join(projectPath, packageRelPath);
+      const absPackagePath = path29.join(projectPath, packageRelPath);
       const aliases = this.loadTsConfigPaths(absPackagePath, packageRelPath);
       if (aliases.length > 0) {
         packages.push({
@@ -135150,7 +135432,7 @@ class ResolveStage {
   structuralAliasesFor(filePath, rootAliases, packages) {
     return [...this.getPackageAliases(filePath, packages), ...rootAliases].map((alias) => ({
       pattern: alias.prefix + (alias.targets.some((target) => target.includes("*")) ? "/*" : ""),
-      targets: alias.targets.map((target) => alias.packagePath ? path28.posix.join(alias.packagePath, target) : target)
+      targets: alias.targets.map((target) => alias.packagePath ? path29.posix.join(alias.packagePath, target) : target)
     }));
   }
 }
@@ -135200,7 +135482,7 @@ async function withDeadlockRetry(operation, options = {}) {
         attempt,
         maxAttempts,
         delayMs,
-        error: error51?.message?.slice(0, 120)
+        error: error51
       });
       await new Promise((resolve7) => setTimeout(resolve7, delayMs));
     }
@@ -135214,7 +135496,7 @@ var init_with_deadlock_retry = __esm(() => {
 });
 // ../../packages/core/dist/services/etl/stages/load.js
-import path29 from "path";
+import path30 from "path";
 function formatDuration(ms) {
   const totalSec = Math.max(0, Math.round(ms / 1000));
   if (totalSec < 60)
@@ -135491,7 +135773,7 @@ class LoadStage {
     const filePath = file2.file.relativePath;
     const batch = buildSymbolPersistenceBatch(ctx.projectId, file2);
     if (ctx.graphGenerationLease) {
-      const manifest = getLanguageManifestEntry(path29.extname(filePath));
+      const manifest = getLanguageManifestEntry(path30.extname(filePath));
       const diagnostics2 = (file2.structuralDiagnostics ?? []).slice(0, 10).map((diagnostic2) => ({
         code: diagnostic2.code,
         severity: diagnostic2.severity,
@@ -135948,9 +136230,9 @@ var init_graph_generation_coordinator = __esm(() => {
 // ../../packages/core/dist/services/etl/pipeline.js
 import { createHash as createHash10 } from "crypto";
 import { setTimeout as delay2 } from "timers/promises";
-import path30 from "path";
+import path31 from "path";
 function buildHeaderLanguageEvidence(files) {
-  const headers = new Set(files.filter((file2) => path30.posix.extname(file2.relativePath).toLowerCase() === ".h").map((file2) => path30.posix.normalize(file2.relativePath)));
+  const headers = new Set(files.filter((file2) => path31.posix.extname(file2.relativePath).toLowerCase() === ".h").map((file2) => path31.posix.normalize(file2.relativePath)));
   const mutable = new Map;
   const entry2 = (header) => {
     let value = mutable.get(header);
@@ -135961,7 +136243,7 @@ function buildHeaderLanguageEvidence(files) {
     return value;
   };
   for (const file2 of files) {
-    if (path30.posix.basename(file2.relativePath) !== "compile_commands.json" || file2.snapshotContent === undefined)
+    if (path31.posix.basename(file2.relativePath) !== "compile_commands.json" || file2.snapshotContent === undefined)
       continue;
     let commands;
     try {
@@ -135977,11 +136259,11 @@ function buildHeaderLanguageEvidence(files) {
       const record2 = command;
       if (typeof record2.file !== "string")
         continue;
-      const projectRoot = path30.resolve(file2.absolutePath, ...file2.relativePath.split("/").map(() => ".."));
-      const commandDirectory = typeof record2.directory === "string" ? path30.resolve(projectRoot, record2.directory) : projectRoot;
-      const absoluteInput = path30.resolve(commandDirectory, record2.file);
-      const relative3 = path30.relative(projectRoot, absoluteInput);
-      const header = path30.posix.normalize(relative3.replaceAll(path30.sep, "/"));
+      const projectRoot = path31.resolve(file2.absolutePath, ...file2.relativePath.split("/").map(() => ".."));
+      const commandDirectory = typeof record2.directory === "string" ? path31.resolve(projectRoot, record2.directory) : projectRoot;
+      const absoluteInput = path31.resolve(commandDirectory, record2.file);
+      const relative3 = path31.relative(projectRoot, absoluteInput);
+      const header = path31.posix.normalize(relative3.replaceAll(path31.sep, "/"));
       if (!headers.has(header))
         continue;
       const invocation = typeof record2.command === "string" ? record2.command : Array.isArray(record2.arguments) ? record2.arguments.join(" ") : "";
@@ -136330,7 +136612,7 @@ var init_pipeline = __esm(() => {
           logger.warn("EtlPipeline: search-admission marker write failed", {
             projectId,
             jobId,
-            error: markerError.message.slice(0, 160)
+            error: markerError
           });
         }
         if (forceReindex) {
@@ -136342,7 +136624,7 @@ var init_pipeline = __esm(() => {
               logger.warn("EtlPipeline: embedding fingerprint stamp failed", {
                 projectId,
                 jobId,
-                error: stampError.message.slice(0, 160)
+                error: stampError
               });
             }
           }
@@ -136505,9 +136787,10 @@ class SearchSessionHook {
       });
     } catch (err) {
       logger.warn("SearchSessionHook: store failed (best-effort)", {
-        error: err.message,
         projectId,
-        query: query.slice(0, 60)
+        sessionId,
+        query: query.slice(0, 60),
+        error: err
       });
     }
   }
@@ -136583,8 +136866,10 @@ class CoRetrievalHook {
       peers = await this.findPeers(memoryId, projectId, sessionId);
     } catch (err) {
       logger.warn("CoRetrievalHook: peer lookup failed", {
-        error: err.message,
-        memoryId
+        projectId,
+        sessionId,
+        memoryId,
+        error: err
       });
       return;
     }
@@ -136755,7 +137040,7 @@ var TOOL_NAME_NORMALIZE, classifyToolCall = (_source, payload) => {
   if (lowerPrompt.includes("blocked on") || lowerPrompt.includes("waiting on") || lowerPrompt.includes("can't proceed") || lowerPrompt.includes("stuck on")) {
     return "blocked-on";
   }
-  if (lowerPrompt.startsWith("/persona") || lowerPrompt.startsWith("act as") || lowerPrompt.startsWith("you are a")) {
+  if (lowerPrompt.startsWith("act as") || lowerPrompt.startsWith("you are a")) {
     return "role";
   }
   return "user-prompts";
@@ -141863,33 +142148,33 @@ var require_URL = __commonJS((exports, module) => {
         else
           return basepath.substring(0, lastslash + 1) + refpath;
       }
-      function remove_dot_segments(path31) {
-        if (!path31)
-          return path31;
+      function remove_dot_segments(path32) {
+        if (!path32)
+          return path32;
         var output = "";
-        while (path31.length > 0) {
-          if (path31 === "." || path31 === "..") {
-            path31 = "";
+        while (path32.length > 0) {
+          if (path32 === "." || path32 === "..") {
+            path32 = "";
             break;
           }
-          var twochars = path31.substring(0, 2);
-          var threechars = path31.substring(0, 3);
-          var fourchars = path31.substring(0, 4);
+          var twochars = path32.substring(0, 2);
+          var threechars = path32.substring(0, 3);
+          var fourchars = path32.substring(0, 4);
           if (threechars === "../") {
-            path31 = path31.substring(3);
+            path32 = path32.substring(3);
           } else if (twochars === "./") {
-            path31 = path31.substring(2);
+            path32 = path32.substring(2);
           } else if (threechars === "/./") {
-            path31 = "/" + path31.substring(3);
-          } else if (twochars === "/." && path31.length === 2) {
-            path31 = "/";
-          } else if (fourchars === "/../" || threechars === "/.." && path31.length === 3) {
-            path31 = "/" + path31.substring(4);
+            path32 = "/" + path32.substring(3);
+          } else if (twochars === "/." && path32.length === 2) {
+            path32 = "/";
+          } else if (fourchars === "/../" || threechars === "/.." && path32.length === 3) {
+            path32 = "/" + path32.substring(4);
             output = output.replace(/\/?[^\/]*$/, "");
           } else {
-            var segment = path31.match(/(\/?([^\/]*))/)[0];
+            var segment = path32.match(/(\/?([^\/]*))/)[0];
             output += segment;
-            path31 = path31.substring(segment.length);
+            path32 = path32.substring(segment.length);
           }
         }
         return output;
@@ -153959,21 +154244,21 @@ function jsonToKeyPathChunks(value, label = "$") {
   walk(value, label, out);
   return out;
 }
-function walk(val, path31, out) {
+function walk(val, path32, out) {
   if (val === null || val === undefined)
     return;
   if (Array.isArray(val)) {
     if (val.length === 0) {
-      out.push({ path: path31, content: `**${path31}** = _[]_` });
+      out.push({ path: path32, content: `**${path32}** = _[]_` });
       return;
     }
     if (val.every((v) => v !== null && typeof v === "object")) {
-      val.forEach((v, i) => walk(v, `${path31}[${i}]`, out));
+      val.forEach((v, i) => walk(v, `${path32}[${i}]`, out));
       return;
     }
     const items = val.map((v) => `- \`${String(v)}\``).join(`
 `);
-    out.push({ path: path31, content: `**${path31}**
+    out.push({ path: path32, content: `**${path32}**
 ${items}` });
     return;
@@ -153981,16 +154266,16 @@ ${items}` });
   if (typeof val === "object") {
     const entries = Object.entries(val);
     if (entries.length === 0) {
-      out.push({ path: path31, content: `**${path31}** = _{}_` });
+      out.push({ path: path32, content: `**${path32}** = _{}_` });
       return;
     }
     for (const [k, v] of entries) {
       const safeKey = /^[A-Za-z_$][\w$]*$/.test(k) ? k : JSON.stringify(k);
-      walk(v, `${path31}.${safeKey}`, out);
+      walk(v, `${path32}.${safeKey}`, out);
     }
     return;
   }
-  out.push({ path: path31, content: `**${path31}** = \`${String(val)}\`` });
+  out.push({ path: path32, content: `**${path32}** = \`${String(val)}\`` });
 }
 var gfm, STRIP_SELECTORS, tdCache = null;
 var init_html_to_md = __esm(() => {
@@ -154094,6 +154379,7 @@ async function fetchAndConvertOne(url2, deps, opts = {}) {
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       logger.error("fetch_and_index indexChunk failed", err, {
+        projectId,
         url: url2,
         chunkId: chunk.id
       });
@@ -154284,6 +154570,7 @@ class WebController {
         return s.value;
       const msg = s.reason instanceof Error ? s.reason.message : String(s.reason);
       logger.error("fetch_and_index job rejected", s.reason, {
+        projectId,
         url: batch[i].url
       });
       return { kind: "error", url: batch[i].url, error: msg };
@@ -154416,7 +154703,7 @@ init_config();
 init_dist();
 init_inference_providers();
 import os9 from "os";
-import path31 from "path";
+import path32 from "path";
 var WRITABLE_PROVIDERS = ["ollama", "lmstudio", "mistral", "openai", "google", "cohere"];
 var GENERATOR_MARKER = "scripts/generate-subagent-artifacts.ts";
 var GENERATOR_MARKER_MAX_LEVELS = 6;
@@ -154459,6 +154746,14 @@ Commands:
   profile set <name> [--host <h>] [--dry-run]
                     Switch installed agents to a profile (restart required after)
+  doctor [--fix] [--host <h>] [--target <dir>]
+                    Report agent model/profile drift: live-tree vs recorded
+                    versions, per-role models, variant staleness, env
+                    overrides. --fix re-runs the profile switch for the
+                    recorded active profile (restart required after).
+                    --target redirects the home the state/registries are
+                    read from (test seam, same convention as bootstrap)
   bootstrap list    List every startup-contract rule: state, default, description
   bootstrap show    Same as 'bootstrap list'
   bootstrap enable <rule-id> [--target <dir> --yes] [--dry-run]
@@ -154476,6 +154771,8 @@ Examples:
   massa-ai-config set embedding.dimensions 1024
   massa-ai-config recover my-project --path /home/user/renamed-dir
   massa-ai-config profile set work --dry-run
+  massa-ai-config doctor
+  massa-ai-config doctor --fix
   massa-ai-config bootstrap list
   massa-ai-config bootstrap disable caveman
 `);
@@ -154519,6 +154816,30 @@ function formatSwitchReport(report) {
 A host session restart is required for the change to take effect.`);
   }
 }
+function formatDriftReport(report) {
+  console.log(`doctor (${report.host}, route: ${report.route})`);
+  console.log(`  live root:       ${report.liveRoot ?? "n/a"}`);
+  console.log(`  source version:  ${report.sourceVersion ?? "n/a"} (live tree)`);
+  console.log(`  state version:   ${report.stateVersion ?? "n/a"} (install-state)`);
+  console.log(`  pinned version:  ${report.pinnedVersion ?? "n/a"} (installed_plugins)`);
+  console.log(`  active profile:  ${report.activeProfile ?? "n/a"}`);
+  for (const role of report.roles) {
+    const stale = role.staleVariant ? " \u2014 STALE vs the recorded profile's variant" : "";
+    console.log(`  ${role.name}: model=${role.model ?? "unknown"} effort=${role.effort ?? "unknown"}${stale}`);
+  }
+  if (report.versionDrift) {
+    console.log(`  drift: live tree ${report.sourceVersion} != recorded ${report.stateVersion} \u2014 update the plugin (or re-run the installer)`);
+  }
+  if (report.profileMaterialized) {
+    console.log("  drift: active agent files differ from the recorded profile's variants \u2014 run `massa-ai-config doctor --fix` (re-runs the profile switch)");
+  }
+  if (report.envOverride) {
+    console.log(`  override: ${report.envOverride.name}=${report.envOverride.value} wins over every per-agent model at runtime \u2014 remove it from the host env to let profiles govern`);
+  }
+  if (report.route !== "unresolved" && !report.versionDrift && !report.profileMaterialized && !report.envOverride) {
+    console.log("  healthy: every recording agrees.");
+  }
+}
 async function runCli(argv) {
   const args = argv;
   const command = args[0];
@@ -154754,6 +155075,39 @@ Using defaults:`);
       console.error("Usage: massa-ai-config profile <list|show|set> ...");
       return 1;
     }
+    case "doctor": {
+      const fix = options["fix"] === true;
+      const hostOpt = typeof options.host === "string" ? options.host : undefined;
+      if (hostOpt !== undefined && !isHost(hostOpt)) {
+        console.error(`Error: unknown host "${hostOpt}"`);
+        return 1;
+      }
+      const host = hostOpt ?? "claude";
+      const targetHome = typeof options.target === "string" ? options.target : os9.homedir();
+      try {
+        let report = runtimeDriftReport({ targetHome, host });
+        if (fix) {
+          const profile = report.activeProfile;
+          if (!profile) {
+            console.error("Error: no recorded active profile in install-state.json \u2014 run " + "`massa-ai-config profile set <name>` first; there is nothing to fix from.");
+            return 1;
+          }
+          const sourceRoot = findRepoRootWithMarker(import.meta.dirname, GENERATOR_MARKER, GENERATOR_MARKER_MAX_LEVELS);
+          formatVariantSync(syncGeneratedVariants({ sourceRoot, targetHome }));
+          const switchReport = switchProfile({ profile, host, targetHome });
+          formatSwitchReport(switchReport);
+          if (!reportSucceeded(switchReport)) {
+            return 1;
+          }
+          report = runtimeDriftReport({ targetHome, host });
+        }
+        formatDriftReport(report);
+        return 0;
+      } catch (e) {
+        console.error(`Error: ${e.message}`);
+        return 1;
+      }
+    }
     case "bootstrap": {
       const subcommand = args[1];
       if (subcommand === "list" || subcommand === "show") {
@@ -154778,7 +155132,7 @@ Using defaults:`);
           return 1;
         }
         const targetOpt = typeof options.target === "string" ? options.target : undefined;
-        const targetHome = targetOpt === undefined ? os9.homedir() : path31.resolve(targetOpt);
+        const targetHome = targetOpt === undefined ? os9.homedir() : path32.resolve(targetOpt);
         if (targetHome !== os9.homedir() && options.yes !== true) {
           console.error(`Error: --target ${targetHome} is not your home (${os9.homedir()}) \u2014 pass --yes to confirm writing there`);
           return 1;
@@ -154798,7 +155152,7 @@ Using defaults:`);
           const report = applyBootstrapState({
             targetHome,
             dryRun,
-            sourcePath: repoRoot === null ? undefined : path31.join(repoRoot, "skills", "AGENTS.md")
+            sourcePath: repoRoot === null ? undefined : path32.join(repoRoot, "skills", "AGENTS.md")
           });
           console.log(formatBootstrapReport(report));
           return bootstrapReportSucceeded(report) ? 0 : 1;