claude-inbox 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f240b8de798a2fea0c318d9bd7882e2d05cf7bdcbdc48fea7698f2ac8e6dc82
-  data.tar.gz: a94912ebe0d438922d9f5bdc334e0be3465e7997fb9767bc1e2a6ef9f7ed55b4
+  metadata.gz: 56e25a548ff2899f765523fbf990e66b96f970915c8efafa39fb8834af99f6db
+  data.tar.gz: 590e72d23244e04517692beee562c53c59cecba10028b16ea9a371560392fcec
 SHA512:
-  metadata.gz: da9407631ff4ec1f734e9e69baf306cace5042f50e473a9d98487629c59109df9bda5e511d15db5db575cebb9e7b95bf02bcc504b8a617a43602e7421a1f1418
-  data.tar.gz: 5d79b77a64ffde8d41933bfaa7946ee550b791f55b7131c6a7057a1caab476164591eb7f2baeaf5285e96f9a7a84b9f30aeeac891196b6d7baa8ac3bafe25b54
+  metadata.gz: ffb0d572f03f482149ddf17f599d936a99de569340e6dbc61d587a5b736aa1919d78d300ddde35689e6b31b15a020eef350830668b046288df6925e021768ecb
+  data.tar.gz: 56805ff4fd994c5a22ef94742a801a6693b04b577f3ebfee63bb99271ff5de68f343e54f33011558852c7dbaeb6851124a944aa2b091190f95479ce51d2736fd

data/README.md

@@ -40,7 +40,7 @@ a fullscreen terminal.
 
 `/inbox` opens it, `ctrl+x tab` focuses it and `esc` leaves. The keys are the
 ones below, with `ge` for `G`, `n` `p` for `Tab` `Shift+Tab`, and no `a`,
-`P`, `X`, `Ctrl-x`, `/`, `R`, `U` or `y`, and `s` has no `5`. `Enter`, or a click on a row, switches to the
+`P`, `X`, `Ctrl-x`, `/`, `R` or `U`, and `s` has no `5`. `Enter`, or a click on a row, switches to the
 session when you attached through `claude-inbox`.
 
 It opens when a session starts. To stop that, set
@@ -61,7 +61,8 @@ It opens when a session starts. To stop that, set
 Under each row is what the session is waiting on, what it produced, or its
 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. A steady `◌` with `idle · 1 shell` means the agent stopped
+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.
@@ -86,9 +87,9 @@ Vim bindings. Arrows and the mouse work too.
 | `u` | wake a snoozed session, or bring back a settled one |
 | `x` | settle by hand |
 | `a` | set a local alias |
-| `o` | open the pull request in the browser |
+| `o` | open the pull request in the browser; with several, `o` again opens the one that matters, `1`… another |
 | `w` | open the session at claude.ai/code |
-| `y` | copy the pull request url, or the session's address |
+| `y` | copy the pull request url, or the session's address; with several, `y` again copies the one that matters, `1`… another |
 | `P` | link a pull request by hand (empty clears) |
 | `X` | stop the session; `Enter` resumes it later |
 | `Ctrl-x` | delete the session, transcript and worktree for good |

data/lib/claude_inbox/app/browsing.rb

@@ -4,14 +4,16 @@ module ClaudeInbox
   class App
     # o opens the selected session's pull request and w its claude.ai/code
     # page, through whatever opens URLs on this platform; y copies the one
-    # of those the session has, or its id.
+    # of those the session has, or its id. With several PRs, o and y ask
+    # which first.
     module Browsing
       private
 
       def open_pr
-        pr = selected_session&.pr
-        return notice("no pull request linked — P sets one") unless pr
-        open_in_browser(pr.url, pr.short)
+        session = selected_session
+        return notice("no pull request linked — P sets one") unless session&.pr
+        return @modal = Dialog::PrPicker.new(:open, session) if session.prs.size > 1
+        open_in_browser(session.pr.url, session.pr.short)
       end
 
       def open_remote
@@ -23,7 +25,17 @@ module ClaudeInbox
       def yank
         session = selected_session
         return notice("nothing to copy") unless session
-        text, what = yank_target(session)
+        return @modal = Dialog::PrPicker.new(:copy, session) if session.prs.size > 1
+        copy_to_clipboard(*yank_target(session))
+      end
+
+      def pr_picked
+        kind, pr = @modal.kind, @modal.choice
+        @modal = nil
+        (kind == :open) ? open_in_browser(pr.url, pr.short) : copy_to_clipboard(pr.url, pr.short)
+      end
+
+      def copy_to_clipboard(text, what)
         in_background do
           @queue << [:notice, @clipboard.call(text) ? "copied #{what}" : "no clipboard tool found"]
         end

data/lib/claude_inbox/app.rb

@@ -198,6 +198,7 @@ module ClaudeInbox
       case @modal.press(name, key)
       when :cancel then @modal = nil
       when :snooze then snooze_chosen
+      when :pick then pr_picked
       when :confirm
         kind, id = @modal.kind, @modal.id
         @modal = nil

data/lib/claude_inbox/dialog.rb

@@ -21,11 +21,14 @@ module ClaudeInbox
     end
 
     def frame(width, caret = nil)
-      box = [width - 4, self.class::WIDTH].min
+      box = [width - 4, fit].min
       TTY::Box.frame(lines(box - 4, caret).join("\n"), title: {top_left: title}, padding: [0, 1], width: box)
         .split("\n")
     end
 
+    # How wide the box wants to be; the frame caps it at the terminal.
+    def fit = self.class::WIDTH
+
     # `s` snooze: one key per choice, and the choice is read from `choice`.
     class Snooze < Dialog
       MENU = [
@@ -53,6 +56,48 @@ module ClaudeInbox
       end
     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`.
+    class PrPicker < Dialog
+      MARGIN = 6
+      KEYS = {open: "o", copy: "y"}.freeze
+      VERBS = {open: "open", copy: "copy"}.freeze
+
+      attr_reader :choice
+
+      def initialize(kind, session)
+        super(kind, session.key)
+        @prs = [session.pr, *session.prs.reject { |pr| pr.equal?(session.pr) }].first(9)
+      end
+
+      def title = " #{VERBS.fetch(kind).capitalize} pull request "
+
+      # Titles vary, so the box grows to the longest line plus some air,
+      # and never shrinks below a plain dialog.
+      def fit = [WIDTH, lines(Float::INFINITY, nil).map { |l| Text.width(l) }.max + MARGIN].max
+
+      def lines(width, _caret)
+        (@prs.each_with_index.map { |pr, i| "  #{i + 1}  #{label(pr)}" } +
+          ["", "  #{KEYS.fetch(kind)}  #{VERBS.fetch(kind)} #{@prs.first.short} · esc cancel"])
+          .map { |line| Text.truncate(line, width) }
+      end
+
+      def press(name, key)
+        return :cancel if name == :escape || key == "q"
+        @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
+      end
+
+      private
+
+      # A bare #190 is ambiguous only once the list spans repos.
+      def label(pr)
+        name = (@prs.map(&:repo).uniq.size > 1) ? pr.qualified : pr.short
+        ["#{name} #{pr.state&.downcase}".strip, pr.trouble, pr.title].compact.join(" · ")
+      end
+    end
+
     # `X` stop, `Ctrl-x` delete and Enter on a remote row all ask first and
     # all take `y`, but the words differ because the outcomes do: read the
     # box before answering.

data/lib/claude_inbox/pull_requests.rb

@@ -6,16 +6,27 @@ require_relative "records"
 require_relative "subprocess"
 
 module ClaudeInbox
+  # What is wrong with an open PR, in the words its badge and the picker
+  # use. CLEAN and unknown say nothing.
+  PR_TROUBLE = {"FAILING" => "✗ checks", "CHANGES_REQUESTED" => "changes requested", "CONFLICTING" => "conflicts"}.freeze
+
   # A pull request tied to a session. `state` uses GitHub's vocabulary plus
   # DRAFT, the same as Claude Code's own cache: OPEN, DRAFT, MERGED, CLOSED,
   # or nil when nothing has told us yet. `resolved_at` is when it was merged
   # or closed, in epoch seconds, once gh has said. `health` is what gh last
   # said is wrong with an open PR: FAILING (a check), CHANGES_REQUESTED or
   # CONFLICTING; CLEAN when nothing is, nil when nothing has said. Claude
-  # Code's cache knows nothing of it, and a resolved PR has none.
-  PullRequest = Struct.new(:number, :url, :state, :resolved_at, :health) do
+  # Code's cache knows nothing of it, and a resolved PR has none. `title`
+  # is whatever gh or the cache last called it, nil until one has.
+  PullRequest = Struct.new(:number, :url, :state, :resolved_at, :health, :title) do
     def short = number ? "##{number}" : url.to_s.sub(%r{\Ahttps?://(www\.)?}, "")
 
+    def repo = url.to_s[%r{\Ahttps://github\.com/([^/\s]+/[^/\s]+)/pull/\d+}, 1]
+
+    def qualified = (number && repo) ? "#{repo}##{number}" : short
+
+    def trouble = PR_TROUBLE[health]
+
     # Failing checks or requested changes want you back; a conflict only
     # waits on whoever rebases.
     def needs_you? = %w[FAILING CHANGES_REQUESTED].include?(health)
@@ -123,7 +134,7 @@ module ClaudeInbox
       state = (h["state"] == "OPEN" && h["isDraft"]) ? "DRAFT" : h["state"]
       resolved_at = h["closedAt"] && Time.iso8601(h["closedAt"]).to_i
       PullRequest.new(number: h["number"], url: h["url"] || url, state: state, resolved_at: resolved_at,
-        health: (health(h) if h["state"] == "OPEN"))
+        health: (health(h) if h["state"] == "OPEN"), title: h["title"])
     rescue JSON::ParserError, ArgumentError
       nil
     end
@@ -163,7 +174,7 @@ module ClaudeInbox
       number = url[%r{/pull/(\d+)}, 1]&.to_i
       cached = resolved[url] || claude_cache[url]
       PullRequest.new(number: cached&.dig("number") || number, url: url, state: cached&.dig("state"),
-        resolved_at: cached&.dig("resolved_at"))
+        resolved_at: cached&.dig("resolved_at"), title: cached&.dig("title"))
     end
 
     # Same shape as Claude Code's cache, so `seed` reads both alike.
@@ -177,14 +188,15 @@ module ClaudeInbox
 
     # Under @mutex.
     def remember(pr)
-      resolved[pr.url] = {"number" => pr.number, "state" => pr.state, "resolved_at" => pr.resolved_at}
+      resolved[pr.url] = {"number" => pr.number, "state" => pr.state, "resolved_at" => pr.resolved_at,
+        "title" => pr.title}
       return unless @resolved_path
       Records.save(@resolved_path, resolved)
     end
 
     def fetch(url)
       r = Subprocess.capture(@gh, "pr", "view", url, "--json",
-        "number,state,isDraft,url,closedAt,statusCheckRollup,reviewDecision,mergeable")
+        "number,state,isDraft,url,closedAt,statusCheckRollup,reviewDecision,mergeable,title")
       r.success? ? self.class.parse(url, r.out) : nil
     rescue SystemCallError
       nil

data/lib/claude_inbox/renderer.rb

@@ -39,11 +39,9 @@ module ClaudeInbox
     # the table isn't named on the badge at all.
     PR_HUES = {"OPEN" => :green, "DRAFT" => nil, "MERGED" => :purple, "CLOSED" => :red}.freeze
 
-    # What is wrong with an open PR, after its badge. Red for what puts the
-    # row in Needs You; a conflict dims, since it waits on a rebase, not on
-    # you. CLEAN and unknown say nothing.
-    PR_TROUBLE = {"FAILING" => [:red, "✗ checks"], "CHANGES_REQUESTED" => [:red, "changes requested"],
-                  "CONFLICTING" => [nil, "conflicts"]}.freeze
+    # The hue of PR_TROUBLE after a badge. Red for what puts the row in
+    # Needs You; a conflict dims, since it waits on a rebase, not on you.
+    PR_TROUBLE_HUES = {"FAILING" => :red, "CHANGES_REQUESTED" => :red}.freeze
 
     SPINNER = %w[⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏].freeze
 
@@ -401,16 +399,20 @@ module ClaudeInbox
       pr ? base + @p.dim(" · ") + pr : base
     end
 
-    # "#885 open", or "#885 open · ✗ checks" when something is wrong. Only
-    # the first PR is shown.
+    # "#885 open", or "#885 open · ✗ checks" when something is wrong. The
+    # headline PR is shown, with a count of the rest.
     def pr_badge(s, section)
       pr = s.pr
       return nil unless pr
+      more = (s.prs.size > 1) ? @p.dim(" · +#{s.prs.size - 1}") : ""
+      pr_state_badge(pr, section) + more
+    end
+
+    def pr_state_badge(pr, section)
       return @p.dim("#{pr.short} #{pr.state&.downcase}".strip) if section == :settled
       return @p.dim(pr.short) unless PR_HUES.key?(pr.state)
       badge = tint(PR_HUES[pr.state], "#{pr.short} #{pr.state.downcase}")
-      hue, trouble = PR_TROUBLE[pr.health]
-      trouble ? badge + @p.dim(" · ") + tint(hue, trouble) : badge
+      pr.trouble ? badge + @p.dim(" · ") + tint(PR_TROUBLE_HUES[pr.health], pr.trouble) : badge
     end
 
     def state_badge(s)

data/lib/claude_inbox/session.rb

@@ -99,6 +99,19 @@ module ClaudeInbox
 
     def project = cwd ? File.basename(cwd) : ""
 
-    def pr = prs.first
+    # 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.
+    def pr = prs.each_with_index.min_by { |pr, i| [headline_rank(pr), i] }&.first
+
+    private
+
+    def headline_rank(pr)
+      if !pr.known? || pr.resolved_before?(created_at) then 4
+      elsif pr.needs_you? then 0
+      elsif pr.health == "CONFLICTING" then 1
+      elsif !pr.resolved? then 2
+      else 3
+      end
+    end
   end
 end

data/lib/claude_inbox.rb

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

data/mod/hooks/register.tsx

@@ -412,11 +412,10 @@ export const register: Register = (on, options) => {
                 key('u', onRow('wake', 'woke')),
                 key('t', onRow('pin', 'pinned')),
                 key('s', () => void startChord($, 's')),
-                key('c', () => {
-                  if (!row?.id) return
-                  void $.ui.copy({ text: `claude attach ${row.id}`, surface: e.surface }).then(copied =>
-                    $.ui.toast(copied.isCopied ? `copied: claude attach ${row.id}` : 'no clipboard here'),
-                  )
+                key('y', () => {
+                  if (!row) return $.ui.toast('nothing to copy')
+                  const text = row.pr?.url ?? row.remote ?? row.id ?? row.label
+                  void $.ui.copy({ text, surface: e.surface }).then(copied => $.ui.toast(copied.isCopied ? `copied ${text}` : 'no clipboard here'))
                 }),
                 key('o', () => (row?.pr ? void openInBrowser($, row.pr.url) : $.ui.toast('no pull request linked'))),
                 key('w', () => (row?.remote ? void openInBrowser($, row.remote) : $.ui.toast('no claude.ai/code page for this session'))),

data/mod/tests/pane.test.tsx

@@ -256,6 +256,28 @@ test('o and w hand the keys back to the prompt before they open the browser', as
   await ui.unmount()
 })
 
+test("y copies the row's pull request, else its claude.ai/code page, else its id", async ($, on) => {
+  mock.env(on, { HOME: '/Users/me' })
+  mock.clock(on, { now: 1_700_000_000_000 })
+  const remote = { section: 'active', id: 'e5', label: 'on the web', state: 'working', actionable: true, remote: 'https://claude.ai/code/session_e5' }
+  on('state.get', ($, e, next) =>
+    e.key === 'rows' ? seeded([ROWS[0], ROWS[1], remote]) : e.key === 'writtenAt' ? seeded(1_700_000_000) : next(e),
+  )
+  const copied: string[] = []
+  on('ui.copy', ($, e) => {
+    copied.push(e.text)
+    return { value: { isCopied: true } }
+  })
+  const ui = await $.ui.mount({ ...PANE, surface: 'terminal' })
+  await ui.press({ key: 'y' })
+  await ui.press({ key: 'j' })
+  await ui.press({ key: 'y' })
+  await ui.press({ key: 'j' })
+  await ui.press({ key: 'y' })
+  expect(copied).toEqual(['a1', 'https://github.com/o/r/pull/7', 'https://claude.ai/code/session_e5'])
+  await ui.unmount()
+})
+
 test('a click on a row puts the cursor on it before it asks for the switch', 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.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Jordan Byron