claude-inbox 0.11.0 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e14abc910988446bead1ad4edc841f64fe256e396765cea5a6b77cd6ae28777
-  data.tar.gz: 8e705e40ce80454dd1d8265f567128fae801286b7112d84f3e63ef00b0228913
+  metadata.gz: 86190c0236a4084ec5b00e5044886f6a6b5ab8b51c8e81ac56d7ee9a78619753
+  data.tar.gz: 763db348bacbb927ec5c5fae6344a02d449ddbf8aeb7dc4460594168e523b5dd
 SHA512:
-  metadata.gz: 895a773cf9237ad41e23826fb4b29f863b55dbbe81954abb9fe3337530b4f9ef77e19642a2a7bfed1bad1710d59e1ca705deabee42205fe52d9e63c7079af1a5
-  data.tar.gz: 211a75470bb66188394cfbb7b0809f0e685e37e4d6c59366b32a8dc3e90fc4cb5f78d5b6ff4c1b42c78ef68d720dcfd29327446f283f0f2343233d0710505e3a
+  metadata.gz: 532e078a269b17bfafd4eb6bbe83893a8be012740bd7fbac7c4625f074c9ce40df5afb9475e0cfbdd09963200265e35dc4335ecfacadfe4a653a83f78033f369
+  data.tar.gz: 51632f06152f27dd1708304ecdc4f9eea0ff9dfba18d8ce302f44a8e7b1d260472d56abf80151d1d48f947faf7432ea2ed47133037c43b570972cc171a4b9e24

data/lib/claude_inbox/app/navigating.rb

@@ -47,6 +47,15 @@ module ClaudeInbox
         select(stops[(idx + delta).clamp(0, stops.size - 1)])
       end
 
+      # Before a row leaves the list: the stop below it, or above it at the
+      # bottom, so working down a section doesn't throw the cursor to the top.
+      def select_neighbour
+        stops = filtered.selections(@expanded)
+        idx = stops.index(@selected)
+        rest = stops - [@selected]
+        select(rest[idx.clamp(..rest.size - 1)]) if idx && rest.any?
+      end
+
       # Tab / Shift-Tab: first selectable row of the next / previous section.
       def jump_section(dir)
         sections = filtered

data/lib/claude_inbox/app/spawning.rb

@@ -28,11 +28,11 @@ module ClaudeInbox
       # it we stay in the inbox and poll, so the new row shows up right away
       # rather than at the next tick.
       def start_session(form, attach:)
-        v = form.values
+        v, note = SessionRequest.without_stray_worktree(form.values)
         notice("starting session…")
         in_background do
           id = @client.spawn(**v)
-          @queue << [:notice, "started #{id}"]
+          @queue << [:notice, ["started #{id}", note].compact.join(" — ")]
           @queue << [:form_started, form]
           @queue << [:select, id]
           attach ? @queue << [:attach, id] : @poller.soon
@@ -53,8 +53,8 @@ module ClaudeInbox
 
       # Someone at the desk may be mid-thought, so a start from another
       # device never moves the cursor, attaches or closes what is open.
-      def remote_started(id, via)
-        notice("started #{id} from #{via}")
+      def remote_started(id, via, note = nil)
+        notice(["started #{id} from #{via}", note].compact.join(" — "))
         @poller.soon
       end
     end

data/lib/claude_inbox/app/triaging.rb

@@ -33,7 +33,9 @@ module ClaudeInbox
 
       def settle_selected
         return unless require_storable
-        @store.settle(@selected.key)
+        key = @selected.key
+        select_neighbour
+        @store.settle(key)
         notice("settled — u brings it back")
       end
 
@@ -44,10 +46,16 @@ module ClaudeInbox
 
       def snooze_chosen
         return @modal = Dialog::Prompt.new(:snooze, @modal.id, "") if @modal.choice == :custom
-        @store.snooze(@modal.id, @modal.choice)
+        snooze_modal_row(@modal.choice)
         @modal = nil
       end
 
+      # A poll can move the cursor while the menu is up, so only step off a row still under it.
+      def snooze_modal_row(choice)
+        select_neighbour if @selected == Store::Selection.row(@modal.id)
+        @store.snooze(@modal.id, choice)
+      end
+
       def open_alias_editor
         return unless require_storable && require_writable("rename")
         current = @store.alias_for(@selected.key) || ""
@@ -67,7 +75,7 @@ module ClaudeInbox
         elsif @modal.kind == :snooze
           wake_at = SnoozeTime.parse(value, Time.now)
           return notice("try 45m, 2h, 3d, 17:00, 5pm, fri, tomorrow or tonight") unless wake_at
-          @store.snooze(@modal.id, wake_at)
+          snooze_modal_row(wake_at)
         elsif value.empty? || PullRequests.valid_url?(value)
           @store.set_pr(@modal.id, value)
           @poller.soon

data/lib/claude_inbox/dialog.rb

@@ -58,7 +58,7 @@ module ClaudeInbox
 
       def press(name, key)
         return :cancel if name == :escape || key == "q"
-        entry = MENU.find { |k, _, _| k == key }
+        entry = MENU.assoc(key)
         return nil unless entry
         @choice = entry[2]
         :snooze

data/lib/claude_inbox/headless.rb

@@ -15,11 +15,15 @@ module ClaudeInbox
   # reaps, since deleting sessions stays with the inbox you can see, and it
   # exits at once while an inbox holds the writer lock.
   class Headless
+    RECHECK_EVERY = 60
+
     def initialize(client:, store:, pull_requests: PullRequests.new, actions: Actions.new, snapshot: Snapshot.new,
-      lock: WriterLock.new, updater: nil, notifier: Notifier.disabled)
+      lock: WriterLock.new, updater: nil, notifier: Notifier.disabled, recheck_every: RECHECK_EVERY)
       @lock = lock
       @snapshot = snapshot
       @updater = updater
+      @recheck_every = recheck_every
+      @notice = nil
       @queue = Queue.new
       @poller = Poller.new(client: client, store: store, pull_requests: pull_requests, reaper: Reaper.disabled,
         queue: @queue, snapshot: snapshot, actions: actions, notifier: notifier)
@@ -29,7 +33,7 @@ module ClaudeInbox
     def run
       return false unless @lock.take(role: "headless")
       @poller.start
-      check_for_update if @updater
+      Thread.new { watch_for_updates } if @updater
       loop { @queue.pop }
     end
 
@@ -38,8 +42,19 @@ module ClaudeInbox
     # After the poller is off, since the check may wait on the network. The
     # pane cannot swap the process under Claude Code, so the snapshot only
     # says a newer one is out, and a check that cannot tell says nothing.
+    # Re-checked because this process outlives an update applied from a
+    # terminal; the updater's day-long cache keeps that off the network.
+    def watch_for_updates
+      loop do
+        check_for_update
+        sleep @recheck_every
+      end
+    end
+
     def check_for_update
-      @snapshot.update = @updater.check&.notice
+      notice = @updater.check&.notice
+      return if notice == @notice
+      @notice = @snapshot.update = notice
       @poller.soon
     rescue Updater::Error
       nil

data/lib/claude_inbox/pull_requests.rb

@@ -158,6 +158,8 @@ module ClaudeInbox
       url.to_s.match?(%r{\Ahttps://github\.com/[^/\s]+/[^/\s]+/pull/\d+/?\z})
     end
 
+    private_class_method :health
+
     private
 
     def scanned(job_state)

data/lib/claude_inbox/remote/page.html

@@ -140,6 +140,7 @@ code { font: 15px ui-monospace, SFMono-Regular, Menlo, monospace; }
 <section id="done" class="card" hidden>
   <p>Started <code id="done-id"></code></p>
   <p class="muted" id="done-where"></p>
+  <p class="muted" id="done-note" hidden></p>
   <p class="muted" id="done-later">claude.ai/code lists it once it has registered, in a moment.</p>
   <div class="actions">
     <a class="button" id="done-url" target="_blank" rel="noopener">Open in Claude</a>
@@ -421,6 +422,8 @@ function started(session, remote) {
   $("name").value = "";
   $("done-id").textContent = session.id;
   $("done-where").textContent = [session.name, session.cwd].filter(Boolean).join(" · ");
+  $("done-note").textContent = session.note || "";
+  $("done-note").hidden = !session.note;
   const link = $("done-url");
   link.hidden = !/^https:\/\//.test(session.url || "");
   if (!link.hidden) link.href = session.url;

data/lib/claude_inbox/remote/start.rb

@@ -156,11 +156,12 @@ module ClaudeInbox
         values[:permission_mode] = capped_mode(values[:permission_mode] || defaults.permission_mode || builtin_mode)
         paths = images.each_with_index.map { |bytes, i| Images.save(bytes, dir: @images_dir, index: i + 1) }
         values[:prompt] = SessionRequest.attach(values[:prompt], paths)
+        values, note = SessionRequest.without_stray_worktree(values)
         @queue << [:notice, "remote: starting session…"]
         id = Http.utf8(@spawn_lock.synchronize { @client.spawn(**values) })
         url = remote_url(id, wait: values[:remote] ? @bridge_wait : 0)
-        @queue << [:remote_started, id, via]
-        {id: id, name: values[:name], cwd: values[:cwd], url: url}
+        @queue << [:remote_started, id, via, note].compact
+        {id: id, name: values[:name], cwd: values[:cwd], url: url}.merge(note ? {note: note} : {})
       rescue SessionRequest::Invalid => e
         raise Http::Error.new(422, e.message, field: e.field)
       end

data/lib/claude_inbox/renderer.rb

@@ -317,7 +317,7 @@ module ClaudeInbox
 
       label_w = [width - chrome - Text.width(project_text), 0].max
       label = Text.truncate(row.label, label_w)
-      label = style_label(label, row, quiet, sel || (live && row.unread?))
+      label = style_label(label, row, quiet, sel || unread)
       first = " #{marker} #{glyph} " + Text.pad(label, label_w) + "  " + meta + "  " + project + " "
 
       return [Text.pad(first, width)] unless live

data/lib/claude_inbox/session_request.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "pathname"
 require_relative "agents_client"
 
 module ClaudeInbox
@@ -77,6 +78,20 @@ module ClaudeInbox
       [text, rest.join("\n")].reject(&:empty?).join("\n\n")
     end
 
+    # `claude --bg --worktree` outside a git repository dies before init
+    # (docs/cli-quirks.md). A folder above several repos is a fair place to
+    # start from, so there the session starts without a worktree and the
+    # note says so.
+    def self.without_stray_worktree(values)
+      return [values, nil] unless values[:worktree] && !inside_repo?(values[:cwd])
+      [values.merge(worktree: false), "not in a git repo, so no worktree"]
+    end
+
+    # A worktree or a submodule has a `.git` file rather than a folder.
+    def self.inside_repo?(dir)
+      Pathname(File.expand_path(dir)).ascend.any? { |d| (d + ".git").exist? }
+    end
+
     # A session's cwd may sit inside a worktree another agent is using;
     # carrying that into a new prompt would spawn the new agent there too,
     # writing over the same files. Fall back to the repo it was cut from.

data/lib/claude_inbox/writer_lock.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "fileutils"
+require_relative "subprocess"
 
 module ClaudeInbox
   # One snapshot writer per machine: the inbox you can see, else a headless
@@ -25,8 +26,8 @@ module ClaudeInbox
       file = File.open(@path, File::RDWR | File::CREAT, 0o600)
       return hold(file, role) if file.flock(File::LOCK_EX | File::LOCK_NB)
       holder_role, holder = file.read.split
-      return refuse(file) unless role == "inbox" && holder_role == "headless"
-      Process.kill("TERM", holder.to_i) if holder.to_i.positive? && holder.to_i != Process.pid
+      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)
         sleep 0.1
@@ -39,6 +40,14 @@ module ClaudeInbox
 
     private
 
+    # The file can name a pid that no longer holds the lock (#322), which by
+    # now may be some other process; only a headless claude-inbox is ended.
+    def headless?(pid)
+      return false unless pid.positive? && pid != Process.pid
+      command = Subprocess.capture("ps", "-o", "command=", "-p", pid.to_s).out
+      command.include?("claude-inbox") && command.split.include?("--headless")
+    end
+
     # 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.0"
+  VERSION = "0.11.2"
 end

metadata

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