Skip to content

Commit d4f4447

Browse files
authored
2026.11.19.1: rule convergence -- the descriptor's two forms, the version group in the merge, link inputs, compiler-run state, transactional publication, actions, text as UTF-8, a resolution per build program, path dependencies in the cache (mcpp#931, #952 to #960, #965, #967, #970, #972, #974) (#966)
The round recorded in `.agents/docs/2026-11-19-ecosystem-rule-convergence-design.md`, released as mcpp 2026.11.19.1. One pull request; its commits are checkpoints, and each carries its specification clause, the usage chapter in both languages, its tests and its CHANGELOG entry. | Checkpoint | Content | Issues | |---|---|---| | 1 | design record: the rules behind the issues, five causes, seven decisions, the round's scope | | | 2 | a descriptor's `mcpp` field has two forms, read by one function; publish writes the pointer form | mcpp#960 | | 3 | the version group's constraint enters the merge; a package's tables are read by the row it is built for | mcpp#956 | | 4 | whether an artifact runs here is one predicate with no branch before it | mcpp#957 | | 5 | a link's inputs are the files its words name and the files its linker reports reading; a project's own link dependency file is kept | mcpp#931 | | 6 | a row a member inherits from its workspace is the root's statement | mcpp#954 | | 7 | an action reads a link unit's objects from the engine; a plugin's feature carries its own program | mcpp#959, mcpp#955 | | 8 | a package instance has a directory of its own | mcpp#953 | | 9 | a build interrupted in another process space continues; a start refused for its size says so | mcpp#952, mcpp#958 | | 10 | a compile writes only its own attempt, and the executor publishes what it wrote; a published output survives a transient hold on Windows | | | 11 | the default platform is openkal-platform 0.31.0; the tests run under mtest 0.10.0 | | | 11b | cl.exe's `/sourceDependencies` record names what a compile read; the text of every program is decoded where it is read (mcpplibs.os 0.4.6); every JSON document replaces what is not UTF-8 | mcpp#970 | | 12 | version 2026.11.19.1 | | | 13 | the pack launchers build on the mcpplibs.os release the platform's build program links (0.4.5): one resolution held the consumer's graph and the platform's build-program dependencies (superseded by 19) | mcpp#972 | | 14 | cl.exe's record reaches ninja as `mcpp.inputs:` lines read under `deps = msvc`; every JSON record of the build is UTF-8 text; a response file on a link line is split by the rules of the tool that reads it; the advice for a lost header reads C1083 in any quote marks | mcpp#970, mcpp#931 | | 15 | the Windows bare-metal llvm rows build (llvm 23.1.3 revision 4 carries `ld.lld.exe`); e2e 663 reads the std record its plan names | | | 16 | a path or git dependency's build is cached under the name of its sources: the commit, or the digest of the tree's content; the project's own trees are built in place | mcpp#974 | | 17 | a base's C++ layer and the graph's layers reach a clang driver with no cfg beside it | mcpp#965 | | 18 | a row the platform column misses is an index miss, refreshed as a dependency's is | mcpp#967 | | 19 | each build program resolves its own build dependencies: a program takes the newest version the build holds that its request admits, two programs may hold two versions (two build programs' graphs, a `+b` lock entry naming its programs), a conflict inside one program is refused naming it; a platform series skips a release whose version group the build does not admit; the pack launchers return to mcpp's own mcpplibs.os (0.4.6, checked), superseding 13; the global dependency cache, the rename's staging and the provisioning closures move to files of their own to keep every file and step under its limit | mcpp#972 | | 20 | a workspace member is the project's own tree whichever members a command selects: a member reached through `path` from the selected one is built in place, so its arguments do not depend on the selection; SPEC-001 §10.4 states every member | mcpp#974 | | 21 | a cache fill completes under the goals a command names: the fills are a phony goal every named goal set includes | | | 22 | build programs resolve after the target, in waves, and keep the versions they hold while their requests admit them; a merge that replaces a version walks the new one as the first and withdraws the old one's requests and build program; a package of the target takes its capability's default from the target's graph (SPEC-002 §3.6); a series restart no call answers is dropped; a development dependency's program does not move the build's programs to another graph (review of 19, four e2e cases that fail before and pass after) | mcpp#972 | Dependencies, each released and indexed: openkal 0.26.0, openkal-platform 0.31.0, mcpplibs.os 0.4.6, mtest 0.10.0.
1 parent 3b88616 commit d4f4447

165 files changed

Lines changed: 10082 additions & 2232 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.agents/docs/2026-11-19-ecosystem-rule-convergence-design-repro.sh‎

Lines changed: 246 additions & 0 deletions
Large diffs are not rendered by default.

‎.agents/docs/2026-11-19-ecosystem-rule-convergence-design.md‎

Lines changed: 1209 additions & 0 deletions
Large diffs are not rendered by default.

‎.agents/docs/README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ superseded_by: 2026-09-07-....md # when status is superseded
1818
---
1919
```
2020

21-
365 records.
21+
366 records.
2222

2323
## By subject
2424

@@ -90,6 +90,7 @@ Records that declare one. Everything else is listed by date below.
9090

9191
### ecosystem
9292

93+
- [生态规则收敛方案:2026.11.18.1 之后十个 issue 的五类成因、七项决定与实施范围](2026-11-19-ecosystem-rule-convergence-design.md) — landed
9394
- [生态架构优化方案:四个平面的收敛、已合入项的纠正与新系统的准入(mcpp × openkal × xlings)](2026-11-12-ecosystem-architecture-optimization-design.md) — active
9495
- [测试与依赖解析补充方案:mcpp、mcpp test、mtest、mcpp-ide](2026-11-10-test-and-resolution-supplement-design.md) — active
9596
- [生态顶层方案:#885 收尾之后的工作流、原则与依赖](2026-11-08-ecosystem-top-level-design.md) — active
@@ -204,6 +205,7 @@ Records that declare one. Everything else is listed by date below.
204205

205206
### 2026-11
206207

208+
- [生态规则收敛方案:2026.11.18.1 之后十个 issue 的五类成因、七项决定与实施范围](2026-11-19-ecosystem-rule-convergence-design.md) — landed
207209
- [第二部分之后的补充方案:带修正的 ninja、模块重编译的级联、工作区发布与本轮遗留项](2026-11-17-ninja-cascade-publish-supplement-design.md) — active
208210
- [生态缺口补充方案(第二部分):文件的角色、运行文件、清单书写与第一部分的遗留项](2026-11-16-ecosystem-gap-supplement-part2-design.md) — active
209211
- [生态缺口补充方案:一个 C 程序走遍全部目标所暴露的通用问题](2026-11-15-ecosystem-gap-supplement-design.md) — active

‎.github/tools/check_system_names.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@
1616
`modules/*/src/`, without `modules/platform/` and without tests and data --
1717
in the two forms a branch on a system takes: the word as a string literal
1818
(`"freebsd"`), and the host predicates of mcpplibs.os (`is_linux`,
19-
`is_windows`, `is_macos`). Comments are not counted.
19+
`is_windows`, `is_macos`) and the system predicates of a triple (`is_apple`,
20+
`is_ios`, `is_android` and their like). Comments are not counted. The triple's
21+
predicates were not in the vocabulary until a branch on `is_apple()` was found
22+
standing before the one predicate that decides whether an artifact runs here
23+
(mcpp#957).
2024

2125
THE RATCHET
2226

@@ -39,7 +43,8 @@
3943

4044
LITERALS = ["linux", "macos", "windows", "freebsd", "android", "emscripten", "ios",
4145
"darwin", "netbsd", "openbsd", "haiku", "dos", "uefi"]
42-
PREDICATES = ["is_linux", "is_windows", "is_macos"]
46+
PREDICATES = ["is_linux", "is_windows", "is_macos",
47+
"is_apple", "is_ios", "is_ios_simulator", "is_android", "is_openkal", "is_windows_gnu"]
4348

4449
SOURCE_SUFFIXES = {".cppm", ".cpp", ".mcpp"}
4550

‎.github/tools/check_version_pins.sh‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Version / pin drift guard.
44
#
5-
# Two invariants that used to live only in a comment:
5+
# Three invariants that used to live only in a comment:
66
#
77
# 1. Every xlings version pinned anywhere in .github/ equals
88
# `pinned::kXlingsVersion` in src/provider/xlings/xlings.cppm — which is the version
@@ -11,6 +11,8 @@
1111
#
1212
# 2. mcpp's own version is identical in all four places that carry it.
1313
#
14+
# 3. The launchers a pack builds use mcpp's own mcpplibs.os release.
15+
#
1416
# Why this exists: src/provider/xlings/xlings.cppm used to say "keep in lock-step with the
1517
# XLINGS_VERSION pins in release.yml / cross-build-test.yml / ci-linux-e2e.yml"
1618
# and that list was ALREADY incomplete — it omitted both composite actions,
@@ -173,7 +175,23 @@ if [ -n "$v_xl" ] && [ -n "$v_toml" ] && [ "$v_xl" != "$v_toml" ]; then
173175
|| bad "bootstrap pin '$v_xl' is NEWER than the version being built ('$v_toml') — CI would try to install an unreleased mcpp"
174176
fi
175177

178+
# ── 3. The launchers' OS library is mcpp's own ────────────────────────────
179+
#
180+
# A pack's launchers build on one release of mcpplibs.os (src/pack/
181+
# distribution.cppm, kLauncherOs), and mcpp builds on one (mcpp.toml). The
182+
# platform's plugin resolves its build dependencies apart from a launcher
183+
# (design 2026-11-19 §21 A6), so nothing outside mcpp chooses the launchers'
184+
# release, and two releases of one library in one repository is drift.
185+
os_toml=$(awk -F '"' '/^mcpplibs\.os[[:space:]]*=/{print $2; exit}' mcpp.toml)
186+
os_launcher=$(grep -oE 'kLauncherOs[[:space:]]*=[[:space:]]*"[^"]+"' src/pack/distribution.cppm \
187+
| grep -oE '"[^"]+"' | tr -d '"' | head -1)
188+
if [ -z "$os_toml" ] || [ -z "$os_launcher" ]; then
189+
bad "could not read mcpplibs.os from mcpp.toml ('$os_toml') or kLauncherOs from src/pack/distribution.cppm ('$os_launcher')"
190+
elif [ "$os_toml" != "$os_launcher" ]; then
191+
bad "src/pack/distribution.cppm builds the launchers on mcpplibs.os '$os_launcher', mcpp.toml builds mcpp on '$os_toml'"
192+
fi
193+
176194
if [ "$fail" = 0 ]; then
177-
echo "OK: xlings pins all at $XLINGS_EXPECTED; building mcpp $v_toml, bootstrapping from $v_xl" >&2
195+
echo "OK: xlings pins all at $XLINGS_EXPECTED; building mcpp $v_toml, bootstrapping from $v_xl; launchers on mcpplibs.os $os_launcher" >&2
178196
fi
179197
exit "$fail"

‎.github/tools/system-names.baseline‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,10 @@ dos 0
1515
uefi 0
1616
is_linux 26
1717
is_windows 126
18-
is_macos 32
18+
is_macos 31
19+
is_apple 5
20+
is_ios 7
21+
is_ios_simulator 6
22+
is_android 9
23+
is_openkal 3
24+
is_windows_gnu 2

‎.github/tools/upgrade_lane.sh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,15 @@ fi
256256
if [ "$VARIANT" = modules ]; then
257257
# A BMI of another spelling is not read: the dependency is rebuilt once (its
258258
# cache key carries the spelling), then served from the cache. The spelling
259-
# moved in 2026.10.26.2 (the module map's `$root`); a previous release from
260-
# then on spells as this one, and its entry is served at once.
259+
# moved in 2026.10.26.2 (the module map's `$root`) and in 2026.11.19.1 (a
260+
# package instance's directory, mcpp#953); a previous release from the last
261+
# move on spells as this one, and its entry is served at once.
262+
spelled_since=2026.11.19.1
261263
old_version=$("$OLD" --version | grep -Eo '[0-9]{4}\.[0-9]+\.[0-9]+\.[0-9]+' | head -1)
262-
same_spelling=$(printf '%s\n2026.10.26.2\n' "$old_version" | sort -t. -k1,1n -k2,2n -k3,3n -k4,4n | head -1)
264+
same_spelling=$(printf '%s\n%s\n' "$old_version" "$spelled_since" | sort -t. -k1,1n -k2,2n -k3,3n -k4,4n | head -1)
263265
modules_project m-new1
264266
run new-modules1 "$W/m-new1" "$NEW" build -v || fail "the module project does not build over the previous release's cache"
265-
if [ "$same_spelling" = 2026.10.26.2 ]; then
267+
if [ "$same_spelling" = "$spelled_since" ]; then
266268
grep -q "STAGE gcm.cache/mcpplibs.openkal/" "$W/new-modules1.log" \
267269
|| fail "a dependency BMI of the same spelling ($old_version) was not served from the cache"
268270
else

‎.github/versions.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# The engines CI pins, read by the composite actions (.github/actions/mtest).
22
# mtest: an xlings package (xim:mtest) whose sha256 the index states; the release
33
# bundle's sha256 checks the fallback download.
4-
MTEST_VERSION=0.8.0
5-
MTEST_SHA256=06555eb8dbdebdf978dc2f074a3efe8521bf71bb51844976216ec21d7fb4be94
4+
MTEST_VERSION=0.10.0
5+
MTEST_SHA256=c7187e6211ea15cff23f622c449247508f6f661f0d3b45dcd031f91104b8f499

‎.github/workflows/ci-fresh-install.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,9 +282,13 @@ jobs:
282282
- distro: fedora-latest
283283
image: fedora:latest
284284
setup: dnf -y install curl bash tar gzip xz git findutils binutils file glibc-langpack-en
285+
# A full upgrade, as Arch supports: a partial one (`-Sy`) installed
286+
# OpenSSL 4 beside packages built against libcrypto.so.3 and was
287+
# refused (`breaks dependency 'libcrypto.so=3-64'`, every run since
288+
# 2026-11-07, mcpp#953).
285289
- distro: arch
286290
image: archlinux:latest
287-
setup: pacman -Sy --noconfirm curl bash tar gzip xz git findutils binutils file
291+
setup: pacman -Syu --noconfirm curl bash tar gzip xz git findutils binutils file
288292
- distro: tumbleweed
289293
image: opensuse/tumbleweed:latest
290294
setup: zypper -n install curl bash tar gzip xz git findutils binutils file

0 commit comments

Comments
 (0)