From 53ea2b70184340252aa929eb5407bead25dde90a Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 12:18:41 -0500
Subject: [PATCH 01/22] PoC

---
 .../js/components/assets/Editor/Editor.vue    |  82 +++++-
 .../js/components/fieldtypes/assets/Asset.js  |   4 +
 .../components/fieldtypes/assets/AssetRow.vue |   1 +
 .../fieldtypes/assets/AssetTile.vue           |   1 +
 .../fieldtypes/assets/AssetsFieldtype.vue     |  12 +
 src/Assets/Asset.php                          | 260 ++++++++++++++++--
 src/Assets/AssetContainer.php                 |  10 +
 src/Assets/AssetRepository.php                |   2 +-
 src/Assets/AugmentedAsset.php                 |   6 +
 .../Commands/AssetsMigrateLocalizable.php     | 202 ++++++++++++++
 src/Contracts/Assets/Asset.php                |  27 +-
 src/Contracts/Assets/AssetContainer.php       |   8 +
 src/Fieldtypes/Assets/Assets.php              |  12 +-
 src/GraphQL/Queries/AssetQuery.php            |   5 +
 src/GraphQL/Queries/AssetsQuery.php           |   9 +-
 src/GraphQL/Types/AssetInterface.php          |   3 +
 .../CP/Assets/AssetContainersController.php   |  14 +-
 .../CP/Assets/AssetsController.php            |  36 ++-
 .../CP/Assets/FieldtypeController.php         |   9 +-
 src/Http/Resources/API/AssetResource.php      |  10 +-
 src/Http/Resources/CP/Assets/Asset.php        |  48 +++-
 src/Providers/ConsoleServiceProvider.php      |   1 +
 src/Stache/Stores/AssetContainersStore.php    |   3 +-
 tests/Assets/AssetRepositoryTest.php          | 116 ++++++++
 tests/Console/Commands/AssetsMetaTest.php     |  81 ++++++
 25 files changed, 912 insertions(+), 50 deletions(-)
 create mode 100644 src/Console/Commands/AssetsMigrateLocalizable.php

diff --git a/resources/js/components/assets/Editor/Editor.vue b/resources/js/components/assets/Editor/Editor.vue
index 12ea14c97dc..052d9424049 100644
--- a/resources/js/components/assets/Editor/Editor.vue
+++ b/resources/js/components/assets/Editor/Editor.vue
@@ -31,6 +31,7 @@
                         <!-- Toolbar -->
                         <div v-if="isToolbarVisible" class="@container/toolbar dark flex flex-wrap items-center justify-center gap-2 px-2 py-4">
                             <ItemActions
+                                v-if="Array.isArray(actions)"
                                 :item="id"
                                 :url="actionUrl"
                                 :actions="actions"
@@ -116,6 +117,7 @@
                         </div>
                     </div>
 
+
                     <!-- Fields Area -->
                     <PublishContainer
                         v-if="fields"
@@ -127,6 +129,11 @@
                         :model-value="values"
                         :extra-values="extraValues"
                         :meta="meta"
+                        :origin-values="originValues"
+                        :origin-meta="originMeta"
+                        :site="activeSite"
+                        v-model:modified-fields="localizedFields"
+                        :sync-field-confirmation-text="syncFieldConfirmationText"
                         :errors="errors"
                         @update:model-value="updateValues"
                     >
@@ -134,6 +141,15 @@
                             <div v-if="saving" class="loading">
                                 <Icon name="loading" />
                             </div>
+                            <ui-panel class="flex items-center justify-between">
+                                <ui-heading size="lg" :text="__('Localizations')" class="ps-2" />
+                                <SiteSelector
+                                    v-if="showLocalizationSelector"
+                                    :sites="localizations"
+                                    :model-value="activeSite"
+                                    @update:modelValue="localizationSelected"
+                                />
+                            </ui-panel>
 
                             <PublishTabs />
                         </div>
@@ -183,6 +199,7 @@
 <script>
 import FocalPointEditor from './FocalPointEditor.vue';
 import PdfViewer from './PdfViewer.vue';
+import SiteSelector from '../../SiteSelector.vue';
 import { pick, flatten } from 'lodash-es';
 import {
     Dropdown,
@@ -192,6 +209,7 @@ import {
     PublishTabs,
     Icon,
 	Stack,
+    Panel,
 } from '@ui';
 import ItemActions from '@/components/actions/ItemActions.vue';
 
@@ -205,6 +223,7 @@ export default {
         ItemActions,
         FocalPointEditor,
         PdfViewer,
+        SiteSelector,
         PublishContainer,
         PublishTabs,
         Icon,
@@ -225,6 +244,10 @@ export default {
                 return true;
             },
         },
+        site: {
+            type: String,
+            default: null,
+        },
     },
 
     data() {
@@ -244,6 +267,13 @@ export default {
             errors: {},
             actions: [],
             closingWithChanges: false,
+            activeSite: this.site,
+            localizations: [],
+            localizedFields: [],
+            hasOrigin: false,
+            originValues: {},
+            originMeta: {},
+            syncFieldConfirmationText: __('messages.sync_entry_field_confirmation_text'),
         };
     },
 
@@ -273,6 +303,10 @@ export default {
         isToolbarVisible() {
             return !this.readOnly && this.showToolbar;
         },
+
+        showLocalizationSelector() {
+            return this.localizations.length > 1;
+        },
     },
 
     mounted() {
@@ -300,22 +334,31 @@ export default {
          * This component is given an asset ID.
          * It needs to get the corresponding data from the server.
          */
-        load() {
+        load(site = null) {
             this.loading = true;
 
             const url = cp_url(`assets/${utf8btoa(this.id)}`);
+            const requestedSite = site ?? this.activeSite ?? this.site;
 
-            this.$axios.get(url).then((response) => {
+            this.$axios.get(url, {
+                params: requestedSite ? { site: requestedSite } : {},
+            }).then((response) => {
                 const data = response.data.data;
                 this.asset = data;
 
                 // If there are no fields, it will be an empty array when PHP encodes
                 // it into JSON on the server. We'll ensure it's always an object.
-                this.values = Array.isArray(data.values) ? {} : data.values;
+                this.values = Array.isArray(data.values) ? {} : (data.values || {});
 
-                this.meta = data.meta;
+                this.meta = data.meta || {};
                 this.actionUrl = data.actionUrl;
-                this.actions = data.actions;
+                this.actions = Array.isArray(data.actions) ? data.actions : [];
+                this.activeSite = data.locale || requestedSite;
+                this.localizations = data.localizations || [];
+                this.localizedFields = data.localizedFields || [];
+                this.hasOrigin = data.hasOrigin || false;
+                this.originValues = data.originValues || {};
+                this.originMeta = data.originMeta || {};
 
                 this.fieldset = data.blueprint;
 
@@ -382,21 +425,23 @@ export default {
         },
 
         updateValues(values) {
-            let updated = { ...event, focus: values.focus };
-
-            if (JSON.stringify(values) === JSON.stringify(updated)) {
-                return
-            }
-
-            values = updated;
+            this.values = values;
         },
 
         save() {
             this.saving = true;
             const url = cp_url(`assets/${utf8btoa(this.id)}`);
+            const payload = {
+                ...this.$refs.container.visibleValues,
+                site: this.activeSite,
+            };
+
+            if (this.hasOrigin) {
+                payload._localized = this.localizedFields;
+            }
 
             return this.$axios
-                .patch(url, this.$refs.container.visibleValues)
+                .patch(url, payload)
                 .then((response) => {
                     this.$emit('saved', response.data.asset);
                     this.$toast.success(__('Saved'));
@@ -422,6 +467,15 @@ export default {
                 });
         },
 
+        localizationSelected(site) {
+            if (site === this.activeSite) {
+                return;
+            }
+
+            this.activeSite = site;
+            this.load(site);
+        },
+
         saveAndClose() {
             this.save().then(() => this.$emit('closed'));
         },
@@ -459,7 +513,7 @@ export default {
         },
 
         canRunAction(handle) {
-            return this.actions.find((action) => action.handle == handle);
+            return (this.actions || []).find((action) => action.handle == handle);
         },
 
         runAction(actions, handle) {
diff --git a/resources/js/components/fieldtypes/assets/Asset.js b/resources/js/components/fieldtypes/assets/Asset.js
index 980a9c9f12c..a4e12a112af 100644
--- a/resources/js/components/fieldtypes/assets/Asset.js
+++ b/resources/js/components/fieldtypes/assets/Asset.js
@@ -16,6 +16,10 @@ export default {
             type: Boolean,
             default: true,
         },
+        site: {
+            type: String,
+            default: null,
+        },
     },
 
     data() {
diff --git a/resources/js/components/fieldtypes/assets/AssetRow.vue b/resources/js/components/fieldtypes/assets/AssetRow.vue
index 301fbc0416b..a76b80f220c 100644
--- a/resources/js/components/fieldtypes/assets/AssetRow.vue
+++ b/resources/js/components/fieldtypes/assets/AssetRow.vue
@@ -54,6 +54,7 @@
                 <asset-editor
                     v-if="editing"
                     :id="asset.id"
+                    :site="site"
                     :allow-deleting="false"
                     @closed="closeEditor"
                     @saved="assetSaved"
diff --git a/resources/js/components/fieldtypes/assets/AssetTile.vue b/resources/js/components/fieldtypes/assets/AssetTile.vue
index f8e0ed632d9..ce44a0e147d 100644
--- a/resources/js/components/fieldtypes/assets/AssetTile.vue
+++ b/resources/js/components/fieldtypes/assets/AssetTile.vue
@@ -11,6 +11,7 @@
         <asset-editor
             v-if="editing"
             :id="asset.id"
+            :site="site"
             :allow-deleting="false"
             @closed="closeEditor"
             @saved="assetSaved"
diff --git a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
index b67ab6a9e65..9c37602eba1 100644
--- a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
+++ b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
@@ -113,6 +113,7 @@
                                 v-for="asset in assets"
                                 :key="asset.id"
                                 :asset="asset"
+                                :site="currentSite"
                                 :read-only="isReadOnly"
                                 :show-filename="config.show_filename"
                                 :show-set-alt="showSetAlt"
@@ -149,6 +150,7 @@
                                         v-for="asset in assets"
                                         :key="asset.id"
                                         :asset="asset"
+                                        :site="currentSite"
                                         :read-only="isReadOnly"
                                         :show-filename="config.show_filename"
                                         :show-set-alt="showSetAlt"
@@ -367,6 +369,10 @@ export default {
             return this.config.query_scopes || [];
         },
 
+        currentSite() {
+            return this.publishContainer.site || this.publishContainer.locale || null;
+        },
+
         replicatorPreview() {
             if (!this.showFieldPreviews) return;
 
@@ -473,6 +479,7 @@ export default {
             this.$axios
                 .post(cp_url('assets-fieldtype'), {
                     assets,
+                    site: this.currentSite,
                 })
                 .then((response) => {
                     this.assets = response.data;
@@ -647,6 +654,11 @@ export default {
         showSelector(selecting) {
             this.$emit(selecting ? 'focus' : 'blur');
         },
+
+        currentSite(site, previous) {
+            if (!site || site === previous || !this.assets.length) return;
+            this.loadAssets(this.assetIds);
+        },
     },
 
     mounted() {
diff --git a/src/Assets/Asset.php b/src/Assets/Asset.php
index a7181e62447..4998bae888a 100644
--- a/src/Assets/Asset.php
+++ b/src/Assets/Asset.php
@@ -19,6 +19,7 @@
 use Statamic\Data\ContainsData;
 use Statamic\Data\HasAugmentedInstance;
 use Statamic\Data\HasDirtyState;
+use Statamic\Data\HasOrigin;
 use Statamic\Data\TracksQueriedColumns;
 use Statamic\Data\TracksQueriedRelations;
 use Statamic\Events\AssetContainerBlueprintFound;
@@ -37,6 +38,7 @@
 use Statamic\Facades\Blink;
 use Statamic\Facades\Image;
 use Statamic\Facades\Path;
+use Statamic\Facades\Site;
 use Statamic\Facades\URL;
 use Statamic\Facades\YAML;
 use Statamic\GraphQL\ResolvesValues;
@@ -53,7 +55,7 @@
 class Asset implements Arrayable, ArrayAccess, AssetContract, Augmentable, ContainsQueryableValues, ResolvesValuesContract, SearchableContract
 {
     use ContainsData, FluentlyGetsAndSets, HasAugmentedInstance, HasDirtyState,
-        Hookable, Searchable,
+        HasOrigin, Hookable, Searchable,
         TracksQueriedColumns, TracksQueriedRelations {
             set as traitSet;
             get as traitGet;
@@ -68,6 +70,7 @@ class Asset implements Arrayable, ArrayAccess, AssetContract, Augmentable, Conta
     protected $container;
     protected $path;
     protected $meta;
+    protected $locale;
     protected $withEvents = true;
     protected $shouldHydrate = true;
     protected $removedData = [];
@@ -137,6 +140,39 @@ public function reference()
         return "asset::{$this->id()}";
     }
 
+    public function locale($locale = null)
+    {
+        return $this
+            ->fluentlyGetOrSet('locale')
+            ->setter(function ($locale) {
+                $locale = $locale instanceof \Statamic\Sites\Site ? $locale->handle() : $locale;
+
+                if ($this->locale !== $locale) {
+                    $this->meta = null;
+                    $this->data = collect();
+                    $this->removedData = [];
+                }
+
+                return $locale;
+            })
+            ->getter(function ($locale) {
+                return $locale ?? Site::selected()?->handle() ?? Site::default()->handle();
+            })
+            ->args(func_get_args());
+    }
+
+    public function site()
+    {
+        return Site::get($this->locale());
+    }
+
+    public function in($locale)
+    {
+        $asset = clone $this;
+
+        return $asset->locale($locale)->hydrate();
+    }
+
     public function get($key, $fallback = null)
     {
         return $this->hydrate()->traitGet($key, $fallback);
@@ -166,7 +202,11 @@ public function data($data = null)
         $this->hydrate();
 
         if (func_get_args()) {
-            $this->removedData = collect($this->meta['data'])
+            $current = $this->usesLocalizedData()
+                ? Arr::get($this->meta, 'data.'.$this->locale(), [])
+                : ($this->meta['data'] ?? []);
+
+            $this->removedData = collect($current)
                 ->diffKeys($data)
                 ->keys()
                 ->merge($this->removedKeys)
@@ -176,6 +216,17 @@ public function data($data = null)
         return call_user_func_array([$this, 'traitData'], func_get_args());
     }
 
+    public function localizedData()
+    {
+        $this->hydrate();
+
+        if (! $this->usesLocalizedData()) {
+            return collect($this->data->all());
+        }
+
+        return collect(Arr::get($this->meta, 'data.'.$this->locale(), []));
+    }
+
     public function hydrate()
     {
         if (! $this->shouldHydrate) {
@@ -184,7 +235,9 @@ public function hydrate()
 
         $this->meta = $this->meta();
 
-        $this->data = collect($this->meta['data']);
+        $this->data = $this->usesLocalizedData()
+            ? $this->dataForLocale($this->meta, $this->locale())
+            : collect($this->meta['data'] ?? []);
 
         $this->removedData = [];
 
@@ -237,25 +290,36 @@ public function meta($key = null)
         }
 
         if (! $this->exists()) {
-            return $this->generateMeta();
+            return $this->normalizeMeta($this->generateMeta());
         }
 
         if (! config('statamic.assets.cache_meta')) {
-            return $this->generateMeta();
+            return $this->normalizeMeta($this->generateMeta());
         }
 
         if ($this->meta) {
-            $meta = $this->meta;
-
-            $meta['data'] = collect(Arr::get($meta, 'data', []))
-                ->merge($this->data->all())
-                ->except($this->removedData)
-                ->all();
+            $meta = $this->normalizeMeta($this->meta);
+
+            if ($this->usesLocalizedData()) {
+                $locale = $this->locale();
+                $existing = Arr::get($meta, "data.{$locale}", []);
+                $updated = collect($existing)
+                    ->merge($this->data->all())
+                    ->except($this->removedData)
+                    ->all();
+
+                Arr::set($meta, "data.{$locale}", $updated);
+            } else {
+                $meta['data'] = collect(Arr::get($meta, 'data', []))
+                    ->merge($this->data->all())
+                    ->except($this->removedData)
+                    ->all();
+            }
 
             return $meta;
         }
 
-        return $this->meta = $this->cacheStore()->rememberForever($this->metaCacheKey(), function () {
+        $meta = $this->cacheStore()->rememberForever($this->metaCacheKey(), function () {
             if ($contents = $this->disk()->get($path = $this->metaPath())) {
                 return YAML::file($path)->parse($contents);
             }
@@ -264,10 +328,20 @@ public function meta($key = null)
 
             return $meta;
         });
+
+        return $this->meta = $this->normalizeMeta($meta);
     }
 
     private function metaValue($key)
     {
+        if ($key === 'data') {
+            $meta = $this->meta();
+
+            return $this->usesLocalizedData()
+                ? $this->dataForLocale($meta, $this->locale())->all()
+                : Arr::get($meta, 'data', []);
+        }
+
         $value = Arr::get($this->meta(), $key);
 
         if (! is_null($value)) {
@@ -283,7 +357,9 @@ private function metaValue($key)
 
     public function generateMeta()
     {
-        $meta = ['data' => $this->data->all()];
+        $meta = ['data' => $this->usesLocalizedData()
+            ? [$this->locale() => $this->data->all()]
+            : $this->data->all()];
 
         if ($this->exists()) {
             $attributes = Attributes::asset($this)->get();
@@ -315,7 +391,24 @@ protected function metaExists()
 
     public function writeMeta($meta)
     {
-        $meta['data'] = Arr::removeNullValues($meta['data']);
+        $meta = $this->normalizeMeta($meta);
+
+        if ($this->usesLocalizedData()) {
+            $meta['data'] = collect($meta['data'] ?? [])
+                ->map(fn ($localeData) => Arr::removeNullValues($localeData ?? []))
+                ->filter(fn ($localeData) => ! empty($localeData))
+                ->all();
+
+            $siteOrigins = $this->siteOriginsForMeta($meta);
+
+            if ($this->siteOriginsAreDefault($siteOrigins)) {
+                unset($meta['sites']);
+            } else {
+                $meta['sites'] = $siteOrigins;
+            }
+        } else {
+            $meta['data'] = Arr::removeNullValues($meta['data'] ?? []);
+        }
 
         $contents = YAML::dump($meta);
 
@@ -324,7 +417,136 @@ public function writeMeta($meta)
 
     public function metaCacheKey()
     {
-        return 'asset-meta-'.$this->id();
+        $key = 'asset-meta-'.$this->id();
+
+        if ($this->usesLocalizedData()) {
+            $key .= '-'.$this->locale();
+        }
+
+        return $key;
+    }
+
+    protected function usesLocalizedData(): bool
+    {
+        return Site::multiEnabled() && $this->container()?->localizable();
+    }
+
+    protected function normalizeMeta(array $meta): array
+    {
+        if (! $this->usesLocalizedData()) {
+            $meta['data'] = Arr::get($meta, 'data', []);
+
+            return $meta;
+        }
+
+        $siteOrigins = $this->siteOriginsForMeta($meta);
+        $data = Arr::get($meta, 'data', []);
+
+        if (! is_array($data)) {
+            $data = [];
+        }
+
+        if (! $this->isLocalizedMetaData($data, $siteOrigins)) {
+            $default = Site::default()->handle();
+            $data = [$default => $data];
+        }
+
+        if ($this->siteOriginsAreDefault($siteOrigins)) {
+            unset($meta['sites']);
+        } else {
+            $meta['sites'] = $siteOrigins;
+        }
+        $meta['data'] = $data;
+
+        return $meta;
+    }
+
+    protected function isLocalizedMetaData(array $data, array $siteOrigins): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+
+        $siteHandles = array_keys($siteOrigins);
+
+        return collect(array_keys($data))->every(fn ($key) => in_array($key, $siteHandles));
+    }
+
+    protected function defaultSiteOrigins(): array
+    {
+        $default = Site::default()->handle();
+        $sites = Site::all()->mapWithKeys(function ($site) use ($default) {
+            return [$site->handle() => $site->handle() === $default ? null : $default];
+        })->all();
+
+        return empty($sites) ? [$default => null] : $sites;
+    }
+
+    protected function siteOriginsForMeta(array $meta): array
+    {
+        $defaultSiteOrigins = $this->defaultSiteOrigins();
+        $sites = Arr::get($meta, 'sites');
+
+        if (! is_array($sites)) {
+            return $defaultSiteOrigins;
+        }
+
+        return collect($defaultSiteOrigins)->mapWithKeys(function ($origin, $site) use ($sites) {
+            return [$site => array_key_exists($site, $sites) ? $sites[$site] : $origin];
+        })->all();
+    }
+
+    protected function siteOriginsAreDefault(array $siteOrigins): bool
+    {
+        return $siteOrigins === $this->defaultSiteOrigins();
+    }
+
+    protected function dataForLocale(array $meta, $locale)
+    {
+        $meta = $this->normalizeMeta($meta);
+        $siteOrigins = collect($this->siteOriginsForMeta($meta));
+
+        $data = collect(Arr::get($meta, "data.{$locale}", []));
+        $origin = $siteOrigins->get($locale);
+
+        while ($origin) {
+            $data = collect(Arr::get($meta, "data.{$origin}", []))->merge($data);
+            $origin = $siteOrigins->get($origin);
+        }
+
+        return $data;
+    }
+
+    public function origin($origin = null)
+    {
+        if (func_num_args() === 0) {
+            if (! $this->usesLocalizedData()) {
+                return null;
+            }
+
+            $siteOrigins = $this->siteOriginsForMeta($this->meta());
+
+            return $this->getOriginByString(
+                collect($siteOrigins)->get($this->locale())
+            );
+        }
+
+        throw new \Exception('The origin cannot be set directly. It is derived from site configuration.');
+    }
+
+    public function getOriginByString($origin)
+    {
+        return $origin ? $this->in($origin) : null;
+    }
+
+    protected function getOriginIdFromObject($origin)
+    {
+        return $origin->locale();
+    }
+
+    protected function getOriginBlinkKey()
+    {
+        return 'origin-asset-'.$this->id().'-'.$this->locale();
     }
 
     /**
@@ -696,7 +918,13 @@ public function delete()
     protected function clearCaches()
     {
         $this->meta = null;
-        $this->cacheStore()->forget($this->metaCacheKey());
+
+        if ($this->usesLocalizedData()) {
+            Site::all()->each(fn ($site) => $this->cacheStore()->forget('asset-meta-'.$this->id().'-'.$site->handle()));
+            $this->cacheStore()->forget('asset-meta-'.$this->id());
+        } else {
+            $this->cacheStore()->forget($this->metaCacheKey());
+        }
     }
 
     /**
diff --git a/src/Assets/AssetContainer.php b/src/Assets/AssetContainer.php
index 9d94368d527..f96b243755c 100644
--- a/src/Assets/AssetContainer.php
+++ b/src/Assets/AssetContainer.php
@@ -45,6 +45,7 @@ class AssetContainer implements Arrayable, ArrayAccess, AssetContainerContract,
     protected $sortField;
     protected $sortDirection;
     protected $validation;
+    protected $localizable;
 
     public function id($id = null)
     {
@@ -109,6 +110,14 @@ public function validationRules($rules = null)
             ->args(func_get_args());
     }
 
+    public function localizable($localizable = null)
+    {
+        return $this
+            ->fluentlyGetOrSet('localizable')
+            ->getter(fn ($localizable) => (bool) ($localizable ?? false))
+            ->args(func_get_args());
+    }
+
     public function diskPath()
     {
         return rtrim($this->disk()->path('/'), '/');
@@ -569,6 +578,7 @@ public function fileData()
             'source_preset' => $this->sourcePreset,
             'warm_presets' => $this->warmPresets,
             'validate' => $this->validation,
+            'localizable' => $this->localizable ?: null,
         ];
 
         $array = Arr::removeNullValues(array_merge($array, [
diff --git a/src/Assets/AssetRepository.php b/src/Assets/AssetRepository.php
index ddb03c9982d..adaa8e3f9a0 100644
--- a/src/Assets/AssetRepository.php
+++ b/src/Assets/AssetRepository.php
@@ -147,7 +147,7 @@ public function save($asset)
 
         $store->save($asset);
 
-        $asset->writeMeta($asset->generateMeta());
+        $asset->writeMeta($asset->meta());
     }
 
     public function delete($asset)
diff --git a/src/Assets/AugmentedAsset.php b/src/Assets/AugmentedAsset.php
index a49727b431a..b0c31ec2cd8 100644
--- a/src/Assets/AugmentedAsset.php
+++ b/src/Assets/AugmentedAsset.php
@@ -35,6 +35,7 @@ public function keys()
                 'edit_url',
                 'container',
                 'folder',
+                'locale',
                 'url',
                 'permalink',
                 'api_url',
@@ -84,6 +85,11 @@ protected function permalink()
         return $this->data->absoluteUrl();
     }
 
+    protected function locale()
+    {
+        return $this->data->locale();
+    }
+
     protected function size()
     {
         return Str::fileSizeForHumans($this->sizeBytes());
diff --git a/src/Console/Commands/AssetsMigrateLocalizable.php b/src/Console/Commands/AssetsMigrateLocalizable.php
new file mode 100644
index 00000000000..530a46f79ac
--- /dev/null
+++ b/src/Console/Commands/AssetsMigrateLocalizable.php
@@ -0,0 +1,202 @@
+<?php
+
+namespace Statamic\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Statamic\Console\RunsInPlease;
+use Statamic\Facades\AssetContainer;
+use Statamic\Facades\Site;
+use Statamic\Facades\YAML;
+
+class AssetsMigrateLocalizable extends Command
+{
+    use RunsInPlease;
+
+    protected $signature = 'statamic:assets:migrate-localizable
+        {container? : Handle of a container}
+        {--site= : Root site handle to receive existing data}';
+
+    protected $description = 'Migrate asset metadata to localizable structure';
+
+    public function handle()
+    {
+        $rootSite = $this->option('site') ?: Site::default()->handle();
+        $siteOrigins = $this->siteOrigins($rootSite);
+        $containers = $this->containers();
+
+        $fileMigrated = 0;
+        $fileScanned = 0;
+
+        foreach ($containers as $container) {
+            if (! $container->localizable()) {
+                $this->components->warn(__('Skipping [:container] because localizable metadata is disabled.', [
+                    'container' => $container->handle(),
+                ]));
+
+                continue;
+            }
+
+            foreach ($container->metaFiles() as $metaPath) {
+                $fileScanned++;
+                $contents = $container->disk()->get($metaPath);
+                $meta = $contents ? YAML::file($metaPath)->parse($contents) : [];
+                $normalized = $this->normalizeMeta($meta, $siteOrigins, $rootSite);
+
+                if ($normalized === $meta) {
+                    continue;
+                }
+
+                $container->disk()->put($metaPath, YAML::dump($normalized));
+                $fileMigrated++;
+            }
+        }
+
+        [$dbMigrated, $dbScanned] = $this->migrateEloquentMeta($siteOrigins, $rootSite);
+
+        $this->components->info(__('Migrated :migrated of :scanned asset metadata files.', [
+            'migrated' => $fileMigrated,
+            'scanned' => $fileScanned,
+        ]));
+
+        if ($dbScanned > 0) {
+            $this->components->info(__('Migrated :migrated of :scanned Eloquent asset metadata rows.', [
+                'migrated' => $dbMigrated,
+                'scanned' => $dbScanned,
+            ]));
+            $this->components->warn(__('For future optimization, add a dedicated locale column in the eloquent-driver assets table.'));
+        }
+
+        return self::SUCCESS;
+    }
+
+    protected function containers()
+    {
+        if (! $handle = $this->argument('container')) {
+            return AssetContainer::all();
+        }
+
+        $container = AssetContainer::find($handle);
+
+        if (! $container) {
+            throw new \InvalidArgumentException(__('Invalid container [:container].', ['container' => $handle]));
+        }
+
+        return collect([$container]);
+    }
+
+    protected function siteOrigins(string $rootSite): array
+    {
+        return Site::all()->mapWithKeys(function ($site) use ($rootSite) {
+            return [$site->handle() => $site->handle() === $rootSite ? null : $rootSite];
+        })->all();
+    }
+
+    protected function normalizeMeta(array $meta, array $siteOrigins, string $rootSite): array
+    {
+        $data = $meta['data'] ?? [];
+
+        if (! is_array($data)) {
+            $data = [];
+        }
+
+        if (! $this->isLocalizedData($data, $siteOrigins)) {
+            $data = [$rootSite => $data];
+        }
+
+        $data = collect($data)
+            ->map(fn ($localeData) => array_filter(($localeData ?? []), fn ($value) => ! is_null($value)))
+            ->filter(fn ($localeData) => ! empty($localeData))
+            ->all();
+
+        $resolvedSiteOrigins = $this->siteOriginsForMeta($meta, $siteOrigins);
+
+        if ($this->siteOriginsAreDefault($resolvedSiteOrigins)) {
+            unset($meta['sites']);
+        } else {
+            $meta['sites'] = $resolvedSiteOrigins;
+        }
+
+        $meta['data'] = $data;
+
+        return $meta;
+    }
+
+    protected function isLocalizedData(array $data, array $siteOrigins): bool
+    {
+        if (empty($data)) {
+            return false;
+        }
+
+        $siteHandles = array_keys($siteOrigins);
+
+        return collect(array_keys($data))->every(fn ($key) => in_array($key, $siteHandles));
+    }
+
+    protected function defaultSiteOrigins(): array
+    {
+        $default = Site::default()->handle();
+
+        return Site::all()->mapWithKeys(function ($site) use ($default) {
+            return [$site->handle() => $site->handle() === $default ? null : $default];
+        })->all();
+    }
+
+    protected function siteOriginsForMeta(array $meta, array $fallbackSiteOrigins): array
+    {
+        $sites = $meta['sites'] ?? null;
+
+        if (! is_array($sites)) {
+            return $fallbackSiteOrigins;
+        }
+
+        return collect($fallbackSiteOrigins)->mapWithKeys(function ($origin, $site) use ($sites) {
+            return [$site => array_key_exists($site, $sites) ? $sites[$site] : $origin];
+        })->all();
+    }
+
+    protected function siteOriginsAreDefault(array $siteOrigins): bool
+    {
+        return $siteOrigins === $this->defaultSiteOrigins();
+    }
+
+    protected function migrateEloquentMeta(array $siteOrigins, string $rootSite): array
+    {
+        $modelClass = app()->bound('statamic.eloquent.assets.model')
+            ? app('statamic.eloquent.assets.model')
+            : null;
+
+        if (! $modelClass) {
+            return [0, 0];
+        }
+
+        $table = (new $modelClass)->getTable();
+
+        if (! Schema::hasTable($table) || ! Schema::hasColumn($table, 'meta')) {
+            return [0, 0];
+        }
+
+        $migrated = 0;
+        $scanned = 0;
+
+        DB::table($table)->select('id', 'meta')->orderBy('id')->lazy()->each(function ($row) use ($table, $siteOrigins, $rootSite, &$migrated, &$scanned) {
+            $scanned++;
+            $meta = is_array($row->meta) ? $row->meta : (json_decode($row->meta ?? '{}', true) ?: []);
+            $normalized = $this->normalizeMeta($meta, $siteOrigins, $rootSite);
+
+            if ($normalized === $meta) {
+                return;
+            }
+
+            DB::table($table)->where('id', $row->id)->update([
+                'meta' => $normalized,
+                'updated_at' => now(),
+            ]);
+
+            $migrated++;
+        });
+
+        return [$migrated, $scanned];
+    }
+}
diff --git a/src/Contracts/Assets/Asset.php b/src/Contracts/Assets/Asset.php
index 3cdd211dd2b..c8f128ac09e 100644
--- a/src/Contracts/Assets/Asset.php
+++ b/src/Contracts/Assets/Asset.php
@@ -2,9 +2,11 @@
 
 namespace Statamic\Contracts\Assets;
 
+use Statamic\Contracts\Data\Localizable;
+use Statamic\Sites\Site;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
-interface Asset
+interface Asset extends Localizable
 {
     /**
      * Get the filename.
@@ -84,4 +86,27 @@ public function download(?string $name = null, array $headers = []);
      * @return mixed
      */
     public function contents();
+
+    /**
+     * Get or set the locale.
+     *
+     * @param  string|Site|null  $locale
+     * @return mixed
+     */
+    public function locale($locale = null);
+
+    /**
+     * Get the asset in a locale.
+     *
+     * @param  string|Site  $locale
+     * @return self
+     */
+    public function in($locale);
+
+    /**
+     * Get the site for the active locale.
+     *
+     * @return Site|null
+     */
+    public function site();
 }
diff --git a/src/Contracts/Assets/AssetContainer.php b/src/Contracts/Assets/AssetContainer.php
index 7c77892fc96..e441bfcfb3c 100644
--- a/src/Contracts/Assets/AssetContainer.php
+++ b/src/Contracts/Assets/AssetContainer.php
@@ -109,4 +109,12 @@ public function private();
      * @return array
      */
     public function validationRules($rules = null);
+
+    /**
+     * Whether metadata in this container is localizable.
+     *
+     * @param  bool|null  $localizable
+     * @return bool|self
+     */
+    public function localizable($localizable = null);
 }
diff --git a/src/Fieldtypes/Assets/Assets.php b/src/Fieldtypes/Assets/Assets.php
index 6b7e3e00c7e..b1fc4c0bf22 100644
--- a/src/Fieldtypes/Assets/Assets.php
+++ b/src/Fieldtypes/Assets/Assets.php
@@ -339,12 +339,14 @@ private function renameFolderAction($dynamicFolder)
         ];
     }
 
-    public function getItemData($items)
+    public function getItemData($items, $site = null)
     {
-        return collect($items)->map(function ($url) {
-            return ($asset = Asset::find($url))
-                ? (new AssetResource($asset))->resolve()['data']
-                : null;
+        return collect($items)->map(function ($url) use ($site) {
+            if (! $asset = Asset::find($url)) {
+                return null;
+            }
+
+            return (new AssetResource($site ? $asset->in($site) : $asset))->resolve()['data'];
         })->filter()->values();
     }
 
diff --git a/src/GraphQL/Queries/AssetQuery.php b/src/GraphQL/Queries/AssetQuery.php
index edb01a0e92a..9f7eb39059e 100644
--- a/src/GraphQL/Queries/AssetQuery.php
+++ b/src/GraphQL/Queries/AssetQuery.php
@@ -32,6 +32,7 @@ public function args(): array
             'id' => GraphQL::string(),
             'container' => GraphQL::string(),
             'path' => GraphQL::string(),
+            'site' => GraphQL::string(),
         ];
     }
 
@@ -43,6 +44,10 @@ public function resolve($root, $args)
             $asset = AssetContainer::findByHandle($args['container'])->asset($args['path']);
         }
 
+        if ($asset && ($site = $args['site'] ?? null)) {
+            $asset = $asset->in($site);
+        }
+
         // The middleware will take care of authorization when using `container` arg,
         // but this is still required when the user queries by the asset `id` arg.
         if ($asset && ! in_array($container = $asset->container()->handle(), $this->allowedSubResources())) {
diff --git a/src/GraphQL/Queries/AssetsQuery.php b/src/GraphQL/Queries/AssetsQuery.php
index ff393d2bdd1..510d1d502e1 100644
--- a/src/GraphQL/Queries/AssetsQuery.php
+++ b/src/GraphQL/Queries/AssetsQuery.php
@@ -40,6 +40,7 @@ public function args(): array
             'container' => GraphQL::nonNull(GraphQL::string()),
             'limit' => GraphQL::int(),
             'page' => GraphQL::int(),
+            'site' => GraphQL::string(),
             'filter' => GraphQL::type(JsonArgument::NAME),
             'sort' => GraphQL::listOf(GraphQL::string()),
         ];
@@ -57,7 +58,13 @@ public function resolve($root, $args)
             $this->sortQuery($query, $sort);
         }
 
-        return $query->paginate($args['limit'] ?? 1000);
+        $assets = $query->paginate($args['limit'] ?? 1000);
+
+        if ($site = $args['site'] ?? null) {
+            $assets->setCollection($assets->getCollection()->map(fn ($asset) => $asset->in($site)));
+        }
+
+        return $assets;
     }
 
     private function sortQuery($query, $sorts)
diff --git a/src/GraphQL/Types/AssetInterface.php b/src/GraphQL/Types/AssetInterface.php
index 2a466c3037e..62471b63397 100644
--- a/src/GraphQL/Types/AssetInterface.php
+++ b/src/GraphQL/Types/AssetInterface.php
@@ -48,6 +48,9 @@ public function fields(): array
             'folder' => [
                 'type' => GraphQL::string(),
             ],
+            'locale' => [
+                'type' => GraphQL::string(),
+            ],
             'url' => [
                 'type' => GraphQL::string(),
             ],
diff --git a/src/Http/Controllers/CP/Assets/AssetContainersController.php b/src/Http/Controllers/CP/Assets/AssetContainersController.php
index dea9bbaa4d3..7f8fd7cd608 100644
--- a/src/Http/Controllers/CP/Assets/AssetContainersController.php
+++ b/src/Http/Controllers/CP/Assets/AssetContainersController.php
@@ -7,6 +7,7 @@
 use Statamic\CP\PublishForm;
 use Statamic\Facades\AssetContainer;
 use Statamic\Facades\Blueprint;
+use Statamic\Facades\Site;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Rules\Handle;
 
@@ -29,6 +30,7 @@ public function edit($container)
             'warm_intelligent' => $intelligent = $container->warmsPresetsIntelligently(),
             'warm_presets' => $intelligent ? [] : $container->warmPresets(),
             'validation' => $container->validationRules(),
+            'localizable' => $container->localizable(),
         ];
 
         return PublishForm::make($this->formBlueprint($container))
@@ -53,7 +55,8 @@ public function update(Request $request, $container)
             ->disk($values['disk'])
             ->sourcePreset($values['source_preset'])
             ->warmPresets($values['warm_intelligent'] ? null : $values['warm_presets'])
-            ->validationRules($values['validation'] ?? null);
+            ->validationRules($values['validation'] ?? null)
+            ->localizable($values['localizable'] ?? false);
 
         $container->save();
 
@@ -91,7 +94,8 @@ public function store(Request $request)
             ->title($values['title'])
             ->disk($values['disk'])
             ->sourcePreset($values['source_preset'])
-            ->warmPresets($values['warm_intelligent'] ? null : $values['warm_presets']);
+            ->warmPresets($values['warm_intelligent'] ? null : $values['warm_presets'])
+            ->localizable($values['localizable'] ?? false);
 
         $container->save();
 
@@ -187,6 +191,12 @@ protected function formBlueprint($container = null)
                         'display' => __('Validation Rules'),
                         'instructions' => __('statamic::messages.asset_container_validation_rules_instructions'),
                     ],
+                    'localizable' => [
+                        'type' => 'toggle',
+                        'display' => __('Localizable Metadata'),
+                        'instructions' => __('When enabled, asset field data like alt text can be translated per site.'),
+                        'if' => Site::multiEnabled(),
+                    ],
                 ],
             ],
         ]);
diff --git a/src/Http/Controllers/CP/Assets/AssetsController.php b/src/Http/Controllers/CP/Assets/AssetsController.php
index a4bb8b4ffa0..69be027ba59 100644
--- a/src/Http/Controllers/CP/Assets/AssetsController.php
+++ b/src/Http/Controllers/CP/Assets/AssetsController.php
@@ -16,6 +16,7 @@
 use Statamic\Exceptions\NotFoundHttpException;
 use Statamic\Facades\Asset;
 use Statamic\Facades\AssetContainer;
+use Statamic\Facades\Site;
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Http\Resources\CP\Assets\Asset as AssetResource;
@@ -39,12 +40,18 @@ public function index()
         throw new AuthorizationException;
     }
 
-    public function show($asset)
+    public function show(Request $request, $asset)
     {
         $asset = Asset::find(base64_decode($asset));
 
         abort_if(! $asset, 404);
 
+        $site = $request->input('site') ?: (Site::multiEnabled() ? Site::selected()->handle() : null);
+
+        if ($site) {
+            $asset = $asset->in($site);
+        }
+
         $this->authorize('view', $asset);
 
         return new AssetResource($asset);
@@ -54,6 +61,12 @@ public function update(Request $request, $asset)
     {
         $asset = Asset::find(base64_decode($asset));
 
+        $site = $request->input('site') ?: (Site::multiEnabled() ? Site::selected()->handle() : null);
+
+        if ($site) {
+            $asset = $asset->in($site);
+        }
+
         $this->authorize('edit', $asset);
 
         $fields = $asset->blueprint()->fields()->addValues($request->all());
@@ -64,8 +77,25 @@ public function update(Request $request, $asset)
             'focus' => $request->focus,
         ]);
 
-        foreach ($values as $key => $value) {
-            $asset->set($key, $value);
+        if ($asset->hasOrigin()) {
+            $localizedHandles = collect($request->input('_localized', []));
+            $localizedInput = $values->only($localizedHandles->all());
+
+            $keysToForget = $localizedInput
+                ->filter(fn ($value) => $value === null || $value === '')
+                ->keys();
+
+            $keysToUpsert = $localizedInput
+                ->reject(fn ($value) => $value === null || $value === '');
+
+            $asset->data(
+                $asset->localizedData()
+                    ->except($keysToForget)
+                    ->merge($keysToUpsert)
+                    ->all()
+            );
+        } else {
+            $asset->merge($values->all());
         }
 
         $asset->save();
diff --git a/src/Http/Controllers/CP/Assets/FieldtypeController.php b/src/Http/Controllers/CP/Assets/FieldtypeController.php
index afcb2ae998e..b9dba96c817 100644
--- a/src/Http/Controllers/CP/Assets/FieldtypeController.php
+++ b/src/Http/Controllers/CP/Assets/FieldtypeController.php
@@ -4,13 +4,20 @@
 
 use Illuminate\Http\Request;
 use Statamic\Fieldtypes\Assets\Assets as AssetsFieldtype;
+use Statamic\Facades\Site;
 use Statamic\Http\Controllers\CP\CpController;
 
 class FieldtypeController extends CpController
 {
     public function index(Request $request)
     {
+        $site = $request->input('site');
+
+        if (! $site && Site::multiEnabled()) {
+            $site = Site::selected()->handle();
+        }
+
         return (new AssetsFieldtype)
-            ->getItemData($request->input('assets', []));
+            ->getItemData($request->input('assets', []), $site);
     }
 }
diff --git a/src/Http/Resources/API/AssetResource.php b/src/Http/Resources/API/AssetResource.php
index 19c1cab3ebe..339af024f8c 100644
--- a/src/Http/Resources/API/AssetResource.php
+++ b/src/Http/Resources/API/AssetResource.php
@@ -14,11 +14,17 @@ class AssetResource extends JsonResource
      */
     public function toArray($request)
     {
-        $with = $this->blueprint()
+        $asset = $this->resource;
+
+        if ($site = $request->input('site')) {
+            $asset = $asset->in($site);
+        }
+
+        $with = $asset->blueprint()
             ->fields()->all()
             ->filter->isRelationship()->keys()->all();
 
-        return $this->resource
+        return $asset
             ->toAugmentedCollection()
             ->withRelations($with)
             ->withShallowNesting()
diff --git a/src/Http/Resources/CP/Assets/Asset.php b/src/Http/Resources/CP/Assets/Asset.php
index 117e0652fe6..e99d762121e 100644
--- a/src/Http/Resources/CP/Assets/Asset.php
+++ b/src/Http/Resources/CP/Assets/Asset.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Http\Resources\Json\JsonResource;
 use Statamic\Facades\Action;
+use Statamic\Facades\Site;
 use Statamic\Facades\User;
 use Statamic\Support\Str;
 
@@ -58,6 +59,10 @@ public function toArray($request)
 
             $this->merge($this->thumbnails()),
             $this->merge($this->publishFormData()),
+            $this->mergeWhen(
+                Site::multiEnabled() && $this->container()->localizable(),
+                fn () => $this->localizationData()
+            ),
 
             'actionUrl' => cp_route('assets.actions.run'),
             'actions' => Action::for($this->resource, [
@@ -75,12 +80,49 @@ public function toArray($request)
     protected function publishFormData()
     {
         $fields = $this->blueprint()->fields()
-            ->addValues($this->data()->all())
+            ->addValues($this->values()->all())
             ->preProcess();
 
         return [
-            'values' => $this->data()->merge($fields->values()),
-            'meta' => $fields->meta(),
+            'values' => collect($this->values())->merge($fields->values())->all(),
+            'meta' => $fields->meta()->all(),
+        ];
+    }
+
+    protected function localizationData()
+    {
+        if (! Site::multiEnabled() || ! $this->container()->localizable()) {
+            return [];
+        }
+
+        $originValues = null;
+        $originMeta = null;
+
+        if ($this->hasOrigin()) {
+            $fields = $this->blueprint()->fields()
+                ->addValues($this->origin()->values()->all())
+                ->preProcess();
+
+            $originValues = $fields->values()->all();
+            $originMeta = $fields->meta()->all();
+        }
+
+        return [
+            'locale' => $this->locale(),
+            'localizedFields' => $this->localizedData()->keys()->values()->all(),
+            'hasOrigin' => $this->hasOrigin(),
+            'originValues' => $originValues,
+            'originMeta' => $originMeta,
+            'localizations' => Site::all()->map(function ($site) {
+                $localized = $this->in($site->handle());
+
+                return [
+                    'handle' => $site->handle(),
+                    'name' => $site->name(),
+                    'active' => $site->handle() === $this->locale(),
+                    'origin' => ! $localized->hasOrigin(),
+                ];
+            })->values()->all(),
         ];
     }
 }
diff --git a/src/Providers/ConsoleServiceProvider.php b/src/Providers/ConsoleServiceProvider.php
index 2720b1fca85..7655fe999ad 100644
--- a/src/Providers/ConsoleServiceProvider.php
+++ b/src/Providers/ConsoleServiceProvider.php
@@ -14,6 +14,7 @@ class ConsoleServiceProvider extends ServiceProvider
         Commands\AssetsCacheClear::class,
         Commands\AssetsGeneratePresets::class,
         Commands\AssetsMeta::class,
+        Commands\AssetsMigrateLocalizable::class,
         Commands\GlideClear::class,
         Commands\Install::class,
         Commands\InstallCollaboration::class,
diff --git a/src/Stache/Stores/AssetContainersStore.php b/src/Stache/Stores/AssetContainersStore.php
index a86def19fe0..d948ecf0a87 100644
--- a/src/Stache/Stores/AssetContainersStore.php
+++ b/src/Stache/Stores/AssetContainersStore.php
@@ -26,6 +26,7 @@ public function makeItemFromFile($path, $contents)
             ->searchIndex(Arr::get($data, 'search_index'))
             ->sortField(Arr::get($data, 'sort_by'))
             ->sortDirection(Arr::get($data, 'sort_dir'))
-            ->validationRules(Arr::get($data, 'validate'));
+            ->validationRules(Arr::get($data, 'validate'))
+            ->localizable(Arr::get($data, 'localizable', false));
     }
 }
diff --git a/tests/Assets/AssetRepositoryTest.php b/tests/Assets/AssetRepositoryTest.php
index 37e89e4235a..f3990b7be8c 100644
--- a/tests/Assets/AssetRepositoryTest.php
+++ b/tests/Assets/AssetRepositoryTest.php
@@ -11,6 +11,7 @@
 use Statamic\Exceptions\AssetNotFoundException;
 use Statamic\Facades\Asset;
 use Statamic\Facades\AssetContainer;
+use Statamic\Facades\YAML;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
@@ -116,4 +117,119 @@ public function test_find_or_fail_throws_exception_when_asset_does_not_exist()
 
         $assetRepository->findOrFail('does-not-exist');
     }
+
+    #[Test]
+    public function it_preserves_other_locales_when_saving_a_localized_asset()
+    {
+        $this->setSites([
+            'en' => ['url' => '/', 'locale' => 'en'],
+            'es' => ['url' => '/es/', 'locale' => 'es'],
+        ]);
+
+        $disk = Storage::fake('test');
+        $disk->put('foo/test.txt', 'hello');
+        $disk->put('foo/.meta/test.txt.yaml', YAML::dump([
+            'data' => [
+                'en' => ['alt' => 'Bob Ross'],
+            ],
+            'size' => 5,
+            'last_modified' => 123,
+            'width' => null,
+            'height' => null,
+            'mime_type' => 'text/plain',
+            'duration' => null,
+        ]));
+
+        $container = tap(AssetContainer::make('test')->disk('test')->localizable(true))->save();
+        $asset = $container->makeAsset('foo/test.txt')->in('es');
+        $asset->data(['alt' => 'El Bob Rosso']);
+
+        (new AssetRepository)->save($asset);
+
+        $meta = YAML::parse($disk->get('foo/.meta/test.txt.yaml'));
+
+        $this->assertSame('Bob Ross', $meta['data']['en']['alt']);
+        $this->assertSame('El Bob Rosso', $meta['data']['es']['alt']);
+    }
+
+    #[Test]
+    public function it_drops_empty_localized_buckets_and_omits_default_sites_map()
+    {
+        $this->setSites([
+            'en' => ['url' => '/', 'locale' => 'en'],
+            'es' => ['url' => '/es/', 'locale' => 'es'],
+            'fr' => ['url' => '/fr/', 'locale' => 'fr'],
+        ]);
+
+        $disk = Storage::fake('test');
+        $disk->put('foo/test.txt', 'hello');
+        $disk->put('foo/.meta/test.txt.yaml', YAML::dump([
+            'data' => [
+                'en' => ['alt' => 'Bob Ross'],
+                'es' => ['alt' => 'El Bob Rosso'],
+            ],
+            'sites' => [
+                'en' => null,
+                'es' => 'en',
+                'fr' => 'en',
+            ],
+            'size' => 5,
+            'last_modified' => 123,
+            'width' => null,
+            'height' => null,
+            'mime_type' => 'text/plain',
+            'duration' => null,
+        ]));
+
+        $container = tap(AssetContainer::make('test')->disk('test')->localizable(true))->save();
+        $asset = $container->makeAsset('foo/test.txt')->in('es');
+        $asset->data([]);
+
+        (new AssetRepository)->save($asset);
+
+        $meta = YAML::parse($disk->get('foo/.meta/test.txt.yaml'));
+
+        $this->assertArrayHasKey('en', $meta['data']);
+        $this->assertArrayNotHasKey('es', $meta['data']);
+        $this->assertArrayNotHasKey('sites', $meta);
+    }
+
+    #[Test]
+    public function it_persists_sites_map_when_it_differs_from_default_site_origins()
+    {
+        $this->setSites([
+            'en' => ['url' => '/', 'locale' => 'en'],
+            'es' => ['url' => '/es/', 'locale' => 'es'],
+        ]);
+
+        $disk = Storage::fake('test');
+        $disk->put('foo/test.txt', 'hello');
+        $disk->put('foo/.meta/test.txt.yaml', YAML::dump([
+            'data' => [
+                'es' => ['alt' => 'El Bob Rosso'],
+            ],
+            'sites' => [
+                'en' => 'es',
+                'es' => null,
+            ],
+            'size' => 5,
+            'last_modified' => 123,
+            'width' => null,
+            'height' => null,
+            'mime_type' => 'text/plain',
+            'duration' => null,
+        ]));
+
+        $container = tap(AssetContainer::make('test')->disk('test')->localizable(true))->save();
+        $asset = $container->makeAsset('foo/test.txt')->in('en');
+        $asset->data(['more_text' => 'custom']);
+
+        (new AssetRepository)->save($asset);
+
+        $meta = YAML::parse($disk->get('foo/.meta/test.txt.yaml'));
+
+        $this->assertArrayHasKey('sites', $meta);
+        $this->assertSame('es', $meta['sites']['en']);
+        $this->assertNull($meta['sites']['es']);
+    }
 }
diff --git a/tests/Console/Commands/AssetsMetaTest.php b/tests/Console/Commands/AssetsMetaTest.php
index 428a8997c05..d72f9ecb800 100644
--- a/tests/Console/Commands/AssetsMetaTest.php
+++ b/tests/Console/Commands/AssetsMetaTest.php
@@ -98,4 +98,85 @@ public function it_preserves_data_property_in_meta_data_file()
             'bar'
         );
     }
+
+    #[Test]
+    public function it_migrates_localizable_meta_without_persisting_default_sites_map()
+    {
+        $this->setSites([
+            'en' => ['url' => '/', 'locale' => 'en_US'],
+            'es' => ['url' => '/es', 'locale' => 'es_ES'],
+        ]);
+
+        Storage::disk('test')->put('foo/bar.txt', 'foobar');
+        Storage::disk('test')->put('foo/.meta/bar.txt.yaml', YAML::dump([
+            'data' => [
+                'en' => ['alt' => 'Bob Ross'],
+                'es' => [],
+            ],
+            'sites' => [
+                'en' => null,
+                'es' => 'en',
+            ],
+            'size' => 6,
+            'last_modified' => 1665086377,
+            'width' => null,
+            'height' => null,
+            'mime_type' => 'text/plain',
+            'duration' => null,
+        ]));
+
+        AssetContainer::make('test_container')
+            ->disk('test')
+            ->localizable(true)
+            ->save();
+
+        $this->artisan('statamic:assets:migrate-localizable test_container')
+            ->expectsOutputToContain('asset metadata files.');
+
+        $meta = YAML::parse(Storage::disk('test')->get('foo/.meta/bar.txt.yaml'));
+
+        $this->assertArrayNotHasKey('sites', $meta);
+        $this->assertSame(['en' => ['alt' => 'Bob Ross']], $meta['data']);
+    }
+
+    #[Test]
+    public function it_migrates_localizable_meta_and_keeps_non_default_sites_map()
+    {
+        $this->setSites([
+            'en' => ['url' => '/', 'locale' => 'en_US'],
+            'es' => ['url' => '/es', 'locale' => 'es_ES'],
+        ]);
+
+        Storage::disk('test')->put('foo/baz.txt', 'foobar');
+        Storage::disk('test')->put('foo/.meta/baz.txt.yaml', YAML::dump([
+            'data' => [
+                'es' => ['alt' => 'El Bob Rosso'],
+            ],
+            'sites' => [
+                'en' => 'es',
+                'es' => null,
+            ],
+            'size' => 6,
+            'last_modified' => 1665086377,
+            'width' => null,
+            'height' => null,
+            'mime_type' => 'text/plain',
+            'duration' => null,
+        ]));
+
+        AssetContainer::make('test_container')
+            ->disk('test')
+            ->localizable(true)
+            ->save();
+
+        $this->artisan('statamic:assets:migrate-localizable test_container')
+            ->expectsOutputToContain('asset metadata files.');
+
+        $meta = YAML::parse(Storage::disk('test')->get('foo/.meta/baz.txt.yaml'));
+
+        $this->assertArrayHasKey('sites', $meta);
+        $this->assertSame('es', $meta['sites']['en']);
+        $this->assertNull($meta['sites']['es']);
+        $this->assertSame(['es' => ['alt' => 'El Bob Rosso']], $meta['data']);
+    }
 }

From 7713acaf9a7569feadd3e904a9b4975d8bbc9ca1 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 16:12:00 -0500
Subject: [PATCH 02/22] Confirm discarding changes when switching locales

---
 .../js/components/assets/Editor/Editor.vue    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/resources/js/components/assets/Editor/Editor.vue b/resources/js/components/assets/Editor/Editor.vue
index 052d9424049..6c8813412f6 100644
--- a/resources/js/components/assets/Editor/Editor.vue
+++ b/resources/js/components/assets/Editor/Editor.vue
@@ -192,6 +192,16 @@
             @confirm="confirmCloseWithChanges"
             @cancel="closingWithChanges = false"
         />
+
+        <confirmation-modal
+            :open="!!pendingSiteSwitch"
+            :title="__('Unsaved Changes')"
+            :body-text="__('Are you sure? Unsaved changes will be lost.')"
+            :button-text="__('Continue')"
+            :danger="true"
+            @confirm="confirmSwitchSite"
+            @cancel="pendingSiteSwitch = null"
+        />
         </div>
     </Stack>
 </template>
@@ -267,6 +277,7 @@ export default {
             errors: {},
             actions: [],
             closingWithChanges: false,
+            pendingSiteSwitch: null,
             activeSite: this.site,
             localizations: [],
             localizedFields: [],
@@ -472,6 +483,20 @@ export default {
                 return;
             }
 
+            if (this.$dirty.has(this.publishContainer)) {
+                this.pendingSiteSwitch = site;
+                return;
+            }
+
+            this.activeSite = site;
+            this.load(site);
+        },
+
+        confirmSwitchSite() {
+            const site = this.pendingSiteSwitch;
+            this.pendingSiteSwitch = null;
+            this.$dirty.remove(this.publishContainer);
+            this.$refs.container?.clearDirtyState?.();
             this.activeSite = site;
             this.load(site);
         },

From 4f5695c7874f70e0c35afec5d5e9e995f1cbf1be Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 16:14:14 -0500
Subject: [PATCH 03/22] Fix field syncing

---
 .../Controllers/CP/Assets/AssetsController.php  | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/Http/Controllers/CP/Assets/AssetsController.php b/src/Http/Controllers/CP/Assets/AssetsController.php
index 69be027ba59..6fbb32211b5 100644
--- a/src/Http/Controllers/CP/Assets/AssetsController.php
+++ b/src/Http/Controllers/CP/Assets/AssetsController.php
@@ -81,16 +81,25 @@ public function update(Request $request, $asset)
             $localizedHandles = collect($request->input('_localized', []));
             $localizedInput = $values->only($localizedHandles->all());
 
-            $keysToForget = $localizedInput
-                ->filter(fn ($value) => $value === null || $value === '')
-                ->keys();
+            // Remove: (1) fields synced back to origin (in localizedData but not in _localized),
+            // (2) fields in _localized with null/empty values
+            $keysToForget = $asset->localizedData()
+                ->keys()
+                ->diff($localizedHandles)
+                ->merge(
+                    $localizedInput
+                        ->filter(fn ($value) => $value === null || $value === '')
+                        ->keys()
+                )
+                ->unique()
+                ->values();
 
             $keysToUpsert = $localizedInput
                 ->reject(fn ($value) => $value === null || $value === '');
 
             $asset->data(
                 $asset->localizedData()
-                    ->except($keysToForget)
+                    ->except($keysToForget->all())
                     ->merge($keysToUpsert)
                     ->all()
             );

From 07446a858aa637c7468df6e85f4d94783e042877 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 16:16:34 -0500
Subject: [PATCH 04/22] DB migration now aware of container and localizable
 scope

---
 .../Commands/AssetsMigrateLocalizable.php     | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/Console/Commands/AssetsMigrateLocalizable.php b/src/Console/Commands/AssetsMigrateLocalizable.php
index 530a46f79ac..86aff94a024 100644
--- a/src/Console/Commands/AssetsMigrateLocalizable.php
+++ b/src/Console/Commands/AssetsMigrateLocalizable.php
@@ -53,7 +53,13 @@ public function handle()
             }
         }
 
-        [$dbMigrated, $dbScanned] = $this->migrateEloquentMeta($siteOrigins, $rootSite);
+        $localizableHandles = $containers
+            ->filter(fn ($c) => $c->localizable())
+            ->map(fn ($c) => $c->handle())
+            ->values()
+            ->all();
+
+        [$dbMigrated, $dbScanned] = $this->migrateEloquentMeta($siteOrigins, $rootSite, $localizableHandles);
 
         $this->components->info(__('Migrated :migrated of :scanned asset metadata files.', [
             'migrated' => $fileMigrated,
@@ -161,7 +167,7 @@ protected function siteOriginsAreDefault(array $siteOrigins): bool
         return $siteOrigins === $this->defaultSiteOrigins();
     }
 
-    protected function migrateEloquentMeta(array $siteOrigins, string $rootSite): array
+    protected function migrateEloquentMeta(array $siteOrigins, string $rootSite, array $localizableContainerHandles): array
     {
         $modelClass = app()->bound('statamic.eloquent.assets.model')
             ? app('statamic.eloquent.assets.model')
@@ -177,10 +183,25 @@ protected function migrateEloquentMeta(array $siteOrigins, string $rootSite): ar
             return [0, 0];
         }
 
+        if (empty($localizableContainerHandles)) {
+            return [0, 0];
+        }
+
+        if (! Schema::hasColumn($table, 'container')) {
+            $this->components->warn(__('Skipping Eloquent migration: assets table has no container column. Add one to filter by container.'));
+
+            return [0, 0];
+        }
+
         $migrated = 0;
         $scanned = 0;
 
-        DB::table($table)->select('id', 'meta')->orderBy('id')->lazy()->each(function ($row) use ($table, $siteOrigins, $rootSite, &$migrated, &$scanned) {
+        $query = DB::table($table)
+            ->select(['id', 'meta'])
+            ->whereIn('container', $localizableContainerHandles)
+            ->orderBy('id');
+
+        $query->lazy()->each(function ($row) use ($table, $siteOrigins, $rootSite, &$migrated, &$scanned) {
             $scanned++;
             $meta = is_array($row->meta) ? $row->meta : (json_decode($row->meta ?? '{}', true) ?: []);
             $normalized = $this->normalizeMeta($meta, $siteOrigins, $rootSite);

From 5ffdfa8767562b8ae4df74b3c50954fabc9c62e5 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 16:17:54 -0500
Subject: [PATCH 05/22] Ensure axios responses are in order

---
 resources/js/components/assets/Editor/Editor.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/resources/js/components/assets/Editor/Editor.vue b/resources/js/components/assets/Editor/Editor.vue
index 6c8813412f6..1be9908aca3 100644
--- a/resources/js/components/assets/Editor/Editor.vue
+++ b/resources/js/components/assets/Editor/Editor.vue
@@ -285,6 +285,7 @@ export default {
             originValues: {},
             originMeta: {},
             syncFieldConfirmationText: __('messages.sync_entry_field_confirmation_text'),
+            loadId: 0,
         };
     },
 
@@ -347,6 +348,7 @@ export default {
          */
         load(site = null) {
             this.loading = true;
+            const loadId = ++this.loadId;
 
             const url = cp_url(`assets/${utf8btoa(this.id)}`);
             const requestedSite = site ?? this.activeSite ?? this.site;
@@ -354,6 +356,8 @@ export default {
             this.$axios.get(url, {
                 params: requestedSite ? { site: requestedSite } : {},
             }).then((response) => {
+                if (loadId !== this.loadId) return;
+
                 const data = response.data.data;
                 this.asset = data;
 
@@ -392,6 +396,10 @@ export default {
                 ]);
 
                 this.loading = false;
+            }).catch(() => {
+                if (loadId === this.loadId) {
+                    this.loading = false;
+                }
             });
         },
 

From ecf2cff8a22c87c1593ac1702b5be90aac0a4a72 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 16:26:11 -0500
Subject: [PATCH 06/22] prevent infinite loop

---
 src/Assets/Asset.php                 |  5 +++++
 tests/Assets/AssetRepositoryTest.php | 33 ++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/src/Assets/Asset.php b/src/Assets/Asset.php
index 4998bae888a..00957beec2b 100644
--- a/src/Assets/Asset.php
+++ b/src/Assets/Asset.php
@@ -508,8 +508,13 @@ protected function dataForLocale(array $meta, $locale)
 
         $data = collect(Arr::get($meta, "data.{$locale}", []));
         $origin = $siteOrigins->get($locale);
+        $visited = [$locale];
 
         while ($origin) {
+            if (in_array($origin, $visited, true)) {
+                break;
+            }
+            $visited[] = $origin;
             $data = collect(Arr::get($meta, "data.{$origin}", []))->merge($data);
             $origin = $siteOrigins->get($origin);
         }
diff --git a/tests/Assets/AssetRepositoryTest.php b/tests/Assets/AssetRepositoryTest.php
index f3990b7be8c..fc6f93254bf 100644
--- a/tests/Assets/AssetRepositoryTest.php
+++ b/tests/Assets/AssetRepositoryTest.php
@@ -232,4 +232,37 @@ public function it_persists_sites_map_when_it_differs_from_default_site_origins(
         $this->assertSame('es', $meta['sites']['en']);
         $this->assertNull($meta['sites']['es']);
     }
+
+    #[Test]
+    public function it_does_not_infinite_loop_when_sites_metadata_has_cycles()
+    {
+        $this->setSites([
+            'en' => ['url' => '/', 'locale' => 'en'],
+            'fr' => ['url' => '/fr/', 'locale' => 'fr'],
+        ]);
+
+        $disk = Storage::fake('test');
+        $disk->put('foo/test.txt', 'hello');
+        $disk->put('foo/.meta/test.txt.yaml', YAML::dump([
+            'data' => [
+                'en' => ['alt' => 'English alt'],
+                'fr' => ['alt' => 'French alt'],
+            ],
+            'sites' => [
+                'en' => 'fr',
+                'fr' => 'en',
+            ],
+            'size' => 5,
+            'last_modified' => 123,
+            'width' => null,
+            'height' => null,
+            'mime_type' => 'text/plain',
+            'duration' => null,
+        ]));
+
+        $container = tap(AssetContainer::make('test')->disk('test')->localizable(true))->save();
+        $asset = $container->makeAsset('foo/test.txt')->in('en');
+
+        $this->assertSame('English alt', $asset->get('alt'));
+    }
 }

From 9a5f823d61af9c3fa7e1dfde49b353383c920ff7 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 17:29:19 -0500
Subject: [PATCH 07/22] avoid infinite loops

`localizationData()` calls `origin()->values()` when `hasOrigin()` is true. With a cyclic sites origin map, this enters recursive origin resolution via `values()` and can loop indefinitely while serializing CP asset responses.
---
 src/Assets/Asset.php                   | 20 ++++++++++++++++++++
 src/Http/Resources/CP/Assets/Asset.php |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/Assets/Asset.php b/src/Assets/Asset.php
index 00957beec2b..53d322439f2 100644
--- a/src/Assets/Asset.php
+++ b/src/Assets/Asset.php
@@ -544,6 +544,26 @@ public function getOriginByString($origin)
         return $origin ? $this->in($origin) : null;
     }
 
+    /**
+     * Get merged origin values without following the origin chain (cycle-safe).
+     * Use this instead of origin()->values() when serializing to avoid infinite
+     * recursion with cyclic site origin maps.
+     */
+    public function originValuesData(): \Illuminate\Support\Collection
+    {
+        if (! $this->usesLocalizedData()) {
+            return collect();
+        }
+
+        $originLocale = collect($this->siteOriginsForMeta($this->meta()))->get($this->locale());
+
+        if (! $originLocale) {
+            return collect();
+        }
+
+        return $this->dataForLocale($this->meta(), $originLocale);
+    }
+
     protected function getOriginIdFromObject($origin)
     {
         return $origin->locale();
diff --git a/src/Http/Resources/CP/Assets/Asset.php b/src/Http/Resources/CP/Assets/Asset.php
index e99d762121e..b11713e8c99 100644
--- a/src/Http/Resources/CP/Assets/Asset.php
+++ b/src/Http/Resources/CP/Assets/Asset.php
@@ -100,7 +100,7 @@ protected function localizationData()
 
         if ($this->hasOrigin()) {
             $fields = $this->blueprint()->fields()
-                ->addValues($this->origin()->values()->all())
+                ->addValues($this->originValuesData()->all())
                 ->preProcess();
 
             $originValues = $fields->values()->all();

From 6f40e859b80e996d3eeb9508a32b39743cbb9394 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 17:35:28 -0500
Subject: [PATCH 08/22] Fix eloquent meta migration types

---
 src/Console/Commands/AssetsMigrateLocalizable.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Console/Commands/AssetsMigrateLocalizable.php b/src/Console/Commands/AssetsMigrateLocalizable.php
index 86aff94a024..59b3cf760df 100644
--- a/src/Console/Commands/AssetsMigrateLocalizable.php
+++ b/src/Console/Commands/AssetsMigrateLocalizable.php
@@ -201,7 +201,7 @@ protected function migrateEloquentMeta(array $siteOrigins, string $rootSite, arr
             ->whereIn('container', $localizableContainerHandles)
             ->orderBy('id');
 
-        $query->lazy()->each(function ($row) use ($table, $siteOrigins, $rootSite, &$migrated, &$scanned) {
+        $query->lazy()->each(function ($row) use ($modelClass, $siteOrigins, $rootSite, &$migrated, &$scanned) {
             $scanned++;
             $meta = is_array($row->meta) ? $row->meta : (json_decode($row->meta ?? '{}', true) ?: []);
             $normalized = $this->normalizeMeta($meta, $siteOrigins, $rootSite);
@@ -210,12 +210,13 @@ protected function migrateEloquentMeta(array $siteOrigins, string $rootSite, arr
                 return;
             }
 
-            DB::table($table)->where('id', $row->id)->update([
-                'meta' => $normalized,
-                'updated_at' => now(),
-            ]);
-
-            $migrated++;
+            $model = $modelClass::find($row->id);
+            if ($model) {
+                $model->meta = $normalized;
+                $model->updated_at = now();
+                $model->save();
+                $migrated++;
+            }
         });
 
         return [$migrated, $scanned];

From 59b8241db72fc02c2640d95446d989b081c577ae Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 17:36:42 -0500
Subject: [PATCH 09/22] Dont't assume migration's updated_at column exists

---
 src/Console/Commands/AssetsMigrateLocalizable.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Console/Commands/AssetsMigrateLocalizable.php b/src/Console/Commands/AssetsMigrateLocalizable.php
index 59b3cf760df..073d91b890b 100644
--- a/src/Console/Commands/AssetsMigrateLocalizable.php
+++ b/src/Console/Commands/AssetsMigrateLocalizable.php
@@ -201,7 +201,7 @@ protected function migrateEloquentMeta(array $siteOrigins, string $rootSite, arr
             ->whereIn('container', $localizableContainerHandles)
             ->orderBy('id');
 
-        $query->lazy()->each(function ($row) use ($modelClass, $siteOrigins, $rootSite, &$migrated, &$scanned) {
+        $query->lazy()->each(function ($row) use ($modelClass, $siteOrigins, $rootSite, $table, &$migrated, &$scanned) {
             $scanned++;
             $meta = is_array($row->meta) ? $row->meta : (json_decode($row->meta ?? '{}', true) ?: []);
             $normalized = $this->normalizeMeta($meta, $siteOrigins, $rootSite);
@@ -213,7 +213,11 @@ protected function migrateEloquentMeta(array $siteOrigins, string $rootSite, arr
             $model = $modelClass::find($row->id);
             if ($model) {
                 $model->meta = $normalized;
-                $model->updated_at = now();
+                if (! Schema::hasColumn($table, 'updated_at')) {
+                    $model->timestamps = false;
+                } else {
+                    $model->updated_at = now();
+                }
                 $model->save();
                 $migrated++;
             }

From c33f8d19014a2079aadf1a96075a14e71152c0a3 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 17:38:17 -0500
Subject: [PATCH 10/22] Ensure valid site handle

---
 src/Assets/Asset.php                                | 3 +++
 src/Http/Controllers/CP/Assets/AssetsController.php | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/Assets/Asset.php b/src/Assets/Asset.php
index 53d322439f2..069e6c8aec9 100644
--- a/src/Assets/Asset.php
+++ b/src/Assets/Asset.php
@@ -440,12 +440,15 @@ protected function normalizeMeta(array $meta): array
         }
 
         $siteOrigins = $this->siteOriginsForMeta($meta);
+        $siteHandles = array_keys($siteOrigins);
         $data = Arr::get($meta, 'data', []);
 
         if (! is_array($data)) {
             $data = [];
         }
 
+        $data = collect($data)->filter(fn ($_, $key) => in_array($key, $siteHandles))->all();
+
         if (! $this->isLocalizedMetaData($data, $siteOrigins)) {
             $default = Site::default()->handle();
             $data = [$default => $data];
diff --git a/src/Http/Controllers/CP/Assets/AssetsController.php b/src/Http/Controllers/CP/Assets/AssetsController.php
index 6fbb32211b5..0f2f78f7af2 100644
--- a/src/Http/Controllers/CP/Assets/AssetsController.php
+++ b/src/Http/Controllers/CP/Assets/AssetsController.php
@@ -49,6 +49,7 @@ public function show(Request $request, $asset)
         $site = $request->input('site') ?: (Site::multiEnabled() ? Site::selected()->handle() : null);
 
         if ($site) {
+            abort_unless(Site::get($site), 422, __('Invalid site.'));
             $asset = $asset->in($site);
         }
 
@@ -64,6 +65,7 @@ public function update(Request $request, $asset)
         $site = $request->input('site') ?: (Site::multiEnabled() ? Site::selected()->handle() : null);
 
         if ($site) {
+            abort_unless(Site::get($site), 422, __('Invalid site.'));
             $asset = $asset->in($site);
         }
 

From c18136874542adca454b43438a5280465eecdd45 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 17:45:46 -0500
Subject: [PATCH 11/22] Ensure legacy metadata doesn't get dropped during
 normalization

---
 src/Assets/Asset.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Assets/Asset.php b/src/Assets/Asset.php
index 069e6c8aec9..a8eb47137e3 100644
--- a/src/Assets/Asset.php
+++ b/src/Assets/Asset.php
@@ -447,11 +447,14 @@ protected function normalizeMeta(array $meta): array
             $data = [];
         }
 
-        $data = collect($data)->filter(fn ($_, $key) => in_array($key, $siteHandles))->all();
-
+        // Check if already localized before filtering. Pre-migration data has flat
+        // field keys (alt, title, etc.), not site handles. Filtering first would
+        // remove all keys and lose existing asset field data.
         if (! $this->isLocalizedMetaData($data, $siteOrigins)) {
             $default = Site::default()->handle();
             $data = [$default => $data];
+        } else {
+            $data = collect($data)->filter(fn ($_, $key) => in_array($key, $siteHandles))->all();
         }
 
         if ($this->siteOriginsAreDefault($siteOrigins)) {

From 3ee66612bda470e0f9a128599e7530ebac2d8e78 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 17:47:07 -0500
Subject: [PATCH 12/22] fix another infinite loop issue

---
 src/Http/Resources/CP/Assets/Asset.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Http/Resources/CP/Assets/Asset.php b/src/Http/Resources/CP/Assets/Asset.php
index b11713e8c99..398d058ae06 100644
--- a/src/Http/Resources/CP/Assets/Asset.php
+++ b/src/Http/Resources/CP/Assets/Asset.php
@@ -79,12 +79,20 @@ public function toArray($request)
 
     protected function publishFormData()
     {
+        $asset = $this->resource;
+        $asset->hydrate();
+
+        // Use $asset->data directly instead of values() to avoid infinite recursion
+        // when sites origin map is cyclic. values() follows origin()->values()
+        // recursively; data is populated by cycle-safe dataForLocale().
+        $values = ($asset->data ?? collect())->all();
+
         $fields = $this->blueprint()->fields()
-            ->addValues($this->values()->all())
+            ->addValues($values)
             ->preProcess();
 
         return [
-            'values' => collect($this->values())->merge($fields->values())->all(),
+            'values' => collect($values)->merge($fields->values())->all(),
             'meta' => $fields->meta()->all(),
         ];
     }

From a7ee572d881b2f74f52acbfca05905103248f8cd Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 19:20:41 -0500
Subject: [PATCH 13/22] use public accessor, not private method

---
 src/Http/Resources/CP/Assets/Asset.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Http/Resources/CP/Assets/Asset.php b/src/Http/Resources/CP/Assets/Asset.php
index 398d058ae06..309e022d184 100644
--- a/src/Http/Resources/CP/Assets/Asset.php
+++ b/src/Http/Resources/CP/Assets/Asset.php
@@ -82,10 +82,10 @@ protected function publishFormData()
         $asset = $this->resource;
         $asset->hydrate();
 
-        // Use $asset->data directly instead of values() to avoid infinite recursion
-        // when sites origin map is cyclic. values() follows origin()->values()
-        // recursively; data is populated by cycle-safe dataForLocale().
-        $values = ($asset->data ?? collect())->all();
+        // Use data() instead of values() to avoid infinite recursion when sites
+        // origin map is cyclic. values() follows origin()->values() recursively;
+        // data() returns the cycle-safe collection populated by dataForLocale().
+        $values = ($asset->data() ?? collect())->all();
 
         $fields = $this->blueprint()->fields()
             ->addValues($values)

From bd824f342547aea0369ee52959cfecc2e91a5ea4 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 19:39:57 -0500
Subject: [PATCH 14/22] Fix asset metadata persisting inherited values on save

When saving a localized asset (e.g. rename/move), hydrate() was filling $data with origin-merged values and meta() was writing that merged set into data.{locale}, turning inherited fields into explicit overrides.

Add localizedDataForPersistence() to only persist explicit localized
data when no mutation occurred. If $data is unchanged from the
hydrated view and removedData is empty, keep the existing explicit
localized bucket as-is.
---
 src/Assets/Asset.php                 | 38 +++++++++++++++++++++++-----
 tests/Assets/AssetRepositoryTest.php | 33 ++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/src/Assets/Asset.php b/src/Assets/Asset.php
index a8eb47137e3..1a8014ccac0 100644
--- a/src/Assets/Asset.php
+++ b/src/Assets/Asset.php
@@ -302,11 +302,7 @@ public function meta($key = null)
 
             if ($this->usesLocalizedData()) {
                 $locale = $this->locale();
-                $existing = Arr::get($meta, "data.{$locale}", []);
-                $updated = collect($existing)
-                    ->merge($this->data->all())
-                    ->except($this->removedData)
-                    ->all();
+                $updated = $this->localizedDataForPersistence($meta);
 
                 Arr::set($meta, "data.{$locale}", $updated);
             } else {
@@ -357,9 +353,18 @@ private function metaValue($key)
 
     public function generateMeta()
     {
+        $rawMeta = $this->meta;
+        if (! $rawMeta && $this->exists() && $contents = $this->disk()->get($path = $this->metaPath())) {
+            $rawMeta = YAML::file($path)->parse($contents);
+        }
+
+        $data = $this->usesLocalizedData() && $rawMeta
+            ? $this->localizedDataForPersistence($this->normalizeMeta($rawMeta))
+            : $this->data->all();
+
         $meta = ['data' => $this->usesLocalizedData()
-            ? [$this->locale() => $this->data->all()]
-            : $this->data->all()];
+            ? [$this->locale() => $data]
+            : $data];
 
         if ($this->exists()) {
             $attributes = Attributes::asset($this)->get();
@@ -528,6 +533,25 @@ protected function dataForLocale(array $meta, $locale)
         return $data;
     }
 
+    protected function localizedDataForPersistence(array $meta): array
+    {
+        $locale = $this->locale();
+        $existing = collect(Arr::get($meta, "data.{$locale}", []));
+        $hydrated = $this->dataForLocale($meta, $locale);
+
+        // If nothing has touched asset data, keep explicit localized values as-is.
+        // This prevents save operations like move/rename from persisting inherited
+        // origin values into the localized override bucket.
+        if ($this->removedData === [] && $this->data->all() === $hydrated->all()) {
+            return $existing->all();
+        }
+
+        return $existing
+            ->merge($this->data->all())
+            ->except($this->removedData)
+            ->all();
+    }
+
     public function origin($origin = null)
     {
         if (func_num_args() === 0) {
diff --git a/tests/Assets/AssetRepositoryTest.php b/tests/Assets/AssetRepositoryTest.php
index fc6f93254bf..21488b867f8 100644
--- a/tests/Assets/AssetRepositoryTest.php
+++ b/tests/Assets/AssetRepositoryTest.php
@@ -152,6 +152,39 @@ public function it_preserves_other_locales_when_saving_a_localized_asset()
         $this->assertSame('El Bob Rosso', $meta['data']['es']['alt']);
     }
 
+    #[Test]
+    public function it_does_not_materialize_inherited_values_when_saving_without_localized_changes()
+    {
+        $this->setSites([
+            'en' => ['url' => '/', 'locale' => 'en'],
+            'es' => ['url' => '/es/', 'locale' => 'es'],
+        ]);
+
+        $disk = Storage::fake('test');
+        $disk->put('foo/test.txt', 'hello');
+        $disk->put('foo/.meta/test.txt.yaml', YAML::dump([
+            'data' => [
+                'en' => ['alt' => 'Bob Ross'],
+            ],
+            'size' => 5,
+            'last_modified' => 123,
+            'width' => null,
+            'height' => null,
+            'mime_type' => 'text/plain',
+            'duration' => null,
+        ]));
+
+        $container = tap(AssetContainer::make('test')->disk('test')->localizable(true))->save();
+        $asset = $container->makeAsset('foo/test.txt')->in('es');
+
+        (new AssetRepository)->save($asset);
+
+        $meta = YAML::parse($disk->get('foo/.meta/test.txt.yaml'));
+
+        $this->assertArrayHasKey('en', $meta['data']);
+        $this->assertArrayNotHasKey('es', $meta['data']);
+    }
+
     #[Test]
     public function it_drops_empty_localized_buckets_and_omits_default_sites_map()
     {

From 627e34217ef714c0931ea2b1c1ddc2131d210bcb Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 21:56:05 -0500
Subject: [PATCH 15/22] Don't navigate left/right between assets if focused in
 a field

---
 resources/js/components/assets/Editor/Editor.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/resources/js/components/assets/Editor/Editor.vue b/resources/js/components/assets/Editor/Editor.vue
index 1be9908aca3..e8f6fcd3897 100644
--- a/resources/js/components/assets/Editor/Editor.vue
+++ b/resources/js/components/assets/Editor/Editor.vue
@@ -404,6 +404,15 @@ export default {
         },
 
         keydown(event) {
+            const target = event.target;
+            const isFormField = target instanceof HTMLElement && (
+                target.matches('input, textarea, select') || target.isContentEditable
+            );
+
+            if (isFormField) {
+                return;
+            }
+
             if ((event.metaKey || event.ctrlKey) && event.key === 'ArrowLeft') {
                 this.navigateToPreviousAsset();
             }

From 497f2accc43a34273b06075aeb90ed5e1c2975c8 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 22:15:55 -0500
Subject: [PATCH 16/22] Keep focus on the default locale

---
 src/Assets/Asset.php                 | 39 +++++++++++++++++++++++++++
 tests/Assets/AssetRepositoryTest.php | 40 ++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/src/Assets/Asset.php b/src/Assets/Asset.php
index 1a8014ccac0..dc54c5e526c 100644
--- a/src/Assets/Asset.php
+++ b/src/Assets/Asset.php
@@ -305,6 +305,7 @@ public function meta($key = null)
                 $updated = $this->localizedDataForPersistence($meta);
 
                 Arr::set($meta, "data.{$locale}", $updated);
+                $this->syncFocusToDefaultLocale($meta, $locale);
             } else {
                 $meta['data'] = collect(Arr::get($meta, 'data', []))
                     ->merge($this->data->all())
@@ -530,6 +531,14 @@ protected function dataForLocale(array $meta, $locale)
             $origin = $siteOrigins->get($origin);
         }
 
+        if ($this->usesLocalizedData() && ! array_key_exists('focus', $data->all())) {
+            $focus = Arr::get($meta, 'data.'.Site::default()->handle().'.focus');
+
+            if (! is_null($focus)) {
+                $data->put('focus', $focus);
+            }
+        }
+
         return $data;
     }
 
@@ -552,6 +561,36 @@ protected function localizedDataForPersistence(array $meta): array
             ->all();
     }
 
+    protected function syncFocusToDefaultLocale(array &$meta, string $locale): void
+    {
+        $default = Site::default()->handle();
+
+        if (in_array('focus', $this->removedData, true)) {
+            $data = Arr::get($meta, 'data', []);
+
+            foreach ($data as $site => $siteData) {
+                unset($siteData['focus']);
+                $data[$site] = $siteData;
+            }
+
+            $meta['data'] = $data;
+
+            return;
+        }
+
+        $focus = Arr::get($meta, "data.{$locale}.focus", Arr::get($meta, "data.{$default}.focus"));
+
+        if (is_null($focus)) {
+            return;
+        }
+
+        Arr::set($meta, "data.{$default}.focus", $focus);
+
+        if ($locale !== $default) {
+            Arr::forget($meta, "data.{$locale}.focus");
+        }
+    }
+
     public function origin($origin = null)
     {
         if (func_num_args() === 0) {
diff --git a/tests/Assets/AssetRepositoryTest.php b/tests/Assets/AssetRepositoryTest.php
index 21488b867f8..803b77f7907 100644
--- a/tests/Assets/AssetRepositoryTest.php
+++ b/tests/Assets/AssetRepositoryTest.php
@@ -298,4 +298,44 @@ public function it_does_not_infinite_loop_when_sites_metadata_has_cycles()
 
         $this->assertSame('English alt', $asset->get('alt'));
     }
+
+    #[Test]
+    public function focal_points_are_not_localized()
+    {
+        $this->setSites([
+            'en' => ['url' => '/', 'locale' => 'en'],
+            'es' => ['url' => '/es/', 'locale' => 'es'],
+        ]);
+
+        $disk = Storage::fake('test');
+        $disk->put('foo/test.txt', 'hello');
+        $disk->put('foo/.meta/test.txt.yaml', YAML::dump([
+            'data' => [
+                'en' => [
+                    'alt' => 'Bob Ross',
+                    'focus' => '10-20',
+                ],
+                'es' => [
+                    'alt' => 'El Bob Rosso',
+                ],
+            ],
+            'size' => 5,
+            'last_modified' => 123,
+            'width' => null,
+            'height' => null,
+            'mime_type' => 'text/plain',
+            'duration' => null,
+        ]));
+
+        $container = tap(AssetContainer::make('test')->disk('test')->localizable(true))->save();
+        $asset = $container->makeAsset('foo/test.txt')->in('es');
+        $asset->set('focus', '75-25');
+
+        (new AssetRepository)->save($asset);
+
+        $meta = YAML::parse($disk->get('foo/.meta/test.txt.yaml'));
+
+        $this->assertSame('75-25', $meta['data']['en']['focus']);
+        $this->assertArrayNotHasKey('focus', $meta['data']['es']);
+    }
 }

From 0fa7c1efb08d65fbc4ef7e991e92b254f1710e1c Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 22:33:33 -0500
Subject: [PATCH 17/22] Fix cursorbot suggestions

---
 src/Assets/Asset.php                          |  2 +-
 .../Commands/AssetsMigrateLocalizable.php     | 34 ++++++++++++++++++-
 .../CP/Assets/AssetContainersController.php   |  5 ++-
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/Assets/Asset.php b/src/Assets/Asset.php
index dc54c5e526c..5ccdfd432a8 100644
--- a/src/Assets/Asset.php
+++ b/src/Assets/Asset.php
@@ -1269,7 +1269,7 @@ public function reupload(ReplacementFile $file)
         $file->writeTo($this->disk()->filesystem(), $this->path());
 
         $this->clearCaches();
-        $this->writeMeta($this->generateMeta());
+        $this->writeMeta($this->meta());
 
         AssetReuploaded::dispatch($this, $file->basename());
 
diff --git a/src/Console/Commands/AssetsMigrateLocalizable.php b/src/Console/Commands/AssetsMigrateLocalizable.php
index 073d91b890b..46b7ae7eb5a 100644
--- a/src/Console/Commands/AssetsMigrateLocalizable.php
+++ b/src/Console/Commands/AssetsMigrateLocalizable.php
@@ -3,12 +3,14 @@
 namespace Statamic\Console\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 use Statamic\Console\RunsInPlease;
 use Statamic\Facades\AssetContainer;
 use Statamic\Facades\Site;
 use Statamic\Facades\YAML;
+use Statamic\Support\Str;
 
 class AssetsMigrateLocalizable extends Command
 {
@@ -49,6 +51,10 @@ public function handle()
                 }
 
                 $container->disk()->put($metaPath, YAML::dump($normalized));
+                $this->clearAssetMetaCache(
+                    $container->handle(),
+                    $this->assetPathFromMetaPath($metaPath)
+                );
                 $fileMigrated++;
             }
         }
@@ -197,7 +203,7 @@ protected function migrateEloquentMeta(array $siteOrigins, string $rootSite, arr
         $scanned = 0;
 
         $query = DB::table($table)
-            ->select(['id', 'meta'])
+            ->select(['id', 'meta', 'container', 'path'])
             ->whereIn('container', $localizableContainerHandles)
             ->orderBy('id');
 
@@ -219,10 +225,36 @@ protected function migrateEloquentMeta(array $siteOrigins, string $rootSite, arr
                     $model->updated_at = now();
                 }
                 $model->save();
+                $this->clearAssetMetaCache($row->container, $row->path);
                 $migrated++;
             }
         });
 
         return [$migrated, $scanned];
     }
+
+    protected function assetPathFromMetaPath(string $metaPath): string
+    {
+        return Str::of($metaPath)
+            ->replace('/.meta/', '/')
+            ->replace('.meta/', '')
+            ->replaceEnd('.yaml', '')
+            ->trim('/')
+            ->toString();
+    }
+
+    protected function clearAssetMetaCache(string $container, string $path): void
+    {
+        if (! config('statamic.assets.cache_meta') || blank($container) || blank($path)) {
+            return;
+        }
+
+        $assetId = "{$container}::{$path}";
+        $cacheStore = Cache::store(config()->has('cache.stores.asset_meta') ? 'asset_meta' : null);
+
+        $cacheStore->forget('asset-meta-'.$assetId);
+        Site::all()->each(function ($site) use ($cacheStore, $assetId) {
+            $cacheStore->forget('asset-meta-'.$assetId.'-'.$site->handle());
+        });
+    }
 }
diff --git a/src/Http/Controllers/CP/Assets/AssetContainersController.php b/src/Http/Controllers/CP/Assets/AssetContainersController.php
index 7f8fd7cd608..e60304fd482 100644
--- a/src/Http/Controllers/CP/Assets/AssetContainersController.php
+++ b/src/Http/Controllers/CP/Assets/AssetContainersController.php
@@ -195,12 +195,15 @@ protected function formBlueprint($container = null)
                         'type' => 'toggle',
                         'display' => __('Localizable Metadata'),
                         'instructions' => __('When enabled, asset field data like alt text can be translated per site.'),
-                        'if' => Site::multiEnabled(),
                     ],
                 ],
             ],
         ]);
 
+        if (! Site::multiEnabled()) {
+            unset($fields['settings']['fields']['localizable']);
+        }
+
         $fields = array_merge($fields, [
             'image_manipulation' => [
                 'display' => __('Image Manipulation'),

From 89cb022c3bad9cb5de7a1d1f0435d22a78901b52 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 22:48:19 -0500
Subject: [PATCH 18/22] Fix reupload meta data

---
 src/Assets/Asset.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Assets/Asset.php b/src/Assets/Asset.php
index 5ccdfd432a8..dc54c5e526c 100644
--- a/src/Assets/Asset.php
+++ b/src/Assets/Asset.php
@@ -1269,7 +1269,7 @@ public function reupload(ReplacementFile $file)
         $file->writeTo($this->disk()->filesystem(), $this->path());
 
         $this->clearCaches();
-        $this->writeMeta($this->meta());
+        $this->writeMeta($this->generateMeta());
 
         AssetReuploaded::dispatch($this, $file->basename());
 

From 3230806c698a0b95a8dbc4cfe67b63fec9d66e78 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 13 Feb 2026 22:53:00 -0500
Subject: [PATCH 19/22] Fix missing asset existence guard before localization

---
 .../CP/Assets/AssetsController.php            |  2 ++
 tests/Feature/Assets/UpdateAssetTest.php      | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 tests/Feature/Assets/UpdateAssetTest.php

diff --git a/src/Http/Controllers/CP/Assets/AssetsController.php b/src/Http/Controllers/CP/Assets/AssetsController.php
index 0f2f78f7af2..6f0ae03537d 100644
--- a/src/Http/Controllers/CP/Assets/AssetsController.php
+++ b/src/Http/Controllers/CP/Assets/AssetsController.php
@@ -62,6 +62,8 @@ public function update(Request $request, $asset)
     {
         $asset = Asset::find(base64_decode($asset));
 
+        abort_if(! $asset, 404);
+
         $site = $request->input('site') ?: (Site::multiEnabled() ? Site::selected()->handle() : null);
 
         if ($site) {
diff --git a/tests/Feature/Assets/UpdateAssetTest.php b/tests/Feature/Assets/UpdateAssetTest.php
new file mode 100644
index 00000000000..6b5449404c8
--- /dev/null
+++ b/tests/Feature/Assets/UpdateAssetTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Tests\Feature\Assets;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Site;
+use Statamic\Facades\User;
+use Tests\FakesRoles;
+use Tests\TestCase;
+
+class UpdateAssetTest extends TestCase
+{
+    use FakesRoles;
+
+    #[Test]
+    public function it_404s_when_the_asset_doesnt_exist_even_when_a_site_is_provided()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'edit test assets']]);
+        $user = User::make()->assignRole('test')->save();
+
+        $this
+            ->actingAs($user)
+            ->patchJson('/cp/assets/'.base64_encode('test::unknown.txt').'?site='.Site::default()->handle(), [])
+            ->assertNotFound();
+    }
+}

From 211c084e6ea5a0006f814c7a4d5ef20f9d8a2afd Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Sat, 14 Feb 2026 10:14:50 -0500
Subject: [PATCH 20/22] Fix code style in FieldtypeController

---
 src/Http/Controllers/CP/Assets/FieldtypeController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/Controllers/CP/Assets/FieldtypeController.php b/src/Http/Controllers/CP/Assets/FieldtypeController.php
index b9dba96c817..a4bb00c5b10 100644
--- a/src/Http/Controllers/CP/Assets/FieldtypeController.php
+++ b/src/Http/Controllers/CP/Assets/FieldtypeController.php
@@ -3,8 +3,8 @@
 namespace Statamic\Http\Controllers\CP\Assets;
 
 use Illuminate\Http\Request;
-use Statamic\Fieldtypes\Assets\Assets as AssetsFieldtype;
 use Statamic\Facades\Site;
+use Statamic\Fieldtypes\Assets\Assets as AssetsFieldtype;
 use Statamic\Http\Controllers\CP\CpController;
 
 class FieldtypeController extends CpController

From c0c83dc5933814ddd2ea525c349f33a423a852ae Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Sat, 14 Feb 2026 10:14:59 -0500
Subject: [PATCH 21/22] add uncommitted test

---
 tests/Tags/AssetsTest.php | 153 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 153 insertions(+)
 create mode 100644 tests/Tags/AssetsTest.php

diff --git a/tests/Tags/AssetsTest.php b/tests/Tags/AssetsTest.php
new file mode 100644
index 00000000000..850a5b3f92d
--- /dev/null
+++ b/tests/Tags/AssetsTest.php
@@ -0,0 +1,153 @@
+<?php
+
+namespace Tests\Tags;
+
+use Illuminate\Support\Facades\Storage;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Asset;
+use Statamic\Facades\AssetContainer;
+use Statamic\Query\Scopes\Scope;
+use Statamic\Tags\Assets;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class AssetsTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->setSites([
+            'en' => ['name' => 'English', 'locale' => 'en_US', 'url' => 'http://localhost/'],
+            'es' => ['name' => 'Spanish', 'locale' => 'es_ES', 'url' => 'http://localhost/es/'],
+        ]);
+
+        Storage::fake('test', ['url' => '/assets']);
+
+        Storage::disk('test')->put('a.jpg', '');
+        Storage::disk('test')->put('b.jpg', '');
+        Storage::disk('test')->put('c.mp4', '');
+        Storage::disk('test')->put('nested/private/d.jpg', '');
+        Storage::disk('test')->put('nested/public/e.jpg', '');
+
+        tap(AssetContainer::make('test')->disk('test'))->save();
+
+        Asset::find('test::a.jpg')->data(['title' => 'Alpha'])->save();
+        Asset::find('test::b.jpg')->data(['title' => 'Beta'])->save();
+        Asset::find('test::c.mp4')->data(['title' => 'Gamma'])->save();
+        Asset::find('test::nested/private/d.jpg')->data(['title' => 'Delta'])->save();
+        Asset::find('test::nested/public/e.jpg')->data(['title' => 'Epsilon'])->save();
+    }
+
+    #[Test]
+    public function it_filters_assets_by_conditions()
+    {
+        $this->assertSame(['a'], $this->getFilenames([
+            'title:is' => 'Alpha',
+        ]));
+
+        $this->assertSame(['b'], $this->getFilenames([
+            'filename:starts_with' => 'b',
+        ]));
+
+        $this->assertSame(['a', 'b', 'd', 'e'], $this->getFilenames([
+            'extension:is' => 'jpg',
+            'sort' => 'filename:asc',
+        ]));
+    }
+
+    #[Test]
+    public function it_filters_assets_by_localized_field_conditions()
+    {
+        Asset::find('test::b.jpg')->data([
+            'en' => ['alt' => 'Bob Ross'],
+        ])->save();
+
+        $this->assertSame(['b'], $this->getFilenames([
+            'alt:contains' => 'Bob',
+        ]));
+    }
+
+    #[Test]
+    public function it_supports_query_scopes()
+    {
+        app('statamic.scopes')[AssetsTagJpgScope::handle()] = AssetsTagJpgScope::class;
+
+        $this->assertSame(['a', 'b', 'd', 'e'], $this->getFilenames([
+            'query_scope' => AssetsTagJpgScope::handle(),
+            'sort' => 'filename:asc',
+        ]));
+    }
+
+    #[Test]
+    public function it_supports_paginating_assets()
+    {
+        $results = $this->runTag([
+            'sort' => 'filename:asc',
+            'paginate' => 2,
+        ]);
+
+        $this->assertIsArray($results);
+        $this->assertArrayHasKey('results', $results);
+        $this->assertArrayHasKey('paginate', $results);
+        $this->assertCount(2, $results['results']);
+        $this->assertSame(['a', 'b'], collect($results['results'])->map->filename()->all());
+        $this->assertSame(5, $results['paginate']['total_items']);
+    }
+
+    #[Test]
+    public function it_keeps_legacy_filtering_params_working()
+    {
+        $this->assertSame(['e'], $this->getFilenames([
+            'folder' => 'nested',
+            'recursive' => true,
+            'sort' => 'filename:asc',
+            'offset' => 1,
+            'limit' => 1,
+        ]));
+
+        $this->assertSame(['a', 'b', 'd', 'e'], $this->getFilenames([
+            'type' => 'image',
+            'sort' => 'filename:asc',
+        ]));
+
+        $this->assertSame(['a', 'b', 'c', 'e'], $this->getFilenames([
+            'not_in' => '/?nested/private',
+            'sort' => 'filename:asc',
+        ]));
+    }
+
+    private function runTag(array $params = [])
+    {
+        $tag = new Assets;
+        $tag->setContext([]);
+        $tag->setParameters(array_merge(['container' => 'test'], $params));
+
+        return $tag->index();
+    }
+
+    private function getFilenames(array $params = []): array
+    {
+        $results = $this->runTag($params);
+
+        if (is_array($results) && isset($results['results'])) {
+            $results = $results['results'];
+        }
+
+        if (is_array($results) && ($results['no_results'] ?? false)) {
+            return [];
+        }
+
+        return collect($results)->map->filename()->values()->all();
+    }
+}
+
+class AssetsTagJpgScope extends Scope
+{
+    public function apply($query, $params)
+    {
+        $query->where('extension', 'jpg');
+    }
+}

From 007d5814da16dcc9fcd7a809cdf382f73b9e680e Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Mon, 16 Feb 2026 17:33:55 -0500
Subject: [PATCH 22/22] Fix asset editor crash when load fails

Show error state and Retry when the asset request fails instead of
rendering with null asset and crashing on asset.path.
---
 .../js/components/assets/Editor/Editor.vue     | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/assets/Editor/Editor.vue b/resources/js/components/assets/Editor/Editor.vue
index e8f6fcd3897..3fcfaa2ee72 100644
--- a/resources/js/components/assets/Editor/Editor.vue
+++ b/resources/js/components/assets/Editor/Editor.vue
@@ -8,7 +8,14 @@
                 <Icon name="loading" />
             </div>
 
-            <template v-if="!loading">
+            <template v-else-if="!loading && !asset">
+                <div class="flex flex-1 flex-col items-center justify-center gap-4 p-8">
+                    <p class="text-sm text-gray-600 dark:text-gray-400">{{ loadError || __('Unable to load asset') }}</p>
+                    <ui-button variant="primary" @click="load(activeSite)" :text="__('Retry')" />
+                </div>
+            </template>
+
+            <template v-if="!loading && asset">
                 <!-- Header -->
                 <header id="asset-editor-header" class="relative flex w-full justify-between px-2">
                     <button
@@ -176,7 +183,7 @@
             </template>
 
             <focal-point-editor
-                v-if="showFocalPointEditor && isFocalPointEditorEnabled"
+                v-if="asset && showFocalPointEditor && isFocalPointEditorEnabled"
                 :data="values.focus"
                 :image="asset.preview"
                 @selected="selectFocalPoint"
@@ -286,12 +293,13 @@ export default {
             originMeta: {},
             syncFieldConfirmationText: __('messages.sync_entry_field_confirmation_text'),
             loadId: 0,
+            loadError: null,
         };
     },
 
     computed: {
         readOnly() {
-            return !this.asset.isEditable;
+            return this.asset ? !this.asset.isEditable : true;
         },
 
         isImage() {
@@ -348,6 +356,7 @@ export default {
          */
         load(site = null) {
             this.loading = true;
+            this.loadError = null;
             const loadId = ++this.loadId;
 
             const url = cp_url(`assets/${utf8btoa(this.id)}`);
@@ -396,9 +405,10 @@ export default {
                 ]);
 
                 this.loading = false;
-            }).catch(() => {
+            }).catch((err) => {
                 if (loadId === this.loadId) {
                     this.loading = false;
+                    this.loadError = err?.response?.data?.message || __('Unable to load asset');
                 }
             });
         },