claude-inbox 0.14.1 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f7809d0909d4391440edb2d01d0452b976b28ed59832d21a05518a11ef164b1
-  data.tar.gz: 106434e33d35e297d312b441bfa1ff333a16a7faddd54443c65ba006a6dcf95e
+  metadata.gz: 20f415de1f5b57baa5330a96c70bb10545c1b1885e419f4174e9a938c0d3c59f
+  data.tar.gz: 1a989c77cbb0553c63ace2b341c95a988eb1028e103c09c173bc28d14023cd14
 SHA512:
-  metadata.gz: cf8d43ffd7d434977f4bcb18acb1d06817854e92973cad5e5e8d7d8efd8e611e82dc1820499f65c50c99f0b12a5b6d3d7d3a18235c1ad693c0efa2325be348a6
-  data.tar.gz: c0560e7bd6444fbf325618d8b2eb7172d74b0d63d331058cf9aca5afbcf88da1f0fd5a4d31c1576e808a4b022cf3933247bc61c5ba229f4543b171805e2aa3df
+  metadata.gz: 251df40e737ea85313ceefc9d8dc401f61fed6af73f9d26b0b2767737c66dec57e1fd02fbc46bd057384b17475b3e76dd2de669d77c4ab534df3a2bfe1e6b67c
+  data.tar.gz: c3368aa2027a9947e09e2d29a642d6ad4884a1c77392298db820b73b69a06c5970f9a30a916224f8786664d5588b307189edcbe960d9634ea1d93d4cff06ac6d

data/lib/claude_inbox/app/attaching.rb

@@ -29,12 +29,14 @@ module ClaudeInbox
       # failed attach leaves its reason on screen until a key is pressed.
       def attach(id)
         while id
-          @store.acknowledge(id)
           @switch.clear
           from = session_for(id)&.session_id
-          @terminal.release do
-            @terminal.pause unless @client.attach(id) { @switch.requested_for?(from) }
+          @store.visit(id) do
+            @terminal.release do
+              @terminal.pause unless @client.attach(id) { @switch.requested_for?(from) }
+            end
           end
+          @poller.soon
           id = @switch.take(@store.actionable_keys)
         end
       end

data/lib/claude_inbox/dialog.rb

@@ -74,7 +74,8 @@ module ClaudeInbox
     end
 
     # `o` open and `y` copy on a session with several PRs: the headline
-    # first, and the same key again takes it. The PR is read from `choice`.
+    # first, then the rest in Session#prs_by_status order; the same key
+    # again takes the headline. The PR is read from `choice`.
     class PrPicker < Dialog
       MARGIN = 6
       KEYS = {open: "o", copy: "y"}.freeze
@@ -83,7 +84,7 @@ module ClaudeInbox
 
       def initialize(kind, session)
         super(kind, session.key)
-        @prs = [session.pr, *session.prs.reject { |pr| pr.equal?(session.pr) }].first(9)
+        @prs = [session.pr, *session.prs_by_status.reject { |pr| pr.equal?(session.pr) }].first(9)
       end
 
       def title = " #{kind.to_s.capitalize} pull request "
@@ -188,7 +189,7 @@ module ClaudeInbox
       # Drawn by hand: TTY::Box measures an emoji as one column, which
       # pushes the right border out on every line that has one.
       def frame(width, _caret = nil)
-        inner = [width - 4, WIDTH].min - 2
+        inner = [width - 4, fit].min - 2
         bordered(lines(inner, nil).map { |l| Text.pad(Text.truncate(l, inner), inner) }, inner)
       end
 

data/lib/claude_inbox/poller.rb

@@ -58,17 +58,17 @@ module ClaudeInbox
       sessions = Sessions.load(client: @client, pull_requests: @pull_requests, transcripts: @transcripts, overrides: @store.pr_overrides)
       doomed = @reaper.due(sessions, now)
       @store.hide(doomed)
-      publish(sessions)
+      publish(sessions, now)
       reaped = []
       begin
         reaped = @reaper.sweep(sessions.select { |s| doomed.include?(s.key) }, now)
       ensure
         @store.release(doomed - reaped)
       end
-      publish(sessions) if reaped != doomed
+      publish(sessions, now) if reaped != doomed
       @queue << [:notice, @reaper.report(reaped)] if reaped.any?
       fresh, moved = @pull_requests.refresh(sessions)
-      publish(fresh) if moved
+      publish(fresh, now) if moved
     rescue => e
       @queue << [:error, e.message]
     end
@@ -82,10 +82,10 @@ module ClaudeInbox
 
     # The notifier compares the sections from just before the hand-over, so
     # a row you woke or unpinned yourself since the last poll says nothing.
-    def publish(sessions)
+    def publish(sessions, fetched_at)
       now = @clock.call
       before = @store.sections(now)
-      @store.update(sessions)
+      @store.update(sessions, fetched_at:)
       after = @store.sections(now)
       @snapshot.write(after, now)
       @notifier.deliver(before, after) { |msg| @queue << [:notice, msg] }

data/lib/claude_inbox/rate_limits.rb

@@ -5,11 +5,10 @@ require "json"
 module ClaudeInbox
   # The subscription's 5-hour and 7-day usage, read from
   # ~/.claude/rate_limits.json. Nothing writes that file but the user's own
-  # status line script (README, "Setup"): `claude agents --json` says nothing
-  # about limits and there is no CLI command for them, but every session hands
-  # its status line a `rate_limits` object on each turn, so a one-line tee
-  # there is the only source that costs no API calls. No file, or a file
-  # nobody has touched in STALE_AFTER, reads as nothing to show.
+  # status line script (README, "Usage bars"): `claude agents --json` says
+  # nothing about limits and there is no CLI command for them, but every
+  # session hands its status line a `rate_limits` object on each turn, so a
+  # one-line tee there is the only source that costs no API calls.
   class RateLimits
     DEFAULT_PATH = File.join(Dir.home, ".claude", "rate_limits.json")
     STALE_AFTER = 15 * 60
@@ -26,10 +25,8 @@ module ClaudeInbox
       @data = nil
     end
 
-    # The windows the file reports, each with a whole percent and its reset
-    # time, or nil.
-    # Parses only when the file has changed, since render asks several times
-    # a second.
+    # The windows the file reports, or nil. Parses only when the file has
+    # changed, since render asks several times a second.
     def windows(now)
       mtime = File.mtime(@path)
       return nil if now - mtime > STALE_AFTER

data/lib/claude_inbox/renderer.rb

@@ -375,22 +375,21 @@ module ClaudeInbox
 
     def meta_for(row, section, now)
       s = row.session
+      age = Text.age(now.to_i - row.spoke_at)
       base =
         case section
         when :snoozed
           wake = row.parked? ? @theme.purple("parked") : @theme.purple("wakes in #{Text.age(row.wake_at.to_i - now.to_i)}")
           row.pinned? ? wake + @theme.cyan(" ★") : wake
         when :settled
-          @p.dim("#{s.state} · #{Text.age(now.to_i - row.spoke_at)}")
+          @p.dim("#{s.state} · #{age}")
         else
           if s.interactive?
             where = s.remote? ? "remote" : "your terminal"
-            age = Text.age(now.to_i - row.spoke_at)
             state_badge(s) + @p.dim(" · #{where} · #{age}")
           else
-            age = @p.dim(" · " + Text.age(now.to_i - row.spoke_at))
             remote = s.remote_control? ? @theme.blue(" ⇅") : ""
-            state_badge(s) + remote + age
+            state_badge(s) + remote + @p.dim(" · #{age}")
           end
         end
       pr = pr_badge(s, section)

data/lib/claude_inbox/session.rb

@@ -99,19 +99,34 @@ module ClaudeInbox
 
     def project = cwd ? File.basename(cwd) : ""
 
-    # The PR you would act on. One resolved before the session began was
-    # only mentioned (as Row#settled? judges), so it loses to any live one.
+    # The PR you would act on. One only mentioned loses to any live one.
     def pr = prs.each_with_index.min_by { |pr, i| [headline_rank(pr), i] }&.first
 
+    # Oldest first so a stack reads up from its base; trouble is the
+    # headline's job, not this order's.
+    def prs_by_status = prs.each_with_index.sort_by { |pr, i| [*status_order(pr), i] }.map(&:first)
+
     private
 
     def headline_rank(pr)
-      if !pr.known? || pr.resolved_before?(created_at) then 4
+      if mentioned?(pr) then 4
       elsif pr.needs_you? then 0
       elsif pr.health == "CONFLICTING" then 1
       elsif !pr.resolved? then 2
       else 3
       end
     end
+
+    def status_order(pr)
+      age = pr.number.to_i
+      if mentioned?(pr) then [3, age]
+      elsif pr.state == "OPEN" then [0, age]
+      elsif pr.state == "DRAFT" then [1, age]
+      else [2, -age]
+      end
+    end
+
+    # Unknown, or resolved before the session began (as Row#settled? judges).
+    def mentioned?(pr) = !pr.known? || pr.resolved_before?(created_at)
   end
 end

data/lib/claude_inbox/slash_commands.rb

@@ -102,8 +102,7 @@ module ClaudeInbox
 
     def unquote(s)
       s = s.sub(/\A[>|][-+]?\z/, "")
-      quoted = s.size >= 2 && ((s.start_with?('"') && s.end_with?('"')) || (s.start_with?("'") && s.end_with?("'")))
-      s = s[1..-2] if quoted
+      s = s[1..-2] if s.match?(/\A(["']).*\1\z/)
       s.gsub("''", "'")
     end
     private_class_method :from_dir, :skills, :commands, :qualify, :plugins, :synced, :frontmatter, :unquote

data/lib/claude_inbox/store/entry.rb

@@ -60,7 +60,8 @@ module ClaudeInbox
 
       def acknowledged_at = @h["acknowledged_at"]
 
-      # When you last attached. Never cleared, unlike `acknowledged_at`.
+      # When you last saw it: an attach, or a change it made while you were
+      # in it. Never cleared, unlike `acknowledged_at`.
       def last_visited_at = @h["last_visited_at"]
 
       def revived_at = @h["revived_at"]

data/lib/claude_inbox/store/row.rb

@@ -3,7 +3,8 @@
 module ClaudeInbox
   class Store
     # A session paired with its Entry (nil until a poll has recorded one), with
-    # the triage rules as its methods; each takes `now`, so a Row is pure.
+    # the triage rules as its methods. A rule that depends on the time takes
+    # `now`, so a Row is pure.
     Row = Struct.new(:session, :entry) do
       def key = session.key
 
@@ -118,8 +119,8 @@ module ClaudeInbox
 
       private
 
-      # Finished or needing you, so it carries a read or unread mark. Only a
-      # session you can attach to counts, since nothing else ever clears it.
+      # Only a session you can attach to carries a read or unread mark, since
+      # nothing else ever clears it.
       def markable? = session.actionable? && (session.finished? || session.needs_you?)
 
       def unchanged_since?(at) = at && entry.state_since.to_i <= at.to_i

data/lib/claude_inbox/store.rb

@@ -78,19 +78,46 @@ module ClaudeInbox
       @sessions = []
       @hidden = Set.new
       @forgotten = Set.new
+      @visiting = Set.new
+      @leaving = {}
       @entries = load
     end
 
     # A hidden or forgotten key the daemon has stopped listing is released;
-    # one it still lists stays out of sight.
-    def update(sessions)
-      @mutex.synchronize do
+    # one it still lists stays out of sight. `fetched_at` is when the list
+    # was asked for, which can be well before it is handed over.
+    def update(sessions, fetched_at: @clock.call)
+      seen = @mutex.synchronize do
         keys = sessions.map(&:key)
         @hidden &= keys
         @forgotten &= keys
         @sessions = sessions.reject { |s| @hidden.include?(s.key) || @forgotten.include?(s.key) }
         @entries = self.class.merge_entries(@writable ? @entries : load, @sessions, @clock.call)
+        # A list asked for before you left shows only what happened while you
+        # were there; the first one asked for after closes the visit.
+        left = @leaving.select { |_, left_at| fetched_at >= left_at }.keys
+        seen = (@visiting.to_a | @leaving.keys).select { |id| see(id) }
+        # A reader reloads state.json each poll, so it holds the visit open
+        # until the writer has taken its acknowledge.
+        (@writable ? left : left - seen).each { |id| @leaving.delete(id) }
         save
+        seen
+      end
+      seen.each { |id| relay("acknowledge", id) }
+    end
+
+    # You are in the session for the length of the block, so whatever it
+    # does meanwhile is seen, not unread. The first list asked for after you
+    # leave still counts: a state that changed in your last seconds there is
+    # only recorded then.
+    def visit(id)
+      acknowledge(id)
+      @mutex.synchronize { @visiting << id }
+      yield
+    ensure
+      @mutex.synchronize do
+        @visiting.delete(id)
+        @leaving[id] = @clock.call
       end
     end
 
@@ -173,9 +200,22 @@ module ClaudeInbox
         yield Entry.new(@entries[id] ||= Entry.blank(@clock.call).to_h)
         save
       end
+      relay(action, id, **detail)
+    end
+
+    def relay(action, id, **detail)
       @relay&.request(action, id, **detail) unless @writable
     end
 
+    # Acknowledges the state the last poll found, and says whether it had to:
+    # `Entry#observe` drops an acknowledgement once the state outruns it.
+    def see(id)
+      entry = @entries[id] && Entry.new(@entries[id])
+      return false if entry.nil? || entry.acknowledged_at
+      entry.acknowledge(@clock.call)
+      true
+    end
+
     def load
       Records.read(@path)["sessions"] || {}
     end

data/lib/claude_inbox.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ClaudeInbox
-  VERSION = "0.14.1"
+  VERSION = "0.14.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: claude-inbox
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.3
 platform: ruby
 authors:
 - Jordan Byron