Conversation
…minology section Per Otto-347 2nd-agent verify (audit + 2nd-agent both confirm): of batch-3's 6 UPSTREAM-RHYTHM commits (44-46, 48, 58-59), only commit #44 (268100a) had substantive substrate not on LFG. Commits #45/#46/#58/#59 are SUPERSEDED-DISCARD (verified via independent LFG-side merges PR #137 and PR #139); commit #48's UPSTREAM-RHYTHM portion is also SUPERSEDED. This PR brings forward the three-surfaces vocabulary (upstream/fork/SUT, with SUT/factory orthogonality) from AceHack commit 268100a, rewritten into LFG's current wording per the option-c discipline. The substantive contribution: clarifies that SUT and factory both live inside either upstream or fork; the upstream↔fork rhythm governs PR cadence only, while the SUT↔factory boundary lives in docs/FACTORY-METHODOLOGIES.md. Commit #48's BACKLOG ruleset-audit-findings expansion is FLAGGED for Aaron's sanity-check (auditor recommended human-decide before landing — the LFG row is currently terse, may have been intentionally trimmed, may want re-expansion or not). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
There was a problem hiding this comment.
Pull request overview
Adds a terminology clarification to UPSTREAM-RHYTHM so the doc can cleanly talk about repo-axis vocabulary (upstream/fork) vs role-axis vocabulary (SUT/factory), and how those axes compose.
Changes:
- Adds a “Terminology — three surfaces, two vocabularies” section defining upstream, fork, and SUT (and contrasting SUT vs factory).
- Documents the orthogonality: SUT/factory distinction is independent of upstream/fork location.
- Adds a lineage note pointing back to the AceHack commit and the option-c sync audit doc.
…oundary Copilot caught: `docs/**.tla` is stale (no TLA+ files under docs/); LFG migrated TLA+ specs to `tools/tla/specs/*.tla`. Plus the directory-list contradicted the doc's own role-not-location framing (TLA+ under tools/ but the paragraph categorized tools/ as factory). Fix: 1. `docs/**.tla` → `tools/tla/specs/**.tla` 2. Annotate that TLA+ specs are SUT-by-role even though they live under tools/ 3. Add explicit worked example clarifying role-not-location Per Otto-347 cost-asymmetry: 2nd-agent (Copilot) caught a stale-path that I cherry-picked verbatim from AceHack without verify. Same failure mode as Otto-2026-04-26 stale-mental-model pattern. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
auto-merge was automatically disabled
April 26, 2026 18:09
Pull Request is not mergeable
AceHack
deleted the
sync/acehack-to-lfg-batch-3-upstream-rhythm-three-surfaces
branch
AceHack
added a commit
that referenced
this pull request
Apr 27, 2026
…on (#636) * tick-history: 18:02Z sync option-c COMPLETE + substrate transition Sync work done. Task #284 marked completed. Forward-sync PRs landed: #592 batch-1, #633 batch-2 (23 per-row-files), #634 batch-3 in CI, #635 batch-4. Batches 5+6 ALL SUPERSEDED-DISCARD per Otto-347 2nd-agent verify. Reverse-sync via Option C (close PR #15, UPSTREAM-RHYTHM cadence going forward). Substrate yield exceeded sync output: ~12 memory files + 3 lineage anchors (harbor+blade=Radical Candor, SRE-as-Substrate-RE, Rodney's-Razor=Occam+Brooks+Kolmogorov+Bennett+Gell-Mann) emerged during the sync work. Otto-347 2nd-agent verify load-bearing in both directions (caught real loss on #618 + confirmed 7 SUPERSEDED calls). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix: standardize "Option C" casing in tick-history row 2026-04-26T18:02Z (Copilot P2) Copilot P2 nit on PR #636: row mixed "option-c" (twice) and "Option C" (once). Standardize on "Option C" across the row so later searches over tick-history don't miss matches. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
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.
Summary
Batch-3 of task #284 AceHack→LFG cherry-pick sync (option-c rewrite-into-current-architecture).
6 commits audited, results:
Otto-347 verification trail
What this PR adds
New 'Terminology — three surfaces, two vocabularies' section in
docs/UPSTREAM-RHYTHM.md:Includes lineage note pointing at AceHack commit 268100a + the option-c sync audit doc.
Flagged for Aaron's review
Commit #48's BACKLOG ruleset-audit-findings expansion: auditor flagged that LFG's current 'Branch-protection required-check' BACKLOG row is terse, may have been intentionally trimmed when migrated to per-row-files, may not want re-expansion. Recommend human-decide before landing.
Test plan