gitbroker 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e5c1620070dc6b1ea787d390ae8f957190e90c347f51cb3e7bb87d97db616f7
-  data.tar.gz: 14b74da5bc45089ee0af18b29a8c897e988d0908acb0353787a7faf11777d495
+  metadata.gz: 946c2fd1fc092b025239f5e0bed964713648ef3c722ae2cd1955d129079ec107
+  data.tar.gz: 3cb2803f1de324bc10195b6136b302ededcd3e34a632bdeaba823c4d98639ea4
 SHA512:
-  metadata.gz: 6c90662bdd2ce91c9d5caa27e33c8528aef51021b545b9d951b23d31481eb512dc86c22abaf5a32b4919716e9831ef89d799cf24b0374d4c3a29d72191837b7c
-  data.tar.gz: 5bf014fde6beb119ea28255295e7dc210a531d8d0a2ce0075c4da36624a03b327b9add007557ce7110d92874143efb0b0af36fd2af65dc6dc06407c60e9d1238
+  metadata.gz: cd93a7d8e7fd151960b28b786ee9409b520f89405552725e3d23dcdde98628afdd952b16cabcd1d841e5c4009215291bd237e93f829a8a7ebd92e339cb38fdb9
+  data.tar.gz: 492201664eca213938e466a6e4e5f8ac920a8d726d746700989de4028fd51644275c2a45fb5e630cd04aaea0935cb7032b74ea1756ac5b6f047c7fb796198f03

data/lib/gitbroker/api.rb

@@ -23,13 +23,21 @@ module Gitbroker
     end
 
     def post(path, body = {})
+      send_request(Net::HTTP::Post, path) { |request| request.body = JSON.generate(body) }
+    end
+
+    def get(path) = send_request(Net::HTTP::Get, path)
+
+    private
+
+    def send_request(verb, path)
       uri = URI("#{@server}#{path}")
-      request = Net::HTTP::Post.new(uri)
+      request = verb.new(uri)
       request["Content-Type"] = "application/json"
       request["Accept"] = "application/json"
       request["User-Agent"] = "gitbroker/#{VERSION}"
       request["Authorization"] = "Bearer #{@token}" if @token
-      request.body = JSON.generate(body)
+      yield request if block_given?
 
       response = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https", open_timeout: 10, read_timeout: 30) do |http|
         http.request(request)
@@ -40,8 +48,6 @@ module Gitbroker
       parsed
     end
 
-    private
-
     def parse(body)
       return {} if body.to_s.strip.empty?
 

data/lib/gitbroker/cli.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "fileutils"
+require "openssl"
 require "optparse"
 require "rbconfig"
 require "socket"
@@ -11,15 +12,18 @@ module Gitbroker
       Usage: gitbroker <command> [options]
 
       Commands:
-        login [--server URL] [--name NAME]  Pair this machine with Git Broker (you type the code at /devices)
-        start                               Stay connected; run your agent when you ask from a PR card
+        start [--server URL] [--name NAME]  Set this machine up and keep it connected: pairs it (paste the code
+                                            it prints at git.broker/devices), installs the background service and the
+                                            "Start companion" button, then runs your agent when you ask from a PR card.
+                                            Run it again any time; it only does what is still missing.
         launch                              Start the companion in the background if it is not running
         stop                                Stop the companion (and its background service, so it stays stopped)
         restart                             Restart the companion, e.g. after `gem update gitbroker`
         upgrade                             Install the newest gem, remove old versions, restart the companion
         uninstall                           Remove the service, the start link, the Claude Code hooks and the gem (keeps your pairing)
-        install-service                     Run `gitbroker start` in the background (launchd / systemd --user), and let
-                                            the website's "Start companion" button wake it (gitbroker:// handler)
+        login [--server URL] [--name NAME]  Only pair this machine (`start` does this when needed)
+        install-service                     Only (re)install the background service (launchd / systemd --user) and the
+                                            "Start companion" handler (`start` does this when needed)
         install-skill                       Install the gitbroker skills into ~/.claude/skills
         status                              Show pairing, configuration and the repositories found
         clean                               Remove finished agent worktrees (keeps ones with uncommitted work)
@@ -88,15 +92,77 @@ module Gitbroker
       Login.new(config:, out: @out, name: options[:name] || Socket.gethostname).run
     end
 
+    # In a terminal: whatever is still missing (pairing, the background service) is set up, then the companion is left
+    # running in the background. Without a terminal (the service, `gitbroker launch`) or with --foreground: the daemon
+    # itself, in this process.
     def start
-      raise Error, "This machine is not paired. Run `gitbroker login` first." unless config.paired?
+      options = {}
+      OptionParser.new do |parser|
+        parser.on("--server URL") { options[:server] = _1 }
+        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]
+
+      return run_daemon if options[:foreground] || !@input.tty?
+
+      set_up(options[:name] || Socket.gethostname)
+    end
+
+    def run_daemon
+      raise Error, "This machine is not paired. Run `gitbroker start` in a terminal to pair it." unless config.paired?
 
       @out.puts "Git Broker companion #{VERSION} → #{config.server} (agent: #{config.agent}, terminal: #{config.terminal})"
       Daemon.build(config, out: @out).run
+    rescue Daemon::Rejected
+      # The pairing is dead. Forget it and remove the service, so nothing restarts a daemon that can never connect.
+      config.clear_credentials!
+      ServiceInstaller.new(home: @home, env: @env).uninstall!
+      raise
     end
 
+    def set_up(name)
+      forget_dead_pairing if config.paired? && pairing_rejected?
+      Login.new(config:, out: @out, name:).run unless config.paired?
+      install_background_service
+      @out.puts "Git Broker is running in the background. Open #{config.server} to see it connected."
+    rescue Error => e
+      raise unless service_unavailable?(e)
+
+      @out.puts "No background service is available here (#{e.message}). Keeping the companion in this window; run " \
+                "`gitbroker start` again after a restart. Press Ctrl-C to stop it."
+      run_daemon
+    end
+
+    # True only when the server answered "unauthorized". An unreachable server proves nothing, so the pairing is kept.
+    def pairing_rejected?
+      Api.new(server: config.server, token: config.device_token).get("/device/ping")
+      false
+    rescue Api::HttpError => e
+      e.status == 401
+    rescue SystemCallError, IOError, SocketError, Net::OpenTimeout, Net::ReadTimeout, OpenSSL::SSL::SSLError
+      false
+    end
+
+    def forget_dead_pairing
+      @out.puts "Git Broker no longer knows this machine, so it needs pairing again."
+      config.clear_credentials!
+      ServiceInstaller.new(home: @home, env: @env).uninstall!
+    end
+
+    # Installs what is missing and starts it. A service that is already installed is only started (installing again
+    # would restart a daemon that may be running a task).
+    def install_background_service
+      service = ServiceInstaller.new(home: @home, env: @env)
+      return lifecycle.launch if service.installed?
+
+      install_service
+    end
+
+    def service_unavailable?(error) = error.message.include?("not found on PATH") || error.message.include?("systemctl")
+
     def install_service
-      raise Error, "This machine is not paired. Run `gitbroker login` first." unless config.paired?
+      raise Error, "This machine is not paired. Run `gitbroker start` first." unless config.paired?
 
       path = ServiceInstaller.new(home: @home, env: @env).install!
       @out.puts "Installed and started #{path}."
@@ -112,7 +178,7 @@ module Gitbroker
     # The target of the website's gitbroker://start link and of `gitbroker launch` by hand: start the background
     # service, or the daemon itself when none is installed. Safe to run when it is already running.
     def launch
-      raise Error, "This machine is not paired. Run `gitbroker login` first." unless config.paired?
+      raise Error, "This machine is not paired. Run `gitbroker start` first." unless config.paired?
       lifecycle.launch
     end
 
@@ -125,7 +191,7 @@ module Gitbroker
     end
 
     def restart
-      raise Error, "This machine is not paired. Run `gitbroker login` first." unless config.paired?
+      raise Error, "This machine is not paired. Run `gitbroker start` first." unless config.paired?
 
       lifecycle.restart
       @out.puts "Restarting the companion."
@@ -137,7 +203,7 @@ module Gitbroker
     # the companion comes back on the new version. An unpaired machine has no companion to restart.
     def upgrade
       maintenance.upgrade!
-      return @out.puts("Upgraded. Run `gitbroker login` to pair this machine.") unless config.paired?
+      return @out.puts("Upgraded. Run `gitbroker start` to pair this machine.") unless config.paired?
 
       lifecycle.restart
       @out.puts "Upgraded. Restarting the companion."
@@ -159,7 +225,7 @@ module Gitbroker
     def status
       @out.puts "Git Broker companion #{VERSION}"
       @out.puts "Server:     #{config.server}"
-      @out.puts "Paired:     #{config.paired? ? "yes (device #{config.device_id})" : "no (run `gitbroker login`)"}"
+      @out.puts "Paired:     #{config.paired? ? "yes (device #{config.device_id})" : "no (run `gitbroker start`)"}"
       @out.puts "Agent:      #{config.agent}"
       @out.puts "Terminal:   #{config.terminal}"
       @out.puts "Hooks:      #{hooks_installer.installed? ? "installed" : "not installed (gitbroker install-hooks)"}"

data/lib/gitbroker/clipboard.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "open3"
+
+module Gitbroker
+  # Puts a short string on the system clipboard so the user can paste it into the browser instead of typing it
+  # (the pairing code). Best effort: false when no clipboard tool exists or it failed, never an error.
+  module Clipboard
+    COMMANDS = {
+      "macos" => [ [ "pbcopy" ] ],
+      "linux" => [ [ "wl-copy" ], [ "xclip", "-selection", "clipboard" ], [ "xsel", "--clipboard", "--input" ], [ "clip.exe" ] ]
+    }.freeze
+
+    def self.copy(text, platform: Gitbroker.platform, commands: COMMANDS)
+      Array(commands[platform]).any? { |argv| pipe(argv, text) }
+    end
+
+    def self.pipe(argv, text)
+      _out, status = Open3.capture2e(*argv, stdin_data: text)
+      status.success?
+    rescue SystemCallError
+      false
+    end
+    private_class_method :pipe
+  end
+end

data/lib/gitbroker/config.rb

@@ -67,6 +67,12 @@ module Gitbroker
       @credentials = nil
     end
 
+    # Forgets the pairing (the server no longer knows this device); the next `gitbroker start` pairs again.
+    def clear_credentials!
+      FileUtils.rm_f(credentials_path)
+      @credentials = nil
+    end
+
     private
 
     def credentials

data/lib/gitbroker/daemon.rb

@@ -8,15 +8,20 @@ module Gitbroker
   # `gitbroker start`: keep the device connected, report checkouts, claim and run tasks, and relay the status of
   # agents the user started themselves (relay: Task 31, process scanner: Task 32).
   class Daemon
+    class Rejected < Error; end
+
     RESCAN_EVERY = 300
     MAX_BACKOFF = 60
     BATCH = 50
     # Spec §5.2 / main §18.4: nothing else about an observed agent ever leaves the machine.
+    # The server answered "unauthorized" this many times in a row (a revoked device, or a server that lost its devices):
+    # the pairing is dead, so the daemon stops asking instead of retrying for ever. One or two could be a blip.
+    REJECTIONS_BEFORE_GIVING_UP = 3
     OBSERVATION_FIELDS = %w[event agent external_session_id repository branch head_sha occurred_at].freeze
 
     def self.build(config, out: $stdout, relay: LocalRelay.new(path: File.join(config.dir, "daemon.sock")),
                    process_scanner: build_process_scanner(config))
-      raise Error, "This machine is not paired. Run `gitbroker login` first." unless config.paired?
+      raise Error, "This machine is not paired. Run `gitbroker start` in a terminal to pair it." unless config.paired?
 
       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) },
@@ -58,6 +63,7 @@ module Gitbroker
 
     def run
       @backoff = 1
+      @rejections = 0
       @relay&.start
       @lifecycle&.write_pid
       until @stopping
@@ -66,7 +72,10 @@ module Gitbroker
           wire(@client)
           @client.run
         rescue CableClient::Unauthorized
-          raise Error, "Git Broker rejected this device (revoked?). Run `gitbroker login` to pair again."
+          @rejections += 1
+          raise Rejected, "Git Broker no longer knows this device (revoked?). Run `gitbroker start` to pair again." if @rejections >= REJECTIONS_BEFORE_GIVING_UP
+
+          @out.puts "Git Broker rejected this device (#{@rejections} of #{REJECTIONS_BEFORE_GIVING_UP}); trying again."
         rescue Error, SystemCallError, IOError, SocketError, OpenSSL::SSL::SSLError => e
           @out.puts "Connection problem: #{e.message}"
         end
@@ -96,6 +105,7 @@ module Gitbroker
     def wire(client)
       client.on_subscribed do
         @backoff = 1
+        @rejections = 0
         rescan(client)
         client.perform("hello", "version" => VERSION, "platform" => Gitbroker.platform,
                                 "service" => @lifecycle ? @lifecycle.service_installed? : false)

data/lib/gitbroker/login.rb

@@ -10,7 +10,8 @@ module Gitbroker
     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 })
+                   sleeper: ->(seconds) { sleep(seconds) }, opener: ->(url) { Login.open_browser(url) }, clock: -> { Time.now },
+                   copier: ->(text) { Clipboard.copy(text) })
       @config = config
       @api = api
       @out = out
@@ -18,14 +19,22 @@ module Gitbroker
       @sleeper = sleeper
       @opener = opener
       @clock = clock
+      @copier = copier
     end
 
     def run
       auth = @api.post("/device_authorizations", { client_name: @name, platform: Gitbroker.platform })
-      # No pre-filled link: the user types the code on the plain page.
-      @out.puts "To pair this machine, open #{auth.fetch("verification_uri")} and type the code: #{auth.fetch("user_code")}"
-      @out.puts "Approve only if the page shows this machine's name (#{@name}) and the code above."
-      @opener.call(auth.fetch("verification_uri"))
+      code = auth.fetch("user_code")
+      uri = auth.fetch("verification_uri")
+      copied = @copier.call(code)
+      # No pre-filled link: nothing in a URL may select a code, the user pastes (or types) it on the plain page.
+      @out.puts "Pairing #{@name} with Git Broker."
+      @out.puts
+      @out.puts "  Your code: #{code}#{"  (copied to your clipboard)" if copied}"
+      @out.puts
+      @out.puts "Paste it at #{uri}, press Pair, then check the device details and press Approve."
+      @out.puts "Only enter a code you see here, in your own terminal."
+      @opener.call(uri)
       poll(auth)
     end
 
@@ -36,7 +45,7 @@ module Gitbroker
       deadline = @clock.call + auth.fetch("expires_in", 600).to_i
 
       loop do
-        raise Error, "The pairing code expired. Run `gitbroker login` again." if @clock.call > deadline
+        raise Error, "The pairing code expired. Run `gitbroker start` again." if @clock.call > deadline
 
         @sleeper.call(interval)
         begin
@@ -46,14 +55,14 @@ module Gitbroker
           case e.body["error"]
           when "authorization_pending" then next
           when "slow_down" then interval += 5
-          when "expired_token" then raise Error, "The pairing code expired. Run `gitbroker login` again."
+          when "expired_token" then raise Error, "The pairing code expired. Run `gitbroker start` again."
           else raise Error, "Pairing failed: #{e.message}"
           end
           next
         end
 
         @config.save_credentials!(device_token: token.fetch("access_token"), device_id: token.fetch("device_id"))
-        @out.puts "Paired. Next: `gitbroker install-service` (or `gitbroker start`)."
+        @out.puts "Paired."
         return token["device_id"]
       end
     end

data/lib/gitbroker/version.rb

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

data/lib/gitbroker.rb

@@ -16,6 +16,7 @@ module Gitbroker
   autoload :Agents, File.expand_path("gitbroker/agents", __dir__)
   autoload :Api, File.expand_path("gitbroker/api", __dir__)
   autoload :CableClient, File.expand_path("gitbroker/cable_client", __dir__)
+  autoload :Clipboard, File.expand_path("gitbroker/clipboard", __dir__)
   autoload :CLI, File.expand_path("gitbroker/cli", __dir__)
   autoload :Config, File.expand_path("gitbroker/config", __dir__)
   autoload :Daemon, File.expand_path("gitbroker/daemon", __dir__)

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

@@ -1,5 +1,5 @@
 {
   "name": "gitbroker",
-  "version": "0.5.0",
+  "version": "0.6.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.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Yuri Sidorov (@newstler)
@@ -41,6 +41,7 @@ files:
 - lib/gitbroker/api.rb
 - lib/gitbroker/cable_client.rb
 - lib/gitbroker/cli.rb
+- lib/gitbroker/clipboard.rb
 - lib/gitbroker/config.rb
 - lib/gitbroker/daemon.rb
 - lib/gitbroker/explain_verifier.rb