@~lyre/ai-agents 0.3.0 → 0.5.0

package/dist/index.js

@@ -46,7 +46,7 @@ var Registry = class {
 };
 
 // src/run.ts
-import { generateObject, generateText, streamText, tool } from "ai";
+import { generateText, streamText, tool, Output } from "ai";
 
 // src/providers.ts
 import { createAnthropic } from "@ai-sdk/anthropic";
@@ -60,6 +60,12 @@ var PROVIDERS = {
   // Grok
   google: (apiKey, id) => createGoogleGenerativeAI({ apiKey })(id)
 };
+var PROVIDER_ENV = {
+  anthropic: "ANTHROPIC_API_KEY",
+  openai: "OPENAI_API_KEY",
+  xai: "XAI_API_KEY",
+  google: "GOOGLE_GENERATIVE_AI_API_KEY"
+};
 var SUPPORTED_PROVIDERS = Object.keys(PROVIDERS);
 function resolveModelString(model, apiKey) {
   const slash = model.indexOf("/");
@@ -67,7 +73,10 @@ function resolveModelString(model, apiKey) {
   const provider = model.slice(0, slash);
   const modelId = model.slice(slash + 1);
   const factory = PROVIDERS[provider];
-  if (factory && apiKey && modelId) return factory(apiKey, modelId);
+  if (!factory || !modelId) return model;
+  const envKey = typeof process !== "undefined" ? process.env?.[PROVIDER_ENV[provider]] : void 0;
+  const key = envKey || apiKey;
+  if (key) return factory(key, modelId);
   return model;
 }
 
@@ -149,11 +158,21 @@ async function* runStream(registry, params, defaults) {
     stopWhen: ({ steps }) => steps.length >= (params.maxSteps ?? 8),
     providerOptions: agent.providerOptions
   });
+  const accumulatedUsage = { inputTokens: 0, outputTokens: 0, totalTokens: 0 };
+  const addUsage = (u) => {
+    if (!u) return;
+    accumulatedUsage.inputTokens += u.inputTokens ?? 0;
+    accumulatedUsage.outputTokens += u.outputTokens ?? 0;
+    accumulatedUsage.totalTokens += u.totalTokens ?? 0;
+  };
   for await (const part of result.fullStream) {
     switch (part.type) {
       case "text-delta":
         yield { type: "text-delta", text: part.text ?? part.delta ?? "" };
         break;
+      case "finish-step":
+        addUsage(part.usage);
+        break;
       case "tool-call":
         yield {
           type: "tool-call",
@@ -178,17 +197,19 @@ async function* runStream(registry, params, defaults) {
           error: part.error
         };
         break;
-      case "finish":
+      case "finish": {
+        const finalUsage = part.totalUsage ?? part.usage;
         yield {
           type: "finish",
           finishReason: part.finishReason,
           usage: {
-            inputTokens: part.usage?.inputTokens ?? 0,
-            outputTokens: part.usage?.outputTokens ?? 0,
-            totalTokens: part.usage?.totalTokens ?? 0
+            inputTokens: finalUsage?.inputTokens ?? accumulatedUsage.inputTokens,
+            outputTokens: finalUsage?.outputTokens ?? accumulatedUsage.outputTokens,
+            totalTokens: finalUsage?.totalTokens ?? accumulatedUsage.totalTokens
           }
         };
         break;
+      }
       case "error":
         yield { type: "error", error: part.error };
         break;
@@ -198,18 +219,20 @@ async function* runStream(registry, params, defaults) {
 async function runObject(registry, params, defaults) {
   const agent = registry.resolveAgent(params.agent);
   const messages = buildMessages(agent, params);
-  const result = await generateObject({
+  const result = await generateText({
     model: resolveModel(agent, defaults),
     messages,
-    schema: params.inputSchema,
-    schemaName: params.schemaName,
-    schemaDescription: params.schemaDescription,
+    output: Output.object({
+      schema: params.inputSchema,
+      name: params.schemaName,
+      description: params.schemaDescription
+    }),
     temperature: params.temperature ?? agent.temperature,
     maxOutputTokens: params.maxOutputTokens ?? agent.maxOutputTokens,
     providerOptions: agent.providerOptions
   });
   return {
-    object: result.object,
+    object: result.output,
     finishReason: result.finishReason ?? "stop",
     usage: {
       inputTokens: result.usage?.inputTokens ?? 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@~lyre/ai-agents",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "Multi-provider AI agents SDK for SvelteKit + Node. Thin agent/tool/run/runStream surface over the Vercel AI SDK — OpenAI, Anthropic, Google Gemini, Mistral, Cohere. Zod-typed tools, full streaming event surface, optional HTML sanitizer.",
   "type": "module",
   "sideEffects": false,