Skip to content

docs: reconcile merged qualification and contributor checkpoints - #5235

Merged
huangruiteng merged 2 commits into
loopx-project:mainfrom
LIHUA919:codex/history-checkpoint-cleanup
Oct 1, 2026
Merged

huangruiteng merged 2 commits into
loopx-project:mainfrom
LIHUA919:codex/history-checkpoint-cleanup

Conversation

@LIHUA919

@LIHUA919 LIHUA919 commented Sep 28, 2026 •

Copy link
Copy Markdown
Contributor

Goal and current result

Reconcile the shared-authority RFC and contributor board with current merged work and live review state. This updates the existing three documentation files and resolves their conflict with current main; it does not change runtime behavior.

Changes

Validation and holds

On head 48604644c, the contributor-board architecture suite passed 23 tests; examples/docs-governance-smoke.py, the three-file loopx check scan and git diff --check passed. Exact-head GitHub CI is complete: 8 successful / 33 expected conditional skips / 0 failed or pending. An earlier same-head Python Tests run was cancelled by its replacement; the replacement workflow succeeded on full head 48604644ca07eb36371b33f3da9ffbb1fa654979, including merge-gate. The prior CHANGES_REQUESTED review is not superseded by CI; maintainer re-review and merge remain required.

The separate SQLite D2 formal rerun on PR #5251 is still in progress. Frozen d767 measured 8 passed / 6 failed / 10 missing; this PR makes no qualification or promotion claim.

中文摘要

本 PR 仅更新现有双语 RFC 与贡献任务板,并以签署合并 48604644c 接入规范 main,保留原提交历史。GH-A05 已纠正:#4915 当前 CI 虽通过,但正式评审为 CHANGES_REQUESTED,且与主干冲突;真实 CLI 显式路径回归和冲突须先修复。GH-A01 保留 #5160 已合并与 #4941 原生环境复核的区分;GH-A03 区分已关闭的 #4336/#5162 与仍待修改的 #4397。当前 head 本地相关测试 23 项通过,文档治理、公开边界及空白检查通过;远端精确版本 CI 已完成:8 项成功、33 项预期条件跳过、零失败或待处理。同 head 的首轮 Python Tests 被替代运行取消;替代工作流 在完整 head 48604644ca07eb36371b33f3da9ffbb1fa654979 上通过,包括 merge-gate。原 CHANGES_REQUESTED 评审仍待维护者重新审阅与合并。D2 旧版正式结果仍为 8 通过、6 失败、10 缺失,不据此声明资格或晋升。

@huangruiteng huangruiteng left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

REQUEST_CHANGES — [P2] GH-A05 把仍有当前 exact-head 阻断的 #4915 写成“已批准、只等维护者合并”,这会误导下一位贡献者和维护者。

精确 head:3d45c1b2eaea6071fa48c3b6df5dae27390fd9b3;比较基线:440a19aab2b69dc23748bb734fa58f2a53e2872f。本人检查三个文档的完整差异与其引用的当前状态,未查询 GitHub CI。

动机

本次按 contributor board 的准入与状态规则 和 shared-authority RFC 整理已合并代码、仍开放的 PR 与尚未满足的资格门槛,避免重复实现。方向合理:合并了 #4931 不等于 SQLite D2 完成;Windows reporter 验证和默认迁移也各有自己的关闭条件。

改动思路

复用现有 GH-A01/A03/A05/R5A 行和双语 RFC checkpoint,不新建路线图、权限或第二套任务。#5160 的 UTF-8 guard、#4397/#5162 的 canonical regression、#4328/#4931 的 D2 资格被放回既有 owning boundary。

具体改动

双语 RFC 正确区分 #4931 已合并与容量、恢复、消费者延迟、支持 runtime 和十天 soak 未完成,并保留 9 月 24 日“当时仍在 review”的历史语境。board 的 GH-A01/A03/R5A 也保留 reporter、精确 head 和原有资格缺口。

唯一阻断在 docs/development/contributor-tasks.md:108(GH-A05): #4915 当前仍是 OPEN,head 为 1bd8bfa8b5690f02aea752129ac4adc5866109e4,最新 正式 review 是 CHANGES_REQUESTED,而非 APPROVED。该 review 给出真实 project register 的 base 成功/head 失败:双默认 runtime 并存时,source guard 丢失已经提供的 explicit registry/effective root。不是因为非自身 PR 的红 CI 请求修改。

最小修复只需把这一行改为等待当前 head 的修复与重新验证/评审,然后再进入合并与 issue closeout;保留 #4915/#4800 的 canonical anchor,不另起 migration Todo,也不在这里改迁移实现。

对主干的风险

36 项 contributor-board/RFC-status 检查、uv run --extra test python examples/docs-governance-smoke.py、精确三文件的 public-boundary scan 与 git diff --check 均通过。但这些测试验证结构与引用,不会证明远端 review 结论;上述当前 head 的反例仍成立。错误状态会让维护者跳过修复,也可能让贡献者以为剩余工作只是 merge。

未来向前的 bounded refine 已体现在替换旧行、复用既有 checkpoint;更大的自动 GitHub→board 同步没有本次同因需求,不应为改一行引入新状态源。无 runtime、权限、frontstage 首屏或行为变更。

我的整体评价

REQUEST_CHANGES:其余 reconcile 有实际价值,但当前状态准确性是本次交付本身,不能因结构测试全绿忽略这个 false approval。修正 GH-A05 后,重新读 #4915 当前 exact head 及正式 review,再跑 board/RFC checks 即可。未要求本 PR 修复其他 PR 的代码、未合并或升级。

English verdict: REQUEST_CHANGES - 3d45c1b; GH-A05 incorrectly declares #4915 approved although its current head has an actionable CHANGES_REQUESTED review. Correct the one current-status row and recheck the exact-head review; other reconciliation and native docs checks are valid.

@huangruiteng

Copy link
Copy Markdown
Collaborator

按 contributor board 的“已有实现复用+当前状态准入”框架,3d45c1b2eaea6071fa48c3b6df5dae27390fd9b3 的分项结论:

  • 已合并代码与 D2/Windows reporter/native regression 资格分开,未把 perf(authority): reuse owned state during SQLite and archive replay #4931 合并冒充 D2 完成。
  • 不新建 migration 或 SQLite qualification 路线,沿用既有 canonical anchors,符合压缩而不是追加的要求。
  • GH-A05 的 approval 状态与 #4915 当前正式 review 冲突,必须仅修这条现状陈述。当前 review 的阻断来自真实 CLI 回归,不是无关红 CI。
  • docs governance 和 36 项结构 checks 通过,但不证明 GitHub 当前 review 结论。

结论 REQUEST_CHANGES;最小修复与证据详见本次 exact-head review。

本次 exact-head 完整 review

@mergify

mergify Bot commented Sep 30, 2026

Copy link
Copy Markdown

This pull request has merge conflicts with main and cannot be merged
until they are resolved. Please rebase or merge the base branch, @LIHUA919.

Choose the remote for the base repository, not an out-of-date fork.
For a fork clone, first inspect git remote -v; upstream must point
to https://github.com/loopx-project/loopx.git. If it is absent, add it
with git remote add upstream https://github.com/loopx-project/loopx.git.
Then run:

git fetch upstream
git rebase upstream/main
# Resolve each conflict, git add the resolved files, then git rebase --continue.
git push --force-with-lease origin HEAD

For a same-repository clone whose origin points to
https://github.com/loopx-project/loopx.git, use origin instead of
upstream for fetch/rebase. If you prefer merging the base, use
git merge <base-remote>/main and push normally.

Keep the DCO Signed-off-by trailer on every commit when you rebase.
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@mergify mergify Bot added the needs-rebase Mergify: the pull request has merge conflicts with its base branch label Sep 30, 2026
Signed-off-by: Lihua <1017343802@qq.com>
@mergify mergify Bot removed the needs-rebase Mergify: the pull request has merge conflicts with its base branch label Oct 1, 2026

@huangruiteng huangruiteng left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

结论:APPROVE。复审精确 head 48604644ca07eb36371b33f3da9ffbb1fa654979,不可变比较基线 f49b4a00870604d39fa4318da24d6dd35e72bb6e。此前误把 #4915 写成已批准的 blocker 已修复;这是文档状态核对的批准,不是 SQLite D2 资格、默认切换或合并授权。

动机

本次交付依据是既有维护者说明:贡献者任务板应先核对已经落地的实现及当前评审,避免重复造 UTF-8 guard、重新声称 typed progress 尚未实现,或者把一个优化 PR 合并当成长期持久化验收完成。受影响者是从任务板选择工作、从共享 authority RFC 判断剩余资格门槛的贡献者。错误状态会在每次认领与复审时累积重复工作和误导。文档维护本身有明确用户结果,不需要捆绑 unrelated runtime 修复才能完成。

改动思路

继续使用现有 contributor board 和中英文共享 authority RFC,不新建任务系统或第二套资格账本。PR 状态取自公开 GitHub lifecycle/review 记录;任务出口仍由原 issue、验收与维护者 review 决定,合并记录不替代容量、恢复或自然时间证据。相较只写一条 PR 评论,原位更新 canonical 行能让后续读者看到一致状态;相较自动抓取所有历史状态,这个有界纠错更容易审核和回退。

具体改动

整个当前 base...head 差异为 3 个文档文件、+12/-9,没有生产代码、配置、测试或 generated 变更。尤其注意:旧 contribution commit 的 patch 仍包含过时的“approved”字样,不能代替 merge resolution 后的最终文件;本次读的是最终 Git tree。

关键内容讲解

  • contributor-tasks.md GH-A01 指向已合并 #5160 及已有 UTF-8 回归测试,把剩余出口限定为 reporter 原生主机验证与 issue closeout,避免复制已有 guard。
  • GH-A03 如实保留 #4336 已关闭、#4397 仍有修改请求、#5162 关闭但未合并的关系;出口先对齐现有 review,而非默认再造一个 runtime regression。
  • GH-A05 不再称 #4915 已批准。独立读回确认该 PR 仍 OPEN,当前 1bd8bfa8b... 有 CHANGES_REQUESTED,merge state 为 DIRTY。新行要求修复已评审的真实 CLI explicit-route 回归和主干冲突,再验证、取得维护者 review、关闭 issue;普通读取不得移动旧状态的要求仍在。
  • GH-R5A 与中英文 RFC 正确记录 #4328、#4931 已合并,#4931 merge commit 为 9482a9496c6e612eeaad0a3bfafc43657f68d97a。历史 checkpoint 使用“当时仍在 review,此后合并”,当前 checkpoint 明确 D2 未完成;不是把历史事实反写成当时已经完成。
  • 两个 RFC 的 §7.2 在 base/head 逐字节一致。完整 profile、1 MiB 失败预算、大历史恢复/consumer lag、restore/upgrade/runtime coverage、>=10 日真实 elapsed soak 和独立 promotion holds 都没有因优化合并而解除。

对主干的风险

最大风险是结构性文档测试通过,但动态公开状态仍写错。因此我另行读取 #4915/#4397 exact-head review、#4336/#4941 issue lifecycle、#5162/#5160/#4328/#4931 merge 记录,再逐行核对。旧 review head 3d45c1b2... 的 GH-A05 仍出现 approved,新 head 不再出现,反例证明确实消除了原 blocker。已有文档验证并不证明原生 cp936 reporter 恢复,也不证明 SQLite 性能预算通过;这些仍是明确的剩余出口。

独立本地验证(当前 exact head):

  • uv run --extra test python -m pytest -q tests/architecture/test_contributor_task_board.py tests/architecture/test_rfc_status_index.py:36 passed,包含无效状态、非 Accepted RFC、重复已完成任务与缺少出口的负例。
  • uv run --extra test python examples/docs-governance-smoke.py:通过。
  • 三个变更文档的 loopx check 公共边界扫描与 git diff --check:通过。
  • 逐行 primary-source reconciliation 与两份 §7.2 不变性检查:通过。
  • uv run --extra test loopx canary premerge --from-git-diff --git-diff-base f49b4a00870604d39fa4318da24d6dd35e72bb6e --goal-id GOAL:3 项直接检查及 14 项风险选定检查全部通过,无失败、警告或未执行项;涵盖维护性、语义词汇、Todo/structured projection、相关 CLI/content-ops 及公共边界。精确差异的 change-quality receipt 也已通过且读回 valid;该结果不授予 self-merge。

typed-state、domain-neutrality、guidance-vs-obligation、default-off 与 authority lenses 已逐项检查:没有引入新状态分类、协议或机器义务;使用已有 board status,预算和 authority stop 条件保持不变。只改文档消费者入口,不改 frontend/Lark/CLI 执行或安装行为,不需要 companion 实现、真实数据库迁移或模型调用。遵循当前 review policy wait_for_ci=false:未查询、轮询或等待远端 CI;GH-A05 关于 CI 的文字不是本次批准依据,红绿 CI 都不能覆盖其独立代码 blocker。

我的整体评价

APPROVE。旧 head 的错误批准表述已修,新 head 的全部差异也经独立核对,关闭的是这份 documentation reconciliation 的完整交付,不是其父 RFC 或其它 PR 的验收。长期维度减少 stale task 引起的重复认领;用户体验维度把“已落地什么、仍卡在哪里、谁提供下一份证据”放回原入口,没有新增确认或授予权限。

未来维护性复查已做:继续在既有 task board/RFC checkpoint 原位压缩过时状态,是这里最有价值的简化;没有需要塞进这份文档 PR 的 runtime refactor。不要求无关框架、额外 Todo 或第二轮 qualification。公开 PR 状态以后仍会变化,变化时按 canonical anchor 更新;本轮没有合并、切换 provider、启动 soak 或改变活跃 Goal。

English verdict: APPROVE - 4860464. The previous false approval claim for #4915 is corrected and independently reconciled against its exact-head requested changes and conflict. The full docs-only diff accurately distinguishes merged implementation from remaining D2 qualification; both §7.2 acceptance sections are unchanged. 36 focused tests, docs governance, public-boundary/diff checks and primary-source reconciliation passed. Risk-based premerge passed 3 direct and 14 selected checks; exact-scope change-quality readback is valid. Remote CI was not consulted. This approves documentation reconciliation only, not promotion, migration or merge.

@huangruiteng
huangruiteng merged commit 35ced67 into loopx-project:main Oct 1, 2026
41 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Legacy replan matcher treats 'installed' as a stall signal

2 participants