gitlab-branch-triage 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f0c6207b42ee32ebdee0043b2bc42fa281174887aa4e0e7983d8ec730212635
-  data.tar.gz: 740c0de7ba602b533247202bdb9f8e2c4ef34fc29eac5ccbb130c87b6ccc19ed
+  metadata.gz: 728dd7248ca6212ced7a37dbef04c41fa8e658459132662ac6200b941a239464
+  data.tar.gz: 3462129e927e1fdb8f3f81611986f472e434dae2fc6d4ba4f234dc9767cce7b1
 SHA512:
-  metadata.gz: 9b9e817f6c1b37d237ee74b08b23a0ac684de7cdbc20cffc0704e7699b465cf2f636ed19014f6583a3f76e1c98378dd4d93d3585ecc6a251d2c4d7ec9735dfbe
-  data.tar.gz: fd595edf5634bab0e9ea7b0030869d2d79630c6cd7262cfe1472240158b7f9511b07f20ae8da7045e3a3c9697150fb8873e7f1f9747ea725819429b9d73fd5d3
+  metadata.gz: 7500ba0c06ff8503a130b9cd18b91287bf16709214556323622f7352dcac18cf96d8ad18a984a9e89198a9d2f3de31ad5eed04b623da71c35d5c0f475d789e05
+  data.tar.gz: a589b89e9757956bcf5749ddfc70787a14576909053f50605b3382930657c5c71cda6aa3da82e83bbf7abde3cb661b81af47fc66bf64b2e22fbf33471abcea28

data/CHANGELOG.md

@@ -5,15 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.0.0] - 2026-03-11
-
-### Added
+## [1.0.1] - 2026-03-16
 
--  initial commit and push beta version v1.0.0 (bfba928)
+### Fixed
 
-### Other
-
-- Initial commit (123cd8b)
+-   inconsistent configurations and next v1.0.1 (622f2f2)
 
 ## [1.0.0] - 2026-03-11
 
@@ -35,4 +31,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [1.0.0]: https://github.com/solucteam/gitlab-branch-triage/releases/tag/v1.0.0
 
-[1.0.0]: https://github.com/solucteam/gitlab-branch-triage/releases/tag/v1.0.0
+[1.0.1]: https://github.com/solucteam/gitlab-branch-triage/releases/tag/v1.0.1

data/README.md

@@ -12,13 +12,13 @@
 
 ---
 
-**gitlab-branch-triage** automates branch and merge request cleanup on GitLab using YAML-driven policies. Notify stale branch authors, auto-delete merged branches, close abandoned MRs, detect inactive authors, and keep your repositories clean — all from a single configuration file.
+**gitlab-branch-triage** automates branch cleanup on GitLab using YAML-driven policies. Notify stale branch authors, auto-delete merged branches, detect inactive authors, and automatically close notification issues when branches are removed — all from a single configuration file.
 
 ## Features
 
 - **Policy-driven** — define triage rules in a simple YAML file
 - **Branch triage** — detect stale, merged, or abandoned branches and act on them
-- **MR triage** — warn about abandoned MRs, close stale ones, flag failing pipelines
+- **Automatic issue lifecycle** — notification issues are closed automatically when the branch is deleted
 - **Inactive author detection** — automatically handles branches from blocked/deleted users
 - **Group-wide** — triage all projects in a GitLab group (subgroups included recursively)
 - **Dry-run by default** — safe to test before executing real actions
@@ -66,7 +66,7 @@ gitlab-branch-triage --source-id my-group/my-project --no-dry-run
 
 ## Configuration
 
-Policies are defined in `.branch-triage-policies.yml`. The file has two main sections: `branches` rules and `merge_requests` rules.
+Policies are defined in `.branch-triage-policies.yml`.
 
 ### Branch Rules
 
@@ -130,72 +130,30 @@ date:
 
 | Action | Config | Description |
 |--------|--------|-------------|
-| `notify` | `{title, body, labels}` | Create an issue to notify the author |
-| `delete` | `true` | Delete the branch |
+| `notify` | `{title, body, labels}` | Create an issue to notify the author. Closed automatically when the branch is deleted. |
+| `delete` | `true` | Delete the branch and close the associated notification issue. |
 | `print` | `"template string"` | Log a message |
 | `comment` | `{issue_iid, body}` | Comment on an existing issue |
 
-### Merge Request Rules
+### Template Variables
 
-```yaml
-resource_rules:
-  merge_requests:
-    rules:
-      - name: Warn abandoned MRs (30+ days)
-        conditions:
-          date:
-            attribute: updated_at
-            condition: older_than
-            interval_type: days
-            interval: 30
-          forbidden_labels:
-            - do-not-close
-        actions:
-          label_mr:
-            - stale
-          comment_mr: |
-            @{{author_username}}, this MR has had no activity for **{{days_since_update}} days**.
+`{{name}}`, `{{author_name}}`, `{{author_email}}`, `{{author_username}}`, `{{committed_date}}`, `{{days_inactive}}`, `{{delete_date}}`, `{{commit_title}}`, `{{short_sha}}`, `{{project_path}}`, `{{today}}`
 
-      - name: Close abandoned MRs (60+ days)
-        conditions:
-          date:
-            attribute: updated_at
-            condition: older_than
-            interval_type: days
-            interval: 60
-        actions:
-          close_mr: true
-```
+## Issue Lifecycle
 
-### MR Conditions
+gitlab-branch-triage manages the full lifecycle of notification issues automatically.
 
-| Condition | Example | Description |
-|-----------|---------|-------------|
-| `date` | `{attribute: updated_at, ...}` | Filter by `updated_at` or `created_at` |
-| `draft` | `true` / `false` | Draft/WIP status |
-| `assigned` | `true` / `false` | Has assignees |
-| `has_reviewer` | `true` / `false` | Has reviewers |
-| `pipeline_status` | `"failed"` | Pipeline state (`success`, `failed`, `running`, `pending`) |
-| `labels` | `["label1"]` | All labels must match (AND) |
-| `forbidden_labels` | `["on-hold"]` | None must match |
-| `target_branch` | `"main"` or `{matches: "regex"}` | Target branch filter |
-| `title` | `{contains: "hotfix"}` | Title pattern matching |
-
-### MR Actions
+**When `notify` runs**, an issue is created and assigned to the branch author with a deletion deadline (`{{delete_date}}`). The issue has the label `branch-cleanup`.
 
-| Action | Config | Description |
-|--------|--------|-------------|
-| `comment_mr` | `"template"` | Post a comment on the MR |
-| `close_mr` | `true` | Close the MR |
-| `label_mr` | `["stale"]` | Add labels |
-| `notify_mr` | `{title, body, labels}` | Create a notification issue |
-| `print` | `"template"` | Log a message |
+**When the branch is deleted by a `delete` rule**, the tool searches for any open `branch-cleanup` issue whose title contains the branch name and closes it automatically.
 
-### Template Variables
+**When the author deletes the branch themselves** (before the scheduled date), the next triage run detects that the branch no longer exists and closes the orphaned issue automatically.
 
-**Branches:** `{{name}}`, `{{author_name}}`, `{{author_email}}`, `{{author_username}}`, `{{committed_date}}`, `{{days_inactive}}`, `{{delete_date}}`, `{{commit_title}}`, `{{short_sha}}`, `{{project_path}}`, `{{today}}`
+This means issues are never left open after the branch is gone, regardless of who or what deleted it.
+
+## Inactive Author Detection
 
-**Merge Requests:** `{{iid}}`, `{{title}}`, `{{web_url}}`, `{{source_branch}}`, `{{target_branch}}`, `{{author_username}}`, `{{author_name}}`, `{{labels}}`, `{{state}}`, `{{draft}}`, `{{days_since_update}}`, `{{days_since_creation}}`, `{{updated_at}}`, `{{pipeline_status}}`, `{{close_date}}`, `{{project_path}}`, `{{today}}`
+When the `notify` action detects that a branch author is inactive (blocked, deactivated, or deleted from GitLab), it automatically deletes the branch and creates a cleanup issue assigned to a project maintainer. This prevents stale notifications to users who can no longer act on them.
 
 ## CLI Options
 
@@ -250,17 +208,13 @@ branch-triage:
 
 Generate the snippet with `gitlab-branch-triage --init-ci`.
 
-## Inactive Author Detection
-
-When the `notify` action detects that a branch author is inactive (blocked, deactivated, or deleted from GitLab), it automatically deletes the branch and creates a cleanup issue assigned to a project maintainer. This prevents stale notifications to users who can no longer act on them.
-
 ## Contributing
 
 Bug reports and pull requests are welcome on [GitHub](https://github.com/solucteam/gitlab-branch-triage).
 
 1. Fork it
 2. Create your feature branch (`git checkout -b feature/my-feature`)
-3. Commit your changes (`git commit -am 'Add my feature'`)
+3. Commit your changes (`git commit -am 'feat: add my feature'`)
 4. Push to the branch (`git push origin feature/my-feature`)
 5. Open a Pull Request
 

data/gitlab-branch-triage.gemspec

@@ -8,11 +8,11 @@ Gem::Specification.new do |spec|
   spec.authors       = ["SolucTeam"]
   spec.email         = ["contact@solucteam.com"]
 
-  spec.summary       = "Automated branch and MR triage for GitLab, driven by YAML policies"
+  spec.summary       = "Automated branch triage for GitLab, driven by YAML policies"
   spec.description   = <<~DESC
     gitlab-branch-triage enables project maintainers to automatically triage
-    GitLab branches and merge requests based on policies defined in a YAML file.
-    Notify stale branch authors, auto-delete merged branches, close abandoned MRs,
+    GitLab branches based on policies defined in a YAML file.
+    Notify stale branch authors, auto-delete merged branches,
     and detect inactive authors — all configurable via simple rules.
   DESC
   spec.homepage      = "https://github.com/solucteam/gitlab-branch-triage"

data/lib/gitlab/branch_triage/actions/delete.rb

@@ -5,27 +5,52 @@ module Gitlab
     module Actions
       # delete: true
       #
-      # Deletes the branch unconditionally.
-      # Author state is checked for logging purposes only here —
-      # the notify action handles the "inactive author" special case.
+      # Deletes the branch and closes any open branch-cleanup issue
+      # that was created by the notify action for this branch.
       class Delete < Base
         def execute
           return unless config
 
           if dry_run
             log_dry("Would delete branch: #{branch.name.inspect}")
+            log_dry("Would close open branch-cleanup issue for: #{branch.name.inspect}")
             return
           end
 
           ok = client.delete_branch(project_id, branch.name)
           if ok
             log_ok("Branch deleted: #{branch.name.inspect}")
+            close_notify_issue
           else
             log_err("Failed to delete branch: #{branch.name.inspect}")
           end
         rescue => e
           log_err("Error deleting branch #{branch.name}: #{e.message}")
         end
+
+        private
+
+        def close_notify_issue
+          issues = client.project_issues(
+            project_id,
+            labels: "branch-cleanup",
+            search: branch.name
+          )
+
+          matching = issues.select { |i| i["title"].to_s.include?(branch.name) }
+
+          if matching.empty?
+            logger.debug("    No open branch-cleanup issue found for #{branch.name.inspect}")
+            return
+          end
+
+          matching.each do |issue|
+            client.close_issue(project_id, issue["iid"])
+            log_ok("Closed issue ##{issue["iid"]}: #{issue["title"]}")
+          end
+        rescue => e
+          log_err("Could not close issue for #{branch.name}: #{e.message}")
+        end
       end
     end
   end

data/lib/gitlab/branch_triage/client.rb

@@ -31,53 +31,38 @@ module Gitlab
         true
       end
 
-      # ── Merge Request endpoints ────────────────────────────────────────────
-
+      # Returns the set of branch names that have an open MR (used by has_open_mr condition)
       def open_mr_source_branches(project_id)
         mrs = paginate("/projects/#{encode(project_id)}/merge_requests", state: "opened")
         mrs.map { |mr| mr["source_branch"] }.to_set
       end
 
-      def merge_requests(project_id, state: "opened")
-        paginate("/projects/#{encode(project_id)}/merge_requests", state: state)
-      end
+      # ── Issue endpoints ────────────────────────────────────────────────────
 
-      def add_mr_note(project_id, mr_iid, body)
-        resp = self.class.post(
-          "/projects/#{encode(project_id)}/merge_requests/#{mr_iid}/notes",
-          body: { body: body }.to_json
-        )
+      def create_issue(project_id, title:, description:, labels: [], assignee_id: nil)
+        payload = { title: title, description: description, labels: labels.join(",") }
+        payload[:assignee_id] = assignee_id if assignee_id
+
+        resp = self.class.post("/projects/#{encode(project_id)}/issues", body: payload.to_json)
         handle_response!(resp, expect: 201)
         resp.parsed_response
       end
 
-      def close_mr(project_id, mr_iid)
+      def close_issue(project_id, issue_iid)
         resp = self.class.put(
-          "/projects/#{encode(project_id)}/merge_requests/#{mr_iid}",
+          "/projects/#{encode(project_id)}/issues/#{issue_iid}",
           body: { state_event: "close" }.to_json
         )
         handle_response!(resp)
         resp.parsed_response
       end
 
-      def add_mr_labels(project_id, mr_iid, labels)
-        resp = self.class.put(
-          "/projects/#{encode(project_id)}/merge_requests/#{mr_iid}",
-          body: { add_labels: labels.join(",") }.to_json
-        )
-        handle_response!(resp)
-        resp.parsed_response
-      end
-
-      # ── Issue endpoints ────────────────────────────────────────────────────
-
-      def create_issue(project_id, title:, description:, labels: [], assignee_id: nil)
-        payload = { title: title, description: description, labels: labels.join(",") }
-        payload[:assignee_id] = assignee_id if assignee_id
-
-        resp = self.class.post("/projects/#{encode(project_id)}/issues", body: payload.to_json)
-        handle_response!(resp, expect: 201)
-        resp.parsed_response
+      # Returns open issues with the given label, optionally filtered by a search string.
+      # Used to find branch-cleanup issues and close them when the branch is gone.
+      def project_issues(project_id, labels:, state: "opened", search: nil)
+        params = { labels: Array(labels).join(","), state: state }
+        params[:search] = search if search
+        paginate("/projects/#{encode(project_id)}/issues", params)
       end
 
       def add_note(project_id, issue_iid, body)
@@ -91,8 +76,6 @@ module Gitlab
 
       # ── Group endpoints ───────────────────────────────────────────────────
 
-      # Returns all projects in a group, including subgroups recursively.
-      # The GitLab API supports include_subgroups=true natively.
       def group_projects(group_id, include_subgroups: true)
         paginate(
           "/groups/#{encode(group_id)}/projects",
@@ -103,21 +86,16 @@ module Gitlab
 
       # ── User endpoints ─────────────────────────────────────────────────────
 
-      # Search users — includes blocked users if token has admin scope,
-      # otherwise only returns active accounts.
       def find_users(search, per_page: 5)
         resp = self.class.get("/users", query: { search: search, per_page: per_page })
         data = resp.parsed_response
         data.is_a?(Array) ? data : []
       end
 
-      # Kept for backward compat
       def find_user(search)
         find_users(search, per_page: 1).first
       end
 
-      # Returns project members with at least min_access_level.
-      # access_level: 40 = Maintainer, 50 = Owner
       def project_members(project_id, min_access_level: 40)
         paginate(
           "/projects/#{encode(project_id)}/members/all",
@@ -137,7 +115,6 @@ module Gitlab
         loop do
           resp = self.class.get(path, query: { per_page: 100, page: page }.merge(extra_params))
 
-          # Handle rate limiting with max retries
           if resp.code == 429
             retries += 1
             raise "Rate limited by GitLab API after #{MAX_RETRIES} retries" if retries > MAX_RETRIES
@@ -148,7 +125,7 @@ module Gitlab
             next
           end
 
-          retries = 0  # reset on success
+          retries = 0
 
           handle_response!(resp)
           data = resp.parsed_response

data/lib/gitlab/branch_triage/policy_loader.rb

@@ -26,10 +26,6 @@ module Gitlab
       def branch_rules
         raw.dig("resource_rules", "branches", "rules") || []
       end
-
-      def mr_rules
-        raw.dig("resource_rules", "merge_requests", "rules") || []
-      end
     end
   end
 end

data/lib/gitlab/branch_triage/runner.rb

@@ -17,17 +17,15 @@ module Gitlab
         @dry_run       = dry_run
         @logger        = logger
         @options       = options
-        @stats         = { projects: 0, branches_matched: 0, mrs_matched: 0,
-                           skipped: 0, errors: 0 }
+        @stats         = { projects: 0, branches_matched: 0, skipped: 0, errors: 0 }
       end
 
       def run
         print_header
 
         branch_rules = policy_loader.branch_rules
-        mr_rules     = policy_loader.mr_rules
 
-        if branch_rules.empty? && mr_rules.empty?
+        if branch_rules.empty?
           logger.warn("No rules found in policies file.")
           return
         end
@@ -38,9 +36,9 @@ module Gitlab
           return
         end
 
-        projects.each { |project| run_project(project, branch_rules, mr_rules) }
+        projects.each { |project| run_project(project, branch_rules) }
 
-        print_summary(branch_rules.size, mr_rules.size)
+        print_summary(branch_rules.size)
       end
 
       private
@@ -62,7 +60,7 @@ module Gitlab
 
       # ── Per-project processing ────────────────────────────────────────────
 
-      def run_project(project, branch_rules, mr_rules)
+      def run_project(project, branch_rules)
         project_id   = project["id"] || project["path_with_namespace"]
         project_path = project["path_with_namespace"] || project_id.to_s
 
@@ -73,13 +71,43 @@ module Gitlab
 
         @stats[:projects] += 1
 
-        run_branch_rules(branch_rules, project_id, project_path) if branch_rules.any?
-        run_mr_rules(mr_rules, project_id, project_path)         if mr_rules.any?
+        close_orphaned_issues(project_id)
+        run_branch_rules(branch_rules, project_id, project_path)
       rescue => e
         logger.error("  ERROR processing #{project_path}: #{e.message}")
         @stats[:errors] += 1
       end
 
+      # ── Orphaned issue cleanup ────────────────────────────────────────────
+      #
+      # Finds open branch-cleanup issues whose branch no longer exists
+      # (deleted manually by the author or via another process) and closes them.
+
+      def close_orphaned_issues(project_id)
+        issues = client.project_issues(project_id, labels: "branch-cleanup")
+        return if issues.empty?
+
+        existing_branches = client.branches(project_id).map { |b| b["name"] }.to_set
+
+        issues.each do |issue|
+          # Extract branch name from issue title — matches patterns like:
+          #   "🔔 Stale branch: `feature/foo`"
+          branch_name = issue["title"].to_s[/`([^`]+)`/, 1]
+          next unless branch_name
+          next if existing_branches.include?(branch_name)
+
+          if dry_run
+            logger.info("  [DRY-RUN] Would close issue ##{issue["iid"]} — branch #{branch_name.inspect} no longer exists")
+            next
+          end
+
+          client.close_issue(project_id, issue["iid"])
+          logger.info("  ✅ Closed issue ##{issue["iid"]} — branch #{branch_name.inspect} no longer exists")
+        rescue => e
+          logger.error("  ❌ Could not close issue ##{issue["iid"]}: #{e.message}")
+        end
+      end
+
       # ── Branch rules ──────────────────────────────────────────────────────
 
       def run_branch_rules(rules, project_id, project_path)
@@ -143,72 +171,6 @@ module Gitlab
         end
       end
 
-      # ── MR rules ──────────────────────────────────────────────────────────
-
-      def run_mr_rules(rules, project_id, project_path)
-        logger.info("")
-        logger.info("-- Merge Requests --")
-
-        raw_mrs = client.merge_requests(project_id, state: "opened")
-        logger.info("  #{raw_mrs.size} open MR(s) found")
-
-        mrs = raw_mrs.map do |raw|
-          mr = Resource::MergeRequest.new(raw)
-          mr.project_path = project_path
-          mr
-        end
-
-        rules.each { |rule| process_mr_rule(rule, mrs, project_id, project_path) }
-      end
-
-      def process_mr_rule(rule, mrs, project_id, project_path)
-        name       = rule["name"] || "(unnamed)"
-        conditions = rule["conditions"] || {}
-        actions    = rule["actions"]    || {}
-        limits     = rule["limits"]     || {}
-
-        logger.info("")
-        logger.info("  Rule: #{name}")
-
-        matched = mrs.select do |mr|
-          Conditions::MrEvaluator.new(mr, conditions).satisfied?
-        rescue => e
-          logger.error("    ERROR evaluating MR !#{mr.iid}: #{e.message}")
-          @stats[:errors] += 1
-          false
-        end
-
-        if limits["most_recent"]
-          matched = matched.sort_by(&:updated_at).last(limits["most_recent"].to_i)
-        end
-
-        if matched.empty?
-          logger.info("    No MRs matched.")
-          return
-        end
-
-        @stats[:skipped] += mrs.size - matched.size
-
-        logger.info("    #{matched.size} matched:")
-
-        close_threshold = conditions.dig("date", "interval") || 30
-
-        matched.each do |mr|
-          mr.close_in_days = [close_threshold.to_i - mr.days_since_update, 0].max
-
-          logger.info("    MR !#{mr.iid} : #{mr.title.slice(0, 55)}")
-          logger.info("      Author  : @#{mr.author_username}")
-          logger.info("      Updated : #{mr.days_since_update}d ago | Draft: #{mr.draft?} | Labels: #{mr.labels.join(", ")}")
-
-          Actions::MrExecutor.new(
-            client: client, project_id: project_id, mr: mr,
-            actions: actions, dry_run: dry_run, logger: logger
-          ).execute!
-
-          @stats[:mrs_matched] += 1
-        end
-      end
-
       # ── Helpers ───────────────────────────────────────────────────────────
 
       def print_header
@@ -225,15 +187,13 @@ module Gitlab
         logger.info(SEPARATOR)
       end
 
-      def print_summary(branch_rule_count, mr_rule_count)
+      def print_summary(branch_rule_count)
         logger.info("")
         logger.info(LINE)
         logger.info("Summary")
         logger.info("  Projects processed  : #{@stats[:projects]}")
         logger.info("  Branch rules        : #{branch_rule_count}")
-        logger.info("  MR rules            : #{mr_rule_count}")
         logger.info("  Branches matched    : #{@stats[:branches_matched]}")
-        logger.info("  MRs matched         : #{@stats[:mrs_matched]}")
         logger.info("  Skipped             : #{@stats[:skipped]}")
         logger.info("  Errors              : #{@stats[:errors]}") if @stats[:errors] > 0
         if dry_run

data/lib/gitlab/branch_triage/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module BranchTriage
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/gitlab-branch-triage.rb

@@ -19,7 +19,6 @@ module Gitlab
 
     module Resource
       autoload :Branch,           "gitlab/branch_triage/resource/branch"
-      autoload :MergeRequest,     "gitlab/branch_triage/resource/merge_request"
     end
 
     module Conditions
@@ -32,15 +31,6 @@ module Gitlab
       autoload :AuthorCondition,  "gitlab/branch_triage/conditions/author_condition"
       autoload :ForbiddenAuthor,  "gitlab/branch_triage/conditions/author_condition"
       autoload :Evaluator,        "gitlab/branch_triage/conditions/evaluator"
-      autoload :MrEvaluator,      "gitlab/branch_triage/conditions/mr_conditions"
-      autoload :MrDateCondition,  "gitlab/branch_triage/conditions/mr_conditions"
-      autoload :MrDraft,          "gitlab/branch_triage/conditions/mr_conditions"
-      autoload :MrAssigned,       "gitlab/branch_triage/conditions/mr_conditions"
-      autoload :MrHasReviewer,    "gitlab/branch_triage/conditions/mr_conditions"
-      autoload :MrPipelineStatus, "gitlab/branch_triage/conditions/mr_conditions"
-      autoload :MrLabels,         "gitlab/branch_triage/conditions/mr_conditions"
-      autoload :MrForbiddenLabels,"gitlab/branch_triage/conditions/mr_conditions"
-      autoload :MrTargetBranch,   "gitlab/branch_triage/conditions/mr_conditions"
     end
 
     module Actions
@@ -50,11 +40,6 @@ module Gitlab
       autoload :Print,            "gitlab/branch_triage/actions/print"
       autoload :Comment,          "gitlab/branch_triage/actions/comment"
       autoload :Executor,         "gitlab/branch_triage/actions/executor"
-      autoload :CommentMr,        "gitlab/branch_triage/actions/mr_actions"
-      autoload :CloseMr,          "gitlab/branch_triage/actions/mr_actions"
-      autoload :LabelMr,          "gitlab/branch_triage/actions/mr_actions"
-      autoload :NotifyMr,         "gitlab/branch_triage/actions/mr_actions"
-      autoload :MrExecutor,       "gitlab/branch_triage/actions/mr_actions"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-branch-triage
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - SolucTeam
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-11 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -40,8 +40,8 @@ dependencies:
         version: '7.0'
 description: |
   gitlab-branch-triage enables project maintainers to automatically triage
-  GitLab branches and merge requests based on policies defined in a YAML file.
-  Notify stale branch authors, auto-delete merged branches, close abandoned MRs,
+  GitLab branches based on policies defined in a YAML file.
+  Notify stale branch authors, auto-delete merged branches,
   and detect inactive authors — all configurable via simple rules.
 email:
 - contact@solucteam.com
@@ -60,7 +60,6 @@ files:
 - lib/gitlab/branch_triage/actions/comment.rb
 - lib/gitlab/branch_triage/actions/delete.rb
 - lib/gitlab/branch_triage/actions/executor.rb
-- lib/gitlab/branch_triage/actions/mr_actions.rb
 - lib/gitlab/branch_triage/actions/notify.rb
 - lib/gitlab/branch_triage/actions/print.rb
 - lib/gitlab/branch_triage/client.rb
@@ -69,13 +68,11 @@ files:
 - lib/gitlab/branch_triage/conditions/date_condition.rb
 - lib/gitlab/branch_triage/conditions/evaluator.rb
 - lib/gitlab/branch_triage/conditions/inactive_days.rb
-- lib/gitlab/branch_triage/conditions/mr_conditions.rb
 - lib/gitlab/branch_triage/conditions/name_condition.rb
 - lib/gitlab/branch_triage/conditions/state_condition.rb
 - lib/gitlab/branch_triage/group_resolver.rb
 - lib/gitlab/branch_triage/policy_loader.rb
 - lib/gitlab/branch_triage/resource/branch.rb
-- lib/gitlab/branch_triage/resource/merge_request.rb
 - lib/gitlab/branch_triage/runner.rb
 - lib/gitlab/branch_triage/user_resolver.rb
 - lib/gitlab/branch_triage/version.rb
@@ -107,5 +104,5 @@ requirements: []
 rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
-summary: Automated branch and MR triage for GitLab, driven by YAML policies
+summary: Automated branch triage for GitLab, driven by YAML policies
 test_files: []

data/lib/gitlab/branch_triage/actions/mr_actions.rb

@@ -1,187 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module BranchTriage
-    module Actions
-      # ── comment_mr ───────────────────────────────────────────────────────
-      # Posts a note directly on the MR thread.
-      #
-      # comment_mr: |
-      #   @{{author_username}} this MR has been inactive for {{days_since_update}} days.
-      #   Please update it or it will be closed on {{close_date}}.
-      class CommentMr < Base
-        def execute
-          body = render(config.to_s)
-
-          if dry_run
-            log_dry("Would comment on MR !#{mr.iid}: #{body[0, 80].inspect}...")
-            return
-          end
-
-          client.add_mr_note(project_id, mr.iid, body)
-          log_ok("Commented on MR !#{mr.iid}")
-        rescue => e
-          log_err("Failed to comment on MR !#{mr.iid}: #{e.message}")
-        end
-
-        private
-
-        def mr = @branch
-      end
-
-      # ── close_mr ─────────────────────────────────────────────────────────
-      # Closes the MR via the API.
-      #
-      # close_mr: true
-      class CloseMr < Base
-        def execute
-          return unless config
-
-          if dry_run
-            log_dry("Would close MR !#{mr.iid}: #{mr.title.slice(0, 60).inspect}")
-            return
-          end
-
-          client.close_mr(project_id, mr.iid)
-          log_ok("Closed MR !#{mr.iid}: #{mr.title.slice(0, 60)}")
-        rescue => e
-          log_err("Failed to close MR !#{mr.iid}: #{e.message}")
-        end
-
-        private
-
-        def mr = @branch
-      end
-
-      # ── label_mr ─────────────────────────────────────────────────────────
-      # Adds labels to the MR.
-      #
-      # label_mr:
-      #   - stale
-      #   - needs-attention
-      class LabelMr < Base
-        def execute
-          labels = Array(config)
-          return if labels.empty?
-
-          if dry_run
-            log_dry("Would add labels #{labels.inspect} to MR !#{mr.iid}")
-            return
-          end
-
-          client.add_mr_labels(project_id, mr.iid, labels)
-          log_ok("Added labels #{labels.inspect} to MR !#{mr.iid}")
-        rescue => e
-          log_err("Failed to label MR !#{mr.iid}: #{e.message}")
-        end
-
-        private
-
-        def mr = @branch
-      end
-
-      # ── notify_mr ────────────────────────────────────────────────────────
-      # Creates a GitLab issue to notify the author of an abandoned MR.
-      #
-      # notify_mr:
-      #   title: "Abandoned MR: {{title}}"
-      #   body: |
-      #     @{{author_username}}, MR !{{iid}} has been inactive for {{days_since_update}} days.
-      #   labels:
-      #     - mr-cleanup
-      class NotifyMr < Base
-        DEFAULT_TITLE = "Abandoned MR: !{{iid}} {{title}}"
-        DEFAULT_BODY  = <<~BODY
-          Hi @{{author_username}} 👋
-
-          Merge Request [!{{iid}} {{title}}]({{web_url}}) in project `{{project_path}}`
-          has been inactive for **{{days_since_update}} days**
-          (last update: `{{updated_at}}`).
-
-          **Status:** {{state}}{{draft_label}}
-
-          Please take one of the following actions before **{{close_date}}**:
-          - ✅ Mark it as ready and request a review
-          - 🔄 Rebase/update if there are conflicts
-          - 🚫 Close it if the work is no longer needed
-
-          _This issue was created automatically by gitlab-branch-triage._
-        BODY
-
-        def execute
-          title_tpl = config.is_a?(Hash) ? config["title"] || DEFAULT_TITLE : DEFAULT_TITLE
-          body_tpl  = config.is_a?(Hash) ? config["body"]  || DEFAULT_BODY  : DEFAULT_BODY
-          labels    = config.is_a?(Hash) ? Array(config["labels"])           : ["mr-cleanup", "automated"]
-
-          close_in   = mr.instance_variable_defined?(:@close_in_days) ? mr.instance_variable_get(:@close_in_days) : 30
-          close_date = (Time.now + close_in * 86_400).strftime("%Y-%m-%d")
-          draft_lbl  = mr.draft? ? " (Draft/WIP)" : ""
-
-          extra = { "close_date" => close_date, "draft_label" => draft_lbl }
-          title = render(title_tpl, extra)
-          body  = render(body_tpl,  extra)
-
-          if dry_run
-            log_dry("Would create issue: #{title.inspect}")
-            return
-          end
-
-          issue = client.create_issue(
-            project_id,
-            title:       title,
-            description: body,
-            labels:      labels,
-            assignee_id: mr.author_id
-          )
-          log_ok("Issue created: #{issue["web_url"]}")
-        rescue => e
-          log_err("Failed to create issue for MR !#{mr.iid}: #{e.message}")
-        end
-
-        private
-
-        def mr = @branch
-      end
-
-      # ── MR Action Executor ────────────────────────────────────────────────
-
-      MR_REGISTRY = {
-        "comment_mr" => CommentMr,
-        "close_mr"   => CloseMr,
-        "label_mr"   => LabelMr,
-        "notify_mr"  => NotifyMr,
-        "print"      => Print,   # shared with branch actions
-      }.freeze
-
-      class MrExecutor
-        def initialize(client:, project_id:, mr:, actions:, dry_run: true, logger: Logger.new($stdout))
-          @client     = client
-          @project_id = project_id
-          @mr         = mr
-          @actions    = actions || {}
-          @dry_run    = dry_run
-          @logger     = logger
-        end
-
-        def execute!
-          @actions.each do |key, config|
-            klass = MR_REGISTRY[key]
-            if klass.nil?
-              @logger.warn("  Unknown MR action '#{key}' — ignored")
-              next
-            end
-
-            klass.new(
-              client:     @client,
-              project_id: @project_id,
-              branch:     @mr,      # reuse :branch slot for MR
-              config:     config,
-              dry_run:    @dry_run,
-              logger:     @logger
-            ).execute
-          end
-        end
-      end
-    end
-  end
-end

data/lib/gitlab/branch_triage/conditions/mr_conditions.rb

@@ -1,141 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module BranchTriage
-    module Conditions
-      # ── MR-specific conditions ────────────────────────────────────────────
-
-      # date:
-      #   attribute: updated_at | created_at
-      #   condition: older_than | more_recent_than
-      #   interval_type: days | weeks | months | years
-      #   interval: 30
-      class MrDateCondition < Base
-        MULTIPLIERS = { "days" => 1, "weeks" => 7, "months" => 30, "years" => 365 }.freeze
-
-        def satisfied?
-          threshold = config["interval"].to_i * MULTIPLIERS.fetch(config["interval_type"] || "days", 1)
-          age       = case config["attribute"]
-                      when "created_at" then resource.days_since_creation
-                      else                   resource.days_since_update
-                      end
-
-          case config["condition"]
-          when "older_than"       then age >= threshold
-          when "more_recent_than" then age <  threshold
-          else false
-          end
-        end
-
-        private
-
-        def resource = @branch  # reuse Base's @branch ivar (holds the MR here)
-      end
-
-      # draft: true | false
-      class MrDraft < Base
-        def satisfied?
-          @branch.draft? == config
-        end
-      end
-
-      # assigned: true | false
-      class MrAssigned < Base
-        def satisfied?
-          @branch.assigned? == config
-        end
-      end
-
-      # has_reviewer: true | false
-      class MrHasReviewer < Base
-        def satisfied?
-          @branch.has_reviewer? == config
-        end
-      end
-
-      # pipeline_status: "failed" | "success" | "running" | ""
-      class MrPipelineStatus < Base
-        def satisfied?
-          @branch.pipeline_status == config.to_s
-        end
-      end
-
-      # labels:
-      #   - needs-review
-      class MrLabels < Base
-        def satisfied?
-          Array(config).all? { |l| @branch.has_label?(l) }
-        end
-      end
-
-      # forbidden_labels:
-      #   - do-not-close
-      class MrForbiddenLabels < Base
-        def satisfied?
-          Array(config).none? { |l| @branch.has_label?(l) }
-        end
-      end
-
-      # target_branch: main
-      class MrTargetBranch < Base
-        def satisfied?
-          case config
-          when String then @branch.target_branch == config
-          when Hash
-            return Regexp.new(config["matches"]).match?(@branch.target_branch) if config["matches"]
-            true
-          else true
-          end
-        end
-      end
-
-      # ── MR Evaluator ─────────────────────────────────────────────────────
-
-      MR_REGISTRY = {
-        "date"            => MrDateCondition,
-        "draft"           => MrDraft,
-        "assigned"        => MrAssigned,
-        "has_reviewer"    => MrHasReviewer,
-        "pipeline_status" => MrPipelineStatus,
-        "labels"          => MrLabels,
-        "forbidden_labels"=> MrForbiddenLabels,
-        "target_branch"   => MrTargetBranch,
-        # title/name reuse existing conditions via alias
-        "title"           => nil,
-      }.freeze
-
-      class MrEvaluator
-        def initialize(mr, conditions)
-          @mr         = mr
-          @conditions = conditions || {}
-        end
-
-        def satisfied?
-          @conditions.all? do |key, value|
-            evaluate(key, value)
-          end
-        end
-
-        private
-
-        def evaluate(key, value)
-          klass = MR_REGISTRY[key]
-
-          # title: reuse NameCondition logic
-          if key == "title"
-            return Conditions::NameCondition.new(@mr, value).tap do |c|
-              c.instance_variable_set(:@branch, OpenStruct.new(name: @mr.title))
-            end.satisfied?
-          end
-
-          if klass.nil?
-            warn "  Unknown MR condition '#{key}' — ignored"
-            return true
-          end
-
-          klass.new(@mr, value).satisfied?
-        end
-      end
-    end
-  end
-end

data/lib/gitlab/branch_triage/resource/merge_request.rb

@@ -1,150 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module BranchTriage
-    module Resource
-      # Wraps a raw GitLab MR API hash and exposes computed helpers.
-      class MergeRequest
-        attr_reader :raw
-        attr_accessor :author_user, :project_path, :close_in_days
-
-        def initialize(raw)
-          @raw         = raw
-          @author_user = nil
-        end
-
-        # ── Identity ──────────────────────────────────────────────────────────
-
-        def iid
-          raw["iid"]
-        end
-
-        def id
-          raw["id"]
-        end
-
-        def title
-          raw["title"].to_s
-        end
-
-        def state
-          raw["state"].to_s  # opened | closed | merged | locked
-        end
-
-        def draft?
-          raw["draft"] == true || title.match?(/\A\s*(Draft|WIP)\s*:/i)
-        end
-
-        def source_branch
-          raw["source_branch"].to_s
-        end
-
-        def target_branch
-          raw["target_branch"].to_s
-        end
-
-        def web_url
-          raw["web_url"].to_s
-        end
-
-        def labels
-          Array(raw["labels"])
-        end
-
-        def has_label?(name)
-          labels.any? { |l| l.casecmp?(name) }
-        end
-
-        # ── Author ────────────────────────────────────────────────────────────
-
-        def author_username
-          raw.dig("author", "username").to_s
-        end
-
-        def author_name
-          raw.dig("author", "name").to_s
-        end
-
-        def author_id
-          raw.dig("author", "id")
-        end
-
-        # ── Assignees ─────────────────────────────────────────────────────────
-
-        def assignees
-          Array(raw["assignees"])
-        end
-
-        def assigned?
-          assignees.any?
-        end
-
-        # ── Reviewers ─────────────────────────────────────────────────────────
-
-        def reviewers
-          Array(raw["reviewers"])
-        end
-
-        def has_reviewer?
-          reviewers.any?
-        end
-
-        # ── Dates ─────────────────────────────────────────────────────────────
-
-        def created_at
-          @created_at ||= Time.parse(raw["created_at"]) rescue Time.now
-        end
-
-        def updated_at
-          @updated_at ||= Time.parse(raw["updated_at"]) rescue Time.now
-        end
-
-        def days_since_update
-          @days_since_update ||= ((Time.now - updated_at) / 86_400).to_i
-        end
-
-        def days_since_creation
-          @days_since_creation ||= ((Time.now - created_at) / 86_400).to_i
-        end
-
-        # ── Pipeline ──────────────────────────────────────────────────────────
-
-        def pipeline_status
-          raw.dig("head_pipeline", "status").to_s  # success|failed|running|pending|""
-        end
-
-        def pipeline_failed?
-          pipeline_status == "failed"
-        end
-
-        # ── Template context ──────────────────────────────────────────────────
-
-        def template_context(extra = {})
-          {
-            "iid"                => iid.to_s,
-            "title"              => title,
-            "web_url"            => web_url,
-            "source_branch"      => source_branch,
-            "target_branch"      => target_branch,
-            "author_username"    => author_username,
-            "author_name"        => author_name,
-            "labels"             => labels.join(", "),
-            "state"              => state,
-            "draft"              => draft?.to_s,
-            "days_since_update"  => days_since_update.to_s,
-            "days_since_creation"=> days_since_creation.to_s,
-            "updated_at"         => updated_at.strftime("%Y-%m-%d"),
-            "created_at"         => created_at.strftime("%Y-%m-%d"),
-            "pipeline_status"    => pipeline_status,
-            "today"              => Time.now.strftime("%Y-%m-%d"),
-            "project_path"       => @project_path.to_s,
-          }.merge(extra)
-        end
-
-        def to_s
-          "#<MR !#{iid} #{title.slice(0, 40)} state=#{state} draft=#{draft?} updated=#{days_since_update}d ago>"
-        end
-      end
-    end
-  end
-end