Support full country names in /investigate command expansion and map them to ISO codes

Author: reichaves

lib/agent/agent_loop.py

@@ -886,13 +886,16 @@ def _expand_slash_commands(query: str) -> str:
     """Expande comandos como /investigate BRA ou /country:Brazil para prompts estruturados."""
     query_stripped = query.strip()
 
-    # 1. /investigate [ISO3]
+    # 1. /investigate [CountryName or ISO]
     investigate_pattern = (
-        r"^/(?:investigate_country_economy|investigate)\s+([A-Za-z]{2,3})$"
+        r"^/(?:investigate_country_economy|investigate)\s+([A-Za-z\s]+)$"
     )
     inv_match = re.match(investigate_pattern, query_stripped, re.IGNORECASE)
     if inv_match:
-        country_code = inv_match.group(1).upper()
+        raw_country = inv_match.group(1).strip().upper()
+        from ..wb_client.wdi_client import _ISO_NORMALIZATION
+
+        country_code = _ISO_NORMALIZATION.get(raw_country, raw_country)
         try:
             from mcp_src.anchor_mcp.main import investigate_country_economy
 

tests/test_agent_loop.py

@@ -25,6 +25,16 @@ def test_expand_slash_commands():
     assert "country_code='BRA'" in expanded
 
 
+def test_expand_slash_commands_full_name():
+    """Verify that /investigate China is expanded and normalized to CHN."""
+    query = "/investigate China"
+    expanded = _expand_slash_commands(query)
+    assert "CHN" in expanded
+    assert "GDP" in expanded
+    assert "search_documents" in expanded
+    assert "country_code='CHN'" in expanded
+
+
 def test_build_messages_with_context():
     """Verify that document context is correctly injected into the user query."""
     user_query = "What is mentioned in the document?"