Enhance MCP feature tests and streamline Llama Stack storage clearing

- Added checks to ensure the response body does not contain 'mcp-client' in MCP feature tests.
- Simplified the `clear_llama_stack_storage` function to remove the entire `~/.llama` directory instead of specific files, improving clarity and efficiency.
- Updated comments to reflect the changes in storage clearing logic.

Author: jrobertboos

tests/e2e/features/mcp.feature

@@ -218,6 +218,7 @@ Feature: MCP tests
     {"query": "Say hello", "model": "{MODEL}", "provider": "{PROVIDER}"}
     """
     Then The status code of the response is 200
+    And The body of the response does not contain mcp-client
     And The response should contain following fragments
         | Fragments in LLM response |
         | Hello                     |
@@ -233,6 +234,7 @@ Feature: MCP tests
     """
     When I wait for the response to be completed
     Then The status code of the response is 200
+    And The body of the response does not contain mcp-client
     And The streamed response should contain following fragments
         | Fragments in LLM response |
         | Hello                     |

tests/e2e/utils/utils.py

@@ -246,41 +246,31 @@ def remove_config_backup(backup_path: str) -> None:
             print(f"Warning: Could not remove backup file {backup_path}: {e}")
 
 
-# Llama Stack storage paths inside the lightspeed-stack container/pod (library mode).
-# Used when clearing embedded Llama Stack storage before MCP config scenarios.
-_LLAMA_STORAGE_ROOT = "/opt/app-root/src/.llama/storage"
-
-
 def clear_llama_stack_storage(container_name: str = "lightspeed-stack") -> None:
     """Clear Llama Stack storage in library mode (embedded Llama Stack).
 
-    Removes SQLite/KV store databases and file storage contents so that
-    toolgroups and other persisted state are reset. Used before MCP config
-    scenarios when not running in server mode (no separate Llama Stack to
-    unregister toolgroups from). Only runs when using Docker (skipped in Prow).
+    Removes the ~/.llama directory so that toolgroups and other persisted
+    state are reset. Used before MCP config scenarios when not running in
+    server mode (no separate Llama Stack to unregister toolgroups from).
+    Only runs when using Docker (skipped in Prow).
 
     Parameters:
         container_name (str): Docker container name (default "lightspeed-stack").
 
     Returns:
         None
     """
+    if is_prow_environment():
+        return
 
-    storage_root = _LLAMA_STORAGE_ROOT
-    commands = [
-        f"rm -f {storage_root}/rag/kv_store.db",
-        f"rm -f {storage_root}/sql_store.db",
-        f"rm -rf {storage_root}/files/*",
-    ]
     try:
-        for cmd in commands:
-            subprocess.run(
-                ["docker", "exec", container_name, "sh", "-c", cmd],
-                capture_output=True,
-                text=True,
-                timeout=10,
-                check=False,
-            )
+        subprocess.run(
+            ["docker", "exec", container_name, "sh", "-c", "rm -rf ~/.llama"],
+            capture_output=True,
+            text=True,
+            timeout=10,
+            check=False,
+        )
     except subprocess.TimeoutExpired as e:
         print(f"Warning: Could not clear Llama Stack storage: {e}")