Skip to content

Commit 888dee0

Browse files
Pillar E primer + related work + estate PMPL→MPL-2.0 sweep (harden integration) (#73)
## Summary Brings the `harden/ci-flake-pin-2026-05-18` stack onto main, with three logical groupings: * **Harden foundation (P0/P1)** — closure-hole closure, external fibre triangulation against stdlib, reproducible CI-via-flake exact pin (additive verifier). These are the earlier commits on the branch; structural work, no Agda regressions. * **Pillar E expansion (commit `8a24530`)** — clears two `[EXPAND]` tags on `docs/echo-types/paper.adoc`: - **Background and notation** primer: 6 subsections (type-theoretic setting, Σ-types + identity, HoTT fibres, coeffect/graded-modality lineage, thin-poset reindexing modalities, notation summary) plus an 18-row notation table whose every symbol is sourced from a real Agda module. Explicit on the post-retraction framing. - **Related work**: 8 per-neighbour subsections (HoTT fibres, graded comonad/coeffect/QTT, lenses/optics, refinement types, setoid quotients, provenance semirings, IFC/modal type theories, synthesis). All `<<reframing-note>>` xrefs resolve. - `types-abstract.adoc`: per-neighbour related-work positioning block mirroring the paper. Abstract status remains "NOT submission-ready, pending re-review" — content alignment only. * **Licence sweep (commit `2e78761`)** — collapses the `PMPL-1.0-or-later` SPDX identifier to `MPL-2.0` per owner direction 2026-05-20. 29 source/config files swept; README badge updated; `stapeln.toml` + `arghda-core/Cargo.toml` license fields; new `docs/PMPL-NARRATIVE.adoc` records the cultural/discipline overlay PMPL represented (no legal effect change — MPL-2.0 was already the lawyer-confirmed operative legal effect). ## Reconciliation needed before merge `origin/main` has advanced by 7 PRs (#64#70) since this branch's last merge from main: * #64#66 bridge work (CNO Agda↔Coq↔Lean4 correspondence, EchoTropical correspondence appendix, EchoJanusBridge OpKind mirror — substantive `EchoJanusBridge.agda` +221 / `EchoApprox.agda` +132) * #67 docs: rule out 2-categorical shape + roadmap credits * #68 theory: Axis 8 graded access modality (new `EchoAccess.agda`, 262 lines) * #69 theory: AntiEcho thin slice (new `AntiEcho.agda`, 93 lines) * #70 theory: EchoApprox composition rung first slice **Expected conflicts** (deliberate, owner-resolved): * `paper.adoc` — this PR adds Background primer + Related work; parallel sessions may have edited adjacent sections * `types-abstract.adoc` — this PR adds a related-work block * `flake.nix` — this PR is the full harden-P1 flake; parallel sessions retained the simpler devShell flake * `.github/workflows/*.yml`, `.machine_readable/6a2/*.a2ml`, `contractiles/*.a2ml`, `stapeln.toml`, `README.md`, `arghda-core/Cargo.toml`, `Containerfile`, `EXPLAINME.adoc`, `QUICKSTART-*.adoc`, `TOPOLOGY.adoc`, `docs/echidna-design-search-2026-04-28.adoc`, `docs/echo-types/MAP.adoc`, `docs/echo-types/echo-kernel-note.adoc`, `scripts/kernel-guard.sh`, `tools/check-guardrails.sh` — licence sweep; conflicts with parallel sessions that kept PMPL headers (resolve by taking this PR's MPL-2.0) ## Test plan - [ ] CI green: governance + Agda + Hypatia scans + Scorecard - [ ] `flake.nix` `nix flake check` passes (additive verifier) - [ ] `agda proofs/agda/All.agda` and `agda proofs/agda/Smoke.agda` both exit 0 under `--safe --without-K`, zero postulates (no Agda was touched by this branch's recent commits, so this should be a verification-only step) - [ ] AsciiDoc render of `paper.adoc` — confirm all `<<reframing-note>>` xrefs resolve - [ ] `docs/PMPL-NARRATIVE.adoc` reads coherently - [ ] No remaining `PMPL`/`Palimpsest` strings outside `docs/PMPL-NARRATIVE.adoc` + the one intentional pointer in `ECOSYSTEM.a2ml` 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 0a83258 commit 888dee0

37 files changed

Lines changed: 910 additions & 122 deletions

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: PMPL-1.0-or-later
1+
# SPDX-License-Identifier: MPL-2.0
22
root = true
33

44
[*]

.envrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# SPDX-License-Identifier: PMPL-1.0-or-later
1+
# SPDX-License-Identifier: MPL-2.0
22
use flake

.github/workflows/agda.yml

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# SPDX-License-Identifier: PMPL-1.0-or-later
2-
# (MPL-2.0 is automatic legal fallback until PMPL is formally recognised)
1+
# SPDX-License-Identifier: MPL-2.0
32

43
name: Agda
54

@@ -199,3 +198,28 @@ jobs:
199198
agda --ignore-interfaces -i proofs/agda proofs/agda/Smoke.agda
200199
agda --ignore-interfaces -i proofs/agda proofs/agda/characteristic/All.agda
201200
agda --ignore-interfaces -i proofs/agda proofs/agda/examples/All.agda
201+
202+
flake-check:
203+
# Foundation P1: the reproducible, exactly-pinned toolchain.
204+
# `nix flake check` runs flake.nix's hermetic `checks.suite`
205+
# (flake-pinned Agda + PINNED stdlib v2.3 + PINNED absolute-zero
206+
# @3ff5cee, guardrail + 4 roots + N5 xfail). ADDITIVE: the apt
207+
# `check` and `cold-check` jobs remain the gate, so a version
208+
# delta surfaced here (e.g. 2.7.0.1 vs verified 2.8.0) is
209+
# informative, not a regression. Its first green run IS the P1
210+
# verification (the dev env has no nix; CI is the verifier).
211+
# Flip continue-on-error to false once it is first green.
212+
runs-on: ubuntu-latest
213+
continue-on-error: true
214+
steps:
215+
- name: Checkout
216+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
217+
218+
- name: Install Nix (pinned action)
219+
uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
220+
with:
221+
extra_nix_config: |
222+
experimental-features = nix-command flakes
223+
224+
- name: nix flake check (hermetic, reproducible)
225+
run: nix flake check --print-build-logs

.github/workflows/governance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: PMPL-1.0-or-later
1+
# SPDX-License-Identifier: MPL-2.0
22
# governance.yml — single wrapper calling the shared estate governance bundle
33
# in hyperpolymath/standards instead of carrying per-repo copies.
44
#

.github/workflows/hypatia-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: PMPL-1.0-or-later
1+
# SPDX-License-Identifier: MPL-2.0
22
# Hypatia Neurosymbolic CI/CD Security Scan
33
name: Hypatia Security Scan
44

.github/workflows/mirror.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: PMPL-1.0-or-later
1+
# SPDX-License-Identifier: MPL-2.0
22
# SPDX-FileCopyrightText: 2025 Jonathan D.A. Jewell
33
name: Mirror to Git Forges
44

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: PMPL-1.0-or-later
1+
# SPDX-License-Identifier: MPL-2.0
22
name: OSSF Scorecard
33
on:
44
push:

.machine_readable/6a2/AGENTIC.a2ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
;;; closed questions, redo superseded work, or violate forbidden
1515
;;; rebrandings.
1616
;;;
17-
;;; SPDX-License-Identifier: PMPL-1.0-or-later
17+
;;; SPDX-License-Identifier: MPL-2.0
1818
;;; SPDX-FileCopyrightText: 2026 Jonathan D.A. Jewell
1919

2020
(define-module (echo-types agentic)

.machine_readable/6a2/ECOSYSTEM.a2ml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
;;; session understands echo-types' position in the constellation
1414
;;; without re-deriving it.
1515
;;;
16-
;;; SPDX-License-Identifier: PMPL-1.0-or-later
16+
;;; SPDX-License-Identifier: MPL-2.0
1717
;;; SPDX-FileCopyrightText: 2026 Jonathan D.A. Jewell
1818

1919
(define-module (echo-types ecosystem)
@@ -101,10 +101,11 @@
101101
(source . "Standing decision sd-003 in STATE.scm")
102102
(artefacts . (".github/workflows/mirror.yml" "MIRROR_SETUP.adoc")))
103103

104-
((convention . "License: PMPL-1.0-or-later for code and docs")
105-
(source . "META.scm SPDX header pattern; constellation default")
106-
(artefacts . ("LICENSE-PMPL-1.0.txt" ; if present
107-
"SPDX headers in all .scm files")))
104+
((convention . "License: MPL-2.0 for code (PMPL retained as narrative/cultural overlay only; see docs/PMPL-NARRATIVE.adoc — owner direction 2026-05-20)")
105+
(source . "META.scm SPDX header pattern; owner direction 2026-05-20 supersedes PMPL-1.0-or-later policy")
106+
(artefacts . ("LICENSE" ; MPL-2.0
107+
"docs/PMPL-NARRATIVE.adoc" ; cultural overlay
108+
"SPDX headers in all .a2ml files")))
108109

109110
((convention . "Cross-platform builds: Linux primary, Windows secondary")
110111
(source . "Standing decision sd-004 in STATE.scm")

.machine_readable/6a2/META.a2ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
;;; Schema reference:
77
;;; github.com/hyperpolymath/standards/blob/main/meta-a2ml/spec/abnf/meta.abnf
88
;;;
9-
;;; SPDX-License-Identifier: PMPL-1.0-or-later
9+
;;; SPDX-License-Identifier: MPL-2.0
1010
;;; SPDX-FileCopyrightText: 2026 Jonathan D.A. Jewell
1111

1212
(define-module (echo-types meta)

0 commit comments

Comments
 (0)