Repository navigation
chore: merge main 3045d54 into release/phase1 (D2, keeps #376 conflict-free) - #423
Merged
Merged
Conversation
…achine forever — spec-ifies steps-blocks-epochs §3e two products: writing state is energy (landauer, one-time at the margin), holding is persistence (free forever — no rent, no dormancy, no eviction, zero mortality terms). four rules + one curve: net-new slots priced W0×M(phi) on the 1-2-4-8 occupancy ladder, payable as burn (ephemeral) or lock (reservation, unlock on delete — the no-death mechanism for long-term agents); expansion valve at sustained 75%; security funded by one asymptotic curve supply(h)=C(1-q^h) with C <= field size — eternal budget with a provable cap, rent as a class dies. survey: nervos' two-layer structure + parano1d's pricing + the closing curve; W0 anchored to the block reward, not a constant. six-number complexity budget; open questions: per-dim phi, lock k, rescaled expansion window for 1 s steps, machine share
…conflict-free (D2) main gained four commits of the owner's after 2e5ba00, the base #376 was opened on: 130ceed (docs: foundation pages), ff06667 (mimi removed), 9d6f5e5 (proposals: state-economics), 3045d54 (CLAUDE.md -> AGENTS.md). They touch five doc and proposal files that release/phase1 never edited; git merge-tree is clean, and no code or workflow reads CLAUDE.md.
cyberia-apparatus
added
contained
cyberia-apparatus
added a commit
that referenced
this pull request
Oct 27, 2026
…t-free again Both sides renamed CLAUDE.md to AGENTS.md (#406 and the main sync #423); GitHub's merge check reports the rename/rename as a conflict. The merged AGENTS.md is #407's (blob 3eedb35), a superset of release/phase1's (513321e): the crate/ row, the cybernode boundary, the node-status note. No other file overlaps; no code, specs or lock changes.
This was referenced Oct 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Merges
main3045d54intorelease/phase1(plan D2, for R0).maingained four commits of the owner's after2e5ba00, the base soft3#376 was opened on. As a result,release/phase1was 4 behindmain(git rev-list --left-right --count origin/main...origin/release/phase1→4 358):130ceeddocs: cyberia foundation pages moved to the repo rootff06667mimi: the project is closed and removed9d6f5e5proposals(state-economics)3045d54agents: one instruction file, AGENTS.md; CLAUDE.md is goneVerified
git merge-base origin/main origin/release/phase1=2e5ba00, andgit merge-tree --write-treeis clean (exit 0). The merge commit's tree equals that result.CLAUDE.md => AGENTS.md,docs/README.md,proposals/README.md,proposals/metabolic-oracle.mdandproposals/state-economics.md(+90 −5).release/phase1never edited any of them since2e5ba00. Nospecs/file is touched, and no code, crate or workflow changes.git grep 'CLAUDE\.md'overrelease/phase1's*.py *.yml *.sh *.nu *.toml *.rsfinds nothing. No gate or workflow reads the renamed file.Remains
After this merges, #376 is again 0 behind
main, with no conflict, and still waits on the owner's review.Risk
Low. This is the owner's own text, already on
main. The diff ofrelease/phase1 → main(#376) does not change.🤖 Generated with Claude Code