Repository navigation
Sync upstream dev into re-dev (2026-10-21): #1349, #1280, #1331, #1326, #1328 - #15
Merged
Merged
Conversation
…c runs even while model work holds every other slot (deeplethe#1349) Signed-off-by: Quintin Botes <[email protected]>
…eeplethe#1280) Signed-off-by: Bogdan Szabo <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: WaylandYang <[email protected]>
…index instead of probing every entity's facts (deeplethe#1331) Signed-off-by: Bogdan Szabo <[email protected]> Co-authored-by: Claude Sonnet 5.5 <[email protected]> Co-authored-by: WaylandYang <[email protected]>
…en and globs can be changed after it is created (deeplethe#1326) Signed-off-by: Quintin Botes <[email protected]> Co-authored-by: WaylandYang <[email protected]>
…ject its sync needs (deeplethe#1328) Signed-off-by: Quintin Botes <[email protected]> Co-authored-by: WaylandYang <[email protected]>
…eeplethe#1326, deeplethe#1328) into re-dev Co-Authored-By: Claude Sonnet 5.5 <[email protected]> Signed-off-by: Bogdan Szabo <[email protected]>
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 upstreamdevatab09b4a1: 5 commits, deeplethe#1349 (two worker slots stay free for jobs without model calls), deeplethe#1280 (a client reads a document back byexternal_id), deeplethe#1331 (containment recall starts from name facts), deeplethe#1326 (a GitHub repo source skips empty files, its config is editable) and deeplethe#1328 (a GitHub or Jira source needs its repo or project). Thedevmirror was fast-forwarded to upstream first.Conflicts.
9002): kept ours.resolution.rsis unchanged by this merge (CONTAINMENT_SQL,contained_names,SET LOCAL jit = off, theRecallguard). The designs differ in where recall starts. Upstream starts from the base'sknown_asfacts throughfacts_live_predicate_idxand joins back to entities, so an entity with no name fact (one created from a description, 0044) is never a candidate. Ours scansentities.canonical_name(trigram index, plus the reversed substring lookup) and unions theknown_asfacts for aliases, so description entities are candidates. Containment matches a name's % and _ literally instead of as wildcards deeplethe/utopia#1320's escaping tests and the alias pair test (Mr. Holmes/Sherlock HolmesthroughHolmes) pass. Containment recall reads the base's name facts through the predicate index instead of probing every entity's facts deeplethe/utopia#1331'sa_described_entity_is_not_paired_by_containmentdoes not pass against ours; I kept the test with the opposite expectation (a_described_entity_is_paired_by_containment_through_its_canonical_name) so the difference is pinned. Whether to adopt upstream's behaviour is a separate decision.pushed_key/is_push_kindandread_retained(.., serves)taken whole. Our older copy hadinclude_missingand amissing_sincefield in the response; both are gone, as are the ADR 0052 andingest.mdsentences about them. A tombstoned identity is now always 404. Our token read onGET /documents/{id}/extractions(A token reads a document's extractions and exports its base deeplethe/utopia#1266) was kept. ADR 0014 keeps our revision line and not upstream's;web/src/docs/ingest.mdkeeps our "A name you push is matched by its spelling" bullet.Behaviour to know about.
embed_namesis still priority 1 (job_priorityfrom0116is unchanged and no migration came in). The new reserved lane (Two worker slots stay free for jobs that make no model call, so a sync runs even while model work holds every other slot deeplethe/utopia#1349) only claims priority 0 jobs, soembed_nameswaits behind extraction as before. Adding it to the list is still the9003decision.include_missing=trueon the read-back route now gets 404.Schema version 107. No upstream migrations came in; the migration count is still 107 and
CURRENT_SCHEMA_VERSIONis unchanged.Checked on the merge: migrations ran twice,
cargo fmt --all -- --checkandcargo clippy --workspace --all-targets -- -D warningsare clean,UTOPIA_TEST_REQUIRE_DB=1 cargo test --workspaceis green: 1675 passed, 0 failed, 6 ignored (server 708 passed, store integration suite 330, store unit tests 91). deeplethe#1326 changed web files, so the web checks ran:pnpm install --frozen-lockfile,tsc --noEmitclean,vitest run315 tests in 46 files.🤖 Generated with Claude Code