claude-inbox 0.12.0 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfb9f33ca25bbd7a081fcab7316c724af065f9d078cd9a329e4c5d2a4f25d49d
-  data.tar.gz: d733d6f8cd233cc37c0d4b0e43abe6f48936b17e1731b9d8d696990f8ded4046
+  metadata.gz: 39ef2bafdac9f7b1c8ba1d4e6f28f5105a5fd5c42320f627caf61fd07f9c314d
+  data.tar.gz: 0ed5aadb2d02b61b1eabca62a7de74820f7e884f5ffdc6f0bbb68382ba26cc13
 SHA512:
-  metadata.gz: a4c6efddf42c8363e1f383941f854ec2ba35e38f2cfe687749aa4b18b88efe1fbb400cdcb2e3e727493daabda7c7b82753d637078b397ca7f8992305d6bb3df6
-  data.tar.gz: 7ddfe74e86730f795581cc454fc4c09a0b7f8b1b8f49c45e7e9cbabb504387c7411902177eb84b8578d36653b421dc0794afb01f6ae55a848fa2a657073b56e0
+  metadata.gz: 393709c2bc4fc083ded424de49ca3ad102bcf41d75fd72b5c445d8b1f23f7e80f7df0ac1623d4081994e14699168db7c58a2bc64f486b00dd83941c2d691600f
+  data.tar.gz: fb06b9a05422bff8e3a5474169a11574041219ae700e30a5178a1e507e74df95cd0c069a1c395a070a7f7856bbe6bcdd6380c2a6011a03ff36a1210c05cdae2e

data/README.md

@@ -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

@@ -116,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",
@@ -135,6 +141,11 @@ module ClaudeInbox
         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/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)

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
@@ -336,11 +336,13 @@ module ClaudeInbox
         @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

data/lib/claude_inbox/remote/pairing_dialog.rb

@@ -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/session_request.rb

@@ -134,11 +134,13 @@ 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)
@@ -146,7 +148,7 @@ module ClaudeInbox
       raise Invalid.new(:cwd, "a directory is required") if cwd.empty?
       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
@@ -174,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/settings.rb

@@ -3,17 +3,15 @@
 require "json"
 
 module ClaudeInbox
-  # What `claude` will use when a flag is left off: read from the same
-  # settings files it reads, most specific wins. Values are strings, or
-  # nil when nothing sets them — then the CLI decides at launch.
+  # What a `claude` session in a directory gets from the settings files it
+  # reads, most specific wins: the defaults for flags left off, and the
+  # plugins it loads.
   module Settings
+    # Strings, or nil when nothing sets them: then the CLI decides at launch.
     Defaults = Struct.new(:model, :effort, :permission_mode, :remote)
 
     def self.defaults(cwd, home: Dir.home)
-      user = read(File.join(home, ".claude", "settings.json"))
-      project = read(File.join(cwd, ".claude", "settings.json"))
-      local = read(File.join(cwd, ".claude", "settings.local.json"))
-      layers = [user, project, local]
+      user, project, local = layers = layers(cwd, home)
       Defaults.new(
         model: pick(layers, "model"),
         effort: pick(layers, "effortLevel"),
@@ -22,6 +20,23 @@ module ClaudeInbox
       )
     end
 
+    # The "name@marketplace" keys of the plugins a session in cwd loads.
+    # Its install scope plays no part; see docs/cli-quirks.md.
+    def self.enabled_plugins(cwd, home: Dir.home)
+      layers(cwd, home).each_with_object({}) do |h, on|
+        plugins = h["enabledPlugins"]
+        on.merge!(plugins) if plugins.is_a?(Hash)
+      end.select { |_, v| v == true }.keys
+    end
+
+    def self.layers(cwd, home)
+      [
+        read(File.join(home, ".claude", "settings.json")),
+        read(File.join(cwd, ".claude", "settings.json")),
+        read(File.join(cwd, ".claude", "settings.local.json"))
+      ]
+    end
+
     # "Enable Remote Control for all sessions" in /config. The CLI lets a
     # repo turn it off but only user scope turn it on, and still honours the
     # copy older versions kept in ~/.claude.json.
@@ -47,6 +62,6 @@ module ClaudeInbox
       end
       nil
     end
-    private_class_method :remote_control, :pick
+    private_class_method :layers, :remote_control, :pick
   end
 end

data/lib/claude_inbox/slash_commands.rb

@@ -6,10 +6,11 @@ module ClaudeInbox
   # The slash commands `claude` would offer at its own prompt, read from the
   # same places it reads them: `.claude/commands/*.md` and
   # `.claude/skills/*/SKILL.md` under the project and the home directory,
-  # the skills and commands of installed plugins (named `plugin:name`), and
-  # the skills claude.ai syncs down (`anthropic-skills:name`). Built-ins
-  # live inside the CLI and are not listed; typing one still works, since
-  # the prompt goes to `claude --bg` verbatim.
+  # the skills and commands of the plugins enabled there (named
+  # `plugin:name`), and the skills claude.ai syncs down
+  # (`anthropic-skills:name`). Built-ins live inside the CLI and are not
+  # listed; typing one still works, since the prompt goes to `claude --bg`
+  # verbatim.
   #
   # Pure: filesystem in, plain values out. Nothing here runs `claude`.
   module SlashCommands
@@ -27,7 +28,7 @@ module ClaudeInbox
       [
         *from_dir(File.join(cwd, ".claude")),
         *from_dir(File.join(home, ".claude")),
-        *plugins(home),
+        *plugins(cwd, home),
         *synced(home)
       ].uniq(&:name).sort_by(&:name)
     end
@@ -65,9 +66,10 @@ module ClaudeInbox
 
     # `installed_plugins.json` maps "name@marketplace" to where the plugin
     # was unpacked: one entry, or a list of them, one per install scope.
-    def plugins(home)
+    def plugins(cwd, home)
       installed = Settings.read(File.join(home, ".claude", "plugins", "installed_plugins.json"))
-      (installed["plugins"] || {}).flat_map do |key, entries|
+      enabled = Settings.enabled_plugins(cwd, home:)
+      (installed["plugins"] || {}).slice(*enabled).flat_map do |key, entries|
         plugin = key.split("@").first
         Array(entries).filter_map { |e| e["installPath"] if e.is_a?(Hash) }.uniq.flat_map do |root|
           from_dir(root, prefix: plugin)

data/lib/claude_inbox/subprocess.rb

@@ -10,15 +10,27 @@ module ClaudeInbox
       def success? = status.success?
     end
 
+    # `asdf exec`, which the ruby shim runs us through, puts the ruby it
+    # picked ahead of every shim on PATH and names it in ASDF_INSTALL_PATH.
+    # Left in place, every session runs our ruby whatever its project's
+    # .tool-versions says.
+    def self.unpinned(env)
+      install = env["ASDF_INSTALL_PATH"] or return env
+      prefix = File.join(install, "")
+      path = env.fetch("PATH", "").split(File::PATH_SEPARATOR).reject { |dir| dir.start_with?(prefix) }
+      env.reject { |k, _| k.start_with?("ASDF_INSTALL_") }.merge("PATH" => path.join(File::PATH_SEPARATOR))
+    end
+
     # Children start in the environment from before Bundler, or every ruby a
-    # session runs, in any project, loads our Gemfile. Handed to exec rather
-    # than set on ENV, which the poll and background threads share.
-    CHILD_ENV = defined?(Bundler.unbundled_env) ? Bundler.unbundled_env.freeze : nil
+    # session runs, in any project, loads our Gemfile, and from before asdf
+    # pinned our ruby. Handed to exec rather than set on ENV, which the poll
+    # and background threads share.
+    CHILD_ENV = unpinned(defined?(Bundler.unbundled_env) ? Bundler.unbundled_env : ENV.to_h).freeze
 
     module_function
 
     # argv as exec and Process.spawn take it, with CHILD_ENV in place of ours.
-    def command(*argv) = CHILD_ENV ? [CHILD_ENV, *argv, {unsetenv_others: true}] : argv
+    def command(*argv) = [CHILD_ENV, *argv, {unsetenv_others: true}]
 
     # `input` is written before any output is read, so it is for the few
     # bytes a clipboard takes, not a stream.

data/lib/claude_inbox.rb

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

metadata

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