diffbroker 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e3e6d8ef83b129d25ae1ebdabed11a54de9663ca621bd1d8d54ec2eb1a739df
-  data.tar.gz: ce3534e62b84e8c356a5e16a5a0e28d4f44f2ac9071b30c066eb798a4898a3ec
+  metadata.gz: 19527d7bf5bd6af3f94eec7673a0b60ebedc3080adc1308ba23e477b874af8f1
+  data.tar.gz: 1a29bde8db351846148a7832d57f6cd2736e3d88941267f21a2699a05a982131
 SHA512:
-  metadata.gz: 9d9689456562cef5bfccd4931405445732c7f183f2783a73a506d1d0c1321298d21b647f67bc551883b9e3c6ef1ce3cde41fc3c2292886fd98a60660f1723b2d
-  data.tar.gz: 63973a9fe55d4899070067c585842f41aaf714252c4f745545226d1450fa12cf5931ce2f84cf0ab939ae695f28cec7b885a04bc729b807230487f9553ad17887
+  metadata.gz: cbf4077b51bd7a4dca8cb9ef8eafc53afe3ce0c2068d954f565e7b9d76cb524350b0c4254c417456e4dc0d8dcd0554ae895767cfcce46b9f4f4abe31a5d5222a
+  data.tar.gz: df450cc45d5d36007c9f629e1c6b296425c49510240e652e89593fb0c02181d4f0547b27d423bfec70a7c381b80ba4c56551fea8523eaa28447669e5d392026c

data/lib/diffbroker/login.rb

@@ -9,14 +9,28 @@ module Diffbroker
       system(Diffbroker.platform == "macos" ? "open" : "xdg-open", url, out: File::NULL, err: File::NULL)
     end
 
-    def initialize(config:, api: Api.new(server: config.server), out: $stdout, name: Socket.gethostname,
-                   sleeper: ->(seconds) { sleep(seconds) }, opener: ->(url) { Login.open_browser(url) }, clock: -> { Time.now })
+    # Best effort: true when a clipboard tool took the text.
+    def self.copy_to_clipboard(text)
+      tool = case Diffbroker.platform
+      when "macos" then %w[pbcopy]
+      else [ %w[wl-copy], %w[xclip -selection clipboard], %w[xsel --clipboard --input] ].find { system("which", _1.first, out: File::NULL, err: File::NULL) }
+      end
+      tool ? IO.popen(tool, "w") { _1.write(text) } && $?.success? : false
+    rescue SystemCallError
+      false
+    end
+
+    def initialize(config:, api: Api.new(server: config.server), out: $stdout, name: Socket.gethostname, input: $stdin,
+                   sleeper: ->(seconds) { sleep(seconds) }, opener: ->(url) { Login.open_browser(url) },
+                   copier: ->(text) { Login.copy_to_clipboard(text) }, clock: -> { Time.now })
       @config = config
       @api = api
       @out = out
+      @input = input
       @name = name
       @sleeper = sleeper
       @opener = opener
+      @copier = copier
       @clock = clock
     end
 
@@ -24,20 +38,30 @@ module Diffbroker
       auth = @api.post("/device_authorizations", { client_name: @name, platform: Diffbroker.platform })
       code = auth.fetch("user_code")
       uri = auth.fetch("verification_uri")
-      # No pre-filled link: nothing in a URL may select a code, the user types it on the plain page. The companion never
-      # touches the clipboard.
+      # No pre-filled link: nothing in a URL may select a code, the user types (or pastes) it on the plain page. The browser
+      # opens only when the user presses Enter, never by itself; without a terminal it does not open at all.
       @out.puts "Pairing #{@name} with Diff Broker."
       @out.puts
-      @out.puts "  Your code: #{code}"
+      @out.puts @copier.call(code) ? "! One-time code (#{code}) copied to clipboard" : "! One-time code: #{code}"
       @out.puts
-      @out.puts "Enter it at #{uri}, press Pair, then check the device details and press Approve."
+      if interactive?
+        @out.puts "Press Enter to open #{uri} in your browser, press Pair, then check the device details and press Approve."
+        enter = Thread.new { @opener.call(uri) if @input.gets }
+      else
+        @out.puts "Open #{uri}, enter the code, press Pair, then check the device details and press Approve."
+      end
       @out.puts "Only enter a code you see here, in your own terminal."
-      @opener.call(uri)
-      poll(auth)
+      begin
+        poll(auth)
+      ensure
+        enter&.kill
+      end
     end
 
     private
 
+    def interactive? = @input.respond_to?(:tty?) && @input.tty?
+
     def poll(auth)
       interval = auth.fetch("interval", 5).to_i
       deadline = @clock.call + auth.fetch("expires_in", 600).to_i

data/lib/diffbroker/version.rb

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

data/lib/diffbroker/worktree.rb

@@ -25,7 +25,7 @@ module Diffbroker
       dir = File.join(@root, full_name.downcase.tr("/", "-"), "pr-#{number}-#{kind}")
 
       remote = GitContext.remote_for(repo_path, full_name)
-      @runner.git(repo_path, "fetch", "--quiet", remote, "+refs/pull/#{number}/head:refs/diffbroker/pr-#{number}")
+      fetch_pull!(repo_path, remote, full_name, 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
@@ -105,6 +105,17 @@ module Diffbroker
       @runner.git_success?(repo_path, "branch", "--quiet", "--unset-upstream", local)
     end
 
+    # git's refusal is several lines and the server keeps only the last, so it becomes one line: what was fetched, git's own
+    # words and the command that shows the same failure in a terminal. The usual cause is the background service lacking the
+    # credentials (SSH key, credential helper) this machine's terminal has.
+    def fetch_pull!(repo_path, remote, full_name, number)
+      @runner.git(repo_path, "fetch", "--quiet", remote, "+refs/pull/#{number}/head:refs/diffbroker/pr-#{number}")
+    rescue Error => e
+      reason = e.message.sub(/\A.*? failed: /m, "").split.join(" ")
+      raise Error, "Could not fetch #{full_name}##{number} from #{remote} (#{reason}). " \
+                   "Check that `git -C #{repo_path} fetch #{remote}` works on this computer, then `diffbroker restart`."
+    end
+
     def validate!(full_name:, number:, head_sha:, kind:)
       raise Error, "Invalid head SHA #{head_sha.inspect}" unless head_sha.to_s.match?(SHA)
       raise Error, "Invalid PR number #{number.inspect}" unless number.to_s.match?(/\A[1-9]\d{0,9}\z/)

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

@@ -1,5 +1,5 @@
 {
   "name": "diffbroker",
-  "version": "0.15.1",
+  "version": "0.16.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.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Yuri Sidorov (@newstler)