claude-inbox 0.11.2 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86190c0236a4084ec5b00e5044886f6a6b5ab8b51c8e81ac56d7ee9a78619753
-  data.tar.gz: 763db348bacbb927ec5c5fae6344a02d449ddbf8aeb7dc4460594168e523b5dd
+  metadata.gz: 58a50d40ba0f8df6b8b53f3613a75b5982871eaa3c6f9d0c29c46411a1e70323
+  data.tar.gz: f8abcc49a7a5d61d339189f79c0f7a62d800b98531ce1e82060efda0a91e0d2e
 SHA512:
-  metadata.gz: 532e078a269b17bfafd4eb6bbe83893a8be012740bd7fbac7c4625f074c9ce40df5afb9475e0cfbdd09963200265e35dc4335ecfacadfe4a653a83f78033f369
-  data.tar.gz: 51632f06152f27dd1708304ecdc4f9eea0ff9dfba18d8ce302f44a8e7b1d260472d56abf80151d1d48f947faf7432ea2ed47133037c43b570972cc171a4b9e24
+  metadata.gz: 1c994b3434e3e45fbf60f6c472227fb97610ae8355bb0dd166fb49c83713025fc8be70d2f06660e4475aa0606604a6860ce063c2d721fb836c048e7f18393b86
+  data.tar.gz: 591b90b883b64fc4494d8dec115958c618cf88ad13fd5cd3e9a125cbba6364df80b7c370d6d49c6db97bb74e65905882ede46bf9fdcab4b2201d39bc1e582d19

data/README.md

@@ -63,9 +63,9 @@ status line. A row with a pull request shows it as `#885 open`, `#885 merged`
 and so on, with `✗ checks`, `changes requested` or `conflicts` after it when
 something is wrong, and `+2` after it when the session has two more.
 A steady `◌` with `idle · 1 shell` means the agent stopped
-and is waiting on a shell or sub-agent it started. A `●` marks a session you
-haven't attached to since it got blocked, in red, or finished, in blue; one
-you have attached to since is dimmed, unless `/color` tints it.
+and is waiting on a shell or sub-agent it started. A blue `●` marks a session you
+haven't attached to since it got blocked or finished; one you have attached
+to since is dimmed, unless `/color` tints it.
 
 ## Keys
 
@@ -105,7 +105,8 @@ Vim bindings. Arrows and the mouse work too.
 `n` opens a form for the prompt, name, directory, model, effort, permissions,
 worktree, Remote Control and color, which tints the row as `/color` would.
 `Tab` moves between fields, `Ctrl-S` starts the session and `Ctrl-O` starts
-it and attaches.
+it and attaches. `Option-S` or `Option-O` by mistake only says which key you
+meant; it no longer reads as `Esc` and asks to discard the prompt.
 
 Paste an image on macOS, or drop a file into the prompt, and refer to it as
 `[Image #1]`. Type `/` for a menu of your skills.

data/lib/claude_inbox/app/attaching.rb

@@ -53,7 +53,7 @@ module ClaudeInbox
 
       def open_confirm(kind)
         return unless require_actionable
-        @modal = Dialog::Confirm.new(kind, @selected.key)
+        @modal = Dialog::Confirm.new(kind, @selected.key, label_for(@selected.key))
       end
 
       def stop_session(id)
@@ -64,11 +64,12 @@ module ClaudeInbox
       end
 
       def delete_session(id)
-        notice("deleting #{id}…")
+        label = label_for(id)
+        notice("deleting #{label}…")
         in_background do
           @client.rm(id)
           @store.forget(id)
-          @queue << [:notice, "deleted #{id}"]
+          @queue << [:notice, "deleted #{label}"]
           @poller.soon
         end
       end

data/lib/claude_inbox/app/navigating.rb

@@ -38,6 +38,9 @@ module ClaudeInbox
 
       def selected_session = session_for(@selected&.key)
 
+      # The alias if one is set, as the row shows it, rather than the bare id.
+      def label_for(key) = session_for(key)&.then { |s| @store.row(s).label } || key
+
       def page = [Renderer.body_height(@terminal.size[1]), 1].max
 
       def move(delta)

data/lib/claude_inbox/app.rb

@@ -173,7 +173,12 @@ module ClaudeInbox
       @input.typed(text).each { |name, c| handle_key(name, c) } if typing
     end
 
+    # Only the form gives an Option chord a meaning; anywhere else it is the
+    # Esc and letter it was before Input named it.
     def handle_key(name, key)
+      if Input.alt?(name) && !(@modal.is_a?(NewSessionForm) && NewSessionForm::SLIPS.key?(name))
+        return Input.unglued(key).each { |n, k| handle_key(n, k) }
+      end
       return handle_modal_key(name, key) if @modal
       return handle_line_key(name, key) if filter_editing?
 

data/lib/claude_inbox/dialog.rb

@@ -38,6 +38,9 @@ module ClaudeInbox
     # A key and what it does.
     def hint(name, action) = "#{key(name)}  #{@theme.dim(action)}"
 
+    # Esc or q closes a box. Prompt skips this, since q is text there.
+    def dismiss?(name, key) = name == :escape || key == "q"
+
     # `s` snooze: one key per choice, and the choice is read from `choice`.
     class Snooze < Dialog
       MENU = [
@@ -57,7 +60,7 @@ module ClaudeInbox
       def lines(_width, _caret) = MENU.map { |k, label, _| "  #{key(k)}  #{label}" } + ["", "  " + hint("esc", "cancel")]
 
       def press(name, key)
-        return :cancel if name == :escape || key == "q"
+        return :cancel if dismiss?(name, key)
         entry = MENU.assoc(key)
         return nil unless entry
         @choice = entry[2]
@@ -70,7 +73,6 @@ module ClaudeInbox
     class PrPicker < Dialog
       MARGIN = 6
       KEYS = {open: "o", copy: "y"}.freeze
-      VERBS = {open: "open", copy: "copy"}.freeze
 
       attr_reader :choice
 
@@ -79,7 +81,7 @@ module ClaudeInbox
         @prs = [session.pr, *session.prs.reject { |pr| pr.equal?(session.pr) }].first(9)
       end
 
-      def title = " #{VERBS.fetch(kind).capitalize} pull request "
+      def title = " #{kind.to_s.capitalize} pull request "
 
       # Titles vary, so the box grows to the longest line plus some air,
       # and never shrinks below a plain dialog.
@@ -87,12 +89,12 @@ module ClaudeInbox
 
       def lines(width, _caret)
         (@prs.each_with_index.map { |pr, i| "  #{key((i + 1).to_s)}  #{label(pr)}" } +
-          ["", "  #{hint(KEYS.fetch(kind), "#{VERBS.fetch(kind)} #{@prs.first.short}")} · #{key("esc")} #{@theme.dim("cancel")}"])
+          ["", "  #{hint(KEYS.fetch(kind), "#{kind} #{@prs.first.short}")} · #{key("esc")} #{@theme.dim("cancel")}"])
           .map { |line| Text.truncate(line, width) }
       end
 
       def press(name, key)
-        return :cancel if name == :escape || key == "q"
+        return :cancel if dismiss?(name, key)
         @choice = @prs.first if key == KEYS.fetch(kind) || name == :return || name == :enter
         @choice = @prs[key.to_i - 1] if key.to_s.match?(/\A[1-9]\z/)
         @choice && :pick
@@ -114,13 +116,19 @@ module ClaudeInbox
     class Confirm < Dialog
       TITLES = {stop: " Stop ", delete: " Delete ", adopt: " Adopt "}.freeze
 
+      # `label` is the name the list shows; the id is what App acts on.
+      def initialize(kind, id, label = id)
+        super(kind, id)
+        @label = label
+      end
+
       def title = TITLES.fetch(kind)
 
-      def lines(_width, _caret)
+      def lines(width, _caret)
         case kind
-        when :stop then ["  Stop session #{id}?", "", "  " + hint("y", "stop it"), "  " + hint("esc", "cancel")]
+        when :stop then [ask("Stop", width), "", "  " + hint("y", "stop it"), "  " + hint("esc", "cancel")]
         when :delete
-          ["  Delete session #{id}?", "  Its worktree and conversation", "  go with it.",
+          [ask("Delete", width), "  Its worktree and conversation", "  go with it.",
             "", "  " + hint("y", "delete it"), "  " + hint("esc", "keep it")]
         when :adopt
           ["  Pull this session into the daemon?", "  Its phone session ends and a",
@@ -130,9 +138,14 @@ module ClaudeInbox
 
       def press(name, key)
         return :confirm if key == "y"
-        return :cancel if name == :escape || key == "n" || key == "q"
+        return :cancel if dismiss?(name, key) || key == "n"
         nil
       end
+
+      private
+
+      # One line, so a long name is cut rather than wrapped mid-word.
+      def ask(verb, width) = "  #{verb} #{Text.truncate(@label.to_s, width - Text.width(verb) - 4)}?"
     end
 
     # The first launch without the Claude Code pane asks once whether to add

data/lib/claude_inbox/input.rb

@@ -9,6 +9,15 @@ module ClaudeInbox
   # keys. Hides what tty-reader does with ESC, echo and a paste, so App sees
   # events and not the raw bytes.
   class Input
+    # macOS sends Option-s as "\es", so an Esc glued to one lowercase letter
+    # is taken as Option held with it.
+    ALT = /\A\e([a-z])\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.
+    def self.unglued(raw) = [[:escape, "\e"], [raw[1], raw[1]]]
+
     def initialize(input, out)
       @input = input
       @reader = TTY::Reader.new(input: input, output: out, interrupt: :noop)
@@ -51,7 +60,7 @@ module ClaudeInbox
       out
     end
 
-    def key_name(key) = @reader.console.keys[key] || key
+    def key_name(key) = @reader.console.keys[key] || key[ALT, 1]&.then { |c| :"alt_#{c}" } || key
 
     # tty-reader glues ESC to whatever arrives within 100ms, so a fast
     # "esc gg" comes in as one unknown key "\egg". Vim hands make that
@@ -59,6 +68,7 @@ module ClaudeInbox
     def split_keys(key)
       return [key] if key.size <= 1 || @reader.console.keys.key?(key)
       return [key] unless key.start_with?("\e")
+      return [key] if key.match?(ALT)
       ["\e"] + key[1..].chars
     end
   end

data/lib/claude_inbox/job_state.rb

@@ -48,7 +48,7 @@ module ClaudeInbox
     # => JobState, or nil when there is no readable file for this id.
     def self.read(id, jobs_dir:)
       return nil unless id
-      new(JSON.parse(File.read(File.join(jobs_dir, id, "state.json"))))
+      new(JSON.parse(File.read(job_file(id, jobs_dir))))
     rescue JSON::ParserError, SystemCallError
       nil
     end
@@ -59,13 +59,16 @@ module ClaudeInbox
     # must not report a started session as failed.
     # ponytail: a daemon write racing this one can drop the color; re-apply on poll if that shows up.
     def self.write_color(id, color, jobs_dir:)
-      path = File.join(jobs_dir, id, "state.json")
+      path = job_file(id, jobs_dir)
       File.write("#{path}.tmp", JSON.generate(JSON.parse(File.read(path)).merge("color" => color)))
       File.rename("#{path}.tmp", path)
     rescue JSON::ParserError, SystemCallError
       nil
     end
 
+    def self.job_file(id, jobs_dir) = File.join(jobs_dir, id, "state.json")
+    private_class_method :job_file
+
     attr_reader :pr_urls, :transcript_path, :color, :intent, :bridge_id, :created_at
 
     def initialize(hash)

data/lib/claude_inbox/new_session_form.rb

@@ -35,6 +35,10 @@ module ClaudeInbox
     # editable field spends these on its own text instead.
     CYCLE = {:left => -1, :right => 1, "h" => -1, "l" => 1, " " => 1}.freeze
 
+    # Option slips for Ctrl on the two submit keys. Option-s arrives as Esc
+    # then s, and that Esc asked to discard the prompt.
+    SLIPS = {alt_s: "that's option-s — ctrl-s starts it", alt_o: "that's option-o — ctrl-o starts and attaches"}.freeze
+
     def initialize(cwd:, dirs: [], home: Dir.home, clipboard: Images.method(:from_clipboard))
       @p = Pastel.new(enabled: true)
       @theme = Theme.new
@@ -83,6 +87,7 @@ module ClaudeInbox
       when :escape then return escape_pressed
       when :ctrl_s then return submit(attach: false)
       when :ctrl_o then return submit(attach: true)
+      when *SLIPS.keys then @error = SLIPS[name]
       when :ctrl_v then paste_clipboard
       when :tab then complete_dir || move(1)
       when :down then move(1)
@@ -169,10 +174,10 @@ module ClaudeInbox
 
     def footer
       return @p.dim("starting session…") if @busy
-      return hints([["y", "discard"], ["esc", "keep editing"]]) if @confirm_discard
+      return @theme.hints([["y", "discard"], ["esc", "keep editing"]]) if @confirm_discard
       return @theme.red(@error) if @error
       return @p.dim("matches: ") + @candidates.join(@p.dim("  ")) if @candidates
-      return hints([["↑ ↓", "choose"], ["⇥ ⏎", "pick"], ["esc", "close"]]) if menu
+      return @theme.hints([["↑ ↓", "choose"], ["⇥ ⏎", "pick"], ["esc", "close"]]) if menu
       keys =
         case focused.kind
         when :multiline then [["⏎", "newline"], ["^V", "image"]]
@@ -182,7 +187,7 @@ module ClaudeInbox
       keys.unshift(["^U", "recent"]) if focused.key == :cwd && @places.any?
       keys += [["^S", "start"], ["^O", "start & open"],
         ["⇥", (focused.key == :cwd) ? "complete / next" : "next"], ["esc", "cancel"]]
-      hints(keys)
+      @theme.hints(keys)
     end
 
     # The App's `claude --bg` call failed after `:start`/`:start_and_attach`
@@ -299,8 +304,6 @@ module ClaudeInbox
       rows
     end
 
-    def hints(pairs) = pairs.map { |k, d| @theme.cyan_bold(k) + " " + @p.dim(d) }.join("  ")
-
     def field_label(f)
       on = f.equal?(focused)
       (on ? @theme.yellow_bold("▶ ") : "  ") + (on ? @p.bold(Text.pad(f.label, 14)) : @p.dim(Text.pad(f.label, 14)))

data/lib/claude_inbox/remote/listener.rb

@@ -200,11 +200,11 @@ module ClaudeInbox
         authenticated(slot) if slot
         Http.write(io, *answer(request, io, via))
       rescue Http::Error => e
-        Http.write(io, e.status, Http::JSON_TYPE.merge(e.headers), JSON.generate(e.body))
+        refuse(io, e)
       rescue => e
         # A message can name a path under the home directory, which is
         # nobody's business before the token checks out.
-        Http.write(io, 500, Http::JSON_TYPE, JSON.generate(error: authorized ? Http.utf8(e.message) : "internal error"))
+        refuse(io, Http::Error.new(500, authorized ? e.message : "internal error"))
       end
 
       private
@@ -322,23 +322,27 @@ module ClaudeInbox
           if slot[:busy] then @turning_away -= 1
           else
             @alive -= 1
-            release_unauthenticated(slot[:via]) unless slot[:authenticated]
+            release_unauthenticated(slot)
           end
         end
       end
 
       # Under the mutex. A host leaves the hash at zero, so it holds only
       # hosts connected now.
-      def release_unauthenticated(via)
+      def release_unauthenticated(slot)
+        return if slot[:authenticated]
+        via = slot[:via]
         @unauthenticated[via] -= 1
         @unauthenticated.delete(via) if @unauthenticated[via].zero?
       end
 
+      def refuse(io, error) = Http.write(io, error.status, Http::JSON_TYPE.merge(error.headers), JSON.generate(error.body))
+
       # `handle` answers every failure it can; what is left is the socket
       # itself going away, and a thread must not report that on stderr.
       def serve(sock, slot)
         if slot[:busy]
-          Http.write(sock, 503, Http::JSON_TYPE.merge("Retry-After" => "2"), JSON.generate(error: "busy: try again in a moment"))
+          refuse(sock, Http::Error.new(503, "busy: try again in a moment", headers: {"Retry-After" => "2"}))
         else
           handle(sock, via: slot[:via], slot: slot)
         end
@@ -353,7 +357,7 @@ module ClaudeInbox
 
       def authenticated(slot)
         @mutex.synchronize do
-          release_unauthenticated(slot[:via]) unless slot[:authenticated]
+          release_unauthenticated(slot)
           slot[:authenticated] = true
         end
       end

data/lib/claude_inbox/remote/pairing_dialog.rb

@@ -41,7 +41,7 @@ module ClaudeInbox
           @asking = false
           return (key == "y") ? :rotate : nil
         end
-        return :cancel if name == :escape || key == "q"
+        return :cancel if dismiss?(name, key)
         return nil unless @snapshot.call.state == :listening
         case key
         when "c" then :copy
@@ -87,7 +87,7 @@ module ClaudeInbox
       def key_lines(s)
         return ["  paired phones get 401 until they pair again —", "  rotate? y/n"] if @asking
         keys = (s.state == :listening) ? [%w[c copy], ["r", "new token"], %w[esc close]] : [%w[esc close]]
-        ["  " + keys.map { |k, action| "#{key(k)} #{@theme.dim(action)}" }.join("  ")]
+        ["  " + @theme.hints(keys)]
       end
     end
   end

data/lib/claude_inbox/renderer.rb

@@ -198,7 +198,7 @@ module ClaudeInbox
       text =
         if view.filter_editing then " " + @theme.cyan_bold("/") + view.filter.row(width - 2, cursor: caret)
         elsif view.filter then " " + @theme.cyan_bold("/") + view.filter.to_s + @p.dim("  esc clears")
-        else " " + footer_keys(view).map { |k, d| @theme.cyan_bold(k) + " " + @p.dim(d) }.join("  ")
+        else " " + @theme.hints(footer_keys(view))
         end
       Text.pad(text, width)
     end
@@ -250,7 +250,7 @@ module ClaudeInbox
     def loading_state(width, height, waited, tick)
       return [] if waited < LOADING_QUIET
       block = [
-        centered(@theme.cyan_bold(SPINNER[tick % SPINNER.size]), width),
+        centered(@theme.cyan_bold(spinner(tick)), width),
         "",
         centered(tray(tick), width),
         "",
@@ -263,6 +263,8 @@ module ClaudeInbox
       [""] * [(height - block.size) / 2, 0].max + block
     end
 
+    def spinner(tick) = SPINNER[tick % SPINNER.size]
+
     TRAY_SLOTS = 9
 
     # A dot bouncing between the ends of a tray, one slot per tick.
@@ -302,8 +304,8 @@ module ClaudeInbox
       quiet = section == :settled || (live && row.read?)
       unread = live && row.unread?
       # A terminal cannot be attached to, so it is never read: while it waits on you it keeps its dot.
-      alert = live && s.needs_you? && (unread || !s.actionable?)
-      marker = marker_for(sel, unread, alert)
+      dotted = unread || (live && s.needs_you? && !s.actionable?)
+      marker = marker_for(sel, dotted)
       glyph = glyph_for(s, section, tick)
       meta = meta_for(row, section, now)
 
@@ -328,13 +330,12 @@ module ClaudeInbox
       [Text.pad(first, width), Text.pad(detail, width)]
     end
 
-    # The caret takes the column. Otherwise one filled dot asks for a look:
-    # red while the row needs you, blue when it only finished. Read, it
-    # clears, and the meta still says needs you.
-    def marker_for(sel, unread, alert)
+    # The caret takes the column. Otherwise a blue dot asks for a look, in
+    # every state: glyph and meta already say needs you in red, so the dot
+    # only says unread. Read, it clears.
+    def marker_for(sel, dotted)
       if sel then @theme.yellow_bold("▶")
-      elsif alert then @theme.red_bold("●")
-      elsif unread then @theme.blue("●")
+      elsif dotted then @theme.blue("●")
       else " "
       end
     end
@@ -362,7 +363,7 @@ module ClaudeInbox
       case s.effective_state
       when "blocked" then @theme.red_bold("?")
       when "failed" then @theme.red_bold("✗")
-      when "working" then s.waiting_on_work? ? @theme.yellow("◌") : @theme.yellow(SPINNER[tick % SPINNER.size])
+      when "working" then s.waiting_on_work? ? @theme.yellow("◌") : @theme.yellow(spinner(tick))
       when "done" then @theme.green("✓")
       when "stopped" then @p.dim("■")
       else @p.dim("·")

data/lib/claude_inbox/session_request.rb

@@ -26,6 +26,7 @@ module ClaudeInbox
     FLAGS = {true => true, false => false, "yes" => true, "no" => false}.freeze
     MAX_PROMPT = 100_000
     MAX_NAME = 100
+    NOT_ONE_LINE = /[[:cntrl:]\u2028\u2029]/
 
     # The hash NewSessionForm#values builds, before `resolve`, from a
     # request's fields, or Invalid. "default" is nil. An unknown key is
@@ -123,7 +124,7 @@ module ClaudeInbox
     def self.name_param(value)
       return nil if value.nil?
       name = string_param(:name, value).strip
-      raise Invalid.new(:name, "a name is one line") if name.match?(/[[:cntrl:]\u2028\u2029]/)
+      raise Invalid.new(:name, "a name is one line") if name.match?(NOT_ONE_LINE)
       raise Invalid.new(:name, "the name is over #{MAX_NAME} characters") if name.length > MAX_NAME
       name.empty? ? nil : name
     end
@@ -133,19 +134,21 @@ module ClaudeInbox
       parts = path.split("/").reject(&:empty?)
       (1..parts.size).each do |n|
         label = parts.last(n).join("/")
-        return label if dirs.one? { |other| other.end_with?("/#{label}") }
+        return label if dirs_called(dirs, label).one?
       end
       path
     end
 
+    def self.dirs_called(dirs, label) = dirs.select { |dir| dir.end_with?("/#{label}") }
+
     # A path is taken as given. Anything else names one of `dirs` by its
     # `label`.
     def self.cwd_param(value, dirs)
       cwd = string_param(:cwd, value || "").strip
       raise Invalid.new(:cwd, "a directory is required") if cwd.empty?
-      raise Invalid.new(:cwd, "a directory is one line") if cwd.match?(/[[:cntrl:]\u2028\u2029]/)
+      raise Invalid.new(:cwd, "a directory is one line") if cwd.match?(NOT_ONE_LINE)
       return File.expand_path(cwd) if cwd.match?(%r{\A(/|~(/|\z))})
-      found = dirs.select { |dir| dir.end_with?("/#{cwd}") }
+      found = dirs_called(dirs, cwd)
       raise Invalid.new(:cwd, "no directory called #{cwd}") if found.empty?
       raise Invalid.new(:cwd, "#{cwd} could be any of #{found.join(", ")}") if found.size > 1
       found.first
@@ -173,6 +176,6 @@ module ClaudeInbox
       text
     end
 
-    private_class_method :prompt_param, :name_param, :cwd_param, :choice_param, :flag_param, :string_param
+    private_class_method :prompt_param, :name_param, :cwd_param, :choice_param, :flag_param, :string_param, :dirs_called
   end
 end

data/lib/claude_inbox/snooze_time.rb

@@ -28,8 +28,8 @@ module ClaudeInbox
       case head
       when nil then nil
       when "tonight", "evening" then rest.nil? ? next_at(now, EVENING) : nil
-      when "tomorrow" then (hm = rest ? clock(rest) : MORNING) && at(now, 1, hm)
-      when WEEKDAY then (hm = rest ? clock(rest) : MORNING) && weekday(now, WEEKDAYS[head[0, 3]], hm)
+      when "tomorrow" then (hm = time_of_day(rest)) && at(now, 1, hm)
+      when WEEKDAY then (hm = time_of_day(rest)) && weekday(now, WEEKDAYS[head[0, 3]], hm)
       else (hm = clock(text)) && next_at(now, hm)
       end
     end
@@ -49,6 +49,9 @@ module ClaudeInbox
       [hour, minute]
     end
 
+    # A day's snooze: the time after the word, else 9am.
+    def self.time_of_day(rest) = rest ? clock(rest) : MORNING
+
     # That day at `hm`, or a week on when it has already passed.
     def self.weekday(now, wday, hm)
       t = at(now, (wday - now.wday) % 7, hm)
@@ -65,6 +68,6 @@ module ClaudeInbox
       day = now.to_date + days
       Time.new(day.year, day.month, day.day, hour, minute, 0, now.utc_offset).to_i
     end
-    private_class_method :clock, :weekday, :next_at, :at
+    private_class_method :clock, :time_of_day, :weekday, :next_at, :at
   end
 end

data/lib/claude_inbox/store/row.rb

@@ -46,31 +46,29 @@ module ClaudeInbox
       # `x` holds through the session finishing; any other state change afterwards lifts it.
       def hand_settled?
         return false unless entry&.settled_at
-        session.finished? || entry.state_since.to_i <= entry.settled_at.to_i
+        session.finished? || unchanged_since?(entry.settled_at)
       end
 
       # Attaching marks the current state seen: out of Needs You, but into
       # Active rather than Settled, until the state changes again.
-      def acknowledged?
-        entry&.acknowledged_at && entry.state_since.to_i <= entry.acknowledged_at.to_i
-      end
+      def acknowledged? = unchanged_since?(entry&.acknowledged_at)
+
+      # 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.
+      def markable? = session.actionable? && (session.finished? || session.needs_you?)
 
-      # Finished or needing you since you last attached. Only a session you
-      # can attach to counts, since nothing else ever clears the mark.
+      # Finished or needing you since you last attached.
       def unread?
-        return false unless session.actionable?
-        return false unless session.finished? || session.needs_you?
-        entry&.last_visited_at.nil? || entry.state_since.to_i > entry.last_visited_at.to_i
+        return false unless markable?
+        !unchanged_since?(entry&.last_visited_at)
       end
 
       # A finished or blocked session you have attached to since: you have seen what it wants.
-      def read? = session.actionable? && (session.finished? || session.needs_you?) && !unread?
+      def read? = markable? && !unread?
 
       # `u` overrides hand-settle and the PR rule alike, and holds until the
       # state actually changes rather than just for the next poll.
-      def revived?
-        entry&.revived_at && entry.state_since.to_i <= entry.revived_at.to_i
-      end
+      def revived? = unchanged_since?(entry&.revived_at)
 
       # Failing checks or requested changes on the PR want you back the way
       # a blocked session does, once the agent has stopped working on it.
@@ -119,6 +117,10 @@ module ClaudeInbox
         else :active
         end
       end
+
+      private
+
+      def unchanged_since?(at) = at && entry.state_since.to_i <= at.to_i
     end
   end
 end

data/lib/claude_inbox/subprocess.rb

@@ -73,5 +73,6 @@ module ClaudeInbox
     ensure
       writer.close
     end
+    private_class_method :feed
   end
 end

data/lib/claude_inbox/theme.rb

@@ -38,6 +38,9 @@ module ClaudeInbox
     # or choice — the inverse of `color`, which puts the hue on the text.
     def pill(text, hue) = "\e[38;5;#{BG};48;5;#{HUES.fetch(hue)}m#{text}\e[0m"
 
+    # A footer's key hints: `n new  N pair`.
+    def hints(pairs) = pairs.map { |k, d| cyan_bold(k) + " " + dim(d) }.join("  ")
+
     private
 
     def color(text, hue, bold: false)

data/lib/claude_inbox/updater.rb

@@ -6,6 +6,7 @@ require "net/http"
 require "rbconfig"
 require_relative "../claude_inbox"
 require_relative "mod"
+require_relative "records"
 require_relative "subprocess"
 
 module ClaudeInbox
@@ -33,6 +34,8 @@ module ClaudeInbox
     end
 
     Applied = Data.define(:success, :output) do
+      def self.from(result) = new(success: result.success?, output: result.out + result.err)
+
       def success? = success
     end
 
@@ -105,7 +108,7 @@ module ClaudeInbox
 
     def install_gem
       result = @run.call(Gem.ruby, File.join(RbConfig::CONFIG["bindir"], "gem"), "install", "claude-inbox")
-      Applied.new(success: result.success?, output: result.out + result.err)
+      Applied.from(result)
     end
 
     def gem_update(latest)
@@ -140,7 +143,7 @@ module ClaudeInbox
       return Applied.new(success: false, output: "not on main (on #{branch})") unless branch == "main"
       return Applied.new(success: false, output: "the working tree is dirty") unless git("status", "--porcelain") == ""
       merged = @run.call("git", "-C", @root, "merge", "--ff-only", "--quiet", "main@{upstream}")
-      Applied.new(success: merged.success?, output: merged.out + merged.err)
+      Applied.from(merged)
     end
 
     def git(*args)
@@ -149,15 +152,14 @@ module ClaudeInbox
     end
 
     def fresh_cache
-      cache = JSON.parse(File.read(@cache_path))
+      cache = Records.read(@cache_path)
       cache["latest"] if cache["kind"] == kind.to_s && @clock.call.to_i - cache["checked_at"].to_i < FRESH_FOR
-    rescue SystemCallError, JSON::ParserError, TypeError
+    rescue SystemCallError, TypeError
       nil
     end
 
     def write_cache(latest)
-      FileUtils.mkdir_p(File.dirname(@cache_path))
-      File.write(@cache_path, JSON.generate(checked_at: @clock.call.to_i, kind: kind, latest: latest))
+      Records.save(@cache_path, {checked_at: @clock.call.to_i, kind: kind, latest: latest})
     end
   end
 end

data/lib/claude_inbox/writer_lock.rb

@@ -24,18 +24,18 @@ module ClaudeInbox
       return true unless @path
       FileUtils.mkdir_p(File.dirname(@path))
       file = File.open(@path, File::RDWR | File::CREAT, 0o600)
-      return hold(file, role) if file.flock(File::LOCK_EX | File::LOCK_NB)
+      return hold(file, role) if try_lock(file)
       holder_role, holder = file.read.split
       return refuse(file) unless role == "inbox" && holder_role == "headless" && headless?(holder.to_i)
       Process.kill("TERM", holder.to_i)
       EVICT_TRIES.times do
-        return hold(file, role) if file.flock(File::LOCK_EX | File::LOCK_NB)
+        return hold(file, role) if try_lock(file)
         sleep 0.1
       end
       refuse(file)
     rescue Errno::ESRCH, Errno::EPERM
       # The holder the file names is gone already: the lock is free.
-      file.flock(File::LOCK_EX | File::LOCK_NB) ? hold(file, role) : refuse(file)
+      try_lock(file) ? hold(file, role) : refuse(file)
     end
 
     private
@@ -48,6 +48,8 @@ module ClaudeInbox
       command.include?("claude-inbox") && command.split.include?("--headless")
     end
 
+    def try_lock(file) = file.flock(File::LOCK_EX | File::LOCK_NB)
+
     # After reading the holder the position sits at the end, and truncate does
     # not move it, so the write is rewound first or it lands after NUL padding.
     def hold(file, role)

data/lib/claude_inbox.rb

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

data/mod/hooks/register.tsx

@@ -460,17 +460,16 @@ export const register: Register = (on, options) => {
               // A finished or blocked row you have attached to since dims, as the gem's Active section draws it,
               // unless it is tinted: faint ink on a /color background is unreadable.
               const isRead = !isQuiet && one.actionable && ['done', 'stopped', 'blocked', 'failed'].includes(one.state) && !one.isUnread
-              // One dot asks for a look: red while the row needs you, blue when it only finished. A terminal
-              // cannot be attached to, so it is never read and keeps its dot while it waits.
+              // A blue dot asks for a look in every state, as the gem draws it: the glyph already says needs you
+              // in red. A terminal cannot be attached to, so it is never read and keeps its dot while it waits.
               const needsYou = one.state === 'blocked' || one.state === 'failed'
-              const alert = !isQuiet && needsYou && (one.isUnread || !one.actionable)
-              const dot = alert || (one.isUnread && !isQuiet)
+              const dot = !isQuiet && (one.isUnread || (needsYou && !one.actionable))
               const text = one.wakeAt !== undefined ? `${one.label} · ${wakeLabel(one.wakeAt)}` : one.label
               const tint = one.color ? TINT[one.color] : undefined
               return (
                 <Box key={viewKey(item)} flexDirection="column">
                   <Box>
-                    <Text color={isHere ? 'yellow' : alert ? 'red' : 'blue'}>{isHere ? '› ' : dot ? '● ' : '  '}</Text>
+                    <Text color={isHere ? 'yellow' : 'blue'}>{isHere ? '› ' : dot ? '● ' : '  '}</Text>
                     <Text color={COLOR[one.state]} dimColor={isQuiet || one.state === 'done'}>
                       {GLYPH[one.state] ?? '·'}{' '}
                     </Text>

data/mod/tests/pane.test.tsx

@@ -87,6 +87,19 @@ test('a poll takes the notice from the snapshot', async ($, on) => {
   expect(set.update).toBe('v0.6.0 available')
 })
 
+test('an unread row that needs you takes the same blue dot as one that only finished', async ($, on) => {
+  mock.env(on, { HOME: '/Users/me' })
+  mock.clock(on, { now: 1_700_000_000_000 })
+  on('state.get', ($, e, next) => {
+    if (e.key === 'rows') return seeded([{ ...ROWS[0], isUnread: true }, { ...ROWS[0], id: 'a2', isUnread: true }])
+    if (e.key === 'writtenAt') return seeded(1_700_000_000)
+    return next(e)
+  })
+  const ui = await $.ui.mount({ ...PANE, surface: 'terminal' })
+  // The caret takes one row's column; the header's red needs-you chip is no row's dot.
+  expect((await ui.findAll({ type: 'Text', text: '● ' })).filter(dot => dot.props.color === 'blue')).toHaveLength(1)
+})
+
 test("rows sit under the gem's sections, Settled folded until za opens it", async ($, on) => {
   mock.env(on, { HOME: '/Users/me' })
   mock.clock(on, { now: 1_700_000_000_000 })

metadata

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