nullabot 1.0.2__tar.gz → 1.0.3__tar.gz

{nullabot-1.0.2 → nullabot-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nullabot
-Version: 1.0.2
+Version: 1.0.3
 Summary: 24/7 AI agents that think, design, and code - controlled via Telegram
 Project-URL: Homepage, https://github.com/ebokoo/nullabot
 Project-URL: Repository, https://github.com/ebokoo/nullabot

{nullabot-1.0.2 → nullabot-1.0.3}/nullabot/agents/claude_agent.py

@@ -342,18 +342,35 @@ IMPORTANT:
             # Parse JSON response to extract tokens
             try:
                 data = json.loads(output)
-                result_text = data.get("result", output)
 
-                # Extract token usage from response
-                input_tokens = data.get("input_tokens", 0)
-                output_tokens = data.get("output_tokens", 0)
+                # Get result text - try multiple fields
+                result_text = data.get("result") or data.get("content") or ""
 
-                # Also check nested usage object
+                # If no result text but we have the raw output, use a summary
+                if not result_text and data.get("subtype") == "error_max_turns":
+                    result_text = "Reached max turns limit. Work saved."
+                elif not result_text:
+                    result_text = output  # Fallback to raw output
+
+                # Extract token usage from nested usage object
                 usage = data.get("usage", {})
-                if not input_tokens:
-                    input_tokens = usage.get("input_tokens", 0)
-                if not output_tokens:
-                    output_tokens = usage.get("output_tokens", 0)
+
+                # Input includes regular + cache tokens
+                input_tokens = (
+                    usage.get("input_tokens", 0) +
+                    usage.get("cache_read_input_tokens", 0) +
+                    usage.get("cache_creation_input_tokens", 0)
+                )
+                output_tokens = usage.get("output_tokens", 0)
+
+                # Also check modelUsage for more detailed breakdown
+                model_usage = data.get("modelUsage", {})
+                if model_usage and not input_tokens:
+                    for model, mu in model_usage.items():
+                        input_tokens += mu.get("inputTokens", 0)
+                        input_tokens += mu.get("cacheReadInputTokens", 0)
+                        input_tokens += mu.get("cacheCreationInputTokens", 0)
+                        output_tokens += mu.get("outputTokens", 0)
 
                 return result_text, True, input_tokens, output_tokens
             except json.JSONDecodeError:

{nullabot-1.0.2 → nullabot-1.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nullabot"
-version = "1.0.2"
+version = "1.0.3"
 description = "24/7 AI agents that think, design, and code - controlled via Telegram"
 readme = "README.md"
 license = "MIT"