fix: coroutine safe markdown rendering

src/mail/src/Mailable.php

@@ -358,9 +358,10 @@ protected function additionalMessageData(): array
      */
     protected function buildMarkdownHtml(array $viewData): Closure
     {
-        return fn ($data) => $this->markdownRenderer()->render(
+        return fn ($data) => Container::getInstance()->make(Markdown::class)->render(
             $this->markdown,
             array_merge($data, $viewData),
+            theme: $this->markdownTheme()
         );
     }
 
@@ -376,26 +377,22 @@ protected function buildMarkdownText(array $viewData): Closure
                 ]);
             }
 
-            return $this->textView ?? $this->markdownRenderer()->renderText(
+            return $this->textView ?? Container::getInstance()->make(Markdown::class)->renderText(
                 $this->markdown,
                 array_merge($data, $viewData)
             );
         };
     }
 
     /**
-     * Resolves a Markdown instance with the mail's theme.
+     * Resolve the Markdown theme for this message.
      */
-    protected function markdownRenderer(): Markdown
+    protected function markdownTheme(): string
     {
-        return tap(Container::getInstance()->make(Markdown::class), function ($markdown) {
-            $markdown->theme(
-                $this->theme ?: Container::getInstance()->make('config')->get(
-                    'mail.markdown.theme',
-                    'default'
-                )
-            );
-        });
+        return $this->theme ?: Container::getInstance()->make('config')->get(
+            'mail.markdown.theme',
+            'default'
+        );
     }
 
     /**

src/mail/src/Markdown.php

@@ -46,54 +46,52 @@ public function __construct(
     /**
      * Render the Markdown template into HTML.
      */
-    public function render(string $view, array $data = [], mixed $inliner = null): HtmlString
+    public function render(string $view, array $data = [], mixed $inliner = null, ?string $theme = null): HtmlString
     {
-        $this->view->flushFinderCache();
+        $viewFactory = $this->viewFactoryWithMailNamespace($this->htmlComponentPaths());
 
-        $bladeCompiler = $this->view
+        $bladeCompiler = $viewFactory
             ->getEngineResolver() // @phpstan-ignore method.notFound
             ->resolve('blade')
             ->getCompiler();
 
         $contents = $bladeCompiler->usingEchoFormat(
             'new \Hypervel\Support\EncodedHtmlString(%s)',
-            function () use ($view, $data) {
-                if (static::$withSecuredEncoding === true) {
-                    EncodedHtmlString::encodeUsing(function ($value) {
+            function () use ($viewFactory, $view, $data) {
+                $render = fn () => $viewFactory->make($view, $data)->render();
+
+                if (static::$withSecuredEncoding === false) {
+                    return $render();
+                }
+
+                return EncodedHtmlString::withEncoding(
+                    function ($value) {
                         $replacements = [
                             '[' => '\[',
                             '<' => '&lt;',
                             '>' => '&gt;',
                         ];
 
                         return str_replace(array_keys($replacements), array_values($replacements), $value);
-                    });
-                }
-
-                try {
-                    $contents = $this->view->replaceNamespace(
-                        'mail',
-                        $this->htmlComponentPaths()
-                    )->make($view, $data)->render();
-                } finally {
-                    EncodedHtmlString::flushState();
-                }
-
-                return $contents;
+                    },
+                    $render
+                );
             }
         );
 
-        if ($this->view->exists($customTheme = Str::start($this->theme, 'mail.'))) {
+        $theme ??= $this->theme;
+
+        if ($viewFactory->exists($customTheme = Str::start($theme, 'mail.'))) {
             $theme = $customTheme;
         } else {
-            $theme = str_contains($this->theme, '::')
-                ? $this->theme
-                : 'mail::themes.' . $this->theme;
+            $theme = str_contains($theme, '::')
+                ? $theme
+                : 'mail::themes.' . $theme;
         }
 
         return new HtmlString(($inliner ?: new CssToInlineStyles)->convert(
             str_replace('\[', '[', $contents),
-            $this->view->make($theme, $data)->render()
+            $viewFactory->make($theme, $data)->render()
         ));
     }
 
@@ -102,12 +100,9 @@ function () use ($view, $data) {
      */
     public function renderText(string $view, array $data = []): HtmlString
     {
-        $this->view->flushFinderCache();
-
-        $contents = $this->view->replaceNamespace(
-            'mail',
-            $this->textComponentPaths()
-        )->make($view, $data)->render();
+        $contents = $this->viewFactoryWithMailNamespace($this->textComponentPaths())
+            ->make($view, $data)
+            ->render();
 
         return new HtmlString(
             html_entity_decode(preg_replace("/[\r\n]{2,}/", "\n\n", $contents), ENT_QUOTES, 'UTF-8')
@@ -123,28 +118,21 @@ public static function parse(Stringable|string $text, bool $encoded = false): Ht
             return new HtmlString(static::converter()->convert((string) $text)->getContent());
         }
 
-        EncodedHtmlString::encodeUsing(function ($value) {
-            $replacements = [
-                '[' => '\[',
-                '<' => '\<',
-            ];
+        return new HtmlString(EncodedHtmlString::withEncoding(
+            function ($value) {
+                $replacements = [
+                    '[' => '\[',
+                    '<' => '\<',
+                ];
 
-            $html = str_replace(array_keys($replacements), array_values($replacements), $value);
+                $html = str_replace(array_keys($replacements), array_values($replacements), $value);
 
-            return static::converter([
-                'html_input' => 'escape',
-            ])->convert($html)->getContent();
-        });
-
-        $html = '';
-
-        try {
-            $html = static::converter()->convert((string) $text)->getContent();
-        } finally {
-            EncodedHtmlString::flushState();
-        }
-
-        return new HtmlString($html);
+                return static::converter([
+                    'html_input' => 'escape',
+                ])->convert($html)->getContent();
+            },
+            fn () => static::converter()->convert((string) $text)->getContent()
+        ));
     }
 
     /**
@@ -186,6 +174,20 @@ public function textComponentPaths(): array
         }, $this->componentPaths());
     }
 
+    /**
+     * Clone the view factory with render-local mail component paths.
+     */
+    protected function viewFactoryWithMailNamespace(array $paths): ViewFactory
+    {
+        // Markdown swaps mail:: between HTML and text component paths while
+        // rendering. Keep that namespace change on a short-lived clone so the
+        // singleton view finder stays untouched for concurrent coroutines.
+        $viewFactory = clone $this->view;
+        $viewFactory->replaceNamespace('mail', $paths);
+
+        return $viewFactory;
+    }
+
     /**
      * Get the component paths.
      */
@@ -198,6 +200,9 @@ protected function componentPaths(): array
 
     /**
      * Register new mail component paths.
+     *
+     * Boot-only. Mutates the shared Markdown renderer's component paths; use
+     * scoped view namespaces for per-render component path changes.
      */
     public function loadComponentsFrom(array $paths = []): void
     {
@@ -206,6 +211,9 @@ public function loadComponentsFrom(array $paths = []): void
 
     /**
      * Set the default theme to be used.
+     *
+     * Boot-only. Mutates the shared Markdown renderer's default theme; pass a
+     * per-render theme to render() for message-specific themes.
      */
     public function theme(string $theme): static
     {
@@ -246,6 +254,9 @@ public static function withoutSecuredEncoding(): void
 
     /**
      * Flush the class's global state.
+     *
+     * Boot or tests only. Clears worker-wide Markdown flags; concurrent renders
+     * may switch encoding behavior depending on timing.
      */
     public static function flushState(): void
     {

src/notifications/src/Channels/MailChannel.php

@@ -85,9 +85,10 @@ protected function buildView(MailMessage $message): array|string
      */
     protected function buildMarkdownHtml(MailMessage $message): Closure
     {
-        return fn ($data) => $this->markdownRenderer($message)->render(
+        return fn ($data) => $this->markdown->render(
             $message->markdown,
             array_merge($data, $message->data()),
+            theme: $this->markdownTheme($message)
         );
     }
 
@@ -96,23 +97,21 @@ protected function buildMarkdownHtml(MailMessage $message): Closure
      */
     protected function buildMarkdownText(MailMessage $message): Closure
     {
-        return fn ($data) => $this->markdownRenderer($message)->renderText(
+        return fn ($data) => $this->markdown->renderText(
             $message->markdown,
             array_merge($data, $message->data()),
         );
     }
 
     /**
-     * Get the Markdown implementation.
+     * Resolve the Markdown theme for the notification.
      */
-    protected function markdownRenderer(MailMessage $message): Markdown
+    protected function markdownTheme(MailMessage $message): string
     {
         $config = Container::getInstance()
             ->make('config');
 
-        $theme = $message->theme ?? $config->get('mail.markdown.theme', 'default');
-
-        return $this->markdown->theme($theme);
+        return $message->theme ?? $config->get('mail.markdown.theme', 'default');
     }
 
     /**

src/notifications/src/Messages/MailMessage.php

@@ -317,8 +317,11 @@ public function render(): string
         $markdown = Container::getInstance()
             ->make(Markdown::class);
 
-        return (string) $markdown->theme($this->theme ?: $markdown->getTheme())
-            ->render($this->markdown, $this->data());
+        return (string) $markdown->render(
+            $this->markdown,
+            $this->data(),
+            theme: $this->theme ?: $markdown->getTheme()
+        );
     }
 
     /**

src/support/src/EncodedHtmlString.php

@@ -6,12 +6,18 @@
 
 use BackedEnum;
 use Closure;
+use Hypervel\Context\CoroutineContext;
 use Hypervel\Contracts\Support\DeferringDisplayableValue;
 use Hypervel\Contracts\Support\Htmlable;
 use Override;
 
 class EncodedHtmlString extends HtmlString
 {
+    /**
+     * Context key for temporarily scoped encoder callbacks.
+     */
+    protected const ENCODER_CONTEXT_KEY = '__support.encoded_html.encoder';
+
     /**
      * The callback that should be used to encode the HTML strings.
      */
@@ -57,7 +63,9 @@ public function toHtml(): string
             $value = $value->value;
         }
 
-        return (static::$encodeUsingFactory ?? function ($value, $doubleEncode) {
+        $factory = CoroutineContext::get(self::ENCODER_CONTEXT_KEY) ?? static::$encodeUsingFactory;
+
+        return ($factory ?? function ($value, $doubleEncode) {
             return static::convert($value, doubleEncode: $doubleEncode);
         })($value, $this->doubleEncode);
     }
@@ -73,6 +81,29 @@ public static function encodeUsing(?callable $factory = null): void
         static::$encodeUsingFactory = $factory;
     }
 
+    /**
+     * Execute the given callback using a temporary encoder.
+     */
+    public static function withEncoding(callable $factory, callable $callback): mixed
+    {
+        // Preserve an outer scoped encoder so nested Markdown renders restore
+        // the previous coroutine-local state instead of falling back globally.
+        $hadPreviousFactory = CoroutineContext::has(self::ENCODER_CONTEXT_KEY);
+        $previousFactory = CoroutineContext::get(self::ENCODER_CONTEXT_KEY);
+
+        CoroutineContext::set(self::ENCODER_CONTEXT_KEY, $factory);
+
+        try {
+            return $callback();
+        } finally {
+            if ($hadPreviousFactory) {
+                CoroutineContext::set(self::ENCODER_CONTEXT_KEY, $previousFactory);
+            } else {
+                CoroutineContext::forget(self::ENCODER_CONTEXT_KEY);
+            }
+        }
+    }
+
     /**
      * Flush the class's global state.
      *
@@ -82,5 +113,6 @@ public static function encodeUsing(?callable $factory = null): void
     public static function flushState(): void
     {
         static::$encodeUsingFactory = null;
+        CoroutineContext::forget(self::ENCODER_CONTEXT_KEY);
     }
 }

src/view/src/Compilers/ComponentTagCompiler.php

@@ -235,8 +235,10 @@ protected function componentString(string $component, array $attributes): string
         // component and pass the component as a view parameter to the data so it
         // can be accessed within the component and we can render out the view.
         if (! class_exists($class)) {
+            // Markdown renders mail components through cloned view factories, so
+            // mail:: tags must resolve through the current $__env, not the singleton.
             $view = Str::startsWith($component, 'mail::')
-                ? "\$__env->getContainer()->make(Hypervel\\View\\Factory::class)->make('{$component}')"
+                ? "\$__env->make('{$component}')"
                 : "'{$class}'";
 
             $parameters = [

src/view/src/Factory.php

@@ -94,6 +94,17 @@ public function __construct(
         $this->share('__env', $this);
     }
 
+    /**
+     * Clone the factory for isolated render-time namespace changes.
+     */
+    public function __clone(): void
+    {
+        // Cloned factories may change namespace hints for one render; the
+        // singleton finder and Blade's $__env shared binding must stay isolated.
+        $this->finder = clone $this->finder;
+        $this->shared['__env'] = $this;
+    }
+
     /**
      * Get the evaluated view contents for the given view.
      */

tests/Integration/Mail/SendingMarkdownMailTest.php

@@ -146,7 +146,7 @@ public function testTheme()
         $this->assertSame('default', $this->app->make(Markdown::class)->getTheme());
 
         Mail::to('test@mail.com')->send(new MarkdownBasicMailableWithTheme);
-        $this->assertSame('taylor', $this->app->make(Markdown::class)->getTheme());
+        $this->assertSame('default', $this->app->make(Markdown::class)->getTheme());
 
         Mail::to('test@mail.com')->send(new MarkdownBasicMailable);
         $this->assertSame('default', $this->app->make(Markdown::class)->getTheme());