Make sure to nuke the old asset if overwriting

Author: jackmcdade

src/Actions/MoveAsset.php

@@ -4,6 +4,7 @@
 
 use Statamic\Contracts\Assets\Asset;
 use Statamic\Exceptions\AssetConflictException;
+use Statamic\Facades\Asset as AssetRepository;
 use Statamic\Facades\AssetContainer;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Glide;
@@ -68,6 +69,13 @@ public function run($assets, $values)
                 if ($strategy === 'overwrite') {
                     $assetForGlideCacheClear = $existingAsset ?? $asset->container()->makeAsset($destinationPath);
                     Glide::clearAsset($assetForGlideCacheClear);
+
+                    // Remove the pre-existing destination record before moving the source
+                    // so we never leave behind stale repository entries for this path.
+                    if ($existingAsset) {
+                        AssetRepository::delete($existingAsset);
+                    }
+
                     $oldId = $asset->id();
                     $newId = $asset->move($folder)->id();
                     $completedMoves[$oldId] = $newId;

tests/Actions/MoveAssetTest.php

@@ -189,6 +189,8 @@ public function it_can_overwrite_conflicting_move_when_strategy_is_overwrite():
         Storage::disk('test')->assertMissing('source/logo.svg');
         Storage::disk('test')->assertExists('target/logo.svg');
         $this->assertEquals('new', Storage::disk('test')->get('target/logo.svg'));
+        $this->assertCount(1, $this->container->assets('/', true));
+        $this->assertSame(['test_container::target/logo.svg'], $this->container->assets('/', true)->pluck('id')->values()->all());
     }
 
     #[Test]