This is an automated email from the ASF dual-hosted git repository.
hello-stephen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new a415c09d6d2 [chore](build) Have agents use Doris development and PR
skills (#70422)
a415c09d6d2 is described below
commit a415c09d6d28571a6623739884e587df166ac432
Author: Mingyu Chen (Rayner) <[email protected]>
AuthorDate: Wed Nov 18 14:03:23 2026 +0800
[chore](build) Have agents use Doris development and PR skills (#70422)
### Background
`doris-skills` is the Apache Doris repository of agent skills, included
here as a submodule. Its `develop-with-evidence` skill develops and
verifies a change and leaves a PR handoff file; `doris-pr-description`
writes and submits the PR. Coding agents such as Claude Code and Codex
read `AGENTS.md` when a session starts.
### What problem does this PR solve?
Issue Number: None
Related PR: #70175 (introduced the PR guidance), #70582 (updated the
skills submodule), #70672 (documented the worktree skill paths),
apache/doris-skills#16 (added both skills)
PR Type: Build/CI/Chore
Problem Summary:
The worktree guidance now names the skill paths, but does not tell
agents when to use them, so developers still have to request the skills
explicitly. This PR makes `develop-with-evidence` the default for
repository changes and `doris-pr-description` the default for PR tasks,
unless the user asks otherwise. The contributor guides and PR template
give people the same recommendation. Doris runtime behavior is
unchanged.
### Details
- **Affected:** Four documentation files: `AGENTS.md`, both contributor
guides, and the PR template. Build scripts, CI workflows, and the
submodule pointer are unchanged.
- **Developer and release impact:** Agents that read `AGENTS.md` receive
explicit task routing and instructions for checking out missing skills.
Contributors see the same recommendation and can optionally fetch newer
skills with `--remote`, while keeping the moved pointer out of commits.
Releases are unchanged.
- **License and third-party:** None; no dependency, artifact, or license
file changes.
- **Rollback:** Revert this PR; no other cleanup is required.
### Testing
- After rebasing onto `bb6fff5077e4`, checked that all four
documentation patches match the original PR, that the final diff
contains only 17 added lines, and that the `doris-skills` pointer
matches master at `c353d71bc50d`.
- The author previously verified submodule initialization and both skill
paths at `0b36dcb`, and agent routing in throwaway sparse clones with
Claude Code 2.1.322 and Codex 0.163.0. These checks predate this rebase
and were not rerun; they covered initial skill selection, not a complete
development and PR submission.
- No Doris build or runtime tests were run for this documentation
change.
### Notes for Reviewers
- Master already contains the original submodule bump and a newer
commit. The rebase retains master's `c353d71bc50d` pointer, which
descends from the original PR's `0b36dcb`; this PR now changes
documentation only.
- Existing worktree instructions for loading the skills remain intact.
### Release note
None
### Check List (For Author)
- Behavior changed: No
- Does this need documentation: No
- Pre-submission status: Partially verified: agent routing checks
predate this rebase and were not rerun.
### AI Disclosure
- Tool: Claude Code (Claude Opus 5.5); Codex (GPT-6)
- Generated: Claude Code wrote the original documentation and
description; Codex resolved the rebase conflict and updated the title
and description.
- Human review: not stated
- Prompts: Update doris-skills and recommend the two skills so agents
use them automatically for development and PR submission. Then rebase,
resolve conflicts, and update the PR.
Co-authored-by: Claude Opus 5.5 <[email protected]>
---
.github/PULL_REQUEST_TEMPLATE.md | 2 ++
AGENTS.md | 11 +++++++++++
CONTRIBUTING.md | 2 ++
CONTRIBUTING_CN.md | 2 ++
4 files changed, 17 insertions(+)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 204f435726c..d2144acdc3e 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,5 @@
+<!-- Recommended: develop the change with the develop-with-evidence skill and
write this description with the doris-pr-description skill, both from
https://github.com/apache/doris-skills (the doris-skills submodule of this
repository). -->
+
### Background
<!-- How the feature or module this PR touches works today, in two to four
plain sentences, for a reviewer who doesn't know it. Link the user doc if there
is one. Leave the problem and the fix to Problem Summary. -->
diff --git a/AGENTS.md b/AGENTS.md
index c6859af9799..5875d3ce45b 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -2,6 +2,17 @@
This is the codebase for Apache Doris, an MPP OLAP database. It primarily
consists of the Backend module BE (`be/`, execution and storage engine), the
Frontend module FE (`fe/`, optimizer and transaction core), and the Cloud
module (`cloud/`, storage-compute separation). Your basic development workflow
is: modify code, build using standard procedures, add and run tests, and submit
relevant changes.
+## Development and PR Skills
+
+Unless the user asks otherwise, work through two skills from the
`doris-skills` submodule
([apache/doris-skills](https://github.com/apache/doris-skills)):
+
+- `develop-with-evidence` for any task that changes this repository, such as
fixing a bug, developing a feature, refactoring, optimizing, or changing tests,
CI, configs, or dependencies.
+- `doris-pr-description` for any task that opens or updates a PR, or writes or
checks a PR title and description.
+
+A request such as "fix this and submit a PR" takes both, in that order:
`develop-with-evidence` leaves a handoff file under `.git/pr-handoff/` with a
description draft, which the commit message follows (see Commit Standards), and
`doris-pr-description` opens the PR from it.
+
+If your tool has not installed these skills, read
`doris-skills/skills/develop-with-evidence/SKILL.md` or
`doris-skills/skills/doris-pr-description/SKILL.md` when the task reaches that
skill, and follow it; paths in a skill are relative to its own directory. An
empty `doris-skills/` means the submodule is not checked out: run `git
submodule update --init doris-skills` first, and if that fails, for example
without network access, ask the user to run it. Leave a moved `doris-skills`
pointe [...]
+
## Security Threat Model
For security scans, vulnerability triage, security reviews, and changes
involving authentication, authorization, network boundaries, external catalogs,
cloud tenancy, or other security-sensitive behavior, read `SECURITY.md` first,
then follow it to `threat-model.md`. Use `threat-model.md` to determine
in-scope components, trust boundaries, attacker roles, explicit non-goals, and
triage classification. Findings that are out of model or by design under
`threat-model.md` should be reported [...]
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d4b49b18058..a01c8ba2ea9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -73,3 +73,5 @@ You can download the code, compile and install it, deploy and
run it for a try (
Whether it's fixing Bugs or adding Features, we're all very welcome. If you
want to submit code to Doris, you need to create a new branch for your
submitted code from the fork code library on GitHub to your project space, add
the source project upstream, and submit PR.
About how to submit a PR refer to [Pull
Request](https://doris.apache.org/community/how-to-contribute/pull-request/).
+
+If you work with an AI coding agent, we recommend two skills from
[apache/doris-skills](https://github.com/apache/doris-skills):
`develop-with-evidence` to develop and verify the change, and
`doris-pr-description` to write the PR title and description by the Doris PR
standard and open the PR. Agents that read [AGENTS.md](AGENTS.md), such as
Claude Code and Codex, use them on their own: start the agent in your Doris
checkout and ask it to fix or develop something and submit a PR. The skil [...]
diff --git a/CONTRIBUTING_CN.md b/CONTRIBUTING_CN.md
index 8078cd159bc..1fe0b8733c3 100644
--- a/CONTRIBUTING_CN.md
+++ b/CONTRIBUTING_CN.md
@@ -72,3 +72,5 @@ under the License.
无论是修复 Bug 还是增加 Feature,我们都非常欢迎。如果您希望给 Doris 提交代码,您需要从 GitHub 上 fork
代码库至您的项目空间下,为您提交的代码创建一个新的分支,添加源项目为upstream,并提交PR。
提交PR的方式可以参考文档 [Pull
Request](https://doris.apache.org/zh-CN/community/how-to-contribute/pull-request/)。
+
+如果您借助 AI 编程助手开发,建议优先使用
[apache/doris-skills](https://github.com/apache/doris-skills) 中的两个 skill:用
`develop-with-evidence` 开发并验证改动,用 `doris-pr-description` 按 Doris 的 PR 规范撰写 PR
标题和描述并提交 PR。会读取 [AGENTS.md](AGENTS.md) 的助手(如 Claude Code、Codex)会自动使用它们:在 Doris
代码目录中启动助手,直接让它修复或开发某个问题并提交 PR 即可。这两个 skill 来自 `doris-skills`
子模块,助手发现缺失时会自行检出。如需自己检出(例如助手没有网络权限时),执行 `git submodule update --init
doris-skills`;加上 `--remote` 可以取 doris-skills 的最新版本而不是本仓库钉住的版本,此时不要把变动的
`doris-skills` 指针提交进去。
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]