docs: merge upstream on-demand skill layout and doc rewrites into house - #67
Merged
Merged
Conversation
* docs: make calm easier to read Restructure the Calm mode prose into sections, lists, and tables without changing documented behavior. Every original heading, anchor, fenced code block, inline-code span, link target, number, and quoted string is preserved. * docs: restore reload case in calm override lead-in The Built-in tool override collisions lead-in covers a session that reloads with Calm already on, as the original text did.
* docs: make turnend-guard easier to read Restructure the turn-end guard doc's prose into shorter sections, lists, and tables without changing documented behavior. Every original heading, anchor, inline identifier, link target, and number is kept. * no-mistakes(review): Restore legacy-only scope on TERM retirement sentence * no-mistakes(review): Name Cursor park behavior in live e2e test line
…henguid#5872) * docs: move situational AGENTS.md sections into on-demand skills Backpass memory optimization: shrink the always-loaded AGENTS.md by moving situational contracts (home layout, session-start recovery, validation and landing supervision, scout completion, away/quiet supervision, Relay ownership) into agent-only skills loaded at their triggers, with a trigger index skill. * docs: classify the new on-demand skills' documentation audience Register the seven new agent-only skills as agent-runtime docs and fix a link in validation-supervision that kept its AGENTS.md-relative path. * docs: close load-timing gaps found by the live regression check - load validation-supervision whenever an ask-user finding is decided or answered, so forbid --yes and process-every-return reach the worker - keep the mid-task captain-ask rule, the unconfirmed network-checks rule, and the worker account pin rule inline in AGENTS.md - fix cross-references that still pointed at moved AGENTS.md sections
jazz127
added
the
house-only
This was referenced Sep 27, 2026
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
3 participants
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
Bring the latest upstream firstmate
maininto the fork'shouseline, and carry each of our own house features' instruction text into upstream's new layout through that feature's ownhousefeature/branch.Upstream has three new commits since
houselast merged it: kunchenguid/firstmate PR 5872 moves situational sections of the always-loaded AGENTS.md into on-demand agent-only skills (operational-home-layout, session-start-recovery, validation-supervision, ship-landing, scout-completion, away-quiet-supervision, a trigger index, plus fmx-respond additions), and two readability rewrites of docs/turnend-guard.md and docs/calm.md. A trial merge conflicts only in AGENTS.md, in two places where upstream replaced a whole section with a skill pointer whilehousehad added lines inside it: the home-layout listing (house added the optional seat inconfig/crew-dispatch.json, theprojectvalue ofconfig/herdr-presentation-spaces,config/ready-session-timeout, and the<id>.ready-timeoutstate record) and the PR ready/landing section (house added the PR reporting-boundary evidence read-back,evidence-validation=failed, stale-attestation diagnostic, PR-body preflight, and contradictory scenario-claim lines). Every other house addition merges cleanly.Changes to our own features' text must go through each owning feature's durable
housefeature/<name>branch, not be edited directly on the upstream-merge branch, so each feature stays self-contained and extractable.What Changed
This merge brings upstream
mainat49a218bbintohouseas a merge commit. It takes upstream's on-demand skill pointers for the two conflicting AGENTS.md sections and includes the upstream rewrites ofdocs/turnend-guard.mdanddocs/calm.md. All other house additions remain.The following nine house instruction lines are deliberately absent until their owning feature branches update the new skills:
config/crew-dispatch.json: optional seat -housefeature/dock-seat-credentials.config/herdr-presentation-spaces:projectmode -housefeature/herdr-project-spaces.config/ready-session-timeout: opt-in ready worker stop -housefeature/ready-session-timeout.<id>.ready-timeout: stopped-worker state record -housefeature/ready-session-timeout.housefeature/evidence-boundary-coverage.evidence-validation=failedreporting marker -housefeature/evidence-boundary-coverage.housefeature/attestation-head-boundary.housefeature/pr-evidence-preflight.housefeature/evidence-contradiction.These are four follow-up areas delivered through seven owning
housefeature/*branches: dispatch seat, Herdr project spaces, ready-session timeout, and PR evidence validation. Each branch first receives its own update PR. Merge this upstream PR intohousefirst, then merge the sevenhousefeature/*integration PRs intohouseimmediately afterward. Do not mergehouseinto those feature branches.Risk Assessment
A documentation and instruction merge. The nine omitted house lines are assigned above to follow-up feature branches; those branches must land immediately after this merge.
Testing
evidence-artifact: /tmp/fm-firstmate-upstream-5872-merge-r1/doc-checks.txt
evidence-command: bash /tmp/fm-firstmate-upstream-5872-merge-r1/capture-evidence.sh > /tmp/fm-firstmate-upstream-5872-merge-r1/doc-checks.txt 2>&1
evidence-captured: 2026-09-27T08:29:22Z
The merge touches instruction prose and a docs manifest. The captured local checks are synthetic/offline built-CLI validation: the documentation checker, its focused test, a whitespace check, and the merge-parent read. No runtime scenario was driven against a real account. The nine omitted lines are assigned above to their feature branches.
Pipeline
Updates from git push no-mistakes
✅ **intent** - passed
✅ No issues found.
✅ **Rebase** - passed
✅ No issues found.
✅ **Review** - passed
✅ No issues found.
git diff --stat c62f9818 46264a23(all 16 changed files are AGENTS.md, .agents/skills/, or docs/)bin/fm-doc-audience-check.sh(the manifest's real consumer: ok, surfaces=118, local_links=709)git grepfor leftover merge-conflict markers in AGENTS.md, .agents, and docs (none found)git log -1 --format=%P HEAD(merge parents are house c62f9818 and upstream 49a218bb)✅ **Document** - passed
✅ No issues found.
✅ **Lint** - passed
✅ No issues found.
✅ **Push** - passed
✅ No issues found.