lux-hammer 0.3.28 → 0.3.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48fd3473ba922f93fa0ebcc897d0bf6a88ec78283ed4436281d938a1297e53ac
-  data.tar.gz: 30eef033e89155cd82b362563e5f4dea0716551f56d686ae5c1fde16fc23170c
+  metadata.gz: 6dab0deb8eba80ec1aac72b16620370af2d80d2528641e9117be71df84e8d416
+  data.tar.gz: 6460bbda170ba18cedf234846e4898f1c6efc48732c81ed122fc6eaa11d237b8
 SHA512:
-  metadata.gz: 7e3961d9aa6c6d89081ec6e1ee111346fab1944c8152644c7e22b300815bea3152606459c6d90e88592c8933021cc7c8ba75b262f8c5aebc4105b05816c0b9cb
-  data.tar.gz: 50fd5ecc020ecb0d31ad7f79d7d7dc5ae313e6646c30cdc0758b07bfbad1bfe145f50301215853b168cd3d79ccd5d66f0372551f405984ac87b0d026f13d047f
+  metadata.gz: c24c74422db1ac9a72b5a03ae4f7d4e56e486c7622be40f5e136c16b9a15b2a04feeb7d2f61cdfdaaeafbc5c3913e71c2f8faf567cac8ea236eaeeadcb7fcb4f
+  data.tar.gz: 823288d67fd112a118c09b3b1dd3599a3b080c5c74fd6e5a35492be182a72fa3fbe82359498e1facb0396b61773b1a51e61dba786284d2bde19426a8e3eddc81

data/.version

@@ -1 +1 @@
-0.3.28
+0.3.29

data/recipes/lib/llm/usage.rb

@@ -64,7 +64,7 @@ module LlmUsage
       # and caching would freeze the staleness note. Only the API call caches.
       data, note = fetch_claude_usage(period: label, cache: cache, now: now)
       notes << note unless note.nil? || note.empty?
-      rows.concat(parse_claude(data, now: now)) if data
+      rows.concat(parse_claude(data, now: now, period: label)) if data
     end
 
     if wanted.include?(:codex)
@@ -294,7 +294,7 @@ module LlmUsage
     "#{mins}m"
   end
 
-  def parse_claude(data, now: Time.now)
+  def parse_claude(data, now: Time.now, period: nil)
     return [] unless data.is_a?(Hash)
 
     five = data['five_hour']
@@ -329,13 +329,13 @@ module LlmUsage
           month_reset: '-'
         )
       end
-      return rows
+      return rows + claude_scoped_rows(data['limits'], rows, now: now, period: period)
     end
 
     week = data['seven_day']
     return [] unless five.is_a?(Hash) || week.is_a?(Hash)
 
-    [
+    rows = [
       UsageRow.new(
         name: 'Claude',
         session_pct: format_pct(session_pct),
@@ -346,6 +346,36 @@ module LlmUsage
         month_reset: month[:reset]
       )
     ]
+    rows + claude_scoped_rows(data['limits'], rows, now: now, period: period)
+  end
+
+  # Per-model weekly buckets live in `limits` as kind weekly_scoped - Fable has
+  # one, and seven_day_opus/_sonnet read null on the accounts that do. Named off
+  # the API's own display_name, so a model added later needs nothing here; a
+  # scope already carrying its own seven_day_* row is skipped rather than
+  # doubled. A weekly bucket has nothing to say in the month view, where these
+  # would be a row of dashes.
+  def claude_scoped_rows(limits, rows, now: Time.now, period: nil)
+    return [] if period_label(period) == 'month'
+
+    taken = rows.map(&:name)
+
+    Array(limits).filter_map do |limit|
+      next unless limit.is_a?(Hash) && limit['kind'] == 'weekly_scoped'
+
+      name = limit.dig('scope', 'model', 'display_name')
+      next if name.nil? || name.empty? || taken.include?(name)
+
+      UsageRow.new(
+        name: name,
+        session_pct: '-',
+        session_reset: '-',
+        week_pct: format_pct(limit['percent']),
+        week_reset: format_reset_short(limit['resets_at'], now: now),
+        month_pct: '-',
+        month_reset: '-'
+      )
+    end
   end
 
   def parse_codex(data, now: Time.now)
@@ -403,7 +433,7 @@ module LlmUsage
     return fetch_cached(:claude, cache) { fetch_claude_oauth_usage } if period == 'month'
 
     data, note = fetch_claude_snapshot(now: now, path: path)
-    return [data, note] if data
+    return [merge_scoped_limits(data, cache: cache), note] if data
 
     api_data, api_note = fetch_cached(:claude, cache) { fetch_claude_oauth_usage }
     return [api_data, api_note] if api_data
@@ -411,6 +441,18 @@ module LlmUsage
     [nil, [note, api_note].compact.join('; ')]
   end
 
+  # The statusline snapshot carries no per-model windows - Claude Code's
+  # `rate_limits` input is five_hour/seven_day and nothing else - so borrow
+  # `limits` from the API payload. Cached, so this is one call per CACHE_TTL,
+  # and silent when it fails: the snapshot's own numbers are still good.
+  def merge_scoped_limits(data, cache: true)
+    api, = fetch_cached(:claude, cache) { fetch_claude_oauth_usage }
+    limits = api['limits'] if api.is_a?(Hash)
+    return data unless limits
+
+    data.merge('limits' => limits)
+  end
+
   def fetch_claude_snapshot(now: Time.now, path: CLAUDE_LIMITS_PATH)
     snapshot = read_json(path)
     return [nil, 'claude: no local snapshot (statusline writer not installed)'] unless snapshot.is_a?(Hash)
@@ -685,11 +727,12 @@ module LlmUsage
       end
     end
 
+    # A failure is cached too, or an unreachable endpoint costs its timeout on
+    # every run - and the snapshot path that now consults the API is the one
+    # that used to be instant and offline.
     data, note = yield
-    if data
-      FileUtils.mkdir_p(CACHE_DIR)
-      File.write(path, JSON.generate('fetched_at' => Time.now.iso8601, 'data' => data, 'note' => note))
-    end
+    FileUtils.mkdir_p(CACHE_DIR)
+    File.write(path, JSON.generate('fetched_at' => Time.now.iso8601, 'data' => data, 'note' => note))
     [data, note]
   end
 

data/recipes/llm.rb

@@ -45,8 +45,10 @@ task :usage do
     `~/.grok/logs/unified.jsonl` for the period end; tokens still sum
     inference_done events in that log. Claude 5h/week windows come from the
     statusline snapshot at `~/.cache/llm/claude-limits.json`, falling back to
-    the OAuth usage API. `month` shows Claude extra-usage credits (API only,
-    and only when you've enabled them).
+    the OAuth usage API. Per-model weekly windows (Fable) get their own row and
+    come from that API either way - the snapshot doesn't carry them. `month`
+    shows Claude extra-usage credits (API only, and only when you've enabled
+    them).
   D
   example 'usage'
   example 'usage month'
@@ -740,9 +742,10 @@ namespace :prompt do
     D
     opt :claude, type: :boolean, default: false, desc: 'Claude Code hook mode'
     opt :codex,  type: :boolean, default: false, desc: 'Codex hook mode'
+    opt :grok,   type: :boolean, default: false, desc: 'Grok CLI hook mode'
 
     proc do |opts|
-      error '--claude or --codex required' unless opts[:claude] || opts[:codex]
+      error '--claude, --codex or --grok required' unless opts[:claude] || opts[:codex] || opts[:grok]
 
       raw = opts[:stdin].to_s
       prompt = begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lux-hammer
 version: !ruby/object:Gem::Version
-  version: 0.3.28
+  version: 0.3.29
 platform: ruby
 authors:
 - Dino Reic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-09 00:00:00.000000000 Z
+date: 2026-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest