ace-git-forgejo 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b31bdebd863b7bee391783037e9aef4dab2a1ac4bede0b2b897e8442ac297b7f
-  data.tar.gz: db3a546c09effeda3781370316a691cb893af860cb0212ef982320a521ab9cc0
+  metadata.gz: ec7d89b79d4c95330a4610f04ce163e8dcd402f3ff72bb468b27dac082d086ea
+  data.tar.gz: b9a7a5d29fa5fbd4b559ef532018d18e07d9a3b8de20dbd5860938408158d6e9
 SHA512:
-  metadata.gz: b4323793a3d0b8b0f217bf7acca41d31d89dc9316b14c51509352edc903760d6811e7412497d1189bf9339cd774154ac6fbc70b506d4c0587a017a3bc8dce2f9
-  data.tar.gz: e501d7e7d7ddf48e3194eb6a110c29df8984ba5f873295c0d6bbbbaa621987dcd814f50ede1fb594eb7f18c605dd1b8bc98edb2ca95a3cb6837db8f7a829d305
+  metadata.gz: f7a145c24c9720d4748f32cc921f42983f2dc20c56dc0c007de0536972b4b318bba6d35c52b2b360ece6846b24cf4cd6d5b819493a7471d14e13bd59e08dc060
+  data.tar.gz: e308d391be1d1057de4176e58a698cfef161ed9474e46bb29dd1ab0a5ef83efb13af1f51b8d4bccb53d8322c0ffce89db71438f777762f49a6cadb07bab9880a

data/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.7.0] - 2026-10-16
+
+### Added
+
+- Repository-bound API surface for scoped service identities: `HttpClient`/`PullRequestApi` accept an explicit `token:` (a host-installed merge receiver credential) with the `fj` keys-file lookup unchanged as the fallback, and `PullRequestApi#create_comment` attaches one PR-thread comment (the issue-served Forgejo endpoint) with the same `MutationOutcome` refusal classification as the other lifecycle mutations.
+
+## [0.6.2] - 2026-10-08
+
+### Fixed
+
+- Recheck ready/merge acceptance and selected repository provenance; retain the exact expected head and classify unconfirmed effects without replay.
+
 ## [0.6.1] - 2026-10-04
 
 ### Fixed

data/lib/ace/git/forgejo/http_client.rb

@@ -20,10 +20,15 @@ module Ace
       # limited to the safe GET verb — a mutation is sent at most once per
       # call, so a lost response stays an unknown outcome.
       class HttpClient
-        def initialize(server:, timeout:, runner: nil)
+        # `token:` injects an explicit credential for deployments whose scoped
+        # service identity is host-installed (e.g. a merge receiver reading its
+        # token from root-owned configuration) instead of the `fj` CLI keys
+        # file; when absent the fj credential governs as before.
+        def initialize(server:, timeout:, runner: nil, token: nil)
           @target = RepositoryBinding::Target.resolve(server.url)
           @timeout = timeout
           @runner = runner
+          @token = token.is_a?(String) && !token.empty? ? token : nil
         end
 
         def paginate(suffix)
@@ -145,6 +150,8 @@ module Ace
         end
 
         def access_token!
+          return @token if @token
+
           path = RepositoryBinding.default_keys_path
           data = path && JSON.parse(File.read(path))
           # fj stores credentials under the bare host (or host:port)

data/lib/ace/git/forgejo/provider.rb

@@ -33,6 +33,16 @@ module Ace
         WIP_PREFIXES = ["WIP:", "[WIP]"].freeze
 
         class << self
+          def pull_request_title(title:, draft:)
+            wip = WIP_PREFIXES.any? { |prefix| title.to_s.upcase.start_with?(prefix) }
+            return wip ? title : "WIP: #{title}" if draft
+            if wip
+              raise Ace::Git::ProviderConflictingMatchesError,
+                "Requested draft:false conflicts with the WIP-prefixed title"
+            end
+            title
+          end
+
           def display_name
             "Forgejo"
           end
@@ -549,7 +559,10 @@ module Ace
         # @return [ProviderMutationReceipt] operation :update
         def update_pull_request(number:, expected_head:, title: nil, body: nil)
           number = request_number!(number)
-          verify_expected_head!(pull_request(number: number), expected_head)
+          before = verify_expected_head!(pull_request(number: number), expected_head)
+          # Title edits are not a ready transition. Keep Forgejo's title-based
+          # draft state, just as providers with an explicit draft field do.
+          title = draft_title!(title, before.draft) if title
           if title || body
             pr_api.ensure_version_supported!
             outcome = send_lifecycle_mutation("PR ##{number} on #{server.name}, head #{expected_head}") do
@@ -560,9 +573,13 @@ module Ace
                 "PR update refused for ##{number} (HTTP #{outcome.status}: #{outcome.message}); " \
                 "reconcile before repeating"
             end
-            verify_post_mutation_head!(number, expected_head, "update")
+            after = verify_post_mutation_head!(number, expected_head, "update")
+            unless after.draft == before.draft
+              raise Ace::Git::ProviderUnknownOutcomeError,
+                "PR update changed draft state for ##{number}; reconcile before repeating"
+            end
           end
-          receipt(:update, pull_request(number: number), nil)
+          receipt(:update, after || before, nil)
         end
 
         # Mark a draft ready on the exact head. Forgejo derives draft state
@@ -715,15 +732,7 @@ module Ace
         # defaults, compared case-insensitively without trimming); the API
         # create form has no draft field.
         def draft_title!(title, draft)
-          if draft
-            work_in_progress_title?(title) ? title : "WIP: #{title}"
-          elsif work_in_progress_title?(title)
-            raise Ace::Git::ProviderConflictingMatchesError,
-              "Requested draft:false conflicts with the WIP-prefixed title #{title.inspect}; " \
-              "Forgejo would create the pull request as a draft"
-          else
-            title
-          end
+          self.class.pull_request_title(title: title, draft: draft)
         end
 
         def work_in_progress_title?(title)

data/lib/ace/git/forgejo/pull_request_api.rb

@@ -35,8 +35,8 @@ module Ace
         # success), and the parsed payload when the server returned one.
         MutationOutcome = Data.define(:status, :message, :payload)
 
-        def initialize(server:, timeout:, runner: nil)
-          @http = HttpClient.new(server: server, timeout: timeout, runner: runner)
+        def initialize(server:, timeout:, runner: nil, token: nil)
+          @http = HttpClient.new(server: server, timeout: timeout, runner: runner, token: token)
         end
 
         # Probe and validate the selected server's API version once per
@@ -161,6 +161,19 @@ module Ace
           MutationOutcome.new(status: status, message: message, payload: payload)
         end
 
+        # Attach one comment to the pull request thread (Forgejo serves PR
+        # comments on the issue endpoints) — e.g. a reviewer-produced evidence
+        # body handed over by a caller before the merge invocation.
+        #
+        # @return [MutationOutcome] 201 with the created comment payload, or a
+        #   refusal outcome (404 absent pull request, 422 rejected body)
+        def create_comment(number, body)
+          status, payload, message = @http.exchange(:post, "issues/#{number}/comments",
+            body: {"body" => body.to_s})
+          classify_send!(status, "create pull request #{number} comment")
+          MutationOutcome.new(status: status, message: message, payload: payload)
+        end
+
         private
 
         # Authentication, absence, and transport failures classify directly

data/lib/ace/git/forgejo/version.rb

@@ -3,7 +3,7 @@
 module Ace
   module Git
     module Forgejo
-      VERSION = "0.6.1"
+      VERSION = "0.7.0"
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ace-git-forgejo
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Michal Czyz
 bindir: exe
 cert_chain: []
-date: 2026-10-04 00:00:00.000000000 Z
+date: 2026-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ace-git
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: '0.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: '0.30'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement