ace-git 0.23.1 → 0.24.0

data/lib/ace/git.rb

@@ -2,6 +2,7 @@
 
 require "ace/support/config"
 require_relative "git/version"
+require_relative "git/errors"
 
 module Ace
   module Git
@@ -12,14 +13,9 @@ module Ace
     # - Organisms: Orchestrate molecules, propagate or wrap exceptions
     # - Commands: Catch exceptions and return exit codes (0=success, 1=error)
     #
-    # All custom exceptions inherit from Ace::Git::Error for consistent catching.
-    class Error < StandardError; end
-    class GitError < Error; end
-    class ConfigError < Error; end
-    class GhNotInstalledError < Error; end
-    class GhAuthenticationError < Error; end
-    class PrNotFoundError < Error; end
-    class TimeoutError < Error; end
+    # All custom exceptions inherit from Ace::Git::Error for consistent catching;
+    # they are defined in git/errors.rb (local git failures plus the forge server
+    # resolution and provider interaction taxonomy).
 
     # Mutex for thread-safe config initialization
     @config_mutex = Mutex.new
@@ -124,7 +120,7 @@ module Ace
       normalized = normalize_keys(git_section)
 
       # Copy top-level settings
-      %w[default_branch remote verbose timeout network_timeout].each do |key|
+      %w[default_branch remote verbose timeout network_timeout servers].each do |key|
         config[key] = normalized[key] if normalized.key?(key)
       end
 
@@ -170,7 +166,7 @@ module Ace
       config["timeout"] || 30
     end
 
-    # Timeout for network operations (gh CLI, remote operations)
+    # Timeout for network operations (provider CLIs, remote operations)
     # @return [Integer] Timeout in seconds (default: 60)
     def self.network_timeout
       config["network_timeout"] || 60
@@ -198,6 +194,8 @@ end
 
 # Require ATOM architecture components
 require_relative "git/atoms/command_executor"
+require_relative "git/atoms/server_url"
+require_relative "git/atoms/pr_identifier"
 require_relative "git/atoms/pattern_filter"
 require_relative "git/atoms/diff_parser"
 require_relative "git/atoms/diff_numstat_parser"
@@ -205,7 +203,6 @@ require_relative "git/atoms/file_grouper"
 require_relative "git/atoms/grouped_stats_formatter"
 require_relative "git/atoms/date_resolver"
 require_relative "git/atoms/task_pattern_extractor"
-require_relative "git/atoms/pr_identifier_parser"
 require_relative "git/atoms/repository_state_detector"
 require_relative "git/atoms/repository_checker"
 require_relative "git/atoms/git_scope_filter"
@@ -218,14 +215,16 @@ require_relative "git/molecules/diff_generator"
 require_relative "git/molecules/config_loader"
 require_relative "git/molecules/diff_filter"
 require_relative "git/molecules/branch_reader"
-require_relative "git/molecules/pr_metadata_fetcher"
 require_relative "git/molecules/recent_commits_fetcher"
 require_relative "git/molecules/git_status_fetcher"
-require_relative "git/molecules/gh_cli_executor"
-require_relative "git/molecules/github_issue_sync"
 
 require_relative "git/organisms/diff_orchestrator"
 require_relative "git/organisms/repo_status_loader"
+require_relative "git/resolved_server"
+require_relative "git/server_registry"
+require_relative "git/providers/base"
+require_relative "git/providers/evidence"
+require_relative "git/providers"
 
 require_relative "git/models/diff_result"
 require_relative "git/models/diff_config"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ace-git
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.24.0
 platform: ruby
 authors:
 - Michal Czyz
 bindir: exe
 cert_chain: []
-date: 2026-09-05 00:00:00.000000000 Z
+date: 2026-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ace-support-config
@@ -94,8 +94,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
 description: ace-git gives developers and coding agents focused git context commands
-  and guided workflows for rebases, pull requests, and commit reorganization, with
-  smart diff output and Git 2.23+ guardrails.
+  and guided workflows for rebases and commit reorganization, with smart diff output,
+  a forge server registry, and a provider contract backed by pluggable provider gems.
 email:
 - mc@cs3b.com
 executables:
@@ -149,9 +149,10 @@ files:
 - lib/ace/git/atoms/grouped_stats_formatter.rb
 - lib/ace/git/atoms/lock_error_detector.rb
 - lib/ace/git/atoms/pattern_filter.rb
-- lib/ace/git/atoms/pr_identifier_parser.rb
+- lib/ace/git/atoms/pr_identifier.rb
 - lib/ace/git/atoms/repository_checker.rb
 - lib/ace/git/atoms/repository_state_detector.rb
+- lib/ace/git/atoms/server_url.rb
 - lib/ace/git/atoms/stale_lock_cleaner.rb
 - lib/ace/git/atoms/status_formatter.rb
 - lib/ace/git/atoms/task_pattern_extractor.rb
@@ -159,8 +160,8 @@ files:
 - lib/ace/git/cli.rb
 - lib/ace/git/cli/commands/branch.rb
 - lib/ace/git/cli/commands/diff.rb
-- lib/ace/git/cli/commands/pr.rb
 - lib/ace/git/cli/commands/status.rb
+- lib/ace/git/errors.rb
 - lib/ace/git/models/diff_config.rb
 - lib/ace/git/models/diff_result.rb
 - lib/ace/git/models/repo_status.rb
@@ -168,22 +169,24 @@ files:
 - lib/ace/git/molecules/config_loader.rb
 - lib/ace/git/molecules/diff_filter.rb
 - lib/ace/git/molecules/diff_generator.rb
-- lib/ace/git/molecules/gh_cli_executor.rb
 - lib/ace/git/molecules/git_status_fetcher.rb
-- lib/ace/git/molecules/github_issue_sync.rb
-- lib/ace/git/molecules/pr_metadata_fetcher.rb
 - lib/ace/git/molecules/recent_commits_fetcher.rb
 - lib/ace/git/organisms/diff_orchestrator.rb
 - lib/ace/git/organisms/repo_status_loader.rb
+- lib/ace/git/providers.rb
+- lib/ace/git/providers/base.rb
+- lib/ace/git/providers/evidence.rb
+- lib/ace/git/resolved_server.rb
+- lib/ace/git/server_registry.rb
 - lib/ace/git/version.rb
-homepage: https://github.com/cs3b/ace/tree/main/ace-git
+homepage: https://forgejo.tail6c0887.ts.net/cs3b/ace
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  homepage_uri: https://github.com/cs3b/ace/tree/main/ace-git
-  source_code_uri: https://github.com/cs3b/ace/tree/main/ace-git/
-  changelog_uri: https://github.com/cs3b/ace/blob/main/ace-git/CHANGELOG.md
+  homepage_uri: https://forgejo.tail6c0887.ts.net/cs3b/ace
+  source_code_uri: https://forgejo.tail6c0887.ts.net/cs3b/ace/src/branch/main/ace-git
+  changelog_uri: https://forgejo.tail6c0887.ts.net/cs3b/ace/src/branch/main/ace-git/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib
@@ -200,5 +203,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.9
 specification_version: 4
-summary: Git workflows and context commands for developers and AI agents
+summary: Forge-neutral Git workflows and context commands for developers and AI agents
 test_files: []

data/lib/ace/git/atoms/pr_identifier_parser.rb

@@ -1,88 +0,0 @@
-# frozen_string_literal: true
-
-module Ace
-  module Git
-    module Atoms
-      # Parse PR identifiers into structured format
-      #
-      # Supports three formats:
-      # - Simple number: "123"
-      # - Qualified reference: "owner/repo#456"
-      # - GitHub URL: "https://github.com/owner/repo/pull/789"
-      #
-      # Consolidated from ace-bundle PrIdentifierParser
-      module PrIdentifierParser
-        # Parsed PR identifier result
-        ParseResult = Data.define(:number, :repo, :gh_format)
-
-        # Parse a PR identifier string
-        #
-        # Returns nil for nil/empty input (no PR specified), raises ArgumentError for
-        # invalid formats. This design allows callers to distinguish between "no PR"
-        # (nil input -> nil result) and "invalid PR" (bad format -> exception).
-        #
-        # @param input [String, Integer] PR identifier
-        # @return [ParseResult, nil] Parsed identifier with number, repo, and gh_format,
-        #   or nil if input is nil/empty
-        # @raise [ArgumentError] if identifier format is invalid (non-empty but malformed)
-        #
-        # @example Simple number
-        #   parse(123)
-        #   # => ParseResult(number: "123", repo: nil, gh_format: "123")
-        #
-        # @example Qualified reference
-        #   parse("owner/repo#456")
-        #   # => ParseResult(number: "456", repo: "owner/repo", gh_format: "owner/repo#456")
-        #
-        # @example GitHub URL
-        #   parse("https://github.com/owner/repo/pull/789")
-        #   # => ParseResult(number: "789", repo: "owner/repo", gh_format: "owner/repo#789")
-        #
-        # @example Nil/empty input
-        #   parse(nil)   # => nil
-        #   parse("")    # => nil
-        #   parse("  ")  # => nil
-        # Maximum length for PR identifier to prevent ReDoS attacks
-        # GitHub URLs are typically under 200 chars, this provides generous margin
-        MAX_IDENTIFIER_LENGTH = 256
-
-        def self.parse(input)
-          return nil if input.nil?
-
-          input_str = input.to_s.strip
-          return nil if input_str.empty?
-
-          # Validate length to prevent ReDoS attacks on regex patterns
-          if input_str.length > MAX_IDENTIFIER_LENGTH
-            raise ArgumentError, "PR identifier too long (max #{MAX_IDENTIFIER_LENGTH} characters)"
-          end
-
-          case input_str
-          when /^(\d+)$/
-            # Simple PR number: "123"
-            number = ::Regexp.last_match(1)
-            # Reject zero: GitHub PR numbers are positive integers starting from 1
-            raise ArgumentError, "Invalid PR identifier format: #{input_str}" if number.to_i.zero?
-            # Normalize to canonical form (strip leading zeros) for consistent gh_format
-            canonical_number = number.to_i.to_s
-            ParseResult.new(number: canonical_number, repo: nil, gh_format: canonical_number)
-
-          when /^(?<repo>[a-zA-Z0-9_\-.]+\/[a-zA-Z0-9_\-.]+)#(?<number>\d+)$/
-            # Qualified reference: "owner/repo#456"
-            # GitHub owner/repo names: alphanumeric, hyphens, underscores, dots only
-            match = ::Regexp.last_match
-            ParseResult.new(number: match[:number], repo: match[:repo], gh_format: "#{match[:repo]}##{match[:number]}")
-
-          when %r{github\.com/(?<repo>[^/]+/[^/]+)/pull/(?<number>\d+)}
-            # GitHub URL: "https://github.com/owner/repo/pull/789"
-            match = ::Regexp.last_match
-            ParseResult.new(number: match[:number], repo: match[:repo], gh_format: "#{match[:repo]}##{match[:number]}")
-
-          else
-            raise ArgumentError, "Invalid PR identifier format: #{input_str}"
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ace/git/cli/commands/pr.rb

@@ -1,119 +0,0 @@
-# frozen_string_literal: true
-
-require "json"
-require "ace/support/cli"
-
-module Ace
-  module Git
-    module CLI
-      module Commands
-        # ace-support-cli command for showing PR information
-        class Pr < Ace::Support::Cli::Command
-          include Ace::Support::Cli::Base
-
-          desc "Show PR information"
-
-          argument :number, required: false, desc: "PR number (auto-detected if not provided)"
-
-          option :format, type: :string, aliases: ["f"], default: "markdown",
-            desc: "Output format: markdown, json"
-          option :with_diff, type: :boolean, default: false,
-            desc: "Include PR diff in output"
-
-          # Standard options
-          option :quiet, type: :boolean, aliases: %w[-q], desc: "Suppress non-essential output"
-          option :verbose, type: :boolean, aliases: %w[-v], desc: "Show verbose output"
-          option :debug, type: :boolean, aliases: %w[-d], desc: "Show debug output"
-
-          def call(number: nil, **options)
-            # Check if gh is installed
-            unless Molecules::PrMetadataFetcher.gh_installed?
-              raise Ace::Support::Cli::Error.new("GitHub CLI (gh) not installed. Install with: brew install gh")
-            end
-
-            # Determine PR identifier
-            identifier = if number
-              number.to_s
-            else
-              # Try to find PR for current branch
-              found = Molecules::PrMetadataFetcher.find_pr_for_branch
-              unless found
-                raise Ace::Support::Cli::Error.new("No PR found for current branch. Specify a PR number.")
-              end
-              found
-            end
-
-            # Fetch PR data
-            result = if options[:with_diff]
-              Molecules::PrMetadataFetcher.fetch_pr(identifier)
-            else
-              Molecules::PrMetadataFetcher.fetch_metadata(identifier)
-            end
-
-            unless result[:success]
-              raise Ace::Support::Cli::Error.new(result[:error])
-            end
-
-            # Output based on format
-            case options[:format]
-            when "json"
-              output_data = {metadata: result[:metadata]}
-              output_data[:diff] = result[:diff] if options[:with_diff]
-              puts JSON.pretty_generate(output_data)
-            else
-              output_markdown(result[:metadata], result[:diff], options)
-            end
-          rescue Ace::Git::Error => e
-            raise Ace::Support::Cli::Error.new(e.message)
-          rescue ArgumentError => e
-            raise Ace::Support::Cli::Error.new(e.message)
-          end
-
-          private
-
-          def output_markdown(metadata, diff, options)
-            lines = []
-
-            # Header line: # PR #82: Title... [OPEN]
-            header = "# PR ##{metadata["number"]}"
-            header += ": #{metadata["title"]}" if metadata["title"]
-            header += " [#{metadata["state"]}]" if metadata["state"]
-            lines << header
-
-            # Branch line: Branch: source → target | Draft: No
-            branch_parts = []
-            if metadata["headRefName"] && metadata["baseRefName"]
-              branch_parts << "Branch: #{metadata["headRefName"]} → #{metadata["baseRefName"]}"
-            elsif metadata["headRefName"]
-              branch_parts << "Branch: #{metadata["headRefName"]}"
-            elsif metadata["baseRefName"]
-              branch_parts << "Target: #{metadata["baseRefName"]}"
-            end
-            branch_parts << "Draft: #{metadata["isDraft"] ? "Yes" : "No"}" if metadata.key?("isDraft")
-            lines << branch_parts.join(" | ") unless branch_parts.empty?
-
-            # Author line
-            if metadata["author"]
-              author = metadata["author"].is_a?(Hash) ? metadata["author"]["login"] : metadata["author"]
-              lines << "Author: #{author}"
-            end
-
-            # URL line
-            lines << "URL: #{metadata["url"]}" if metadata["url"]
-
-            if options[:with_diff] && diff
-              lines << ""
-              lines << "## Diff"
-              lines << ""
-              lines << "```diff"
-              lines << diff
-              lines << "```"
-            end
-
-            puts lines.join("\n")
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ace/git/molecules/gh_cli_executor.rb

@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-require "open3"
-require "timeout"
-
-module Ace
-  module Git
-    module Molecules
-      # Safely execute gh CLI commands with timeout and structured output.
-      class GhCliExecutor
-        DEFAULT_GH_TIMEOUT = 30
-        DEFAULT_SIMPLE_TIMEOUT = 10
-
-        def self.execute(subcommand, args = [], timeout: nil)
-          check_installed
-          timeout_seconds = timeout || Ace::Git.network_timeout || DEFAULT_GH_TIMEOUT
-          command = ["gh", subcommand] + args
-          run_command(command, timeout_seconds)
-        rescue Timeout::Error
-          raise Ace::Git::TimeoutError, "gh command timed out after #{timeout_seconds} seconds"
-        end
-
-        def self.check_installed
-          result = execute_simple("--version")
-          raise Ace::Git::GhNotInstalledError unless result[:success]
-
-          true
-        end
-
-        def self.check_authenticated
-          result = execute_simple("auth", ["status"])
-          raise Ace::Git::GhAuthenticationError unless result[:success]
-
-          {
-            authenticated: true,
-            username: extract_username(result[:stderr])
-          }
-        end
-
-        def self.execute_simple(command, args = [], timeout_seconds = nil)
-          timeout_seconds ||= Ace::Git.network_timeout || DEFAULT_SIMPLE_TIMEOUT
-          cmd = ["gh", command] + args
-          run_command(cmd, timeout_seconds)
-        rescue Timeout::Error
-          {
-            success: false,
-            stdout: "",
-            stderr: "Command timed out",
-            exit_code: 1
-          }
-        end
-
-        def self.extract_username(output)
-          match = output.match(/Logged in to .+ as (\S+)/)
-          match ? match[1] : nil
-        end
-
-        def self.run_command(command, timeout_seconds)
-          stdout_str, stderr_str, status = Timeout.timeout(timeout_seconds) do
-            Open3.capture3(*command)
-          end
-
-          {
-            success: status.success?,
-            stdout: stdout_str,
-            stderr: stderr_str,
-            exit_code: status.exitstatus
-          }
-        rescue Errno::ENOENT
-          raise Ace::Git::GhNotInstalledError
-        end
-
-        private_class_method :execute_simple, :extract_username, :run_command
-      end
-    end
-  end
-end