@agentfield/sdk 0.1.142-rc.7 → 0.1.142-rc.9

package/dist/index.d.ts

@@ -354,6 +354,7 @@ declare class AIClient {
     resolveModelChoice(options?: AIRequestOptions): {
         provider: NonNullable<AIConfig['provider']>;
         modelName: string;
+        routingProvider: string;
     };
     private buildModel;
     private buildPrompt;
@@ -609,6 +610,8 @@ declare const USAGE_ENVELOPE_KEY = "__agentfield_usage__";
 /** A single LLM (or harness) call usage record. */
 interface CostEntry {
     model: string;
+    usageStatus?: 'missing';
+    routingProvider?: string;
     inputTokens: number;
     outputTokens: number;
     totalTokens: number;
@@ -632,6 +635,8 @@ interface CostEntry {
 /** Input accepted by {@link CostTracker.record}. */
 interface CostEntryInit {
     model: string;
+    usageStatus?: 'missing';
+    routingProvider?: string;
     inputTokens?: number;
     outputTokens?: number;
     totalTokens?: number;
@@ -646,6 +651,8 @@ interface CostEntryInit {
 }
 /** Wire form of a single usage entry (snake_case cross-language contract). */
 interface UsageEntryWire {
+    usage_status?: 'missing';
+    routing_provider?: string;
     source: string;
     provider: string | null;
     model: string;
@@ -1211,6 +1218,7 @@ declare function buildToolConfig(toolsParam: ToolsOption, agent: Agent): Promise
 declare function executeToolCallLoop(agent: Agent, prompt: string, toolMap: ToolSet, config: ToolCallConfig, needsLazyHydration: boolean, buildModel: () => any, options?: AIRequestOptions, modelChoice?: {
     provider?: string;
     modelName?: string;
+    routingProvider?: string;
 }): Promise<{
     text: string;
     trace: ToolCallTrace;
@@ -1959,7 +1967,7 @@ declare const PROVIDER_SPECS: {
     };
 };
 type HarnessProviderName = keyof typeof PROVIDER_SPECS;
-declare const SUPPORTED_PROVIDER_NAMES: readonly ("aforge" | "claude-code" | "codex" | "gemini" | "opencode" | "pi" | "omp")[];
+declare const SUPPORTED_PROVIDER_NAMES: readonly ("gemini" | "aforge" | "claude-code" | "codex" | "opencode" | "pi" | "omp")[];
 interface ProviderHealth {
     provider: HarnessProviderName;
     binary: string | null;

package/dist/index.js

@@ -218,8 +218,9 @@ function batchProbeInvocation(command) {
   });
   return {
     file: process.env.ComSpec ?? "cmd.exe",
-    // /s strips only the outermost quote pair, leaving each "%VAR%" quoted.
-    // /v:off keeps ! in a path literal even if delayed expansion is enabled.
+    // /s removes the outer quote pair of the fixed template, so each "%VAR%"
+    // expansion stays quoted.
+    // /v:off disables delayed ! expansion; /d disables AutoRun.
     args: ["/d", "/v:off", "/s", "/c", `"${tokens.join(" ")}"`],
     env
   };
@@ -227,20 +228,40 @@ function batchProbeInvocation(command) {
 async function defaultVersionProbe(command) {
   const { execFile } = await import('child_process');
   return new Promise((resolve3, reject) => {
-    const batch = isWindowsBatchFile(command[0]);
-    const { file, args, env } = batch ? batchProbeInvocation(command) : { file: command[0], args: command.slice(1), env: process.env };
-    execFile(
-      file,
-      args,
-      { timeout: 2e3, windowsHide: true, windowsVerbatimArguments: batch, env },
-      (error, stdout, stderr) => {
-        if (error) {
-          reject(error);
-          return;
+    const onProbeOutput = (error, stdout, stderr) => {
+      if (error) {
+        reject(error);
+        return;
+      }
+      const output = String(stdout || stderr).trim();
+      resolve3(output ? output.split(/\r?\n/, 1)[0] : "unknown");
+    };
+    if (isWindowsBatchFile(command[0])) {
+      for (const value of command) {
+        for (let index = 0; index < value.length; index += 1) {
+          const codePoint = value.charCodeAt(index);
+          if (codePoint === 34 || codePoint < 32) {
+            reject(new TypeError(
+              `Windows batch probe values must not contain double quotes or control characters; offending code point ${codePoint} in ${JSON.stringify(value)}`
+            ));
+            return;
+          }
         }
-        const output = String(stdout || stderr).trim();
-        resolve3(output ? output.split(/\r?\n/, 1)[0] : "unknown");
       }
+      const { file, args, env } = batchProbeInvocation(command);
+      execFile(
+        file,
+        args,
+        { timeout: 2e3, windowsHide: true, windowsVerbatimArguments: true, env },
+        onProbeOutput
+      );
+      return;
+    }
+    execFile(
+      command[0],
+      command.slice(1),
+      { timeout: 2e3, windowsHide: true, windowsVerbatimArguments: false },
+      onProbeOutput
     );
   });
 }
@@ -2729,6 +2750,8 @@ var CostTracker = class {
   record(init) {
     this.entries.push({
       model: init.model,
+      usageStatus: init.usageStatus,
+      routingProvider: init.routingProvider,
       inputTokens: toCount(init.inputTokens),
       outputTokens: toCount(init.outputTokens),
       totalTokens: toCount(init.totalTokens),
@@ -2788,6 +2811,8 @@ var CostTracker = class {
         cost_usd: e.costUsd,
         cost_source: e.costSource
       });
+      if (e.routingProvider) entries[entries.length - 1].routing_provider = e.routingProvider;
+      if (e.usageStatus) entries[entries.length - 1].usage_status = e.usageStatus;
       totalInput += e.inputTokens;
       totalOutput += e.outputTokens;
       totalTokens += entryTotal;
@@ -2916,7 +2941,19 @@ function recordAiSdkUsage(params) {
     const tokens = extractTokenUsage(params.source.totalUsage ?? params.source.usage);
     const cost = extractProviderCostUsd(params.source);
     const hasTokens = tokens.inputTokens > 0 || tokens.outputTokens > 0 || tokens.totalTokens > 0 || tokens.cacheReadTokens > 0 || tokens.cacheCreationTokens > 0;
-    if (!hasTokens && cost === null) return;
+    const receipt = params.source.totalUsage ?? params.source.usage;
+    const hasTokenReceipt = isRecord(receipt) && ["inputTokens", "outputTokens", "totalTokens"].some(
+      (key) => typeof receipt[key] === "number" && Number.isFinite(receipt[key])
+    );
+    if (!hasTokens && cost === null && !hasTokenReceipt) {
+      tracker.record({
+        model: params.model,
+        provider: params.provider ?? "unknown",
+        routingProvider: params.routingProvider ?? params.provider ?? "unknown",
+        usageStatus: "missing"
+      });
+      return;
+    }
     tracker.record({
       model: params.model,
       ...tokens,
@@ -2924,6 +2961,7 @@ function recordAiSdkUsage(params) {
       costSource: cost !== null ? "provider" : null,
       reasonerName: params.reasonerName !== void 0 ? params.reasonerName : current?.metadata.reasonerId ?? null,
       source: "llm",
+      routingProvider: params.routingProvider ?? params.provider ?? void 0,
       provider: params.provider ?? void 0
     });
   } catch {
@@ -3154,7 +3192,7 @@ async function executeToolCallLoop(agent, prompt, toolMap, config, needsLazyHydr
   const usageModel = modelChoice?.modelName ?? options.model;
   const recordLoopUsage = (result2) => {
     if (usageModel) {
-      recordAiSdkUsage({ source: result2, model: usageModel, provider: modelChoice?.provider });
+      recordAiSdkUsage({ source: result2, model: usageModel, provider: modelChoice?.provider, routingProvider: modelChoice?.routingProvider });
     }
   };
   const trace = {
@@ -3679,6 +3717,26 @@ function withOpenRouterUsageInclude(baseFetch) {
     return impl(input, init);
   };
 }
+
+// src/usage/routingProvider.ts
+function routingProvider(provider, endpoint) {
+  if (endpoint !== void 0 && endpoint !== null) {
+    try {
+      const url = new URL(endpoint);
+      if (!["https:", "http:"].includes(url.protocol)) return "unknown";
+      const host = url.hostname.toLowerCase();
+      if (host === "openrouter.ai") return "openrouter";
+      if (host === "api.openai.com") return "openai";
+      if (host === "api.anthropic.com") return "anthropic";
+      if (host === "generativelanguage.googleapis.com") return "google";
+      return "other";
+    } catch {
+      return "unknown";
+    }
+  }
+  const normalized = provider === "gemini" ? "google" : provider?.toLowerCase();
+  return ["openrouter", "openai", "anthropic", "google", "bedrock", "azure", "ollama"].includes(normalized ?? "") ? normalized : "unknown";
+}
 var IMAGE_MIME_TYPES = {
   ".jpg": "image/jpeg",
   ".jpeg": "image/jpeg",
@@ -4003,7 +4061,7 @@ var AIClient = class {
     };
   }
   async generate(prompt, options = {}) {
-    const { provider, modelName } = this.resolveModelChoice(options);
+    const { provider, modelName, routingProvider: routingProvider2 } = this.resolveModelChoice(options);
     const model = this.buildModel(options);
     const requestPrompt = this.buildPrompt(prompt, options.content);
     if (options.schema) {
@@ -4019,7 +4077,7 @@ var AIClient = class {
         experimental_repairText: async ({ text: text2 }) => repairJsonText(text2)
       });
       const response2 = await this.withRateLimitRetry(call2);
-      recordAiSdkUsage({ source: response2, model: modelName, provider });
+      recordAiSdkUsage({ source: response2, model: modelName, provider, routingProvider: routingProvider2 });
       return response2.object;
     }
     const call = async () => generateText({
@@ -4030,23 +4088,38 @@ var AIClient = class {
       maxOutputTokens: options.maxTokens ?? this.config.maxTokens
     });
     const response = await this.withRateLimitRetry(call);
-    recordAiSdkUsage({ source: response, model: modelName, provider });
+    recordAiSdkUsage({ source: response, model: modelName, provider, routingProvider: routingProvider2 });
     return response.text;
   }
-  // NOTE: stream() usage is deliberately NOT captured. The AI SDK's
-  // streamResult.usage/.totalUsage promises "automatically consume the
-  // stream": attaching to them would force full background consumption of a
-  // stream the caller may abandon early, changing stream semantics.
+  // Observe usage only after the caller consumes the stream. Merely creating
+  // the stream must not start background consumption of an abandoned response.
   async stream(prompt, options = {}) {
-    const model = this.buildModel(options);
+    const { provider, modelName, routingProvider: routingProvider2 } = this.resolveModelChoice(options);
+    const tracker = ExecutionContext.getCurrent()?.costTracker;
     const streamResult = streamText({
-      model,
+      model: this.buildModel(options),
       prompt: this.buildPrompt(prompt, options.content),
       system: options.system,
       temperature: options.temperature ?? this.config.temperature,
       maxOutputTokens: options.maxTokens ?? this.config.maxTokens
     });
-    return streamResult.textStream;
+    if (!tracker) return streamResult.textStream;
+    return (async function* () {
+      let completed = false;
+      try {
+        for await (const text2 of streamResult.textStream) yield text2;
+        try {
+          const usage = await streamResult.totalUsage;
+          if (usage) recordAiSdkUsage({ source: { totalUsage: usage }, model: modelName, provider, routingProvider: routingProvider2, tracker });
+          else tracker.record({ model: modelName, provider, routingProvider: routingProvider2, usageStatus: "missing" });
+        } catch {
+          tracker.record({ model: modelName, provider, routingProvider: routingProvider2, usageStatus: "missing" });
+        }
+        completed = true;
+      } finally {
+        if (!completed) tracker.record({ model: modelName, provider, routingProvider: routingProvider2, usageStatus: "missing" });
+      }
+    })();
   }
   async embed(value, options = {}) {
     const model = this.buildEmbeddingModel(options);
@@ -4083,7 +4156,8 @@ var AIClient = class {
   resolveModelChoice(options = {}) {
     return {
       provider: options.provider ?? this.config.provider ?? "openai",
-      modelName: options.model ?? this.config.model ?? "gpt-4o"
+      modelName: options.model ?? this.config.model ?? "gpt-4o",
+      routingProvider: routingProvider(options.provider ?? this.config.provider ?? "openai", this.config.baseUrl)
     };
   }
   buildModel(options) {