Skip to content

Sync upstream dev into re-dev (2026-10-22, third): #1354, #1251, #1327, #1248, #1353, #1265 - #26

Merged
gedaiu merged 7 commits into
re-devfrom
sync/upstream-dev-2026-10-22c
Oct 22, 2026
Merged

gedaiu merged 7 commits into
re-devfrom
sync/upstream-dev-2026-10-22c

Conversation

@gedaiu

@gedaiu gedaiu commented Oct 22, 2026

Copy link
Copy Markdown

Brings re-dev up to upstream dev at 02611ae7: 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). The dev mirror was fast-forwarded to upstream first.

Conflicts.

  • Prefer grounded subject evidence before namesake profile scores deeplethe/utopia#1251 vs our pushed-name recall (RC-002, extraction_open.rs): kept our NameRecall::Spelling / Full branch and took upstream's per-mention evidence as the text argument, in place of Some(&chunk.text). Both sides now apply: a pushed name still recalls by spelling alone, and the others use the evidence of their own mention.
  • A token reads a base's ontology and a class's instances deeplethe/utopia#1265 vs our earlier copy of the same reads (the fork had the ontology and a class's instances open to tokens already): upstream's route and tests taken as they merged. In ontology_routes.rs and auth.rs only doc comments differed; the extractor comment lists both sets (the instances plus our external_id read-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.md lists the instances too.

Behaviour to know about. None beyond the above; no migration came in (still 109 files, CURRENT_SCHEMA_VERSION 109).

Checked on the merge: cargo fmt --check and cargo clippy --workspace --all-targets -D warnings clean, cargo test --workspace on a migrated database 1699 passed, 0 failed, 6 ignored. The merge touched web files, so: tsc --noEmit clean, vitest run 336 passed, style guard clean.

🤖 Generated with Claude Code

gedaiu and others added 7 commits October 22, 2026 20:09
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
@gedaiu
gedaiu merged commit 6262935 into re-dev Oct 22, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants