@dexto/core 1.8.4 → 1.8.5

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

@@ -382,7 +382,7 @@ class TurnExecutor {
             {
               name: "turn.prepare_model_step",
               componentName: "TurnExecutor",
-              attributes: { "turn.step_count": stepCount }
+              attributes: this.createTurnStepSpanAttributes(stepCount)
             },
             () => this.prepareNextModelRequest({
               contributorContext,
@@ -420,7 +420,7 @@ class TurnExecutor {
               {
                 name: "turn.prepare_model_step",
                 componentName: "TurnExecutor",
-                attributes: { "turn.step_count": stepCount }
+                attributes: this.createTurnStepSpanAttributes(stepCount)
               },
               () => this.prepareNextModelRequest({
                 contributorContext,
@@ -435,7 +435,20 @@ class TurnExecutor {
             throw new Error("Model step request was not prepared");
           }
           this.logger.debug(`Step ${stepCount}: Starting`);
-          const result = await this.runModelStepWithRetry(modelStepRequest);
+          const result = await (0, import_operation_span.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;
@@ -474,7 +487,18 @@ class TurnExecutor {
           toolCallsRunning = true;
           currentToolCallsExecuted = true;
           try {
-            await this.executeModelToolCalls(result.toolCalls);
+            await (0, import_operation_span.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;
@@ -495,7 +519,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 (0, import_operation_span.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;
@@ -599,6 +639,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);
@@ -1026,29 +1073,46 @@ class TurnExecutor {
       request.streaming,
       false
     );
-    return streamProcessor.process(
-      () => (0, import_ai.streamText)({
-        model: this.model,
-        stopWhen: (0, import_ai.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 (0, import_operation_span.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(
+        () => (0, import_ai.streamText)({
+          model: this.model,
+          stopWhen: (0, import_ai.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) {
@@ -1121,10 +1185,41 @@ class TurnExecutor {
   async executeModelToolCalls(toolCalls) {
     const preparedCalls = [];
     for (const toolCall of toolCalls) {
-      preparedCalls.push(await this.prepareModelToolCall(toolCall));
+      preparedCalls.push(
+        await (0, import_operation_span.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) => (0, import_operation_span.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];
@@ -1132,7 +1227,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 (0, import_operation_span.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) {

package/dist/llm/executor/turn-executor.d.ts

@@ -298,6 +298,7 @@ export declare class TurnExecutor {
     private validateInitialToolSupport;
     private startTurn;
     private startModelStepScope;
+    private createTurnStepSpanAttributes;
     private finishTurn;
     private failTurn;
     private advanceStep;

package/dist/llm/executor/turn-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turn-executor.d.ts","sourceRoot":"","sources":["../../../src/llm/executor/turn-executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"turn-executor.d.ts","sourceRoot":"","sources":["../../../src/llm/executor/turn-executor.ts"],"names":[],"mappings":"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"}

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

@@ -356,7 +356,7 @@ class TurnExecutor {
             {
               name: "turn.prepare_model_step",
               componentName: "TurnExecutor",
-              attributes: { "turn.step_count": stepCount }
+              attributes: this.createTurnStepSpanAttributes(stepCount)
             },
             () => this.prepareNextModelRequest({
               contributorContext,
@@ -394,7 +394,7 @@ class TurnExecutor {
               {
                 name: "turn.prepare_model_step",
                 componentName: "TurnExecutor",
-                attributes: { "turn.step_count": stepCount }
+                attributes: this.createTurnStepSpanAttributes(stepCount)
               },
               () => this.prepareNextModelRequest({
                 contributorContext,
@@ -409,7 +409,20 @@ class TurnExecutor {
             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;
@@ -448,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;
@@ -469,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;
@@ -573,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);
@@ -1000,29 +1047,46 @@ class TurnExecutor {
       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) {
@@ -1095,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];
@@ -1106,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) {

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",

package/dist/llm/services/vercel.cjs

@@ -77,6 +77,7 @@ var import_turn_executor = require("../executor/turn-executor.js");
 var import_DextoRuntimeError = require("../../errors/DextoRuntimeError.js");
 var import_types4 = require("../../errors/types.js");
 var import_error_codes = require("../error-codes.js");
+var import_operation_span = require("../../telemetry/operation-span.js");
 var _VercelLLMService_decorators, _init;
 function ensureRunContextMatchesServiceSession(serviceSessionId, runContext) {
   if (runContext !== void 0 && runContext.sessionId !== serviceSessionId) {
@@ -157,11 +158,37 @@ class VercelLLMService {
   async createTurnDriver(options = {}) {
     const sessionId = ensureRunContextMatchesServiceSession(this.sessionId, options.runContext);
     const executor = this.createTurnExecutor(options.signal, options.runContext);
-    const contributorContext = await this.toolManager.buildContributorContext({ sessionId });
-    return executor.createDriver(contributorContext, {
-      streaming: options.streaming ?? true,
-      ...options.state !== void 0 ? { state: options.state } : {}
-    });
+    const contributorContext = await (0, import_operation_span.recordOperationSpan)(
+      {
+        name: "llm.vercel.build_contributor_context",
+        attributes: {
+          "session.id": sessionId
+        },
+        resultAttributes: (context2) => ({
+          "tool.has_workspace_context": context2.workspace !== null,
+          "tool.has_environment_context": context2.environment !== void 0,
+          "tool.session_prompt_contributors": context2.session?.systemPromptContributors?.length ?? 0
+        })
+      },
+      () => this.toolManager.buildContributorContext({ sessionId }),
+      this.logger
+    );
+    const streaming = options.streaming ?? true;
+    return (0, import_operation_span.recordOperationSpan)(
+      {
+        name: "llm.vercel.create_turn_executor_driver",
+        attributes: {
+          "session.id": sessionId,
+          "turn.streaming": streaming,
+          "turn.resume": options.state !== void 0
+        }
+      },
+      () => executor.createDriver(contributorContext, {
+        streaming,
+        ...options.state !== void 0 ? { state: options.state } : {}
+      }),
+      this.logger
+    );
   }
   /**
    * Create a TurnExecutor instance for executing the agent loop.

package/dist/llm/services/vercel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vercel.d.ts","sourceRoot":"","sources":["../../../src/llm/services/vercel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vercel.d.ts","sourceRoot":"","sources":["../../../src/llm/services/vercel.ts"],"names":[],"mappings":"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"}