Add bounded retry around agent check invocations in env/agent.py

Author: Kyle-Neale

ddev/src/ddev/cli/env/agent.py

@@ -9,6 +9,36 @@
 
 if TYPE_CHECKING:
     from ddev.cli.application import Application
+    from ddev.e2e.agent.interface import AgentInterface
+
+
+def _invoke_check_with_retry(
+    agent: AgentInterface, args: list[str], *, retries: int = 3, backoff: float = 0.5
+) -> None:
+    """Invoke ``agent check`` with bounded retry on non-zero exits.
+
+    E2E callers race the Agent's check loader: a config-swap or
+    autodiscovery reload can briefly leave the check unregistered,
+    causing ``agent check`` to exit with "no valid check found".
+    Output streams live (not captured) so we can't filter by stderr;
+    the bound ensures a genuinely broken check still surfaces.
+    """
+    import subprocess
+    import time
+
+    for attempt in range(retries + 1):
+        try:
+            agent.invoke(args)
+            return
+        except subprocess.CalledProcessError:
+            if attempt >= retries:
+                raise
+            click.echo(
+                f'agent check failed (attempt {attempt + 1}/{retries + 1}), '
+                f'retrying in {backoff:.1f}s...',
+                err=True,
+            )
+            time.sleep(backoff)
 
 
 @click.command(
@@ -54,7 +84,10 @@ def agent(app: Application, *, intg_name: str, environment: str, args: tuple[str
 
     if config_file is None or not trigger_run:
         try:
-            agent.invoke(full_args)
+            if trigger_run:
+                _invoke_check_with_retry(agent, full_args)
+            else:
+                agent.invoke(full_args)
         except subprocess.CalledProcessError as e:
             app.abort(code=e.returncode)
 
@@ -67,14 +100,14 @@ def agent(app: Application, *, intg_name: str, environment: str, args: tuple[str
     if not env_data.config_file.is_file():
         try:
             env_data.write_config(config)
-            agent.invoke(full_args)
+            _invoke_check_with_retry(agent, full_args)
         finally:
             env_data.config_file.unlink()
     else:
         temp_config_file = env_data.config_file.parent / f'{env_data.config_file.name}.bak.example'
         env_data.config_file.replace(temp_config_file)
         try:
             env_data.write_config(config)
-            agent.invoke(full_args)
+            _invoke_check_with_retry(agent, full_args)
         finally:
             temp_config_file.replace(env_data.config_file)