graphlit-client 1.0.20250613007 → 1.0.20250613009

package/dist/client.js

@@ -1499,13 +1499,17 @@ class Graphlit {
             // 3. Tool calling loop
             const allToolCalls = [];
             let rounds = 0;
-            let totalTokens = 0;
+            let totalTokens = currentMessage?.tokens || 0;
+            const toolStartTime = Date.now();
+            let toolTime = 0;
             while (currentMessage.toolCalls?.length &&
                 rounds < maxRounds &&
                 !abortController.signal.aborted) {
                 rounds++;
                 // Execute tools
+                const toolExecStart = Date.now();
                 const toolResults = await this.executeToolsForPromptAgent(currentMessage.toolCalls.filter((tc) => tc !== null), toolHandlers || {}, allToolCalls, abortController.signal);
+                toolTime += Date.now() - toolExecStart;
                 if (abortController.signal.aborted) {
                     throw new Error("Operation timed out");
                 }
@@ -1519,9 +1523,31 @@ class Graphlit {
                     totalTokens += continueResponse.continueConversation.message.tokens;
                 }
             }
+            // Calculate metrics
+            const totalTime = Date.now() - startTime;
+            const llmTime = totalTime - toolTime;
+            const metrics = {
+                totalTime,
+                llmTime,
+                toolTime,
+                toolExecutions: allToolCalls.length,
+                rounds,
+            };
+            // Build usage info if we have token data
+            const usage = totalTokens > 0 ? {
+                promptTokens: 0, // We don't have this breakdown from the API
+                completionTokens: totalTokens,
+                totalTokens: totalTokens,
+                model: currentMessage?.model || undefined,
+            } : undefined;
             return {
                 message: currentMessage?.message || "",
                 conversationId: actualConversationId,
+                conversationMessage: currentMessage ? currentMessage : undefined,
+                toolCalls: currentMessage?.toolCalls?.filter((tc) => tc !== null),
+                toolResults: allToolCalls,
+                metrics,
+                usage,
             };
         }
         catch (error) {
@@ -1536,6 +1562,14 @@ class Graphlit {
                     recoverable: isTimeout || error.code === "RATE_LIMIT",
                     details: error.response?.data,
                 },
+                // Include partial metrics if available
+                metrics: {
+                    totalTime: Date.now() - startTime,
+                    llmTime: 0,
+                    toolTime: 0,
+                    toolExecutions: 0,
+                    rounds: 0,
+                },
             };
         }
         finally {

package/dist/streaming/providers.js

@@ -11,6 +11,27 @@ function isValidJSON(str) {
         return false;
     }
 }
+/**
+ * Clean schema for Google Gemini by removing unsupported fields
+ */
+function cleanSchemaForGoogle(schema) {
+    if (typeof schema !== "object" || schema === null) {
+        return schema;
+    }
+    if (Array.isArray(schema)) {
+        return schema.map((item) => cleanSchemaForGoogle(item));
+    }
+    const cleaned = {};
+    for (const [key, value] of Object.entries(schema)) {
+        // Skip fields that Google doesn't support
+        if (key === "$schema" || key === "additionalProperties") {
+            continue;
+        }
+        // Recursively clean nested objects
+        cleaned[key] = cleanSchemaForGoogle(value);
+    }
+    return cleaned;
+}
 /**
  * Stream with OpenAI SDK
  */
@@ -665,11 +686,21 @@ onEvent, onComplete) {
         const googleTools = tools && tools.length > 0
             ? [
                 {
-                    functionDeclarations: tools.map((tool) => ({
-                        name: tool.name,
-                        description: tool.description,
-                        parameters: tool.schema ? JSON.parse(tool.schema) : {},
-                    })),
+                    functionDeclarations: tools.map((tool) => {
+                        const rawSchema = tool.schema ? JSON.parse(tool.schema) : {};
+                        const cleanedSchema = cleanSchemaForGoogle(rawSchema);
+                        if (process.env.DEBUG_GRAPHLIT_SDK_STREAMING) {
+                            const hadCleanup = JSON.stringify(rawSchema) !== JSON.stringify(cleanedSchema);
+                            if (hadCleanup) {
+                                console.log(`[Google] Cleaned schema for tool ${tool.name} - removed unsupported fields`);
+                            }
+                        }
+                        return {
+                            name: tool.name,
+                            description: tool.description,
+                            parameters: cleanedSchema,
+                        };
+                    }),
                 },
             ]
             : undefined;

package/dist/types/agent.d.ts

@@ -1,11 +1,26 @@
+import { ConversationMessage, ConversationToolCall } from "../generated/graphql-types.js";
 export type ToolHandler = (args: any) => Promise<any>;
 export interface AgentOptions {
     maxToolRounds?: number;
     timeout?: number;
 }
+export interface AgentMetrics {
+    totalTime: number;
+    llmTime?: number;
+    toolTime?: number;
+    ttft?: number;
+    tokensPerSecond?: number;
+    toolExecutions?: number;
+    rounds?: number;
+}
 export interface AgentResult {
     message: string;
     conversationId: string;
+    conversationMessage?: ConversationMessage;
+    toolCalls?: ConversationToolCall[];
+    toolResults?: ToolCallResult[];
+    metrics?: AgentMetrics;
+    usage?: UsageInfo;
     error?: AgentError;
 }
 export interface StreamAgentOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphlit-client",
-  "version": "1.0.20250613007",
+  "version": "1.0.20250613009",
   "description": "Graphlit API Client for TypeScript",
   "type": "module",
   "main": "./dist/client.js",