From a98f308c81b32c197b3a43e308b2500eead3475b Mon Sep 17 00:00:00 2001
From: systemfsoftware-maker
 <248545757+systemfsoftware-maker@users.noreply.github.com>
Date: Sat, 24 Oct 2026 03:38:49 -0400
Subject: [PATCH] ci(mergify): extend the org merge-queue policy and name this
 repo's checks

---
 .github/dependabot.yml | 12 +++++++++++-
 .mergify.yml           | 43 +++++++++++++++++++++++++-----------------
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 9955fbc..9440a9f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,10 +9,13 @@ updates:
       interval: "weekly"
       day: "monday"
     groups:
-      github-actions:
+      github-actions-minor-patch:
         patterns:
           - "*"
 
+        update-types:
+          - minor
+          - patch
   - package-ecosystem: "npm"
     directories:
       - "/"
@@ -101,3 +104,10 @@ updates:
     schedule:
       interval: "weekly"
       day: "monday"
+    groups:
+      minor-and-patch:
+        patterns:
+          - '*'
+        update-types:
+          - minor
+          - patch
diff --git a/.mergify.yml b/.mergify.yml
index 563ee81..6e0debb 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,37 +1,46 @@
-# Mergify merges every PR into main. A PR that meets queue_conditions is queued automatically; nobody comments.
-# The first PR in this repository (SYS-440) is a bootstrap merge: kiro-systemf merges it once with
-# --match-head-commit. From the next PR the queue takes over.
+# Mergify: policy lives in systemfsoftware/.github (.mergify.yml). This file names this repo's CI checks.
+extends: .github
 queue_rules:
   - name: default
-    merge_method: squash
     queue_conditions:
-      - base = main
+      # Repeats the org policy's merge authority (YAML anchors are not inherited): a Kiro approval, or a
+      # Dependabot patch/minor update. Keep it in step with systemfsoftware/.github.
+      - or:
+          - approved-reviews-by = kiro-systemf[bot]
+          - and:
+              - author = dependabot[bot]
+              - dependabot-update-type != version-update:semver-major
+              - or:
+                  - dependabot-update-type = version-update:semver-patch
+                  - dependabot-update-type = version-update:semver-minor
+                  - "title ~= (?i)\\bthe [a-z0-9@/._-]*(minor|patch)[a-z0-9@/._-]* group\\b"
       - -draft
       - -label = hold
-      - "approved-reviews-by = kiro-systemf[bot]"
-      - "#changes-requested-reviews-by = 0"
+      - check-success = check (dist)
       - check-success = check (format)
       - check-success = check (lint)
-      - check-success = check (typecheck)
-      - check-success = check (test)
-      - check-success = check (dist)
       - check-success = check (sfs-sources)
+      - check-success = check (test)
+      - check-success = check (typecheck)
       - check-success = journeys
       - check-success = rules
-      - check-success = lint PR commits
-      - check-success = changeset · shared tooling
+      - or:
+          - check-success = lint PR commits
+          - check-skipped = lint PR commits
+      - or:
+          - check-success = changeset · shared tooling / a publishable-package change needs an intent
+          - check-skipped = changeset · shared tooling / a publishable-package change needs an intent
     merge_conditions:
+      - check-success = check (dist)
       - check-success = check (format)
       - check-success = check (lint)
-      - check-success = check (typecheck)
-      - check-success = check (test)
-      - check-success = check (dist)
       - check-success = check (sfs-sources)
+      - check-success = check (test)
+      - check-success = check (typecheck)
       - check-success = journeys
       - check-success = rules
-      - check-success = lint PR commits
-      - check-success = changeset · shared tooling
 
+# A PR enters the queue only through a queue action; queue_conditions decide which PRs it accepts.
 pull_request_rules:
   - name: queue when ready
     conditions: