From e035ceb85875c12c0a7f1b0c40c8e7c6cd91da4f Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 8 Nov 2026 01:32:37 +0000 Subject: [PATCH] Float the AdaWorldAPI fork pins on their default branch Internal pins are prohibited, so the egglog, PathMap and ractor pins move to their fork's default branch: - egglog rev 5deaa56 -> main (dr-math-binding-probe, egglog-r2il-probe, xlog-relcomp-probe). main's head is 5deaa56, so all three resolve to the same commit as before, and still name one source. - PathMap rev ef02591 -> master (crepe-plan-probe, mork-pathmap-probe, including its [patch] for MORK). master's head is ef02591. - ractor branch claude/jirak-math-theorems-harvest-rfii13 -> main (cognitive-stack, symbiont). main's one extra commit is the merge of that branch, so the tree is unchanged. All seven manifests resolve with no unused-patch warning. The egglog-r2il-probe comment records the cost the 2026-11-02 pin avoided: a ProofChanged refusal can now come from an egglog change. Not floated, because the fork's default branch does not carry the pinned commits: - crepe branch ccr-d3ce1263-ied9yh (2 commits not on crepe main). - MORK de9312e3 (the stable-build fix; MORK main needs nightly). Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01XAqKMMWgnUU9g7Ldyn6sbk --- crates/cognitive-stack/Cargo.toml | 4 ++-- crates/crepe-plan-probe/Cargo.toml | 2 +- crates/dr-math-binding-probe/Cargo.toml | 7 ++++--- crates/egglog-r2il-probe/Cargo.toml | 11 ++++++----- crates/mork-pathmap-probe/Cargo.toml | 11 ++++++----- crates/symbiont/Cargo.toml | 4 ++-- crates/xlog-relcomp-probe/Cargo.toml | 7 ++++--- 7 files changed, 25 insertions(+), 21 deletions(-) diff --git a/crates/cognitive-stack/Cargo.toml b/crates/cognitive-stack/Cargo.toml index e3429e4ea..ccf135371 100644 --- a/crates/cognitive-stack/Cargo.toml +++ b/crates/cognitive-stack/Cargo.toml @@ -83,11 +83,11 @@ ogar-adapter-surrealql = { git = "https://github.com/AdaWorldAPI/OGAR", branch = # ── OLD stack, external AdaWorldAPI forks: git deps (mirrors crates/symbiont; # pre-existing, unchanged by this fix) ── -# ractor: jirak branch (carries the MessagingErr::Saturated fix; on github). +# ractor: `main` (the jirak branch's MessagingErr::Saturated fix is an ancestor of main). # surrealdb: `main` — each fork's jirak HEAD is an ANCESTOR of its main # (main is the canonical superset), and kv-lance lives on surrealdb main; pinning # surrealdb to main matches OGAR's own surrealdb pin so they resolve to ONE source. -ractor = { git = "https://github.com/AdaWorldAPI/ractor", branch = "claude/jirak-math-theorems-harvest-rfii13" } +ractor = { git = "https://github.com/AdaWorldAPI/ractor", branch = "main" } surrealdb-core = { git = "https://github.com/AdaWorldAPI/surrealdb", branch = "main", default-features = false, features = ["kv-lance"] } # The OGAR activation crate (in-repo, path) — links the full Active-Record surface diff --git a/crates/crepe-plan-probe/Cargo.toml b/crates/crepe-plan-probe/Cargo.toml index cd4e00072..c7e50d3ae 100644 --- a/crates/crepe-plan-probe/Cargo.toml +++ b/crates/crepe-plan-probe/Cargo.toml @@ -51,4 +51,4 @@ lance-graph-contract = { path = "../lance-graph-contract" } # Same reason as in mork-pathmap-probe: MORK's workspace names PathMap by a # path outside its repository, so the git dependency needs this to resolve. [patch."https://github.com/AdaWorldAPI/MORK"] -pathmap = { git = "https://github.com/AdaWorldAPI/PathMap", rev = "ef02591" } +pathmap = { git = "https://github.com/AdaWorldAPI/PathMap", branch = "master" } diff --git a/crates/dr-math-binding-probe/Cargo.toml b/crates/dr-math-binding-probe/Cargo.toml index 64be8a7aa..2ed027133 100644 --- a/crates/dr-math-binding-probe/Cargo.toml +++ b/crates/dr-math-binding-probe/Cargo.toml @@ -14,9 +14,10 @@ lance-graph-contract = { path = "../lance-graph-contract" } # parse_and_run_program, `prove`, the read-only `egglog::proof` module). # egglog checks every proof it returns with its own checker; that check is # egglog's, not an independent one. -# Pinned to one commit, the same in every crate that links egglog -# (DECISION 2026-11-02; a branch and a rev are two sources to cargo). -egglog = { git = "https://github.com/AdaWorldAPI/egglog", rev = "5deaa5637a306c48c998f88d5d08792d2dbfd037" } +# Floats on `main` (2026-11-08: internal pins are prohibited; this replaces the +# 2026-11-02 one-commit pin). Every crate that links egglog names the same +# branch, so cargo still sees one source; a branch and a rev would be two. +egglog = { git = "https://github.com/AdaWorldAPI/egglog", branch = "main" } # Compiled identity of a certified lowering (relcomp::lowering_digest). sha2 = "0.10" diff --git a/crates/egglog-r2il-probe/Cargo.toml b/crates/egglog-r2il-probe/Cargo.toml index 8ed3b4c8c..7359c752c 100644 --- a/crates/egglog-r2il-probe/Cargo.toml +++ b/crates/egglog-r2il-probe/Cargo.toml @@ -22,11 +22,12 @@ description = "Stage B probe: egglog as a cold, bounded, proof-producing compile [dependencies] # Public API only (EGraph::new_with_proofs, parse_and_run_program, prove-variants). -# Pinned to a commit (DECISION 2026-11-02): with a floating branch a -# `ReplayRefusal::ProofChanged` could be an egglog change rather than a change -# in the program, and the replay capsule records no egglog version. Moving -# the pin is a deliberate edit, re-run with the capsule recheck. -egglog = { git = "https://github.com/AdaWorldAPI/egglog", rev = "5deaa5637a306c48c998f88d5d08792d2dbfd037" } +# Floats on `main` (2026-11-08: internal pins are prohibited; this replaces the +# 2026-11-02 one-commit pin), as in every crate that links egglog. Cost: the +# replay capsule records no egglog version, so a `ReplayRefusal::ProofChanged` +# can now come from an egglog change rather than from the program. Read one +# against egglog `main`'s log before treating it as a program change. +egglog = { git = "https://github.com/AdaWorldAPI/egglog", branch = "main" } # `set_rules::Arith`, the law-domain vocabulary. The catalogue is NOT copied. lance-graph-contract = { path = "../lance-graph-contract" } # FoldDialect, Val, INT_MULT, FoldError. diff --git a/crates/mork-pathmap-probe/Cargo.toml b/crates/mork-pathmap-probe/Cargo.toml index ab1d1899c..c879c0b3c 100644 --- a/crates/mork-pathmap-probe/Cargo.toml +++ b/crates/mork-pathmap-probe/Cargo.toml @@ -25,12 +25,13 @@ leapfrog = ["mork/leapfrog"] # upstream `trueagi-io/MORK` `ed57c67` + one commit that makes `nightly` a # feature instead of a default, so it builds on stable Rust. Upstream `main` # needs nightly (`#![feature]` in fast-slice-utils). -# PathMap: AdaWorldAPI fork `ef02591`, byte-identical to upstream -# `Adam-Vandervorst/PathMap` `master` at the time of writing. +# PathMap: AdaWorldAPI fork, floating on `master` (internal pins are +# prohibited); `ef02591` was byte-identical to upstream +# `Adam-Vandervorst/PathMap` `master` when this probe was written. [dependencies] mork = { git = "https://github.com/AdaWorldAPI/MORK", rev = "de9312e3" } mork-expr = { git = "https://github.com/AdaWorldAPI/MORK", rev = "de9312e3" } -pathmap = { git = "https://github.com/AdaWorldAPI/PathMap", rev = "ef02591" } +pathmap = { git = "https://github.com/AdaWorldAPI/PathMap", branch = "master" } # The native executor for the D-RMAP focus probe (`src/rmap.rs`): the prepared # relationship operands are run as its programs, never re-implemented here. lance-graph-mask-risc = { path = "../lance-graph-mask-risc" } @@ -44,7 +45,7 @@ arrow-buffer = "58" # MORK's workspace names PathMap as `path = "../PathMap/"`, outside its own # repository, so a git dependency on MORK cannot resolve it. This patch points -# that one requirement at the same PathMap revision as above: one `pathmap` +# that one requirement at the same PathMap branch as above: one `pathmap` # package identity in the graph, no edit to MORK. [patch."https://github.com/AdaWorldAPI/MORK"] -pathmap = { git = "https://github.com/AdaWorldAPI/PathMap", rev = "ef02591" } +pathmap = { git = "https://github.com/AdaWorldAPI/PathMap", branch = "master" } diff --git a/crates/symbiont/Cargo.toml b/crates/symbiont/Cargo.toml index 6b1fb95cc..4ffd9b39c 100644 --- a/crates/symbiont/Cargo.toml +++ b/crates/symbiont/Cargo.toml @@ -44,11 +44,11 @@ lance-graph-contract = { path = "../lance-graph-contract" } ndarray = { path = "../../../ndarray" } # ── external AdaWorldAPI forks: git deps ── -# ractor: jirak branch (carries this session's MessagingErr::Saturated fix; on github). +# ractor: `main` (the jirak branch's MessagingErr::Saturated fix is an ancestor of main). # surrealdb + OGAR: `main` — each fork's jirak HEAD is an ANCESTOR of its main # (main is the canonical superset), and kv-lance lives on surrealdb main. Pinning # surrealdb to main matches OGAR's own surrealdb pin, so they resolve to ONE source. -ractor = { git = "https://github.com/AdaWorldAPI/ractor", branch = "claude/jirak-math-theorems-harvest-rfii13" } +ractor = { git = "https://github.com/AdaWorldAPI/ractor", branch = "main" } surrealdb-core = { git = "https://github.com/AdaWorldAPI/surrealdb", branch = "main", default-features = false, features = ["kv-lance"] } # OGAR tracks `main` (its jirak commit 3016c78 is an ancestor of main — main is a # strict superset; there is no separate OGAR jirak branch on github). diff --git a/crates/xlog-relcomp-probe/Cargo.toml b/crates/xlog-relcomp-probe/Cargo.toml index bc754d16e..c1060e814 100644 --- a/crates/xlog-relcomp-probe/Cargo.toml +++ b/crates/xlog-relcomp-probe/Cargo.toml @@ -46,9 +46,10 @@ causal-edge = { path = "../causal-edge" } # egglog, on the coordinate dr-math-binding-probe already uses, for the # shared-relation experiment (tests/shared_relation.rs): equality with proofs # over the same DR64 register the closure reads. -# Pinned to one commit, the same in every crate that links egglog -# (DECISION 2026-11-02; a branch and a rev are two sources to cargo). -egglog = { git = "https://github.com/AdaWorldAPI/egglog", rev = "5deaa5637a306c48c998f88d5d08792d2dbfd037" } +# Floats on `main` (2026-11-08: internal pins are prohibited; this replaces the +# 2026-11-02 one-commit pin). Every crate that links egglog names the same +# branch, so cargo still sees one source; a branch and a rev would be two. +egglog = { git = "https://github.com/AdaWorldAPI/egglog", branch = "main" } [patch."https://github.com/AdaWorldAPI/lance-graph"] lance-graph-contract = { path = "../lance-graph-contract" }