Simplify retry extension logic to use built-in filters

src/Platform/Microsoft.Testing.Extensions.Retry/Resources/ExtensionResources.resx

@@ -149,9 +149,6 @@ Moving last attempt asset files to the default result directory
   <data name="RetryFailedTestsExtensionDisplayName" xml:space="preserve">
     <value>Retry failed tests</value>
   </data>
-  <data name="RetryProviderRequiresDefaultTestHostManagerErrorMessage" xml:space="preserve">
-    <value>The retry provider requires the default TestHostManager implementation.</value>
-  </data>
   <data name="RetryExtensionNotSupportedOnBrowserErrorMessage" xml:space="preserve">
     <value>The retry extension is not supported on browser platform. Browser-based tests cannot be retried due to platform limitations.</value>
   </data>

src/Platform/Microsoft.Testing.Extensions.Retry/Resources/xlf/ExtensionResources.cs.xlf

@@ -100,11 +100,6 @@ Přesouvání souborů prostředků posledního pokusu do výchozího adresáře
         <target state="translated">Možnost {0} nelze používat společně s možností {1}.</target>
         <note />
       </trans-unit>
-      <trans-unit id="RetryProviderRequiresDefaultTestHostManagerErrorMessage">
-        <source>The retry provider requires the default TestHostManager implementation.</source>
-        <target state="translated">Zprostředkovatel opakování vyžaduje výchozí implementaci TestHostManager.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TestHostProcessExitedBeforeRetryCouldConnect">
         <source>Test host process exited before the retry service could connect to it. Exit code: {0}</source>
         <target state="translated">Hostitelský proces testu byl ukončen dříve, než se k němu mohla služba opakování připojit. Ukončovací kód: {0}</target>

src/Platform/Microsoft.Testing.Extensions.Retry/Resources/xlf/ExtensionResources.de.xlf

@@ -100,11 +100,6 @@ Medienobjektdateien des letzten Versuchs werden in das Standardergebnisverzeichn
         <target state="translated">Optionen "{0}" und "{1}" können nicht zusammen verwendet werden</target>
         <note />
       </trans-unit>
-      <trans-unit id="RetryProviderRequiresDefaultTestHostManagerErrorMessage">
-        <source>The retry provider requires the default TestHostManager implementation.</source>
-        <target state="translated">Der Wiederholungsanbieter erfordert die standardmäßige TestHostManager-Implementierung.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TestHostProcessExitedBeforeRetryCouldConnect">
         <source>Test host process exited before the retry service could connect to it. Exit code: {0}</source>
         <target state="translated">Der Testhostprozess wurde beendet, bevor der Wiederholungsdienst eine Verbindung herstellen konnte. Exitcode: {0}</target>

src/Platform/Microsoft.Testing.Extensions.Retry/Resources/xlf/ExtensionResources.es.xlf

@@ -100,11 +100,6 @@ Moviendo los archivos de recursos del último intento al directorio de resultado
         <target state="translated">Las opciones '{0}' y '{1}' no se pueden usar juntas</target>
         <note />
       </trans-unit>
-      <trans-unit id="RetryProviderRequiresDefaultTestHostManagerErrorMessage">
-        <source>The retry provider requires the default TestHostManager implementation.</source>
-        <target state="translated">El proveedor de reintentos requiere la implementación predeterminada de TestHostManager.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TestHostProcessExitedBeforeRetryCouldConnect">
         <source>Test host process exited before the retry service could connect to it. Exit code: {0}</source>
         <target state="translated">El proceso de host de prueba se cerró antes de que el servicio de reintento pudiera conectarse a él. Código de salida: {0}</target>

src/Platform/Microsoft.Testing.Extensions.Retry/Resources/xlf/ExtensionResources.fr.xlf

@@ -100,11 +100,6 @@ Déplacement des fichiers de ressources de la dernière tentative vers le réper
         <target state="translated">Les options «{0}» et «{1}» ne peuvent pas être utilisées ensemble</target>
         <note />
       </trans-unit>
-      <trans-unit id="RetryProviderRequiresDefaultTestHostManagerErrorMessage">
-        <source>The retry provider requires the default TestHostManager implementation.</source>
-        <target state="translated">Le fournisseur de nouvelles tentatives requiert l'implémentation par défaut de TestHostManager.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TestHostProcessExitedBeforeRetryCouldConnect">
         <source>Test host process exited before the retry service could connect to it. Exit code: {0}</source>
         <target state="translated">Le processus hôte de test s’est arrêté avant que le service de nouvelle tentative puisse s’y connecter. Code de sortie : {0}</target>

src/Platform/Microsoft.Testing.Extensions.Retry/Resources/xlf/ExtensionResources.it.xlf

@@ -100,11 +100,6 @@ Spostamento dei file di asset dell'ultimo tentativo nella directory dei risultat
         <target state="translated">Le opzioni '{0}' e '{1}' non possono essere usate insieme</target>
         <note />
       </trans-unit>
-      <trans-unit id="RetryProviderRequiresDefaultTestHostManagerErrorMessage">
-        <source>The retry provider requires the default TestHostManager implementation.</source>
-        <target state="translated">Il provider di tentativi richiede l'implementazione predefinita di TestHostManager.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TestHostProcessExitedBeforeRetryCouldConnect">
         <source>Test host process exited before the retry service could connect to it. Exit code: {0}</source>
         <target state="translated">Il processo host di test è stato chiuso prima che il servizio di ripetizione potesse connettersi ad esso. Codice di uscita: {0}</target>

src/Platform/Microsoft.Testing.Extensions.Retry/Resources/xlf/ExtensionResources.ja.xlf

@@ -100,11 +100,6 @@ Moving last attempt asset files to the default result directory
         <target state="translated">オプション '{0}' と '{1}' を一緒に使用することはできません</target>
         <note />
       </trans-unit>
-      <trans-unit id="RetryProviderRequiresDefaultTestHostManagerErrorMessage">
-        <source>The retry provider requires the default TestHostManager implementation.</source>
-        <target state="translated">再試行プロバイダーには、既定の TestHostManager 実装が必要です。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TestHostProcessExitedBeforeRetryCouldConnect">
         <source>Test host process exited before the retry service could connect to it. Exit code: {0}</source>
         <target state="translated">再試行サービスが接続する前に、テスト ホスト プロセスが終了しました。終了コード: {0}</target>

src/Platform/Microsoft.Testing.Extensions.Retry/Resources/xlf/ExtensionResources.ko.xlf

@@ -100,11 +100,6 @@ Moving last attempt asset files to the default result directory
         <target state="translated">'{0}' 및 '{1}' 옵션은 함께 사용할 수 없습니다.</target>
         <note />
       </trans-unit>
-      <trans-unit id="RetryProviderRequiresDefaultTestHostManagerErrorMessage">
-        <source>The retry provider requires the default TestHostManager implementation.</source>
-        <target state="translated">다시 시도 공급자에는 기본 TestHostManager 구현이 필요합니다.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TestHostProcessExitedBeforeRetryCouldConnect">
         <source>Test host process exited before the retry service could connect to it. Exit code: {0}</source>
         <target state="translated">다시 시도 서비스가 연결되기 전에 테스트 호스트 프로세스가 종료되었습니다. 종료 코드: {0}</target>

src/Platform/Microsoft.Testing.Extensions.Retry/Resources/xlf/ExtensionResources.pl.xlf

@@ -100,11 +100,6 @@ Przeniesienie plików zasobów ostatniej próby do domyślnego katalogu wyników
         <target state="translated">Opcji „{0}” i „{1}” nie można używać razem</target>
         <note />
       </trans-unit>
-      <trans-unit id="RetryProviderRequiresDefaultTestHostManagerErrorMessage">
-        <source>The retry provider requires the default TestHostManager implementation.</source>
-        <target state="translated">Dostawca ponawiania wymaga domyślnej implementacji TestHostManager.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TestHostProcessExitedBeforeRetryCouldConnect">
         <source>Test host process exited before the retry service could connect to it. Exit code: {0}</source>
         <target state="translated">Proces hosta testowego zakończył się, zanim usługa ponawiania próby mogła nawiązać z nim połączenie. Kod zakończenia: {0}</target>

src/Platform/Microsoft.Testing.Extensions.Retry/Resources/xlf/ExtensionResources.pt-BR.xlf

@@ -100,11 +100,6 @@ Movendo arquivos de ativo da última tentativa para o diretório de resultados p
         <target state="translated">As opções ''{0}'' e ''{1}'' não podem ser usadas juntas</target>
         <note />
       </trans-unit>
-      <trans-unit id="RetryProviderRequiresDefaultTestHostManagerErrorMessage">
-        <source>The retry provider requires the default TestHostManager implementation.</source>
-        <target state="translated">O provedor de repetição requer a implementação padrão de TestHostManager.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TestHostProcessExitedBeforeRetryCouldConnect">
         <source>Test host process exited before the retry service could connect to it. Exit code: {0}</source>
         <target state="translated">O processo de host de teste foi encerrado antes que o serviço de repetição pudesse se conectar a ele. Código de saída: {0}</target>

src/Platform/Microsoft.Testing.Extensions.Retry/Resources/xlf/ExtensionResources.ru.xlf

@@ -100,11 +100,6 @@ Moving last attempt asset files to the default result directory
         <target state="translated">Параметры "{0}" и "{1}" не могут использоваться вместе</target>
         <note />
       </trans-unit>
-      <trans-unit id="RetryProviderRequiresDefaultTestHostManagerErrorMessage">
-        <source>The retry provider requires the default TestHostManager implementation.</source>
-        <target state="translated">Для поставщика повторных попыток требуется реализация TestHostManager по умолчанию.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TestHostProcessExitedBeforeRetryCouldConnect">
         <source>Test host process exited before the retry service could connect to it. Exit code: {0}</source>
         <target state="translated">Тестовый хост-процесс завершился прежде, чем к нему смогла подключиться служба повторной попытки. Код выхода: {0}</target>

src/Platform/Microsoft.Testing.Extensions.Retry/Resources/xlf/ExtensionResources.tr.xlf

@@ -100,11 +100,6 @@ Son deneme varlık dosyaları, varsayılan sonuç dizinine taşınıyor
         <target state="translated">'{0}' ve '{1}' seçenekleri birlikte kullanılamaz</target>
         <note />
       </trans-unit>
-      <trans-unit id="RetryProviderRequiresDefaultTestHostManagerErrorMessage">
-        <source>The retry provider requires the default TestHostManager implementation.</source>
-        <target state="translated">Yeniden deneme sağlayıcısı varsayılan TestHostManager'ın uygulanmasını gerektiriyor.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TestHostProcessExitedBeforeRetryCouldConnect">
         <source>Test host process exited before the retry service could connect to it. Exit code: {0}</source>
         <target state="translated">Yeniden deneme hizmeti ona bağlanamadan test ana makinesi işleminden çıkıldı. Çıkış kodu: {0}</target>

src/Platform/Microsoft.Testing.Extensions.Retry/Resources/xlf/ExtensionResources.zh-Hans.xlf

@@ -100,11 +100,6 @@ Moving last attempt asset files to the default result directory
         <target state="translated">选项“{0}”和“{1}”不能一起使用</target>
         <note />
       </trans-unit>
-      <trans-unit id="RetryProviderRequiresDefaultTestHostManagerErrorMessage">
-        <source>The retry provider requires the default TestHostManager implementation.</source>
-        <target state="translated">重试提供程序需要默认的 TestHostManager 实现。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TestHostProcessExitedBeforeRetryCouldConnect">
         <source>Test host process exited before the retry service could connect to it. Exit code: {0}</source>
         <target state="translated">测试主机进程已在重试服务可以连接到它之前退出。退出代码: {0}</target>

src/Platform/Microsoft.Testing.Extensions.Retry/Resources/xlf/ExtensionResources.zh-Hant.xlf

@@ -100,11 +100,6 @@ Moving last attempt asset files to the default result directory
         <target state="translated">選項 '{0}' 和 '{1}' 不能同時使用</target>
         <note />
       </trans-unit>
-      <trans-unit id="RetryProviderRequiresDefaultTestHostManagerErrorMessage">
-        <source>The retry provider requires the default TestHostManager implementation.</source>
-        <target state="translated">重試提供者需要預設的 TestHostManager 實作。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TestHostProcessExitedBeforeRetryCouldConnect">
         <source>Test host process exited before the retry service could connect to it. Exit code: {0}</source>
         <target state="translated">測試主機處理序在重試服務連線到它之前已結束。結束代碼: {0}</target>

src/Platform/Microsoft.Testing.Extensions.Retry/RetryExtensions.cs

@@ -5,7 +5,6 @@
 using Microsoft.Testing.Extensions.Policy.Resources;
 using Microsoft.Testing.Platform.Builder;
 using Microsoft.Testing.Platform.Extensions;
-using Microsoft.Testing.Platform.TestHost;
 
 namespace Microsoft.Testing.Extensions;
 
@@ -38,14 +37,5 @@ CompositeExtensionFactory<RetryDataConsumer> compositeExtensionFactory
 
         builder.TestHostOrchestrator
             .AddTestHostOrchestrator(serviceProvider => new RetryOrchestrator(serviceProvider));
-
-        if (builder.TestHost is not TestHostManager testHostManager)
-        {
-            throw new InvalidOperationException(
-                ExtensionResources.RetryProviderRequiresDefaultTestHostManagerErrorMessage);
-        }
-
-        testHostManager
-            .AddTestExecutionFilterFactory(serviceProvider => new RetryExecutionFilterFactory(serviceProvider));
     }
 }

src/Platform/Microsoft.Testing.Extensions.Retry/RetryOrchestrator.cs

@@ -170,6 +170,41 @@ public async Task<int> OrchestrateTestHostExecutionAsync(CancellationToken cance
             finalArguments.Add($"--{RetryCommandLineOptionsProvider.RetryFailedTestsPipeNameOptionName}");
             finalArguments.Add(retryFailedTestsPipeServer.PipeName);
 
+            // When retrying, replace any existing test filter with --filter-uid for the failed tests
+            if (lastListOfFailedId is { Length: > 0 })
+            {
+                RemoveOption(finalArguments, TreeNodeFilterCommandLineOptionsProvider.TreenodeFilter);
+                RemoveOption(finalArguments, PlatformCommandLineProvider.FilterUidOptionKey);
+
+                // Estimate command line length to avoid hitting OS limits (notably ~32K on Windows).
+                const int CommandLineLengthLimit = 30_000;
+                int predictedLength = 0;
+                foreach (string arg in finalArguments)
+                {
+                    predictedLength += arg.Length + 1;
+                }
+
+                predictedLength += 2 + PlatformCommandLineProvider.FilterUidOptionKey.Length + 1;
+                foreach (string uid in lastListOfFailedId)
+                {
+                    predictedLength += uid.Length + 1;
+                }
+
+                if (predictedLength <= CommandLineLengthLimit)
+                {
+                    finalArguments.Add($"--{PlatformCommandLineProvider.FilterUidOptionKey}");
+                    finalArguments.AddRange(lastListOfFailedId);
+                }
+                else
+                {
+                    // Use a response file to avoid exceeding command-line length limits.
+                    string responseFilePath = Path.Combine(currentTryResultFolder, "retry-filter-uids.rsp");
+                    _fileSystem.CreateDirectory(currentTryResultFolder);
+                    File.WriteAllText(responseFilePath, $"--{PlatformCommandLineProvider.FilterUidOptionKey} {string.Join(" ", lastListOfFailedId)}");
+                    finalArguments.Add($"@{responseFilePath}");
+                }
+            }
+
 #if NET8_0_OR_GREATER
             // On net8.0+, we can pass the arguments as a collection directly to ProcessStartInfo.
             // When passing the collection, it's expected to be unescaped, so we pass what we have directly.
@@ -351,4 +386,48 @@ private static int GetOptionArgumentIndex(string optionName, string[] executable
         index = Array.IndexOf(executableArgs, "--" + optionName);
         return index >= 0 ? index : -1;
     }
+
+    private static void RemoveOption(List<string> arguments, string optionName)
+    {
+        string longForm = $"--{optionName}";
+        string shortForm = $"-{optionName}";
+
+        // Remove all occurrences since options like --filter-uid can appear multiple times.
+        // Also handle --option=value and --option:value forms produced by the command-line parser.
+        while (true)
+        {
+            int idx = -1;
+            for (int i = 0; i < arguments.Count; i++)
+            {
+                string arg = arguments[i];
+                if (arg == longForm || arg == shortForm
+                    || arg.StartsWith(longForm + "=", StringComparison.Ordinal) || arg.StartsWith(longForm + ":", StringComparison.Ordinal)
+                    || arg.StartsWith(shortForm + "=", StringComparison.Ordinal) || arg.StartsWith(shortForm + ":", StringComparison.Ordinal))
+                {
+                    idx = i;
+                    break;
+                }
+            }
+
+            if (idx < 0)
+            {
+                break;
+            }
+
+            string found = arguments[idx];
+            arguments.RemoveAt(idx);
+
+            // If the option used = or : separator, the value is inline — nothing more to remove.
+            if (found.Contains('=') || found.Contains(':'))
+            {
+                continue;
+            }
+
+            // Otherwise, remove subsequent non-option arguments (the option's values).
+            while (idx < arguments.Count && !arguments[idx].StartsWith('-'))
+            {
+                arguments.RemoveAt(idx);
+            }
+        }
+    }
 }