claude-inbox 0.14.2 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d987ed72f80dde3f91bd8ddeb3486aa867fb25e8b4ac5be91305654be021c9b0
-  data.tar.gz: 5a4874f4eee5a49c7bf56921db71f966f935397001a20a58c53a71bec69b013b
+  metadata.gz: ed40b9c11c703427940ad961d9f114e815c8af02090d8dd2b614971a1a578f4b
+  data.tar.gz: 21e8cbb5fac27662d14cf77dd40673c36b9f254618fcb029cef73b8cbee56dfb
 SHA512:
-  metadata.gz: c75cc50ea18dd72da00508eb50066dc6f0a7b9b20a1e8bb6ed042272bac0c45cd963ec31efe570b080dfaf9b4ec191c56143de05a229c2f83212b7baad551728
-  data.tar.gz: 5ed8c579ff1405d26327bc6c39acc95cd79a5c0eb3706314aeab91f006bdc940d699e6ba41f35396e3af9b372900329ec8978d122e6026a8f766554a7501c806
+  metadata.gz: 5a464b6c6d6e97943dc66e66e2f3b6ed42eb4e839e878a54afb8fca8e8b5d46a51176180dd3231e178f92ce1b63cca49c755a1e36731b6740acb1d370143cb7f
+  data.tar.gz: 4e959e5f8b45042c7d19b40616865fa62830fca5b788313392eae6e006cbcf780e3549f253c6086913eecbd344f4d8e9e6480f13c75ae25efe6b34825d98468d

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

@@ -189,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/input.rb

@@ -13,6 +13,9 @@ module ClaudeInbox
     # is taken as Option held with it.
     ALT = /\A\e([a-z])\z/
 
+    # A nonblocking read can end partway through a mouse report.
+    UNFINISHED_REPORT = /\e\[<[\d;]*\z/
+
     def self.alt?(name) = name.to_s.start_with?("alt_")
 
     # An Option chord as the quick Esc-then-letter it may also have been.
@@ -22,6 +25,7 @@ module ClaudeInbox
       @input = input
       @reader = TTY::Reader.new(input: input, output: out, interrupt: :noop)
       @paste = Paste.new
+      @held = +""
     end
 
     def pasting? = @paste.pasting?
@@ -33,13 +37,17 @@ module ClaudeInbox
 
     # `[:paste, text]`, `[:mouse, event]` and `[:key, name, raw]`, in the
     # order they arrived; `name` is the reader's symbol for a key it knows,
-    # else the raw string.
+    # else the raw string. The head of a report cut off at the end of a read
+    # waits for the rest instead of being typed.
     def events(raw)
       @paste.feed(raw).flat_map do |kind, text|
         next [[:paste, text]] if kind == :paste
-        mouse = Mouse.events(text)
-        next mouse.map { |e| [:mouse, e] } if mouse.any?
-        split_keys(text).map { |k| [:key, key_name(k), k] }
+        text = @held + text
+        @held = text[UNFINISHED_REPORT] || +""
+        Mouse.split(text.delete_suffix(@held)).flat_map do |piece|
+          next [[:mouse, piece]] if piece.is_a?(Mouse::Event)
+          split_keys(piece).map { |k| [:key, key_name(k), k] }
+        end
       end
     end
 

data/lib/claude_inbox/mouse.rb

@@ -10,14 +10,21 @@ module ClaudeInbox
 
     Event = Struct.new(:kind, :row, :col)
 
-    # A raw keypress can glue several reports together the same way a fast
-    # "esc gg" glues onto one read (see Input#split_keys), so this scans
-    # rather than matching once.
-    def self.events(raw)
-      raw.scan(SEQUENCE).filter_map do |cb, col, row, type|
+    # The read cut at its reports, in order: an Event per report acted on,
+    # the keys between as strings. An ignored report still cuts, so the keys
+    # either side of it never join into one.
+    def self.split(raw)
+      out = []
+      rest = raw
+      while (m = SEQUENCE.match(rest))
+        out << m.pre_match unless m.pre_match.empty?
+        cb, col, row, type = m.captures
         kind = kind_for(cb.to_i, type)
-        Event.new(kind, row.to_i, col.to_i) if kind
+        out << Event.new(kind, row.to_i, col.to_i) if kind
+        rest = m.post_match
       end
+      out << rest unless rest.empty?
+      out
     end
 
     # Bit 6 (0x40) marks a wheel tick, direction in bit 0. Otherwise bits

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

@@ -14,9 +14,12 @@ module ClaudeInbox
       # The same frame for a terminal drawn without color.
       def plain = self.class.new(lines.map { |l| l.gsub(Text::CSI, "") }, items, top)
 
+      # Only the row under the pointer is scanned: every keystroke paints a
+      # frame, and scanning the whole screen for links each time cost more
+      # than the key repeat interval.
       def link_at(row, col)
-        @links ||= lines.map { |l| Text.links(l) }
-        @links.fetch(row - 1, []).find { |link| link.columns.cover?(col - 1) }
+        line = lines[row - 1] if row >= 1
+        Text.links(line).find { |link| link.columns.cover?(col - 1) } if line
       end
     end
 
@@ -375,22 +378,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/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/text.rb

@@ -25,6 +25,7 @@ module ClaudeInbox
     Link = Data.define(:columns, :url, :text)
 
     def links(s)
+      return [] unless s.include?("\e]8;")
       found = []
       col = 0
       start = url = text = nil

data/lib/claude_inbox.rb

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

metadata

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