fix(core): support factory-cli user agent in path fix handlers

- Update path fix logic to recognize 'factory' keyword in User-Agent
- Fix issue where Droid (factory-cli) relative paths were not being normalized
- Ensure consistent handling for both 'droid' and 'factory' agents
- Add regression tests for production factory-cli User-Agent strings

Author: Mateusz

src/core/services/tool_call_handlers/droid_antigravity_path_fix_handler.py

@@ -58,7 +58,9 @@ async def can_handle(self, context: ToolCallContext) -> bool:
 
         Returns True only if:
         1. Handler is enabled
-        2. Agent contains "droid" (case-insensitive)
+        2. Agent contains "droid" or "factory" (case-insensitive)
+           - "droid" is the agent name
+           - "factory" is the company that builds Droid (factory-cli user agent)
         3. Tool arguments contain a path that needs fixing
 
         Args:
@@ -71,11 +73,13 @@ async def can_handle(self, context: ToolCallContext) -> bool:
             return False
 
         # Check agent name (from calling_agent or context)
+        # Droid sends User-Agent: factory-cli/X.Y.Z so we also check for "factory"
         agent_name = context.calling_agent or ""
-        if "droid" not in agent_name.lower():
+        agent_lower = agent_name.lower()
+        if "droid" not in agent_lower and "factory" not in agent_lower:
             if logger.isEnabledFor(logging.DEBUG):
                 logger.debug(
-                    "DroidAntigravityPathFix: agent '%s' doesn't contain 'droid'",
+                    "DroidAntigravityPathFix: agent '%s' doesn't contain 'droid' or 'factory'",
                     agent_name,
                 )
             return False

src/core/services/tool_call_reactor_middleware.py

@@ -761,14 +761,16 @@ def _maybe_fix_droid_antigravity_path(
         isn't registered, we still want to avoid the "absolute path required" errors
         by normalizing obvious relative paths emitted by the backend.
 
-        This fix applies to any backend when the calling agent is "droid".
+        This fix applies to any backend when the calling agent is "droid" or "factory"
+        (Droid sends User-Agent: factory-cli/X.Y.Z).
 
         Returns:
             Tuple of (possibly modified arguments, was_modified flag).
         """
-        # Check agent name - must contain "droid" to activate
+        # Check agent name - must contain "droid" or "factory" to activate
+        # Droid is built by Factory and uses "factory-cli" as user agent
         agent = (calling_agent or "").lower()
-        if "droid" not in agent:
+        if "droid" not in agent and "factory" not in agent:
             return tool_arguments, False
 
         def _extract_path(args: Any) -> tuple[Any, str | None, str | None]:
@@ -1525,14 +1527,16 @@ def _maybe_fix_droid_antigravity_path(
         isn't registered, we still want to avoid the "absolute path required" errors
         by normalizing obvious relative paths emitted by the backend.
 
-        This fix applies to any backend when the calling agent is "droid".
+        This fix applies to any backend when the calling agent is "droid" or "factory"
+        (Droid sends User-Agent: factory-cli/X.Y.Z).
 
         Returns:
             Tuple of (possibly modified arguments, was_modified flag).
         """
-        # Check agent name - must contain "droid" to activate
+        # Check agent name - must contain "droid" or "factory" to activate
+        # Droid is built by Factory and uses "factory-cli" as user agent
         agent = (calling_agent or "").lower()
-        if "droid" not in agent:
+        if "droid" not in agent and "factory" not in agent:
             return tool_arguments, False
 
         def _extract_path(args: Any) -> tuple[Any, str | None, str | None]:

tests/unit/core/services/test_tool_call_reactor_middleware.py

@@ -621,6 +621,50 @@ def test_maybe_fix_droid_antigravity_path_not_modified_for_non_droid_agent() ->
     assert modified is False
 
 
+def test_maybe_fix_droid_antigravity_path_handles_factory_cli_agent() -> None:
+    """factory-cli user agent (Droid's actual User-Agent) should have paths fixed.
+
+    Droid agent sends User-Agent: factory-cli/X.Y.Z, so the fix should trigger
+    for both 'droid' and 'factory' in the agent name.
+
+    This test verifies the fix for the production bug where Droid sent relative
+    paths with User-Agent: factory-cli/0.35.0, but the proxy didn't fix them.
+    """
+    args: dict[str, str] = {
+        "file_path": "tests/unit/services/test_steering_leak_protection.py"
+    }
+    fixed, modified = ToolCallReactorFeature._maybe_fix_droid_antigravity_path(
+        args, "gemini-oauth-antigravity", "factory-cli/0.35.0"
+    )
+    assert isinstance(fixed, dict)
+    assert (
+        fixed.get("file_path")
+        == "/tests/unit/services/test_steering_leak_protection.py"
+    )
+    assert modified is True
+
+
+def test_maybe_fix_droid_antigravity_path_handles_factory_variations() -> None:
+    """Various factory-related agent names should trigger the path fix."""
+    factory_agents = [
+        "factory-cli/0.35.0",
+        "factory-cli/1.0.0",
+        "Factory",
+        "FACTORY",
+        "MyFactoryAgent",
+    ]
+    for agent_name in factory_agents:
+        args: dict[str, str] = {"file_path": "src/test.py"}
+        fixed, modified = ToolCallReactorFeature._maybe_fix_droid_antigravity_path(
+            args, "gemini-oauth-antigravity", agent_name
+        )
+        assert isinstance(fixed, dict), f"Should return dict for agent: {agent_name}"
+        assert (
+            fixed.get("file_path") == "/src/test.py"
+        ), f"Should fix path for agent: {agent_name}"
+        assert modified is True, f"Should mark as modified for agent: {agent_name}"
+
+
 class TestVTCToolCallBypass:
     """Tests for VTC (Virtual Tool Calling) tool call bypass in ToolCallReactorFeature."""
 

tests/unit/core/services/tool_call_handlers/test_droid_antigravity_path_fix_handler.py

@@ -85,6 +85,32 @@ async def test_can_handle_case_insensitive_agent_match(
             result = await enabled_handler.can_handle(context)
             assert result is True, f"Should match agent name: {agent_name}"
 
+    @pytest.mark.asyncio
+    async def test_can_handle_factory_cli_user_agent(
+        self, enabled_handler: DroidAntigravityPathFixHandler
+    ) -> None:
+        """Handler should match factory-cli user agent (Droid's actual User-Agent).
+
+        Droid agent sends User-Agent: factory-cli/X.Y.Z, so we need to detect
+        both 'droid' and 'factory' in the agent name.
+        """
+        factory_agents = [
+            "factory-cli/0.35.0",
+            "factory-cli/1.0.0",
+            "Factory",
+            "FACTORY",
+            "MyFactoryAgent",
+        ]
+        for agent_name in factory_agents:
+            context = self._create_context(
+                calling_agent=agent_name,
+                tool_arguments={"file_path": "src/file.py"},
+            )
+            result = await enabled_handler.can_handle(context)
+            assert (
+                result is True
+            ), f"Should match factory-based agent name: {agent_name}"
+
     @pytest.mark.asyncio
     async def test_can_handle_non_matching_agent(
         self, enabled_handler: DroidAntigravityPathFixHandler
@@ -182,6 +208,42 @@ async def test_handle_real_scenario_from_cbor(
         assert result.should_swallow is False
         assert context.tool_arguments["file_path"] == r"\src\core\config\app_config.py"
 
+    @pytest.mark.asyncio
+    async def test_handle_factory_cli_scenario_from_production(
+        self, enabled_handler: DroidAntigravityPathFixHandler
+    ) -> None:
+        """Test the exact scenario that failed in production with factory-cli User-Agent.
+
+        From production logs:
+        - User-Agent: factory-cli/0.35.0
+        - Path: tests/unit/services/test_steering_leak_protection.py (relative)
+        - Expected: Should be fixed to \\tests\\unit\\services\\test_steering_leak_protection.py
+
+        This test verifies the fix for the bug where Droid's actual User-Agent
+        (factory-cli/X.Y.Z) wasn't being recognized.
+        """
+        context = self._create_context(
+            calling_agent="factory-cli/0.35.0",  # Actual User-Agent from production
+            backend_name="gemini-oauth-antigravity",
+            model_name="gemini-3-pro-high",
+            tool_name="Read",
+            tool_arguments={
+                "file_path": "tests/unit/services/test_steering_leak_protection.py"
+            },
+        )
+
+        # Verify can_handle returns True for factory-cli
+        can_handle = await enabled_handler.can_handle(context)
+        assert can_handle is True, "Handler should match factory-cli/0.35.0 agent"
+
+        # Verify handle fixes the path
+        result = await enabled_handler.handle(context)
+        assert result.should_swallow is False
+        assert (
+            context.tool_arguments["file_path"]
+            == r"\tests\unit\services\test_steering_leak_protection.py"
+        )
+
     # ==================== Internal method tests ====================
 
     def test_needs_path_fix_relative_path(