gitbroker 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdb076d007739b3e1eb411ac473ffe84dc28423a2ad78065a4aa33d14f11bbd9
-  data.tar.gz: 93e99568aba514f872f45e8f445ca9f1c40fdc8d0ffccfdbd1b454feb3008a54
+  metadata.gz: d89c372f196a3cd8b81d057f63c8abcdafa765585fcde6abaa15dd8ec81c48bf
+  data.tar.gz: 473d304e0ed3fe9bafc232490e4be505b17b12b09c2cebf6b194d2547b108203
 SHA512:
-  metadata.gz: b87041c66a6a11b01ab1003ee3912e7bddc8cb2ccdd7d8b6c6162bc4da04320530c621d941024b059dbe13080088b8d21112b7f47a24481d76369930093eea9a
-  data.tar.gz: 57b801d31d18aae68cb9bf52e9e58a890a9fa9b41cddbc7c43eb3cc9aed227fca3064bdca72b58b9523630855aa3c657c899915da79d45d8f3ecb55199e37a81
+  metadata.gz: c0d446a0a798acb225933b1cd4c1f31c3425112ac025a2bc684b468e47bc57869b56f892683a4c278cbbb788ac5cd7f5f56fa8286671c98d160d115d72313c4c
+  data.tar.gz: 3914718aa114dfe375b4783dfe9c6d5e0408d43d319c013e400f4628912e15984f937417043409b6dfd9b3766cb2e6c3ed7f2a74ae678cc52813a35f57560f81

data/lib/gitbroker/config.rb

@@ -63,8 +63,13 @@ module Gitbroker
     def cable_url = "#{server.sub(/\Ahttp/, "ws")}/cable"
     # `roots` in config.yml and the folders added in Git Broker (`device_roots`) add to the usual folders; the checkouts Claude Code and Codex know come in through `repo_scanner`.
     def device_roots = self.class.clean_device_roots(data["device_roots"], home:)
+    def ignored_roots = self.class.clean_device_roots(data["ignored_roots"], home:)
     def roots = (self.class.common_roots(home) + Array(data["roots"]).map { File.expand_path(_1.to_s.sub(/\A~/, home)) } + device_roots).uniq
-    def repo_scanner = RepoScanner.new(roots:, depth: scan_depth, exclude: [ worktree_root ], hints: AgentProjects.paths(home:), home:)
+    # Folders the user removed in Git Broker (`ignored_roots`) are skipped everywhere except inside a folder they added.
+    def repo_scanner
+      RepoScanner.new(roots: roots - device_roots, explicit_roots: device_roots, depth: scan_depth, exclude: [ worktree_root ],
+                      ignored: ignored_roots, hints: AgentProjects.paths(home:), home:)
+    end
     def scan_depth = Integer(data["scan_depth"] || 3)
     def terminal = (data["terminal"] || (@platform == "macos" ? "terminal" : "tmux")).to_s
     def worktree_root = File.expand_path(data["worktree_root"] || File.join(home, ".local/share/gitbroker/worktrees"))

data/lib/gitbroker/daemon.rb

@@ -23,7 +23,7 @@ module Gitbroker
                    process_scanner: build_process_scanner(config))
       raise Error, "This machine is not paired. Run `gitbroker start` in a terminal to pair it." unless config.paired?
 
-      new(scanner: config.repo_scanner, roots_changed: roots_changed(config), device_roots: config.device_roots,
+      new(scanner: config.repo_scanner, roots_changed: roots_changed(config), device_roots: config.device_roots, ignored_roots: config.ignored_roots,
           client_factory: -> { CableClient.new(url: config.cable_url, token: config.device_token, origin: config.server) },
           task_runner_factory: ->(report) { TaskRunner.new(config:, report:, out:) }, out:, relay:, process_scanner:,
           lifecycle: Lifecycle.new(dir: config.dir, server: config.server))
@@ -33,8 +33,8 @@ module Gitbroker
     # scan with them from now on. Returns the new scanner.
     def self.roots_changed(config)
       current = config
-      lambda do |roots|
-        current = current.save!("device_roots" => roots.empty? ? nil : roots)
+      lambda do |roots, ignored|
+        current = current.save!("device_roots" => roots.empty? ? nil : roots, "ignored_roots" => ignored.empty? ? nil : ignored)
         current.repo_scanner
       end
     end
@@ -54,9 +54,10 @@ module Gitbroker
 
     def initialize(scanner:, client_factory:, task_runner_factory:, out: $stdout, sleeper: ->(seconds) { sleep(seconds) },
                    clock: -> { Time.now }, spawner: ->(&block) { Thread.new(&block) }, relay: nil, process_scanner: nil, lifecycle: nil,
-                   maintenance: Maintenance.new, roots_changed: nil, device_roots: [])
+                   maintenance: Maintenance.new, roots_changed: nil, device_roots: [], ignored_roots: [])
       @scanner = scanner
       @device_roots = device_roots
+      @ignored_roots = ignored_roots
       @roots_changed = roots_changed
       @client_factory = client_factory
       @task_runner = task_runner_factory.call(method(:report))
@@ -221,7 +222,7 @@ module Gitbroker
 
     def handle(client, message)
       return control(message["action"]) if message["type"] == "control"
-      return apply_roots(client, message["roots"]) if message["type"] == "roots"
+      return apply_roots(client, message["roots"], message["ignored"]) if message["type"] == "roots"
 
       id = message["task_id"]
       return unless id.is_a?(String)
@@ -234,14 +235,16 @@ module Gitbroker
     end
 
     # Sent on every connection and whenever the user changes the list. Nothing happens when it is what we already scan.
-    def apply_roots(client, roots)
+    def apply_roots(client, roots, ignored)
       return unless @roots_changed
 
       clean = Config.clean_device_roots(roots, home: Dir.home)
-      return if clean == @device_roots
+      clean_ignored = Config.clean_device_roots(ignored, home: Dir.home)
+      return if clean == @device_roots && clean_ignored == @ignored_roots
 
       @device_roots = clean
-      @scanner = @roots_changed.call(clean)
+      @ignored_roots = clean_ignored
+      @scanner = @roots_changed.call(clean, clean_ignored)
       rescan(client)
     end
 

data/lib/gitbroker/repo_scanner.rb

@@ -19,19 +19,25 @@ module Gitbroker
     HINT_LEVELS = 4
     HINT_PARENT_DEPTH = 2
 
-    def initialize(roots:, depth: 3, exclude: [], hints: [], home: Dir.home)
+    # `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.
+    def initialize(roots:, depth: 3, exclude: [], hints: [], home: Dir.home, explicit_roots: [], ignored: [])
       @roots = roots
+      @explicit_roots = explicit_roots
+      @ignored = ignored.map { File.expand_path(_1) }
       @hints = hints
       @home = File.expand_path(home)
       @depth = depth
       @exclude = exclude.map { File.expand_path(_1) }
+      @skip = @exclude + @ignored
     end
 
     def scan
       found = {}
-      @roots.each { |root| walk(File.expand_path(root), 0, found) if File.directory?(root) }
+      @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
-      parents.each { |parent| walk(parent, 0, found, HINT_PARENT_DEPTH) if scannable_parent?(parent) }
+      parents.each { |parent| walk(parent, 0, found, HINT_PARENT_DEPTH, @skip) if scannable_parent?(parent) }
       found.sort.map { |full_name, path| { "full_name" => full_name, "path" => path } }
     end
 
@@ -40,7 +46,7 @@ module Gitbroker
     # Records the checkout a hint is in and returns its directory (nil when it is not in one).
     def add_hint(dir, found)
       HINT_LEVELS.times do
-        return nil if @exclude.any? { |excluded| dir == excluded || dir.start_with?("#{excluded}/") }
+        return nil if @skip.any? { |skipped| dir == skipped || dir.start_with?("#{skipped}/") }
         return nil unless File.directory?(dir)
 
         if File.exist?(File.join(dir, ".git"))
@@ -58,8 +64,8 @@ module Gitbroker
       !(dir == @home || dir == "/" || @home.start_with?("#{dir}/"))
     end
 
-    def walk(dir, level, found, limit = @depth)
-      return if @exclude.any? { |excluded| dir == excluded || dir.start_with?("#{excluded}/") }
+    def walk(dir, level, found, limit, skip)
+      return if skip.any? { |skipped| dir == skipped || dir.start_with?("#{skipped}/") }
 
       if File.exist?(File.join(dir, ".git"))
         remote_names(dir).each { |name| found[name] = dir if found[name].nil? || dir.length < found[name].length }
@@ -71,7 +77,7 @@ module Gitbroker
         next if child.start_with?(".") || SKIP.include?(child)
 
         path = File.join(dir, child)
-        walk(path, level + 1, found, limit) if File.directory?(path) && !File.symlink?(path)
+        walk(path, level + 1, found, limit, skip) if File.directory?(path) && !File.symlink?(path)
       end
     rescue Errno::EACCES, Errno::ENOENT, Errno::ENOTDIR
       nil

data/lib/gitbroker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gitbroker
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

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

@@ -1,5 +1,5 @@
 {
   "name": "gitbroker",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Skills for working on Git Broker agent tasks: the gitbroker MCP tools, write rules and report_task."
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitbroker
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Yuri Sidorov (@newstler)