v2.6.0 (#524)

Co-authored-by: Clément Drouin <clement.drouin@mistral.ai>
Co-authored-by: Clément Sirieix <clement.sirieix@mistral.ai>
Co-authored-by: Gauthier Guinet <43207538+Gguinet@users.noreply.github.com>
Co-authored-by: Kim-Adeline Miguel <kimadeline.miguel@mistral.ai>
Co-authored-by: Michel Thomazo <51709227+michelTho@users.noreply.github.com>
Co-authored-by: Quentin <torroba.q@gmail.com>
Co-authored-by: Simon <80467011+sorgfresser@users.noreply.github.com>
Co-authored-by: Simon Van de Kerckhove <simon.vandekerckhove@mistral.ai>
Co-authored-by: Vincent G <10739306+VinceOPS@users.noreply.github.com>
Co-authored-by: angelapopopo <angele.lenglemetz@mistral.ai>
Co-authored-by: Mistral Vibe <vibe@mistral.ai>

tests/tools/test_bash.py

@@ -5,6 +5,7 @@ import pytest
 from tests.mock.utils import collect_result
 from vibe.core.tools.base import BaseToolState, ToolError, ToolPermission
 from vibe.core.tools.builtins.bash import Bash, BashArgs, BashToolConfig
+from vibe.core.tools.permissions import PermissionContext
 
 
 @pytest.fixture
@@ -80,7 +81,10 @@ def test_find_not_in_default_allowlist():
     bash_tool = Bash(config=BashToolConfig(), state=BaseToolState())
     # find -exec runs arbitrary commands; must not be allowlisted by default
     permission = bash_tool.resolve_permission(BashArgs(command="find . -exec id \\;"))
-    assert permission is not ToolPermission.ALWAYS
+    assert (
+        not isinstance(permission, PermissionContext)
+        or permission.permission is not ToolPermission.ALWAYS
+    )
 
 
 def test_resolve_permission():
@@ -92,9 +96,13 @@ def test_resolve_permission():
     mixed = bash_tool.resolve_permission(BashArgs(command="pwd && whoami"))
     empty = bash_tool.resolve_permission(BashArgs(command=""))
 
-    assert allowlisted is ToolPermission.ALWAYS
-    assert denylisted is ToolPermission.NEVER
-    assert mixed is None
+    assert isinstance(allowlisted, PermissionContext)
+    assert allowlisted.permission is ToolPermission.ALWAYS
+    assert isinstance(denylisted, PermissionContext)
+    assert denylisted.permission is ToolPermission.NEVER
+    assert isinstance(mixed, PermissionContext)
+    assert mixed.permission is ToolPermission.ASK
+    assert any(rp.label == "whoami *" for rp in mixed.required_permissions)
     assert empty is None
 
 
@@ -108,80 +116,95 @@ class TestResolvePermissionWindowsSyntax:
     def test_dir_with_windows_flags_allowlisted(self):
         bash_tool = self._make_bash(allowlist=["dir"])
         result = bash_tool.resolve_permission(BashArgs(command="dir /s /b"))
-        assert result is ToolPermission.ALWAYS
+        assert isinstance(result, PermissionContext)
+        assert result.permission is ToolPermission.ALWAYS
 
     def test_type_command_allowlisted(self):
         bash_tool = self._make_bash(allowlist=["type"])
         result = bash_tool.resolve_permission(BashArgs(command="type file.txt"))
-        assert result is ToolPermission.ALWAYS
+        assert isinstance(result, PermissionContext)
+        assert result.permission is ToolPermission.ALWAYS
 
     def test_findstr_allowlisted(self):
         bash_tool = self._make_bash(allowlist=["findstr"])
         result = bash_tool.resolve_permission(
             BashArgs(command="findstr /s pattern *.txt")
         )
-        assert result is ToolPermission.ALWAYS
+        assert isinstance(result, PermissionContext)
+        assert result.permission is ToolPermission.ALWAYS
 
     def test_ver_allowlisted(self):
         bash_tool = self._make_bash(allowlist=["ver"])
         result = bash_tool.resolve_permission(BashArgs(command="ver"))
-        assert result is ToolPermission.ALWAYS
+        assert isinstance(result, PermissionContext)
+        assert result.permission is ToolPermission.ALWAYS
 
     def test_where_allowlisted(self):
         bash_tool = self._make_bash(allowlist=["where"])
         result = bash_tool.resolve_permission(BashArgs(command="where python"))
-        assert result is ToolPermission.ALWAYS
+        assert isinstance(result, PermissionContext)
+        assert result.permission is ToolPermission.ALWAYS
 
     def test_cmd_k_denylisted(self):
         bash_tool = self._make_bash(denylist=["cmd /k"])
         result = bash_tool.resolve_permission(BashArgs(command="cmd /k something"))
-        assert result is ToolPermission.NEVER
+        assert isinstance(result, PermissionContext)
+        assert result.permission is ToolPermission.NEVER
 
     def test_powershell_noexit_denylisted(self):
         bash_tool = self._make_bash(denylist=["powershell -NoExit"])
         result = bash_tool.resolve_permission(BashArgs(command="powershell -NoExit"))
-        assert result is ToolPermission.NEVER
+        assert isinstance(result, PermissionContext)
+        assert result.permission is ToolPermission.NEVER
 
     def test_notepad_denylisted(self):
         bash_tool = self._make_bash(denylist=["notepad"])
         result = bash_tool.resolve_permission(BashArgs(command="notepad file.txt"))
-        assert result is ToolPermission.NEVER
+        assert isinstance(result, PermissionContext)
+        assert result.permission is ToolPermission.NEVER
 
     def test_cmd_standalone_denylisted(self):
         bash_tool = self._make_bash(denylist_standalone=["cmd"])
         result = bash_tool.resolve_permission(BashArgs(command="cmd"))
-        assert result is ToolPermission.NEVER
+        assert isinstance(result, PermissionContext)
+        assert result.permission is ToolPermission.NEVER
 
     def test_powershell_standalone_denylisted(self):
         bash_tool = self._make_bash(denylist_standalone=["powershell"])
         result = bash_tool.resolve_permission(BashArgs(command="powershell"))
-        assert result is ToolPermission.NEVER
+        assert isinstance(result, PermissionContext)
+        assert result.permission is ToolPermission.NEVER
 
     def test_powershell_cmdlet_asks(self):
         bash_tool = self._make_bash(allowlist=["dir", "echo"])
         result = bash_tool.resolve_permission(BashArgs(command="Get-ChildItem -Path ."))
-        assert result is None
+        assert isinstance(result, PermissionContext)
+        assert result.permission == ToolPermission.ASK
 
     def test_mixed_allowed_and_unknown_asks(self):
         bash_tool = self._make_bash(allowlist=["git status"])
         result = bash_tool.resolve_permission(
             BashArgs(command="git status && npm install")
         )
-        assert result is None
+        assert isinstance(result, PermissionContext)
+        assert result.permission == ToolPermission.ASK
 
     def test_chained_windows_commands_all_allowed(self):
         bash_tool = self._make_bash(allowlist=["dir", "echo"])
         result = bash_tool.resolve_permission(BashArgs(command="dir /s && echo done"))
-        assert result is ToolPermission.ALWAYS
+        assert isinstance(result, PermissionContext)
+        assert result.permission is ToolPermission.ALWAYS
 
     def test_chained_commands_one_denied(self):
         bash_tool = self._make_bash(allowlist=["dir"], denylist=["rm"])
         result = bash_tool.resolve_permission(BashArgs(command="dir /s && rm -rf /"))
-        assert result is ToolPermission.NEVER
+        assert isinstance(result, PermissionContext)
+        assert result.permission is ToolPermission.NEVER
 
     def test_piped_windows_commands(self):
         bash_tool = self._make_bash(allowlist=["findstr", "type"])
         result = bash_tool.resolve_permission(
             BashArgs(command="type file.txt | findstr pattern")
         )
-        assert result is ToolPermission.ALWAYS
+        assert isinstance(result, PermissionContext)
+        assert result.permission is ToolPermission.ALWAYS