agent-relay-server 0.70.0 → 0.70.1

package/src/context-advisory.ts

@@ -1,4 +1,4 @@
-import { deriveContextThresholdFromWindowTokens, resolveProviderContextThreshold, type ProviderModelCatalogEntry, type ResolvedProviderContextThreshold } from "agent-relay-sdk/provider-catalog";
+import { deriveContextThresholdFromWindowTokens, findProviderCatalogModel, resolveProviderContextThreshold, type ProviderModelCatalogEntry, type ResolvedProviderContextThreshold } from "agent-relay-sdk/provider-catalog";
 import { isRecord, SPAWN_PROVIDERS } from "agent-relay-sdk";
 import { getConfig, getNotificationsConfig } from "./config-store";
 import { DEFAULT_CONTEXT_THRESHOLD_CONFIG, validateContextThresholdConfig } from "./context-threshold-config";
@@ -132,10 +132,11 @@ export function handleContextPressure(input: {
 }
 
 function effectiveContextThreshold(agent: AgentCard): EffectiveContextThreshold {
-  const model = findAgentCatalogModel(agent);
-  const windowTokens = model?.limits?.contextWindowTokens?.value
-    ?? finiteNumber(agent.providerCapabilities?.context?.windowTokens)
+  const observedWindowTokens = finiteNumber(agent.providerCapabilities?.context?.windowTokens)
     ?? finiteNumber(agent.context?.tokensMax);
+  const model = findAgentCatalogModel(agent, observedWindowTokens);
+  const windowTokens = model?.limits?.contextWindowTokens?.value
+    ?? observedWindowTokens;
   if (model?.contextThreshold) {
     return { ...resolveProviderContextThreshold(model), source: "model" };
   }
@@ -157,16 +158,14 @@ function explicitContextThresholdConfig(): EffectiveContextThreshold | undefined
   };
 }
 
-function findAgentCatalogModel(agent: AgentCard): ProviderModelCatalogEntry | undefined {
+function findAgentCatalogModel(agent: AgentCard, observedWindowTokens: number | undefined): ProviderModelCatalogEntry | undefined {
   const runtime = agent.providerCapabilities?.model;
   const provider = runtime?.provider;
   if (!provider || !(SPAWN_PROVIDERS as readonly string[]).includes(provider)) return undefined;
   const catalog = effectiveProviderCatalogList().find((entry) => entry.provider === provider);
   if (!catalog) return undefined;
   const ids = [runtime.alias, runtime.id, runtime.providerModel].filter((value): value is string => Boolean(value));
-  const lowerIds = new Set(ids.map((id) => id.toLowerCase()));
-  return catalog.models.find((model) => ids.includes(model.alias) || ids.includes(model.providerModel))
-    ?? catalog.models.find((model) => lowerIds.has(model.alias.toLowerCase()) || lowerIds.has(model.providerModel.toLowerCase()));
+  return findProviderCatalogModel(catalog, ids, { observedWindowTokens });
 }
 
 function clearContextAdvisory(context: ContextState): ContextState {