Skip to content

fix(#1283 follow-up): provenance drift + grammar in B-0172 calibration recovery#1287

Merged
AceHack merged 1 commit intomainfrom
fix/b-0172-recovery-provenance-drift-and-grammar-otto-2026-05-03
May 3, 2026
Merged

fix(#1283 follow-up): provenance drift + grammar in B-0172 calibration recovery#1287
AceHack merged 1 commit intomainfrom
fix/b-0172-recovery-provenance-drift-and-grammar-otto-2026-05-03

Conversation

@AceHack
Copy link
Copy Markdown
Member

@AceHack AceHack commented May 3, 2026

Summary

Three real findings from #1283 review (post-merge):

  1. Wrong commit hash — Recovery section cited cf1dc7b (actually guess deps: Bump FsUnit.xUnit from 7.1.0 to 7.1.1 #1's branch hash); footer correctly listed 4a3d583. Fixed to consistently use 4a3d583.
  2. False merge claim — Recovery section + footer claimed "merged to main via PR free-memory: guess #002 — in-the-moment guess on B-0172 skill-domain-plugin-packaging (Otto 2026-05-03) #1282" but free-memory: guess #002 — in-the-moment guess on B-0172 skill-domain-plugin-packaging (Otto 2026-05-03) #1282 never merged (closed as superseded after GROUND-TRUTH-RECOVERY: B-0172 calibration delta (65%) — context-dependent pattern refinement #1283's chained-rebase-merge). Fixed to clarify the actual landing path.
  3. Grammar fix re-applied — Line 7 grammar fix ('why packages skills' → 'why package skills') was applied on free-memory: guess #002 — in-the-moment guess on B-0172 skill-domain-plugin-packaging (Otto 2026-05-03) #1282's branch but lost when free-memory: guess #002 — in-the-moment guess on B-0172 skill-domain-plugin-packaging (Otto 2026-05-03) #1282 was closed-as-superseded.

Lessons

  • Branch-chain provenance hygiene: when chained PRs land via rebase-merge, fixes on the parent (closed) branch can be lost
  • Hash-copy hygiene: cf1dc7b was guess deps: Bump FsUnit.xUnit from 7.1.0 to 7.1.1 #1's branch hash — copy-paste error during recovery commit. Substrate-claim-checker's specific-output-drift sub-class would catch this when v1+ adds it (per B-0170)

🤖 Generated with Claude Code

…n recovery

Three real findings from #1283 review (post-merge):

1. **Wrong commit hash**: Recovery section's provenance cited `cf1dc7b`
   (which is actually guess #1's branch hash) but the footer correctly
   listed `4a3d583`. Fixed to consistently use `4a3d583`.

2. **False merge claim**: Recovery section + footer both said "merged
   to main via PR #1282" — but #1282 never merged (was closed as
   superseded after #1283's chained-rebase-merge absorbed both guess +
   recovery commits). Fixed to clarify: landing happened via PR #1283;
   #1282 was the original guess-only PR that got closed as superseded.

3. **Grammar fix re-applied**: Line 7 grammar fix ("why packages
   skills" → "why package skills") was applied on PR #1282's branch
   but lost when #1282 was closed-as-superseded (the fix didn't make
   it into #1283's branch chain). Re-applied here.

Lessons:

- **Branch-chain provenance hygiene**: when chained PRs land via
  rebase-merge, the chained-on-top PR (#1283) absorbs the parent's
  commits, but if the parent (#1282) gets closed unmerged, fixes
  applied to the parent's branch can be lost. Future-Otto: when
  closing a chained PR, verify any post-creation fixes have propagated
  to the merging PR's branch
- **Hash-copy hygiene**: the `cf1dc7b` was guess #1's branch hash;
  copy-paste error during recovery commit. Substrate-claim-checker's
  count-drift / specific-output-drift sub-class would catch this if
  v1+ adds it (per B-0170)

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Copilot AI review requested due to automatic review settings May 3, 2026 03:05
@AceHack AceHack enabled auto-merge (squash) May 3, 2026 03:05
@AceHack AceHack merged commit 2704c49 into main May 3, 2026
25 of 26 checks passed
@AceHack AceHack deleted the fix/b-0172-recovery-provenance-drift-and-grammar-otto-2026-05-03 branch May 3, 2026 03:07
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR cleans up provenance and wording in an architectural-intent calibration artifact (B-0172) to keep the guess/recovery record internally consistent after the #1283 rebase-merge chain.

Changes:

  • Fixes a grammar regression in the “why package skills…” framing line.
  • Corrects commit/PR provenance in the ground-truth “Read source” note and the footer (commit hash + actual landing path after #1282 was superseded).

@AceHack
Copy link
Copy Markdown
Member Author

AceHack commented May 3, 2026

AceHack added a commit that referenced this pull request May 3, 2026
…nal contradiction (3 PRs of findings) (#1290)

Three real findings from #1286 + #1287 + #1288 review:

**#1286**: MEMORY.md entry for architectural-intent-guesses/ directory was
LOST when #1282 closed-as-superseded. Fix was on #1282's branch but
didn't propagate to #1283's chained merge. Re-added newest-first entry
pointing at architectural-intent-guesses/README.md with series
progression note (guess #1 48% + guess #2 65% + pattern observations
including the architect-vs-UX divide finding).

**#1287**: Grammar — "landed to main" / "landing to main" → "merged
into main". Two instances fixed (recovery section + footer).

**#1288**: P1 internal contradiction in calibration delta table —
"Composition-as-contracts" was listed under "What I got" while the
refined-analysis paragraph below said it was inferred-from-principles
NOT named by Aaron. Fixed by moving composition-as-contracts (+
versioning-as-lineage + isolation-as-namespace) to the "What I missed"
column with explicit "Inferred-from-principles, not load-bearing"
classification — consistent with the refined-analysis paragraph.

Lessons:

- **Branch-chain provenance hygiene** (Otto-355 derivative): when a
  chained PR's parent gets closed-as-superseded, fixes on the parent's
  branch can be lost. Even my second attempt to address this (#1287
  fix) missed re-applying #1282's MEMORY.md entry. Future-Otto: when
  closing a parent PR, explicitly enumerate which fixes need to
  propagate to the merging chain
- **Internal-contradiction at write-time**: the calibration table's
  "got" column listed composition-as-contracts while the analysis below
  classified it as missed; this is intra-file semantic-equivalence drift
  that v1+ substrate-claim-checker would catch via its semantic-
  equivalence sub-class

Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
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.

2 participants