llmist 4.0.0 → 5.1.0

package/dist/index.cjs

@@ -5018,15 +5018,16 @@ var init_agent = __esm({
             });
           } else if (event.type === "llm_call_end") {
             const info = event.event;
+            const usage = info.usage ?? (info.outputTokens ? {
+              inputTokens: info.inputTokens ?? 0,
+              outputTokens: info.outputTokens,
+              totalTokens: (info.inputTokens ?? 0) + info.outputTokens
+            } : void 0);
             void this.hooks?.observers?.onLLMCallComplete?.({
               iteration: info.iteration,
               options: { model: info.model, messages: [] },
               finishReason: info.finishReason ?? null,
-              usage: info.outputTokens ? {
-                inputTokens: info.inputTokens ?? 0,
-                outputTokens: info.outputTokens,
-                totalTokens: (info.inputTokens ?? 0) + info.outputTokens
-              } : void 0,
+              usage,
               rawResponse: "",
               finalMessage: "",
               logger: this.logger,
@@ -7069,6 +7070,9 @@ var init_gemini = __esm({
       async countTokens(messages, descriptor, _spec) {
         const client = this.client;
         const contents = this.convertMessagesToContents(messages);
+        if (!contents || contents.length === 0) {
+          return 0;
+        }
         try {
           const response = await client.models.countTokens({
             model: descriptor.name,
@@ -9541,13 +9545,24 @@ ${endPrefix}`
             observers: {
               ...hooks?.observers,
               onLLMCallStart: async (context) => {
+                let inputTokens;
+                try {
+                  if (this.client) {
+                    inputTokens = await this.client.countTokens(
+                      context.options.model,
+                      context.options.messages
+                    );
+                  }
+                } catch {
+                }
                 onSubagentEvent({
                   type: "llm_call_start",
                   gadgetInvocationId: invocationId,
                   depth,
                   event: {
                     iteration: context.iteration,
-                    model: context.options.model
+                    model: context.options.model,
+                    inputTokens
                   }
                 });
                 if (existingOnLLMCallStart) {
@@ -9562,8 +9577,13 @@ ${endPrefix}`
                   event: {
                     iteration: context.iteration,
                     model: context.options.model,
+                    // Backward compat fields
+                    inputTokens: context.usage?.inputTokens,
                     outputTokens: context.usage?.outputTokens,
-                    finishReason: context.finishReason
+                    finishReason: context.finishReason ?? void 0,
+                    // Full usage object with cache details (for first-class display)
+                    usage: context.usage
+                    // Cost will be calculated by parent if it has model registry
                   }
                 });
                 if (existingOnLLMCallComplete) {