claude-inbox 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58a50d40ba0f8df6b8b53f3613a75b5982871eaa3c6f9d0c29c46411a1e70323
-  data.tar.gz: f8abcc49a7a5d61d339189f79c0f7a62d800b98531ce1e82060efda0a91e0d2e
+  metadata.gz: 39ef2bafdac9f7b1c8ba1d4e6f28f5105a5fd5c42320f627caf61fd07f9c314d
+  data.tar.gz: 0ed5aadb2d02b61b1eabca62a7de74820f7e884f5ffdc6f0bbb68382ba26cc13
 SHA512:
-  metadata.gz: 1c994b3434e3e45fbf60f6c472227fb97610ae8355bb0dd166fb49c83713025fc8be70d2f06660e4475aa0606604a6860ce063c2d721fb836c048e7f18393b86
-  data.tar.gz: 591b90b883b64fc4494d8dec115958c618cf88ad13fd5cd3e9a125cbba6364df80b7c370d6d49c6db97bb74e65905882ede46bf9fdcab4b2201d39bc1e582d19
+  metadata.gz: 393709c2bc4fc083ded424de49ca3ad102bcf41d75fd72b5c445d8b1f23f7e80f7df0ac1623d4081994e14699168db7c58a2bc64f486b00dd83941c2d691600f
+  data.tar.gz: fb06b9a05422bff8e3a5474169a11574041219ae700e30a5178a1e507e74df95cd0c069a1c395a070a7f7856bbe6bcdd6380c2a6011a03ff36a1210c05cdae2e

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.1"
+  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.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Jordan Byron