diffbroker 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e54b099af52044a49465285a6e1c6433be4fbac0c9e2b76dade0717b42bb5cb
-  data.tar.gz: c27ba555b4cf84832fac018fabb0a32acbc13a2778a98f526db61304abd8f11f
+  metadata.gz: 90e8bd666f8efcb2f12429d70caee992e7e06337041a32333b334beedf0c6053
+  data.tar.gz: 48507f0c813906471b8345e3473f8f7f5c729c4c68ebeb46ac45579f3b3ed87e
 SHA512:
-  metadata.gz: 71929768b4b9c14a10e969ab4ace0687849082ce27816f4e78a04593d3f177fe3f286ad007e800a7f22bd57f6798b244ba43559ccca864ffde00f89c6e9764f5
-  data.tar.gz: 437c9ee4dd4b481ede08fc5c080c60bdb366741d33f89da9ae2af4285ae7c8875c9dde3776683612c003dce2eb8eb7b01828a679cbcf8d82f2d1cd07d61d72da
+  metadata.gz: 58362a84f6cc68cde8a081c5f02d6177db48656557bb9262390b272357e574343c33153d2118728b8dd18971cb68962199d327d740cc342ca9490e54fbe55196
+  data.tar.gz: 6d4ee8a4c7fdc7d8619ed4efc2caef559a354bc28f6987ebe213cb94122ba989ff4686a8ae6a03aec2e72c993318e3aca2a4cc99bb923495082d4493340dab1e

data/lib/diffbroker/daemon.rb

@@ -11,6 +11,7 @@ module Diffbroker
     class Rejected < Error; end
 
     RESCAN_EVERY = 300
+    USAGE_EVERY = 300
     MAX_BACKOFF = 60
     BATCH = 50
     # Spec §5.2 / main §18.4: nothing else about an observed agent ever leaves the machine.
@@ -26,6 +27,7 @@ module Diffbroker
       new(scanner: config.repo_scanner, roots_changed: roots_changed(config), device_roots: config.device_roots, ignored_roots: config.ignored_roots,
           client_factory: -> { CableClient.new(url: config.cable_url, token: config.device_token, origin: config.server) },
           task_runner_factory: ->(report) { TaskRunner.new(config:, report:, out:) }, out:, relay:, process_scanner:, agent: config.agent,
+          plan_usage: PlanUsage.new(agent: config.agent),
           lifecycle: Lifecycle.new(dir: config.dir, server: config.server), reaper: Reaper.new(root: config.worktree_root))
     end
 
@@ -54,7 +56,7 @@ module Diffbroker
 
     def initialize(scanner:, client_factory:, task_runner_factory:, out: $stdout, sleeper: ->(seconds) { sleep(seconds) },
                    clock: -> { Time.now }, spawner: ->(&block) { Thread.new(&block) }, relay: nil, process_scanner: nil, lifecycle: nil,
-                   maintenance: Maintenance.new, roots_changed: nil, device_roots: [], ignored_roots: [], agent: "claude", reaper: nil)
+                   maintenance: Maintenance.new, roots_changed: nil, device_roots: [], ignored_roots: [], agent: "claude", reaper: nil, plan_usage: nil)
       @scanner = scanner
       @device_roots = device_roots
       @ignored_roots = ignored_roots
@@ -71,6 +73,7 @@ module Diffbroker
       @maintenance = maintenance
       @agent = agent
       @reaper = reaper
+      @plan_usage = plan_usage
       @repositories = []
       @running = Set.new
       @running_lock = Mutex.new
@@ -123,6 +126,7 @@ module Diffbroker
         @backoff = 1
         @rejections = 0
         rescan(client)
+        @usage_at = nil
         client.perform("hello", "version" => VERSION, "platform" => Diffbroker.platform,
                                 "service" => @lifecycle ? @lifecycle.service_installed? : false, "agent" => @agent)
         @out.puts "Connected. #{@repositories.size} repositories reported."
@@ -131,6 +135,7 @@ module Diffbroker
         client.perform("heartbeat", "version" => VERSION)
         rescan(client) if @scanned_at.nil? || @clock.call - @scanned_at >= RESCAN_EVERY
         observe(client, @process_scanner.scan) if @process_scanner
+        report_usage(client)
       end
       client.on_poll { observe(client, @relay.drain) if @relay }
       client.on_message { |message| handle(client, message) }
@@ -143,6 +148,18 @@ module Diffbroker
       client.perform("repositories", "repositories" => @repositories)
     end
 
+    # The plan limits change slowly and reading them can wait on the network, so: every few minutes, off the tick's thread.
+    def report_usage(client)
+      return unless @plan_usage
+      return if @usage_at && @clock.call - @usage_at < USAGE_EVERY
+
+      @usage_at = @clock.call
+      @spawner.call do
+        usage = @plan_usage.read
+        client.perform("usage", usage) if usage
+      end
+    end
+
     def observe(client, events)
       clean = Array(events).filter_map { _1.is_a?(Hash) ? _1.slice(*OBSERVATION_FIELDS) : nil }
       clean.each_slice(BATCH) { client.perform("observe", "events" => _1) }

data/lib/diffbroker/plan_usage.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+require "json"
+require "net/http"
+require "time"
+
+module Diffbroker
+  # How much of the user's own plan limits the agent has used: Claude Code's 5-hour and weekly limits, Codex's rate-limit
+  # windows. Read on this machine with the user's own login and reported as plain percentages and reset times; no token,
+  # prompt or file ever leaves it. Every reader answers nil when it cannot tell (not logged in, no sessions, no network).
+  class PlanUsage
+    CLAUDE_URL = URI("https://api.anthropic.com/api/oauth/usage")
+    CLAUDE_KEYCHAIN_SERVICE = "Claude Code-credentials"
+    MAX_WINDOWS = 2
+    # A window's key by its length in minutes: the rings and bars name them.
+    KEYS = { 300 => "session", 10_080 => "weekly", 43_200 => "monthly" }.freeze
+    CODEX_TAIL_BYTES = 400_000
+
+    def initialize(agent:, home: Dir.home, http: nil, keychain: nil, clock: -> { Time.now })
+      @agent = agent
+      @home = home
+      @http = http || method(:fetch)
+      @keychain = keychain || method(:read_keychain)
+      @clock = clock
+    end
+
+    # => { "agent" => "claude", "windows" => [{ "key", "percent", "resets_at" }] } or nil
+    def read
+      windows = @agent == "codex" ? codex_windows : claude_windows
+      windows = Array(windows).first(MAX_WINDOWS)
+      { "agent" => @agent, "windows" => windows } unless windows.empty?
+    rescue StandardError
+      nil
+    end
+
+    private
+
+    def claude_windows
+      token = claude_token
+      return unless token
+
+      body = JSON.parse(@http.call(CLAUDE_URL, token))
+      [ [ "five_hour", "session" ], [ "seven_day", "weekly" ] ].filter_map do |field, key|
+        window = body[field]
+        next unless window.is_a?(Hash) && window["utilization"].is_a?(Numeric)
+
+        { "key" => key, "percent" => window["utilization"].clamp(0, 100).round(1), "resets_at" => Time.parse(window["resets_at"].to_s).to_i }
+      rescue ArgumentError
+        nil
+      end
+    end
+
+    def claude_token
+      raw = @keychain.call || credentials_file
+      JSON.parse(raw.to_s).dig("claudeAiOauth", "accessToken")
+    rescue JSON::ParserError
+      nil
+    end
+
+    def credentials_file
+      path = File.join(@home, ".claude", ".credentials.json")
+      File.read(path) if File.file?(path)
+    end
+
+    def read_keychain
+      return unless RUBY_PLATFORM.include?("darwin")
+
+      out = IO.popen([ "security", "find-generic-password", "-s", CLAUDE_KEYCHAIN_SERVICE, "-w" ], err: File::NULL, &:read)
+      out.to_s.strip.then { _1.empty? ? nil : _1 }
+    rescue SystemCallError
+      nil
+    end
+
+    def fetch(uri, token)
+      request = Net::HTTP::Get.new(uri, "Authorization" => "Bearer #{token}", "anthropic-beta" => "oauth-2025-04-20", "Accept" => "application/json")
+      response = Net::HTTP.start(uri.host, uri.port, use_ssl: true, open_timeout: 5, read_timeout: 8) { _1.request(request) }
+      raise Error, "usage #{response.code}" unless response.is_a?(Net::HTTPSuccess)
+
+      response.body
+    end
+
+    # Codex writes its limits into every session's log; the newest line of the newest session is the current state.
+    def codex_windows
+      file = Dir.glob(File.join(@home, ".codex", "sessions", "*", "*", "*", "rollout-*.jsonl")).max_by { File.mtime(_1) }
+      return unless file
+
+      line = tail(file).lines.reverse.find { _1.include?('"rate_limits"') }
+      limits = line && JSON.parse(line).dig("payload", "rate_limits")
+      return unless limits.is_a?(Hash)
+
+      now = @clock.call.to_i
+      windows = %w[primary secondary].filter_map { |name| codex_window(limits[name], now) }
+      windows.sort_by { _1["minutes"] }.map { _1.except("minutes") }
+    rescue JSON::ParserError
+      nil
+    end
+
+    def codex_window(window, now)
+      return unless window.is_a?(Hash) && window["used_percent"].is_a?(Numeric) && window["resets_at"].is_a?(Integer)
+
+      minutes = window["window_minutes"].to_i
+      # A window that already reset reports the old percentage until Codex runs again: it is empty now.
+      percent = window["resets_at"] <= now ? 0 : window["used_percent"].clamp(0, 100).round(1)
+      { "key" => KEYS.fetch(minutes, minutes >= 10_080 ? "weekly" : "session"), "percent" => percent, "resets_at" => window["resets_at"], "minutes" => minutes }
+    end
+
+    def tail(path)
+      File.open(path) do |file|
+        file.seek([ file.size - CODEX_TAIL_BYTES, 0 ].max)
+        file.read.to_s
+      end
+    end
+  end
+end

data/lib/diffbroker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Diffbroker
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/lib/diffbroker.rb

@@ -32,6 +32,7 @@ module Diffbroker
   autoload :LocalRelay, File.expand_path("diffbroker/local_relay", __dir__)
   autoload :Login, File.expand_path("diffbroker/login", __dir__)
   autoload :Neutralizer, File.expand_path("diffbroker/neutralizer", __dir__)
+  autoload :PlanUsage, File.expand_path("diffbroker/plan_usage", __dir__)
   autoload :ProcessScanner, File.expand_path("diffbroker/process_scanner", __dir__)
   autoload :Reaper, File.expand_path("diffbroker/reaper", __dir__)
   autoload :RepoScanner, File.expand_path("diffbroker/repo_scanner", __dir__)

data/plugin/.claude-plugin/plugin.json

@@ -1,5 +1,5 @@
 {
   "name": "diffbroker",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Skills for working on Diff Broker agent tasks: the diffbroker MCP tools, write rules and report_task."
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffbroker
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Yuri Sidorov (@newstler)
@@ -56,6 +56,7 @@ files:
 - lib/diffbroker/login.rb
 - lib/diffbroker/maintenance.rb
 - lib/diffbroker/neutralizer.rb
+- lib/diffbroker/plan_usage.rb
 - lib/diffbroker/process_scanner.rb
 - lib/diffbroker/reaper.rb
 - lib/diffbroker/repo_scanner.rb