[ci] mergify: accept [skill]/[skills] and [infra] PR title tags (hao-ai-lab#1309)

Author: SolitaryThinker

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,8 @@
 PR TITLE: Must start with a type tag, e.g.:
   [feat] Add new model       [bugfix] Fix VAE tiling      [refactor] Restructure pipeline
   [perf] Optimize kernel     [ci] Update tests             [docs] Add guide
-  [misc] Cleanup configs     [new-model] Port Flux2
+  [misc] Cleanup configs     [new-model] Port Flux2        [infra] Add trace hooks
+  [skill] Add agent skill
 
 MERGE WORKFLOW:
   1. Ensure pre-commit passes and you have at least 1 approval

.github/mergify.yml

@@ -3,7 +3,7 @@ merge_protections:
     if:
       - base = main
     success_conditions:
-      - "title~=(?i)^\\[(feat|feature|bugfix|fix|refactor|perf|ci|doc|docs|misc|chore|kernel|new.?model)\\]"
+      - "title~=(?i)^\\[(feat|feature|bugfix|fix|refactor|perf|ci|doc|docs|misc|chore|kernel|new.?model|skill|skills|infra)\\]"
       - "#approved-reviews-by>=1"
       - check-success~=pre-commit
       - check-success=fastcheck-passed
@@ -79,6 +79,22 @@ pull_request_rules:
       label:
         add: ["type: new-model"]
 
+  - name: "label type: infra"
+    conditions:
+      - "title~=(?i)^\\[infra\\]"
+      - -closed
+    actions:
+      label:
+        add: ["type: infra"]
+
+  - name: "label type: skill"
+    conditions:
+      - "title~=(?i)^\\[skills?\\]"
+      - -closed
+    actions:
+      label:
+        add: ["type: skill"]
+
   # ============================================================
   # Scope labels (from changed files)
   # ============================================================
@@ -262,7 +278,7 @@ pull_request_rules:
   - name: auto-merge when ready and all checks pass
     conditions:
       - label=ready
-      - "title~=(?i)^\\[(feat|feature|bugfix|fix|refactor|perf|ci|doc|docs|misc|chore|kernel|new.?model)\\]"
+      - "title~=(?i)^\\[(feat|feature|bugfix|fix|refactor|perf|ci|doc|docs|misc|chore|kernel|new.?model|skill|skills|infra)\\]"
       - "#approved-reviews-by>=1"
       - check-success~=pre-commit
       - check-success=fastcheck-passed
@@ -292,7 +308,7 @@ pull_request_rules:
     conditions:
       - -closed
       - -draft
-      - "-title~=(?i)^\\[(feat|feature|bugfix|fix|refactor|perf|ci|doc|docs|misc|chore|kernel|new.?model)\\]"
+      - "-title~=(?i)^\\[(feat|feature|bugfix|fix|refactor|perf|ci|doc|docs|misc|chore|kernel|new.?model|skill|skills|infra)\\]"
     actions:
       comment:
         message: |
@@ -304,11 +320,13 @@ pull_request_rules:
           - `[refactor] Restructure training pipeline`
           - `[perf] Optimize attention kernel`
           - `[ci] Update test infrastructure`
+          - `[infra] Add activation trace hooks`
           - `[docs] Add inference guide`
           - `[misc] Clean up configs`
           - `[new-model] Port Flux2 to FastVideo`
+          - `[skill] Add add-model agent skill`
 
-          Valid tags: `feat`, `feature`, `bugfix`, `fix`, `refactor`, `perf`, `ci`, `doc`, `docs`, `misc`, `chore`, `kernel`, `new-model`
+          Valid tags: `feat`, `feature`, `bugfix`, `fix`, `refactor`, `perf`, `ci`, `infra`, `doc`, `docs`, `misc`, `chore`, `kernel`, `new-model`, `skill`, `skills`
 
           Please update your PR title and the merge protection check will pass automatically.
 

docs/contributing/pull_requests.md

@@ -25,10 +25,12 @@ Mergify before any merge is allowed.
 | `[refactor]` | Code restructuring with no behavior change |
 | `[perf]` | Performance improvement |
 | `[ci]` | CI/CD or build tooling changes |
+| `[infra]` | Repo infrastructure: agent tooling, debug hooks, conversion scripts, dev infra |
 | `[doc]` or `[docs]` | Documentation only |
 | `[misc]` or `[chore]` | Housekeeping, dependency bumps, minor cleanup |
 | `[kernel]` | CUDA kernel changes in `fastvideo-kernel/` |
 | `[new-model]` | Adding a new model or pipeline |
+| `[skill]` or `[skills]` | Agent skills under `.agents/skills/` or `.claude/skills/` |
 
 **Examples:**
 
@@ -38,6 +40,8 @@ Mergify before any merge is allowed.
 [refactor] Restructure distributed attention dispatch
 [docs] Add LoRA finetuning guide
 [new-model] Port HunyuanVideo 1.5 to FastVideo
+[infra] Add activation trace hooks for pipeline debugging
+[skill] Add add-model agent skill
 ```
 
 If your title is missing the tag, Mergify will post a comment listing the valid formats.
@@ -51,8 +55,8 @@ Labels are applied automatically based on your PR title and the files you change
 need to set them manually.
 
 **Type label** — set from the `[tag]` in your title:
-`type: feat`, `type: bugfix`, `type: refactor`, `type: perf`, `type: ci`, `type: docs`,
-`type: misc`, `type: new-model`
+`type: feat`, `type: bugfix`, `type: refactor`, `type: perf`, `type: ci`, `type: infra`,
+`type: docs`, `type: misc`, `type: new-model`, `type: skill`
 
 **Scope labels** — set from which files you modified (multiple labels can apply):
 `scope: training`, `scope: inference`, `scope: attention`, `scope: kernel`, `scope: data`,
@@ -187,8 +191,8 @@ Common quick fixes:
 Update your title to start with a valid type tag. The Mergify merge protection check
 re-evaluates automatically after you save the title.
 
-Valid tags: `feat`, `feature`, `bugfix`, `fix`, `refactor`, `perf`, `ci`, `doc`, `docs`,
-`misc`, `chore`, `kernel`, `new-model`
+Valid tags: `feat`, `feature`, `bugfix`, `fix`, `refactor`, `perf`, `ci`, `infra`, `doc`,
+`docs`, `misc`, `chore`, `kernel`, `new-model`, `skill`, `skills`
 
 ### My PR has merge conflicts (`needs-rebase` label)