@massa-ai/mcp-client 1.60.1 → 1.61.0

package/dist/config-cli.js

@@ -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) {
@@ -2856,6 +2940,7 @@ function readRoles(liveRoot, activeProfile) {
 }
 function runtimeDriftReport(opts = {}) {
   const targetHome = opts.targetHome ?? os6.homedir();
+  const host = opts.host ?? "claude";
   const stateFilePath = opts.stateFilePath ?? path10.join(targetHome, ".config", "massa-ai", "install-state.json");
   let state = opts.state ?? null;
   if (state === null) {
@@ -2865,9 +2950,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);
@@ -2939,7 +3039,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)
@@ -2966,7 +3066,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)
@@ -3946,6 +4046,7 @@ var init_dist = __esm(() => {
   init_engine();
   init_variant_sync();
   init_repo_root();
+  init_doctor();
   init_bootstrap();
   init_types();
   init_interfaces();
@@ -15098,7 +15199,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;
     }
   }
@@ -52643,7 +52744,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 +52792,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 +52810,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 +52959,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 +53003,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 +53021,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 +53051,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 +53066,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 +53080,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 +53102,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 +53112,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 +62136,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 +62311,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
         });
@@ -95471,16 +95615,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 +95664,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 +95986,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 +96025,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 +96039,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;
       }
     }
@@ -108114,7 +108264,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 +108573,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 +108616,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 +108773,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 +108856,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 +108955,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 +108968,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 +108982,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 +110710,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 +111249,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 +111287,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 +111436,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 +111448,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 +111461,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 +112133,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 +112160,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 +114763,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 +115363,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 +115498,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 +115604,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 +115612,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 +115633,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 +115643,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 +115665,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 +115692,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 +115700,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 +115728,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 +116545,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;
     }
@@ -118232,7 +118406,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 +118429,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 +118452,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 +118463,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 +118806,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 +118827,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 +119722,7 @@ class RelationExtractor {
     } catch (error51) {
       logger.warn("RelationExtractor: extraction failed", {
         memoryId,
-        error: error51.message
+        error: error51
       });
     }
     return edgesCreated;
@@ -119995,7 +120169,7 @@ class MemoryGraphService {
     } catch (error51) {
       logger.warn("Graph update failed after memory store", {
         memoryId,
-        error: error51.message
+        error: error51
       });
     }
   }
@@ -120011,7 +120185,7 @@ class MemoryGraphService {
     } catch (error51) {
       logger.warn("Graph cleanup failed after memory delete", {
         memoryId,
-        error: error51.message
+        error: error51
       });
     }
   }
@@ -120160,7 +120334,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 +120435,7 @@ class MemoryConsolidationJob {
     } catch (error51) {
       logger.warn("Memory consolidation skipped", {
         trigger,
-        error: error51.message
+        error: error51
       });
     } finally {
       this.running = false;
@@ -120284,7 +120458,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 +120480,7 @@ class MemoryConsolidationJob {
       } catch (e) {
         logger.warn("consolidation: decay write failed", {
           id: row.id,
-          error: e.message
+          error: e
         });
       }
     }
@@ -120335,14 +120509,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 +120527,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 +120553,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 +120566,7 @@ class MemoryConsolidationJob {
         logger.warn("consolidation: addSupercedesEdge failed", {
           newId,
           sourceId,
-          error: e.message
+          error: e
         });
       }
     }
@@ -120432,7 +120606,7 @@ class MemoryConsolidationJob {
       return result;
     } catch (e) {
       logger.warn("consolidation: promote (PG) failed", {
-        error: e.message
+        error: e
       });
       return 0;
     }
@@ -120471,19 +120645,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 +120875,8 @@ class MemoryController {
         }
       } catch (err) {
         logger.warn("Graph enrichment failed", {
-          error: err.message
+          projectId,
+          error: err
         });
       }
     }
@@ -120900,7 +121078,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 +121118,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 +121431,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, {
@@ -122790,9 +122971,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;
     });
@@ -123067,7 +123248,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 +123402,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 +123728,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 +124643,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}`
@@ -127016,7 +127202,7 @@ class PgJobStore {
           } catch (e) {
             this.recovered = true;
             logger.warn("PgJobStore markStaleRunningFailed failed (best-effort)", {
-              error: e.message
+              error: e
             });
           }
         }
@@ -127042,7 +127228,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 +127251,7 @@ class PgJobStore {
     next.catch((e) => {
       logger.warn("PgJobStore.save failed (best-effort)", {
         jobId: job.jobId,
-        error: e.message
+        error: e
       });
     });
   }
@@ -127197,7 +127383,7 @@ class PgJobStore {
         }
       } catch (e) {
         logger.warn("PgJobStore markStaleRunningFailed failed (best-effort)", {
-          error: e.message
+          error: e
         });
       }
     })();
@@ -127387,7 +127573,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 +127604,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 +127634,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 +127871,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 +127885,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 +128141,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 +128256,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 +128275,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 +128295,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 +128798,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 +128849,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 +129163,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 +129359,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 +129374,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 +129422,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 +129451,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 +129586,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 +129688,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 +129718,7 @@ class ObservationConsolidationJob {
     } catch (e) {
       logger.warn("observation consolidation: listRecent failed", {
         projectId,
-        error: e.message
+        error: e
       });
       return noop2;
     }
@@ -129534,7 +129729,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 +129745,7 @@ class ObservationConsolidationJob {
     } catch (e) {
       logger.warn("observation consolidation: llm.object threw (silent)", {
         projectId,
-        error: e.message
+        error: e
       });
       return noop2;
     }
@@ -129579,7 +129774,7 @@ class ObservationConsolidationJob {
     } catch (e) {
       logger.warn("observation consolidation: summary insert failed", {
         batchId: batch.id,
-        error: e.message
+        error: e
       });
       return noop2;
     }
@@ -129690,7 +129885,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 +130079,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 +130148,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);
@@ -130241,8 +130437,9 @@ var init_models_dev_client = __esm(() => {
           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 +130661,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) {
@@ -130568,8 +130765,9 @@ var init_models_dev_client = __esm(() => {
           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
         });
       }
     }
@@ -131274,8 +131472,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}`);
     }
@@ -133800,8 +133999,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;
@@ -135037,7 +135237,7 @@ class ResolveStage {
         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;
@@ -135200,7 +135400,7 @@ async function withDeadlockRetry(operation, options = {}) {
         attempt,
         maxAttempts,
         delayMs,
-        error: error51?.message?.slice(0, 120)
+        error: error51
       });
       await new Promise((resolve7) => setTimeout(resolve7, delayMs));
     }
@@ -136330,7 +136530,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 +136542,7 @@ var init_pipeline = __esm(() => {
               logger.warn("EtlPipeline: embedding fingerprint stamp failed", {
                 projectId,
                 jobId,
-                error: stampError.message.slice(0, 160)
+                error: stampError
               });
             }
           }
@@ -136505,9 +136705,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 +136784,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;
     }
@@ -154094,6 +154297,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 +154488,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 };
@@ -154459,6 +154664,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 +154689,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 +154734,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 +154993,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") {