Skip to content

memory(lfg-acehack-fork): hard-reset safety addendum + content-equivalence audit rule (round-9 peer-harness save)#826

Merged
AceHack merged 1 commit intomainfrom
memory/lfg-acehack-content-equivalence-amara-2026-04-29
Apr 29, 2026
Merged

memory(lfg-acehack-fork): hard-reset safety addendum + content-equivalence audit rule (round-9 peer-harness save)#826
AceHack merged 1 commit intomainfrom
memory/lfg-acehack-content-equivalence-amara-2026-04-29

Conversation

@AceHack
Copy link
Copy Markdown
Member

@AceHack AceHack commented Apr 29, 2026

Summary

Round-9 multi-AI feedback packet preserved a load-bearing safety rule about AceHack→LFG hard-reset.

What the peer-harness check caught

A prior reset-readiness audit ran git diff --diff-filter=A on origin/main..acehack/main, found no AceHack-only files, and inferred 19/23 PRs were ALREADY-COVERED. The peer-harness check (Codex independently sampling, Grok attacking methodology) caught the gap: file-presence is not content-equivalence. Deeper probe of .github/workflows/gate.yml + .github/codeql/codeql-config.yml found shared files with unique AceHack content NOT on LFG.

Hard-reset is BLOCKED until content-equivalence audit runs cleanly.

Where it lands

Addendum to existing memory/feedback_lfg_master_acehack_zero_divergence_fork_double_hop_aaron_2026_04_27.md (the canonical fork-topology home). No new memory island — consolidation discipline (B-0105) honored.

Key rules (verbatim from the packet)

No AceHack-only files ≠ no AceHack-only content.
Same path is not same substrate.
Hard reset is allowed only after content-loss proof, not content-loss confidence.

Required content-equivalence audit (BEFORE any hard-reset)

# Both checks required:
git diff --name-status --diff-filter=A origin/main..acehack/main   # AceHack-only files
git diff --numstat --diff-filter=M origin/main..acehack/main        # shared files modified
git diff origin/main..acehack/main -- <path>                         # content-compare
git merge-base --is-ancestor <sha> origin/main                       # reachability

Hard-reset gate (binding)

Hard-reset can only return to the table after:
  - all NEEDS-FORWARD-SYNC items have been forwarded to LFG
  - all OBSOLETE / INTENTIONAL-DROP items have rationale recorded
  - all NEEDS-HUMAN-REVIEW items resolved by maintainer sign-off
  - final content-loss audit returns clean

Anti-overcorrection

145 commits is still not the work queue.
Unverified content-loss candidates are the work queue.

Test plan

  • Verbatim packet content preserved as addendum (channel rule)
  • §33 archive header NOT applicable (in-repo memory file edit, not external-conversation import)
  • No new memory file (consolidation discipline)
  • MEMORY.md paired-edit updated

🤖 Generated with Claude Code

…lence audit rule (round-9 peer-harness save)

Multi-AI feedback packet (round 9) preserved a load-bearing
safety rule about AceHack→LFG hard-reset: a prior audit used
`git diff --diff-filter=A` to check for AceHack-only FILES,
found none, and inferred 19/23 PRs were ALREADY-COVERED. The
peer-harness check (Codex sampling, Grok attacking
methodology) caught the gap: file-presence is not content-
equivalence. Deeper probe of .github/workflows/gate.yml +
.github/codeql/codeql-config.yml found shared files with
unique AceHack content NOT on LFG.

Hard-reset is now BLOCKED until content-equivalence audit
runs cleanly.

Landed as addendum to existing
memory/feedback_lfg_master_acehack_zero_divergence_fork_double_hop_aaron_2026_04_27.md
(consolidation discipline — no new memory island; addendum
to canonical fork-topology home).

Key rules captured verbatim:
  "No AceHack-only files ≠ no AceHack-only content."
  "Same path is not same substrate."
  "Hard reset is allowed only after content-loss proof,
   not content-loss confidence."

Required audit methodology:
  - both --diff-filter=A AND --diff-filter=M shared-file
    content-compare
  - git merge-base --is-ancestor for reachability
  - per-PR classification with explicit rationale
  - hard-reset gate: all NEEDS-FORWARD-SYNC forwarded +
    all OBSOLETE/INTENTIONAL-DROP rationale recorded +
    NEEDS-HUMAN-REVIEW resolved + final audit clean

Anti-overcorrection: 145 commits is not the work queue;
unverified content-loss candidates are the work queue.

MEMORY.md paired-edit comment updated.

Per the consolidation discipline: this is an addendum to
an existing memory file, not a new conceptual island.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Copilot AI review requested due to automatic review settings April 29, 2026 07:44
@AceHack AceHack enabled auto-merge (squash) April 29, 2026 07:45
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 updates the fork-topology “canonical home” memory to include a hard-reset safety addendum clarifying that “no AceHack-only files” is not sufficient evidence of content-equivalence, and records a required audit procedure before any destructive reset.

Changes:

  • Added a hard-reset safety addendum describing the prior audit gap and the corrected methodology (including required diff/reachability commands).
  • Updated memory/MEMORY.md fast-path note to reflect the paired edit and point readers at the updated canonical memory.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
memory/feedback_lfg_master_acehack_zero_divergence_fork_double_hop_aaron_2026_04_27.md Adds the load-bearing “content-equivalence audit” requirement and hard-reset gate criteria as an addendum.
memory/MEMORY.md Updates the fast-path header comment to reflect the paired edit and keep the index current.

@AceHack AceHack merged commit 3f7f852 into main Apr 29, 2026
27 checks passed
@AceHack AceHack deleted the memory/lfg-acehack-content-equivalence-amara-2026-04-29 branch April 29, 2026 07:48
AceHack added a commit that referenced this pull request Apr 29, 2026
…n note + slot-semantics on MEMORY.md HTML comment (Amara round-10) (#827)

* memory(fork-audit): R/C/T diff-filter coverage + plumbing-vs-porcelain note + slot-semantics on MEMORY.md HTML comment (Amara round-10)

Three corrections from Amara round-10 review of PR #826
(now-merged fork-topology safety addendum):

1. Audit was missing rename/copy/type-change coverage. The
   slogan "same path is not same substrate" has an inverse:
   "different path can still be same substrate." Renames and
   copies need content comparison, not path equality.
   Replaced `--diff-filter=A` + `--diff-filter=M` with a
   single comprehensive `--diff-filter=ACMRT --find-renames`
   call + per-status interpretation guide.

2. Plumbing-vs-porcelain note added: human audit is fine with
   `git diff`; scripted tooling should prefer
   `git diff-tree -r --name-status --find-renames` (plumbing)
   for output stability + config-immunity, OR add
   `-c core.quotepath=false --no-ext-diff` to porcelain for
   predictability.

3. MEMORY.md HTML comment renamed `paired-edit:` →
   `latest-paired-edit:` per Amara: the comment is acting as
   a single-slot ledger that loses prior markers each time;
   making the slot semantics explicit prevents future
   confusion that only one paired edit exists. (The prior
   round-9 marker was overwritten without ledger preservation
   — a chronic drift class. Future enhancement: paired-edit
   log file if multi-slot history becomes necessary.)

Round-10 keepers preserved in audit prose:
  Added files are a clue.
  Modified shared files are the trap.
  Content equivalence is the gate.

The four meta-rules from the round-10 packet that are NOT
landing as new substrate (per B-0105 consolidation gate):
  - "Paired-edit failure must stop before commit" — process
    discipline; will absorb into existing paired-edit lint
    documentation when consolidation pass picks it up.
  - "Safety blockers should land as soon as green" —
    discipline-level rule; honored in this PR's intent.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* fix(fork-audit): enable copy detection + D semantic-regression separate pass + CI cost note (Amara round-11)

Three corrections to PR #827's fork-audit additions:

1. --diff-filter=ACMRT requires BOTH --find-renames AND
   --find-copies. Previous form had `C` in the filter but only
   enabled rename detection, so copied entries would never
   appear. Added --find-copies. Plumbing form likewise uses
   `-M -C`.

2. D=deleted moved to a SEPARATE pass. Not AceHack-content-
   loss in the AceHack→LFG hard-reset direction (LFG already
   lacks the file), but can be SEMANTIC REGRESSION if AceHack
   intentionally removed bad/stale/unsafe content. Review
   separately when the deleted path is workflow / security
   config / tooling / governance substrate.

3. Copy-detection cost note for CI tooling. -C has an O(n²)
   fallback comparing each added file to each deleted file.
   Added two-pass tooling pattern:
     fast pass — A/M/R/T with rename detection only
     slow pass — bounded -C (e.g. -l200) for suspicious clusters
   Human one-shot audit can stay unbounded.

Best round-11 keeper:
  Renames need -M.
  Copies need -C.
  Deletes need judgment.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

---------

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