Skip to content

fix+feat: paper.adoc conflict resolution + related-work [EXPAND] cleared + Track C land#120

Merged
hyperpolymath merged 1 commit into
docs/consolidate-roadmaps-and-sigma-skepticism-2026-05-26from
fix/paper-conflict-and-lane-closeout-2026-05-26
May 26, 2026
Merged

fix+feat: paper.adoc conflict resolution + related-work [EXPAND] cleared + Track C land#120
hyperpolymath merged 1 commit into
docs/consolidate-roadmaps-and-sigma-skepticism-2026-05-26from
fix/paper-conflict-and-lane-closeout-2026-05-26

Conversation

@hyperpolymath
Copy link
Copy Markdown
Owner

Summary

Stacked on #118. Closes the three remaining session items from the user-prioritised batch:

  1. 🔴 P0 — paper.adoc merge-conflict resolution
  2. Lane 1 close-out item 1paper.adoc [EXPAND] tag 2 (related-work pass) cleared
  3. Lane 2 close-out item 2 — Track C (per-example raw-Σ counter-programs) landed

1. P0 conflict resolution

Three unresolved git conflict markers at paper.adoc:557,1137,1156 from merge commit cab99f1 (reframe/retraction-2026-05-18). Resolution:

  • HEAD chunk (579 lines, lines 558-1136): substantive proof-size + threats-to-validity + related-work analysis. Kept verbatim.
  • Incoming chunk (17 lines, lines 1138-1155): [EXPAND] note + 2-cat ruleout note. Kept verbatim.
  • Conflict markers stripped, no content lost.
  • Duplicate == Reframing note (2026-05-18) at lines 1207-1243 deleted; single canonical copy at lines 1158-1194 retained.

Net: paper.adoc 1278 → 1238 lines. Now well-formed AsciiDoc on main.

2. Related-work [EXPAND] tag 2 cleared

Discovered both stale TODO notes (related-work expansion + 2-cat ruleout fold-in) had their content silently delivered in substantive subsections of == Related work:

  • === HoTT homotopy fibres
  • === Graded comonads, coeffects, and QTT (the lineage we are motivated by, but explicitly not an instance of)
  • === Lenses and optics (the witness-transport leg) — already contains the 2-categorical rule-out at lines 948-953

Replaced both stale notes with a single explanatory NOTE pointing at the delivered subsections + docs/echo-types/comparators.adoc companion. Lane 1 close-out: only the ordinal-appendix [EXPAND] (tag 4) remains, correctly gated on the Bachmann-Howard milestone per design.

3. Track C — proofs/agda/examples/EchoVsSigma.agda

Three lemmas pairing each headline example with the small raw-Σ counter-program the Echo interface refuses to export at affine mode:

Lemma Distinguishes
parser-sigma-distinguishes echo-parse-nested vs echo-parse-pair at parses ≡ true (via proj₁ + paren-nested≢paren-pair)
provenance-sigma-distinguishes echo-prov-true vs echo-prov-false at project ≡ 0 (via prov ∘ proj₁ + true≢false)
absint-sigma-distinguishes echo-pos-p1 vs echo-pos-p2 at α ≡ pos (via proj₁ + p1≢p2)

Mirrors EchoAbstractionBarrier.sigma-distinguishes at the per-example level. Together with EchoAbstractionBarrier.affine-consumer-cannot-distinguish, establishes the Gate 3 matched-positive + matched-negative pair discipline ("raw Σ would leak; Echo blocks it").

Build verification: agda proofs/agda/All.agda, proofs/agda/Smoke.agda, proofs/agda/examples/All.agda all exit 0 under --safe --without-K, zero postulates. Wired into examples/All.agda; pinned in Smoke.agda under own using block.

Roadmap updates

  • Lane 1: item 1 (related-work) now LANDED; only ordinal-appendix EXPAND tag remains (correctly out-of-scope).
  • Lane 2: item 2 (Track C) now LANDED. Only item 3 (Gate-2 nominee re-audit ≥3/4 surviving) remains for full Lane 2 close-out.

Retraction discipline (R-2026-05-18) respected throughout

No new prose introduces graded-comonad, full-universal-property, model-independence, or general-parametricity claims.

Test plan

  • agda proofs/agda/All.agda exits 0 under --safe --without-K
  • agda proofs/agda/Smoke.agda exits 0 (new Track C pins verified)
  • agda proofs/agda/examples/All.agda exits 0 (new EchoVsSigma wired)
  • agda proofs/agda/examples/EchoVsSigma.agda typechecks in isolation
  • Zero conflict markers remain in paper.adoc (grep -nE '^<<<<<<<|^=======|^>>>>>>>')
  • Single == Reframing note section (no duplicate)
  • AsciiDoc rendering of paper.adoc + roadmap.adoc is well-formed

Net diffstat: +140 / -65 across 5 files.

🤖 Generated with Claude Code

…AND] + land Track C

Three-in-one batch closing the remaining session items.

1. P0 — paper.adoc merge-conflict resolution
   - Remove three unresolved git conflict markers at lines 557, 1137,
     1156 (from merge commit cab99f1 incorporating reframe/retraction-
     2026-05-18). The HEAD chunk (579 lines of substantive proof-size /
     threats-to-validity / related-work analysis) and the incoming
     chunk (related-work [EXPAND] note + 2-cat ruleout note) both kept;
     conflict markers stripped, no content lost.
   - Delete duplicate Reframing note (37 lines at former 1207-1243);
     single canonical copy retained earlier in the file.
   - paper.adoc 1278 → 1238 lines.

2. Lane 1 close-out — paper.adoc [EXPAND] tag 2 (related-work pass)
   - Clear the two stale TODO notes (related-work expansion + 2-cat
     ruleout fold-in). Both notes' content was silently delivered in
     the substantive subsections above: §"HoTT homotopy fibres",
     §"Graded comonads, coeffects, and QTT", §"Lenses and optics (the
     witness-transport leg)" — the latter already containing the
     2-categorical rule-out at lines 948-953.
   - Replaced with a single explanatory NOTE pointing at the
     delivered subsections + the comparators.adoc companion.
   - Lane 1 close-out: only the ordinal-appendix [EXPAND] (tag 4)
     remains, gated on the Bachmann-Howard milestone per design.

3. Lane 2 close-out item 2 — Track C
   - New proofs/agda/examples/EchoVsSigma.agda. Three lemmas pairing
     each headline example with the small raw-Σ counter-program the
     Echo interface refuses to export at affine mode:
     * parser-sigma-distinguishes (echo-parse-nested vs echo-parse-
       pair at parses≡true, via proj₁ + paren-nested≢paren-pair)
     * provenance-sigma-distinguishes (echo-prov-true vs echo-prov-
       false at project≡0, via prov∘proj₁ + true≢false)
     * absint-sigma-distinguishes (echo-pos-p1 vs echo-pos-p2 at
       α≡pos, via proj₁ + p1≢p2)
   - Mirrors EchoAbstractionBarrier.sigma-distinguishes at the
     per-example level. Together with EchoAbstractionBarrier.affine-
     consumer-cannot-distinguish, establishes the Gate 3
     matched-positive + matched-negative pair discipline ("raw Σ
     would leak; Echo blocks it").
   - Builds clean under --safe --without-K, zero postulates.
   - Wired into examples/All.agda; pinned in Smoke.agda under own
     using-block.

4. Roadmap Lane 2 update
   - Mark Track C item as LANDED 2026-05-26. Gate-2 nominee re-audit
     (item 3) remains the sole open requirement for full Lane 2
     close-out.

Build verification: agda proofs/agda/All.agda, proofs/agda/Smoke.agda,
proofs/agda/examples/All.agda all exit 0 under --safe --without-K.

Retraction discipline (R-2026-05-18) respected throughout: no new
prose introduces graded-comonad, full-universal-property,
model-independence, or general-parametricity claims.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@hyperpolymath hyperpolymath merged commit 7234a8b into docs/consolidate-roadmaps-and-sigma-skepticism-2026-05-26 May 26, 2026
1 of 9 checks passed
@hyperpolymath hyperpolymath deleted the fix/paper-conflict-and-lane-closeout-2026-05-26 branch May 26, 2026 22:21
hyperpolymath added a commit that referenced this pull request May 30, 2026
…e 1 close-out annotation (#157)

## Summary

Two loose-end doc-sweeps surfaced during a repo-health survey:

### 1. Lane 5 — CLOSED via the killer-app branch

\`roadmap.adoc\` §Lane 5's unblocking condition has two branches: either
Lane 1 closes, or *"a single killer-application example emerges that
justifies a tutorial track on its own merit"*. The second branch fired
2026-05-26: \`tutorial/region_exit_audit/RegionExitAudit.agda\` is the
ephapax-L3-corroborated certified region-exit audit example, and already
carried the in-place self-description as the killer-app candidate. The
three walkthroughs (region-exit audit / epistemic erasure / provenance
debugging) all landed in May.

Changes:
- \`roadmap.adoc\` — move Lane 5 from active lanes to §"Closed lanes"
with close-out route, closing artefacts, retraction-watch, and an
explicit "Why this counts as a kill, not a deferral" subsection.
- \`tutorial/README.adoc\` — flip the [PARKED] status to CLOSED in the
heading + IMPORTANT block; convert the "Killer-app close-out check"
subsection from candidacy framing to ACCEPTED.
- \`docs/echo-types/MAP.adoc\` — update the two Lane 5 / killer-app
pointers (Walkthrough 1 bullet, track-level docs note).

### 2. Lane 1 — refresh stale close-out criterion

Lane 1's close-out criterion had \`[EXPAND]\` tag 2 (related-work pass)
listed without a LANDED marker, even though \`paper.adoc:1183\` already
records *"Related-work [EXPAND] cleared 2026-05-26"* via PR #120.
Sections §"HoTT homotopy fibres", §"Graded comonads, coeffects, and
QTT", §"Lenses and optics (the witness-transport leg)" + the
2-categorical rule-out (\`decisions/no-2-cat.adoc\`) are live;
\`comparators.adoc\` ships the single-page summary.

Changes to Lane 1:
- Mark item 1 LANDED 2026-05-26 with cross-references to the landed
paper sections + tag clearance attributions (#73 / #84 / #120). Tag 4
(ordinal consumer-evidence appendix) explicitly flagged as gated on Lane
3 and NOT load-bearing for Lane 1.
- Refresh §Bottleneck: in-repo half closed; remaining bottleneck is the
offline half of Pillar E (TYPES / CPP submission, Zenodo DOI, packaging,
outreach) per \`pillar-e-offline.adoc\`.
- Add §"Lane-level status" footer: all three falsifiable in-repo
criteria hold, but Lane 1 stays open at lane-policy because the
load-bearing question cannot be answered without the offline half.
**IN-REPO CLOSED, EXTERNALLY OPEN.**

## Test plan

- [x] Pure doc edits. Agda suite unaffected — verified clean against
post-#156 main tip earlier this session (all four typecheck lanes + both
guardrail scripts pass).
- [ ] Sceptic check: read §"Closed lanes" Lane 5 entry and confirm the
"Why this counts as a kill, not a deferral" subsection is sufficient
against the "but Lane 1 hasn't closed yet" objection.
- [ ] Cross-doc consistency: \`tutorial/README.adoc\`, \`MAP.adoc\`, and
\`roadmap.adoc\` agree on Lane 5's closed status.

## Honest scope

This PR does NOT touch the offline half of Pillar E (submission events,
DOI mint, packaging, outreach). Those are author-driven per
\`pillar-e-offline.adoc\` and remain owner-action items. Lane 1's full
closure waits on those events.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude Opus 4.7 (1M context) <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.

1 participant