portage-cli 0.6.4 → 0.7.3

data/lib/portage/cli.rb

@@ -2,6 +2,7 @@ require "optparse"
 require "json"
 
 require_relative "cli/version"
+require_relative "cli/user_agent"
 require_relative "cli/shipping_profile"
 require_relative "cli/buyer_context"
 require_relative "cli/catalog_products"
@@ -10,7 +11,12 @@ require_relative "cli/find"
 require_relative "cli/compare"
 require_relative "cli/history"
 require_relative "cli/payment_methods"
+require_relative "cli/proxy_settings"
 require_relative "cli/doctor"
+require_relative "cli/handoff_reconciler"
+require_relative "cli/handoff_waiter"
+require_relative "cli/reconcile_notifier"
+require_relative "cli/reconcile_notify"
 require_relative "cli/generate/adapter"
 require_relative "cli/generate/agent_profile"
 
@@ -23,7 +29,9 @@ module Portage
     USAGE = <<~USAGE.freeze
       usage: portage buy <url> --query "..." [--qty N] [--payment-token TOKEN]
                                 [--product-id ID] [--yes] [--dry-run]
-                                [--auto-open|--no-auto-open] [--notify-webhook URL] [--json]
+                                [--auto-open|--no-auto-open] [--notify-webhook URL]
+                                [--decision-backend jev|laya] [--min-confidence N] [--json]
+                                [--wait [--wait-timeout DURATION|off]]
              portage buy --query "..." [--store URL] [--max-price N] [--limit N] ...
              portage find --query "..." [--max-price N] [--limit N] [--json]
              portage compare <url> --product-id ID [--id VALUE ...] [--results N]
@@ -42,25 +50,66 @@ module Portage
                                  [--rolling-cap N --rolling-window-seconds N --currency CUR]
                                  [--velocity-count N --velocity-window-seconds N]
                                  [--allow HOST ...] [--clear-allowlist]
+             portage orders reconcile [--checkout ID] [--json]
              portage doctor [--require FILE] [--adapter CLASS_NAME] [--json]
+             portage configure [--require FILE] [--adapter CLASS_NAME] [--json]  (alias for doctor)
+             portage setup [--require FILE] [--adapter CLASS_NAME] [--json]      (alias for doctor)
              portage generate adapter NAME [--dir DIR]
              portage generate agent-profile [--out FILE] [--key-out FILE] [--rotate]
+             portage --version
+
+           proxy flags (buy/find/compare/doctor/payment enroll):
+             [--proxy URL] [--proxy-mode forward|gateway] [--proxy-header "Name: value"]
+             [--no-proxy HOSTS] [--proxy-route ROUTE=URL|direct] [--proxy-chain URL,URL,...]
+             [--proxy-passthrough HEADER] [--proxy-ca FILE] [--no-env-proxy]
     USAGE
 
     COMMANDS = { "buy" => :run_buy, "find" => :run_find, "compare" => :run_compare,
                  "history" => :run_history, "payment" => :run_payment, "policy" => :run_policy,
-                 "doctor" => :run_doctor, "generate" => :run_generate }.freeze
+                 "orders" => :run_orders, "doctor" => :run_doctor, "configure" => :run_doctor,
+                 "setup" => :run_doctor, "generate" => :run_generate }.freeze
+
+    VERSION_FLAGS = %w[--version -v version].freeze
 
     # @param argv [Array<String>]
     # @return [Integer] process exit code
     def self.run(argv)
       command, *rest = argv
+      return run_version if VERSION_FLAGS.include?(command)
       return send(COMMANDS[command], rest) if COMMANDS.key?(command)
 
       warn USAGE
       1
     end
 
+    # So a packaged install (Homebrew's `test do` block, `portage doctor`)
+    # can confirm which release it's running without hitting the network.
+    def self.run_version
+      puts VERSION
+      0
+    end
+    private_class_method :run_version
+
+    # --- proxy (docs/plans/proxy-support.md Phase 2) ---
+
+    # Resolves this command's `--proxy*` flags/env/config.json into a
+    # ProxyConfig and installs it as the process-wide default every
+    # Support::Connection.start call (buy/find/compare/payment/doctor alike)
+    # already reads unless it's handed its own `proxy:` — see ProxySettings'
+    # own comment for why. A bad flag or a malformed/protected-header
+    # config.json surfaces here as a clean message, never a raw core
+    # exception.
+    # @return [ProxySettings, nil] nil on a config error (already reported).
+    def self.apply_proxy_settings(proxy_flags)
+      settings = ProxySettings.new(flags: proxy_flags || {})
+      Portage::Ucp::Support::ProxyConfig.current = settings.resolve
+      settings
+    rescue ProxySettings::ConfigError => e
+      warn "portage: #{e.message}"
+      nil
+    end
+    private_class_method :apply_proxy_settings
+
     # --- find ---
 
     def self.run_find(argv)
@@ -68,14 +117,21 @@ module Portage
       return 1 unless options
 
       json = options.delete(:json)
+      return 1 unless apply_proxy_settings(options.delete(:proxy))
+
       report = Find.new(**options).call
-      History.new.record_search(query: report[:query], offer_count: report[:offers].length,
-                                message: report[:message])
+      record_find(report)
       puts json ? JSON.pretty_generate(report) : format_find(report)
       report[:offers].any? ? 0 : 1
     end
     private_class_method :run_find
 
+    def self.record_find(report)
+      History.new.record_search(query: report[:query], offer_count: report[:offers].length,
+                                message: report[:message])
+    end
+    private_class_method :record_find
+
     def self.parse_find_options(argv)
       opts = {}
       find_option_parser(opts).parse!(argv)
@@ -89,11 +145,13 @@ module Portage
     private_class_method :parse_find_options
 
     def self.find_option_parser(opts)
+      opts[:proxy] = {}
       OptionParser.new do |parser|
         parser.on("--query QUERY") { |v| opts[:query] = v }
         parser.on("--limit N", Integer) { |v| opts[:limit] = v }
         parser.on("--max-price N", Float) { |v| opts[:max_price] = to_minor_units(v) }
         parser.on("--json") { opts[:json] = true }
+        ProxySettings.add_options(parser, opts[:proxy])
       end
     end
     private_class_method :find_option_parser
@@ -112,6 +170,8 @@ module Portage
 
       json = options.delete(:json)
       url = options.delete(:url)
+      return 1 unless apply_proxy_settings(options.delete(:proxy))
+
       report = Compare.new(origin_url: url, **options).call
       # Recorded as a search, not a purchase — compare never checks out. The
       # query string names the compare so `portage history list` doesn't
@@ -138,12 +198,14 @@ module Portage
     private_class_method :parse_compare_options
 
     def self.compare_option_parser(opts)
+      opts[:proxy] = {}
       OptionParser.new do |parser|
         parser.on("--product-id ID") { |v| opts[:origin_product_id] = v }
         parser.on("--id VALUE") { |v| opts[:identity] << v }
         parser.on("--results N", Integer) { |v| opts[:results] = v }
         parser.on("--max-price N", Float) { |v| opts[:max_price] = to_minor_units(v) }
         parser.on("--json") { opts[:json] = true }
+        ProxySettings.add_options(parser, opts[:proxy])
       end
     end
     private_class_method :compare_option_parser
@@ -153,8 +215,11 @@ module Portage
     def self.run_buy(argv)
       parsed = parse_buy_options(argv)
       return 1 unless parsed
+      return 1 unless apply_proxy_settings(parsed[:proxy])
 
       url = parsed[:buy][:url] || parsed[:store]
+      parsed[:confidence_check] = confidence_check(parsed, url)
+      return 1 unless parsed[:confidence_check]
       return execute_buy(parsed, url) if url
 
       buy_from_search(parsed)
@@ -168,6 +233,7 @@ module Portage
     # interactive pick has to name it. Piped/CI runs list the offers and stop.
     def self.buy_from_search(parsed)
       report = Find.new(**parsed[:find]).call
+      record_find(report)
       offer = pick_offer(report, parsed[:json])
       return report[:offers].any? ? 0 : 1 unless offer
 
@@ -194,36 +260,164 @@ module Portage
     private_class_method :prompt_for_offer
 
     def self.execute_buy(parsed, url, product_id: nil)
-      options = parsed[:buy].merge(url: url)
+      options = parsed[:buy].merge(url: url, confidence_check: parsed[:confidence_check])
       options[:product_id] ||= product_id
       report = Buy.new(**options).call
-      record_purchase(report, options[:query]) if report[:checkout]
-      puts parsed[:json] ? JSON.pretty_generate(report) : format_report(report)
+      record_buy(report, options[:query])
+      result = parsed[:wait] ? wait_for_handoff(report, parsed) : nil
+      print_buy_report(report, result, parsed[:json])
       report[:checkout] || report[:browse] ? 0 : 1
     end
     private_class_method :execute_buy
 
-    # Only checkout attempts land here — a browse-only report never reached a
-    # checkout, so it belongs to search history, not purchase history.
-    def self.record_purchase(report, query)
-      History.new.record_purchase(
-        url: report[:url], query: query, checkout: report[:checkout],
-        checkout_status: report[:checkout_status], message: report[:message],
-        products: report[:products].map { |p| product_line(p) }
+    # docs/plans/handoff-reconcile.md Phase 3 — `portage buy --wait`. A
+    # no-op (returns nil) whenever there's nothing to wait on: --dry-run
+    # never hands off at all, and a completed/browse-only/dead-end report
+    # has no pending shopper record either. Otherwise polls
+    # `HandoffReconciler` through `HandoffWaiter` until it settles or its
+    # deadline passes.
+    #
+    # Under --json, every event streams to stdout as it happens (NDJSON) —
+    # the initial hand-off, then a line per checkout-status change, then the
+    # settle, so a calling agent reading stdout live never has to guess
+    # whether it's still waiting. Under plain output, nothing streams here:
+    # the forced "terminal" notify channel (see #wait_notifier) prints its
+    # own line when it settles, and the final report follows exactly as it
+    # does without --wait.
+    def self.wait_for_handoff(report, parsed)
+      return nil unless report[:handoff] && report[:checkout_id]
+
+      transaction_log = Portage::Ucp::Support::TransactionLog.new
+      record = pending_shopper_record(report[:checkout_id], transaction_log)
+      return nil unless record
+
+      json = parsed[:json]
+      emit_ndjson(handoff_event(report)) if json
+      reconciler = HandoffReconciler.new(transaction_log: transaction_log, notifier: wait_notifier(json))
+      waiter = HandoffWaiter.new(reconciler: reconciler, transaction_log: transaction_log,
+                                 wait_timeout_override: parsed[:wait_timeout])
+      waiter.call(record) { |event, result| emit_wait_event(event, result, json) }
+    end
+    private_class_method :wait_for_handoff
+
+    def self.pending_shopper_record(checkout_id, transaction_log)
+      transaction_log.each_record.find { |r| r["checkout_id"] == checkout_id && r["settled_by"] == "shopper" }
+    end
+    private_class_method :pending_shopper_record
+
+    # `terminal` is forced on for a plain-text wait (see ReconcileNotify) so
+    # the shopper sees a line the moment it settles even with nothing
+    # configured. Never forced under --json: that channel prints plain text,
+    # which would corrupt the NDJSON stream this method's caller is also
+    # writing to the same stdout.
+    def self.wait_notifier(json)
+      ReconcileNotifier.new(channels: ReconcileNotify.resolve(extra: json ? [] : ["terminal"]))
+    end
+    private_class_method :wait_notifier
+
+    def self.handoff_event(report)
+      { event: "handoff", checkout_id: report[:checkout_id], checkout_url: report[:checkout_url],
+        reason: report[:outcome] }
+    end
+    private_class_method :handoff_event
+
+    # Only `:settled` ever reaches stdout as `handoff_settled` — a timeout or
+    # an interrupted wait leaves `result.settled` false, and that's already
+    # visible in the final report object this event stream ends with, so a
+    # second, redundant "gave up" event isn't needed.
+    def self.emit_wait_event(event, result, json)
+      return unless json
+
+      case event
+      when :status then emit_ndjson({ event: "handoff_status", status: result.checkout_status })
+      when :settled
+        emit_ndjson({ event: "handoff_settled", result: result.status, resolution: result.resolution,
+                      order_id: result.order_id, amount: result.amount, currency: result.currency }.compact)
+      end
+    end
+    private_class_method :emit_wait_event
+
+    def self.emit_ndjson(payload) = puts JSON.generate(payload)
+    private_class_method :emit_ndjson
+
+    def self.print_buy_report(report, result, json)
+      report = report.merge(reconcile: result.to_h) if result
+      puts json ? JSON.pretty_generate(report) : format_report(report)
+    end
+    private_class_method :print_buy_report
+
+    # Built before the buy starts (and before the search, when there's no
+    # URL), so a bad --min-confidence, or a bad PORTAGE_MIN_CONFIDENCE with
+    # a backend enabled, stops the run up front rather than after a
+    # checkout already exists.
+    def self.confidence_check(parsed, url)
+      ConfidenceCheck.new(**parsed[:confidence])
+    rescue ArgumentError => e
+      invalid_buy_option(e.message, url: url, json: parsed[:json])
+    end
+    private_class_method :confidence_check
+
+    # A buy refused before it started. Under --json that's a report like
+    # any other, with outcome `invalid_option`, so an agent loop reading
+    # stdout gets JSON rather than nothing and a line on stderr.
+    # @return [nil]
+    def self.invalid_buy_option(message, url:, json:)
+      unless json
+        warn message
+        return nil
+      end
+
+      puts JSON.pretty_generate(url: url, checkout_url: nil, products: [], warnings: [], source: "none",
+                                outcome: "invalid_option", browse: false, checkout: false, message: message)
+      nil
+    end
+    private_class_method :invalid_buy_option
+
+    # A buy that created a checkout is a purchase entry, whatever its
+    # outcome. One that never got that far (no match, browse-only, dead end,
+    # a store or adapter error) is a search at that store, so "what did I
+    # already buy" never lists a checkout that doesn't exist.
+    def self.record_buy(report, query)
+      history = History.new
+      unless report[:checkout_id]
+        return history.record_search(query: query, url: report[:url], offer_count: report[:products].length,
+                                     message: report[:message])
+      end
+
+      history.record_purchase(
+        url: report[:url], query: query, outcome: report[:outcome], source: report[:source],
+        checkout_id: report[:checkout_id], checkout_status: report[:checkout_status],
+        checkout_url: report[:checkout_url], total: report_total(report), currency: report[:currency],
+        items: Array(report[:items]).map { |item| item.transform_keys(&:to_s) }, message: report[:message]
       )
     end
-    private_class_method :record_purchase
+    private_class_method :record_buy
 
+    def self.report_total(report)
+      Portage::Ucp::Support::Totals.amount(report[:totals])
+    end
+    private_class_method :report_total
+
+    # A flag OptionParser can't read (`--min-confidence high`, `--qty two`,
+    # an unknown flag) is refused the same way as an out-of-range
+    # threshold. `--json` is looked for up front, since parsing stops at
+    # the bad flag and may never reach it.
     def self.parse_buy_options(argv)
       url = argv.first && !argv.first.start_with?("-") ? argv.shift : nil
       buy = { url: url, qty: 1, yes: false, dry_run: false }
-      parsed = { buy: buy, find: {} }
-      buy_option_parser(buy, parsed).parse!(argv)
+      parsed = { buy: buy, find: {}, confidence: {} }
+      json = argv.include?("--json")
+      parsed[:proxy] = {}
+      parser = buy_option_parser(buy, parsed)
+      ProxySettings.add_options(parser, parsed[:proxy])
+      parser.parse!(argv)
       buy[:query] ||= ""
       return parsed if url || !buy[:query].strip.empty?
 
       warn USAGE
       nil
+    rescue OptionParser::ParseError => e
+      invalid_buy_option(e.message, url: url, json: json)
     end
     private_class_method :parse_buy_options
 
@@ -234,14 +428,39 @@ module Portage
         parser.on("--product-id ID") { |v| buy[:product_id] = v }
         parser.on("--yes") { buy[:yes] = true }
         parser.on("--dry-run") { buy[:dry_run] = true }
-        parser.on("--[no-]auto-open") { |v| buy[:auto_open] = v }
-        parser.on("--notify-webhook URL") { |v| buy[:notify_webhook] = v }
         parser.on("--json") { parsed[:json] = true }
+        add_handoff_options(parser, buy)
+        add_wait_options(parser, parsed)
         add_search_options(parser, buy, parsed)
+        add_confidence_options(parser, parsed[:confidence])
       end
     end
     private_class_method :buy_option_parser
 
+    # The opt-in confidence gate in front of a `--yes` completion (see
+    # ConfidenceCheck) — both default to their PORTAGE_* env vars.
+    def self.add_confidence_options(parser, confidence)
+      parser.on("--decision-backend NAME") { |v| confidence[:backend] = v }
+      parser.on("--min-confidence N", Float) { |v| confidence[:threshold] = v }
+    end
+    private_class_method :add_confidence_options
+
+    def self.add_handoff_options(parser, buy)
+      parser.on("--[no-]auto-open") { |v| buy[:auto_open] = v }
+      parser.on("--notify-webhook URL") { |v| buy[:notify_webhook] = v }
+    end
+    private_class_method :add_handoff_options
+
+    # docs/plans/handoff-reconcile.md Phase 3 — `--wait`/`--wait-timeout`
+    # land on `parsed`, never on `buy`: they're consumed by
+    # `#wait_for_handoff` after `Buy#call` returns, and `Buy.new` has no
+    # `wait:`/`wait_timeout:` keyword to accidentally receive them.
+    def self.add_wait_options(parser, parsed)
+      parser.on("--wait") { parsed[:wait] = true }
+      parser.on("--wait-timeout DURATION") { |v| parsed[:wait_timeout] = v }
+    end
+    private_class_method :add_wait_options
+
     # `--query` feeds both halves: it's the store search when there's no URL
     # and the catalog search once a store is settled, so it's registered once
     # here rather than twice on the same parser.
@@ -249,7 +468,7 @@ module Portage
       parser.on("--query QUERY") { |v| parsed[:find][:query] = buy[:query] = v }
       parser.on("--store URL") { |v| parsed[:store] = v }
       parser.on("--limit N", Integer) { |v| parsed[:find][:limit] = v }
-      parser.on("--max-price N", Float) { |v| parsed[:find][:max_price] = to_minor_units(v) }
+      parser.on("--max-price N", Float) { |v| parsed[:find][:max_price] = buy[:max_price] = to_minor_units(v) }
     end
     private_class_method :add_search_options
 
@@ -310,13 +529,30 @@ module Portage
     end
     private_class_method :format_history
 
+    # `outcome` first, since it's what the entry is for. Entries recorded
+    # before `outcome` existed fall back to their checkout_status/message.
     def self.history_purchase_line(entry)
-      "#{Time.at(entry['at'])} — #{entry['url']} (#{entry['query']}) — #{entry['checkout_status'] || entry['message']}"
+      items = Array(entry["items"]).map { |item| item_label(item) }.join(", ")
+      [
+        "#{Time.at(entry['at'])} — #{entry['outcome'] || entry['checkout_status'] || entry['message']}",
+        "#{entry['url']} (#{entry['query']})", (items unless items.empty?),
+        (format_amount(entry["total"], entry["currency"]) if entry["total"]),
+        (entry["checkout_url"] unless entry["outcome"] == "purchased")
+      ].compact.join(" — ")
     end
     private_class_method :history_purchase_line
 
+    # Takes a report's symbol-keyed item or a history entry's string-keyed
+    # one.
+    def self.item_label(item)
+      item = item.transform_keys(&:to_s)
+      "#{item['title'] || item['id']} x#{item['quantity']}"
+    end
+    private_class_method :item_label
+
     def self.history_search_line(entry)
-      "#{Time.at(entry['at'])} — \"#{entry['query']}\" — #{entry['offer_count']} offer(s)"
+      where = entry["url"] ? " at #{entry['url']}" : ""
+      "#{Time.at(entry['at'])} — \"#{entry['query']}\"#{where} — #{entry['offer_count']} result(s)"
     end
     private_class_method :history_search_line
 
@@ -369,13 +605,14 @@ module Portage
     private_class_method :run_payment_mutate
 
     def self.parse_payment_enroll_options(argv)
-      opts = { scope_merchants: [] }
+      opts = { scope_merchants: [], proxy: {} }
       OptionParser.new do |parser|
         parser.on("--label NAME") { |v| opts[:label] = v }
         parser.on("--json") { opts[:json] = true }
         parser.on("--scope-merchant HOST") { |v| opts[:scope_merchants] << v }
         parser.on("--scope-max-amount N", Integer) { |v| opts[:scope_max_amount] = v }
         parser.on("--scope-currency CUR") { |v| opts[:scope_currency] = v }
+        ProxySettings.add_options(parser, opts[:proxy])
       end.parse!(argv)
       opts[:url] = argv.first && !argv.first.start_with?("-") ? argv.shift : nil
       opts
@@ -400,6 +637,7 @@ module Portage
         warn USAGE
         return 1
       end
+      return 1 unless apply_proxy_settings(opts[:proxy])
 
       result = PaymentMethods.new.enroll(opts[:url], label: opts[:label],
                                                      scope: payment_enroll_scope(opts)) do |setup_url|
@@ -524,14 +762,86 @@ module Portage
     end
     private_class_method :format_payment_enroll
 
+    # --- orders ---
+
+    # docs/plans/handoff-reconcile.md Phase 1 — resolves every pending
+    # `settled_by: "shopper"` TransactionLog record (or just the one named
+    # by `--checkout`) by re-fetching that checkout from the store. Safe to
+    # run from cron/launchd: a record that's already terminal, or that
+    # doesn't belong to this run (a `--checkout` for a different id, or
+    # `settled_by: nil` dispatcher crash-evidence), is a no-op result, not
+    # an error, so a scheduled run never needs its own filtering logic.
+    def self.run_orders(argv)
+      sub = argv.first && !argv.first.start_with?("-") ? argv.shift : nil
+      return run_orders_reconcile(argv) if sub == "reconcile"
+
+      warn USAGE
+      1
+    end
+    private_class_method :run_orders
+
+    def self.run_orders_reconcile(argv)
+      opts = {}
+      OptionParser.new do |parser|
+        parser.on("--checkout ID") { |v| opts[:checkout] = v }
+        parser.on("--json") { opts[:json] = true }
+      end.parse!(argv)
+
+      transaction_log = Portage::Ucp::Support::TransactionLog.new
+      reconciler = HandoffReconciler.new(transaction_log: transaction_log)
+      results = reconcile_records(opts[:checkout], transaction_log, reconciler)
+
+      puts opts[:json] ? JSON.pretty_generate(results.map(&:to_h)) : format_reconcile(results)
+      0
+    end
+    private_class_method :run_orders_reconcile
+
+    def self.reconcile_records(checkout_id, transaction_log, reconciler)
+      return reconcile_one_checkout(checkout_id, transaction_log, reconciler) if checkout_id
+
+      HandoffReconciler.each_pending_shopper_record(transaction_log).map { |record| reconciler.call(record) }
+    end
+    private_class_method :reconcile_records
+
+    # `--checkout ID` reconciles the one named record whatever its
+    # `settled_by`/status — #call itself still refuses to settle anything
+    # that isn't a pending shopper record, this just skips the "iterate
+    # every pending record" step when the caller already knows which one.
+    def self.reconcile_one_checkout(checkout_id, transaction_log, reconciler)
+      key = transaction_log.each_record.find { |r| r["checkout_id"] == checkout_id }&.fetch("idempotency_key", nil)
+      return [] unless key
+
+      [reconciler.call(transaction_log.find(key))]
+    end
+    private_class_method :reconcile_one_checkout
+
+    def self.format_reconcile(results)
+      return "(nothing to reconcile)" if results.empty?
+
+      results.map { |r| format_reconcile_result(r) }.join("\n")
+    end
+    private_class_method :format_reconcile
+
+    def self.format_reconcile_result(result)
+      return "#{result.idempotency_key}: #{result.note}" unless result.settled
+
+      parts = ["#{result.idempotency_key}: #{result.status}"]
+      parts << "resolution: #{result.resolution}" if result.resolution
+      parts << "order: #{result.order_id}" if result.order_id
+      parts << format_amount(result.amount, result.currency) if result.amount
+      parts.join(" — ")
+    end
+    private_class_method :format_reconcile_result
+
     # --- doctor ---
 
     def self.parse_doctor_options(argv)
-      opts = {}
+      opts = { proxy: {} }
       OptionParser.new do |parser|
         parser.on("--require FILE") { |v| opts[:require] = v }
         parser.on("--adapter CLASS_NAME") { |v| opts[:adapter] = v }
         parser.on("--json") { opts[:json] = true }
+        ProxySettings.add_options(parser, opts[:proxy])
       end.parse!(argv)
       opts
     end
@@ -541,8 +851,10 @@ module Portage
       opts = parse_doctor_options(argv)
       require File.expand_path(opts[:require]) if opts[:require]
       adapter_class = opts[:adapter] && Object.const_get(opts[:adapter])
+      proxy_settings = apply_proxy_settings(opts[:proxy])
+      return 1 unless proxy_settings
 
-      findings = Doctor.new(adapter_class: adapter_class).call
+      findings = Doctor.new(adapter_class: adapter_class, proxy_settings: proxy_settings).call
       puts opts[:json] ? JSON.pretty_generate(findings.map(&:to_h)) : format_doctor(findings)
       findings.empty? ? 0 : 1
     end
@@ -598,21 +910,44 @@ module Portage
       puts "Wrote #{result[:profile_path]} (kid #{result[:kid]})"
       puts "Wrote private key to #{result[:private_key_path]} — keep this out of version control " \
            "and off the machine that serves the public profile"
+      puts "Next: commit #{result[:profile_path]}, then, once it's on main, run " \
+           "`bundle exec rake agent_profile:purge` from the repo root — see docs/agent-profile.md."
       0
     end
     private_class_method :run_generate_agent_profile
 
     # --- output ---
 
+    # The `[outcome]` tag leads so a caller reading text, not --json, has the
+    # same value to branch on that the JSON report carries.
     def self.format_report(report)
-      lines = ["#{report[:message]} (source: #{report[:source]})"]
+      lines = ["[#{report[:outcome]}] #{report[:message]} (source: #{report[:source]})"]
       report[:products].each { |p| lines << "  - #{product_line(p)}" }
+      lines.concat(format_checkout(report))
       lines << "  checkout: #{report[:checkout_url]}" if report[:checkout_url]
       lines.concat(format_handoff(report[:handoff])) if report[:handoff]
+      lines.concat(format_decisions(report[:decisions])) if report[:decisions]&.any?
       lines.join("\n")
     end
     private_class_method :format_report
 
+    # What the checkout holds, as opposed to the search results above it,
+    # and where it differs from the request.
+    def self.format_checkout(report)
+      lines = Array(report[:items]).map { |item| "  in checkout: #{item_label(item)}" }
+      total = report_total(report)
+      lines << "  total: #{format_amount(total, report[:currency])}" if total
+      lines + Array(report[:warnings]).map { |w| "  warning: #{w}" }
+    end
+    private_class_method :format_checkout
+
+    def self.format_decisions(decisions)
+      decisions.map do |name, verdict|
+        "  decision #{name}: #{verdict.compact.map { |key, value| "#{key}=#{value}" }.join(' ')}"
+      end
+    end
+    private_class_method :format_decisions
+
     def self.format_handoff(handoff)
       lines = ["  opened in browser: #{handoff[:opened]}", "  notified: #{handoff[:notified]}"]
       lines << "  notify error: #{handoff[:notify_error]}" if handoff[:notify_error]
@@ -656,8 +991,13 @@ module Portage
     def self.format_price(offer)
       return "price n/a" unless offer[:amount]
 
-      "#{format('%.2f', offer[:amount] / 100.0)}#{" #{offer[:currency]}" if offer[:currency]}"
+      format_amount(offer[:amount], offer[:currency])
     end
     private_class_method :format_price
+
+    def self.format_amount(amount, currency)
+      "#{format('%.2f', amount / 100.0)}#{" #{currency}" if currency}"
+    end
+    private_class_method :format_amount
   end
 end