diffbroker 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1d00b5898842a32e456087716d26bdb5b1c28e35f04e44b9d73acf8726d78f7
-  data.tar.gz: 25464398637a5bcf58c4e85f8babb57134cd1d3463e0325bb445b983328c7e09
+  metadata.gz: 19527d7bf5bd6af3f94eec7673a0b60ebedc3080adc1308ba23e477b874af8f1
+  data.tar.gz: 1a29bde8db351846148a7832d57f6cd2736e3d88941267f21a2699a05a982131
 SHA512:
-  metadata.gz: 306e519a17b426111cfe62d5ea845abd4b2c1e77534749864cb6b44cb9dd802126d85ab1025a1a89e8ba26f0ff08591f701f13c7c05aba75de2985ea629c14f6
-  data.tar.gz: e7e2f33022fcbc9c670821bff1025709c86cd5900ba52e229150ce4847ff8403fc304888117d942e0c616256af1a6616060dd45d5fe4f0ddf041e963a3a47ed8
+  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.0"
+  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.0",
+  "version": "0.16.0",
   "description": "Skills for working on Diff Broker agent tasks: the diffbroker MCP tools, write rules and report_task."
 }

data/plugin/skills/diffbroker-explain/SKILL.md

@@ -114,7 +114,9 @@ What a newcomer needs first …
 - 1–5 questions in the quiz section, each with a unique `key` (letters, digits, `_` or `-`), unique across quiz and delta too.
 - 2–5 options, **exactly one** `[x]`. Every option has a one-line explanation after ` | ` that says why it is right or wrong.
 - The question needs the **substance** of the change: behaviour, a consequence, a reason, a failure mode. No trivia (file names, line counts, author names), no trick wording, no "all of the above".
-- Options are similar in length and grammar, so the right one doesn't stand out. Diff Broker shuffles them.
+- Options are comparable in length, grammar, specificity and confidence, so the right one doesn't stand out. Readers (and models) pick the longest, most qualified option, so never make the right one conspicuously longer or more precise than the wrong ones: shorten it, or add the same kind of detail to the wrong ones. Diff Broker refuses a question whose right option is much longer than every other. Diff Broker shuffles the order, so don't try to place the right answer yourself; just don't write options in a habitual order either.
+- Every wrong option is plausible and tied to a real misunderstanding of the change. No joke answers, impossible claims or "all/none of the above".
+- Nothing before the answer is chosen gives it away: no hint in the question's wording, no option that repeats a phrase from the question while the others don't.
 - Readers pass at 80% on first tries. A question the verifier marks `unsupported` (the code contradicts the marked answer or does not show it) is not scored, so make each answer provable from the code. `uncertain` only shows as a caveat; the question stays scored.
 
 ## Style

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffbroker
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Yuri Sidorov (@newstler)