diffbroker 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fc1c3a662ccc736b0c62b0d083dbac979f52cf13f1c15e7eb5e12c009bdefe5
-  data.tar.gz: a2b6d513455ba9439a99b67603b9507b83aa3e510c323b2c94cf8748b5157e96
+  metadata.gz: 432bb946c0772a58cf38c9234bc6f717c79f4aa727aad1bebb7b07f17c9c5909
+  data.tar.gz: 812611ec01f56bb33748565704829e4cc0b46267319d893a161ff88e0b5ee189
 SHA512:
-  metadata.gz: 4dde5f0960aa3d14efcdc9e8c301a997bce559dff9ff14e836c4af2cbb5d5dcd4b8c35892b88a354aa0d30c593158c217f0e5559cf18456bd5531b1a3523bd53
-  data.tar.gz: acd78b508a85c294dab674659e7ed72caa263f712e688ea6006169ea92293106f19136547b7aac70b1be437c60eff80357c8f89e182689e18888518821a60807
+  metadata.gz: c748db09f1bba8074c246fa20634dddd77ad96603441f82402ca9b42302cbc5df5b21913bea1b2900af1b2130bf7bc2a3b4cd1d85ae325ea5ce828705136d728
+  data.tar.gz: fa95a2a4958005c0d49858e20bc71b840686ec02b12eeb7117f95710a83a049e8333dd3939667e4698a0f5589886f7d808aeee2099cabf286958a41f1177baf9

data/lib/diffbroker/access_help.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Diffbroker
+  # What `diffbroker status` says about folders the scan was refused: the folders and, on macOS, the steps that give the
+  # program access (Full Disk Access). Devices says the same in the browser (devices/_scan_roots). Which program needs the
+  # grant depends on how the companion runs, so both are named: the Ruby that runs the background service and the terminal.
+  module AccessHelp
+    module_function
+
+    def lines(paths, macos: RbConfig::CONFIG["host_os"].to_s.include?("darwin"), ruby: ruby_path)
+      return [] if paths.empty?
+
+      lines = [ "Folders the system would not let the companion read (their repositories are not found):" ]
+      lines += paths.map { "  #{_1}" }
+      lines += macos ? macos_steps(ruby) : [ "  Check who may read them (`ls -ld <folder>`): the companion runs as #{ENV["USER"] || "your user"}." ]
+      lines
+    end
+
+    def macos_steps(ruby)
+      [
+        "To allow it (macOS):",
+        "  1. Open System Settings > Privacy & Security > Full Disk Access.",
+        "  2. Click + and add the program that runs the companion: #{ruby}",
+        "     (in the file picker press Cmd+Shift+G to type a path). A companion you start by hand in a terminal uses that",
+        "     terminal app's access instead: add the terminal there.",
+        "  3. Run `diffbroker restart`.",
+        "Or keep your code outside cloud folders (Dropbox, iCloud Drive), which macOS protects."
+      ]
+    end
+
+    def ruby_path = File.realpath(RbConfig.ruby)
+  rescue SystemCallError
+    RbConfig.ruby
+  end
+end

data/lib/diffbroker/cli.rb

@@ -303,9 +303,11 @@ module Diffbroker
       @out.puts "Roots:      #{config.roots.join(", ")} (plus the projects Claude Code and Codex know)"
       @out.puts "Worktrees:  #{config.worktree_root}"
       @out.puts "Task worktrees: #{Worktree.new(root: config.worktree_root).list.size} (running or kept; `diffbroker clean` removes finished ones)"
-      repositories = config.repo_scanner.scan
+      scanner = config.repo_scanner
+      repositories = scanner.scan
       @out.puts "Repositories found: #{repositories.size}"
       repositories.each { @out.puts "  #{_1["full_name"]}  #{_1["path"]}" }
+      AccessHelp.lines(scanner.unreadable).each { @out.puts _1 }
     end
 
     # What the daemon wrote about itself (DaemonState), next to what this installed version and service would run.

data/lib/diffbroker/daemon.rb

@@ -242,7 +242,9 @@ module Diffbroker
     def rescan(client)
       @repositories = @scanner.scan
       @scanned_at = @clock.call
-      client.perform("repositories", "repositories" => @repositories)
+      payload = { "repositories" => @repositories }
+      payload["unreadable"] = @scanner.unreadable if @scanner.respond_to?(:unreadable) # Devices explains how to grant access
+      client.perform("repositories", payload)
     end
 
     # The plan limits change slowly and reading them can wait on the network, so: every few minutes, off the tick's thread.

data/lib/diffbroker/repo_scanner.rb

@@ -21,6 +21,11 @@ module Diffbroker
 
     # `exclude` (the task worktrees) is skipped everywhere. `ignored` (folders the user removed) is skipped by everything
     # found by itself; `explicit_roots` (folders the user added) are scanned even inside an ignored folder.
+    # Folders the last scan was refused (macOS answers EPERM for Dropbox, iCloud, Desktop and the like until the program has
+    # been given access; other systems say EACCES). Reported to the server so Devices can explain how to grant it.
+    MAX_UNREADABLE = 20
+    attr_reader :unreadable
+
     def initialize(roots:, depth: 3, exclude: [], hints: [], home: Dir.home, explicit_roots: [], ignored: [])
       @roots = roots
       @explicit_roots = explicit_roots
@@ -30,10 +35,12 @@ module Diffbroker
       @depth = depth
       @exclude = exclude.map { File.expand_path(_1) }
       @skip = @exclude + @ignored
+      @unreadable = []
     end
 
     def scan
       found = {}
+      @unreadable = []
       @roots.each { |root| walk(File.expand_path(root), 0, found, @depth, @skip) if File.directory?(root) }
       @explicit_roots.each { |root| walk(File.expand_path(root), 0, found, @depth, @exclude) if File.directory?(root) }
       parents = @hints.filter_map { |hint| add_hint(File.expand_path(hint), found) }.map { File.dirname(_1) }.uniq
@@ -79,8 +86,10 @@ module Diffbroker
         path = File.join(dir, child)
         walk(path, level + 1, found, limit, skip) if File.directory?(path) && !File.symlink?(path)
       end
+    rescue Errno::EPERM, Errno::EACCES
+      @unreadable << dir if @unreadable.size < MAX_UNREADABLE && !@unreadable.include?(dir)
     rescue SystemCallError
-      nil # a folder that cannot be listed (macOS answers EPERM for Dropbox, iCloud and other protected folders) holds nothing for us
+      nil # gone meanwhile, or not a folder: nothing to report
     end
 
     def remote_names(dir) = GitContext.remote_urls(dir).filter_map { |_name, url| self.class.full_name_from(url) }.uniq

data/lib/diffbroker/version.rb

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

data/lib/diffbroker.rb

@@ -32,6 +32,7 @@ module Diffbroker
   autoload :Launcher, File.expand_path("diffbroker/launcher", __dir__)
   autoload :Maintenance, File.expand_path("diffbroker/maintenance", __dir__)
   autoload :LocalRelay, File.expand_path("diffbroker/local_relay", __dir__)
+  autoload :AccessHelp, File.expand_path("diffbroker/access_help", __dir__)
   autoload :Login, File.expand_path("diffbroker/login", __dir__)
   autoload :Neutralizer, File.expand_path("diffbroker/neutralizer", __dir__)
   autoload :PlanUsage, File.expand_path("diffbroker/plan_usage", __dir__)

data/plugin/.claude-plugin/plugin.json

@@ -1,5 +1,5 @@
 {
   "name": "diffbroker",
-  "version": "0.13.1",
+  "version": "0.14.0",
   "description": "Skills for working on Diff Broker agent tasks: the diffbroker MCP tools, write rules and report_task."
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffbroker
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Yuri Sidorov (@newstler)
@@ -34,6 +34,7 @@ files:
 - LICENSE.txt
 - exe/diffbroker
 - lib/diffbroker.rb
+- lib/diffbroker/access_help.rb
 - lib/diffbroker/agent_projects.rb
 - lib/diffbroker/agents.rb
 - lib/diffbroker/agents/base.rb