Repository navigation
feat: 建立安全的合并与分支清理治理 - #6
Conversation
明确仅在官方 Codex Review 覆盖当前 HEAD、全部 review thread 已解决且风险已分类后，才允许为单个 PR 开启 GitHub 原生 Auto-merge。 中央审计新增仓库级 Auto-merge 与合并后远端分支自动删除检查，并以失败 fixture 锁定两项设置；同步更新契约、模板、README 与维护手册。 验证：bash tests/test-audit.sh；ruff check/format；ShellCheck；bash -n；py_compile；git diff --check。 Co-Authored-By: Codex <noreply@anthropic.com>
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 0e6e4366ea
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
根据官方 Codex Review 与 GitHub 官方文档，维护者推送新提交后 Auto-merge 不保证自动关闭，而官方 Review 当前又不是 required check。 因此 v1 改为强制关闭 Auto-merge、保留合并后远端分支自动删除，并把当前 HEAD Review、thread 解决和风险分类作为人工合并前置；同步补齐新项目接入步骤与审计范围说明。 验证：bash tests/test-audit.sh；ruff check/format；ShellCheck；bash -n；py_compile；82 个 YAML 解析；git diff --check。 Co-Authored-By: Codex <noreply@anthropic.com>
|
@codex review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 3e326b4414
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
让关闭远端分支自动删除的失败 fixture 保持 Auto-merge 为合法关闭状态，确保测试只由目标约束触发。 mutation 验证：临时移除 delete_branch_on_merge 审计后，该 fixture 错误 PASS；恢复实现后 fixture 稳定失败，全量 tests/test-audit.sh 通过。 Co-Authored-By: Codex <noreply@anthropic.com>
|
@codex review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: edf423ca25
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
在项目 AGENTS 模板的 CI/CD 公共门禁中明确 allow_auto_merge=false 与 delete_branch_on_merge=true，并增加模板断言防止后续遗漏。 验证：新增断言先因模板缺失取得 RED，补齐模板后 tests/test-audit.sh 全量通过。 Co-Authored-By: Codex <noreply@anthropic.com>
|
@codex review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: a91a9d9317
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Co-Authored-By: Codex <noreply@anthropic.com>
|
@codex review |
|
Codex Review: Didn't find any major issues. 👍 Reviewed commit: ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
1 participant
背景
在已接入官方 Codex Code Review、master 门禁与分支清理能力的基础上，明确 GitHub Auto-merge 与当前官方 Review 能力之间的安全边界。目标是复用官方能力，不自建合并 Bot 或平行状态机。
最终方案
TDD 与验证
风险边界
本 PR 不创建自动合并服务，不开启任何产品 PR 的 Auto-merge，也不触发 Fusion/Audio 生产发布。