gitbroker 0.6.2 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2718632c166f839f99b68dcb7cd9fbf4b516f5c91d607c7208ae2dd16374f684
-  data.tar.gz: 8e4d8d1ee8a100efa10c3f9d63b9754210f05b740d17dc578ec7834499b0f9a9
+  metadata.gz: b6c41dc04d47bc8bfbad2ccb322b3a952b58e4957c2e282c25cb9075e58e83b2
+  data.tar.gz: 6d2f1b148005c310ed3538fe6fc4349cbaa38821bd1aa0f2ef25117477f146fa
 SHA512:
-  metadata.gz: befca93d9a8f18e2afb179ca45a8b7b6973570cc380f1a7765958e04e3dff86691f266428b9de4124a2b8e3e7477f2abfc2206e13f300f16f4f77b6cca1b493a
-  data.tar.gz: 14aa5ff4b302825ca46a766620087d5978482da9c6f7120adda2fc2402e2826e4939ef836b2a30a6869409caca4813c926ac83f2d8ff0306bc9324716b8a8d23
+  metadata.gz: 271fb887ec812d171902d32a53ed027bd3107194c19e0d67f14a1e5d22352f143add06b8090f2ba9ddd57e5853e35c773541234ad50d4666a064d49a9683513f
+  data.tar.gz: 9a259bd5c66d1836d85b23f7e017a4011ff28722cd068f5eaeaf746eb7be8e0d2d6dbf578067cd529ed9a8858e9970fd1712d6feabc39a505afca5d9f3bd69bc

data/lib/gitbroker/cli.rb

@@ -103,13 +103,33 @@ module Gitbroker
         parser.on("--name NAME") { options[:name] = _1 }
         parser.on("--foreground") { options[:foreground] = true }
       end.parse!(@argv)
-      @config = config.save!("server" => options[:server]) if options[:server]
+      foreground = options[:foreground] || !@input.tty?
+      if options[:server]
+        # Setting a machine up remembers its server (the background service must use it too). A daemon run by hand only
+        # uses it for this run: it must not rewrite the settings the service reads.
+        @config = foreground ? Config.load(dir: Config.default_dir(@env), env: @env.merge("GITBROKER_SERVER" => options[:server])) : config.save!("server" => options[:server])
+      end
 
-      return run_daemon if options[:foreground] || !@input.tty?
+      return run_daemon if foreground
+      return set_up_separate_instance(options[:name] || Socket.gethostname) if separate_instance?
 
       set_up(options[:name] || Socket.gethostname)
     end
 
+    # A GITBROKER_CONFIG_DIR that is not the default is another companion (say, one for a local dev server). The background
+    # service belongs to the default one, so this one is paired and then kept in this window; it never touches the service.
+    def separate_instance?
+      custom = @env["GITBROKER_CONFIG_DIR"]
+      custom && File.expand_path(custom) != File.expand_path(Config.default_dir(@env.reject { |key, _| key == "GITBROKER_CONFIG_DIR" }))
+    end
+
+    def set_up_separate_instance(name)
+      Login.new(config:, out: @out, name:).run unless config.paired?
+      @out.puts "This companion uses its own settings (#{config.dir}), so the background service is left alone. Keeping it in this " \
+                "window, connected to #{config.server}; press Ctrl-C to stop it."
+      run_daemon
+    end
+
     def run_daemon
       raise Error, "This machine is not paired. Run `gitbroker start` in a terminal to pair it." unless config.paired?
 

data/lib/gitbroker/daemon.rb

@@ -26,7 +26,7 @@ module Gitbroker
       new(scanner: RepoScanner.new(roots: config.roots, depth: config.scan_depth, exclude: [ config.worktree_root ]),
           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))
+          lifecycle: Lifecycle.new(dir: config.dir, server: config.server))
     end
 
     # Claude sessions with hooks installed report real working/waiting status, so the scanner only looks for `claude`

data/lib/gitbroker/lifecycle.rb

@@ -12,7 +12,7 @@ module Gitbroker
     WAIT = 10
 
     def initialize(dir:, home: Dir.home, service: ServiceInstaller.new(home:), runner: Runner.new, exe: ServiceInstaller.launcher,
-                   ruby: RbConfig.ruby, spawner: nil, sleeper: ->(seconds) { sleep(seconds) }, pid: Process.pid)
+                   ruby: RbConfig.ruby, spawner: nil, sleeper: ->(seconds) { sleep(seconds) }, pid: Process.pid, env: ENV, server: nil)
       @dir = dir
       @home = home
       @service = service
@@ -22,6 +22,8 @@ module Gitbroker
       @spawner = spawner || method(:spawn_process)
       @sleeper = sleeper
       @pid = pid
+      @env = env
+      @server = server
     end
 
     attr_reader :service
@@ -41,9 +43,15 @@ module Gitbroker
       nil
     end
 
-    # Used by the daemon itself: false when no service is installed or the manager refused.
-    def stop_service = @service.installed? && @service.stop!
-    def restart_service = @service.installed? && @service.restart!
+    # True only for the daemon the service manager started (launchd sets XPC_SERVICE_NAME to the job's label, systemd sets
+    # INVOCATION_ID). A daemon started by hand (`gitbroker start --server http://localhost:3000`) is not the service's:
+    # asking the manager to restart or stop "the service" would act on a different process (the one pointed at the
+    # default server) and leave this one running its old code for ever.
+    def service_process? = @env["XPC_SERVICE_NAME"] == ServiceInstaller::LABEL || @env.key?("INVOCATION_ID")
+
+    # Used by the daemon itself: false when this is not the service's daemon, no service is installed or the manager refused.
+    def stop_service = service_process? && @service.installed? && @service.stop!
+    def restart_service = service_process? && @service.installed? && @service.restart!
 
     # Starts the background service, or the daemon itself when none is installed. False when a service was refused.
     def launch
@@ -109,8 +117,11 @@ module Gitbroker
       false
     end
 
+    # The respawned daemon talks to the server this one did (a daemon started by hand against a local server must not come
+    # back pointed at the default one).
     def spawn_process(argv, log)
-      Process.detach(Process.spawn(*argv, in: File::NULL, out: [ log, "a" ], err: [ log, "a" ], pgroup: true))
+      env = @server ? { "GITBROKER_SERVER" => @server } : {}
+      Process.detach(Process.spawn(env, *argv, in: File::NULL, out: [ log, "a" ], err: [ log, "a" ], pgroup: true))
     end
   end
 end

data/lib/gitbroker/version.rb

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

data/lib/gitbroker/worktree.rb

@@ -30,6 +30,7 @@ module Gitbroker
       end
 
       local = "gitbroker/pr-#{number}-#{kind}"
+      retire_leftovers!(repo_path, dir, local, head_sha) if branch && kind == "update_branch"
       keep_local_commits!(repo_path, local, head_sha) if branch
       if File.exist?(File.join(dir, ".git"))
         reuse(dir, local, head_sha, branch:)
@@ -64,6 +65,26 @@ module Gitbroker
       branch ? @runner.git(dir, "checkout", "--quiet", "-B", local, head_sha) : @runner.git(dir, "checkout", "--quiet", "--detach", head_sha)
     end
 
+    # An update_branch task rewrites its branch, so what an earlier attempt left behind (an unpushed rebase, a half-finished
+    # one, a dirty worktree) is not work to protect but a result to redo: it is set aside, never deleted (the worktree is
+    # moved and the branch renamed, both with a `-leftover-<time>` suffix that `gitbroker clean` can remove), and the task
+    # starts from the PR head.
+    def retire_leftovers!(repo_path, dir, local, head_sha)
+      stamp = Time.now.strftime("%Y%m%d%H%M%S")
+      if File.exist?(File.join(dir, ".git"))
+        pristine = @runner.git(dir, "status", "--porcelain").strip.empty? && @runner.git(dir, "rev-parse", "HEAD").strip.start_with?(head_sha)
+        unless pristine
+          moved = "#{dir}-leftover-#{stamp}"
+          @runner.git(repo_path, "worktree", "move", dir, moved)
+          @runner.git(moved, "checkout", "--quiet", "--detach") # frees the task branch; the files stay as they were
+        end
+      end
+      return unless @runner.git_success?(repo_path, "rev-parse", "--verify", "--quiet", "refs/heads/#{local}")
+      return if @runner.git_success?(repo_path, "merge-base", "--is-ancestor", "refs/heads/#{local}", head_sha)
+
+      @runner.git(repo_path, "branch", "--quiet", "-m", local, "#{local}-leftover-#{stamp}")
+    end
+
     # `-B` resets the task branch to the head; refuse when that would drop commits made there that the head lacks.
     def keep_local_commits!(repo_path, local, head_sha)
       return unless @runner.git_success?(repo_path, "rev-parse", "--verify", "--quiet", "refs/heads/#{local}")

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

@@ -1,5 +1,5 @@
 {
   "name": "gitbroker",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "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.6.2
+  version: 0.6.4
 platform: ruby
 authors:
 - Yuri Sidorov (@newstler)