@massa-ai/mcp-client 1.66.0 → 1.66.2

package/dist/index.js

@@ -27179,6 +27179,15 @@ function estimateTokens(text, type = "code") {
   const charsPerToken = type === "code" ? 4 : 5;
   return Math.ceil(text.length / charsPerToken);
 }
+function truncateToTokenLimit(text, limit, type = "code") {
+  const charsPerToken = type === "code" ? 4 : 5;
+  const maxChars = limit * charsPerToken;
+  if (text.length <= maxChars) {
+    return text;
+  }
+  return text.slice(0, maxChars) + `
+... (truncated)`;
+}
 // ../../packages/shared/dist/utils/metrics.js
 var FALLBACK_PRICING, MetricsCollector;
 var init_metrics = __esm(() => {
@@ -59594,12 +59603,55 @@ function _isAbortOrTimeoutError(err) {
   }
   return false;
 }
+function _isConnectionError(err) {
+  let cur = err;
+  for (let hops = 0;cur && hops < 5; hops++, cur = cur.lastError ?? cur.cause) {
+    const code = typeof cur.code === "string" ? cur.code : "";
+    if (/^(ECONNREFUSED|ECONNRESET|ENOTFOUND|EHOSTUNREACH|ConnectionRefused|ConnectionClosed|FailedToOpenSocket)$/.test(code)) {
+      return true;
+    }
+    const message = typeof cur.message === "string" ? cur.message : "";
+    if (message.startsWith("Cannot connect to API"))
+      return true;
+  }
+  return false;
+}
 function summarizeZodIssues(error51, maxIssues = 5) {
   return error51.issues.slice(0, maxIssues).map((issue2) => `${issue2.path.join(".") || "(root)"}: ${issue2.message}`).join("; ");
 }
+function isEndpointCircuitOpen(baseUrl) {
+  const circuit = endpointCircuits.get(baseUrl);
+  if (!circuit || circuit.failures < ENDPOINT_FAILURE_THRESHOLD)
+    return false;
+  const now2 = Date.now();
+  if (now2 < circuit.openUntil)
+    return true;
+  circuit.openUntil = now2 + ENDPOINT_COOLDOWN_MS;
+  return false;
+}
+function recordEndpointOutcome(baseUrl, err) {
+  if (!err || !_isConnectionError(err)) {
+    endpointCircuits.delete(baseUrl);
+    return;
+  }
+  const circuit = endpointCircuits.get(baseUrl) ?? { failures: 0, openUntil: 0 };
+  circuit.failures++;
+  if (circuit.failures >= ENDPOINT_FAILURE_THRESHOLD) {
+    circuit.openUntil = Date.now() + ENDPOINT_COOLDOWN_MS;
+  }
+  if (circuit.failures === ENDPOINT_FAILURE_THRESHOLD) {
+    logger.warn("LLM endpoint unreachable \u2014 pausing LLM calls", {
+      provider: resolveProviderIdForLogging(baseUrl),
+      consecutiveConnectionFailures: circuit.failures,
+      cooldownMs: ENDPOINT_COOLDOWN_MS
+    });
+  }
+  endpointCircuits.set(baseUrl, circuit);
+}
 function recordLlmFailure(label, role, model, baseUrl, timeoutMs, elapsedMs, err) {
   const consecutiveFailures = (llmFailureStreaks.get(label) ?? 0) + 1;
   llmFailureStreaks.set(label, consecutiveFailures);
+  recordEndpointOutcome(baseUrl, err);
   logger.warn("LLM call failed \u2014 using non-LLM fallback", {
     label,
     role,
@@ -59613,7 +59665,8 @@ function recordLlmFailure(label, role, model, baseUrl, timeoutMs, elapsedMs, err
   });
   return consecutiveFailures;
 }
-function recordLlmSuccess(label, model) {
+function recordLlmSuccess(label, model, baseUrl) {
+  recordEndpointOutcome(baseUrl, null);
   const priorFailures = llmFailureStreaks.get(label) ?? 0;
   if (priorFailures > 0) {
     logger.info("LLM call recovered", { label, model, afterFailures: priorFailures });
@@ -59625,6 +59678,9 @@ async function llmComplete(prompt, opts) {
     return { ok: false, error: "llm disabled" };
   }
   const llm = getLlmConfig({ modelRole: opts.modelRole });
+  if (isEndpointCircuitOpen(llm.baseUrl)) {
+    return { ok: false, error: "llm endpoint unreachable (circuit open)" };
+  }
   const role = opts.modelRole ?? "instruct";
   const timeoutMs = opts.timeoutMs ?? llm.timeoutMs;
   const startedAt = Date.now();
@@ -59639,7 +59695,7 @@ async function llmComplete(prompt, opts) {
     });
     const text2 = result.text ?? "";
     if (text2.length > 0) {
-      recordLlmSuccess(opts.label, llm.model);
+      recordLlmSuccess(opts.label, llm.model, llm.baseUrl);
       return { ok: true, value: text2 };
     }
     if (llm.disableThink) {
@@ -59648,7 +59704,7 @@ async function llmComplete(prompt, opts) {
         logger.warn("llmComplete: empty content \u2014 recovered from reasoning channel", {
           reasoningLen: reasoning.length
         });
-        recordLlmSuccess(opts.label, llm.model);
+        recordLlmSuccess(opts.label, llm.model, llm.baseUrl);
         return { ok: true, value: reasoning };
       }
       logger.warn("llm reasoning-recovery empty", {
@@ -59669,6 +59725,9 @@ async function llmObject(prompt, schema, opts) {
     return { ok: false, error: "llm disabled" };
   }
   const llm = getLlmConfig({ modelRole: opts.modelRole });
+  if (isEndpointCircuitOpen(llm.baseUrl)) {
+    return { ok: false, error: "llm endpoint unreachable (circuit open)" };
+  }
   const role = opts.modelRole ?? "instruct";
   const timeoutMs = opts.timeoutMs ?? llm.timeoutMs;
   const startedAt = Date.now();
@@ -59687,7 +59746,7 @@ async function llmObject(prompt, schema, opts) {
         abortSignal: timeoutSignal(timeoutMs)
       });
       logger.debug("json_schema: constrained decoding used", { label: opts.label, model: llm.model });
-      recordLlmSuccess(opts.label, llm.model);
+      recordLlmSuccess(opts.label, llm.model, llm.baseUrl);
       return { ok: true, value: result.object };
     }
     result = await generateObject({
@@ -59702,7 +59761,7 @@ async function llmObject(prompt, schema, opts) {
     const validated = schema.safeParse(result.object);
     if (validated.success) {
       logger.debug("json_schema: fallback to json_object \u2014 validated", { label: opts.label, model: llm.model });
-      recordLlmSuccess(opts.label, llm.model);
+      recordLlmSuccess(opts.label, llm.model, llm.baseUrl);
       return { ok: true, value: validated.data };
     }
     if (llm.disableThink) {
@@ -59715,7 +59774,7 @@ async function llmObject(prompt, schema, opts) {
             logger.warn("llmObject: recovered object from reasoning channel (fallback path)", {
               reasoningLen: reasoning.length
             });
-            recordLlmSuccess(opts.label, llm.model);
+            recordLlmSuccess(opts.label, llm.model, llm.baseUrl);
             return { ok: true, value: recovered.data };
           }
         }
@@ -59727,7 +59786,7 @@ async function llmObject(prompt, schema, opts) {
     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)) {
+    if (llm.disableThink && !_isAbortOrTimeoutError(e) && !_isConnectionError(e)) {
       const reasoning = _reasoningToText(result).length > 0 ? _reasoningToText(result) : _reasoningToText(e);
       if (reasoning.length > 0) {
         const parsed = _extractJsonObject(reasoning);
@@ -59737,7 +59796,7 @@ async function llmObject(prompt, schema, opts) {
             logger.warn("llmObject: recovered object from reasoning channel", {
               reasoningLen: reasoning.length
             });
-            recordLlmSuccess(opts.label, llm.model);
+            recordLlmSuccess(opts.label, llm.model, llm.baseUrl);
             return { ok: true, value: validated.data };
           }
         }
@@ -59751,7 +59810,7 @@ async function llmObject(prompt, schema, opts) {
     return { ok: false, error: e.message };
   }
 }
-var _jsonSchemaSupported = null, testEnabledOverride = null, testBaseUrlOverride = null, llmFailureStreaks, llm;
+var _jsonSchemaSupported = null, testEnabledOverride = null, testBaseUrlOverride = null, llmFailureStreaks, ENDPOINT_FAILURE_THRESHOLD = 3, ENDPOINT_COOLDOWN_MS = 60000, endpointCircuits, llm;
 var init_llm_client = __esm(() => {
   init_dist6();
   init_dist7();
@@ -59759,6 +59818,7 @@ var init_llm_client = __esm(() => {
   init_config();
   init_inference_providers();
   llmFailureStreaks = new Map;
+  endpointCircuits = new Map;
   llm = {
     complete: llmComplete,
     object: llmObject,
@@ -130028,14 +130088,80 @@ function indexDefinitions(definitions) {
   });
   return { registry: registry3, definitions: Object.freeze(indexed) };
 }
-function candidateKind(reference, definition) {
-  if (reference.kind === "type_ref" || reference.kind === "extend" || reference.kind === "implement") {
-    return ["class", "interface", "trait", "enum", "type", "type_parameter"].includes(definition.identity.kind);
-  }
-  if (reference.kind === "call" || reference.kind === "data_flow" || reference.kind === "http_call") {
-    return ["function", "method", "constructor", "class", "field", "variable", "constant", "export"].includes(definition.identity.kind);
-  }
-  return false;
+function buildPartition(list) {
+  const byFqn = new Map;
+  const byFile = new Map;
+  const byFileQualifiedName = new Map;
+  const byQualifiedName = new Map;
+  for (const definition of list) {
+    const identity = definition.identity;
+    if (!byFqn.has(identity.fqn))
+      byFqn.set(identity.fqn, definition);
+    const fileBucket = byFile.get(identity.file);
+    if (fileBucket)
+      fileBucket.push(definition);
+    else
+      byFile.set(identity.file, [definition]);
+    const fileQualifiedNameKey = `${identity.file}\x00${identity.qualifiedName}`;
+    const fileQualifiedNameBucket = byFileQualifiedName.get(fileQualifiedNameKey);
+    if (fileQualifiedNameBucket)
+      fileQualifiedNameBucket.push(definition);
+    else
+      byFileQualifiedName.set(fileQualifiedNameKey, [definition]);
+    const qualifiedNameBucket = byQualifiedName.get(identity.qualifiedName);
+    if (qualifiedNameBucket)
+      qualifiedNameBucket.push(definition);
+    else
+      byQualifiedName.set(identity.qualifiedName, [definition]);
+  }
+  return { list, byFqn, byFile, byFileQualifiedName, byQualifiedName };
+}
+function buildScopedIndex(rawDefinitions, familyOnly) {
+  const scoped = familyOnly ? rawDefinitions.filter((definition) => FAMILY_DIALECTS.has(definition.identity.dialect)) : rawDefinitions;
+  const { registry: registry3, definitions: all } = indexDefinitions(scoped);
+  const typeRefs = [];
+  const calls = [];
+  for (const definition of all) {
+    if (TYPE_REF_KINDS.has(definition.identity.kind))
+      typeRefs.push(definition);
+    if (CALL_KINDS.has(definition.identity.kind))
+      calls.push(definition);
+  }
+  return { registry: registry3, typeRefs: buildPartition(typeRefs), calls: buildPartition(calls), all: buildPartition(all) };
+}
+function definitionIndex(rawDefinitions, familyOnly) {
+  let byScope = RESOLVE_INDEX_CACHE.get(rawDefinitions);
+  if (!byScope) {
+    byScope = new Map;
+    RESOLVE_INDEX_CACHE.set(rawDefinitions, byScope);
+  }
+  const existing = byScope.get(familyOnly);
+  if (existing)
+    return existing;
+  const built = buildScopedIndex(rawDefinitions, familyOnly);
+  byScope.set(familyOnly, built);
+  return built;
+}
+function cachedDialectScope(definitions, dialectKey, predicate) {
+  let byKey = DIALECT_SCOPE_CACHE.get(definitions);
+  if (!byKey) {
+    byKey = new Map;
+    DIALECT_SCOPE_CACHE.set(definitions, byKey);
+  }
+  const existing = byKey.get(dialectKey);
+  if (existing)
+    return existing;
+  const scoped = definitions.filter((definition) => predicate(definition));
+  byKey.set(dialectKey, scoped);
+  return scoped;
+}
+function normalizedKnownFiles(knownFiles) {
+  const existing = KNOWN_FILES_CACHE.get(knownFiles);
+  if (existing)
+    return existing;
+  const built = new Set(knownFiles.map(normalizeStructuralFile));
+  KNOWN_FILES_CACHE.set(knownFiles, built);
+  return built;
 }
 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];
@@ -130048,7 +130174,7 @@ function probe(base, known, dialect = "typescript") {
   return;
 }
 function resolveStructuralSpecifier(specifier, fromFile, build, dialect = "typescript") {
-  const known = new Set(build.knownFiles.map(normalizeStructuralFile));
+  const known = normalizedKnownFiles(build.knownFiles);
   if (specifier.startsWith("./") || specifier.startsWith("../")) {
     return probe(path25.posix.join(path25.posix.dirname(fromFile), specifier), known, dialect);
   }
@@ -130085,12 +130211,12 @@ function matchesStructuralPathAlias(specifier, aliases) {
     return specifier.startsWith(prefix) && specifier.endsWith(suffix) && specifier.length >= prefix.length + suffix.length;
   });
 }
-function exportedMatches(file2, sought, defaultOnly, definitions, build, visited = new Set) {
+function exportedMatches(file2, sought, defaultOnly, partition, build, visited = new Set) {
   const key = `${file2}\x00${sought}\x00${defaultOnly}`;
   if (visited.has(key))
     return [];
   visited.add(key);
-  const direct = definitions.filter((definition) => definition.identity.file === file2 && definition.exported && (defaultOnly ? definition.defaultExport : definition.identity.qualifiedName === sought));
+  const direct = (partition.byFile.get(file2) ?? []).filter((definition) => definition.exported && (defaultOnly ? definition.defaultExport : definition.identity.qualifiedName === sought));
   const concrete = direct.filter((definition) => definition.identity.kind !== "export");
   if (concrete.length > 0) {
     if (!defaultOnly)
@@ -130108,7 +130234,7 @@ function exportedMatches(file2, sought, defaultOnly, definitions, build, visited
     for (const binding of reexport.bindings) {
       if (binding.local !== sought && binding.imported !== "*")
         continue;
-      forwarded.push(...exportedMatches(targetFile, binding.imported === "*" ? sought : binding.imported, defaultOnly || binding.imported === "default", definitions, build, visited));
+      forwarded.push(...exportedMatches(targetFile, binding.imported === "*" ? sought : binding.imported, defaultOnly || binding.imported === "default", partition, build, visited));
     }
   }
   if (forwarded.length > 0)
@@ -130118,7 +130244,7 @@ function exportedMatches(file2, sought, defaultOnly, definitions, build, visited
   const namedDefault = direct.filter((definition) => definition.identity.name !== "default");
   return namedDefault.length > 0 ? namedDefault : direct;
 }
-function importedMatches(file2, reference, definitions, build) {
+function importedMatches(file2, reference, partition, build) {
   const matches = [];
   let claimed = false;
   for (const imported of file2.imports) {
@@ -130160,31 +130286,30 @@ function importedMatches(file2, reference, definitions, build) {
       }
       if ((imported.typeOnly || binding.typeOnly) && !typeEdge)
         continue;
-      const importedFile = resolveStructuralSpecifier(imported.specifier, file2.file, build, file2.dialect) ?? (["python_import", "ruby_require", "php_use", "lua_require", "c_include", "cpp_include", "go_import", "rust_use", "zig_import", "java_import", "java_static_import", "kotlin_import", "scala_import", "dart_import", "elixir_alias", "elixir_import", "elixir_require", "elixir_use", "erlang_import", "clojure_require", "clojure_import", "ocaml_open", "ocaml_include", "ocaml_module_alias", "haskell_import"].includes(imported.form) ? probe(imported.specifier.replace(/^\.\//u, ""), new Set(build.knownFiles.map(normalizeStructuralFile)), file2.dialect) : undefined);
+      const importedFile = resolveStructuralSpecifier(imported.specifier, file2.file, build, file2.dialect) ?? (["python_import", "ruby_require", "php_use", "lua_require", "c_include", "cpp_include", "go_import", "rust_use", "zig_import", "java_import", "java_static_import", "kotlin_import", "scala_import", "dart_import", "elixir_alias", "elixir_import", "elixir_require", "elixir_use", "erlang_import", "clojure_require", "clojure_import", "ocaml_open", "ocaml_include", "ocaml_module_alias", "haskell_import"].includes(imported.form) ? probe(imported.specifier.replace(/^\.\//u, ""), normalizedKnownFiles(build.knownFiles), file2.dialect) : undefined);
       if (!importedFile)
         continue;
       const esmDefaultMember = imported.form === "esm_import" && binding.imported === "default" && qualifier[0] === binding.local;
       if (esmDefaultMember && sought !== undefined) {
-        const owners = exportedMatches(importedFile, "default", true, definitions, build);
+        const owners = exportedMatches(importedFile, "default", true, partition, build);
         for (const owner of owners) {
           const ownerMember = `${owner.identity.qualifiedName}.${sought}`;
-          matches.push(...definitions.filter((definition) => definition.identity.file === owner.identity.file && definition.exported && definition.identity.qualifiedName === ownerMember));
+          matches.push(...(partition.byFileQualifiedName.get(`${owner.identity.file}\x00${ownerMember}`) ?? []).filter((definition) => definition.exported));
         }
         continue;
       }
       if (defaultOnly)
-        matches.push(...exportedMatches(importedFile, "default", true, definitions, build));
+        matches.push(...exportedMatches(importedFile, "default", true, partition, build));
       else if (sought !== undefined)
-        matches.push(...exportedMatches(importedFile, sought, false, definitions, build).filter((definition) => binding.arity === undefined || definition.arity === binding.arity));
+        matches.push(...exportedMatches(importedFile, sought, false, partition, build).filter((definition) => binding.arity === undefined || definition.arity === binding.arity));
     }
   }
   return { matches, claimed };
 }
-function sameFileMatches(file2, reference, definitions) {
-  const local = definitions.filter((definition) => definition.identity.file === file2);
+function sameFileMatches(file2, reference, partition) {
   if (reference.qualifier && reference.qualifier !== "this") {
     const exact = `${reference.qualifier}.${reference.name}`;
-    return local.filter((definition) => definition.identity.qualifiedName === exact);
+    return partition.byFileQualifiedName.get(`${file2}\x00${exact}`) ?? [];
   }
   const lexical = reference.lexicalScope?.split(".").filter(Boolean) ?? [];
   if (lexical.length > 0)
@@ -130192,7 +130317,7 @@ function sameFileMatches(file2, reference, definitions) {
   for (let length = lexical.length;length >= 0; length -= 1) {
     const prefix = lexical.slice(0, length).join(".");
     const exact = prefix ? `${prefix}.${reference.name}` : reference.name;
-    const matches = local.filter((definition) => definition.identity.qualifiedName === exact);
+    const matches = partition.byFileQualifiedName.get(`${file2}\x00${exact}`) ?? [];
     if (matches.length > 0)
       return matches;
     if (reference.qualifier === "this")
@@ -130200,7 +130325,7 @@ function sameFileMatches(file2, reference, definitions) {
   }
   return [];
 }
-var TYPESCRIPT_RESOLVER_VERSION = "1.0.0", DIALECT_PROBES, REQUIRE_IMPORT_FORMS, TYPESCRIPT_LANGUAGE_RESOLVER;
+var TYPESCRIPT_RESOLVER_VERSION = "1.0.0", DIALECT_PROBES, TYPE_REF_KINDS, CALL_KINDS, FAMILY_DIALECTS, REFERENCE_PARTITION, EMPTY_PARTITION, RESOLVE_INDEX_CACHE, DIALECT_SCOPE_CACHE, KNOWN_FILES_CACHE, REQUIRE_IMPORT_FORMS, TYPESCRIPT_LANGUAGE_RESOLVER;
 var init_typescript2 = __esm(() => {
   init_fqn_codec();
   DIALECT_PROBES = Object.freeze({
@@ -130235,6 +130360,27 @@ var init_typescript2 = __esm(() => {
     ocaml: ["", ".ml"],
     haskell: ["", ".hs"]
   });
+  TYPE_REF_KINDS = new Set(["class", "interface", "trait", "enum", "type", "type_parameter"]);
+  CALL_KINDS = new Set(["function", "method", "constructor", "class", "field", "variable", "constant", "export"]);
+  FAMILY_DIALECTS = new Set(["typescript", "tsx", "javascript", "jsx", "sfc"]);
+  REFERENCE_PARTITION = Object.freeze({
+    type_ref: "typeRefs",
+    extend: "typeRefs",
+    implement: "typeRefs",
+    call: "calls",
+    data_flow: "calls",
+    http_call: "calls"
+  });
+  EMPTY_PARTITION = Object.freeze({
+    list: Object.freeze([]),
+    byFqn: new Map,
+    byFile: new Map,
+    byFileQualifiedName: new Map,
+    byQualifiedName: new Map
+  });
+  RESOLVE_INDEX_CACHE = new WeakMap;
+  DIALECT_SCOPE_CACHE = new WeakMap;
+  KNOWN_FILES_CACHE = new WeakMap;
   REQUIRE_IMPORT_FORMS = new Set(["commonjs_require", "dynamic_import", "ruby_require", "lua_require"]);
   TYPESCRIPT_LANGUAGE_RESOLVER = Object.freeze({
     version: TYPESCRIPT_RESOLVER_VERSION,
@@ -130242,21 +130388,19 @@ var init_typescript2 = __esm(() => {
     resolve(file2, rawReference, rawDefinitions, build) {
       const normalizedFile = normalizeStructuralFile(file2.file);
       const reference = normalizedReference(rawReference);
-      const familyDialects = ["typescript", "tsx", "javascript", "jsx", "sfc"];
-      const scopedDefinitions = familyDialects.includes(file2.dialect) ? rawDefinitions.filter((definition) => familyDialects.includes(definition.identity.dialect)) : rawDefinitions;
-      const { registry: registry3, definitions: allDefinitions } = indexDefinitions(scopedDefinitions);
-      const definitions = allDefinitions.filter((definition) => candidateKind(reference, definition));
+      const index = definitionIndex(rawDefinitions, FAMILY_DIALECTS.has(file2.dialect));
+      const partition = reference.kind && REFERENCE_PARTITION[reference.kind] ? index[REFERENCE_PARTITION[reference.kind]] : EMPTY_PARTITION;
       if (reference.existingFqn) {
-        const prepared = definitions.find((definition) => definition.identity.fqn === reference.existingFqn)?.identity;
-        const exact = prepared ? { found: true, identity: prepared } : registry3.resolveModern(reference.existingFqn);
+        const prepared = partition.byFqn.get(reference.existingFqn)?.identity;
+        const exact = prepared ? { found: true, identity: prepared } : index.registry.resolveModern(reference.existingFqn);
         return exact.found ? Object.freeze({ status: "resolved", fqn: exact.identity.fqn, identity: exact.identity, source: "exact" }) : Object.freeze({ status: "unresolved", name: reference.existingFqn });
       }
       const soughtQualified = reference.qualifier ? `${reference.qualifier}.${reference.name}` : reference.name;
-      const local = sameFileMatches(normalizedFile, reference, definitions);
+      const local = sameFileMatches(normalizedFile, reference, partition);
       const localOutcome = outcome(reference, local, "same_file");
       if (localOutcome)
         return localOutcome;
-      const imported = importedMatches({ ...file2, file: normalizedFile }, reference, definitions, build);
+      const imported = importedMatches({ ...file2, file: normalizedFile }, reference, partition, build);
       const importOutcome = outcome(reference, imported.matches, "import");
       if (importOutcome)
         return importOutcome;
@@ -130266,16 +130410,16 @@ var init_typescript2 = __esm(() => {
           name: reference.name,
           ...reference.qualifier ? { qualifier: reference.qualifier } : {}
         });
-      const global2 = definitions.filter((definition) => definition.exported && (reference.qualifier ? definition.identity.qualifiedName === soughtQualified : definition.identity.name === reference.name && definition.identity.qualifiedName === definition.identity.name));
-      return outcome(reference, global2, "global") ?? Object.freeze({
+      const globalBucket = reference.qualifier ? (partition.byQualifiedName.get(soughtQualified) ?? []).filter((definition) => definition.exported) : (partition.byQualifiedName.get(reference.name) ?? []).filter((definition) => definition.exported && definition.identity.qualifiedName === definition.identity.name);
+      return outcome(reference, globalBucket, "global") ?? Object.freeze({
         status: "unresolved",
         name: reference.name,
         ...reference.qualifier ? { qualifier: reference.qualifier } : {}
       });
     },
     resolveLegacy(legacyFqn, rawDefinitions) {
-      const { registry: registry3, definitions } = indexDefinitions(rawDefinitions);
-      const materialized = definitions.filter((definition) => definition.identity.legacyFqn === legacyFqn);
+      const { registry: registry3, all } = definitionIndex(rawDefinitions, false);
+      const materialized = all.list.filter((definition) => definition.identity.legacyFqn === legacyFqn);
       const materializedOutcome = outcome({ kind: "call", span: { startByte: 0, endByte: 0, start: { row: 0, column: 0 }, end: { row: 0, column: 0 } }, name: legacyFqn }, materialized, "legacy");
       if (materializedOutcome)
         return materializedOutcome;
@@ -130308,7 +130452,7 @@ var init_scripting2 = __esm(() => {
     ...TYPESCRIPT_LANGUAGE_RESOLVER,
     dialects: Object.freeze(["python", "ruby", "php", "lua-luajit"]),
     resolve(file2, reference, definitions, build) {
-      return TYPESCRIPT_LANGUAGE_RESOLVER.resolve(file2, reference, definitions.filter((definition) => definition.identity.dialect === file2.dialect), build);
+      return TYPESCRIPT_LANGUAGE_RESOLVER.resolve(file2, reference, cachedDialectScope(definitions, file2.dialect, (definition) => definition.identity.dialect === file2.dialect), build);
     }
   });
 });
@@ -130324,6 +130468,7 @@ var init_systems2 = __esm(() => {
     dialects: DIALECTS,
     resolve(file2, reference, definitions, build) {
       const compatible = file2.dialect === "header-default-c" ? ["c", "header-default-c"] : file2.dialect === "header-cpp" || file2.dialect === "header" ? ["cpp", "header", "header-cpp"] : [file2.dialect];
+      const compatibleKey = compatible.join(",");
       const unresolvedTarget = reference.target.status === "unresolved" ? reference.target : undefined;
       const resolverFile = file2.dialect === "rust" ? {
         ...file2,
@@ -130342,7 +130487,7 @@ var init_systems2 = __esm(() => {
           return { ...item, bindings };
         })
       } : file2;
-      return TYPESCRIPT_LANGUAGE_RESOLVER.resolve(resolverFile, reference, definitions.filter((item) => compatible.includes(item.identity.dialect)), build);
+      return TYPESCRIPT_LANGUAGE_RESOLVER.resolve(resolverFile, reference, cachedDialectScope(definitions, compatibleKey, (item) => compatible.includes(item.identity.dialect)), build);
     }
   });
 });
@@ -130387,7 +130532,7 @@ var init_managed2 = __esm(() => {
           return imported;
         return { ...imported, bindings: imported.bindings.map((binding) => binding.imported === "*" && binding.local === "*" ? { ...binding, imported: unresolved2.name, local: unresolved2.name } : binding) };
       }) } : file2;
-      return TYPESCRIPT_LANGUAGE_RESOLVER.resolve(resolverFile, reference, definitions.filter((item) => file2.dialect === "kotlin" || file2.dialect === "kotlin-script" ? item.identity.dialect === "kotlin" || item.identity.dialect === "kotlin-script" : item.identity.dialect === file2.dialect), build);
+      return TYPESCRIPT_LANGUAGE_RESOLVER.resolve(resolverFile, reference, cachedDialectScope(definitions, file2.dialect === "kotlin" || file2.dialect === "kotlin-script" ? "kotlin" : file2.dialect, (item) => file2.dialect === "kotlin" || file2.dialect === "kotlin-script" ? item.identity.dialect === "kotlin" || item.identity.dialect === "kotlin-script" : item.identity.dialect === file2.dialect), build);
     }
   });
 });
@@ -130415,7 +130560,7 @@ var init_functional2 = __esm(() => {
           return imported;
         return { ...imported, bindings: imported.bindings.length === 0 ? [{ imported: `${owner}.${unresolved2.name}`, local: unresolved2.name, typeOnly: false }] : imported.bindings.map((binding) => binding.imported === "*" && (binding.local === "*" || imported.form === "elixir_import") ? { ...binding, imported: `${owner}.${unresolved2.name}`, local: unresolved2.name } : binding.imported.startsWith("!") ? binding : { ...binding, imported: `${owner}.${binding.imported}` }) };
       }) } : file2;
-      return TYPESCRIPT_LANGUAGE_RESOLVER.resolve(resolverFile, reference, definitions.filter((item) => file2.dialect === "elixir" || file2.dialect === "elixir-script" ? item.identity.dialect === "elixir" || item.identity.dialect === "elixir-script" : item.identity.dialect === file2.dialect), build);
+      return TYPESCRIPT_LANGUAGE_RESOLVER.resolve(resolverFile, reference, cachedDialectScope(definitions, file2.dialect === "elixir" || file2.dialect === "elixir-script" ? "elixir" : file2.dialect, (item) => file2.dialect === "elixir" || file2.dialect === "elixir-script" ? item.identity.dialect === "elixir" || item.identity.dialect === "elixir-script" : item.identity.dialect === file2.dialect), build);
     }
   });
 });
@@ -130433,6 +130578,14 @@ var init_data_document2 = __esm(() => {
 // ../../packages/core/dist/services/etl/stages/resolve.js
 import path27 from "path";
 import fs18 from "fs";
+function knownRelPathsList(knownRelPaths) {
+  const existing = KNOWN_REL_PATHS_LISTS.get(knownRelPaths);
+  if (existing)
+    return existing;
+  const built = Object.freeze([...knownRelPaths]);
+  KNOWN_REL_PATHS_LISTS.set(knownRelPaths, built);
+  return built;
+}
 
 class ResolveStage {
   symbolRepository;
@@ -130516,7 +130669,7 @@ class ResolveStage {
   resolveStructuralFile(parsed, session2, knownRelPaths, rootAliases, monorepoPackages) {
     const filePath = parsed.file.relativePath;
     const structuralAliases = this.structuralAliasesFor(filePath, rootAliases, monorepoPackages);
-    const build = { knownFiles: [...knownRelPaths], pathAliasesByFile: { [filePath]: structuralAliases } };
+    const build = { knownFiles: knownRelPathsList(knownRelPaths), pathAliasesByFile: { [filePath]: structuralAliases } };
     const resolvedImports = parsed.rawImports.map((raw2) => {
       const resolvedPath = resolveStructuralSpecifier(raw2.specifier, filePath, build) ?? null;
       return {
@@ -130816,7 +130969,7 @@ class ResolveStage {
     }));
   }
 }
-var TS_EXTENSIONS, STRUCTURAL_SEED_EXTENSIONS;
+var KNOWN_REL_PATHS_LISTS, TS_EXTENSIONS, STRUCTURAL_SEED_EXTENSIONS;
 var init_resolve = __esm(() => {
   init_dist();
   init_symbol_repository_factory();
@@ -130830,14 +130983,28 @@ var init_resolve = __esm(() => {
   init_fqn_codec();
   init_language_manifest();
   init_types3();
+  KNOWN_REL_PATHS_LISTS = new WeakMap;
   TS_EXTENSIONS = [".ts", ".tsx", ".js", ".jsx", "/index.ts", "/index.js"];
   STRUCTURAL_SEED_EXTENSIONS = new Set([".ts", ".tsx", ".js", ".jsx", ".py", ".rb", ".php", ".lua", ".c", ".h", ".cpp", ".hpp", ".go", ".rs", ".zig", ".java", ".kt", ".kts", ".scala", ".cs", ".swift", ".dart", ".ex", ".exs", ".erl", ".clj", ".ml", ".hs", ".vue", ".md", ".json", ".yaml", ".yml"]);
 });
 
 // ../../packages/core/dist/data/with-deadlock-retry.js
+function isConnectionPoolAcquisitionError(error51) {
+  if (!error51 || typeof error51 !== "object")
+    return false;
+  const code = error51.code;
+  if (code === "P2024")
+    return true;
+  const message = error51.message;
+  if (typeof message !== "string")
+    return false;
+  return message.includes("Unable to start a transaction in the given time") || message.includes("Timed out fetching a new connection from the connection pool");
+}
 function isRetriableTransactionError(error51) {
   if (!error51 || typeof error51 !== "object")
     return false;
+  if (isConnectionPoolAcquisitionError(error51))
+    return true;
   const code = error51.code;
   if (typeof code === "string" && RETRIABLE_SQLSTATES.has(code))
     return true;
@@ -130850,17 +131017,23 @@ function isRetriableTransactionError(error51) {
 async function withDeadlockRetry(operation, options = {}) {
   const maxAttempts = options.maxAttempts ?? 5;
   const baseDelayMs = options.baseDelayMs ?? 75;
-  for (let attempt = 1;attempt <= maxAttempts; attempt++) {
+  const connectionDelayMs = options.connectionDelayMs ?? 30000;
+  const loopBound = Math.max(maxAttempts, 10);
+  for (let attempt = 1;attempt <= loopBound; attempt++) {
     try {
       return await operation();
     } catch (error51) {
-      if (!isRetriableTransactionError(error51) || attempt === maxAttempts)
+      if (!isRetriableTransactionError(error51))
+        throw error51;
+      const isConn = isConnectionPoolAcquisitionError(error51);
+      const effectiveMax = isConn ? Math.max(maxAttempts, 10) : maxAttempts;
+      if (attempt >= effectiveMax)
         throw error51;
-      const delayMs = baseDelayMs * 2 ** (attempt - 1);
-      logger.warn("Retriable DB lock cycle; retrying operation", {
+      const delayMs = isConn ? connectionDelayMs * attempt : baseDelayMs * 2 ** (attempt - 1);
+      logger.warn("Retriable DB failure; retrying operation", {
         operation: options.operation ?? "unknown",
         attempt,
-        maxAttempts,
+        maxAttempts: effectiveMax,
         delayMs,
         error: error51
       });
@@ -146632,6 +146805,7 @@ var init_auto_improve_job = __esm(() => {
 var exports_observation_consolidation_job = {};
 __export(exports_observation_consolidation_job, {
   observationConsolidationJob: () => observationConsolidationJob,
+  buildObservationPrompt: () => buildObservationPrompt,
   ObservationConsolidationJob: () => ObservationConsolidationJob
 });
 import { randomUUID as randomUUID9 } from "crypto";
@@ -146659,6 +146833,7 @@ class ObservationConsolidationJob {
   maxWindow;
   lastRunAt = 0;
   newSinceRun = 0;
+  running = false;
   runCalls = 0;
   get store() {
     return this.injectedStore ?? getObservationStore();
@@ -146702,6 +146877,18 @@ class ObservationConsolidationJob {
   }
   async runOnce(projectId) {
     this.runCalls++;
+    if (this.running) {
+      logger.debug("observation consolidation: skipped, a run is in flight", { projectId });
+      return { consolidated: false, batchesCreated: 0 };
+    }
+    this.running = true;
+    try {
+      return await this.consolidateWindow(projectId);
+    } finally {
+      this.running = false;
+    }
+  }
+  async consolidateWindow(projectId) {
     const noop2 = {
       consolidated: false,
       batchesCreated: 0
@@ -146791,8 +146978,9 @@ class ObservationConsolidationJob {
   }
 }
 function buildObservationPrompt(window2) {
+  const observationTokens = Math.min(MAX_OBSERVATION_TOKENS, Math.floor(MAX_WINDOW_TOKENS / Math.max(window2.length, 1)));
   const items = window2.map((o, i) => `[${i}] id=${o.id} source=${o.source} importance=${o.importance.toFixed(2)}
-${o.payloadJson}`).join(`
+${digestPayload(o.payloadJson, observationTokens)}`).join(`
 `);
   return [
     "You are consolidating a window of passive lifecycle observations (agent telemetry)",
@@ -146807,7 +146995,20 @@ ${o.payloadJson}`).join(`
   ].join(`
 `);
 }
-var FALLBACK_BRIDGE, observationConsolidationJob;
+function digestPayload(payloadJson, maxTokens) {
+  let payload;
+  try {
+    payload = JSON.parse(payloadJson);
+  } catch {
+    return truncateToTokenLimit(payloadJson, maxTokens);
+  }
+  if (payload && typeof payload === "object" && !Array.isArray(payload)) {
+    payload = Object.fromEntries(Object.entries(payload).filter(([key]) => !PROMPT_BOOKKEEPING_KEYS.has(key)));
+  }
+  const compact = JSON.stringify(payload, (_key, value) => typeof value === "string" && value.length > MAX_PROMPT_FIELD_CHARS ? `${value.slice(0, MAX_PROMPT_FIELD_CHARS)}\u2026` : value);
+  return truncateToTokenLimit(compact ?? "", maxTokens);
+}
+var FALLBACK_BRIDGE, observationConsolidationJob, PROMPT_BOOKKEEPING_KEYS, MAX_PROMPT_FIELD_CHARS = 400, MAX_OBSERVATION_TOKENS = 300, MAX_WINDOW_TOKENS = 2400;
 var init_observation_consolidation_job = __esm(() => {
   init_dist();
   init_dist();
@@ -146823,6 +147024,18 @@ var init_observation_consolidation_job = __esm(() => {
     maxWindow: 8
   };
   observationConsolidationJob = new ObservationConsolidationJob;
+  PROMPT_BOOKKEEPING_KEYS = new Set([
+    "session_id",
+    "transcript_path",
+    "cwd",
+    "prompt_id",
+    "tool_use_id",
+    "agent_id",
+    "hook_event_name",
+    "permission_mode",
+    "effort",
+    "duration_ms"
+  ]);
 });
 
 // ../../packages/core/dist/services/scheduler/scheduler-defaults.js