## Problem Follow-up to: ai_context#3586510+s `AiRequest::doRequest()` attaches `entity_context` request metadata so subscribers such as AI Context can scope pushed context to the entity being edited. It only works for saved entities. 1. **Unsaved entities have no context at all.** `ai_ckeditor_form_alter()` puts `entity_type` and `id` into drupalSettings. On an add form the id is an empty string, and `validateEntityContext()` returns NULL when the id is empty, so nothing is sent. AI Context's Entity Types scope then cannot match, so a context item scoped to "Content: Pirate post" is never pushed while writing a new Pirate post. The `bundle` key that we already send for saved entities is exactly what is needed here, but it is only ever derived from a loaded entity. 2. **No page path.** The request goes to `/api/ai-ckeditor/request/{editor}/{plugin}`, so the HTTP path is the endpoint, not the page being edited. AI Context's Site Sections scope has nothing to match. AI Context now falls back to the same-site Referer on JSON requests (ai_context#3586510+s), but an explicit path is more reliable, for example when a Referrer-Policy strips the path or the editor is embedded in a dialog. Reproduce with ai_context 1.0.x-dev after ai_context#3586510+s: create content type "Pirate post", a context item scoped with Entity Types = Content: Pirate post, enable push for the CKEditor completion consumer, open `/node/add/pirate_post`, and use Generate with AI. The debug log shows the Entity Types item is not a candidate. Save the node, edit it, repeat: the item is pushed. ## Proposed resolution Keep the existing `entity_context` shape and extend it. AI Context 1.0.x-dev already reads `bundle` and `path` from `entity_context` (ai_context#3586510+s), so no ai_context change is needed. 1. `ai_ckeditor_form_alter()`: add `'bundle' => $entity->bundle()` to the drupalSettings entry. 2. `AiDrupalDialog.js` `getEntityContext()`: read `bundle` and send `entity_bundle`. `getPagePath()` sends `page_path` as `window.location.pathname` with `drupalSettings.path.baseUrl` removed, so subdirectory installs match `/node/add/*`. 3. `AiCKEditorDialogForm::buildForm()`: read `entity_bundle` and `page_path` from the payload, pass them to `buildCkEditorModalForm()` settings, and add hidden `entity_bundle` and `page_path` fields next to `entity_type` and `entity_id`. 4. `js/ai_ckeditor.js` `aiRequest` command: forward the two new hidden fields to the streaming POST like `entity_type` and `entity_id`. 5. `AiRequest::validateEntityContext()`: - Saved entity (id present): unchanged. Load, check view access, and use the loaded entity's bundle. Ignore the client bundle. - Unsaved entity (id empty, type and bundle present): accept only a content entity type, a bundle that exists in `EntityTypeBundleInfo`, and create access for that bundle. Return `['entity_type' => $type, 'bundle' => $bundle, 'id' => '']`. Do not load anything. Config entity types return NULL. - Add `path` when it is a string starting with `/`, with query, fragment, and the site base path stripped. Reject protocol-relative and absolute URLs. It is an untrusted hint used only for string matching. 6. Update the comment in `AiCKEditorDialogForm` that says the bundle is intentionally omitted, and the `AiRequest` comment about bundle-scoped context. 7. Docs: describe the full `entity_context` shape (`entity_type`, `bundle`, `id`, `path`) in the README or docs so consumers of the metadata have one reference. AI Context documents the same shape in its `context_delivery.md`. ## Remaining tasks - [x] Implement the changes above - [x] Rebuild `js/build/aickeditor.js` - [x] Kernel tests in `ValidateEntityContextTest`: unsaved entity with valid bundle returns type, bundle, and empty id; unknown bundle returns NULL; client bundle is ignored for saved entities; path is normalized and invalid paths dropped - [x] Kernel test in `EntityContextMetadataTest` for the unsaved-entity payload reaching `PreGenerateResponseEvent` - [x] FunctionalJavascript test in `EntityContextJavascriptTest`: new entity form exposes `bundle`, and `getEntityContext()` returns it - [x] Functional test in `AiRequestControllerTest` for the empty-id, valid-bundle request - [x] Docs - [x] Manual test with ai_context 1.0.x-dev: Entity Types item pushed on `/node/add/pirate_post`, Site Sections item pushed without relying on the Referer ## Related - ai_context#3586510+s AI Context: situational scopes fail on API-proxy consumer requests. Adds the `bundle` and `path` readers and the Referer fallback this issue feeds. - #3581952+s Added the metadata bag and the original `entity_context` payload. ## AI usage - [x] AI assisted issue