Skip to content

sync #2: windows -> main (single-parent sync commit, draft) - #55

Merged
PaperStrange merged 1 commit into
mainfrom
sync/main-20261025
Oct 25, 2026
Merged

PaperStrange merged 1 commit into
mainfrom
sync/main-20261025

Conversation

@PaperStrange

Copy link
Copy Markdown
Owner

这是什么

第二次 windows → main 同步(第一次为 PR #54 / merge commit cdec4d2)。仍是单亲同步提交,
复刻本仓历史先例(f0205e0 / c8578b0 / bc31219 形态),不是把 windows 历史合进 main。

  • 分支:sync/main-20261025
  • 同步提交:259628f,父=cdec4d2(当前 main 顶端)⇒ origin/main..HEAD = 1
  • 同步面:15 文件,+50/−1
  • 排除:docs/iteration/**(windows-only)⇒ 树内 0 行
  • 保留:4 个 mac 启动脚本
  • 带上 main 的内容:ci.yml 的 structure-guard 基线修复、32+3 条 docstring(C 级棘轮租金)、.gitignore 忽略形状补丁

为什么 D101/D102 是"租金"

用户批评"基线只花钱不促改善",据此 BR-1 把 C 级棘轮改成到期收租:review_by=2026-10-31 起
逐项实测必须严格小于 measured_value。本 PR 之前已提前兑现:
D101 12→0、D102 46→23、D103 203/205、E501 2493/2494 ⇒ 四项全部严格低于基线。

验证读数(同步树现跑)

判据 读数
verify/run_suite.py --tier offline SUITE PASSED (23 scripts, 3 skipped) rc=3,0 FAILED(3 条具名 SKIP:agentops / close_readiness / usage)
verify/verify_matrix.py check CHECK OK: 57 脚本与 TEST-MATRIX.MD 一致
verify/verify_decision_register.py DECISION-REGISTER PASS,pointers=1248 quotes_drift=0

合并前提

main 有分支保护:必需检查 Offline suite + builds (Windows) 必须绿、enforce_admins=true。
本 PR 先以草稿开出,待 main 侧 CI 绿后再标记 ready 并合并。

走查

清单:docs/iteration/phases/testing-governance/2026-10-25-main-sync-walkthrough-checklist.MD
(该文件位于 docs/iteration/**,按设计不进 main,请在 windows 分支阅读)。

…ommit)

- source: c882401 (windows)
- excludes docs/iteration/** (windows-only) and keeps the 4 mac launchers
- includes docs/6-DECISIONS.md: the 2026-09-25 exclusion clause 3 is flipped by the
  2026-10-25 dry run (DECISION-REGISTER PASS, drift 0, 1106 pointers ratcheted)
- branch-aware gates: verify_usage SKIPs by name when its pinned rev is unreachable,
  verify_agentops/close_readiness SKIP by name without a ledger
@PaperStrange
PaperStrange marked this pull request as ready for review October 25, 2026 15:40
@PaperStrange
PaperStrange merged commit 02b1c12 into main Oct 25, 2026
2 checks passed
@PaperStrange
PaperStrange deleted the sync/main-20261025 branch October 25, 2026 15:40
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 25, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-25T15:41:26.950783Z 259628f Draft marked ready
🔒 Security Review ✅ Completed 2026-10-25T15:42:38.738021Z 259628f Draft marked ready
ℹ️ 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

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.

1 participant