Repository navigation
Sync upstream dev into re-dev (2026-10-22, third): #1354, #1251, #1327, #1248, #1353, #1265 - #26
Merged
Merged
Conversation
Signed-off-by: Bogdan Szabo <bogdan@re-cinq.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: WaylandYang <145302500+WaylandYang@users.noreply.github.com>
…and the client remembers it, so chat and the second look work on reasoning deployments (deeplethe#1353) (deeplethe#1368) Signed-off-by: Quintin Botes <quintinbotes@outlook.com> Co-authored-by: WaylandYang <145302500+WaylandYang@users.noreply.github.com>
… a small model cannot merge a source's identities (deeplethe#1248) (deeplethe#1364) Signed-off-by: Quintin Botes <quintinbotes@outlook.com> Co-authored-by: WaylandYang <145302500+WaylandYang@users.noreply.github.com>
…ch, so GitLab issues need no third copy of the shape (deeplethe#1327) (deeplethe#1367) * Three issue trackers share one ticket document and keep their own fetch, so GitLab issues need no third copy of the shape (deeplethe#1327) Signed-off-by: Quintin Botes <quintinbotes@outlook.com> * Write out the ticket fields, the update-time checkpoint and opt-in merge requests in 0013 decision 7 (deeplethe#1327) Signed-off-by: Quintin Botes <quintinbotes@outlook.com> --------- Signed-off-by: Quintin Botes <quintinbotes@outlook.com> Co-authored-by: WaylandYang <145302500+WaylandYang@users.noreply.github.com>
…lethe#1251) * Prefer a namesake's grounded subject evidence over the chunk profile Signed-off-by: Virtue039 <virtue039@qq.com> * Make the subject-only evidence boundary explicit and keep focused regressions Signed-off-by: Virtue039 <virtue039@qq.com> --------- Signed-off-by: Virtue039 <virtue039@qq.com> Co-authored-by: WaylandYang <145302500+WaylandYang@users.noreply.github.com>
…model that refuses streaming or tools no longer passes it (deeplethe#1354) (deeplethe#1363) * The model settings test sends the request shapes the jobs send, so a model that refuses streaming or tools no longer passes it (deeplethe#1354) Signed-off-by: Quintin Botes <quintinbotes@outlook.com> * Show one line per request shape in the settings card, bound each probe and run the last two together, and pin each shape in the test (deeplethe#1354) Signed-off-by: Quintin Botes <quintinbotes@outlook.com> --------- Signed-off-by: Quintin Botes <quintinbotes@outlook.com> Co-authored-by: WaylandYang <145302500+WaylandYang@users.noreply.github.com>
…eplethe#1251, deeplethe#1327, deeplethe#1248, deeplethe#1353, deeplethe#1265 # Conflicts: # crates/utopia-server/src/api/ontology_routes.rs # crates/utopia-server/src/auth.rs # crates/utopia-server/src/extraction_open.rs # docs/decisions/0014-identity-from-the-person-scope-from-the-token.md # docs/design/access-and-audit.md
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.
Brings
re-devup to upstreamdevat02611ae7: 6 commits, deeplethe#1354 (the model settings test sends the request shapes the jobs send), deeplethe#1251 (grounded subject evidence before namesake profile scores), deeplethe#1327 (three issue trackers share one ticket document), deeplethe#1248 (a same verdict that touches an identity entity waits for a person), deeplethe#1353 (a tool request refused for its reasoning effort is retried with none) and deeplethe#1265 (a token reads a base's ontology and a class's instances). Thedevmirror was fast-forwarded to upstream first.Conflicts.
extraction_open.rs): kept ourNameRecall::Spelling/Fullbranch and took upstream's per-mentionevidenceas the text argument, in place ofSome(&chunk.text). Both sides now apply: a pushed name still recalls by spelling alone, and the others use the evidence of their own mention.ontology_routes.rsandauth.rsonly doc comments differed; the extractor comment lists both sets (the instances plus ourexternal_idread-back, chunk search, extractions and export). ADR 0014 keeps our longer list and gains upstream's detail on the instances read and its dated line;access-and-audit.mdlists the instances too.Behaviour to know about. None beyond the above; no migration came in (still 109 files,
CURRENT_SCHEMA_VERSION109).Checked on the merge:
cargo fmt --checkandcargo clippy --workspace --all-targets -D warningsclean,cargo test --workspaceon a migrated database 1699 passed, 0 failed, 6 ignored. The merge touched web files, so:tsc --noEmitclean,vitest run336 passed, style guard clean.🤖 Generated with Claude Code