[5.x] Fix Stache index re-entrancy causing null URIs on cold stache (#14181)

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Jason Varga <jason@pixelfear.com>

Author: 3 people

src/Stache/Indexes/Index.php

@@ -11,7 +11,7 @@ abstract class Index
     protected $name;
     protected $items = [];
     protected $loaded = false;
-    private static ?string $currentlyLoading = null;
+    private static array $loadingStack = [];
 
     public function __construct($store, $name)
     {
@@ -66,27 +66,29 @@ public function load()
         }
 
         $loadingKey = $this->store->key().'/'.$this->name;
-        $currentlyLoadingThis = static::$currentlyLoading === $loadingKey;
+        $currentlyLoadingThis = in_array($loadingKey, static::$loadingStack);
 
-        static::$currentlyLoading = $loadingKey;
+        static::$loadingStack[] = $loadingKey;
 
-        $this->loaded = true;
+        try {
+            $this->loaded = true;
 
-        if (Statamic::isWorker() && ! $currentlyLoadingThis) {
-            $this->loaded = false;
-        }
-
-        debugbar()->addMessage("Loading index: {$loadingKey}", 'stache');
+            if (Statamic::isWorker() && ! $currentlyLoadingThis) {
+                $this->loaded = false;
+            }
 
-        $this->items = Stache::cacheStore()->get($this->cacheKey());
+            debugbar()->addMessage("Loading index: {$loadingKey}", 'stache');
 
-        if ($this->items === null) {
-            $this->update();
-        }
+            $this->items = Stache::cacheStore()->get($this->cacheKey());
 
-        $this->store->cacheIndexUsage($this);
+            if ($this->items === null) {
+                $this->update();
+            }
 
-        static::$currentlyLoading = null;
+            $this->store->cacheIndexUsage($this);
+        } finally {
+            array_pop(static::$loadingStack);
+        }
 
         return $this;
     }
@@ -161,8 +163,14 @@ public function clear()
         Stache::cacheStore()->forget($this->cacheKey());
     }
 
+    /** @deprecated */
     public static function currentlyLoading()
     {
-        return static::$currentlyLoading;
+        return end(static::$loadingStack) ?: null;
+    }
+
+    public static function isLoading(): bool
+    {
+        return ! empty(static::$loadingStack);
     }
 }

src/Stache/Stores/CollectionEntriesStore.php

@@ -234,9 +234,7 @@ protected function getCachedItem($key)
             return null;
         }
 
-        $isLoadingIds = Index::currentlyLoading() === $this->key().'/id';
-
-        if (! $isLoadingIds && $this->shouldBlinkEntryUris && ($uri = $this->resolveIndex('uri')->load()->get($entry->id()))) {
+        if (! Index::isLoading() && $this->shouldBlinkEntryUris && ($uri = $this->resolveIndex('uri')->load()->get($entry->id()))) {
             Blink::store('entry-uris')->put($entry->id(), $uri);
         }
 

src/Stache/Stores/Store.php

@@ -319,6 +319,8 @@ public function paths()
             return $isDuplicate ?? false;
         });
 
+        $items->each(fn ($item) => $this->cacheItem($item['item']));
+
         $paths = $items->pluck('path', 'key');
 
         $this->cachePaths($paths);

tests/Stache/ColdStacheUriTest.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace Tests\Stache;
+
+use Facades\Tests\Factories\EntryFactory;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Blink;
+use Statamic\Facades\Collection;
+use Statamic\Facades\Entry;
+use Statamic\Facades\Stache;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class ColdStacheUriTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    private function simulateColdStache(): void
+    {
+        Stache::clear();
+        Blink::flush();
+    }
+
+    #[Test]
+    public function entries_have_uris_on_cold_stache_with_single_site_structured_collection()
+    {
+        $collection = Collection::make('pages')
+            ->routes('{parent_uri}/{slug}')
+            ->structureContents(['root' => true]);
+        $collection->save();
+
+        EntryFactory::id('alfa-id')->collection('pages')->slug('alfa')->data(['title' => 'Alfa'])->create();
+        EntryFactory::id('bravo-id')->collection('pages')->slug('bravo')->data(['title' => 'Bravo'])->create();
+
+        $this->simulateColdStache();
+
+        // Loading a non-URI index first triggers re-entrant URI index loading via getCachedItem().
+        Stache::store('entries')->store('pages')->index('site')->load();
+
+        $entries = Entry::query()
+            ->where('collection', 'pages')
+            ->whereNotNull('uri')
+            ->whereStatus('published')
+            ->get();
+
+        $this->assertCount(2, $entries);
+    }
+
+    #[Test]
+    public function entries_have_uris_on_cold_stache_with_multisite_structured_collection()
+    {
+        $this->setSites([
+            'en' => ['url' => 'http://localhost/', 'locale' => 'en_US'],
+            'fr' => ['url' => 'http://localhost/fr/', 'locale' => 'fr_FR'],
+        ]);
+
+        $collection = Collection::make('pages')
+            ->routes('{parent_uri}/{slug}')
+            ->structureContents(['root' => true])
+            ->sites(['en', 'fr']);
+        $collection->save();
+
+        EntryFactory::id('alfa-id')->locale('en')->collection('pages')->slug('alfa')->data(['title' => 'Alfa'])->create();
+        EntryFactory::id('bravo-id')->locale('fr')->collection('pages')->slug('bravo')->origin('alfa-id')->data(['title' => 'Bravo'])->create();
+
+        $this->simulateColdStache();
+
+        Stache::store('entries')->store('pages')->index('site')->load();
+
+        $entries = Entry::query()
+            ->where('collection', 'pages')
+            ->whereNotNull('uri')
+            ->whereStatus('published')
+            ->get();
+
+        $this->assertCount(2, $entries);
+    }
+}