Skip to content

refactor(gov): 新增否决覆写机制#24

Open
Mikuoso wants to merge 2 commits into
mainfrom
refactor/veto-override
Open

refactor(gov): 新增否决覆写机制#24
Mikuoso wants to merge 2 commits into
mainfrom
refactor/veto-override

Conversation

@Mikuoso
Copy link
Copy Markdown
Member

@Mikuoso Mikuoso commented Jun 5, 2026

由 Sourcery 提供的摘要

在治理决策流程中记录一项否决权覆盖机制,并在变更日志中记录该变更。

文档:

  • 在治理决策协议中描述新的否决权覆盖流程,在定义好的超级多数和简单多数条件下,允许维护者推翻核心维护者的否决。
  • 更新变更日志,注明在治理文档中引入否决权覆盖机制。
Original summary in English

Summary by Sourcery

在治理决策流程和变更日志中记录新的维护者否决权(veto)覆盖机制。

文档:

  • 在治理决策文档中,描述一个流程:在特定条件下,允许维护者团队多数决通过,以推翻核心维护者的否决权。
  • 在项目变更日志中记录该否决覆盖机制的引入。
Original summary in English

Summary by Sourcery

Document a new maintainer veto override mechanism in the governance decision-making protocol and changelog.

Documentation:

  • Describe a process allowing the maintainer team majority to override a core maintainer veto under defined conditions in the governance decision-making document.
  • Record the introduction of the veto override mechanism in the project changelog.

@Mikuoso Mikuoso added the Type: Refactor Improves code structure, readability & reduces complexity without altering external behavior. label Jun 5, 2026
@Mikuoso Mikuoso requested a review from yztkz June 5, 2026 15:55
@Mikuoso Mikuoso self-assigned this Jun 5, 2026
@sourcery-ai
Copy link
Copy Markdown

sourcery-ai Bot commented Jun 5, 2026

审阅者指南(在小型 PR 上折叠)

审阅者指南

记录了一种新的治理“否决权覆盖(veto‑override)”机制,并将其写入变更日志,明确说明维护者如何推翻核心维护者的否决以及如何计票。

新治理否决覆盖机制的流程图

flowchart TD
    A[Proposal PR created] --> B[Core maintainer reviews]
    B --> C{Core maintainer vetoes?}
    C -- No --> M[Squash and Merge]
    C -- Yes --> D[Core maintainer posts written explanation]
    D --> E[Maintainer team reviews explanation]
    E --> F{Maintainer team majority opposes explanation?}
    F -- No --> G[Veto stands PR not merged]
    F -- Yes --> H[Veto overridden]
    H --> I[PR is force merged]

    subgraph Voting_rule
        J[Core maintainer with maintainer role] --> K[Counts as one vote only]
    end
Loading

文件级变更

变更 详情 文件
在治理决策流程中记录了一项否决覆盖机制。
  • 添加了一个信息提示块,描述在何种条件下维护者可以推翻核心维护者的否决
  • 明确指出,如果书面否决理由被大多数维护者反对,则该 PR 将被强制合并,否决失效
  • 澄清了在覆盖流程中,具有双重角色的维护者只按一票计数
docs/governance/decision-making.md
在变更日志中记录了否决覆盖机制的引入。
  • 在 “Changed” 小节中添加了一条条目,描述新的否决覆盖机制及其对 PR 合并和否决有效性的影响
docs/changelog.md

技巧与命令

与 Sourcery 交互

  • 触发新的审阅: 在 pull request 中评论 @sourcery-ai review
  • 继续讨论: 直接回复 Sourcery 的审阅评论。
  • 从审阅评论生成 GitHub Issue: 通过回复某条审阅评论,要求 Sourcery 从该评论创建一个 issue。你也可以在某条审阅评论下回复 @sourcery-ai issue 来从该评论创建 issue。
  • 生成 pull request 标题: 在 pull request 标题的任意位置写上 @sourcery-ai,即可随时生成标题。你也可以在 pull request 中评论 @sourcery-ai title 以随时(重新)生成标题。
  • 生成 pull request 概要: 在 pull request 正文任意位置写上 @sourcery-ai summary,即可在你想要的位置随时生成 PR 概要。你也可以在 pull request 中评论 @sourcery-ai summary 以随时(重新)生成概要。
  • 生成审阅者指南: 在 pull request 中评论 @sourcery-ai guide,即可随时(重新)生成审阅者指南。
  • 解决所有 Sourcery 评论: 在 pull request 中评论 @sourcery-ai resolve,即可一次性解决所有 Sourcery 评论。如果你已经处理完所有评论且不想再看到它们,这很有用。
  • 关闭所有 Sourcery 审阅: 在 pull request 中评论 @sourcery-ai dismiss,即可关闭所有现有的 Sourcery 审阅。尤其适用于你想从一次全新的审阅开始时 —— 别忘了再评论 @sourcery-ai review 来触发新的审阅!

自定义你的体验

打开你的 dashboard 以:

  • 启用或禁用审阅功能,例如 Sourcery 自动生成的 pull request 概要、审阅者指南等。
  • 修改审阅语言。
  • 添加、删除或编辑自定义审阅指令。
  • 调整其他审阅设置。

获取帮助

Original review guide in English
Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Documents a new governance veto-override mechanism and records it in the changelog, specifying how maintainers can overrule a core maintainer’s veto and how votes are counted.

Flow diagram for the new governance veto override mechanism

flowchart TD
    A[Proposal PR created] --> B[Core maintainer reviews]
    B --> C{Core maintainer vetoes?}
    C -- No --> M[Squash and Merge]
    C -- Yes --> D[Core maintainer posts written explanation]
    D --> E[Maintainer team reviews explanation]
    E --> F{Maintainer team majority opposes explanation?}
    F -- No --> G[Veto stands PR not merged]
    F -- Yes --> H[Veto overridden]
    H --> I[PR is force merged]

    subgraph Voting_rule
        J[Core maintainer with maintainer role] --> K[Counts as one vote only]
    end
Loading

File-Level Changes

Change Details Files
Documented a veto-override mechanism in the governance decision-making protocol.
  • Added an info callout describing conditions under which maintainers can override a core maintainer’s veto
  • Specified that if the written veto rationale is opposed by a majority of maintainers, the PR is forcibly merged and the veto is void
  • Clarified that maintainers with dual roles are counted as a single vote in the override process
docs/governance/decision-making.md
Recorded the introduction of the veto-override mechanism in the changelog.
  • Added a 'Changed' section entry describing the new veto-override mechanism and its effect on PR merging and veto validity
docs/changelog.md

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link
Copy Markdown

@sourcery-ai sourcery-ai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey - 我发现了 1 个问题,并留下了一些整体性的反馈:

  • 当前对“覆写表决”的规则表述中同时使用了“三分之二以上反对”和“多数通过”等不同阈值,建议明确各自适用的投票对象和具体比例(如相对多数/绝对多数),以避免实际执行时的歧义。
  • 建议在否决覆写机制中补充对投票范围和人数要求的边界条件,例如维护者人数较少、部分维护者缺席或投票冲突(如运营/技术双重身份)时如何计算,以确保规则在极端情况也可操作。
面向 AI Agent 的提示
Please address the comments from this code review:

## Overall Comments
- 当前对“覆写表决”的规则表述中同时使用了“三分之二以上反对”和“多数通过”等不同阈值,建议明确各自适用的投票对象和具体比例(如相对多数/绝对多数),以避免实际执行时的歧义。
- 建议在否决覆写机制中补充对投票范围和人数要求的边界条件,例如维护者人数较少、部分维护者缺席或投票冲突(如运营/技术双重身份)时如何计算,以确保规则在极端情况也可操作。

## Individual Comments

### Comment 1
<location path="docs/governance/decision-making.md" line_range="73-74" />
<code_context>
 - **批准**:点击 Squash and Merge。方案正式转化为茶馆的执行指令或历史档案。
 - **否决**:核心维护者有权拒绝合并不符合标准的提案,但必须给出基于本 Protocol 的书面解释。当核心维护者人数超过 3 人时,重大否决需经核心维护者内部多数通过。

+!!! info "否决覆写"
+    若否决的书面解释遭到全体维护者(含运营与技术维护者)三分之二以上反对,可发起覆写表决。覆写需经维护者团队多数通过,通过后 PR 强制合并,否决失效。
+
 !!! info "关于审计权"
</code_context>
<issue_to_address>
**suggestion:** 请明确“多数”在覆写投票中的具体含义。

这里的“维护者团队多数通过”可以被理解为以下几种简单多数中的任意一种:(1) 全体维护者的简单多数;(2) 所有有投票资格成员的简单多数;或 (3) 仅参与该次投票成员的简单多数。由于这里定义的是一个正式的覆写流程,请添加一句简短说明,阐明实际意图是哪一种,并说明多数是如何计算的。

```suggestion
!!! info "否决覆写"
    若否决的书面解释遭到全体维护者(含运营与技术维护者)三分之二以上反对,可发起覆写表决。覆写需经参加该次表决的维护者简单多数(即赞成票数严格大于反对票数)通过,通过后 PR 强制合并,否决失效。
```
</issue_to_address>

Sourcery 对开源项目免费——如果你喜欢我们的评审,欢迎分享 ✨
帮助我变得更有用!请在每条评论上点击 👍 或 👎,我会根据你的反馈改进评审质量。
Original comment in English

Hey - I've found 1 issue, and left some high level feedback:

  • 当前对“覆写表决”的规则表述中同时使用了“三分之二以上反对”和“多数通过”等不同阈值,建议明确各自适用的投票对象和具体比例(如相对多数/绝对多数),以避免实际执行时的歧义。
  • 建议在否决覆写机制中补充对投票范围和人数要求的边界条件,例如维护者人数较少、部分维护者缺席或投票冲突(如运营/技术双重身份)时如何计算,以确保规则在极端情况也可操作。
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- 当前对“覆写表决”的规则表述中同时使用了“三分之二以上反对”和“多数通过”等不同阈值,建议明确各自适用的投票对象和具体比例(如相对多数/绝对多数),以避免实际执行时的歧义。
- 建议在否决覆写机制中补充对投票范围和人数要求的边界条件,例如维护者人数较少、部分维护者缺席或投票冲突(如运营/技术双重身份)时如何计算,以确保规则在极端情况也可操作。

## Individual Comments

### Comment 1
<location path="docs/governance/decision-making.md" line_range="73-74" />
<code_context>
 - **批准**:点击 Squash and Merge。方案正式转化为茶馆的执行指令或历史档案。
 - **否决**:核心维护者有权拒绝合并不符合标准的提案,但必须给出基于本 Protocol 的书面解释。当核心维护者人数超过 3 人时,重大否决需经核心维护者内部多数通过。

+!!! info "否决覆写"
+    若否决的书面解释遭到全体维护者(含运营与技术维护者)三分之二以上反对,可发起覆写表决。覆写需经维护者团队多数通过,通过后 PR 强制合并,否决失效。
+
 !!! info "关于审计权"
</code_context>
<issue_to_address>
**suggestion:** Specify the exact meaning of "多数" for the override vote.

Here “维护者团队多数通过” could be read as a simple majority of (1) all maintainers, (2) all eligible voters, or (3) only participants in the vote. Since this defines a formal override process, please add a brief note clarifying which of these is intended and how the majority is computed.

```suggestion
!!! info "否决覆写"
    若否决的书面解释遭到全体维护者(含运营与技术维护者)三分之二以上反对,可发起覆写表决。覆写需经参加该次表决的维护者简单多数(即赞成票数严格大于反对票数)通过,通过后 PR 强制合并,否决失效。
```
</issue_to_address>

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Comment thread docs/governance/decision-making.md Outdated
Comment on lines +73 to +74
!!! info "否决覆写"
若否决的书面解释遭到全体维护者(含运营与技术维护者)三分之二以上反对,可发起覆写表决。覆写需经维护者团队多数通过,通过后 PR 强制合并,否决失效。
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: 请明确“多数”在覆写投票中的具体含义。

这里的“维护者团队多数通过”可以被理解为以下几种简单多数中的任意一种:(1) 全体维护者的简单多数;(2) 所有有投票资格成员的简单多数;或 (3) 仅参与该次投票成员的简单多数。由于这里定义的是一个正式的覆写流程,请添加一句简短说明,阐明实际意图是哪一种,并说明多数是如何计算的。

Suggested change
!!! info "否决覆写"
若否决的书面解释遭到全体维护者(含运营与技术维护者)三分之二以上反对,可发起覆写表决。覆写需经维护者团队多数通过,通过后 PR 强制合并,否决失效。
!!! info "否决覆写"
若否决的书面解释遭到全体维护者(含运营与技术维护者)三分之二以上反对,可发起覆写表决。覆写需经参加该次表决的维护者简单多数(即赞成票数严格大于反对票数)通过,通过后 PR 强制合并,否决失效。
Original comment in English

suggestion: Specify the exact meaning of "多数" for the override vote.

Here “维护者团队多数通过” could be read as a simple majority of (1) all maintainers, (2) all eligible voters, or (3) only participants in the vote. Since this defines a formal override process, please add a brief note clarifying which of these is intended and how the majority is computed.

Suggested change
!!! info "否决覆写"
若否决的书面解释遭到全体维护者(含运营与技术维护者)三分之二以上反对,可发起覆写表决。覆写需经维护者团队多数通过,通过后 PR 强制合并,否决失效。
!!! info "否决覆写"
若否决的书面解释遭到全体维护者(含运营与技术维护者)三分之二以上反对,可发起覆写表决。覆写需经参加该次表决的维护者简单多数(即赞成票数严格大于反对票数)通过,通过后 PR 强制合并,否决失效。

@Mikuoso
Copy link
Copy Markdown
Member Author

Mikuoso commented Jun 7, 2026

@sourcery-ai review

Copy link
Copy Markdown

@sourcery-ai sourcery-ai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

嗨,我在这里给出了一些整体性的反馈:

  • 建议进一步明确“维护者团队多数”的定义(例如,具体的百分比、弃权/缺席的处理方式),以避免在何时可以推翻否决权方面产生歧义。
  • 建议补充说明触发否决权覆写的具体操作流程(由谁发起投票、投票时间窗口、投票记录在哪里),这样可以确保该机制被一致地执行。
供 AI 代理使用的提示
Please address the comments from this code review:

## Overall Comments
- Consider clarifying what constitutes “维护者团队多数” (e.g., explicit percentage, handling of abstentions/absences) to avoid ambiguity in when a veto override is valid.
- It may help to specify the operational procedure for triggering a veto override (who initiates the vote, time window, where votes are recorded) so the mechanism is consistently applied.

Sourcery 对开源项目是免费的——如果你喜欢我们的审查,请考虑分享 ✨
帮我变得更有用!请在每条评论上点 👍 或 👎,我会根据你的反馈改进之后的代码审查。
Original comment in English

Hey - I've left some high level feedback:

  • Consider clarifying what constitutes “维护者团队多数” (e.g., explicit percentage, handling of abstentions/absences) to avoid ambiguity in when a veto override is valid.
  • It may help to specify the operational procedure for triggering a veto override (who initiates the vote, time window, where votes are recorded) so the mechanism is consistently applied.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- Consider clarifying what constitutes “维护者团队多数” (e.g., explicit percentage, handling of abstentions/absences) to avoid ambiguity in when a veto override is valid.
- It may help to specify the operational procedure for triggering a veto override (who initiates the vote, time window, where votes are recorded) so the mechanism is consistently applied.

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Type: Refactor Improves code structure, readability & reduces complexity without altering external behavior.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant