portage-cli 0.10.0 → 0.12.0

data/lib/portage/cli.rb

@@ -55,6 +55,7 @@ module Portage
              portage buy --quote QUOTE_ID --yes [--json] ...
              portage buy --query "..." [--store URL] [--max-price N] [--limit N] ...
              portage find --query "..." [--max-price N] [--limit N] [--json]
+             portage find --store URL --query "..." [--max-price N] [--json]  (one store, live, read-only)
              portage compare <url> --product-id ID [--id VALUE ...] [--results N]
                                     [--max-price N] [--json]
              portage check <url> [--json]
@@ -79,8 +80,9 @@ module Portage
              portage orders reconcile [--checkout ID] [--json]
              portage index build [--sources a,b] [--queries FILE] [--dry-run] [--export DIR] [--json]
              portage index refresh [--sources a,b] [--queries FILE] [--dry-run] [--export DIR] [--json]
-             portage index show [--stores|--products] [--json]
-             portage index add <url> [--json]
+             portage index show [--stores|--products [--page N] [--per-page N]] [--json]
+             portage index search QUERY [--category ID] [--store HOST] [--limit N] [--json]
+             portage index add <url> [--crawl] [--json]
              portage index remove <host> [--json]
              portage index sources [--json]
              portage browser import [--browser chrome|edge|brave|arc|firefox|safari] [--profile-root DIR]
@@ -187,14 +189,29 @@ module Portage
         return nil
       end
 
-      opts
+      valid_find_store?(opts) ? opts : nil
     end
     private_class_method :parse_find_options
 
+    # `--store` must be an http(s) URL (a bare host is read as https); anything
+    # else is a usage error rather than a silent no-op search.
+    def self.valid_find_store?(opts)
+      return true unless opts.key?(:store)
+      return true if Find.store_origin(opts[:store])
+
+      warn "portage: --store needs an http(s) store URL, got #{opts[:store].inspect}."
+      warn USAGE
+      false
+    end
+    private_class_method :valid_find_store?
+
     def self.find_option_parser(opts)
       opts[:proxy] = {}
       OptionParser.new do |parser|
         parser.on("--query QUERY") { |v| opts[:query] = v }
+        parser.on("--store URL", "Search only this store's catalogue, live and read-only (http/https)") do |v|
+          opts[:store] = v
+        end
         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 }
@@ -252,6 +269,7 @@ module Portage
       lines << "  platform: #{report[:platform]}" if report[:platform]
       lines << "  webmcp: #{report[:webmcp][:status]}#{" (#{report[:webmcp][:reason]})" if report[:webmcp][:reason]}"
       lines << "  next: #{report[:next_step]}"
+      lines << "  index: `#{report[:index_hint]}` adds its catalogue to your local index" if report[:index_hint]
       lines.join("\n")
     end
     private_class_method :format_check
@@ -412,7 +430,8 @@ module Portage
       parsed[:quote_record] = quote
       buy = parsed[:buy]
       buy.merge!(qty: quote["qty"], product_id: quote["product_id"], query: quote["query"].to_s)
-      buy.merge!(quote_total: quote["total"], quote_currency: quote["currency"])
+      buy.merge!(quote_total: quote["total"], quote_currency: quote["currency"], quote_store: quote["store"],
+                 quote_title: quote["title"])
       execute_buy(parsed, quote["store"])
     end
     private_class_method :buy_from_quote
@@ -1361,6 +1380,7 @@ module Portage
       "build" => ->(argv) { run_index_build(argv, refresh: false) },
       "refresh" => ->(argv) { run_index_build(argv, refresh: true) },
       "show" => ->(argv) { run_index_show(argv) },
+      "search" => ->(argv) { run_index_search(argv) },
       "add" => ->(argv) { run_index_add(argv) },
       "remove" => ->(argv) { run_index_remove(argv) },
       "sources" => ->(argv) { run_index_sources(argv) }
@@ -1419,41 +1439,120 @@ module Portage
     end
     private_class_method :format_index_build
 
+    INDEX_SHOW_PER_PAGE = 50
+
     def self.run_index_show(argv)
-      opts = { kind: nil, json: false }
+      opts = { kind: nil, json: false, page: 1, per_page: INDEX_SHOW_PER_PAGE }
       OptionParser.new do |parser|
         parser.on("--stores") { opts[:kind] = "stores" }
         parser.on("--products") { opts[:kind] = "products" }
+        parser.on("--page N", Integer) { |v| opts[:page] = [v, 1].max }
+        parser.on("--per-page N", Integer) { |v| opts[:per_page] = [v, 1].max }
         parser.on("--json") { opts[:json] = true }
       end.parse!(argv)
 
-      result = { stores: opts[:kind] == "products" ? [] : Index::Store.new.all,
-                 products: opts[:kind] == "stores" ? [] : Index::ProductStore.new.all }
+      result = opts[:kind] == "products" ? index_products_page(opts) : index_show_all(opts[:kind])
       puts opts[:json] ? JSON.pretty_generate(result) : format_index_show(result)
       0
     end
     private_class_method :run_index_show
 
+    def self.index_show_all(kind)
+      { stores: kind == "products" ? [] : Index::Store.new.all, products: kind == "stores" ? [] : Index::ProductStore.new.all }
+    end
+    private_class_method :index_show_all
+
+    # `--products` pages (docs/plans/local-catalogue.md Phase 2): a crawled
+    # index can hold thousands.
+    def self.index_products_page(opts)
+      products = Index::ProductStore.new
+      { stores: [], products: products.page(opts[:page], per_page: opts[:per_page]), page: opts[:page],
+        per_page: opts[:per_page], products_total: products.count }
+    end
+    private_class_method :index_products_page
+
     def self.format_index_show(result)
-      lines = ["Stores:"]
-      result[:stores].each { |s| lines << "  #{s['origin']} (#{Array(s['sources']).join(', ')})" }
-      lines << "(none)" if result[:stores].empty?
+      paged = result.key?(:page)
+      lines = paged ? [] : index_store_lines(result[:stores])
       lines << "Products:"
       result[:products].each { |p| lines << "  #{p['title'] || p['key']}" }
       lines << "(none)" if result[:products].empty?
+      lines << index_page_line(result) if paged
       lines.join("\n")
     end
     private_class_method :format_index_show
 
+    def self.index_store_lines(stores)
+      lines = ["Stores:"] + stores.map { |s| "  #{s['origin']} (#{Array(s['sources']).join(', ')})" }
+      stores.empty? ? lines + ["(none)"] : lines
+    end
+    private_class_method :index_store_lines
+
+    def self.index_page_line(result)
+      first = ((result[:page] - 1) * result[:per_page]) + 1
+      last = first + result[:products].length - 1
+      return "Page #{result[:page]} is past the end (#{result[:products_total]} product(s))." if last < first
+
+      "Showing #{first}-#{last} of #{result[:products_total]}. Next: --page #{result[:page] + 1}" \
+        "#{" --per-page #{result[:per_page]}" unless result[:per_page] == INDEX_SHOW_PER_PAGE}"
+    end
+    private_class_method :index_page_line
+
+    # `portage index search` (docs/plans/local-catalogue.md Phase 2): local
+    # index entries only, no request. Exits 1 with no hits.
+    def self.run_index_search(argv)
+      opts = { category: nil, store: nil, limit: 20, json: false }
+      OptionParser.new do |parser|
+        parser.on("--category ID") { |v| opts[:category] = v }
+        parser.on("--store HOST") { |v| opts[:store] = v }
+        parser.on("--limit N", Integer) { |v| opts[:limit] = [v, 1].max }
+        parser.on("--json") { opts[:json] = true }
+      end.parse!(argv)
+      query = argv.join(" ").strip
+      return (warn USAGE) || 1 if query.empty?
+
+      result = index_search(query, opts)
+      puts opts[:json] ? JSON.pretty_generate(result) : format_index_search(result)
+      result[:products].empty? ? 1 : 0
+    end
+    private_class_method :run_index_search
+
+    def self.index_search(query, opts)
+      products = Index::ProductStore.new
+      filters = opts.slice(:category, :store, :limit)
+      hits = products.search(query, **filters).map { |entry| entry.merge("product" => Index::EntryProduct.wire(entry)) }
+      { query: query, engine: products.search_engine, live: false, filters: filters, products: hits }
+    end
+    private_class_method :index_search
+
+    def self.format_index_search(result)
+      return "No index products match \"#{result[:query]}\"." if result[:products].empty?
+
+      lines = result[:products].map { |p| index_search_line(p) }
+      lines << "(From the local index, not live: check the price and stock with " \
+               "`portage find --store URL --query ...`.)"
+      lines << "(FTS5 isn't available in this SQLite, so this was a plain text match.)" if result[:engine] == "like"
+      lines.join("\n")
+    end
+    private_class_method :format_index_search
+
+    def self.index_search_line(product)
+      hosts = Array(product["stores"]).filter_map { |s| URI.parse(s["origin"].to_s).host }.join(", ")
+      ["#{product['title']}#{" — #{product['brand']}" if product['brand']}", ("(#{hosts})" unless hosts.empty?),
+       product["url"]].compact.join(" ")
+    end
+    private_class_method :index_search_line
+
     def self.run_index_add(argv)
-      json = argv.delete("--json") ? true : false
+      json = !argv.delete("--json").nil?
+      crawl = !argv.delete("--crawl").nil?
       url = argv.first && !argv.first.start_with?("-") ? argv.shift : nil
       unless url
         warn USAGE
         return 1
       end
 
-      result = Index::Builder.new.add(url)
+      result = Index::Builder.new.add(url, crawl: crawl)
       puts json ? JSON.pretty_generate(result) : result[:message]
       result[:added] ? 0 : 1
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: portage-cli
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Tom Whitbread
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-09-29 00:00:00.000000000 Z
+date: 2026-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb
@@ -72,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +169,8 @@ files:
 - exe/portage
 - exe/portage-console
 - known-stores/categories.yml
+- known-stores/category-stoplist.yml
+- known-stores/category-synonyms.yml
 - lib/portage/cli.rb
 - lib/portage/cli/agent_profile_url.rb
 - lib/portage/cli/approval_policy.rb
@@ -188,8 +204,11 @@ files:
 - lib/portage/cli/check_next_step.rb
 - lib/portage/cli/checkout_handoff.rb
 - lib/portage/cli/classifier.rb
+- lib/portage/cli/classifier/ranking.rb
+- lib/portage/cli/classifier/table.rb
 - lib/portage/cli/compare.rb
 - lib/portage/cli/confidence_check.rb
+- lib/portage/cli/confidence_state.rb
 - lib/portage/cli/config.rb
 - lib/portage/cli/console.rb
 - lib/portage/cli/decisions.rb
@@ -212,12 +231,21 @@ files:
 - lib/portage/cli/human_prompt.rb
 - lib/portage/cli/index.rb
 - lib/portage/cli/index/builder.rb
+- lib/portage/cli/index/database.rb
+- lib/portage/cli/index/entry_product.rb
 - lib/portage/cli/index/exporter.rb
 - lib/portage/cli/index/known_cache.rb
+- lib/portage/cli/index/legacy_import.rb
 - lib/portage/cli/index/product_store.rb
+- lib/portage/cli/index/schema.rb
+- lib/portage/cli/index/search.rb
 - lib/portage/cli/index/sources.rb
 - lib/portage/cli/index/sources/browser.rb
 - lib/portage/cli/index/sources/shopify_catalog.rb
+- lib/portage/cli/index/sources/storefront_products.rb
+- lib/portage/cli/index/sources/storefront_products/mapper.rb
+- lib/portage/cli/index/sources/storefront_products/pages.rb
+- lib/portage/cli/index/sources/storefront_products/robots.rb
 - lib/portage/cli/index/sources/stores_file.rb
 - lib/portage/cli/index/sources/webmcp_sweep.rb
 - lib/portage/cli/index/sources/wikidata.rb