Repository navigation
Sync upstream dev into re-dev (2026-10-24, evening): #1350, #1387, #1389, #1384 - #41
Merged
Merged
Conversation
…d changes (deeplethe#1348) (deeplethe#1350) * fix: label correction values so changes cannot read as reversals Signed-off-by: Aschenbath <Aschenbath@users.noreply.github.com> * A correction exposes its previous value in structured changes so callers can tell the direction Signed-off-by: Aschenbath <Aschenbath@users.noreply.github.com> --------- Signed-off-by: Aschenbath <Aschenbath@users.noreply.github.com> Co-authored-by: Aschenbath <Aschenbath@users.noreply.github.com>
…derived fact names the axiom's property (deeplethe#1347) (deeplethe#1387) * fix: show the ontology axioms behind derived facts Signed-off-by: Aschenbath <Aschenbath@users.noreply.github.com> * list_rules lists ontology axioms with their derivation status, and a derived fact names the axiom's property (deeplethe#1347) Signed-off-by: Aschenbath <Aschenbath@users.noreply.github.com> --------- Signed-off-by: Aschenbath <Aschenbath@users.noreply.github.com> Co-authored-by: Aschenbath <Aschenbath@users.noreply.github.com> Co-authored-by: WaylandYang <145302500+WaylandYang@users.noreply.github.com>
…edding model's input limit cannot fail it (deeplethe#1375) (deeplethe#1389) * fix: keep statement ingestion independent of embedding limits Signed-off-by: Aschenbath <Aschenbath@users.noreply.github.com> * A statements document is found by keyword and not embedded, so an embedding model's input limit cannot fail it (deeplethe#1375) Signed-off-by: Aschenbath <Aschenbath@users.noreply.github.com> --------- Signed-off-by: Aschenbath <Aschenbath@users.noreply.github.com> Co-authored-by: Aschenbath <Aschenbath@users.noreply.github.com> Co-authored-by: WaylandYang <145302500+WaylandYang@users.noreply.github.com>
Brings in deeplethe#1350, deeplethe#1387, deeplethe#1389 and deeplethe#1384. No textual conflicts. The fork's embed_names job stays in place of the inline embed_pending_names call at the end of run_open. Build fix: deeplethe#1389's test calls search with upstream's three arguments; the fork's document filter adds a fourth, so the call passes None. Schema version stays 113. Signed-off-by: Bogdan Szabo <bogdan@re-cinq.com>
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.
Sync upstream dev into re-dev (2026-10-24b): deeplethe#1350 and 3 more
Brings
re-devup to upstreamdevatfc21f46d: 4 commits, deeplethe#1350 (a correction labels old and new values and includes both in structured changes), deeplethe#1387 (list_ruleslists ontology axioms with their derivation status, and a derived fact names the axiom's property), deeplethe#1389 (a statements document is found by keyword and not embedded, so an embedding model's input limit cannot fail it) and deeplethe#1384 (MCP snippets use the last opened permitted base). Thedevmirror was fast-forwarded to upstream first.Upstream
devholds the truth: where fork code conflicts with upstream, upstream's version is taken.Conflicts. None. The fork's
embed_namesjob at the end ofrun_openwas not touched by upstream and stays in place of the inlineembed_pending_namescall.Build fix. deeplethe#1389's test in
pipeline_tests.rscallssearchwith upstream's three arguments; the fork's document filter (a95037b) adds a fourth, so the call passesNone.Schema version 113. No upstream migration came in; 113 migration files,
CURRENT_SCHEMA_VERSIONstays 113.Checked on the merge: migrations ran twice on a fresh database,
cargo fmt --all -- --checkandcargo clippy --workspace --all-targets -- -D warningsare clean,UTOPIA_TEST_REQUIRE_DB=1 cargo test --workspaceis green: 1777 passed, 0 failed, 6 ignored. Web files changed, so the web checks ran: style guard,tsc --noEmitclean,vite buildok,vitest run345 tests in 49 files.