[gedaiu]

Brings re-dev up to upstream dev at 24029380: 9 commits, deeplethe#1266 (a token reads a document's extractions and exports its base), deeplethe#1327 (GitLab repo source, and one Ticket document for GitHub, Jira and GitLab), deeplethe#1333 (a statements source may declare its names identities), deeplethe#1334 (a regression case can expect no binding, migration 0118), deeplethe#1355 (scoped identity-provider sign-in), deeplethe#1381 (an empty balance during alignment fails the run once), deeplethe#1354 (a timed-out settings probe reads as timed out) and deeplethe#1391 (chat test trigger installed once). The dev mirror was fast-forwarded to upstream first.

This sync follows the rule that upstream dev holds the truth: where fork code conflicts with what upstream merged, upstream's version is taken and ours is dropped.

Removed in favour of upstream.

• Containment recall (Containment matches a name's % and _ literally instead of as wildcards (#1320, ahead of upstream) #11, Containment recall reads indexes instead of scanning the base #12, and Sync upstream dev (2026-10-23): #1371, #1385, #1357 #31's word-edge port): CONTAINMENT_SQL, contained_names, SET LOCAL jit = off and the reverse substring lookup are gone. resolution.rs is now byte for byte upstream's, so containment_reviews is Containment recall reads the base's name facts through the predicate index instead of probing every entity's facts deeplethe/utopia#1331 plus Containment pairs a Latin name only at a word edge, so area no longer meets AreaScorecard deeplethe/utopia#1357. a_similar_name_is_proposed_not_merged.rs is upstream's too, which restores Containment recall reads the base's name facts through the predicate index instead of probing every entity's facts deeplethe/utopia#1331's a_described_entity_is_not_paired_by_containment with its original expectation.
• The blanket pushed-name skip (RC-002, c80af41, b758409, A name pushed in a statements source is an identity, but resolution still proposes it as a duplicate deeplethe/utopia#1293/Pushed statements: entity resolution does work it already knows the answer to deeplethe/utopia#1296 on our side): resolve_pushed_name, the Recall and NameRecall enums, the skip of name vectors for pushed chunks, and extraction_open_pushed_names_tests.rs are gone. Extraction is wired as upstream does it, through Source::names_are_identities and resolve_identity_name. The fork's 0054 revision line and the "A name you push is matched by its spelling" bullet in web/src/docs/ingest.md were removed; RC-002 has a dated note saying it is superseded.
• Conflicting text (auth.rs doc comment, docs/design/access-and-audit.md, export_routes.rs): upstream's. The fork's token read on chunk search still works; only upstream's prose for it was taken.

Behaviour changes.

• Containment no longer reads entities.canonical_name; it starts from known_as facts. An entity created from a description is never paired by containment.
• Migration 9002_containment_is_trigram_indexed.sql stays (it ran in production and the migrator refuses a missing one), but its trigram indexes are no longer used. Dropping them would be a later fork migration if wanted.
• A pushed name is resolved like any other mention again (name vectors, containment) unless its source says otherwise. The embed_names job (Pushed statements: entity resolution does work it already knows the answer to deeplethe/utopia#1296, 9003) is kept.

Config step. To keep the old behaviour for re-cinq's mirror sources, set {"names": "identity"} in each statements source's config. Such a name attaches by exact name and gets no name vector.

Kept and unchanged: source decay (RC-003), the embed_names job, Google Drive, migrations 9000 to 9006, the token reads for fork-only routes.

Schema version 112. One upstream migration came in (0118); 112 migration files, CURRENT_SCHEMA_VERSION set to 112.

Checked on the merge: migrations ran twice on a fresh database, cargo fmt --all -- --check and cargo clippy --workspace --all-targets -- -D warnings are clean, UTOPIA_TEST_REQUIRE_DB=1 cargo test --workspace is green: 1741 passed, 0 failed, 6 ignored. web/src/docs/ingest.md conflicted, so the web checks ran: style guard, tsc --noEmit clean, vitest run 342 tests in 48 files.

🤖 Generated with Claude Code