Repository navigation
docs: 写第五章《PR 与合并权限》并更新路线图 - #8
Closed
jasontopia wants to merge 2 commits into
Closed
jasontopia wants to merge 2 commits into
jasontopia wants to merge 2 commits into
Conversation
覆盖硬规矩二(未经船长明确同意不合并 PR)、yolo 只管合并权限且不改变 质检流水线本身、以及红色 CI 无论 yolo 或船长指示都不能合并;用第一章 交付时的强推插曲与第二、三章的「合并吧」流程作真实案例。README 路线图 第五行标记为已写并链接新章节,章末预告第六章。
…merge claim, section cite
Owner
Author
|
Superseded by #14 (same content, re-validated on a fresh branch after a quality-check tool issue on this branch). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Intent
继续 Learn FirstMate 教程,写第五章。前四章已写完(第一、二章已合入主分支,第三、四章正在走质检流水线)。README 的学习路线图里,第五章的定位是:为什么默认必须船长点头才合并,yolo 姿态放开了什么、没放开什么,以及红色 CI 为什么依然不能合。第五章也是「沿着一件活的真实旅程往下走」这条线(第 2 到 5 章)的最后一章。
What Changed
chapters/05-pr-merge-authority.md:讲解为什么合并默认需要船长明确点头、yolo姿态放开的是合并权限而非质检标准或红色 CI 拦截、以及销毁性/不可逆/安全相关合并为何仍需上报,内容依据AGENTS.md第 1 节硬规矩二与第 7 节「Selected delivery path and merge authority」小节。yolo/CI 组合下的合并判断,以及核对本仓库真实 PR 状态,并给出前后 git 状态对比的验证方法。README.md路线图表格,将第 5 章状态从「待写」改为「已写」并加上章节链接。🤖 Generated with Claude Code
Risk Assessment
✅ Low: All three round-1 findings (private-data sourcing, false chapter-3 merge claim, mislabeled AGENTS.md section) are correctly fixed: the chapter now sources its examples from learn-firstmate's own public PR/CI history (verified via gh-axi: PR #1 and #3 merged with green CI, PR #4 still open with green CI but no merge), which is public data distinct from the FirstMate checkout's captain-private paths; all AGENTS.md quotes and the section-7/subsection citation were independently verified against ~/firstmate/AGENTS.md and match exactly; the exercises remain read-only and consistent with the corrected claims.
Testing
Baseline
python3 scripts/check-docs.pyalready passed (6 files, no problems) and I re-ran it to confirm. Since this change only edits tutorial prose in chapters/05-pr-merge-authority.md and a README table entry, there is no running application for this test phase to drive live; the tutorial's own exercises call for a live FirstMate/大副 session that this test phase has no credential or environment to start. As extra diligence I fact-checked the corrected claims against real GitHub state viagh-axi pr view 3andgh-axi pr view 4: PR #3 (chapter 2) is confirmed merged and PR #4 (chapter 3) is confirmed still open with green CI, exactly matching the rewritten chapter text - so the fixes for the false merge claim and the private-data sourcing read as accurate on manual review, though this is a document fact-check rather than a live scenario. Overall: no-surface, nothing to park.Pipeline
Updates from git push no-mistakes
✅ **intent** - passed
✅ No issues found.
✅ **Rebase** - passed
✅ No issues found.
🔧 **Review** - 3 issues found → auto-fixed ✅
chapters/05-pr-merge-authority.md:17- Chapter 5 quotes and derives content directly from this checkout's captain-private state to build 'authoritative' tutorial material, violating this repo's own AGENTS.md rule: ".env,data/,state/,config/,projects/, and.no-mistakes/in that checkout are captain-private. Never use their contents as tutorial material." Line 17 quotes the exact registry line fromdata/projects.md('learn-firstmate [no-mistakes-prod-only] - ...') verbatim, presenting it as something the reader can look up. The 'two real examples' section built on top of that (lines 42-48) is also sourced from captain-private files: the force-push example (line 46) reproduces the captain's quoted authorization fromdata/backlog.md:49and the harness-classifier explanation fromdata/learnings.md:11; the ch2/ch3 merge example (line 48) is likewise drawn fromdata/backlog.md. Exercise 2 (lines 83-102) then has the reader ask their own firstmate to recall these same private-sourced events. Remedy: rewrite these passages so the illustrative facts are stated without quoting or reproducing content lifted fromdata/,state/,config/,projects/,.no-mistakes/, or.env— the project's own writing rule requires public/tracked sources only (AGENTS.md, README.md, docs/, bin/ header comments).chapters/05-pr-merge-authority.md:48- Line 48 (and the exercise-2 prompt/expectations built on it at lines 87, 92-93) states that chapter 3's PR was already merged after the captain said '合并吧', citing it as a settled precedent for 'yolo 关着时最朴素的合并流程'. But perdata/backlog.md,learn-fm-ch3is still listed under 'In flight' (not 'Done'), its PR has no merged marker, and the live PR list shows PR docs(chapters): write chapter 3 on crewmates and worktree isolation #4 (chapter 3) still open with no review — matching the user intent's own framing that 'chapters 3 and 4 are still going through the quality pipeline'. The claim is fabricated/premature, not traceable to any authoritative source, and directly undercuts the chapter's own instruction to the reader not to invent unverifiable history ('不要编'). A reader running exercise 2 to verify against 'PR 链接或提交记录' will find this false. Fix by dropping the chapter-3 half of this example (keep only the chapter-2 precedent) until chapter 3 has actually merged.chapters/05-pr-merge-authority.md:9- Lines 9 and 21 cite "AGENTS.md 第 7 节「Selected delivery path and merge authority」" as if that were section 7's title. In the actualAGENTS.md, section 7 is titled 'Task lifecycle'; 'Selected delivery path and merge authority' is a###subsection nested inside it. A reader trying to locate '第 7 节' by that name in AGENTS.md would not find a section with that title. The quoted content itself is accurate — only the section label is off.🔧 Fix applied.
✅ Re-checked - no issues remain.
gh-axi, which confirms the corrected claims are accurate, but that is a manual fact-check of the document, not a live run of the exercise as an end user would experience it.; guard-no-captain-private-data-quoted: Confirming the absence of private-data quoting is a document-content check, not something with a live product surface to drive - there is no application behavior to exercise here, only prose to read.; guard-no-false-ch3-merged-claim: Same as above - this is a factual-accuracy read of static tutorial prose, not a live product interaction.python3 scripts/check-docs.pypython3 scripts/check-docs.pygh-axi pr view 3gh-axi pr view 4manual re-read of chapters/05-pr-merge-authority.md diff against the three round-1 fix decisions✅ **Document** - passed
✅ No issues found.
✅ **Lint** - passed
✅ No issues found.
✅ **Push** - passed
✅ No issues found.