@dexto/core 1.8.3 → 1.8.5

package/dist/llm/executor/turn-executor.js

@@ -13,9 +13,11 @@ import { StreamProcessor } from "./stream-processor.js";
 import { truncateToolResult } from "./tool-output-truncator.js";
 import { buildProviderOptions, getEffectiveReasoningBudgetTokens } from "./provider-options.js";
 import { DextoLogComponent } from "../../logger/v2/types.js";
-import { DextoRuntimeError } from "../../errors/DextoRuntimeError.js";
-import { ErrorScope, ErrorType } from "../../errors/types.js";
-import { LLMErrorCode } from "../error-codes.js";
+import { recordOperationSpan } from "../../telemetry/operation-span.js";
+import {
+  extractProviderErrorDetails,
+  mapProviderError as mapCoreProviderError
+} from "./provider-error.js";
 import { toError } from "../../utils/error-conversion.js";
 import { isCodexBaseURL } from "../providers/codex-base-url.js";
 import { createModelToolDefinitions } from "./tool-definitions.js";
@@ -350,11 +352,19 @@ class TurnExecutor {
         this.currentModelStepId = `in-memory-model-step-${stepCount}`;
         modelStepPreparing = true;
         try {
-          preparedModelRequest = await this.prepareNextModelRequest({
-            contributorContext,
-            supportsTools: turn.supportsTools,
-            streaming: options.streaming
-          });
+          preparedModelRequest = await recordOperationSpan(
+            {
+              name: "turn.prepare_model_step",
+              componentName: "TurnExecutor",
+              attributes: this.createTurnStepSpanAttributes(stepCount)
+            },
+            () => this.prepareNextModelRequest({
+              contributorContext,
+              supportsTools: turn.supportsTools,
+              streaming: options.streaming
+            }),
+            this.logger
+          );
         } catch (error) {
           currentStepScope[Symbol.dispose]();
           currentStepScope = null;
@@ -380,18 +390,39 @@ class TurnExecutor {
             }
             currentStepScope = this.startModelStepScope();
             this.currentModelStepId = `in-memory-model-step-${stepCount}`;
-            preparedModelRequest = await this.prepareNextModelRequest({
-              contributorContext,
-              supportsTools: turn.supportsTools,
-              streaming: options.streaming
-            });
+            preparedModelRequest = await recordOperationSpan(
+              {
+                name: "turn.prepare_model_step",
+                componentName: "TurnExecutor",
+                attributes: this.createTurnStepSpanAttributes(stepCount)
+              },
+              () => this.prepareNextModelRequest({
+                contributorContext,
+                supportsTools: turn.supportsTools,
+                streaming: options.streaming
+              }),
+              this.logger
+            );
           }
           const modelStepRequest = preparedModelRequest;
           if (currentStepScope === null || modelStepRequest === null) {
             throw new Error("Model step request was not prepared");
           }
           this.logger.debug(`Step ${stepCount}: Starting`);
-          const result = await this.runModelStepWithRetry(modelStepRequest);
+          const result = await recordOperationSpan(
+            {
+              name: "turn.run_model_step",
+              componentName: "TurnExecutor",
+              attributes: this.createTurnStepSpanAttributes(stepCount),
+              resultAttributes: (stepResult) => ({
+                "llm.finish_reason": stepResult.finishReason,
+                "llm.output_text_length": stepResult.text.length,
+                "tool.count": stepResult.toolCalls.length
+              })
+            },
+            () => this.runModelStepWithRetry(modelStepRequest),
+            this.logger
+          );
           currentResult = result;
           currentToolCallsExecuted = result.finishReason !== "tool-calls";
           preparedModelRequest = null;
@@ -430,7 +461,18 @@ class TurnExecutor {
           toolCallsRunning = true;
           currentToolCallsExecuted = true;
           try {
-            await this.executeModelToolCalls(result.toolCalls);
+            await recordOperationSpan(
+              {
+                name: "turn.execute_tool_calls",
+                componentName: "TurnExecutor",
+                attributes: {
+                  ...this.createTurnStepSpanAttributes(stepCount),
+                  "tool.count": result.toolCalls.length
+                }
+              },
+              () => this.executeModelToolCalls(result.toolCalls),
+              this.logger
+            );
           } catch (error) {
             currentToolCallsExecuted = false;
             throw error;
@@ -451,7 +493,23 @@ class TurnExecutor {
         if (result.finishReason === "tool-calls" && !currentToolCallsExecuted) {
           throw new Error("Tool calls must finish before deciding the next model step");
         }
-        const nextStep = await this.decideNextStep(result, stepCount);
+        const nextStep = await recordOperationSpan(
+          {
+            name: "turn.decide_next_step",
+            componentName: "TurnExecutor",
+            attributes: {
+              ...this.createTurnStepSpanAttributes(stepCount),
+              "llm.finish_reason": result.finishReason,
+              "tool.calls_executed": currentToolCallsExecuted
+            },
+            resultAttributes: (decision) => ({
+              "turn.next_action": decision.kind,
+              "turn.next_step_count": decision.stepCount
+            })
+          },
+          () => this.decideNextStep(result, stepCount),
+          this.logger
+        );
         stepCount = nextStep.stepCount;
         currentResult = null;
         currentToolCallsExecuted = false;
@@ -555,6 +613,13 @@ class TurnExecutor {
       }
     };
   }
+  createTurnStepSpanAttributes(stepCount) {
+    return {
+      "turn.step_count": stepCount,
+      "llm.model": this.llmContext.model,
+      "llm.provider": this.llmContext.provider
+    };
+  }
   async finishTurn(input) {
     await this.contextManager.flush();
     this.setTelemetryAttributes(input.usage);
@@ -576,7 +641,13 @@ class TurnExecutor {
     this.eventBus.emit("llm:error", {
       error: mappedError,
       context: "TurnExecutor",
-      recoverable: false
+      recoverable: false,
+      details: extractProviderErrorDetails({
+        error,
+        provider: this.llmContext.provider,
+        model: this.llmContext.model,
+        sessionId: this.sessionId
+      })
     });
     await this.contextManager.flush();
     this.eventBus.emit("run:complete", {
@@ -773,48 +844,159 @@ class TurnExecutor {
       await this.injectQueuedMessages(coalesced);
     }
     await this.pruneOldToolOutputs();
-    let prepared = await this.contextManager.getFormattedMessagesForLLM(
-      input.contributorContext,
-      this.llmContext
+    let systemPrompt = await recordOperationSpan(
+      {
+        name: "system_prompt.build",
+        componentName: "TurnExecutor",
+        attributes: {
+          "llm.model": this.llmContext.model,
+          "llm.provider": this.llmContext.provider
+        }
+      },
+      () => this.contextManager.getSystemPrompt(input.contributorContext),
+      this.logger
     );
-    const toolDefinitions = input.supportsTools ? this.toolManager.filterToolsForSession(
-      await this.toolManager.getAllTools(),
-      this.sessionId
+    let { preparedHistory, formattedMessages } = await recordOperationSpan(
+      {
+        name: "context.build_messages",
+        componentName: "TurnExecutor",
+        attributes: {
+          "llm.model": this.llmContext.model,
+          "llm.provider": this.llmContext.provider
+        }
+      },
+      async () => {
+        const preparedHistory2 = (await this.contextManager.prepareHistory()).preparedHistory;
+        const formattedMessages2 = await this.contextManager.getFormattedMessages(
+          input.contributorContext,
+          this.llmContext,
+          systemPrompt,
+          preparedHistory2
+        );
+        return { preparedHistory: preparedHistory2, formattedMessages: formattedMessages2 };
+      },
+      this.logger
+    );
+    const toolDefinitions = input.supportsTools ? await recordOperationSpan(
+      {
+        name: "tools.list",
+        componentName: "TurnExecutor",
+        attributes: { "tools.supports": input.supportsTools },
+        resultAttributes: (tools) => ({ "tools.count": Object.keys(tools).length })
+      },
+      async () => this.toolManager.filterToolsForSession(
+        await this.toolManager.getAllTools(),
+        this.sessionId
+      ),
+      this.logger
     ) : {};
-    let estimatedInputTokens = await this.contextManager.getEstimatedNextInputTokens(
-      prepared.systemPrompt,
-      prepared.preparedHistory,
-      toolDefinitions
+    let estimatedInputTokens = await recordOperationSpan(
+      {
+        name: "context.token_estimate",
+        componentName: "TurnExecutor",
+        attributes: { "tools.count": Object.keys(toolDefinitions).length },
+        resultAttributes: (tokens) => ({ "context.estimated_input_tokens": tokens })
+      },
+      () => this.contextManager.getEstimatedNextInputTokens(
+        systemPrompt,
+        preparedHistory,
+        toolDefinitions
+      ),
+      this.logger
     );
     if (this.shouldCompact(estimatedInputTokens)) {
       this.logger.debug(
         `Pre-check: estimated ${estimatedInputTokens} tokens exceeds threshold, compacting`
       );
-      const didCompact = await this.compactContext(
-        estimatedInputTokens,
-        input.contributorContext,
-        toolDefinitions
+      const didCompact = await recordOperationSpan(
+        {
+          name: "context.compact",
+          componentName: "TurnExecutor",
+          attributes: { "context.estimated_input_tokens": estimatedInputTokens }
+        },
+        () => this.compactContext(
+          estimatedInputTokens,
+          input.contributorContext,
+          toolDefinitions
+        ),
+        this.logger
       );
       if (didCompact) {
-        prepared = await this.contextManager.getFormattedMessagesForLLM(
-          input.contributorContext,
-          this.llmContext
+        systemPrompt = await recordOperationSpan(
+          {
+            name: "system_prompt.build",
+            componentName: "TurnExecutor",
+            attributes: {
+              "context.after_compaction": true,
+              "llm.model": this.llmContext.model,
+              "llm.provider": this.llmContext.provider
+            }
+          },
+          () => this.contextManager.getSystemPrompt(input.contributorContext),
+          this.logger
         );
-        estimatedInputTokens = await this.contextManager.getEstimatedNextInputTokens(
-          prepared.systemPrompt,
-          prepared.preparedHistory,
-          toolDefinitions
+        ({ preparedHistory, formattedMessages } = await recordOperationSpan(
+          {
+            name: "context.build_messages",
+            componentName: "TurnExecutor",
+            attributes: {
+              "context.after_compaction": true,
+              "llm.model": this.llmContext.model,
+              "llm.provider": this.llmContext.provider
+            }
+          },
+          async () => {
+            const preparedHistory2 = (await this.contextManager.prepareHistory()).preparedHistory;
+            const formattedMessages2 = await this.contextManager.getFormattedMessages(
+              input.contributorContext,
+              this.llmContext,
+              systemPrompt,
+              preparedHistory2
+            );
+            return { preparedHistory: preparedHistory2, formattedMessages: formattedMessages2 };
+          },
+          this.logger
+        ));
+        estimatedInputTokens = await recordOperationSpan(
+          {
+            name: "context.token_estimate",
+            componentName: "TurnExecutor",
+            attributes: {
+              "context.after_compaction": true,
+              "tools.count": Object.keys(toolDefinitions).length
+            },
+            resultAttributes: (tokens) => ({
+              "context.estimated_input_tokens": tokens
+            })
+          },
+          () => this.contextManager.getEstimatedNextInputTokens(
+            systemPrompt,
+            preparedHistory,
+            toolDefinitions
+          ),
+          this.logger
         );
         this.logger.debug(
           `Post-compaction: recomputed estimate is ${estimatedInputTokens} tokens`
         );
       }
     }
-    const providerOptions = buildProviderOptions({
-      provider: this.llmContext.provider,
-      model: this.llmContext.model,
-      reasoning: this.config.reasoning
-    });
+    const providerOptions = await recordOperationSpan(
+      {
+        name: "llm.request_setup",
+        componentName: "TurnExecutor",
+        attributes: {
+          "llm.model": this.llmContext.model,
+          "llm.provider": this.llmContext.provider
+        }
+      },
+      () => buildProviderOptions({
+        provider: this.llmContext.provider,
+        model: this.llmContext.model,
+        reasoning: this.config.reasoning
+      }),
+      this.logger
+    );
     this.logger.debug("LLM request options", {
       provider: this.llmContext.provider,
       model: this.llmContext.model,
@@ -831,7 +1013,7 @@ class TurnExecutor {
       ...reasoningBudgetTokens !== void 0 && { reasoningBudgetTokens }
     } : void 0;
     return {
-      messages: prepared.formattedMessages,
+      messages: formattedMessages,
       tools: input.supportsTools ? createModelToolDefinitions(toolDefinitions) : {},
       toolDefinitions,
       estimatedInputTokens,
@@ -862,31 +1044,49 @@ class TurnExecutor {
       this.stepAbortController.signal,
       this.getStreamProcessorConfig(request.estimatedInputTokens, request.reasoning),
       this.logger,
-      request.streaming
+      request.streaming,
+      false
     );
-    return streamProcessor.process(
-      () => streamText({
-        model: this.model,
-        stopWhen: stepCountIs(1),
-        maxRetries: 0,
-        tools: request.tools,
-        abortSignal: this.stepAbortController.signal,
-        messages: request.messages,
-        ...this.config.maxOutputTokens !== void 0 && {
-          maxOutputTokens: this.config.maxOutputTokens
-        },
-        ...this.config.temperature !== void 0 && {
-          temperature: this.config.temperature
-        },
-        // Provider-specific options (caching, reasoning, etc.)
-        ...request.providerOptions !== void 0 && {
-          providerOptions: request.providerOptions
+    return recordOperationSpan(
+      {
+        name: "llm.stream",
+        componentName: "TurnExecutor",
+        attributes: {
+          "llm.model": this.llmContext.model,
+          "llm.provider": this.llmContext.provider,
+          "tools.count": Object.keys(request.toolDefinitions).length
         },
-        // Log stream-level errors (tool errors, API errors during streaming)
-        onError: (error) => {
-          this.logger.error("Stream error", { error });
-        }
-      })
+        resultAttributes: (result) => ({
+          "llm.finish_reason": result.finishReason,
+          "llm.output_text_length": result.text.length,
+          "tool.count": result.toolCalls.length
+        })
+      },
+      () => streamProcessor.process(
+        () => streamText({
+          model: this.model,
+          stopWhen: stepCountIs(1),
+          maxRetries: 0,
+          tools: request.tools,
+          abortSignal: this.stepAbortController.signal,
+          messages: request.messages,
+          ...this.config.maxOutputTokens !== void 0 && {
+            maxOutputTokens: this.config.maxOutputTokens
+          },
+          ...this.config.temperature !== void 0 && {
+            temperature: this.config.temperature
+          },
+          // Provider-specific options (caching, reasoning, etc.)
+          ...request.providerOptions !== void 0 && {
+            providerOptions: request.providerOptions
+          },
+          // Log stream-level errors (tool errors, API errors during streaming)
+          onError: (error) => {
+            this.logger.error("Stream error", { error });
+          }
+        })
+      ),
+      this.logger
     );
   }
   async runModelStepWithRetry(request) {
@@ -959,10 +1159,41 @@ class TurnExecutor {
   async executeModelToolCalls(toolCalls) {
     const preparedCalls = [];
     for (const toolCall of toolCalls) {
-      preparedCalls.push(await this.prepareModelToolCall(toolCall));
+      preparedCalls.push(
+        await recordOperationSpan(
+          {
+            name: "tool.prepare",
+            componentName: "TurnExecutor",
+            attributes: {
+              "tool.call_id": toolCall.toolCallId,
+              "tool.name": toolCall.toolName
+            },
+            resultAttributes: (prepared) => ({ "tool.prepare_kind": prepared.kind })
+          },
+          () => this.prepareModelToolCall(toolCall),
+          this.logger
+        )
+      );
     }
     const executionResults = await Promise.all(
-      preparedCalls.map((prepared) => this.executePreparedModelToolCall(prepared))
+      preparedCalls.map(
+        (prepared) => recordOperationSpan(
+          {
+            name: "tool.execute",
+            componentName: "TurnExecutor",
+            attributes: {
+              "tool.call_id": prepared.toolCall.toolCallId,
+              "tool.name": prepared.toolCall.toolName,
+              "tool.prepare_kind": prepared.kind
+            },
+            resultAttributes: (result) => ({
+              "tool.success": this.isToolExecutionSuccessful(result)
+            })
+          },
+          () => this.executePreparedModelToolCall(prepared),
+          this.logger
+        )
+      )
     );
     for (let index = 0; index < toolCalls.length; index += 1) {
       const toolCall = toolCalls[index];
@@ -970,7 +1201,19 @@ class TurnExecutor {
       if (toolCall === void 0 || executionResult === void 0) {
         throw new Error("Tool call result count must match emitted tool call count");
       }
-      await this.persistModelToolResult(toolCall, executionResult);
+      await recordOperationSpan(
+        {
+          name: "tool.persist_result",
+          componentName: "TurnExecutor",
+          attributes: {
+            "tool.call_id": toolCall.toolCallId,
+            "tool.name": toolCall.toolName,
+            "tool.success": this.isToolExecutionSuccessful(executionResult)
+          }
+        },
+        () => this.persistModelToolResult(toolCall, executionResult),
+        this.logger
+      );
     }
   }
   async prepareModelToolCall(toolCall) {
@@ -1499,84 +1742,12 @@ class TurnExecutor {
    * Map provider errors to DextoRuntimeError.
    */
   mapProviderError(err) {
-    if (APICallError.isInstance?.(err)) {
-      const status = err.statusCode;
-      const headers = err.responseHeaders || {};
-      const retryAfter = headers["retry-after"] ? Number(headers["retry-after"]) : void 0;
-      const body = typeof err.responseBody === "string" ? err.responseBody : JSON.stringify(err.responseBody ?? "");
-      if (status === 402) {
-        let balance;
-        try {
-          const parsed = JSON.parse(body);
-          const msg = parsed?.error?.message || "";
-          const match = msg.match(/Balance:\s*\$?([\d.]+)/i);
-          if (match) {
-            balance = parseFloat(match[1]);
-          }
-        } catch {
-        }
-        return new DextoRuntimeError(
-          LLMErrorCode.INSUFFICIENT_CREDITS,
-          ErrorScope.LLM,
-          ErrorType.PAYMENT_REQUIRED,
-          `Insufficient Dexto credits${balance !== void 0 ? `. Balance: $${balance.toFixed(2)}` : ""}`,
-          {
-            sessionId: this.sessionId,
-            provider: this.llmContext.provider,
-            model: this.llmContext.model,
-            status,
-            balance,
-            body
-          },
-          "Run `dexto billing` to check your balance"
-        );
-      }
-      if (status === 429) {
-        return new DextoRuntimeError(
-          LLMErrorCode.RATE_LIMIT_EXCEEDED,
-          ErrorScope.LLM,
-          ErrorType.RATE_LIMIT,
-          `Rate limit exceeded${body ? ` - ${body}` : ""}`,
-          {
-            sessionId: this.sessionId,
-            provider: this.llmContext.provider,
-            model: this.llmContext.model,
-            status,
-            retryAfter,
-            body
-          }
-        );
-      }
-      if (status === 408) {
-        return new DextoRuntimeError(
-          LLMErrorCode.GENERATION_FAILED,
-          ErrorScope.LLM,
-          ErrorType.TIMEOUT,
-          `Provider timed out${body ? ` - ${body}` : ""}`,
-          {
-            sessionId: this.sessionId,
-            provider: this.llmContext.provider,
-            model: this.llmContext.model,
-            status,
-            body
-          }
-        );
-      }
-      return new DextoRuntimeError(
-        LLMErrorCode.GENERATION_FAILED,
-        ErrorScope.LLM,
-        ErrorType.THIRD_PARTY,
-        `Provider error ${status}${body ? ` - ${body}` : ""}`,
-        {
-          sessionId: this.sessionId,
-          provider: this.llmContext.provider,
-          model: this.llmContext.model,
-          status,
-          body
-        }
-      );
-    }
-    return toError(err, this.logger);
+    return mapCoreProviderError({
+      error: err,
+      provider: this.llmContext.provider,
+      model: this.llmContext.model,
+      sessionId: this.sessionId
+    });
   }
 }
 export {

package/dist/llm/registry/sync.cjs

@@ -257,6 +257,19 @@ function buildModelsFromModelsDevProvider(params) {
   results.sort((a, b) => a.name.localeCompare(b.name));
   return results;
 }
+function hasProviderMetadata(model) {
+  return model.providerMetadata != null && Object.keys(model.providerMetadata).length > 0;
+}
+function dedupeModelsByNamePreferProviderMetadata(models) {
+  const byName = /* @__PURE__ */ new Map();
+  for (const model of models) {
+    const existing = byName.get(model.name);
+    if (!existing || !hasProviderMetadata(existing) && hasProviderMetadata(model)) {
+      byName.set(model.name, model);
+    }
+  }
+  return [...byName.values()].sort((a, b) => a.name.localeCompare(b.name));
+}
 function buildModelsByProviderFromParsedSources(params) {
   const { modelsDevApi } = params;
   const defaults = {
@@ -368,7 +381,7 @@ function buildModelsByProviderFromParsedSources(params) {
     }),
     litellm: [],
     glama: [],
-    vertex: [
+    vertex: dedupeModelsByNamePreferProviderMetadata([
       ...buildModelsFromModelsDevProvider({
         spec: {
           provider: "vertex",
@@ -386,7 +399,7 @@ function buildModelsByProviderFromParsedSources(params) {
         },
         modelsDevApi
       })
-    ].sort((a, b) => a.name.localeCompare(b.name)),
+    ]),
     bedrock: buildModelsFromModelsDevProvider({
       spec: {
         provider: "bedrock",

package/dist/llm/registry/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../src/llm/registry/sync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAqB,MAAM,YAAY,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAK5C,eAAO,MAAM,cAAc,gCAAgC,CAAC;AAE5D,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;AACtD,KAAK,iBAAiB,GAAG;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;CAC1C,CAAC;AACF,KAAK,cAAc,GAAG;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE;QACP,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChD,KAAK,EAAE;QACH,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,UAAU,CAAC,EACL;QACI,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC,CAAC;QAC3D,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC,CAAC;KAC/D,GACD,SAAS,CAAC;IAChB,IAAI,CAAC,EACC;QACI,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,iBAAiB,CAAC,EAAE;YAChB,KAAK,EAAE,MAAM,CAAC;YACd,MAAM,EAAE,MAAM,CAAC;SAClB,CAAC;QACF,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,SAAS,CAAC,EAAE,MAAM,CAAC;KACtB,GACD,SAAS,CAAC;CACnB,CAAC;AA2CF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,YAAY,CA6J7D;AAmKD,wBAAgB,sCAAsC,CAAC,MAAM,EAAE;IAC3D,YAAY,EAAE,YAAY,CAAC;CAC9B,GAAG,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAuJnC;AAED,wBAAsB,+BAA+B,CAAC,OAAO,CAAC,EAAE;IAC5D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAoB5C"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../src/llm/registry/sync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAqB,MAAM,YAAY,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAK5C,eAAO,MAAM,cAAc,gCAAgC,CAAC;AAE5D,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;AACtD,KAAK,iBAAiB,GAAG;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;CAC1C,CAAC;AACF,KAAK,cAAc,GAAG;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE;QACP,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChD,KAAK,EAAE;QACH,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,UAAU,CAAC,EACL;QACI,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC,CAAC;QAC3D,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC,CAAC;KAC/D,GACD,SAAS,CAAC;IAChB,IAAI,CAAC,EACC;QACI,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,iBAAiB,CAAC,EAAE;YAChB,KAAK,EAAE,MAAM,CAAC;YACd,MAAM,EAAE,MAAM,CAAC;SAClB,CAAC;QACF,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,SAAS,CAAC,EAAE,MAAM,CAAC;KACtB,GACD,SAAS,CAAC;CACnB,CAAC;AA2CF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,YAAY,CA6J7D;AAoLD,wBAAgB,sCAAsC,CAAC,MAAM,EAAE;IAC3D,YAAY,EAAE,YAAY,CAAC;CAC9B,GAAG,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAuJnC;AAED,wBAAsB,+BAA+B,CAAC,OAAO,CAAC,EAAE;IAC5D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAoB5C"}

package/dist/llm/registry/sync.js

@@ -232,6 +232,19 @@ function buildModelsFromModelsDevProvider(params) {
   results.sort((a, b) => a.name.localeCompare(b.name));
   return results;
 }
+function hasProviderMetadata(model) {
+  return model.providerMetadata != null && Object.keys(model.providerMetadata).length > 0;
+}
+function dedupeModelsByNamePreferProviderMetadata(models) {
+  const byName = /* @__PURE__ */ new Map();
+  for (const model of models) {
+    const existing = byName.get(model.name);
+    if (!existing || !hasProviderMetadata(existing) && hasProviderMetadata(model)) {
+      byName.set(model.name, model);
+    }
+  }
+  return [...byName.values()].sort((a, b) => a.name.localeCompare(b.name));
+}
 function buildModelsByProviderFromParsedSources(params) {
   const { modelsDevApi } = params;
   const defaults = {
@@ -343,7 +356,7 @@ function buildModelsByProviderFromParsedSources(params) {
     }),
     litellm: [],
     glama: [],
-    vertex: [
+    vertex: dedupeModelsByNamePreferProviderMetadata([
       ...buildModelsFromModelsDevProvider({
         spec: {
           provider: "vertex",
@@ -361,7 +374,7 @@ function buildModelsByProviderFromParsedSources(params) {
         },
         modelsDevApi
       })
-    ].sort((a, b) => a.name.localeCompare(b.name)),
+    ]),
     bedrock: buildModelsFromModelsDevProvider({
       spec: {
         provider: "bedrock",