ace-llm-providers-cli 0.34.1 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aee773ea6aac47cb8aeaa00ca6926a81f5d9eaac29f9b968ba098d81da0117d
-  data.tar.gz: ac05f84f681e6316ac4662750e923e06a03692ee88201456f56da5afae904079
+  metadata.gz: f25fb8b3c59151cc9e4e46f49cd9eae4d2d06b6fca7052422a60b1ab0129cc24
+  data.tar.gz: 4f37a1d94452b1f3fb06f37d47d3407c2c3e1c3e0e8cf40eb2d38756f1920b16
 SHA512:
-  metadata.gz: 707c07914d35d16e3e868b4891a0be562930edd9ce5d79a41eb0a99f6628bc90b3cc5eff2f9ad7adc122b3e674431e4825ae2a2602354e0386bd1c0cf737e0d7
-  data.tar.gz: d10514be9fbb31940a1cd96c7ba35807eddedaa047aacf8fd09d35085d82c4e742db8efdf6261889236839056493305ec6f781836f38180a69fc3c9af2332c18
+  metadata.gz: 2124492c17917caf053a5ad03014087c5c1fe75c3336cb9e44777d6858829ff6b1e02cf1552c05b1f2c9c4afed6b573f83b1df61c6bf06c444435b171731d35d
+  data.tar.gz: a77c73150b6f49caa994f793a6608c4be21d6c2bc46f30d0b475078568c6f0e7e35345cb974c2aa4ddeef0b17d0ad2cbdc2c372862ad4375aa401965d2f9aac3

data/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.35.0] - 2026-09-27
+
+### Changed
+
+- Pi client reports measured per-model token usage — input, output, cached (`cacheRead`) and total (`totalTokens`) — instead of character-based estimates. When the CLI supplies no usage, the session records an explicit `usage_status: unavailable` (with the pi version when known) and no fabricated token counts; measured zeros are preserved and absent fields stay absent.
+
 ## [0.34.1] - 2026-09-24
 
 ### Fixed

data/lib/ace/llm/providers/cli/pi_client.rb

@@ -297,21 +297,48 @@ module Ace
             }
           end
 
+          # Measured usage only. When the pi CLI supplies usage the token counts
+          # are recorded as-is (cached 0 means "no cache read", distinct from
+          # absent); when it does not, tokens are absent entirely and the
+          # session records an explicit "unavailable" state — never an estimate.
           def build_metadata(response, text, prompt, options)
             usage = response["usage"] || {}
 
-            prompt_tokens = usage["input_tokens"] || (prompt.to_s.length / 4).round
-            output_tokens = usage["output_tokens"] || (text.length / 4).round
-
-            {
+            metadata = {
               provider: "pi",
               model: @model || DEFAULT_MODEL,
-              input_tokens: prompt_tokens,
-              output_tokens: output_tokens,
-              total_tokens: prompt_tokens + output_tokens,
               finish_reason: response["finish_reason"] || "success",
               timestamp: Time.now.utc.iso8601
             }
+
+            if usage["input_tokens"] || usage["output_tokens"]
+              metadata[:input_tokens] = usage["input_tokens"] unless usage["input_tokens"].nil?
+              metadata[:output_tokens] = usage["output_tokens"] unless usage["output_tokens"].nil?
+              metadata[:cached_tokens] = usage["cached_tokens"] if usage.key?("cached_tokens")
+              metadata[:total_tokens] = usage["total_tokens"] ||
+                (usage["input_tokens"].to_i + usage["output_tokens"].to_i)
+              metadata[:usage_status] = "measured"
+            else
+              metadata[:usage_status] = "unavailable"
+              version = pi_version
+              metadata[:pi_version] = version if version
+            end
+
+            metadata
+          end
+
+          # Best-effort pi CLI version for the usage-unavailable record. Runs
+          # outside SafeCapture (a bare --version probe) and is memoized per
+          # instance so retries don't re-spawn the process.
+          def pi_version
+            return @pi_version if defined?(@pi_version)
+
+            @pi_version = begin
+              stdout, _stderr, status = Open3.capture3("pi", "--version")
+              status.success? ? stdout.strip : nil
+            rescue StandardError
+              nil
+            end
           end
 
           # Parse NDJSON output from Pi CLI when --mode json is used.
@@ -385,7 +412,10 @@ module Ace
           end
 
           # Normalize Pi usage field names to our standard format.
-          # Pi uses "input"/"output", we normalize to "input_tokens"/"output_tokens".
+          # Pi reports input/output/cacheRead/cacheWrite/totalTokens on the
+          # assistant message; we map them to *_tokens keys. A measured zero
+          # cacheRead is kept (distinguishing "no cache" from "unknown"); a
+          # missing key stays missing.
           #
           # @param usage [Hash] Raw usage hash from Pi response
           # @return [Hash] Normalized usage hash
@@ -393,7 +423,9 @@ module Ace
             return {} unless usage
             {
               "input_tokens" => usage["input"] || usage["input_tokens"],
-              "output_tokens" => usage["output"] || usage["output_tokens"]
+              "output_tokens" => usage["output"] || usage["output_tokens"],
+              "cached_tokens" => (usage["cacheRead"] if usage.key?("cacheRead")),
+              "total_tokens" => (usage["totalTokens"] if usage.key?("totalTokens"))
             }.compact
           end
 

data/lib/ace/llm/providers/cli/version.rb

@@ -4,7 +4,7 @@ module Ace
   module LLM
     module Providers
       module CLI
-        VERSION = "0.34.1"
+        VERSION = "0.35.0"
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ace-llm-providers-cli
 version: !ruby/object:Gem::Version
-  version: 0.34.1
+  version: 0.35.0
 platform: ruby
 authors:
 - Michal Czyz
 bindir: exe
 cert_chain: []
-date: 2026-09-24 00:00:00.000000000 Z
+date: 2026-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ace-llm
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '0.41'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '0.41'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement