portage-cli 0.7.0 → 0.7.4

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"
 
@@ -25,6 +31,7 @@ module Portage
                                 [--product-id ID] [--yes] [--dry-run]
                                 [--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]
@@ -43,28 +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, "configure" => :run_doctor, "setup" => :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)
@@ -72,6 +117,8 @@ module Portage
       return 1 unless options
 
       json = options.delete(:json)
+      return 1 unless apply_proxy_settings(options.delete(:proxy))
+
       report = Find.new(**options).call
       record_find(report)
       puts json ? JSON.pretty_generate(report) : format_find(report)
@@ -98,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
@@ -121,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
@@ -147,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
@@ -162,6 +215,7 @@ 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)
@@ -210,11 +264,88 @@ module Portage
       options[:product_id] ||= product_id
       report = Buy.new(**options).call
       record_buy(report, options[:query])
-      puts parsed[:json] ? JSON.pretty_generate(report) : format_report(report)
+      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
 
+    # 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
@@ -276,7 +407,10 @@ module Portage
       buy = { url: url, qty: 1, yes: false, dry_run: false }
       parsed = { buy: buy, find: {}, confidence: {} }
       json = argv.include?("--json")
-      buy_option_parser(buy, parsed).parse!(argv)
+      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?
 
@@ -294,9 +428,9 @@ 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
@@ -311,6 +445,22 @@ module Portage
     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.
@@ -318,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
 
@@ -455,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
@@ -486,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|
@@ -610,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
@@ -627,17 +851,27 @@ 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
-      puts opts[:json] ? JSON.pretty_generate(findings.map(&:to_h)) : format_doctor(findings)
-      findings.empty? ? 0 : 1
+      report_doctor(Doctor.new(adapter_class: adapter_class, proxy_settings: proxy_settings).call, json: opts[:json])
     end
     private_class_method :run_doctor
 
-    def self.format_doctor(findings)
-      return "No issues found." if findings.empty?
+    def self.report_doctor(findings, json:)
+      puts json ? JSON.pretty_generate(findings.map(&:to_h)) : format_doctor(findings)
+      findings.none?(&:warning?) ? 0 : 1
+    end
+    private_class_method :report_doctor
 
-      findings.map { |f| "[#{f.check}] #{f.message}" }.join("\n")
+    # Info findings (install method, Ruby, adapters, PATH) first, then the
+    # warnings, which alone decide the exit code.
+    def self.format_doctor(findings)
+      info, warnings = findings.partition { |f| !f.warning? }
+      lines = info.map { |f| "[#{f.check}] #{f.message}" }
+      lines << "" unless info.empty?
+      lines.concat(warnings.empty? ? ["No issues found."] : warnings.map { |f| "[#{f.check}] #{f.message}" })
+      lines.join("\n")
     end
     private_class_method :format_doctor
 

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: portage-cli
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.4
 platform: ruby
 authors:
 - Tom Whitbread
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-09-23 00:00:00.000000000 Z
+date: 2026-09-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: portage-ucp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: portage-ucp-client
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +47,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +57,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: portage-ucp-journal
   requirement: !ruby/object:Gem::Requirement
@@ -154,17 +168,34 @@ files:
 - lib/portage/cli/find.rb
 - lib/portage/cli/generate/adapter.rb
 - lib/portage/cli/generate/agent_profile.rb
+- lib/portage/cli/handoff_reconciler.rb
+- lib/portage/cli/handoff_reconciler/wire_adapters.rb
+- lib/portage/cli/handoff_spend_mode.rb
+- lib/portage/cli/handoff_wait_timeout.rb
+- lib/portage/cli/handoff_waiter.rb
 - lib/portage/cli/history.rb
+- lib/portage/cli/homepage_fetch.rb
+- lib/portage/cli/install_doctor.rb
+- lib/portage/cli/macos_notifier.rb
 - lib/portage/cli/notifier.rb
 - lib/portage/cli/payment_methods.rb
 - lib/portage/cli/payment_methods/env_backend.rb
 - lib/portage/cli/payment_methods/keychain_backend.rb
 - lib/portage/cli/payment_methods/secret_service_backend.rb
+- lib/portage/cli/permissive_authenticator.rb
 - lib/portage/cli/probe_cache.rb
+- lib/portage/cli/proxy_doctor.rb
+- lib/portage/cli/proxy_settings.rb
+- lib/portage/cli/proxy_settings/password_ref.rb
+- lib/portage/cli/reconcile_notifier.rb
+- lib/portage/cli/reconcile_notify.rb
 - lib/portage/cli/search_backends.rb
 - lib/portage/cli/setting.rb
 - lib/portage/cli/shipping_profile.rb
+- lib/portage/cli/user_agent.rb
 - lib/portage/cli/version.rb
+- lib/portage/cli/webmcp.rb
+- lib/portage/cli/webmcp_checkout_mode.rb
 homepage: https://github.com/tomtom87/Portage/tree/main/portage-cli
 licenses:
 - MIT