gitbroker 0.6.3 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f6274054ed60618fb8616a0749d40c1b4cb52ca6e404c1e6cf7db5680974f3a
-  data.tar.gz: 6804bcf3df622af5f6e3c28982c0f02253344030d17d2e7abf33386a53e0930f
+  metadata.gz: be4bff227a1a036f59d8124a89b2f6dc782dda63c5b6d471f7e51f9fde126e5d
+  data.tar.gz: c984663cf01008495cca098619d95e5476b57b6d9b8626c7bb047f20dee8f576
 SHA512:
-  metadata.gz: cf810ab366134baa979fa36e90fe717e9651565c82456a52f18e2bb80e8a485cbdbaac654f17d92b91c9c0591d314402026beda26b7e213e9058cf88f012d8e1
-  data.tar.gz: 1af26124d306502ac9f731538e40604d1b948cd8147dd9ce23ddd5aa1e50a462273be93a00d79d7640ebd2a00fa8d29d6a206fbf353e172701cb912ddbf8189e
+  metadata.gz: 0ec15dc9d6642178cf85e8ba9ddc874b6662af3e88f0106d45797c1839a4baf62bce28e16261f28acdb1124b4fb056f46001804bd846e082681a0d9f9a2b2aac
+  data.tar.gz: b3b4fb6d648a3bb7e9cf0e4fdc5032da58b6794df9eae5adbc62eb8606145d2317beabbc7bbee2c043f2076470908e07e0bd015ff36bfa9c5d15400c22027251

data/lib/gitbroker/branch_publisher.rb

@@ -14,16 +14,17 @@ module Gitbroker
 
     REF = %r{\A\w[\w./-]{0,200}\z}
 
-    def initialize(dir:, head_ref:, expected_sha:, base_ref:, runner: Runner.new)
+    def initialize(dir:, head_ref:, expected_sha:, base_ref:, remote: "origin", runner: Runner.new)
       @dir = dir
       @head_ref = head_ref.to_s
       @expected = expected_sha.to_s
       @base_ref = base_ref.to_s
+      @remote = remote.to_s
       @runner = runner
     end
 
     def publish!
-      return failed("No branch name to push.") unless valid_ref?(@head_ref) && valid_ref?(@base_ref)
+      return failed("No branch name to push.") unless valid_ref?(@head_ref) && valid_ref?(@base_ref) && valid_ref?(@remote)
       return failed("No starting head to protect.") unless @expected.match?(/\A[0-9a-f]{7,40}\z/)
       return failed("A rebase or merge is still in progress in the worktree: finish it first.") if in_progress?
       return failed("The worktree has uncommitted changes.") unless git("status", "--porcelain").strip.empty?
@@ -31,16 +32,16 @@ module Gitbroker
       head = git("rev-parse", "HEAD").strip
       return Result.new(:nothing, "Nothing to push: the branch did not change.") if head.start_with?(@expected) || @expected.start_with?(head)
 
-      git("fetch", "--quiet", "origin", @base_ref)
-      unless @runner.git_success?(@dir, "merge-base", "--is-ancestor", "origin/#{@base_ref}", "HEAD")
-        return failed("The branch is not on top of origin/#{@base_ref}: nothing pushed.")
+      git("fetch", "--quiet", @remote, @base_ref)
+      unless @runner.git_success?(@dir, "merge-base", "--is-ancestor", "#{@remote}/#{@base_ref}", "HEAD")
+        return failed("The branch is not on top of #{@remote}/#{@base_ref}: nothing pushed.")
       end
       unless git("rev-list", "--merges", "#{@expected}..HEAD").strip.empty?
         return failed("The branch contains merge commits; it must be a clean rebase: nothing pushed.")
       end
 
-      git("push", lease_option, "origin", "HEAD:refs/heads/#{@head_ref}")
-      Result.new(:pushed, "Pushed #{@head_ref} rebased onto origin/#{@base_ref}.")
+      git("push", lease_option, @remote, "HEAD:refs/heads/#{@head_ref}")
+      Result.new(:pushed, "Pushed #{@head_ref} rebased onto #{@remote}/#{@base_ref}.")
     rescue Error => e
       failed("Push failed: #{e.message.lines.first.to_s.strip}")
     end

data/lib/gitbroker/cli.rb

@@ -111,10 +111,25 @@ module Gitbroker
       end
 
       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?
 
@@ -304,6 +319,7 @@ module Gitbroker
         parser.on("--head-ref REF") { options[:head_ref] = _1 }
         parser.on("--expected SHA") { options[:expected_sha] = _1 }
         parser.on("--base REF") { options[:base_ref] = _1 }
+        parser.on("--remote NAME") { options[:remote] = _1 }
       end.parse!(@argv)
       result = BranchPublisher.new(**options).publish!
       @out.puts result.message

data/lib/gitbroker/git_context.rb

@@ -61,6 +61,16 @@ module Gitbroker
       end
     end
 
+    # The remote that is `full_name` on GitHub (origin first when several are): a checkout found through its `github` remote
+    # has an origin that is something else, so fetching and pushing must name the remote, never assume origin.
+    def remote_for(dir, full_name)
+      wanted = full_name.to_s.downcase
+      matches = remote_urls(dir).select { |_name, url| RepoScanner.full_name_from(url).to_s.downcase == wanted }.map(&:first)
+      (matches.include?("origin") ? "origin" : matches.find { _1.match?(REMOTE_NAME) }) || "origin"
+    end
+
+    REMOTE_NAME = /\A\w[\w.-]{0,60}\z/
+
     def repository_from(remotes)
       remotes.sort_by { |name, _url| name == "origin" ? 0 : 1 }.lazy.filter_map { |_name, url| RepoScanner.full_name_from(url) }.first
     end

data/lib/gitbroker/neutralizer.rb

@@ -17,13 +17,13 @@ module Gitbroker
       @runner = runner
     end
 
-    def neutralize!(dir, repo_path:, number:, base_ref:)
+    def neutralize!(dir, repo_path:, number:, base_ref:, remote: "origin")
       raise Error, "Invalid base branch #{base_ref.inspect}" unless Worktree.valid_ref?(base_ref)
       raise Error, "Invalid PR number #{number.inspect}" unless number.to_s.match?(/\A[1-9]\d{0,9}\z/)
 
       @dir = File.realpath(dir)
       base = "refs/gitbroker/base-#{number}"
-      @runner.git(repo_path, "fetch", "--quiet", "origin", "+refs/heads/#{base_ref}:#{base}")
+      @runner.git(repo_path, "fetch", "--quiet", remote, "+refs/heads/#{base_ref}:#{base}")
 
       removed = paths(@runner.git(@dir, "ls-files", "-z", "--", *REMOVE))
       removed.each { delete(_1) }

data/lib/gitbroker/task_runner.rb

@@ -58,7 +58,7 @@ module Gitbroker
                               cross_repository: task["cross_repository"] == true)
       # Agents report real paths (macOS: /private/var, not /var); progress paths are matched against this form.
       dir = File.realpath(dir)
-      restored = task["untrusted"] ? @neutralizer.neutralize!(dir, repo_path:, number: task["pr_number"], base_ref: base_ref(task)) : []
+      restored = task["untrusted"] ? @neutralizer.neutralize!(dir, repo_path:, number: task["pr_number"], base_ref: base_ref(task), remote: GitContext.remote_for(repo_path, task["repo"])) : []
       task = task.merge("prompt" => prompt_for(task))
       agent = Agents.for(@config, worktree: dir)
       say(id, "#{task["kind"]} on #{task["repo"]}##{task["pr_number"]}: starting (#{agent.name}, #{task["mode"] == "terminal" ? "terminal" : "autonomous"})")
@@ -143,7 +143,8 @@ module Gitbroker
     def publish_branch(task, outcome, dir)
       return outcome unless publishes_branch?(task)
 
-      result = BranchPublisher.new(dir:, head_ref: task["head_ref"], expected_sha: task["head_sha"], base_ref: base_ref(task)).publish!
+      result = BranchPublisher.new(dir:, head_ref: task["head_ref"], expected_sha: task["head_sha"], base_ref: base_ref(task),
+                                     remote: GitContext.remote_for(dir, task["repo"])).publish!
       say(task["task_id"], result.message)
       return outcome unless result.failed?
 
@@ -155,7 +156,7 @@ module Gitbroker
       return unless publishes_branch?(task)
 
       [ RbConfig.ruby, ServiceInstaller.launcher, "publish-branch", "--dir", dir, "--head-ref", task["head_ref"].to_s,
-        "--expected", task["head_sha"].to_s, "--base", base_ref(task) ]
+        "--expected", task["head_sha"].to_s, "--base", base_ref(task), "--remote", GitContext.remote_for(dir, task["repo"]) ]
     end
 
     def publishes_branch?(task) = task["kind"] == "update_branch" && task["cross_repository"] != true && !task["read_only"]

data/lib/gitbroker/version.rb

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

data/lib/gitbroker/worktree.rb

@@ -24,7 +24,8 @@ module Gitbroker
       validate!(full_name:, number:, head_sha:, kind:)
       dir = File.join(@root, full_name.downcase.tr("/", "-"), "pr-#{number}-#{kind}")
 
-      @runner.git(repo_path, "fetch", "--quiet", "origin", "+refs/pull/#{number}/head:refs/gitbroker/pr-#{number}")
+      remote = GitContext.remote_for(repo_path, full_name)
+      @runner.git(repo_path, "fetch", "--quiet", remote, "+refs/pull/#{number}/head:refs/gitbroker/pr-#{number}")
       unless @runner.git_success?(repo_path, "cat-file", "-e", "#{head_sha}^{commit}")
         raise Error, "Head #{head_sha[0, 7]} is not in the fetched PR; the PR may have moved. Start the task again from the card."
       end
@@ -41,7 +42,7 @@ module Gitbroker
         @runner.git(repo_path, "worktree", "add", "--quiet", *target, dir, head_sha)
       end
       if branch
-        cross_repository ? drop_upstream(repo_path, local) : track_upstream(repo_path, local, head_ref)
+        cross_repository ? drop_upstream(repo_path, local) : track_upstream(repo_path, local, head_ref, remote)
       end
       dir
     end
@@ -93,11 +94,11 @@ module Gitbroker
       raise Error, "Branch #{local} has commits that are not on the PR head; push or delete it, then start the task again."
     end
 
-    def track_upstream(repo_path, local, head_ref)
+    def track_upstream(repo_path, local, head_ref, remote)
       return unless self.class.valid_ref?(head_ref)
-      return unless @runner.git_success?(repo_path, "fetch", "--quiet", "origin", "+refs/heads/#{head_ref}:refs/remotes/origin/#{head_ref}")
+      return unless @runner.git_success?(repo_path, "fetch", "--quiet", remote, "+refs/heads/#{head_ref}:refs/remotes/#{remote}/#{head_ref}")
 
-      @runner.git(repo_path, "branch", "--quiet", "--set-upstream-to=origin/#{head_ref}", local)
+      @runner.git(repo_path, "branch", "--quiet", "--set-upstream-to=#{remote}/#{head_ref}", local)
     end
 
     def drop_upstream(repo_path, local)

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

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