tunacode-cli 0.0.12__py3-none-any.whl → 0.0.13__py3-none-any.whl

tunacode/constants.py

@@ -7,7 +7,7 @@ Centralizes all magic strings, UI text, error messages, and application constant
 
 # Application info
 APP_NAME = "TunaCode"
-APP_VERSION = "0.0.12"
+APP_VERSION = "0.0.13"
 
 # File patterns
 GUIDE_FILE_PATTERN = "{name}.md"

tunacode/core/agents/main.py

@@ -12,6 +12,7 @@ from pydantic_ai.messages import ModelRequest, ToolReturnPart
 
 from tunacode.core.state import StateManager
 from tunacode.services.mcp import get_mcp_servers
+from tunacode.tools.bash import bash
 from tunacode.tools.read_file import read_file
 from tunacode.tools.run_command import run_command
 from tunacode.tools.update_file import update_file
@@ -37,6 +38,7 @@ def get_or_create_agent(model: ModelName, state_manager: StateManager) -> Pydant
         state_manager.session.agents[model] = Agent(
             model=model,
             tools=[
+                Tool(bash, max_retries=max_retries),
                 Tool(read_file, max_retries=max_retries),
                 Tool(run_command, max_retries=max_retries),
                 Tool(update_file, max_retries=max_retries),

tunacode/tools/__init__.py

@@ -0,0 +1 @@
+"""TunaCode tools package."""

tunacode/tools/bash.py

@@ -0,0 +1,252 @@
+"""
+Module: tunacode.tools.bash
+
+Enhanced bash execution tool for agent operations in the TunaCode application.
+Provides advanced shell command execution with working directory support,
+environment variables, timeouts, and improved output handling.
+"""
+
+import asyncio
+import os
+import subprocess
+from typing import Dict, Optional
+
+from pydantic_ai.exceptions import ModelRetry
+
+from tunacode.constants import MAX_COMMAND_OUTPUT
+from tunacode.exceptions import ToolExecutionError
+from tunacode.tools.base import BaseTool
+from tunacode.types import ToolResult
+
+
+class BashTool(BaseTool):
+    """Enhanced shell command execution tool with advanced features."""
+
+    @property
+    def tool_name(self) -> str:
+        return "Bash"
+
+    async def _execute(
+        self,
+        command: str,
+        cwd: Optional[str] = None,
+        env: Optional[Dict[str, str]] = None,
+        timeout: Optional[int] = 30,
+        capture_output: bool = True,
+    ) -> ToolResult:
+        """Execute a bash command with enhanced features.
+
+        Args:
+            command: The bash command to execute
+            cwd: Working directory for the command (defaults to current)
+            env: Additional environment variables to set
+            timeout: Command timeout in seconds (default 30, max 300)
+            capture_output: Whether to capture stdout/stderr (default True)
+
+        Returns:
+            ToolResult: Formatted output with exit code, stdout, and stderr
+
+        Raises:
+            ModelRetry: For guidance on command failures
+            Exception: Any command execution errors
+        """
+        # Validate and sanitize inputs
+        if timeout and (timeout < 1 or timeout > 300):
+            raise ModelRetry(
+                "Timeout must be between 1 and 300 seconds. "
+                "Use shorter timeouts for quick commands, longer for builds/tests."
+            )
+
+        # Validate working directory if specified
+        if cwd and not os.path.isdir(cwd):
+            raise ModelRetry(
+                f"Working directory '{cwd}' does not exist. "
+                "Please verify the path or create the directory first."
+            )
+
+        # Check for potentially destructive commands
+        destructive_patterns = ["rm -rf", "rm -r", "rm /", "dd if=", "mkfs", "fdisk"]
+        if any(pattern in command for pattern in destructive_patterns):
+            raise ModelRetry(
+                f"Command contains potentially destructive operations: {command}\n"
+                "Please confirm this is intentional and safe for your system."
+            )
+
+        # Prepare environment
+        exec_env = os.environ.copy()
+        if env:
+            # Sanitize environment variables
+            for key, value in env.items():
+                if isinstance(key, str) and isinstance(value, str):
+                    exec_env[key] = value
+
+        # Set working directory
+        exec_cwd = cwd or os.getcwd()
+
+        try:
+            # Execute command with timeout
+            process = await asyncio.create_subprocess_shell(
+                command,
+                stdout=subprocess.PIPE if capture_output else None,
+                stderr=subprocess.PIPE if capture_output else None,
+                cwd=exec_cwd,
+                env=exec_env,
+            )
+
+            try:
+                stdout, stderr = await asyncio.wait_for(
+                    process.communicate(), timeout=timeout
+                )
+            except asyncio.TimeoutError:
+                # Kill the process if it times out
+                process.kill()
+                await process.wait()
+                raise ModelRetry(
+                    f"Command timed out after {timeout} seconds: {command}\n"
+                    "Consider using a longer timeout or breaking the command into smaller parts."
+                )
+
+            # Decode output
+            stdout_text = stdout.decode("utf-8", errors="replace").strip() if stdout else ""
+            stderr_text = stderr.decode("utf-8", errors="replace").strip() if stderr else ""
+
+            # Format output
+            result = self._format_output(
+                command=command,
+                exit_code=process.returncode,
+                stdout=stdout_text,
+                stderr=stderr_text,
+                cwd=exec_cwd,
+            )
+
+            # Handle non-zero exit codes as guidance, not failures
+            if process.returncode != 0 and stderr_text:
+                # Provide guidance for common error patterns
+                if "command not found" in stderr_text.lower():
+                    raise ModelRetry(
+                        f"Command '{command}' not found. "
+                        "Check if the command is installed or use the full path."
+                    )
+                elif "permission denied" in stderr_text.lower():
+                    raise ModelRetry(
+                        f"Permission denied for command '{command}'. "
+                        "You may need elevated privileges or different file permissions."
+                    )
+                elif "no such file or directory" in stderr_text.lower():
+                    raise ModelRetry(
+                        f"File or directory not found when running '{command}'. "
+                        "Verify the path exists or create it first."
+                    )
+
+            return result
+
+        except FileNotFoundError:
+            raise ModelRetry(
+                f"Shell not found. Cannot execute command: {command}\n"
+                "This typically indicates a system configuration issue."
+            )
+
+    def _format_output(
+        self,
+        command: str,
+        exit_code: int,
+        stdout: str,
+        stderr: str,
+        cwd: str,
+    ) -> str:
+        """Format command output in a consistent way.
+
+        Args:
+            command: The executed command
+            exit_code: The process exit code
+            stdout: Standard output content
+            stderr: Standard error content
+            cwd: Working directory where command was executed
+
+        Returns:
+            str: Formatted output string
+        """
+        # Build the result
+        lines = [
+            f"Command: {command}",
+            f"Exit Code: {exit_code}",
+            f"Working Directory: {cwd}",
+            "",
+        ]
+
+        # Add stdout if present
+        if stdout:
+            lines.extend(["STDOUT:", stdout, ""])
+        else:
+            lines.extend(["STDOUT:", "(no output)", ""])
+
+        # Add stderr if present
+        if stderr:
+            lines.extend(["STDERR:", stderr])
+        else:
+            lines.extend(["STDERR:", "(no errors)"])
+
+        result = "\n".join(lines)
+
+        # Truncate if too long
+        if len(result) > MAX_COMMAND_OUTPUT:
+            truncate_point = MAX_COMMAND_OUTPUT - 100  # Leave room for truncation message
+            result = result[:truncate_point] + "\n\n[... output truncated ...]"
+
+        return result
+
+    def _format_args(
+        self,
+        command: str,
+        cwd: Optional[str] = None,
+        env: Optional[Dict[str, str]] = None,
+        timeout: Optional[int] = None,
+        **kwargs,
+    ) -> str:
+        """Format arguments for display in UI logging."""
+        args = [repr(command)]
+
+        if cwd:
+            args.append(f"cwd={repr(cwd)}")
+        if timeout:
+            args.append(f"timeout={timeout}")
+        if env:
+            env_summary = f"{len(env)} vars" if len(env) > 3 else str(env)
+            args.append(f"env={env_summary}")
+
+        return ", ".join(args)
+
+    def _get_error_context(self, command: str = None, **kwargs) -> str:
+        """Get error context for bash execution."""
+        if command:
+            return f"executing bash command '{command}'"
+        return super()._get_error_context()
+
+
+# Create the function that maintains the existing interface
+async def bash(
+    command: str,
+    cwd: Optional[str] = None,
+    env: Optional[Dict[str, str]] = None,
+    timeout: Optional[int] = 30,
+    capture_output: bool = True,
+) -> ToolResult:
+    """
+    Execute a bash command with enhanced features.
+
+    Args:
+        command (str): The bash command to execute
+        cwd (Optional[str]): Working directory for the command
+        env (Optional[Dict[str, str]]): Additional environment variables
+        timeout (Optional[int]): Command timeout in seconds (default 30, max 300)
+        capture_output (bool): Whether to capture stdout/stderr
+
+    Returns:
+        ToolResult: Formatted output with exit code, stdout, and stderr
+    """
+    tool = BashTool()
+    try:
+        return await tool.execute(command, cwd=cwd, env=env, timeout=timeout, capture_output=capture_output)
+    except ToolExecutionError as e:
+        # Return error message for pydantic-ai compatibility
+        return str(e)

{tunacode_cli-0.0.12.dist-info → tunacode_cli-0.0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tunacode-cli
-Version: 0.0.12
+Version: 0.0.13
 Summary: Your agentic CLI developer.
 Author-email: larock22 <noreply@github.com>
 License-Expression: MIT

{tunacode_cli-0.0.12.dist-info → tunacode_cli-0.0.13.dist-info}/RECORD

@@ -1,5 +1,5 @@
 tunacode/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tunacode/constants.py,sha256=RPAd2a-jP0RifT8Rfj1EVfoG8i7U5viyk99HKLwPy5U,3807
+tunacode/constants.py,sha256=gBGd50EIBnIUeflCZXGpyWYXjEOgymDTmVwETS1fDFE,3807
 tunacode/context.py,sha256=0ttsxxLAyD4pSoxw7S-pyzor0JUkhOFZh96aAf4Kqsg,2634
 tunacode/exceptions.py,sha256=RFUH8wOsWEvSPGIYM2exr4t47YkEyZt4Fr-DfTo6_JY,2647
 tunacode/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -19,7 +19,7 @@ tunacode/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tunacode/core/state.py,sha256=sf3xvc9NBnz98tkHiSi-mi1GgxuN-r5kERwjmuIKjq8,1344
 tunacode/core/tool_handler.py,sha256=OKx7jM8pml6pSEnoARu33_uBY8awJBqvhbVeBn6T4ow,1804
 tunacode/core/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tunacode/core/agents/main.py,sha256=o6EJUWBbOMqg9Y9UVgn_3l2ZK8iJveK5UpAmWQQYz0E,4661
+tunacode/core/agents/main.py,sha256=DVwm0T3NbmY1NmA41EWHiLry_OE_f-CUoV6tyn3Y9bo,4751
 tunacode/core/setup/__init__.py,sha256=lzdpY6rIGf9DDlDBDGFvQZaSOQeFsNglHbkpq1-GtU8,376
 tunacode/core/setup/agent_setup.py,sha256=trELO8cPnWo36BBnYmXDEnDPdhBg0p-VLnx9A8hSSSQ,1401
 tunacode/core/setup/base.py,sha256=cbyT2-xK2mWgH4EO17VfM_OM2bj0kT895NW2jSXbe3c,968
@@ -30,8 +30,9 @@ tunacode/core/setup/git_safety_setup.py,sha256=6sAQ0L74rRpayR7hWpnPyGKxCzW1Mk-2g
 tunacode/prompts/system.txt,sha256=6ecousLK6KvRj6wzIVyzRE7OPQVC5n7P6ceSbtmmaZQ,3207
 tunacode/services/__init__.py,sha256=w_E8QK6RnvKSvU866eDe8BCRV26rAm4d3R-Yg06OWCU,19
 tunacode/services/mcp.py,sha256=R48X73KQjQ9vwhBrtbWHSBl-4K99QXmbIhh5J_1Gezo,3046
-tunacode/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tunacode/tools/__init__.py,sha256=l5O018T-bUjCSy7JSupJoKojZp07uAz3913qDFVdCzM,29
 tunacode/tools/base.py,sha256=UioygDbXy0JY67EIcyEoYt2TBfX9-n9Usf_1huQ4zOE,7046
+tunacode/tools/bash.py,sha256=h8pUzfp7n2aVtAJcUICJOJV0FBTphifZdYrzHLvrZjA,8781
 tunacode/tools/read_file.py,sha256=ZNX9PvaYcI2Hw_GeSpQ3_wEy26DQ3LqLwYlaCVYDXO0,3051
 tunacode/tools/run_command.py,sha256=jI5TWi4SKukfUkCdcFpSWDULsAM4RQN2Du0VTttIWvs,3796
 tunacode/tools/update_file.py,sha256=QQwdTHUbtfwjCa2sbbrf-d2uIfZY1SQH1wkvjKU9OlQ,4137
@@ -57,9 +58,9 @@ tunacode/utils/ripgrep.py,sha256=AXUs2FFt0A7KBV996deS8wreIlUzKOlAHJmwrcAr4No,583
 tunacode/utils/system.py,sha256=FSoibTIH0eybs4oNzbYyufIiV6gb77QaeY2yGqW39AY,11381
 tunacode/utils/text_utils.py,sha256=B9M1cuLTm_SSsr15WNHF6j7WdLWPvWzKZV0Lvfgdbjg,2458
 tunacode/utils/user_configuration.py,sha256=uFrpSRTUf0CijZjw1rOp1sovqy1uyr0UNcn85S6jvdk,1790
-tunacode_cli-0.0.12.dist-info/licenses/LICENSE,sha256=Btzdu2kIoMbdSp6OyCLupB1aRgpTCJ_szMimgEnpkkE,1056
-tunacode_cli-0.0.12.dist-info/METADATA,sha256=cgYzSgQ7fjai-wCWUiETKaqpU-itmLUhIkM1ZUIK7bg,12837
-tunacode_cli-0.0.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tunacode_cli-0.0.12.dist-info/entry_points.txt,sha256=hbkytikj4dGu6rizPuAd_DGUPBGF191RTnhr9wdhORY,51
-tunacode_cli-0.0.12.dist-info/top_level.txt,sha256=lKy2P6BWNi5XSA4DHFvyjQ14V26lDZctwdmhEJrxQbU,9
-tunacode_cli-0.0.12.dist-info/RECORD,,
+tunacode_cli-0.0.13.dist-info/licenses/LICENSE,sha256=Btzdu2kIoMbdSp6OyCLupB1aRgpTCJ_szMimgEnpkkE,1056
+tunacode_cli-0.0.13.dist-info/METADATA,sha256=sJNahxSaLVB_QK6WoXW3SkDD0Wmh67MPSTmI0g_gub8,12837
+tunacode_cli-0.0.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tunacode_cli-0.0.13.dist-info/entry_points.txt,sha256=hbkytikj4dGu6rizPuAd_DGUPBGF191RTnhr9wdhORY,51
+tunacode_cli-0.0.13.dist-info/top_level.txt,sha256=lKy2P6BWNi5XSA4DHFvyjQ14V26lDZctwdmhEJrxQbU,9
+tunacode_cli-0.0.13.dist-info/RECORD,,