claude-inbox 0.14.0 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c346a215bf94ae3088c6ce5ddff23a2852e0294b77bbaa92a980d6baf4315cb7
-  data.tar.gz: 92e53f999cc3731ab9bf96c20e96048cd47a2261cb9640ed26bdafdc5032bbd6
+  metadata.gz: d987ed72f80dde3f91bd8ddeb3486aa867fb25e8b4ac5be91305654be021c9b0
+  data.tar.gz: 5a4874f4eee5a49c7bf56921db71f966f935397001a20a58c53a71bec69b013b
 SHA512:
-  metadata.gz: cb9dc45979798d3e8c73534f06c1e6dc73a6bdfb5019c6df3f87ae7e3e3adb6cf0d67f370e61f29729f3a10a07a5728a58507dd1f961929843c2798e52f5cd18
-  data.tar.gz: 59558583519adb57a59ab15c9bad0d78bff87b8db105210c8bdd63370eaa40d3105a68bed312ec0972bfd6fe91bca53866c39decd734db64b09059d8071d4860
+  metadata.gz: c75cc50ea18dd72da00508eb50066dc6f0a7b9b20a1e8bb6ed042272bac0c45cd963ec31efe570b080dfaf9b4ec191c56143de05a229c2f83212b7baad551728
+  data.tar.gz: 5ed8c579ff1405d26327bc6c39acc95cd79a5c0eb3706314aeab91f006bdc940d699e6ba41f35396e3af9b372900329ec8978d122e6026a8f766554a7501c806

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 "
@@ -144,13 +145,13 @@ module ClaudeInbox
 
       def lines(width, _caret)
         case kind
-        when :stop then [ask("Stop", width), "", "  " + hint("y", "stop it"), "  " + hint("esc", "cancel")]
+        when :stop then [ask("Stop", width), *answers("stop it", "cancel")]
         when :delete
           [ask("Delete", width), "  Its worktree and conversation", "  go with it.",
-            "", "  " + hint("y", "delete it"), "  " + hint("esc", "keep it")]
+            *answers("delete it", "keep it")]
         when :adopt
           ["  Pull this session into the daemon?", "  Its phone session ends and a",
-            "  new one takes its place.", "", "  " + hint("y", "adopt it"), "  " + hint("esc", "cancel")]
+            "  new one takes its place.", *answers("adopt it", "cancel")]
         end
       end
 
@@ -164,6 +165,8 @@ module ClaudeInbox
 
       # 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)}?"
+
+      def answers(yes, no) = ["", "  " + hint("y", yes), "  " + hint("esc", no)]
     end
 
     # The first launch without the Claude Code pane asks once whether to add

data/lib/claude_inbox/new_session_form.rb

@@ -333,7 +333,7 @@ module ClaudeInbox
 
     def prompt_box(f, w, h)
       on = f.equal?(focused)
-      edge = on ? ->(s) { @theme.cyan(s) } : ->(s) { @p.dim(s) }
+      edge = ->(s) { @theme.tint((:cyan if on), s) }
       rows, hidden = f.value.view(w - 4, h, cursor: (caret if on), chip: ->(s) { @theme.cyan_bold(s) })
       rows = [@p.dim("What should this session do?")] if f.value.empty? && !on
       rows += [""] * (h - rows.size)

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.rb

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

data/mod/hooks/register.tsx

@@ -95,6 +95,11 @@ function itemKey(item: Item): string {
   return item.kind === 'fold' ? `fold:${item.section}` : `row:${item.row.id ?? item.row.label}`
 }
 
+// The Button drawn for a row's pull request, a click on which opens it.
+function prKey(item: Item): string | undefined {
+  return item.kind === 'row' && item.row.pr ? `pr:${itemKey(item)}` : undefined
+}
+
 // The visible box drawn for an item, what the pane scrolls to.
 function viewKey(item: Item): string {
   return `view:${itemKey(item)}`
@@ -313,14 +318,18 @@ export const register: Register = (on, options) => {
   // the cursor's item, the arrows move it to the next, and the cursor follows.
   on('ui.focus', { requestId: PANE }, async ($, e, next) => {
     const flat = await listed($)
+    const was = onList(flat, await read($, cursor))
     if (e.element === undefined) {
-      const item = flat[onList(flat, await read($, cursor))]
+      const item = flat[was]
       return item ? next({ ...e, element: itemKey(item) }) : next(e)
     }
-    const at = flat.findIndex(item => itemKey(item) === e.element)
+    // A PR chip's Button sits in the ring between its row and the next: the ring arrives on it going down
+    // from its own row, so it passes on to the next; going up, or by a click, it lands on its own row.
+    const chipOf = flat.findIndex(item => prKey(item) === e.element)
+    const at = chipOf < 0 ? flat.findIndex(item => itemKey(item) === e.element) : chipOf === was ? Math.min(chipOf + 1, flat.length - 1) : chipOf
     if (at < 0) return {}
     await update($, cursor, () => at)
-    return next(e)
+    return next({ ...e, element: itemKey(flat[at]!) })
   })
 
   // An arrow in a focused pane scrolls its body a row while the tree is taller than the
@@ -335,7 +344,7 @@ export const register: Register = (on, options) => {
   })
 
   on('ui.render', { component: 'Pane', requestId: PANE }, async ($, e) => {
-    const { Box, Text, Button, Link } = $.ui.resolve(e)
+    const { Box, Text, Button } = $.ui.resolve(e)
     const list = await read($, rows)
     const viewing = await read($, current)
     const folded = await read($, folds)
@@ -384,6 +393,12 @@ export const register: Register = (on, options) => {
       if (!item.row.id || !item.row.actionable) return $.ui.toast('this session cannot be attached')
       void requestSwitch($, host, item.row.id)
     }
+    // The click's focus may have walked the ring past the row, so the cursor is put back on it.
+    const openPr = (item: Item) => () => {
+      if (item.kind !== 'row' || !item.row.pr) return
+      const url = item.row.pr.url
+      void moveTo($, flat, flat.indexOf(item)).then(() => openInBrowser($, url))
+    }
 
     // Only the keys a chord allows are mounted while it waits, so any other key is a no-op.
     const keys =
@@ -475,10 +490,13 @@ export const register: Register = (on, options) => {
               return (
                 <Box key={viewKey(item)} flexDirection="column">
                   <Box>
-                    <Text color={isHere ? 'yellow' : 'blue'}>{isHere ? '› ' : dot ? '● ' : '  '}</Text>
-                    <Text color={COLOR[one.state]} dimColor={isQuiet || one.state === 'done'}>
-                      {GLYPH[one.state] ?? '·'}{' '}
-                    </Text>
+                    {/* Only the label gives way to a long row: a squeezed glyph wraps under itself. */}
+                    <Box flexShrink={0}>
+                      <Text color={isHere ? 'yellow' : 'blue'}>{isHere ? '› ' : dot ? '● ' : '  '}</Text>
+                      <Text color={COLOR[one.state]} dimColor={isQuiet || one.state === 'done'}>
+                        {GLYPH[one.state] ?? '·'}{' '}
+                      </Text>
+                    </Box>
                     {/* A Button cannot truncate, so its Box clips a long label to the row. A Button takes no
                         color either, so a session's /color is the Box's background rather than the label's ink. */}
                     <Box key={`label:${itemKey(item)}`} height={1} flexShrink={1} overflow="hidden" backgroundColor={tint}>
@@ -494,15 +512,19 @@ export const register: Register = (on, options) => {
                         {one.isUnread && !isQuiet ? <Text bold>{text}</Text> : text}
                       </Button>
                     </Box>
-                    {/* The label gives up its cells to the PR chip, which would otherwise wrap under it. */}
+                    {/* Takes what a short label leaves, so the PR and age sit at the right edge on every row;
+                        the label's own box would stretch a /color tint across it. */}
+                    <Box flexGrow={1} />
+                    {/* The label gives up its cells to the PR chip, which would otherwise wrap under it. The chip is
+                        a Button rather than a Link: a terminal without OSC 8 cannot click a Link, and prints its URL. */}
                     {one.pr ? (
                       <Box flexShrink={0}>
-                        <Box key={`pr:${itemKey(item)}`} marginLeft={1} hover={{ backgroundColor: 'subtle' }}>
-                          <Link href={one.pr.url}>
+                        <Box marginLeft={1}>
+                          <Button key={prKey(item)} plain label={one.pr.short} onPress={openPr(item)}>
                             <Text underline color={isQuiet ? undefined : PR_COLOR[one.pr.state]} dimColor={isQuiet}>
                               {one.pr.short}
                             </Text>
-                          </Link>
+                          </Button>
                         </Box>
                         <Text color={isQuiet ? undefined : PR_COLOR[one.pr.state]} dimColor={isQuiet}>
                           {' '}

data/mod/tests/pane.test.tsx

@@ -129,7 +129,7 @@ test("rows sit under the gem's sections, Settled folded until za opens it", asyn
     expect((await ui.findAll({ type: 'Text', text: '● ' })).filter(dot => dot.props.color === 'blue')).toHaveLength(1)
     expect((await ui.find({ type: 'Text', text: 'finished unseen' }))?.props.bold).toBe(true)
     expect(await ui.find({ type: 'Text', text: 'still going' })).toBeUndefined()
-    expect((await ui.find({ type: 'Link' }))?.props.href).toBe('https://github.com/o/r/pull/7')
+    expect((await ui.find({ type: 'Button', key: 'pr:row:b2' }))?.props.label).toBe('#7')
     expect((await ui.find({ type: 'Text', text: '#7' }))?.props.underline).toBe(true)
     expect(await ui.find({ text: /1 folded/ })).toBeDefined()
     expect(await ui.find({ text: /put away/ })).toBeUndefined()
@@ -250,7 +250,7 @@ test('a switch hands the keys back to the prompt before it asks, so a return lan
   await ui.unmount()
 })
 
-test('o and w hand the keys back to the prompt before they open the browser', async ($, on) => {
+test('o, w and a click on the PR hand the keys back to the prompt before they open the browser', async ($, on) => {
   mock.env(on, { HOME: '/Users/me' })
   mock.clock(on, { now: 1_700_000_000_000 })
   const remote = { ...ROWS[1], remote: 'https://claude.ai/code/session_b2' }
@@ -271,6 +271,7 @@ test('o and w hand the keys back to the prompt before they open the browser', as
   const ui = await $.ui.mount({ ...PANE, surface: 'terminal' })
   await ui.press({ key: 'o' })
   await ui.press({ key: 'w' })
+  await ui.press({ key: 'pr:row:b2' })
   expect(calls).toEqual([
     'close inbox',
     'open inbox',
@@ -278,6 +279,9 @@ test('o and w hand the keys back to the prompt before they open the browser', as
     'close inbox',
     'open inbox',
     'open https://claude.ai/code/session_b2',
+    'close inbox',
+    'open inbox',
+    'open https://github.com/o/r/pull/7',
   ])
   await ui.unmount()
 })
@@ -360,3 +364,23 @@ test('with openOnStart off only /inbox opens it', { options: { openOnStart: fals
   await polled
   expect(opened).toEqual([])
 })
+
+test("the ring steps over a row's PR chip: down to the next row, up onto its own", async ($, on) => {
+  mock.env(on, { HOME: '/Users/me' })
+  mock.clock(on, { now: 1_700_000_000_000 })
+  on('state.get', ($, e, next) => (e.key === 'rows' ? seeded(ROWS) : e.key === 'writtenAt' ? seeded(1_700_000_000) : next(e)))
+  const landed: (string | undefined)[] = []
+  on('ui.focus', ($, e) => {
+    landed.push(e.element)
+    return {}
+  })
+  const ui = await $.ui.mount({ ...PANE, surface: 'terminal' })
+  // The harness has no ring to walk, so the test raises ui.focus as the engine does for an arrow.
+  const arrowOnto = (element: string) =>
+    $.ui.focus({ component: 'Pane', requestId: 'inbox', plugin: 'inbox-pane', element, origin: { kind: 'person' } } as never)
+  await arrowOnto('row:b2')
+  await arrowOnto('pr:row:b2')
+  await arrowOnto('pr:row:b2')
+  expect(landed).toEqual(['row:b2', 'row:uuid-term', 'row:b2'])
+  await ui.unmount()
+})

metadata

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