git-fit 0.10.4 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69674e0fc800279e2099fe879318f4b8f3ce751325515192474dc40223438293
-  data.tar.gz: f91fd18620742288f923f302917667121d310a5707ac71cc185f77da5fc154a6
+  metadata.gz: 529a74a588a51b0b04ba1a0e15e629425dec93dd79986c6e6f45a0eda35d5914
+  data.tar.gz: 37a81d2e9285b8917c13b36eb343d3b97de27709cf1d71a094216c7a645b3168
 SHA512:
-  metadata.gz: f204350fdd449be0942ba5d42917a54460198f61ffdfde00b6c51fa39cdb379c0e056851c05e0bae6577b2d3dca9a0428bc967247245528c65c94b1b9f32d591
-  data.tar.gz: 9d4bf7e3c1c72ebfc4a35c05e2b5c150b87c17cfd67ca634ede7e4026b72978c89360434baac73b9e36addd1f88b8c61b8820c0089712086f9cc9dee8777e989
+  metadata.gz: 8ecb103ba98d635affa43058a695811d061d8be767754e3012efb23aa3a7eb4a85b5ab6041c371da1371fab1afc31100f94f8cf77e11a21ec900b38be29a3dcf
+  data.tar.gz: 27610f67729cf037ac1a05772103abcc0899de47a484b929d4d62a4f34184c23921245c84f62ea308861ffa62c4e520e0d39223ecb8908e0c36966e0f6825d6c

data/lib/git-fit.rb

@@ -58,6 +58,7 @@ require_relative 'git_fit/timezone/resolver'
 require_relative 'git_fit/privacy/polyline_filter'
 require_relative 'git_fit/import'
 require_relative 'git_fit/sync/base'
+require_relative 'git_fit/std/resolver'
 require_relative 'git_fit/util'
 require_relative 'git_fit/sync/lorem'
 require_relative 'git_fit/sync/garmin_base'
@@ -74,6 +75,12 @@ require_relative 'git_fit/cli/sync'
 require_relative 'git_fit/db/rebuild'
 require_relative 'git_fit/db/connection'
 require_relative 'git_fit/db/activity'
+require_relative 'git_fit/dedup/matcher'
+require_relative 'git_fit/dedup/trajectory'
+require_relative 'git_fit/dedup/group_consolidator'
+require_relative 'git_fit/dedup/log_writer'
+require_relative 'git_fit/dedup/service'
+require_relative 'git_fit/dedup/field_elector'
 require_relative 'git_fit/export'
 require_relative 'git_fit/db/cli'
 require_relative 'git_fit/install/actions'
@@ -84,4 +91,6 @@ require_relative 'git_fit/cli/import_cli'
 require_relative 'git_fit/cli/geo_cli'
 require_relative 'git_fit/strava_web/file_check'
 require_relative 'git_fit/cli/strava'
+require_relative 'git_fit/auth/garmin_token'
+require_relative 'git_fit/auth/strava'
 require_relative 'git_fit/cli'

data/lib/git_fit/auth/garmin_token.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module GitFit
+  module Auth
+    # Garmin token facade. Ported from workouts-cli
+    # (lib/workouts/auth/garmin_token.rb).
+    #
+    # Builds the appropriate sync adapter, authenticates, and returns the
+    # access token + domain for programmatic use (e.g. future migrate
+    # commands, CI token checks).
+    class GarminToken
+      def self.for_intl(config)
+        authenticate_with(GitFit::Sync::Garmin, config, 'garmin.com')
+      end
+
+      def self.for_cn(config)
+        authenticate_with(GitFit::Sync::GarminCN, config, 'garmin.cn')
+      end
+
+      def self.authenticate_with(klass, config, default_domain)
+        adapter = klass.new(config: config, db: nil, activity_filter: nil)
+        return nil unless adapter.authenticate
+
+        token_hash = adapter.instance_variable_get(:@access_token) || {}
+        domain = adapter.instance_variable_get(:@domain) || default_domain
+
+        { access_token: token_hash['access_token'], domain: domain }
+      end
+      private_class_method :authenticate_with
+    end
+  end
+end

data/lib/git_fit/auth/strava.rb

@@ -0,0 +1,223 @@
+# frozen_string_literal: true
+
+require 'webrick'
+require 'json'
+require 'yaml'
+require 'socket'
+require 'faraday'
+require 'uri'
+
+module GitFit
+  module Auth
+    # Strava OAuth2 interactive flow. Ported from workouts-cli
+    # (lib/workouts/auth/strava.rb).
+    #
+    # Starts a loopback WEBrick server, prints an auth URL for the user to
+    # open, exchanges the returned code for a refresh_token, and writes it
+    # into sync.strava.refresh_token in the config file.
+    class Strava
+      STATUS_COLORS = { done: 32, warn: 33, error: 31, auth: 36 }.freeze
+
+      def initialize(cli_options, config)
+        @options = cli_options
+        @config = config
+      end
+
+      # Faithful port of workouts Auth::Strava#call — full loopback server
+      # lifecycle, inherently large surface area.
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      def call
+        strava_cfg = @config.sync_config('strava')
+        client_id = strava_cfg['client_id'].to_s
+        client_secret = strava_cfg['client_secret'].to_s
+        creds_missing = client_id.empty? || client_secret.empty?
+
+        puts "\e[33m⚠  Strava API credentials not configured — see browser page\e[0m" if creds_missing
+
+        port = TCPServer.open('127.0.0.1', 0) { |s| s.addr[1] }
+        redirect_uri = "http://localhost:#{port}/callback"
+
+        code = nil
+        exchange_error = nil
+        tokens = nil
+
+        log_file = File.open(File::NULL, 'w')
+        server = WEBrick::HTTPServer.new(
+          Port: port, Logger: WEBrick::Log.new(log_file),
+          AccessLog: [[log_file, '']]
+        )
+
+        server.mount_proc '/' do |_req, res|
+          fresh = load_fresh_config
+          scfg = fresh.dig('sync', 'strava') || {}
+          has_creds = scfg['client_id'].to_s != '' && scfg['client_secret'].to_s != ''
+
+          if has_creds
+            auth_url = "https://www.strava.com/oauth/authorize?#{URI.encode_www_form(
+              client_id: scfg['client_id'], redirect_uri: redirect_uri,
+              response_type: 'code', approval_prompt: 'force',
+              scope: 'read_all,profile:read_all,activity:read_all'
+            )}"
+            res.body = success_html(auth_url)
+          else
+            res.body = config_page_html
+          end
+        end
+
+        server.mount_proc '/callback' do |req, res|
+          fresh = load_fresh_config
+          scfg = fresh.dig('sync', 'strava') || {}
+          cid = scfg['client_id'].to_s
+          csec = scfg['client_secret'].to_s
+
+          code = req.query['code']
+          if code && !cid.empty? && !csec.empty? && !code.empty?
+            begin
+              resp = Faraday.post('https://www.strava.com/oauth/token') do |r|
+                r.body = { client_id: cid, client_secret: csec, code: code, grant_type: 'authorization_code' }
+              end
+              if resp.success?
+                tokens = JSON.parse(resp.body)
+                rt = tokens['refresh_token']
+
+                cfg = load_fresh_config
+                cfg['sync'] ||= {}
+                cfg['sync']['strava'] ||= {}
+                cfg['sync']['strava']['client_id'] ||= cid
+                cfg['sync']['strava']['client_secret'] ||= csec
+                cfg['sync']['strava']['refresh_token'] = rt
+                File.write(config_path, YAML.dump(cfg))
+
+                puts "\e[32m✓ Strava authorization successful\e[0m"
+              else
+                exchange_error = "Token exchange failed: HTTP #{resp.status}"
+              end
+            rescue StandardError => e
+              exchange_error = e.message
+            end
+          else
+            exchange_error = 'No authorization code received'
+          end
+
+          if tokens
+            repo = `git remote get-url origin 2>/dev/null`.strip.sub(%r{.*github\.com[/:]}, '').sub(/\.git$/, '')
+            gh_url = repo.empty? ? 'https://github.com' : "https://github.com/#{repo}/settings/secrets/actions"
+            rt = tokens['refresh_token']
+            res.body = result_html(cid, csec, rt, gh_url, config_path)
+          else
+            err = exchange_error || 'Unknown error'
+            res.body = "<html><body><h1>#{err}</h1><p>Please close and try again.</p></body></html>"
+          end
+        end
+
+        server.mount_proc '/shutdown' do |_req, res|
+          res.body = '<html><body><h1>Server closed</h1><p>You may close this window.</p></body></html>'
+          server.shutdown
+        end
+
+        Thread.new { server.start }
+        puts "\e[36m🔗  Open in your browser:\e[0m"
+        puts "  http://localhost:#{port}"
+
+        begin
+          sleep 0.1 while server.status == :Running
+        rescue Interrupt
+          puts "\e[33m⚠  Server stopped by user\e[0m"
+        end
+
+        if exchange_error
+          puts "\e[31m✗ #{exchange_error}\e[0m"
+          return
+        end
+
+        return unless tokens
+
+        rt = tokens['refresh_token']
+        puts "\e[32m✓ Done\e[0m"
+        puts ''
+        puts 'GitHub Actions Secrets:'
+        puts "  SYNC_STRAVA_CLIENT_ID = #{client_id}"
+        puts "  SYNC_STRAVA_CLIENT_SECRET = #{client_secret}"
+        puts "  SYNC_STRAVA_REFRESH_TOKEN = #{rt}"
+        puts ''
+        puts 'Local config:'
+        puts '  strava:'
+        puts "    refresh_token: #{rt}"
+      end
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+
+      private
+
+      def config_path
+        File.expand_path(@options[:config] || 'config/config.yml')
+      end
+
+      def load_fresh_config
+        File.exist?(config_path) ? (YAML.safe_load_file(config_path) || {}) : {}
+      end
+
+      def success_html(auth_url)
+        <<~HTML
+          <!DOCTYPE html><html lang="zh-CN"><head>
+          <meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1">
+          <title>git-fit — Strava 授权</title>
+          <style>body{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,sans-serif;background:#222;color:#eee;display:flex;justify-content:center;align-items:center;min-height:100vh;margin:0;text-align:center}.card{background:#333;border-radius:12px;padding:3rem 2rem;max-width:520px;box-shadow:0 8px 32px rgba(0,0,0,0.3)}.icon{font-size:2.5rem;margin-bottom:0.5rem}h1{font-size:1.2rem;margin:0 0 0.3rem}p{color:#aaa;margin:0 0 1.5rem;font-size:0.9rem}.badge{display:inline-block;background:#2a2;color:#fff;padding:0.3rem 0.8rem;border-radius:4px;font-size:0.8rem;margin-bottom:1.5rem}.btn{display:inline-block;background:#FC4C02;color:#fff;text-decoration:none;padding:0.8rem 2rem;border-radius:6px;font-weight:600;font-size:1rem;transition:0.2s}.btn:hover{background:#e04400}.hint{color:#666;font-size:0.8rem;margin-top:1.5rem}</style></head><body>
+          <div class="card"><div class="icon">🏃</div><h1>Connect with Strava</h1>
+          <p>授权 git-fit 同步你的运动数据<br>Authorize git-fit to sync your activities</p>
+          <div class="badge">✓ client_id & client_secret 已配置</div><br>
+          <a class="btn" href="#{auth_url}">Connect with Strava ↗</a>
+          <div class="hint">授权后将自动跳转回此页面</div></div></body></html>
+        HTML
+      end
+
+      def config_page_html
+        <<~HTML
+          <!DOCTYPE html><html lang="zh-CN"><head>
+          <meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1">
+          <title>Strava 授权 — 配置缺失</title>
+          <style>body{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,sans-serif;background:#222;color:#eee;display:flex;justify-content:center;align-items:center;min-height:100vh;margin:0;text-align:left}.card{background:#333;border-radius:12px;padding:2.5rem 2rem;max-width:640px;box-shadow:0 8px 32px rgba(0,0,0,0.3)}h1{color:#FC4C02;font-size:1.1rem;margin:0 0 1rem}ol{color:#aaa;line-height:1.8;padding-left:1.2rem}code{background:#1a1a1a;padding:0.1rem 0.3rem;border-radius:3px}.box{background:#1a1a1a;border-radius:6px;padding:0.8rem;font-family:monospace;font-size:0.8rem;white-space:pre;margin:0.5rem 0}.hint{color:#666;font-size:0.8rem;margin-top:1rem}</style></head><body>
+          <div class="card"><h1>⚠ 缺少 Strava API 凭证</h1><p style="color:#aaa;font-size:0.9rem">Missing Strava API credentials</p>
+          <ol><li>前往 <a href="https://www.strava.com/settings/api" style="color:#FC4C02">strava.com/settings/api</a></li>
+          <li>点击 "Create & Manage Your App"</li>
+          <li>填写 Application Name、Website（任意）、Authorization Callback Domain = <code>localhost</code></li>
+          <li>复制 Client ID 和 Client Secret</li></ol>
+          <p style="color:#aaa;font-size:0.85rem">配置后<b>刷新此页面</b>即可开始授权（无需重启）</p>
+          <div class="box"># config/config.yml
+          strava:
+            client_id: "your_client_id"
+            client_secret: "your_client_secret"
+            # refresh_token: (由 auth strava 自动填充)</div>
+          <div class="hint">配置 config.yml 后刷新此页面</div></div></body></html>
+        HTML
+      end
+
+      def result_html(cid, csec, refresh_token, gh_url, config_path)
+        <<~HTML
+          <!DOCTYPE html><html lang="zh-CN"><head>
+          <meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1">
+          <title>git-fit — 授权成功</title>
+          <style>body{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,sans-serif;background:#222;color:#eee;display:flex;justify-content:center;align-items:center;min-height:100vh;margin:0}.card{background:#333;border-radius:12px;padding:2.5rem 2rem;max-width:640px;box-shadow:0 8px 32px rgba(0,0,0,0.3);text-align:left}h1{text-align:center;font-size:1.2rem}.section{margin:1.5rem 0}.section h2{font-size:1rem;margin:0 0 0.5rem;color:#FC4C02}.box{background:#1a1a1a;border-radius:6px;padding:0.8rem;font-family:"SFMono-Regular",Consolas,monospace;font-size:0.8rem;position:relative;overflow-x:auto}.box code{display:block;white-space:pre}.copy{cursor:pointer;position:absolute;top:0.4rem;right:0.5rem;background:#555;color:#fff;border:none;border-radius:3px;padding:0.15rem 0.5rem;font-size:0.7rem}.copy:hover{background:#777}.action-btn{display:inline-block;background:#238636;color:#fff;text-decoration:none;padding:0.6rem 1.2rem;border-radius:6px;font-size:0.85rem;margin-top:0.5rem}.action-btn:hover{background:#2ea043}hr{border:none;border-top:1px solid #444;margin:1.2rem 0}</style></head><body>
+          <div class="card"><h1>✓ 授权成功<br><span style="font-size:0.8rem;color:#aaa;font-weight:400">Authorization Successful</span></h1>
+          <div class="section"><h2>📦 GitHub Actions Secrets</h2>
+          <p style="margin:0.3rem 0 0.6rem;font-size:0.8rem;color:#aaa">Settings → Secrets and variables → Actions → New repository secret</p>
+          <div class="box"><button class="copy" onclick="cn('n0')">📋 Name</button><button class="copy" style="margin-left:0.3rem" onclick="cv('v0')">📋 Value</button>
+          <code>Name:  SYNC_STRAVA_CLIENT_ID<span id="n0" data-name="SYNC_STRAVA_CLIENT_ID"></span><span id="v0">#{cid}</span></code></div>
+          <div class="box" style="margin-top:0.5rem"><button class="copy" onclick="cn('n1')">📋 Name</button><button class="copy" style="margin-left:0.3rem" onclick="cv('v1')">📋 Value</button>
+          <code>Name:  SYNC_STRAVA_CLIENT_SECRET<span id="n1" data-name="SYNC_STRAVA_CLIENT_SECRET"></span><span id="v1">#{csec}</span></code></div>
+          <div class="box" style="margin-top:0.5rem"><button class="copy" onclick="cn('n2')">📋 Name</button><button class="copy" style="margin-left:0.3rem" onclick="cv('v2')">📋 Value</button>
+          <code>Name:  SYNC_STRAVA_REFRESH_TOKEN<span id="n2" data-name="SYNC_STRAVA_REFRESH_TOKEN"></span><span id="v2">#{refresh_token}</span></code></div>
+          <a class="action-btn" href="#{gh_url}" target="_blank">Open GitHub Secrets ↗</a></div>
+          <hr>
+          <div class="section compact"><h2>💻 本地配置 / Local Config</h2>
+          <div class="box" style="border-left:3px solid #2a2"><code>✓ 已自动写入 #{config_path.sub(Dir.home, '~')}
+          <span style="color:#888">strava:
+            refresh_token: #{refresh_token}</span></code></div></div>
+          <hr>
+          <p style="text-align:center;color:#666;font-size:0.8rem">复制完成后点击下方按钮关闭服务器<br>Click the button below to close the server</p>
+          <div style="text-align:center"><button onclick="fetch('/shutdown').then(function(){document.body.innerHTML='<h1 style=text-align:center;margin-top:40vh>✓ Server closed</h1>'})" style="background:#555;color:#fff;border:none;border-radius:6px;padding:0.6rem 1.5rem;font-size:0.9rem;cursor:pointer">🛑 Close Server</button></div></div>
+          <script>function cn(id){navigator.clipboard.writeText(document.getElementById(id).dataset.name).then(function(){var b=event.target;b.textContent='✓';setTimeout(function(){b.textContent='📋 Name'},2000)})}function cv(id){navigator.clipboard.writeText(document.getElementById(id).textContent).then(function(){var b=event.target;b.textContent='✓';setTimeout(function(){b.textContent='📋 Value'},2000)})}</script></body></html>
+        HTML
+      end
+    end
+  end
+end

data/lib/git_fit/cli/export.rb

@@ -7,6 +7,7 @@ module GitFit
     desc 'json', 'Export activities to JSON'
     option :output, type: :string, aliases: '-o', desc: 'Output path'
     option :activity, type: :array, desc: 'Filter by sport type', aliases: '--act'
+    option :tracks_output, type: :string, desc: 'Write polylines to a separate JSON file (run_id → polyline)'
     no_commands do
       def git_fit_config
         @git_fit_config ||= GitFit::Config.new(options[:config])
@@ -20,7 +21,8 @@ module GitFit
       db = conn.db
       path = options[:output] || config.export_config.dig('json', 'path') || 'site/activities.json'
       filter = options[:activity]&.map(&:strip)&.map(&:downcase)
-      count = Export::JSON.new(db: db, output: path, activity_filter: filter).call
+      count = Export::JSON.new(db: db, output: path, activity_filter: filter,
+                               tracks_output: options[:tracks_output]).call
       say_status :done, "Exported #{count} activities to #{path}", :green
     rescue StandardError => e
       say_status :error, "JSON export failed: #{e.message}", :red
@@ -43,6 +45,23 @@ module GitFit
       say_status :error, "CSV export failed: #{e.message}", :red
     end
 
+    desc 'gpx', 'Export activities to GPX files (one per activity)'
+    option :output, type: :string, aliases: '-o', desc: 'Output directory'
+    option :activity, type: :array, desc: 'Filter by sport type', aliases: '--act'
+
+    def gpx
+      config = git_fit_config
+      conn = GitFit::DB::Connection.new(config.db_path)
+      conn.migrate!
+      db = conn.db
+      path = options[:output] || config.export_config.dig('gpx', 'path') || 'site/gpx_out'
+      filter = options[:activity]&.map(&:strip)&.map(&:downcase)
+      count = Export::GPX.new(db: db, output: path, activity_filter: filter).call
+      say_status :done, "Exported #{count} GPX files to #{path}/", :green
+    rescue StandardError => e
+      say_status :error, "GPX export failed: #{e.message}", :red
+    end
+
     desc 'stats', 'Export activity statistics to JSON'
     option :output, type: :string, aliases: '-o', desc: 'Output path'
     option :activity, type: :array, desc: 'Filter by sport type', aliases: '--act'

data/lib/git_fit/cli/sync.rb

@@ -30,6 +30,60 @@ module GitFit
       rescue StandardError => e
       say_status :error, e.message, :red
       end
+
+      def auth(source)
+        sources = %w[garmin garmin_cn strava]
+        unless sources.include?(source)
+          say_status :error, "Supported: #{sources.join(', ')}", :red
+          return
+        end
+
+        if source == 'garmin'
+          say_status :warn, 'garmin (intl) DI auth migration pending (Phase 3)', :yellow
+          return
+        end
+
+        config = git_fit_config.sync_config(source)
+        if config.empty?
+          say_status :warn, "No config for #{source}. Set env vars or config.yml", :yellow
+          return
+        end
+
+        adapter = build_auth_adapter(source)
+        unless adapter.respond_to?(:authenticate)
+          say_status :error, "#{source} does not support interactive auth", :red
+          return
+        end
+
+        say_status :auth, "Logging in to #{source}...", :green
+        if adapter.authenticate
+          say_status :done, "#{source} authenticated successfully", :green
+          if adapter.respond_to?(:generated_secret) && (secret = adapter.generated_secret)
+            puts ''
+            puts 'GitHub Actions Secrets:'
+            puts "  SYNC_#{source.upcase}_SECRET = #{secret}"
+            puts "  SYNC_#{source.upcase}_EMAIL  = #{config['email']}"
+            puts "  SYNC_#{source.upcase}_PASSWORD = #{config['password']}"
+            puts ''
+            puts 'Local config:'
+            puts "  #{source}:"
+            puts '    secret: (已自动写入 config/config.yml)'
+          end
+        else
+          say_status :error, 'Authentication failed', :red
+        end
+      rescue GitFit::Sync::AuthError => e
+        say_status :error, "Authentication failed: #{e.message}", :red
+      end
+
+      private
+
+      def build_auth_adapter(source)
+        klass = GitFit::Sync::Base.adapters.find { |a| a.config_key == source }
+        return nil unless klass
+
+        klass.new(config: git_fit_config.sync_config(source), db: nil)
+      end
     end
   end
 end

data/lib/git_fit/cli.rb

@@ -72,12 +72,41 @@ module GitFit
       super
     end
 
+    desc 'auth SOURCE', 'Authenticate with a sync source (strava, garmin, garmin_cn)'
+    def auth(source)
+      if source == 'strava'
+        GitFit::Auth::Strava.new(options, git_fit_config).call
+      else
+        super
+      end
+    rescue GitFit::Sync::AuthError => e
+      say_status :error, "Auth failed: #{e.message}", :red
+    end
+
     desc 'gh SUBCOMMAND', 'Manage GitHub secrets and variables'
     subcommand 'gh', GhCLI
 
     desc 'geo SUBCOMMAND', 'Detect geographical administrative regions'
     subcommand 'geo', GeoCLI
 
+    desc 'dedup', 'Run cross-source dedup matching'
+    option :incremental, type: :boolean, default: false, desc: 'Skip already-grouped records'
+    option :log, type: :string, default: nil, desc: "Log path (or 'auto' for data/dedup/)"
+    option :verbose, type: :boolean, default: false, desc: 'Detailed per-match output'
+    def dedup
+      db = connect_db
+      log_path = options[:log] == 'auto' ? nil : options[:log]
+      count = GitFit::Dedup::Service.new(
+        db,
+        incremental: options[:incremental],
+        log_path: log_path,
+        verbose: options[:verbose],
+      ).run
+      say_status :done, "Dedup: #{count} matches updated", :green
+    rescue StandardError => e
+      say_status :error, "Dedup failed: #{e.message}", :red
+    end
+
     desc 'strava SUBCOMMAND', 'Strava web operations'
     subcommand 'strava', StravaCLI
 

data/lib/git_fit/config_template.rb

@@ -23,6 +23,12 @@ module GitFit
           # garmin:                                    # env: GIT_FIT_GARMIN_EMAIL
           #   email: ""                                # env: GIT_FIT_GARMIN_PASSWORD
           #   password: ""
+          #   auth_seed: ""                            # git fit auth garmin (DI OAuth2, Phase 3)
+          #   secret: ""                               # CN SSO secret (auto-written by git fit auth garmin_cn)
+
+          # garmin_cn:                                 # env: GIT_FIT_GARMIN_CN_EMAIL
+          #   email: ""                                # env: GIT_FIT_GARMIN_CN_PASSWORD
+          #   password: ""
 
           # keep:                                      # env: GIT_FIT_KEEP_PHONE
           #   phone: ""                                # env: GIT_FIT_KEEP_PASSWORD
@@ -50,6 +56,9 @@ module GitFit
           # csv:
           #   path: site/workouts.csv
 
+          # gpx:
+          #   path: site/gpx_out
+
         privacy:
           start_end_range: 200
 

data/lib/git_fit/dedup/field_elector.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require 'time'
+
+module GitFit
+  module Dedup
+    class FieldElector
+      FIELD_ELECTION_RULES = {
+        distance: :median,
+        moving_time: :min,
+        elapsed_time: :max,
+        average_heartrate: :mean,
+        max_heartrate: :max,
+        average_power: :non_null,
+        max_power: :non_null,
+        average_cadence: :non_null,
+        max_cadence: :non_null,
+        summary_polyline: :best_polyline,
+        elevation_gain: :median,
+        calories: :median,
+        average_temperature: :non_null,
+        average_speed: :computed,
+        name: :best_name,
+        start_date: :earliest,
+      }.freeze
+
+      SOURCE_NAME_PRIORITY = {
+        garmin: 1, strava: 2, igpsport: 3, xoss: 4,
+        keep: 5, xingzhe: 6, apple_health: 7
+      }.freeze
+
+      def elect(field, values, sources = [])
+        rule = FIELD_ELECTION_RULES[field]
+        non_nil = values.compact
+        return nil if non_nil.empty?
+
+        case rule
+        when :median
+          sorted = non_nil.sort
+          sorted[sorted.size / 2]
+        when :mean
+          non_nil.sum / non_nil.size
+        when :min
+          non_nil.min
+        when :max
+          non_nil.max
+        when :non_null
+          non_nil.first
+        when :best_polyline
+          candidates = non_nil.select { |v| v.is_a?(String) && !v.empty? }
+          return nil if candidates.empty?
+          candidates.max_by { |v| decode_polyline_size(v) }
+        when :computed
+          nil
+        when :best_name
+          best_name(values, sources)
+        when :earliest
+          non_nil.min_by do |v|
+            Time.parse(v.to_s)
+          rescue StandardError
+            Time.at(0)
+          end
+        else
+          non_nil.first
+        end
+      end
+
+      private
+
+      def decode_polyline_size(polyline)
+        return 0 unless polyline.is_a?(String) && !polyline.empty?
+        polyline.size / 3
+      end
+
+      def best_name(values, sources)
+        pairs = values.zip(sources)
+        pairs.min_by { |_, src| SOURCE_NAME_PRIORITY[src&.to_sym] || 99 }&.first
+      end
+    end
+  end
+end

data/lib/git_fit/dedup/group_consolidator.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'digest'
+
+module GitFit
+  module Dedup
+    class GroupConsolidator
+      def consolidate(matched_pairs)
+        parent = {}
+        all_ids = []
+
+        matched_pairs.each do |pair|
+          a_id = pair[:a][:run_id]
+          b_id = pair[:b][:run_id]
+          all_ids << a_id << b_id
+        end
+
+        all_ids.uniq!
+        return {} if all_ids.empty?
+
+        all_ids.each { |id| parent[id] = id }
+
+        matched_pairs.each do |pair|
+          union(parent, pair[:a][:run_id], pair[:b][:run_id])
+        end
+
+        groups = Hash.new { |h, k| h[k] = [] }
+        all_ids.each do |run_id|
+          root = find(parent, run_id)
+          groups[root] << run_id
+        end
+
+        groups.transform_values! { |ids| ids.uniq.sort }
+
+        result = {}
+        groups.each_value do |sorted_ids|
+          group_id = Digest::SHA256.hexdigest(sorted_ids.join(','))[0, 16]
+          result[group_id] = sorted_ids
+        end
+        result
+      end
+
+      private
+
+      def find(parent, x)
+        parent[x] = find(parent, parent[x]) if parent[x] != x
+        parent[x]
+      end
+
+      def union(parent, x, y)
+        rx = find(parent, x)
+        ry = find(parent, y)
+        return if rx == ry
+        parent[ry] = rx
+      end
+    end
+  end
+end

data/lib/git_fit/dedup/log_writer.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'json'
+require 'fileutils'
+
+module GitFit
+  module Dedup
+    class LogWriter
+      def initialize(log_path = nil)
+        @log_path = log_path || default_path
+        FileUtils.mkdir_p(File.dirname(@log_path))
+      end
+
+      def write(stats:, matches:, elapsed:)
+        log = {
+          started_at: (Time.now.utc - elapsed).iso8601,
+          elapsed_seconds: elapsed.round(1),
+          stats: stats,
+          matches: matches,
+        }
+        File.write(@log_path, JSON.pretty_generate(log))
+        @log_path
+      end
+
+      private
+
+      def default_path
+        timestamp = Time.now.utc.strftime('%Y%m%dT%H%M%SZ')
+        "data/dedup/#{timestamp}.json"
+      end
+    end
+  end
+end