Media: Enable client-side uploads in the Media Library and media modal by adamsilverstein · Pull Request #12585 · WordPress/wordpress-develop

adamsilverstein · 2026-07-17T22:53:46Z

Claude drafted this description, folding in the media modal work from #13875:

Trac ticket: https://core.trac.wordpress.org/ticket/65661

This now also includes the media modal work that was in #13875 (Trac https://core.trac.wordpress.org/ticket/66220), so one PR covers every place core uploads media through wp.Uploader.

Description

Client-side media processing currently only works for files dropped straight on a block in the editor - uploads from the Media Library grid, the Add New Media File screen and the media modal (the wp.media frame behind an Image block's "Media Library" button, the featured image panel and so on) still send the original file to async-upload.php and generate every sub-size on the server. That is why a HEIC converts and uploads when dropped on an Image block but fails in the modal on a server with no HEIC support. This PR routes uploads on all three through the same client-side pipeline the editor uses, so the browser resizes the image and generates the thumbnails.

Why this matters: server-side image processing is a common source of timeouts and memory errors on large images, and results vary depending on what image libraries the host has installed. Processing in the browser avoids both problems, and users get the same upload experience everywhere media is uploaded, not just in the editor.

How it works:

Both screens send the Document-Isolation-Policy header so the page is cross-origin isolated, which the wasm-vips image library requires. This reuses wp_set_up_cross_origin_isolation(), extended to cover the grid and the Add New Media File screen. A shared media-upload-pipeline script configures the @wordpress/upload-media store, queues files, tracks progress, and builds error text; a thin script on each screen intercepts files as they are added to the existing uploader and hands them to that pipeline instead: the original is uploaded via the REST API, the browser generates the sub-sizes and sideloads them, then the attachment is finalized. The existing UI - progress bars, grid tiles, error notices - is reused, so the screens look and behave unchanged. While an upload is in flight the page warns before you navigate away, since an interrupted client-side upload would lose thumbnails that were not sideloaded yet.

If the browser does not support cross-origin isolation (currently Chromium 137+ on a secure origin, exposed as wp_is_document_isolation_policy_supported()) or client-side processing is disabled, the scripts do nothing and uploads fall back to the classic flow unchanged. Audio files also stay on the classic path, since media_handle_upload() derives their title and description from ID3 tags and the REST endpoint does not. Any extra multipart params a plugin adds through plupload_default_params or wp.Uploader.param() are forwarded to the REST request so they still arrive in $_POST. A HEIC file the browser cannot decode (Linux, and Windows without the HEVC extension) is handed back to the classic uploader when the server's image editor supports HEIC, so the server converts it instead of the upload failing; when neither can convert it, the pipeline's error is shown.

Error messages come straight from the pipeline, so the platform-specific HEIC wording from WordPress/gutenberg#81130 shows up in the grid's error sidebar and in the Add New Media File error rows the same way it does in the editor. Progress is estimated from the pipeline's remaining operations and sideloaded sub-sizes, since the store does not report a percentage of its own.

The media modal

The block editor screens are already cross-origin isolated, so the modal mostly needed wiring:

The grid script is now media-frame-upload and is enqueued from wp_enqueue_media(), so it loads on every screen that opens a media frame, the grid included. It only loads on requests that are actually isolated, checked by a new wp_is_cross_origin_isolated_request(), which also honors a Document-Isolation-Policy header a plugin sent itself (the Gutenberg plugin does). The Customizer, the Site Icon picker and the classic editor open the frame without isolation and keep classic uploads, without downloading the wp-upload-media chain.
When the block editor has already configured the upload-media store, the shared pipeline script adopts it instead of rendering a second provider into it. The editor's transport reports failures as a bare string, which the pipeline now wraps so the server's reason still reaches the modal's error list.
Only uploaders that post attachments (async-upload.php with the upload-attachment action) are intercepted, so a plugin's own wp.Uploader pointed somewhere else is left alone.

This replaces the plugin-side workaround in WordPress/gutenberg#82473 and resolves WordPress/gutenberg#82409. Still not covered, worth their own tickets: isolating the Customizer, the Site Icon picker and the classic editor's modal.

Testing Instructions

Test in Chrome 137 or newer on a secure origin (https or localhost).

Check that client-side processing is enabled:

Go to Media > Library in grid view.
Open DevTools and run crossOriginIsolated in the console - it should return true. You can also confirm the page response includes the Document-Isolation-Policy: isolate-and-credentialless header in the Network tab. Client-side processing is on by default in a secure context; the wp_client_side_media_processing_enabled filter can turn it off.

Verify uploads go through the client-side pipeline:

Keep the Network tab open and drag a large image onto the grid.
You should see a POST to wp/v2/media creating the attachment, followed by sideload and finalize requests - and no file POST to async-upload.php. That is how you can tell the client-side pipeline handled the upload.
Watch the tile while that happens: the progress bar should advance as the original uploads and thumbnails are sideloaded, rather than sitting at zero until the end.
Confirm the attachment looks normal: thumbnail in the grid, sub-sizes listed in the attachment details. Server files should match what you get before the patch.
Repeat on Media > Add New Media File - same network pattern, the percentage on the row should climb, and the finished upload should show the usual row with Edit and Copy URL links.
Start another large upload and try closing the tab before it finishes: the browser should ask for confirmation. After uploads complete, closing the tab should not prompt.
Test with multiple files at once, including the same file twice - every tile should resolve.

Error handling:

Try a disallowed file type (rename a text file to .xyz): the grid's error sidebar shows the file name and a readable reason, and the placeholder tile is removed rather than left spinning. On Add New Media File the error renders the same notice a server-side failure does, with a Dismiss button that announces the error and returns focus to the browse button.
To see a server error surface, block the wp/v2/media request in DevTools (Network > right-click > Block request URL) and upload again: the server's message appears in the sidebar under the file name.

Media modal:

Open a post in the block editor, add an Image block and click "Media Library". Drop an image on "Upload files" with the Network tab open: same create, sideload, finalize pattern and no async-upload.php. The tile's progress bar advances, and "Select" inserts the finished image into the block.
Try a HEIC or AVIF on a server whose image editor cannot process them: it uploads (HEIC as a converted JPEG) instead of erroring.
Block the wp/v2/media request and upload from the modal: the server's message shows in the modal's error list.
Open the Customizer and pick a site logo, or Settings > General and pick a Site Icon: uploads go through async-upload.php and media-frame-upload.js is not loaded.

Fallback:

Repeat an upload in Firefox or Safari (or add ?browser-uploader on media-new.php) - files should upload through async-upload.php as before. In list mode (Media > Library, list view) the Document-Isolation-Policy header is not sent and the grid script is not loaded.
Upload an MP3 or WAV on either screen: it goes through async-upload.php, and the attachment title comes from the file's tags as before.
Open Media > Add New Media File with ?post_id= set to a post that does not exist and upload an image: it uploads unattached, with no error, matching the classic behavior.

Formats:

Verify that all formats supported by client side media work as expected, regardless of the server's support for them. Tests should include:

AVIF, WebP, HEIC formats
HDR JPEG images with Gain maps, HDR AVIF images
WebP and PNGs with various transparency types and color depths
PDFs, Audio and Video files also upload as expected
GIF's get a companion video created

Automated coverage: npm run test:e2e -- media-modal-client-side-upload media-library-client-side-upload media-new-client-side-upload runs 33 tests on Chromium (which supports DIP as of the bundled Chrome 149), covering the headers, the pipeline requests, the classic fallback when the page is not isolated, multi-file uploads with duplicates, mid-upload progress, the unload guard, audio staying classic, forwarded upload params, an invalid post_id, the error message, file name, and accessible Dismiss button for rejected and failed uploads, the readiness gate before the store's settings land, the HEIC hand-off to a server that can convert it, a PostInit handler another script placed in wpUploaderInit, and in the media modal: the script loading in the block editor, an upload going create, sideload, finalize and landing in the block, a server error reaching the modal's error list, an uploader with another action left to plupload, and the classic fallback without isolation. npm run test:php -- --filter 'wpEnqueueMediaFrameUpload|wpEnqueueMediaNewUpload|CrossOriginIsolation|wpIsDocumentIsolationPolicySupported' runs 71 PHPUnit tests. All green locally.

Screencasts

1-grid-client-side-upload.mp4

2-add-new-media-file-and-multi-upload.mp4

3-error-handling.mp4

4-media-modal-and-site-icon.mp4

5-fallbacks-audio-invalid-post.mp4

6-all-formats.mp4

AI Use

Code and description both came out of a long back and forth with 🤖 Claude Code. I will review and test.

Commit message

Media: Enable client-side uploads in the Media Library and modal.

Enable client-side media processing for Uploads from the Media Library grid, the Add New Media File screen and the media modal in the block editor (in supported browsers).

These screens now use the same pipeline as block editor uploads: the original is uploaded through the REST API, sub-sizes are generated in the browser and sideloaded, then the attachment is finalized. `wp_set_up_cross_origin_isolation()` now also isolates the Media Library grid and the Add New Media File screen using Document Isolation Policy. Uploads huse the client-side processing still use the existing progress, tile and error UI.

When client-side processing is disabled, uploads fall back to the classic flow unchanged. Audio files, uploaders that do not post attachments, and JPEG/PNG files while plupload resizing is enabled also stay on the classic path, and a HEIC the browser cannot decode is handed to the server when its image editor supports HEIC. The Customizer, Site Icon picker and classic editor are not isolated and keep classic uploads.

See https://github.com/WordPress/gutenberg/issues/82409.

Props adamsilverstein, westonruter, andrewserong, sanayasir, arkaprabhachowdhury, logicrays.
Fixes #65661. See #66220.

The client-side media pipeline needs SharedArrayBuffer, which requires a cross-origin isolated context. Core only isolates the block editor screens, so uploads from the Media Library grid cannot use the pipeline. Hook the existing Document-Isolation-Policy output buffer on load-upload.php, gated to grid mode for users who can upload files. The mode is resolved the same way upload.php resolves it later in the request, without updating the saved user option. List mode has no pipeline integration and stays untouched, avoiding isolation side effects on a screen that gets no benefit.

Grid uploads go through wp.Uploader/plupload to async-upload.php, doing all image processing server-side even when the browser could handle it. Add a media-library-upload script that configures the @wordpress/upload-media store and intercepts plupload's FilesAdded at a higher priority, routing each file through the pipeline: REST upload of the original, client-side thumbnails via wasm-vips, then sideload and finalize. The grid UI is preserved by mirroring wp-plupload's placeholder tiles, progress, queue reset, and error sidebar. mediaSideload/mediaFinalize are thin apiFetch wrappers because the @wordpress/media-utils equivalents are private APIs. When the browser is not cross-origin isolated or lacks client-side support, the script no-ops and classic plupload keeps handling uploads, so degraded environments lose nothing.

Assert the Document-Isolation-Policy header is sent on the grid and not in list mode, that a JPEG upload flows through the REST create, sideload, and finalize endpoints with no async-upload.php requests, and that a disallowed file type surfaces in the error sidebar. Playwright's Chromium build ships without Document-Isolation-Policy support, so the upload assertions skip when the context is not cross-origin isolated; the header assertions still run everywhere.

github-actions · 2026-07-17T22:53:57Z

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

Core Committers: Use this line as a base for the props when committing in SVN:

Props adamsilverstein, westonruter, andrewserong.

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

github-actions · 2026-07-17T22:57:29Z

Test using WordPress Playground

The changes in this pull request can previewed and tested using a WordPress Playground instance.

WordPress Playground is an experimental project that creates a full WordPress instance entirely within the browser.

Some things to be aware of

All changes will be lost when closing a tab with a Playground instance.
All changes will be lost when refreshing the page.
A fresh instance is created each time the link below is clicked.
Every time this pull request is updated, a new ZIP file containing all changes is created. If changes are not reflected in the Playground instance,
it's possible that the most recent build failed, or has not completed. Check the list of workflow runs to be sure.

For more details about these limitations and more, check out the Limitations page in the WordPress Playground documentation.

Test this pull request with WordPress Playground.

The ticket did not exist yet when the tests were written; annotate all new test methods now that it has been filed.

CI's Playwright Chromium now supports Document-Isolation-Policy, so the pipeline E2E test runs for real instead of skipping. The previous asset was the 50x50 phpunit fixture, smaller than every registered sub-size, so the pipeline correctly generated zero thumbnails and the sideload-count assertion failed. Swap in the 640x480 canola.jpg fixture so thumbnail and medium sub-sizes are generated and sideloaded, and update the skip comments that claimed Playwright lacks DIP support. See #65661

The suites gated the isolation callback and enqueue but never proved the callback is actually wired to load-upload.php, that the inline settings match what the server computes, or that the pipeline's output is real: * Assert the default-filters.php hook registration, without which none of the gating logic runs. * Assert the inline settings are exactly the JSON encoding of wp_get_media_library_upload_settings(), and that the upload_mimes, image_strip_meta, and image_max_bit_depth filters flow through to the settings the browser pipeline consumes. * Extend the E2E happy path past request counting: the finalized attachment must carry thumbnail and medium sub-sizes in its metadata, and the sideloaded thumbnail file must actually be servable.

Interrupting a client-side pipeline upload is worse than interrupting a classic plupload one: classic uploads complete server-side once the bytes arrive, but an interrupted pipeline upload loses browser-generated thumbnails that were not sideloaded yet and leaves the attachment unfinalized. Trigger the browser's leave confirmation while the progress map is non-empty; the guard is scoped to the pipeline, so classic uploads behave exactly as before. See #65662

…eline media-new.php was the last admin upload surface without pipeline integration: plupload-handlers creates a raw plupload.Uploader (wp.Uploader never loads there) posting to async-upload.php with all image processing server-side. Extend cross-origin isolation to the screen via a new wp_set_up_media_new_cross_origin_isolation() on load-media-new.php, gated on client-side processing being enabled and the upload_files capability (the screen itself already requires it). Add a new media-new-upload admin script that binds a higher-priority FilesAdded handler on the plupload-handlers uploader instance and routes files through the @wordpress/upload-media store, sharing its settings with the grid integration via wp_get_media_library_upload_settings(). The screen's existing UI helpers are reused rather than replicated: fileQueued() builds the progress item, uploadSuccess() renders the finished attachment row through the existing async-upload.php markup endpoint, itemAjaxError() surfaces per-file errors, and uploadComplete() runs when the queue drains, so the screen looks and behaves unchanged. The same beforeunload guard as the grid warns while pipeline uploads are in flight. When the browser is not cross-origin isolated or lacks client-side support the script no-ops and the classic plupload flow (and the browser-uploader HTML fallback form) keep working unchanged. See #65662

Assert the Document-Isolation-Policy header on media-new.php, the happy-path pipeline upload (create, sideload, and finalize via REST with no file upload through async-upload.php; the fetch=3 markup POST is expected and excluded), and the disallowed-file-type error path. CI's Playwright Chromium supports Document-Isolation-Policy, so the full pipeline is exercised there; the upload assertions still skip in browsers where isolation is unavailable, and the existing media-upload spec keeps covering the classic path as the degradation check. See #65662

The test asserts that a failed SVG upload on media-new.php shows a dismissible error. With the client-side pipeline active (CI's Chromium is cross-origin isolated), the disallowed file is rejected client-side and the error renders through the standard per-file error UI, where the dismiss control is a link, instead of the server-rendered async-upload.php notice, where it is a button. Target the .dismiss control by class so both variants pass; the error text and the dismissal behavior asserted are unchanged. See #65662

…oreunload guards The beforeunload guards from this branch had no test coverage at all, and the media-new.php suites had the same blind spots just closed for the grid on the base branch: * Assert the load-media-new.php hook registration in default-filters.php and that the inline settings are exactly the JSON encoding of wp_get_media_library_upload_settings(). * Add an E2E test per screen for the beforeunload guard: hold sideload requests via routing so the upload is deterministically in flight, then dispatch a synthetic cancelable beforeunload and assert it is prevented while uploading and no longer prevented after completion. * Extend the media-new.php E2E happy path past request counting: the finalized attachment must carry thumbnail and medium sub-sizes and the sideloaded thumbnail file must actually be servable.

Copilot

Pull request overview

Extends WordPress’s client-side media processing pipeline beyond the block editor to the remaining admin upload surfaces (Media Library grid and Media > Add New), including cross-origin isolation setup, upload routing via the @wordpress/upload-media store, and new automated coverage to validate the end-to-end pipeline and headers.

Changes:

Adds Media Library mode resolution and new helpers to enable Document-Isolation-Policy isolation and enqueue upload-routing scripts for upload.php (grid) and media-new.php.
Introduces new admin upload integration scripts (media-library-upload, media-new-upload) that intercept plupload flows and route files through the REST-based client-side pipeline.
Adds comprehensive PHPUnit + Playwright E2E tests covering header gating, pipeline upload behavior (create/sideload/finalize), beforeunload guards, and error handling.

Reviewed changes

Copilot reviewed 15 out of 16 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
tests/phpunit/tests/media/wpMediaNewCrossOriginIsolation.php	Adds PHPUnit coverage for DIP isolation setup on `media-new.php`.
tests/phpunit/tests/media/wpMediaLibraryCrossOriginIsolation.php	Adds PHPUnit coverage for DIP isolation setup and Media Library mode resolution on `upload.php` grid.
tests/phpunit/tests/media/wpEnqueueMediaNewUpload.php	Adds PHPUnit coverage for enqueueing `media-new-upload` and inline settings.
tests/phpunit/tests/media/wpEnqueueMediaLibraryUpload.php	Adds PHPUnit coverage for enqueueing `media-library-upload`, inline settings, and filter plumbing into settings.
tests/e2e/specs/media-upload.test.js	Adjusts an existing E2E assertion to support both server and client-side rejection UIs.
tests/e2e/specs/media-new-client-side-upload.test.js	Adds E2E coverage for `media-new.php` DIP header, pipeline upload, beforeunload guard, and disallowed types.
tests/e2e/specs/media-library-client-side-upload.test.js	Adds E2E coverage for `upload.php` grid DIP header, pipeline upload, beforeunload guard, and disallowed types (plus list-mode header absence).
src/wp-includes/script-loader.php	Registers the new admin script handles and their dependencies/translations.
src/wp-includes/media.php	Adds mode helper, isolation setup helpers, shared upload settings helper, and enqueue helpers for the two upload surfaces.
src/wp-includes/default-filters.php	Wires the new isolation setup callbacks into the relevant `load-*` hooks.
src/wp-admin/upload.php	Enqueues the new grid upload integration script in Media Library grid mode.
src/wp-admin/media-new.php	Enqueues the new Media > Add New upload integration script.
src/js/_enqueues/admin/media-new-upload.js	Implements `media-new.php` plupload interception, pipeline routing, UI mirroring, progress sync, and beforeunload guard.
src/js/_enqueues/admin/media-library-upload.js	Implements Media Library grid uploader interception, pipeline routing, UI mirroring, progress sync, and beforeunload guard.
Gruntfile.js	Adds build mappings for the two new admin scripts.

Comments suppressed due to low confidence (1)

src/wp-includes/media.php:6846

wp_enqueue_media_new_upload() enqueues the pipeline integration on any secure origin, but wp_start_cross_origin_isolation_output_buffer() (and therefore crossOriginIsolated) is Chromium 137+ only. On other browsers this script cannot run and will always no-op, so enqueueing it adds avoidable page weight. Consider gating enqueueing on wp_get_chromium_major_version() >= 137 to skip loading unused bundles in browsers that can’t be isolated by DIP.

	if ( ! wp_is_client_side_media_processing_enabled() ) {
		return;
	}

	wp_enqueue_script( 'media-new-upload' );

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 15 out of 16 changed files in this pull request and generated 1 comment.

Comments suppressed due to low confidence (1)

tests/phpunit/tests/media/wpEnqueueMediaLibraryUpload.php:46

tear_down() restores HTTP_HOST but not HTTP_USER_AGENT. If set_up() sets a Chromium UA for deterministic enqueue behavior, tear_down() should restore/unset it to avoid leaking the UA into later tests.

		if ( null === $this->original_http_host ) {
			unset( $_SERVER['HTTP_HOST'] );
		} else {
			$_SERVER['HTTP_HOST'] = $this->original_http_host;
		}

Casting and clamping the `upload_size_limit` filter result changed a widely used public function only to satisfy a type annotation: a filter returning shorthand such as '64M' became 64 bytes. Clamp the value in the pipeline settings instead, where a non-negative integer is required. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UDLDCCiR2MuQ6MeizyiAgi

A plugin calling wp_enqueue_media() on the "Add New Media File" screen enqueues both screen scripts, and each appended another copy of the settings blob, with every image size and mime type, to the shared pipeline script. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UDLDCCiR2MuQ6MeizyiAgi

The media frame script configured the store when it loaded and, when the editor had not done so yet, rendered its own MediaUploadProvider into the same store. Whichever provider committed last won, so this one could replace the editor's mediaUpload setting. On block editor screens it now only waits for the editor's settings. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UDLDCCiR2MuQ6MeizyiAgi

wp-plupload.js calls it on every UploadProgress, and views or plugins passing their own `progress` callback rely on it. Pipeline uploads updated the tile's percent but never called it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UDLDCCiR2MuQ6MeizyiAgi

One audio file in a batch kept every file in it on the classic path, so a HEIC dropped together with an MP3 failed on a server that cannot convert HEIC, although the browser could have. Eligible files now go through the pipeline and the rest are re-queued on plupload, the way a HEIC the browser cannot decode already was. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UDLDCCiR2MuQ6MeizyiAgi

The pipeline uploaded the original file, so plupload's client-side resize (the "Scale images" setting, or a `resize` passed through `plupload_init`) was silently skipped. Those images now take the classic path whenever resizing is enabled. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UDLDCCiR2MuQ6MeizyiAgi

The Media Library pipeline repeated the filters the REST index applies for the block editor, and the copies had already drifted: it never passed `wp_generate_animated_image_subsizes`, which upload-media reads to decide whether animated sub-sizes keep their animation. Both now read one private helper. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UDLDCCiR2MuQ6MeizyiAgi

adamsilverstein · 2026-10-19T22:40:30Z

I have addressed all of the outstanding feedback.

Copilot

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

westonruter

🤖 Comment by Claude Opus 5.5

A second code review of the branch (medium effort) turned up the findings below, attached inline and ordered roughly by severity. None of them repeats the earlier review. They have not been verified by running them, so each should be confirmed before acting on it.

Possible bugs:

get_current_screen() is called in a path that can run on the front end, which is a fatal error.
On media-new.php, uploadComplete() can fire while uploads are still running.
Pipeline entries leak when upload-media finishes or drops an item without calling onSuccess or onError.
A failed finalize leaves an orphaned attachment on the server.
The frame passes an unchecked post_id to REST, so uploads fail where the classic uploader would upload unattached.

Cleanups: the batch flow is duplicated between the two screens, the run-once guard searches inline script text, and isolated screens are hardcoded in conditionals. Bugs 3 and 4 start in @wordpress/upload-media's own behavior and only show up through this integration.

westonruter · 2026-10-19T23:05:17Z

+	}
+
+	$settings = wp_get_media_library_upload_settings();
+	$screen   = get_current_screen();


🤖 Comment by Claude Opus 5.5

_wp_enqueue_media_upload_pipeline_script() calls get_current_screen(), which only exists in wp-admin, so it fatals when wp_enqueue_media() runs on the front end in a cross-origin isolated response.

Failure scenario: A front-end editing plugin sends the Document-Isolation-Policy header itself (wp_is_cross_origin_isolated_request() deliberately counts a header a plugin queued), the visitor uses Chromium 137+ with client-side processing enabled, and the plugin calls wp_enqueue_media() on the front end. The three guards pass, then get_current_screen() is an undefined function and the request fails with a PHP fatal error.

Guarding with function_exists( 'get_current_screen' ), or computing isBlockEditor some other way, would avoid it.

Good catch, fixed in f7a2aaf. It now falls back to no screen when get_current_screen() isn't loaded.

westonruter · 2026-10-19T23:05:17Z

+	 * The built-in UploadComplete binding never fires for pipeline uploads
+	 * because every file is removed from plupload before its queue starts.
+	 */
+	function finishUpload() {


🤖 Comment by Claude Opus 5.5

finishUpload() fires uploadComplete() whenever the in-flight counter reaches 0 during the batch loop, and it ignores files handed back to plupload, so "upload complete" fires too early.

Failure scenario: The user drops [bad.exe, a.png, b.webp]. addItems() rejects bad.exe synchronously inside dispatch (validateMimeTypeForUser runs before any await), so onError runs, the counter goes 1→0, and uploadComplete() fires before a.png is even queued. The same happens when a batch's audio or JPEG share, or a HEIC hand-off, is still uploading through plupload. #insert-gallery is re-enabled and the queue is reported finished while uploads are still running.

Confirmed, and fixed in 11e485c.

Claude reproduced it before fixing, notes below:

Reproduced with an image plus a WAV in one batch while the WAV's classic upload was held back: uploadComplete() ran with plupload still STARTED. The other direction was wrong too - plupload's own UploadComplete would fire for the classic share while pipeline uploads were still running.

The batch is now counted before any file is queued, so a synchronous addItems() rejection can't drain the count mid-batch. finishUpload() only fires when plupload isn't STARTED, and a priority-100 UploadComplete handler holds back the built-in one while pipeline uploads are in flight. A new e2e test covers the mixed batch.

westonruter · 2026-10-19T23:05:17Z

 	}

-	if ( ! $screen->is_block_editor() && 'site-editor' !== $screen->id && ! ( 'widgets' === $screen->id && wp_use_widgets_block_editor() ) ) {
+	$is_media_screen = 'media' === $screen->id || ( 'upload' === $screen->id && 'grid' === wp_get_media_library_mode() );


🤖 Comment by Claude Opus 5.5

Each new screen adds another special case to wp_set_up_cross_origin_isolation(), plus a matching exemption from the page-builder action guard, instead of letting screens opt in through a filter or list.

$is_media_screen now has to be threaded through both the screen check and the action guard. The next screen that wants isolation (the classic editor, a plugin screen) means editing core conditionals again. A filterable list of screen IDs with a per-screen predicate would avoid that and let plugins opt in. This is related to the missing opt-out raised in the previous review.

I agree this would be nicer, but I'd like to keep it out of this PR.

Claude's reasoning for holding off:

A filterable list of screens, each with its own predicate, would be a new public API. It should be designed together with the opt-out question from the last round, and it would touch the existing block editor, site editor and widgets cases, not just the media screens added here. Keeping it separate leaves this PR to route uploads only, and gives the API its own ticket where the shape (screen IDs, per-screen callbacks, an opt-out) can be decided on its own.

Want me to open that ticket?

…t end. wp_enqueue_media() can run on the front end of a cross-origin isolated response, where get_current_screen() is not loaded. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UDLDCCiR2MuQ6MeizyiAgi

Searching the inline script text for the global's name breaks if it is renamed or another script mentions it. The flag lives on the registered script, so it resets with WP_Scripts the way the inline data does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UDLDCCiR2MuQ6MeizyiAgi

Both screens ran the same batch flow, so it now lives in wp.mediaUploadPipeline.routeBatch() with per-screen hooks, and the fixes below land once: - Delete the attachment when an upload fails after the original reached the server (a failed finalize, say), so a retry does not leave a duplicate beside unfinished metadata. - Fail an upload whose item left the store without calling either callback, so it cannot hold the unload guard forever. - On Add New Media File, count a batch before queueing it and fire uploadComplete() only once plupload is done too, holding back plupload's own UploadComplete while pipeline uploads run. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UDLDCCiR2MuQ6MeizyiAgi

westonruter

I was able to successfully upload an image from the media modal and I saw these messages logged, which I believe indicates client-side uploads:

preventDefault() is enough to show the prompt in supported browsers, and returnValue raises TS6385 and IDE deprecation warnings. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01F8YqSYiTEhynsRUBn4arsF

Resolves the TS80006 suggestion and reads more plainly than the promise chain. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01F8YqSYiTEhynsRUBn4arsF

Parsing the uploader URL handles query strings and fragments without manual splitting. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01F8YqSYiTEhynsRUBn4arsF

andrewserong

This is smoke-testing well for me, too, both in the block editor via the media modal, and via the media page in wp-admin, with sideload and finalize requests signalling that it's firing correctly (and double-checked in the editor that all the sub-sizes were generated correctly):

Block editor modal	Media page grid view

I've given the code a read-through but only skimmed the tests. Architecturally this is looking nice to me! I like the addition of the shared PHP functions, and the way the media upload pipeline renders the MediaUploadProvider when needed (or shares the one from the block editor), and the approach of hooking into the global wp.Uploader makes sense, too.

Great work here! Excited to see this land for 7.2 🎉

github-actions · 2026-10-20T05:03:19Z

A commit was made that fixes the Trac ticket referenced in the description of this pull request.

SVN changeset: 64588
GitHub commit: 9fbaa2d

This PR will be closed, but please confirm the accuracy of this and reopen if there is more work to be done.

adamsilverstein added 3 commits July 17, 2026 15:52

Media: Reference Trac ticket 65661 in test annotations

27d0ef1

The ticket did not exist yet when the tests were written; annotate all new test methods now that it has been filed.

adamsilverstein mentioned this pull request Jul 17, 2026

Media: Client-side uploads for media-new.php and a guard for in-flight uploads #12586

Closed

adamsilverstein added 8 commits July 18, 2026 09:20

Merge branch 'trunk' into add/media-library-client-side-uploads

962ea3b

adamsilverstein changed the title ~~Media: Enable client-side media uploads in the Media Library grid~~ Media: Enable client-side media uploads in the Media Library grid and media-new.php Jul 19, 2026

Merge branch 'trunk' into add/media-library-client-side-uploads

e4bfd9b

adamsilverstein changed the title ~~Media: Enable client-side media uploads in the Media Library grid and media-new.php~~ Media: Enable client-side media uploads in the Media Library Jul 20, 2026

adamsilverstein mentioned this pull request Jul 20, 2026

Media: Show determinate GIF conversion progress in the upload snackbar WordPress/gutenberg#80329

Closed

adamsilverstein added 2 commits July 20, 2026 17:23

Merge branch 'trunk' into add/media-library-client-side-uploads

cd73025

Merge branch 'trunk' into add/media-library-client-side-uploads

52bfd80

Copilot AI review requested due to automatic review settings July 23, 2026 02:26

Copilot started reviewing on behalf of adamsilverstein July 23, 2026 02:27

View session

Copilot AI reviewed Jul 23, 2026

View reviewed changes

Comment thread src/wp-includes/media.php Outdated

Potential fix for pull request finding

4d3ece2

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings July 23, 2026 03:12

Copilot started reviewing on behalf of adamsilverstein July 23, 2026 03:12

View session

Copilot AI reviewed Jul 23, 2026

View reviewed changes

Comment thread tests/phpunit/tests/media/wpEnqueueMediaLibraryUpload.php

adamsilverstein self-assigned this Jul 23, 2026

adamsilverstein added the enhancement label Jul 23, 2026

adamsilverstein and others added 7 commits October 19, 2026 14:53

adamsilverstein requested a review from westonruter October 19, 2026 22:40

Merge branch 'trunk' into add/media-library-client-side-uploads

2c5795a

adamsilverstein requested a balanced review from Copilot October 19, 2026 22:41

Copilot AI reviewed Oct 19, 2026

westonruter reviewed Oct 19, 2026

View reviewed changes

adamsilverstein and others added 3 commits October 19, 2026 16:32

adamsilverstein requested a review from westonruter October 20, 2026 01:22

adamsilverstein mentioned this pull request Oct 20, 2026

Upload Media: Delete the attachment when finalizing an upload fails WordPress/gutenberg#85158

Open

Merge branch 'trunk' into add/media-library-client-side-uploads

d647e30

westonruter reviewed Oct 20, 2026

View reviewed changes

Comment thread src/js/_enqueues/admin/media-upload-pipeline.js Outdated

Fix eslint errors

422cd66

westonruter reviewed Oct 20, 2026

View reviewed changes

Comment thread src/js/_enqueues/admin/media-upload-pipeline.js Outdated

westonruter reviewed Oct 20, 2026

View reviewed changes

Comment thread src/js/_enqueues/admin/media-frame-upload.js Outdated

westonruter approved these changes Oct 20, 2026

View reviewed changes

adamsilverstein and others added 3 commits October 19, 2026 20:13

Media: Make the pipeline's mediaFinalize() an async function

baacd06

Resolves the TS80006 suggestion and reads more plainly than the promise chain. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01F8YqSYiTEhynsRUBn4arsF

Media: Match the async-upload.php endpoint with the URL API

36aff7d

Parsing the uploader URL handles query strings and fragments without manual splitting. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01F8YqSYiTEhynsRUBn4arsF

andrewserong approved these changes Oct 20, 2026

View reviewed changes

github-actions Bot closed this Oct 20, 2026

Conversation

adamsilverstein commented Jul 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

How it works:

The media modal

Testing Instructions

Check that client-side processing is enabled:

Verify uploads go through the client-side pipeline:

Error handling:

Media modal:

Fallback:

Formats:

Screencasts

AI Use

Commit message

Uh oh!

github-actions Bot commented Jul 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jul 17, 2026

Test using WordPress Playground

Some things to be aware of

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

adamsilverstein commented Oct 19, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

westonruter left a comment

Choose a reason for hiding this comment

Uh oh!

westonruter Oct 19, 2026

Choose a reason for hiding this comment

Uh oh!

adamsilverstein Oct 19, 2026

Choose a reason for hiding this comment

Uh oh!

westonruter Oct 19, 2026

Choose a reason for hiding this comment

Uh oh!

adamsilverstein Oct 19, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

westonruter Oct 19, 2026

Choose a reason for hiding this comment

Uh oh!

adamsilverstein Oct 19, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

westonruter left a comment

Choose a reason for hiding this comment

Uh oh!

andrewserong left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Oct 20, 2026

Uh oh!

Reviewers

Assignees

Labels

adamsilverstein commented Jul 17, 2026 •

edited

Loading

github-actions Bot commented Jul 17, 2026 •

edited

Loading