praisonai-code 0.0.51__tar.gz → 0.0.52__tar.gz

{praisonai_code-0.0.51 → praisonai_code-0.0.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: praisonai-code
-Version: 0.0.51
+Version: 0.0.52
 Summary: Agentic terminal CLI for PraisonAI — the terminal-native agent (run, chat, code, runtime, cli backends) extracted from the praisonai wrapper.
 Author: Mervin Praison
 License: MIT

{praisonai_code-0.0.51 → praisonai_code-0.0.52}/praisonai_code/__init__.py

@@ -12,6 +12,6 @@ the remaining terminal-agent modules, with PEP 562 shims left behind at the
 old ``praisonai.*`` paths for backward compatibility.
 """
 
-__version__ = "0.0.51"
+__version__ = "0.0.52"
 
 __all__ = ["__version__"]

{praisonai_code-0.0.51 → praisonai_code-0.0.52}/praisonai_code/cli/interactive/events.py

@@ -114,6 +114,70 @@ class ApprovalRequest:
         return fnmatch.fnmatch(str(path), path_pattern)
 
 
+def derive_permission_pattern(request: "ApprovalRequest", scope: str = "command") -> str:
+    """Derive the persisted permission pattern for an approval request.
+
+    Mirrors the console backend's ``_create_pattern`` so interactive frontends
+    and the non-interactive console backend scope grants identically.
+
+    Args:
+        request: The approval request being persisted.
+        scope: ``"command"`` (default) derives the *narrowest reasonable*
+            pattern so approving a single command does not silently grant
+            unrestricted use of a tool. ``"tool"`` is the explicit, clearly
+            labelled "allow all uses of this tool" choice that emits the
+            blanket ``action_type:*`` pattern.
+
+    Returns:
+        A permission glob pattern. For ``scope="command"`` the result is
+        **never** the blanket ``action_type:*``: shell commands are generalised
+        to a reusable command-prefix (e.g. ``shell_command:git status *``) via
+        the shared core helper, and other tools scope to the concrete
+        path/argument, falling back to a literal (single-use) target so the
+        rule can only match the exact invocation the user approved.
+    """
+    action_type = request.action_type
+
+    # Explicit, clearly-labelled "always allow all uses of this tool" only.
+    if scope == "tool":
+        return f"{action_type}:*"
+
+    params = request.parameters or {}
+
+    # Shell tools: generalise to a reusable command-prefix via the shared core
+    # helper so interactive and declarative rules scope identically. Unknown or
+    # compound commands stay literal (fail-closed).
+    command = params.get("command")
+    if isinstance(command, str) and command.strip():
+        try:
+            from praisonaiagents.permissions import derive_pattern
+
+            # derive_pattern only generalises bash:/shell: targets, so map the
+            # action type onto a shell prefix for derivation, then restore it.
+            derived = derive_pattern(f"shell:{command}")
+            suffix = derived[len("shell:"):]
+            return f"{action_type}:{suffix}"
+        except ImportError:
+            pass
+        except Exception:  # pragma: no cover - fail-closed on unexpected errors
+            import logging as _logging
+            _logging.getLogger(__name__).debug(
+                "derive_pattern failed for %r; falling back to literal command",
+                command,
+                exc_info=True,
+            )
+        return f"{action_type}:{command}"
+
+    # Non-shell tools: scope to the concrete path/target when available so the
+    # persisted rule matches only that resource, never the whole tool.
+    path = params.get("path")
+    if isinstance(path, str) and path:
+        return f"{action_type}:{path}"
+
+    # No usable target: match only the bare invocation, never the wildcard.
+    return f"{action_type}:"
+
+
 @dataclass
 class ApprovalResponse:
     """Response to an approval request."""

{praisonai_code-0.0.51 → praisonai_code-0.0.52}/praisonai_code/cli/interactive/frontends/rich_frontend.py

@@ -17,6 +17,7 @@ from ..events import (
     ApprovalRequest,
     ApprovalResponse,
     ApprovalDecision,
+    derive_permission_pattern,
 )
 
 logger = logging.getLogger(__name__)
@@ -163,6 +164,10 @@ class RichFrontend:
     
     def _prompt_approval(self, request: ApprovalRequest) -> ApprovalResponse:
         """Prompt user for approval decision."""
+        # Derive the narrowest reasonable pattern so "always allow" defaults to
+        # a command-scoped grant, not a blanket ``action_type:*`` whitelist.
+        narrow_pattern = derive_permission_pattern(request, scope="command")
+        blanket_pattern = derive_permission_pattern(request, scope="tool")
         try:
             from rich.console import Console
             from rich.panel import Panel
@@ -177,23 +182,25 @@ class RichFrontend:
             ))
             
             console.print("[1] Allow once")
-            console.print("[2] Always allow this pattern")
-            console.print("[3] Always allow for this session")
-            console.print("[4] Reject")
+            console.print(f"[2] Always allow this command ({narrow_pattern})")
+            console.print(f"[3] Always allow this command for this session ({narrow_pattern})")
+            console.print(f"[4] Always allow ALL uses of {request.tool_name} ({blanket_pattern})")
+            console.print("[5] Reject")
             
         except ImportError:
-            print(f"\n=== Approval Required ===")
+            print("\n=== Approval Required ===")
             print(f"Description: {request.description}")
             print(f"Tool: {request.tool_name}")
             print(f"Action: {request.action_type}")
             print("[1] Allow once")
-            print("[2] Always allow this pattern")
-            print("[3] Always allow for this session")
-            print("[4] Reject")
+            print(f"[2] Always allow this command ({narrow_pattern})")
+            print(f"[3] Always allow this command for this session ({narrow_pattern})")
+            print(f"[4] Always allow ALL uses of {request.tool_name} ({blanket_pattern})")
+            print("[5] Reject")
         
         while True:
             try:
-                choice = input("\nChoice [1-4]: ").strip()
+                choice = input("\nChoice [1-5]: ").strip()
                 
                 if choice == "1":
                     return ApprovalResponse(
@@ -201,26 +208,30 @@ class RichFrontend:
                         decision=ApprovalDecision.ONCE
                     )
                 elif choice == "2":
-                    pattern = f"{request.action_type}:*"
                     return ApprovalResponse(
                         request_id=request.request_id,
                         decision=ApprovalDecision.ALWAYS,
-                        remember_pattern=pattern
+                        remember_pattern=narrow_pattern
                     )
                 elif choice == "3":
-                    pattern = f"{request.action_type}:*"
                     return ApprovalResponse(
                         request_id=request.request_id,
                         decision=ApprovalDecision.ALWAYS_SESSION,
-                        remember_pattern=pattern
+                        remember_pattern=narrow_pattern
                     )
                 elif choice == "4":
+                    return ApprovalResponse(
+                        request_id=request.request_id,
+                        decision=ApprovalDecision.ALWAYS,
+                        remember_pattern=blanket_pattern
+                    )
+                elif choice == "5":
                     return ApprovalResponse(
                         request_id=request.request_id,
                         decision=ApprovalDecision.REJECT
                     )
                 else:
-                    print("Invalid choice. Please enter 1-4.")
+                    print("Invalid choice. Please enter 1-5.")
             except (EOFError, KeyboardInterrupt):
                 return ApprovalResponse(
                     request_id=request.request_id,

{praisonai_code-0.0.51 → praisonai_code-0.0.52}/praisonai_code/cli/interactive/frontends/textual_frontend.py

@@ -15,6 +15,7 @@ from ..events import (
     ApprovalRequest,
     ApprovalResponse,
     ApprovalDecision,
+    derive_permission_pattern,
 )
 
 logger = logging.getLogger(__name__)
@@ -87,8 +88,9 @@ class ApprovalDialog:
     
     This provides the same approval options as the Rich frontend:
     - Allow once
-    - Always allow this pattern
-    - Always allow for this session
+    - Always allow this command (narrow, command-scoped pattern)
+    - Always allow this command for this session
+    - Always allow ALL uses of the tool (explicit blanket pattern)
     - Reject
     """
     
@@ -100,6 +102,10 @@ class ApprovalDialog:
         """
         self.request = request
         self.response: Optional[ApprovalResponse] = None
+        # Derive both patterns once so the label shown and the pattern stored
+        # for a given decision are guaranteed identical.
+        self._narrow_pattern = derive_permission_pattern(request, scope="command")
+        self._blanket_pattern = derive_permission_pattern(request, scope="tool")
     
     def compose(self):
         """Compose the dialog widgets (for Textual)."""
@@ -107,15 +113,19 @@ class ApprovalDialog:
             from textual.containers import Vertical, Horizontal
             from textual.widgets import Static, Button
             
+            narrow_pattern = self._narrow_pattern
+            blanket_pattern = self._blanket_pattern
+
             yield Vertical(
-                Static(f"[bold]Approval Required[/bold]", id="title"),
+                Static("[bold]Approval Required[/bold]", id="title"),
                 Static(f"\n{self.request.description}\n"),
                 Static(f"Tool: {self.request.tool_name}"),
                 Static(f"Action: {self.request.action_type}\n"),
                 Horizontal(
                     Button("Allow Once", id="once", variant="primary"),
-                    Button("Always Allow", id="always", variant="success"),
-                    Button("Session Only", id="session", variant="default"),
+                    Button(f"Always Allow This Command ({narrow_pattern})", id="always", variant="success"),
+                    Button(f"Session Only ({narrow_pattern})", id="session", variant="default"),
+                    Button(f"Always Allow All ({blanket_pattern})", id="always_tool", variant="warning"),
                     Button("Reject", id="reject", variant="error"),
                     id="buttons"
                 ),
@@ -133,8 +143,11 @@ class ApprovalDialog:
         Returns:
             ApprovalResponse based on the button pressed.
         """
-        pattern = f"{self.request.action_type}:*"
-        
+        # "Always allow" defaults to the narrowest reasonable command-scoped
+        # pattern; the blanket ``action_type:*`` grant is a separate, explicit
+        # choice so a single benign approval never whitelists an entire tool.
+        narrow_pattern = self._narrow_pattern
+
         if button_id == "once":
             return ApprovalResponse(
                 request_id=self.request.request_id,
@@ -144,13 +157,19 @@ class ApprovalDialog:
             return ApprovalResponse(
                 request_id=self.request.request_id,
                 decision=ApprovalDecision.ALWAYS,
-                remember_pattern=pattern
+                remember_pattern=narrow_pattern
             )
         elif button_id == "session":
             return ApprovalResponse(
                 request_id=self.request.request_id,
                 decision=ApprovalDecision.ALWAYS_SESSION,
-                remember_pattern=pattern
+                remember_pattern=narrow_pattern
+            )
+        elif button_id == "always_tool":
+            return ApprovalResponse(
+                request_id=self.request.request_id,
+                decision=ApprovalDecision.ALWAYS,
+                remember_pattern=self._blanket_pattern
             )
         else:  # reject
             return ApprovalResponse(

{praisonai_code-0.0.51 → praisonai_code-0.0.52}/praisonai_code.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: praisonai-code
-Version: 0.0.51
+Version: 0.0.52
 Summary: Agentic terminal CLI for PraisonAI — the terminal-native agent (run, chat, code, runtime, cli backends) extracted from the praisonai wrapper.
 Author: Mervin Praison
 License: MIT

{praisonai_code-0.0.51 → praisonai_code-0.0.52}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "praisonai-code"
-version = "0.0.51"
+version = "0.0.52"
 description = "Agentic terminal CLI for PraisonAI — the terminal-native agent (run, chat, code, runtime, cli backends) extracted from the praisonai wrapper."
 readme = "README.md"
 license = {text = "MIT"}