## Problem/motivation The pre-beta5 review in #3586404+s found several scope-data bugs. None are beta5 upgrade blockers. They silently drop or mismatch published items and should land in rc1. The one-shot post-update 0006 scrub stays on #3586470+s. The live settings-form half is here because #3586470+s left confirmation UI and live cleanup redesign out of beta5. The public-API freeze on #3586444+s has landed. `isGlobal()` stays the stored/effective flag and is not gated on the Global scope being enabled. The leftover here is form-only: keep the checkbox visible so an existing global item can still be cleared. ### 1. Draft revisions overwrite the live scope index `hook_ENTITY_TYPE_update()` in `ai_context.module` reindexes unconditionally from the saved entity with no `isDefaultRevision()` guard. The module ships `ai_context_editorial` with a non-default `draft` state. A draft of a published item rewrites `ai_context_item_scope_index` from the draft's scope and cascades to inheriting children. Example: a published Global item is drafted with Global unchecked → the index loses `global:global` → Minimal prefiltering and subscription prefilters stop returning the still-published item until the draft is published or the default revision is resaved. The inheriting-child cascade has the same bug in a second form: publishing a draft compares the new scope against the draft's scope, which was never written to the children, so an unchanged scope since the draft is treated as unchanged since the last index write. ### 2. Entity Types settings delete stored values without confirmation Unchecking an entity type on the Entity Types settings page permanently deletes every stored `type:*` / `type:_all` value from items and consumer subscriptions. There is no confirmation, no message, and re-checking the type does not restore the values (`AiContextScopeEntityType`, `AiContextScopeCleanupService`). The Specific Entities form blocks removing a still-referenced type. Entity Types should not be more destructive than that. Live cleanup also ignores the enabled/available gate, so a single-language site can lose every non-default language value. That contradicts the Language form's "stored language values are kept but ignored" promise from #3586412+s. ### 3. Scope-matching revision, translation, language, and Global form - Taxonomy matches the default revision in the default language (route entity reduced to type+id then reloaded), so drafts and translations match the wrong terms. Core's `/node/{node}/revisions/{node_revision}/view` route also upcasts the node twice, default revision first, so taking the first content-entity route parameter is not enough. - Language detection ignores the caller-supplied request path that Site Sections and Entity Types honor, so `path: /es/...` can match Spanish sections then fail the language hard filter. - Deleting the last bundle of a configured type also scrubs `type:_all`, contradicting "All means every current and future bundle". Once a configured type has no bundles, it also disappears from the Entity Types settings form and the item and consumer forms, so the settings form can no longer be saved and a stored `_all` is dropped on the next item re-save. - When Global is disabled, the item form skips the checkbox (`isEnabledAndAvailable()`). `isGlobal()` and the Global prefilter stay ungated (frozen on #3586444+s). Existing global items cannot be un-globalled in the UI, and a save can treat the missing checkbox as unchecked. - Inheriting subcontexts under-score when a scope plugin is missing: `calculateScopeScore()` and the budget estimator fall back to the child's own non-inheriting `getScopeValues()`. ## Proposed resolution - Skip indexing when `!$entity->isDefaultRevision()`. Reindex when the default revision changes (publish, revert, or revision delete). Cascade to inheriting children only when the previous default revision's scope changed. - Mirror Specific Entities: block the Entity Types settings save when a removed type is still referenced by a context item or a consumer subscription, and name the usage in the error. Count only items that store the value themselves; inheriting subcontexts are not counted, because updating the parent updates them. Keep a configured type listed on that form even when it has no bundles, so the form stays savable. - Skip disabled/unavailable plugins in live `scrubStaleScopeValues()` and settings-change scrubs so Language values are kept on single-language sites. Entity and bundle deletes still scrub regardless of the gate: a deleted term, vocabulary, language, role, tag, or bundle can never match again. - Match Taxonomy against the route-upcast entity, not a default-revision reload. On a revision route, prefer the route parameter that is the same entity as a non-default revision. A caller-supplied override (`setEntity()`) always loads by ID, since it carries no revision or translation. - Honor the caller-supplied path in language detection the same way Site Sections and Entity Types do, via `AiContextRequestInfoResolver::getPath()`. `getPath()` uses the first available path; language detection then extracts a prefix from that one path only. A prefix-less caller path does not fall through to Referer. - Keep `type:_all` when a bundle is deleted but the type still exists, and keep the All option in `AiContextScopeEntityType::getValues()` for a configured type with no bundles, so item and consumer forms still render it and a re-save keeps it. - Do not change `isGlobal()` or the Global prefilter. Keep the Global checkbox visible when the scope is disabled so existing global items can be cleared. A save must not silently drop stored global just because the widget was hidden. - When a scope plugin is missing, inheriting children should keep the parent's stored values for scoring. - Hold the Taxonomy request-entity memo by object identity, not `spl_object_id()`, so a reused handle cannot serve another entity's terms. ## Tests - Kernel: saving a draft does not change the published item's scope-index rows; inheriting children keep the published parent's indexed values; publishing, reverting, or deleting the pending revision updates or leaves the index correctly. - Functional: unchecking a still-referenced entity type is blocked for context items and for subscription-only usage; a configured type with no bundles stays listed and an unchanged save passes. - Kernel: Language values survive live cleanup when Language is unavailable; vocabulary and bundle deletes still scrub while the scope is disabled. - Kernel and unit: Taxonomy matches the route-upcast revision on a two-parameter revision route and the route-upcast translation; a caller override loads by ID even when it names the route entity. - Unit: caller-supplied `/es/...` wins over the request path; a cross-site Referer is ignored even when async; a same-site Referer is ignored on a non-async request. - Kernel: `type:_all` survives a last-bundle delete; `getValues()` keeps the All option for a configured type with no bundles. - Functional: with Global disabled, the checkbox renders and unchecking persists; an unrelated save keeps Global; a stored `_all` survives an item re-save with no bundles and can still be unchecked. - Kernel: inheriting score when a plugin is missing uses the parent's stored values. - Kernel: the Entity Types in-use count skips inheriting subcontexts. ## Out of scope - Changing post-update 0006 (stays on #3586470+s) - Changing the live stale-value policy from #3586416+s except for the block path, the unavailable-plugin skip, and keeping deletes ungated - Changing moderation workflow states or transitions - Changing `isGlobal()` to AND with `isEnabledAndAvailable()` (rejected on #3586444+s) - Public-API freeze leftovers from #3586444+s (already landed) ## Follow-ups - `countStoredValueUsage()` loads every matching item during settings validation so it can apply `inheritsParentScope()`. Fine for current catalogs; a cheaper path can wait. - Functional coverage that a parent plus inheriting child still reports "1 context item" on the Entity Types settings form. The kernel test covers the count service. ## Related issues #3586404+s #3586412+s #3586416+s #3586444+s #3586470+s ## AI usage - [x] AI assisted issue