@fitlab-ai/agent-infra 0.5.6 → 0.5.8

package/templates/.agents/skills/close-codescan/SKILL.en.md

@@ -61,7 +61,7 @@ Confirm? (y/N)
 
 Dismiss the alert by following the Code Scanning dismiss command in `.agents/rules/security-alerts.md`, passing the mapped `{api-reason}` and the user's explanation.
 
-**API reason mapping** (per the GitHub Code Scanning API):
+**API reason mapping** (per the Code Scanning API):
 - False Positive -> `false positive`
 - Won't Fix -> `won't fix`
 - Used in Tests -> `used in tests`
@@ -84,7 +84,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 
 ### 8. Inform User
 
-> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent.
+> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name).
 
 ```
 Code Scanning alert #{alert-number} dismissed.
@@ -96,7 +96,7 @@ Explanation: {explanation}
 
 View: {html_url}
 
-Note: it can be reopened on GitHub if necessary.
+Note: it can be reopened on the platform if necessary.
 
 Next step - complete and archive the task if a related task exists:
   - Claude Code / OpenCode: /complete-task {task-id}

package/templates/.agents/skills/close-codescan/SKILL.zh-CN.md

@@ -61,7 +61,7 @@ Code Scanning 告警 #{alert-number}
 
 按 `.agents/rules/security-alerts.md` 中的 Code Scanning 告警关闭命令执行关闭操作，并传入映射后的 `{api-reason}` 与用户说明。
 
-**API reason 映射**（按 GitHub Code Scanning API）：
+**API reason 映射**（按 Code Scanning API）：
 - 误报 -> `false positive`
 - 不会修复 -> `won't fix`
 - 测试代码 -> `used in tests`
@@ -84,7 +84,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 
 ### 8. 告知用户
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。
+> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。
 
 ```
 Code Scanning 告警 #{alert-number} 已关闭。
@@ -96,7 +96,7 @@ Code Scanning 告警 #{alert-number} 已关闭。
 
 查看：{html_url}
 
-注意：如有需要，可在 GitHub 上重新打开。
+注意：如有需要，可在 平台上重新打开。
 
 下一步 - 完成并归档任务（如有关联任务）：
   - Claude Code / OpenCode：/complete-task {task-id}

package/templates/.agents/skills/close-dependabot/SKILL.en.md

@@ -92,7 +92,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 
 ### 8. Inform User
 
-> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent.
+> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name).
 
 ```
 Security alert #{alert-number} dismissed.

package/templates/.agents/skills/close-dependabot/SKILL.zh-CN.md

@@ -92,7 +92,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 
 ### 8. 告知用户
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。
+> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。
 
 ```
 安全告警 #{alert-number} 已关闭。

package/templates/.agents/skills/commit/SKILL.en.md

@@ -44,7 +44,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 
 > The full four-case status matrix, prerequisite checks, and multi-TUI next-step commands live in `reference/task-status-update.md`. Read `reference/task-status-update.md` before updating task state.
 
-> **IMPORTANT**: When showing the next step, output every TUI command format in full and directly use the standard template from `reference/task-status-update.md`.
+> **IMPORTANT**: When showing the next step, output every TUI command format in full and directly use the standard template from `reference/task-status-update.md`. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name).
 
 Append the Commit Activity Log entry and choose exactly one next-step case:
 - final commit -> `complete-task {task-id}`
@@ -64,7 +64,7 @@ Failure handling matches "Update Task Status When Applicable": warn, but do **no
 
 ## 7. Sync PR Summary When Applicable
 
-When `{task-id}` exists and task.md contains a valid `pr_number`, refresh the PR summary comment `<!-- sync-pr:{task-id}:summary -->` on the PR. Otherwise, skip this step.
+When `{task-id}` exists and task.md contains a valid `pr_number`, refresh the PR summary comment marked with the PR summary marker defined in `.agents/rules/pr-sync.md` on the PR. Otherwise, skip this step.
 
 > The full trigger conditions, aggregation rules, PATCH/POST flow, shell-safety constraints, and error handling live in `reference/pr-summary-sync.md` (which in turn points to `.agents/rules/pr-sync.md`). Read `reference/pr-summary-sync.md` before executing this step.
 >

package/templates/.agents/skills/commit/SKILL.zh-CN.md

@@ -44,7 +44,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 
 > 完整的 4 种状态分支、前置条件检查和多 TUI 下一步命令见 `reference/task-status-update.md`。更新任务状态前，先读取 `reference/task-status-update.md`。
 
-> **重要**：向用户展示下一步时，必须完整输出所有 TUI 命令格式，并直接使用 `reference/task-status-update.md` 中对应场景的标准模板。
+> **重要**：向用户展示下一步时，必须完整输出所有 TUI 命令格式，并直接使用 `reference/task-status-update.md` 中对应场景的标准模板。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。
 
 追加 Commit 的 Activity Log，并且只能选择一个下一步分支：
 - 最终提交 -> `complete-task {task-id}`
@@ -64,7 +64,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 
 ## 7. 同步 PR 摘要（按需）
 
-当 `{task-id}` 存在且 task.md 包含有效 `pr_number` 时，刷新 PR 上的 `<!-- sync-pr:{task-id}:summary -->` 摘要评论；否则跳过。
+当 `{task-id}` 存在且 task.md 包含有效 `pr_number` 时，刷新 PR 上由 `.agents/rules/pr-sync.md` 中定义的 PR 摘要评论标记对应的摘要评论；否则跳过。
 
 > 完整的触发条件、聚合规则、PATCH/POST 流程、Shell 安全约束和错误处理见 `reference/pr-summary-sync.md`（其内联引用 `.agents/rules/pr-sync.md`）。执行此步骤前先读取 `reference/pr-summary-sync.md`。
 >

package/templates/.agents/skills/commit/config/verify.json

@@ -21,7 +21,8 @@
       "when": "pr_number_exists",
       "expected_pr_comment_marker": "<!-- sync-pr:{task-id}:summary -->",
       "verify_in_labels_computed": true,
-      "verify_pr_comment_last_commit_matches_head": true
+      "verify_pr_comment_last_commit_matches_head": true,
+      "expected_pr_comment_marker_key": "prSummary"
     }
   }
 }

package/templates/.agents/skills/complete-task/SKILL.en.md

@@ -93,7 +93,7 @@ If a valid `issue_number` exists:
 - First scan and backfill unpublished `task.md`, `analysis*.md`, `plan*.md`, `implementation*.md`, `review*.md`, and `refinement*.md` comments using the backfill rules in `.agents/rules/issue-sync.md` (`task.md` uses the idempotent update path)
 - Backfill checked `## Requirements` items to the Issue body by following the requirements-checkbox sync steps in issue-sync.md
 - Do not set any `status:` label — status labels are automatically cleared when the Issue is closed
-- Finally create or update the summary comment marked with `<!-- sync-issue:{task-id}:summary -->`
+- Finally create or update the summary comment marked with the summary marker defined in `.agents/rules/issue-sync.md`
 
 ### 7. Verification Gate
 

package/templates/.agents/skills/complete-task/SKILL.zh-CN.md

@@ -93,7 +93,7 @@ ls .agents/workspace/completed/{task-id}/task.md
 - 先按 `.agents/rules/issue-sync.md` 的补发规则扫描并补发未发布的 `task.md`、`analysis*.md`、`plan*.md`、`implementation*.md`、`review*.md`、`refinement*.md` 评论（`task.md` 走幂等更新路径）
 - 按 issue-sync.md 的需求复选框同步步骤，兜底同步 `## 需求` 中已勾选的条目到 Issue body
 - 不要设置 `status:` label — Issue 关闭后 status label 会被自动清除
-- 最后创建或更新 `<!-- sync-issue:{task-id}:summary -->` 标记的 summary 评论
+- 最后创建或更新 `.agents/rules/issue-sync.md` 中定义的 summary 评论标记对应的 summary 评论
 
 ### 7. 完成校验
 

package/templates/.agents/skills/complete-task/config/verify.json

@@ -29,7 +29,8 @@
       "verify_task_comment_content": true,
       "sync_checked_requirements": true,
       "verify_issue_type": true,
-      "verify_milestone": true
+      "verify_milestone": true,
+      "expected_comment_marker_key": "summary"
     }
   }
 }

package/templates/.agents/skills/create-issue/SKILL.en.md

@@ -1,18 +1,18 @@
 ---
 name: create-issue
-description: "Create a GitHub Issue from a task file"
+description: "Create an Issue from a task file"
 ---
 
 # Create Issue
 
-Create the base GitHub Issue from `task.md` and write `issue_number` back to the task.
+Create the base Issue from `task.md` and write `issue_number` back to the task.
 
 ## Boundary / Critical Rules
 
 - Build the Issue title and body from `task.md` only
 - Issue title format: `type(scope): description` - map `type` from task.md (`feature` -> `feat`, `bugfix` -> `fix`, `refactor` -> `refactor`, `docs` -> `docs`, `chore` -> `chore`), infer scope from the affected module (omit it if unclear), and use the task title from task.md verbatim for the description (do not translate or rewrite)
 - Do not read `analysis.md`, `plan.md`, `implementation.md`, or review artifacts
-- The only durable outputs are the GitHub Issue and the `issue_number` update in task.md
+- The only durable outputs are the Issue and the `issue_number` update in task.md
 - After executing this skill, you **must** immediately update task.md
 
 ## Steps
@@ -31,7 +31,7 @@ Extract the title, `## Description`, `## Requirements`, `type`, and `milestone`
 
 ### 3. Build Issue Content
 
-Detect `.github/ISSUE_TEMPLATE` files and decide whether to use a matched template path or the fallback path.
+Detect Issue templates through `.agents/rules/issue-pr-commands.md` and decide whether to use a matched template path or the fallback path.
 
 > Template detection, field mapping for `textarea`, `input`, `dropdown`, and `checkboxes`, and the fallback body rules live in `reference/template-matching.md`. Read `reference/template-matching.md` before building the body.
 
@@ -57,7 +57,7 @@ Write back `issue_number`, update `updated_at`, and append the Create Issue Acti
 
 If artifact files already exist in the task directory, backfill them in this order:
 
-1. `task.md` -> `<!-- sync-issue:{task-id}:task -->` comment (idempotent create or update)
+1. `task.md` -> the task comment marker defined in `.agents/rules/issue-sync.md` (idempotent create or update)
 2. Backfill existing `analysis*.md`, `plan*.md`, `implementation*.md`, `review*.md`, and `refinement*.md` files in filename order
 
 Every backfill action must follow the raw publishing, task.md sync, and chunking rules in `.agents/rules/issue-sync.md`.
@@ -81,7 +81,7 @@ Keep the gate output in your reply as fresh evidence. Do not claim completion wi
 
 > Execute this step only after the verification gate passes.
 
-> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent.
+> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name).
 
 Show the Issue number, URL, labels, Issue Type, milestone result, confirm that `issue_number` was written back, and include the next-step commands in every TUI format:
 
@@ -94,11 +94,11 @@ Next step - run requirements analysis:
 
 ## Completion Checklist
 
-- [ ] Created the GitHub Issue
+- [ ] Created the Issue
 - [ ] Used `task.md` as the only content source
 - [ ] Recorded `issue_number` in task.md
 - [ ] Updated `updated_at` and appended the Activity Log entry
-- [ ] Included all TUI formats for the next-step commands
+- [ ] Included all TUI formats, including any custom TUIs, for the next-step commands
 
 ## STOP
 
@@ -106,13 +106,13 @@ Stop after the checklist. Do not start detailed progress sync here.
 
 ## Notes
 
-- `create-issue` creates the base Issue; later status, comments, and checkboxes are maintained by workflow skills and GitHub Actions
+- `create-issue` creates the base Issue; later status, comments, and checkboxes are maintained by workflow skills and platform automation
 - If no valid labels survive filtering, create the Issue without labels instead of failing
 - If Issue Type or milestone setup fails, continue and record the fallback outcome
 
 ## Error Handling
 
 - Task not found: `Task {task-id} not found`
-- GitHub CLI unavailable or unauthenticated
+- the platform CLI unavailable or unauthenticated
 - Empty description in task.md
 - Issue creation failure

package/templates/.agents/skills/create-issue/SKILL.zh-CN.md

@@ -1,18 +1,18 @@
 ---
 name: create-issue
-description: "从任务文件创建 GitHub Issue"
+description: "从任务文件创建 Issue"
 ---
 
 # 创建 Issue
 
-仅从 `task.md` 创建基础 GitHub Issue，并把 `issue_number` 回写到任务文件。
+仅从 `task.md` 创建基础 Issue，并把 `issue_number` 回写到任务文件。
 
 ## 行为边界 / 关键规则
 
 - Issue 标题和正文只能来自 `task.md`
 - Issue 标题格式为 `type(scope): 描述`——type 从 task.md 的 `type` 字段映射（feature→feat, bugfix→fix, refactor→refactor, docs→docs, chore→chore），scope 从受影响模块推断（无法确定时省略），描述使用 task.md 中的任务标题原文（不要翻译或改写）
 - 不要读取 `analysis.md`、`plan.md`、`implementation.md` 或审查产物
-- 持久产物只有 GitHub Issue 本身，以及 task.md 中的 `issue_number` 更新
+- 持久产物只有 Issue 本身，以及 task.md 中的 `issue_number` 更新
 - 执行本技能后，你**必须**立即更新 task.md
 
 ## 执行步骤
@@ -31,7 +31,7 @@ description: "从任务文件创建 GitHub Issue"
 
 ### 3. 构建 Issue 内容
 
-检测 `.github/ISSUE_TEMPLATE`，决定使用模板路径还是 fallback 路径。
+通过 `.agents/rules/issue-pr-commands.md` 检测 Issue 模板，决定使用模板路径还是 fallback 路径。
 
 > 模板识别、`textarea`、`input`、`dropdown`、`checkboxes` 字段映射，以及 fallback 正文规则见 `reference/template-matching.md`。构建正文前先读取 `reference/template-matching.md`。
 
@@ -57,7 +57,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 
 如果任务目录中已存在产物文件，按以下顺序补发：
 
-1. `task.md` → `<!-- sync-issue:{task-id}:task -->` 评论（幂等创建或更新）
+1. `task.md` → `.agents/rules/issue-sync.md` 中定义的 task 评论标记（幂等创建或更新）
 2. 按文件名排序补发已存在的 `analysis*.md`、`plan*.md`、`implementation*.md`、`review*.md`、`refinement*.md`
 
 所有补发动作都必须遵循 `.agents/rules/issue-sync.md` 的原文发布、task.md 同步和分片规则。
@@ -81,7 +81,7 @@ node .agents/scripts/validate-artifact.js gate create-issue .agents/workspace/ac
 
 > 仅在校验通过后执行本步骤。
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。
+> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。
 
 展示 Issue 编号、URL、labels、Issue Type、milestone 结果，确认 `issue_number` 已回写，并完整输出所有 TUI 里的下一步命令：
 
@@ -94,11 +94,11 @@ node .agents/scripts/validate-artifact.js gate create-issue .agents/workspace/ac
 
 ## 完成检查清单
 
-- [ ] 已创建 GitHub Issue
+- [ ] 已创建 Issue
 - [ ] 已仅使用 `task.md` 作为内容来源
 - [ ] 已在 task.md 中记录 `issue_number`
 - [ ] 已更新 `updated_at` 并追加 Activity Log
-- [ ] 已输出所有 TUI 格式的下一步命令
+- [ ] 已输出所有 TUI 格式的下一步命令（含自定义 TUI）
 
 ## 停止
 
@@ -106,13 +106,13 @@ node .agents/scripts/validate-artifact.js gate create-issue .agents/workspace/ac
 
 ## 注意事项
 
-- `create-issue` 只负责创建基础 Issue；后续状态、评论和复选框由工作流技能与 GitHub Actions 维护
+- `create-issue` 只负责创建基础 Issue；后续状态、评论和复选框由工作流技能与 platform automation 维护
 - 如果过滤后没有有效 label，允许不带 label 创建 Issue
 - 如果 Issue Type 或 milestone 设置失败，继续执行并记录结果
 
 ## 错误处理
 
 - 任务未找到：`Task {task-id} not found`
-- GitHub CLI 不可用或未认证
+- the platform CLI 不可用或未认证
 - task.md 的描述为空
 - 创建 Issue 失败

package/templates/.agents/skills/create-issue/config/verify.json

@@ -23,7 +23,8 @@
       "issue_must_exist": true,
       "verify_task_comment_content": true,
       "verify_issue_type": true,
-      "verify_milestone": true
+      "verify_milestone": true,
+      "expected_status_label_key": "waitingForTriage"
     }
   }
 }

package/templates/.agents/skills/create-issue/reference/label-and-type.en.md

@@ -17,11 +17,11 @@ Recommended fallback:
 - [ ] {requirement-2}
 ```
 
-Map task types to GitHub labels and Issue Types, but keep only labels that actually exist.
+Map task types to labels and Issue Types, but keep only labels that actually exist.
 
 Fallback label mapping:
 
-| task.md type | GitHub label |
+| task.md type | label |
 |---|---|
 | `bug`, `bugfix` | `type: bug` |
 | `feature` | `type: feature` |
@@ -34,7 +34,7 @@ Fallback label mapping:
 
 Issue Type fallback mapping:
 
-| task.md type | GitHub Issue Type |
+| task.md type | Issue Type |
 |---|---|
 | `bug`, `bugfix` | `Bug` |
 | `feature`, `enhancement` | `Feature` |

package/templates/.agents/skills/create-issue/reference/label-and-type.zh-CN.md

@@ -17,11 +17,11 @@
 - [ ] {requirement-2}
 ```
 
-将任务类型映射到 GitHub label 和 Issue Type，但只保留仓库里实际存在的 label。
+将任务类型映射到 label 和 Issue Type，但只保留仓库里实际存在的 label。
 
 Fallback label 映射：
 
-| task.md type | GitHub label |
+| task.md type | label |
 |---|---|
 | `bug`, `bugfix` | `type: bug` |
 | `feature` | `type: feature` |
@@ -34,7 +34,7 @@ Fallback label 映射：
 
 Issue Type fallback 映射：
 
-| task.md type | GitHub Issue Type |
+| task.md type | Issue Type |
 |---|---|
 | `bug`, `bugfix` | `Bug` |
 | `feature`, `enhancement` | `Feature` |

package/templates/.agents/skills/create-issue/reference/template-matching.en.md

@@ -1,45 +1,17 @@
 # Issue Template Matching
 
-Read this file before deciding how to build the Issue body from `.github/ISSUE_TEMPLATE`.
+Read this file before deciding how to build the Issue body.
 
 ## Detect Issue Templates
 
-Search project templates with:
+Issue template detection is platform-specific. Read `.agents/rules/issue-pr-commands.md` and follow the template detection section provided by the configured platform.
 
-```bash
-rg --files .github/ISSUE_TEMPLATE -g '*.yml' -g '!config.yml'
-```
-
-If templates exist, inspect their top-level `name:` fields and choose the best match for the task title and description.
-
-Typical candidate templates:
-- `bug_report.yml` for bug work
-- `question.yml` for question or investigation work
-- `feature_request.yml` for feature work
-- `documentation.yml` for documentation work
-- `other.yml` as the general fallback
+If templates exist, inspect their top-level names and choose the best match for the task title and description. Use the candidate template guidance provided by the configured platform rule when available.
 
 If no template matches clearly, choose the nearest candidate. If templates are missing, unreadable, or parsing fails, fall back to the default body path.
 
 ## Build the Body from the Matched Template
 
-Read the matched template's:
-- `name`
-- `type:`
-- `labels:`
-- `body:`
-
-Field handling rules:
-- `textarea` and `input`: use `attributes.label` as the markdown heading and fill values from task.md
-- `markdown`: skip template explanation prose
-- `dropdown` and `checkboxes`: skip
-- when task.md lacks a suitable value, write `N/A`
-
-Suggested field mapping:
-
-| Template field hint | task.md source |
-|---|---|
-| `summary`, `title` | task title |
-| `description`, `problem`, `what happened`, `issue-description`, `current-content` | task description |
-| `solution`, `requirements`, `steps`, `suggested-content`, `impact`, `context`, `alternatives`, `expected` | requirements list |
-| other `textarea` / `input` fields | task description, otherwise `N/A` |
+Build the body by following the field handling and field mapping guidance provided by the configured platform section in `.agents/rules/issue-pr-commands.md`.
+
+When platform guidance is unavailable, use the default body path.

package/templates/.agents/skills/create-issue/reference/template-matching.zh-CN.md

@@ -1,45 +1,17 @@
 # Issue 模板匹配
 
-在决定如何从 `.github/ISSUE_TEMPLATE` 构建 Issue 正文之前先读取本文件。
+在决定如何构建 Issue 正文前先读取本文件。
 
-## 探测 Issue 模板
+## 检测 Issue 模板
 
-用下面的命令搜索项目模板：
+Issue 模板检测属于平台相关逻辑。先读取 `.agents/rules/issue-pr-commands.md`，并按当前配置平台提供的模板检测章节执行。
 
-```bash
-rg --files .github/ISSUE_TEMPLATE -g '*.yml' -g '!config.yml'
-```
+如果存在模板，检查其顶层名称，并根据任务标题和描述选择最匹配的模板。可用时，使用当前配置平台规则提供的候选模板指引。
 
-如果模板存在，检查其顶层 `name:` 字段，并为当前任务标题和描述选择最匹配的模板。
+如果没有清晰匹配，选择最接近的候选模板。模板不存在、无法读取或解析失败时，回退到默认正文路径。
 
-常见候选模板：
-- `bug_report.yml`：用于 bug 类工作
-- `question.yml`：用于问题排查或调研类工作
-- `feature_request.yml`：用于功能类工作
-- `documentation.yml`：用于文档类工作
-- `other.yml`：通用 fallback
+## 从匹配模板构建正文
 
-如果没有明显匹配的模板，选择最接近的候选项。如果模板缺失、不可读取或解析失败，就回退到默认正文路径。
+按 `.agents/rules/issue-pr-commands.md` 中当前配置平台章节提供的字段处理和字段映射指引构建正文。
 
-## 使用匹配到的模板构建正文
-
-读取匹配模板中的：
-- `name`
-- `type:`
-- `labels:`
-- `body:`
-
-字段处理规则：
-- `textarea` 和 `input`：使用 `attributes.label` 作为 Markdown 标题，并从 task.md 填充值
-- `markdown`：跳过模板解释性文字
-- `dropdown` 和 `checkboxes`：跳过
-- 当 task.md 没有合适值时，写入 `N/A`
-
-建议字段映射：
-
-| 模板字段提示 | task.md 来源 |
-|---|---|
-| `summary`, `title` | 任务标题 |
-| `description`, `problem`, `what happened`, `issue-description`, `current-content` | 任务描述 |
-| `solution`, `requirements`, `steps`, `suggested-content`, `impact`, `context`, `alternatives`, `expected` | 需求列表 |
-| 其他 `textarea` / `input` 字段 | 优先使用任务描述，否则写 `N/A` |
+如果平台指引不可用，使用默认正文路径。

package/templates/.agents/skills/create-pr/SKILL.en.md

@@ -26,7 +26,7 @@ Use the explicit argument when provided. Otherwise infer the target branch from
 
 ### 3. Prepare the PR Body
 
-Read `.github/PULL_REQUEST_TEMPLATE.md` when it exists, review recent merged PRs for style, and gather all commits between `<target-branch>` and `HEAD`.
+Read the PR template through `.agents/rules/issue-pr-commands.md`, review recent merged PRs for style, and gather all commits between `<target-branch>` and `HEAD`.
 
 > Template handling, HEREDOC body generation, and `Generated with AI assistance` requirements live in `reference/pr-body-template.md`. Read `reference/pr-body-template.md` before writing the PR body.
 
@@ -93,7 +93,7 @@ Keep the gate output in your reply as fresh evidence. Do not claim completion wi
 
 > Execute this step only after the verification gate passes.
 
-> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent.
+> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name).
 
 Explain the created PR URL, summarize metadata sync and summary-comment results, and recommend `complete-task {task-id}` once the workflow is truly done.
 
@@ -101,7 +101,7 @@ Explain the created PR URL, summarize metadata sync and summary-comment results,
 
 - Review every commit in the branch, not only the latest one
 - `create-pr` must not defer type-label mapping to another skill; inline the mapping here when `{task-id}` is available
-- Keep the hidden summary marker as `<!-- sync-pr:{task-id}:summary -->` for compatibility with existing PR comments
+- Keep the hidden summary marker as the PR summary marker defined in `.agents/rules/pr-sync.md` for compatibility with existing PR comments
 - If the current branch already has a PR, show its URL and stop without repeating sync work
 - When metadata inheritance from the Issue fails, continue with task.md and branch-based fallbacks
 

package/templates/.agents/skills/create-pr/SKILL.zh-CN.md

@@ -26,7 +26,7 @@ description: "创建 Pull Request 到目标分支"
 
 ### 3. 准备 PR 正文
 
-读取 `.github/PULL_REQUEST_TEMPLATE.md`（如存在），参考最近合并的 PR 风格，并收集 `<target-branch>` 到 `HEAD` 的全部提交。
+通过 `.agents/rules/issue-pr-commands.md` 读取 PR 模板，参考最近合并的 PR 风格，并收集 `<target-branch>` 到 `HEAD` 的全部提交。
 
 > 模板处理、HEREDOC 正文生成和 `Generated with AI assistance` 要求见 `reference/pr-body-template.md`。编写正文前先读取 `reference/pr-body-template.md`。
 
@@ -93,7 +93,7 @@ node .agents/scripts/validate-artifact.js gate create-pr .agents/workspace/activ
 
 > 仅在校验通过后执行本步骤。
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。
+> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。
 
 说明 PR URL、元数据同步结果、摘要评论结果，并在工作流真正完成后推荐执行 `complete-task {task-id}`。
 
@@ -101,7 +101,7 @@ node .agents/scripts/validate-artifact.js gate create-pr .agents/workspace/activ
 
 - 必须检查分支中的全部提交，而不是只看最后一个
 - `create-pr` 不能把 type label 映射委托给其他技能，必须在获取到 `{task-id}` 时于本技能内内联处理
-- 隐藏 summary 标记必须保持 `<!-- sync-pr:{task-id}:summary -->` 以兼容已有 PR 评论
+- 隐藏 summary 标记必须保持为 `.agents/rules/pr-sync.md` 中定义的 PR 摘要评论标记，以兼容已有 PR 评论
 - 如果当前分支已存在 PR，直接告知用户 PR URL 并结束，不做重复同步
 - 如果从 Issue 继承元数据失败，继续使用 task.md 和分支推断兜底
 

package/templates/.agents/skills/create-pr/config/verify.json

@@ -23,7 +23,8 @@
       "verify_in_labels_match_pr": true,
       "verify_pr_type_label": true,
       "verify_pr_assignee": true,
-      "verify_milestone": true
+      "verify_milestone": true,
+      "expected_pr_comment_marker_key": "prSummary"
     }
   }
 }

package/templates/.agents/skills/create-pr/reference/pr-body-template.en.md

@@ -4,15 +4,11 @@ Read this file before generating the PR title and body.
 
 ## Read the PR Template
 
-Read `.github/PULL_REQUEST_TEMPLATE.md` from the repository. If it does not exist, use the standard format.
+PR template discovery is platform-specific. Read `.agents/rules/issue-pr-commands.md` and follow the PR template section provided by the configured platform. If no template is available, use the standard format.
 
 ## Review Recent Merged PRs for Reference
 
-```bash
-gh pr list --limit 3 --state merged --json number,title,body
-```
-
-Use the recent merged PRs as style and formatting references.
+Use the recent merged PR query from `.agents/rules/issue-pr-commands.md` as style and formatting reference input.
 
 ## Analyze Current Branch Changes
 
@@ -27,19 +23,13 @@ git diff <target-branch>...HEAD
 
 Read `.agents/rules/issue-pr-commands.md` before this step.
 
-Before syncing linked Issue metadata, complete authentication and code-hosting platform detection through that rule. Keep `gh pr list` / `gh pr create` on the current repository.
-
-Before syncing labels, verify the standard label system:
-
-```bash
-gh label list --search "type:" --limit 1 --json name --jq 'length'
-```
+Before syncing linked Issue metadata, complete authentication and code-hosting platform detection through that rule.
 
-If the result is `0`, run `init-labels` before retrying metadata sync.
+Before syncing labels, verify the standard label system by following the label-list command in `.agents/rules/issue-pr-commands.md`. If the result shows no standard type labels, run `init-labels` before retrying metadata sync.
 
 Type label mapping:
 
-| task.md type | GitHub label |
+| task.md type | label |
 |---|---|
 | `bug`, `bugfix` | `type: bug` |
 | `feature` | `type: feature` |
@@ -54,7 +44,7 @@ Metadata sync order:
 1. query Issue labels and milestone via the Issue read command in `.agents/rules/issue-pr-commands.md`
 2. build `{label-args}` from the mapped type label, non-`type:` / non-`status:` Issue labels, and the current Issue `in:` labels (commit already computed them, so do not recompute them here and do not write back to the Issue)
 3. build `{milestone-arg}` by following "Phase 3: `create-pr`" in `.agents/rules/milestone-inference.md` and reusing the Issue milestone directly
-4. pass `{label-args}` and `{milestone-arg}` atomically to `gh pr create` by using the create-PR command template and permission-degradation rules in `.agents/rules/issue-pr-commands.md`
+4. pass `{label-args}` and `{milestone-arg}` atomically by using the create-PR command template and permission-degradation rules in `.agents/rules/issue-pr-commands.md`
 5. ensure the PR body contains `Closes #{issue-number}` or an equivalent closing keyword
 
 If those rules say to skip the direct metadata arguments above, keep only the PR body linkage plus later comment sync.
@@ -72,7 +62,7 @@ Milestone rule:
 - Replace `{$IssueNumber}` in the template when present
 - End the PR body with `Generated with AI assistance`
 
-Create the PR with the "Create a PR" command template in `.agents/rules/issue-pr-commands.md`.
+Create the PR with the create-PR command template in `.agents/rules/issue-pr-commands.md`.
 
 Final user output should include this follow-up path: