rails-informant 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 206cb69356bdf4d40de95e2435428cf0413f85ed56f7cdbed4912431fb2ddd6e
-  data.tar.gz: c2c7b3844c83ae2e92d389a9f8d914dfc3b4ff6ea599f741a6e31cdf10866254
+  metadata.gz: 452521455f3505485bde1a549f773545c459f78ecae46aea7aa1844a19cdc77c
+  data.tar.gz: 6c74d39ca5094a26bec34cd98fb7c0a8fbbdf0d6ac940265bef79484ab5e53d0
 SHA512:
-  metadata.gz: 19e1887a018a41d07163385fc1a7868ea21f33ea9599de3c6f8aaae309c2939f93c386fc7a21582e109ff15c8df5f21702f1aed77bd2b92af5beb41bb26f73c6
-  data.tar.gz: 5bd2451b4a52590e2687c2009b6603a5e1a2df42451508ad0bc1e24f5cb86377020bbb6b79336c2aa1fe2213061c4235911046b9423aaf575fcd2c2db47ffe31
+  metadata.gz: c0dafe1256811528cc18da9566369a8186e028fa4aaa8746ec2be68f6b1f533ffaebc369ec192e9d8e5ff282a15a49c87c4b40a58633054f1ea629d617036f71
+  data.tar.gz: ae248c9b2c78ed8d6e71d280c743144d75d6aef77459b1aecdd9be251f7bd7949593d96e35cdc018a9004b31b8c822cbc118cef426395c8a16656891b4269c77

data/lib/rails_informant/mcp/tools/verify_pending_fixes.rb

@@ -1,9 +1,12 @@
+require "json"
+require "open3"
+
 module RailsInformant
   module Mcp
     module Tools
       class VerifyPendingFixes < BaseTool
         tool_name "verify_pending_fixes"
-        description "Verify fix_pending errors by checking if their fix_sha is an ancestor of the deployed code. Resolves verified fixes. Requires git locally. Results reflect local git state — run git fetch first to ensure accuracy."
+        description "Verify fix_pending errors by checking whether the fix is in the deployed code: first by fix_sha ancestry, then — for squash/rebase merges, where fix_sha is not an ancestor of the deploy — by the fix PR's merge commit. Resolves verified fixes. Requires git locally (and gh for the PR fallback). Results reflect local git state — run git fetch first to ensure accuracy."
         input_schema(
           properties: {
             auto_resolve: { type: "boolean", description: "Resolve verified fixes automatically (default: true)" },
@@ -31,8 +34,7 @@ module RailsInformant
               pending = []
 
               errors.each do |error|
-                fix_sha = error["fix_sha"]
-                if fix_sha && ancestor?(fix_sha, ref)
+                if verified?(error, ref)
                   verified << error
                 else
                   pending << error
@@ -55,10 +57,52 @@ module RailsInformant
 
           private
 
+          def verified?(error, target_ref)
+            fix_sha = error["fix_sha"]
+            return true if fix_sha && ancestor?(fix_sha, target_ref)
+
+            # Squash and rebase merges create a new commit unrelated to fix_sha, so the
+            # recorded SHA is never an ancestor of the deploy. Fall back to the PR's merge
+            # commit, which is in the deployed history regardless of merge strategy.
+            merge_sha = merged_pr_commit error["fix_pr_url"]
+            !merge_sha.nil? && ancestor?(merge_sha, target_ref)
+          end
+
           def ancestor?(fix_sha, target_ref)
             system "git", "merge-base", "--is-ancestor", fix_sha, target_ref, out: File::NULL, err: File::NULL
           end
 
+          # Returns the merge commit SHA of a merged PR, or nil if the PR is unmerged, the
+          # URL is blank, or gh is unavailable. Best-effort fetches the commit so the
+          # subsequent ancestry check can see it. Uses the array form (no shell) so the
+          # PR URL can't be interpreted as a command.
+          def merged_pr_commit(pr_url)
+            return if pr_url.nil? || pr_url.empty?
+            return unless gh_available?
+
+            output, status = Open3.capture2 "gh", "pr", "view", pr_url, "--json", "state,mergeCommit", err: File::NULL
+            return unless status.success? && !output.strip.empty?
+
+            data = JSON.parse output
+            return unless data["state"] == "MERGED"
+
+            merge_sha = data.dig "mergeCommit", "oid"
+            return if merge_sha.nil? || merge_sha.empty?
+
+            fetch_commit merge_sha
+            merge_sha
+          rescue JSON::ParserError
+            nil
+          end
+
+          def fetch_commit(sha)
+            system "git", "fetch", "--quiet", "origin", sha, out: File::NULL, err: File::NULL
+          end
+
+          def gh_available?
+            system "gh", "--version", out: File::NULL, err: File::NULL
+          end
+
           def fetch_all_fix_pending(client)
             errors = []
             page = 1

data/lib/rails_informant.rb

@@ -156,6 +156,12 @@ module RailsInformant
         return ENV[key] if ENV[key].present?
       end
 
+      revision_path = Rails.root.join("REVISION")
+      if revision_path.exist?
+        content = revision_path.read.strip
+        return content.match?(SHA_FORMAT) ? content : nil
+      end
+
       head = Rails.root.join(".git", "HEAD").read.strip
       if head.start_with?("ref: ")
         ref = head.delete_prefix("ref: ")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-informant
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Daniel López Prat
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Self-hosted error monitoring for Rails with MCP server for agentic workflows
 test_files: []