Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/cognitive-stack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crates/crepe-plan-probe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
7 changes: 4 additions & 3 deletions crates/dr-math-binding-probe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
11 changes: 6 additions & 5 deletions crates/egglog-r2il-probe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
11 changes: 6 additions & 5 deletions crates/mork-pathmap-probe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -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" }
4 changes: 2 additions & 2 deletions crates/symbiont/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
7 changes: 4 additions & 3 deletions crates/xlog-relcomp-probe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Loading