ace-git 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f05486971c36b968a3eeeb42f4bfdeda24b0a3d672732dd5ff532ab4a7db034
-  data.tar.gz: 21fe708e731585aba811f719acc8705b906b2c2e11cf249f9d5279223890ea69
+  metadata.gz: f2aefd55e04cf20182ce9302454f857fb836a9948f8c5d3287d574fda05e73d0
+  data.tar.gz: 630a48152d3aaa43df4d6ec23dac65f6f2496fb1ea4fa7b4dbe968a677843751
 SHA512:
-  metadata.gz: a4439500ea545b8c557af9e6b436852b14bebec56f4e44b4f36c72c005851d72d29256cef3a70fcff6de50900bc2e101d5f55ef93a7b48c850b69c200157ddca
-  data.tar.gz: 705d2d95b952af1c2bd44a8da79b1173210b00313744c3dbd554b9d22d76983534b5db3552655a8fd797584accc4c774b205bb5710cb8e8b0fd61ddddf0fc80e
+  metadata.gz: 38abefdfea8dc06b4b30804daaa0b9e9327a3d9042c6671c6bae876896bfc8473c5f364444142726008d49d91c50d6ad7bb4cdb8e92243f1f0c515c050030a77
+  data.tar.gz: 760780054d64d4cd58134ab8c6e3db5a47a8daf45dbc7080195e716a5a55b17535b986f0dbc7d383bedc2108a87e27aa3c2b8fd2bdde7ff1834654240839f2b2

data/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.28.0] - 2026-10-04
+
+### Added
+- PR receipts include merge-commit proof and `pr` JSON failures carry the classified error category on stdout (parseable non-success; text and nonzero exit unchanged).
+
 ## [0.27.0] - 2026-10-03
 
 ### Added

data/docs/usage.md

@@ -199,6 +199,18 @@ ace-git pr merge 25 --expected-head SHA --method squash
 - A create request whose outcome is unknown (transport failure after send)
   reports an unknown outcome with the exact identity to reconcile; it never
   retries automatically.
+- With `--format json`, a failed operation prints the classified error as
+  JSON on stdout (`{"error": {"category": ..., "message": ...}}` — e.g.
+  `expected_head_conflict`, `unsupported_capability`, `unknown_outcome`)
+  before the nonzero exit; text mode explains the same failure on stderr.
+
+Provider notes (Forgejo): the delivery lifecycle rides the repository-bound
+Forgejo API v1 and requires Forgejo >= 8.0 (probed before mutations; the
+provider refuses below the documented capability floor). Drafts use the
+forge's WIP-title convention (`draft: true` creates a `WIP:`-prefixed
+title; `pr ready` strips it and proves the ready state by read-back).
+Same-server fork sources are supported via the declared `--head-repo`
+URL; cross-host sources refuse before any mutation.
 
 ### `ace-git version`
 
@@ -290,7 +302,7 @@ Both providers implement the same issue-tracking contract (issue lookup, comment
 create/update/delete, label add/remove, state transitions) so task issue
 synchronization stays forge-neutral; `ace-task` owns the sync orchestration.
 
-Configure servers in `.ace/git.yml` (or project config) under `git.servers`, then
+Configure servers in `.ace/git/config.yml` under `git.servers`, then
 resolve them by name, by default, or from a git remote URL. Every failure path is
 classified (missing CLI, unauthenticated, unreachable, malformed output, object
 not found) with no silent fallbacks.

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

@@ -13,7 +13,9 @@ module Ace
         # (mutually exclusive; remote resolution when neither is given) and
         # `--format json`. Success output carries the resolved server,
         # provider, and exact PR identity; failures exit nonzero with the
-        # classified provider error and never claim success.
+        # classified provider error and never claim success. JSON failures
+        # put the error category and message on stdout so machine callers
+        # can parse the classification; text goes to stderr via the runner.
         module Pr
           # Shared plumbing for all pr subcommands.
           class BaseCommand < Ace::Support::Cli::Command
@@ -24,6 +26,19 @@ module Ace
             option :remote, type: :string, desc: "Git remote used for server resolution when nothing is selected"
             option :format, type: :string, default: "text", desc: "Output format: text, json"
 
+            ERROR_CATEGORIES = {
+              "ProviderAuthenticationError" => "authentication",
+              "ProviderUnreachableError" => "unreachable",
+              "ProviderMalformedOutputError" => "malformed",
+              "ProviderObjectNotFoundError" => "not_found",
+              "ProviderCliMissingError" => "cli_missing",
+              "ProviderIdentityMismatchError" => "identity_mismatch",
+              "ProviderConflictingMatchesError" => "conflicting_matches",
+              "ProviderExpectedHeadConflictError" => "expected_head_conflict",
+              "ProviderUnsupportedCapabilityError" => "unsupported_capability",
+              "ProviderUnknownOutcomeError" => "unknown_outcome"
+            }.freeze
+
             private
 
             def lifecycle(options)
@@ -47,6 +62,18 @@ module Ace
               end
             end
 
+            # JSON mode keeps the classified failure parseable on stdout;
+            # the human-readable line still reaches stderr through the
+            # raised Cli::Error with a nonzero exit.
+            def render_failure(options, error)
+              return unless options[:format] == "json"
+
+              puts JSON.pretty_generate(
+                error: {category: ERROR_CATEGORIES.fetch(error.class.name.split("::").last, "error"),
+                        message: error.message}
+              )
+            end
+
             def format_value(value)
               case value
               when Hash
@@ -73,7 +100,8 @@ module Ace
                 head_ref: pr.head_ref,
                 head_repository: pr.head_repository_url,
                 base_ref: pr.base_ref,
-                base_repository: pr.base_repository_url
+                base_repository: pr.base_repository_url,
+                merge_commit: pr.merge_commit_sha
               )
             end
           end
@@ -103,6 +131,7 @@ module Ace
                 merge_commit: pr.merge_commit_sha
               )
             rescue Ace::Git::Error, ArgumentError => e
+              render_failure(options, e)
               raise Ace::Support::Cli::Error.new(e.message)
             end
           end
@@ -131,6 +160,7 @@ module Ace
               )
               emit_receipt(options, "created", receipt)
             rescue Ace::Git::Error, ArgumentError => e
+              render_failure(options, e)
               raise Ace::Support::Cli::Error.new(e.message)
             end
           end
@@ -153,6 +183,7 @@ module Ace
               )
               emit_receipt(options, "updated", receipt)
             rescue Ace::Git::Error, ArgumentError => e
+              render_failure(options, e)
               raise Ace::Support::Cli::Error.new(e.message)
             end
           end
@@ -168,6 +199,7 @@ module Ace
               receipt = lifecycle(options).ready(identifier, expected_head: expected_head)
               emit_receipt(options, "readied", receipt)
             rescue Ace::Git::Error, ArgumentError => e
+              render_failure(options, e)
               raise Ace::Support::Cli::Error.new(e.message)
             end
           end
@@ -184,6 +216,7 @@ module Ace
               receipt = lifecycle(options).merge(identifier, expected_head: expected_head, method: method)
               emit_receipt(options, "merged", receipt)
             rescue Ace::Git::Error, ArgumentError => e
+              render_failure(options, e)
               raise Ace::Support::Cli::Error.new(e.message)
             end
           end

data/lib/ace/git/version.rb

@@ -2,6 +2,6 @@
 
 module Ace
   module Git
-    VERSION = "0.27.0"
+    VERSION = "0.28.0"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ace-git
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Michal Czyz
 bindir: exe
 cert_chain: []
-date: 2026-10-03 00:00:00.000000000 Z
+date: 2026-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ace-support-config