tunacode-cli 0.0.76.9__py3-none-any.whl → 0.0.77.2__py3-none-any.whl

tunacode/cli/commands/implementations/development.py

@@ -49,25 +49,25 @@ class BranchCommand(SimpleCommand):
 
 
 class InitCommand(SimpleCommand):
-    """Creates or updates TUNACODE.md with project-specific context."""
+    """Creates or updates AGENTS.md with project-specific context."""
 
     spec = CommandSpec(
         name="/init",
         aliases=[],
-        description="Analyze codebase and create/update TUNACODE.md file",
+        description="Analyze codebase and create/update AGENTS.md file",
         category=CommandCategory.DEVELOPMENT,
     )
 
     async def execute(self, args, context: CommandContext) -> CommandResult:
         """Execute the init command."""
         # Minimal implementation to make test pass
-        prompt = """Please analyze this codebase and create a TUNACODE.md file containing:
+        prompt = """Please analyze this codebase and create a AGENTS.md file containing:
 1. Build/lint/test commands - especially for running a single test
 2. Code style guidelines including imports, formatting, types, naming conventions, error handling, etc.
 
 The file you create will be given to agentic coding agents (such as yourself) that operate in this repository.
 Make it about 20 lines long.
-If there's already a TUNACODE.md, improve it.
+If there's already a AGENTS.md, improve it.
 If there are Cursor rules (in .cursor/rules/ or .cursorrules) or Copilot rules (in .github/copilot-instructions.md),
 make sure to include them."""
 

tunacode/configuration/key_descriptions.py

@@ -32,13 +32,6 @@ CONFIG_KEY_DESCRIPTIONS: Dict[str, KeyDescription] = {
         help_text="Format: provider:model-name. Examples: openai:gpt-4, anthropic:claude-3-sonnet, google:gemini-pro",
         category="AI Models",
     ),
-    "skip_git_safety": KeyDescription(
-        name="skip_git_safety",
-        description="Skip Git safety checks when making changes",
-        example=True,
-        help_text="When true, TunaCode won't create safety branches before making changes. Use with caution!",
-        category="Safety Settings",
-    ),
     # Environment variables (API Keys)
     "env.OPENAI_API_KEY": KeyDescription(
         name="OPENAI_API_KEY",
@@ -108,8 +101,8 @@ CONFIG_KEY_DESCRIPTIONS: Dict[str, KeyDescription] = {
     "settings.guide_file": KeyDescription(
         name="guide_file",
         description="Name of your project guide file",
-        example="TUNACODE.md",
-        help_text="TunaCode looks for this file to understand your project. Usually TUNACODE.md or README.md.",
+        example="AGENTS.md",
+        help_text="TunaCode looks for this file to understand your project. Usually AGENTS.md or README.md.",
         category="Project Settings",
     ),
     "settings.fallback_response": KeyDescription(

tunacode/constants.py

@@ -9,12 +9,12 @@ from enum import Enum
 
 # Application info
 APP_NAME = "TunaCode"
-APP_VERSION = "0.0.76.9"
+APP_VERSION = "0.0.77.2"
 
 
 # File patterns
 GUIDE_FILE_PATTERN = "{name}.md"
-GUIDE_FILE_NAME = "TUNACODE.md"
+GUIDE_FILE_NAME = "AGENTS.md"
 ENV_FILE = ".env"
 CONFIG_FILE_NAME = "tunacode.json"
 

tunacode/context.py

@@ -50,16 +50,16 @@ async def get_directory_structure(max_depth: int = 3) -> str:
 
 
 async def get_code_style() -> str:
-    """Concatenate contents of all TUNACODE.md files up the directory tree."""
+    """Concatenate contents of all AGENTS.md files up the directory tree."""
     parts: List[str] = []
     current = Path.cwd()
     while True:
-        file = current / "TUNACODE.md"
+        file = current / "AGENTS.md"
         if file.exists():
             try:
                 parts.append(file.read_text(encoding="utf-8"))
             except Exception as e:
-                logger.debug(f"Failed to read TUNACODE.md at {file}: {e}")
+                logger.debug(f"Failed to read AGENTS.md at {file}: {e}")
         if current == current.parent:
             break
         current = current.parent
@@ -67,5 +67,5 @@ async def get_code_style() -> str:
 
 
 async def get_claude_files() -> List[str]:
-    """Return a list of additional TUNACODE.md files in the repo."""
-    return ripgrep("TUNACODE.md", ".")
+    """Return a list of additional AGENTS.md files in the repo."""
+    return ripgrep("AGENTS.md", ".")

tunacode/core/agents/agent_components/__init__.py

@@ -13,6 +13,7 @@ from .agent_helpers import (
     get_tool_description,
     get_tool_summary,
     get_user_prompt_part_class,
+    handle_empty_response,
 )
 from .json_tool_parser import extract_and_execute_tool_calls, parse_json_tool_calls
 from .message_handler import get_model_messages, patch_tool_messages
@@ -47,6 +48,7 @@ __all__ = [
     "get_tool_description",
     "get_tool_summary",
     "get_user_prompt_part_class",
+    "handle_empty_response",
     "stream_model_request_node",
     "get_batch_description",
 ]

tunacode/core/agents/agent_components/agent_config.py

@@ -30,6 +30,9 @@ _TUNACODE_CACHE: Dict[str, Tuple[str, float]] = {}
 _AGENT_CACHE: Dict[ModelName, PydanticAgent] = {}
 _AGENT_CACHE_VERSION: Dict[ModelName, int] = {}
 
+_PROMPT_FILENAMES: Tuple[str, ...] = ("system.xml", "system.md", "system.txt")
+_DEFAULT_SYSTEM_PROMPT = "You are a helpful AI assistant."
+
 
 def clear_all_caches():
     """Clear all module-level caches. Useful for testing."""
@@ -46,55 +49,55 @@ def get_agent_tool():
     return Agent, Tool
 
 
-def load_system_prompt(base_path: Path) -> str:
-    """Load the system prompt from file with caching."""
-    prompt_path = base_path / "prompts" / "system.md"
+def _read_prompt_from_path(prompt_path: Path) -> str:
+    """Return prompt content from disk, leveraging the cache when possible."""
     cache_key = str(prompt_path)
 
-    # Check cache with file modification time
     try:
-        if cache_key in _PROMPT_CACHE:
-            cached_content, cached_mtime = _PROMPT_CACHE[cache_key]
-            current_mtime = prompt_path.stat().st_mtime
-            if current_mtime == cached_mtime:
-                return cached_content
+        current_mtime = prompt_path.stat().st_mtime
+    except FileNotFoundError as error:
+        raise FileNotFoundError from error
 
-        # Load from file and cache
-        with open(prompt_path, "r", encoding="utf-8") as f:
-            content = f.read().strip()
-        _PROMPT_CACHE[cache_key] = (content, prompt_path.stat().st_mtime)
-        return content
+    if cache_key in _PROMPT_CACHE:
+        cached_content, cached_mtime = _PROMPT_CACHE[cache_key]
+        if current_mtime == cached_mtime:
+            return cached_content
+
+    try:
+        content = prompt_path.read_text(encoding="utf-8").strip()
+    except FileNotFoundError as error:
+        raise FileNotFoundError from error
 
-    except FileNotFoundError:
-        # Fallback to system.txt if system.md not found
-        prompt_path = base_path / "prompts" / "system.txt"
-        cache_key = str(prompt_path)
+    _PROMPT_CACHE[cache_key] = (content, current_mtime)
+    return content
 
-        try:
-            if cache_key in _PROMPT_CACHE:
-                cached_content, cached_mtime = _PROMPT_CACHE[cache_key]
-                current_mtime = prompt_path.stat().st_mtime
-                if current_mtime == cached_mtime:
-                    return cached_content
 
-            with open(prompt_path, "r", encoding="utf-8") as f:
-                content = f.read().strip()
-            _PROMPT_CACHE[cache_key] = (content, prompt_path.stat().st_mtime)
-            return content
+def load_system_prompt(base_path: Path) -> str:
+    """Load the system prompt from file with caching."""
+    prompts_dir = base_path / "prompts"
 
+    for prompt_name in _PROMPT_FILENAMES:
+        prompt_path = prompts_dir / prompt_name
+        if not prompt_path.exists():
+            continue
+
+        try:
+            return _read_prompt_from_path(prompt_path)
         except FileNotFoundError:
-            # Use a default system prompt if neither file exists
-            return "You are a helpful AI assistant."
+            # File disappeared between exists() check and read. Try next candidate.
+            continue
+
+    return _DEFAULT_SYSTEM_PROMPT
 
 
 def load_tunacode_context() -> str:
-    """Load TUNACODE.md context if it exists with caching."""
+    """Load AGENTS.md context if it exists with caching."""
     try:
-        tunacode_path = Path.cwd() / "TUNACODE.md"
+        tunacode_path = Path.cwd() / "AGENTS.md"
         cache_key = str(tunacode_path)
 
         if not tunacode_path.exists():
-            logger.info("📄 TUNACODE.md not found: Using default context")
+            logger.info("📄 AGENTS.md not found: Using default context")
             return ""
 
         # Check cache with file modification time
@@ -107,17 +110,17 @@ def load_tunacode_context() -> str:
         # Load from file and cache
         tunacode_content = tunacode_path.read_text(encoding="utf-8")
         if tunacode_content.strip():
-            logger.info("📄 TUNACODE.md located: Loading context...")
-            result = "\n\n# Project Context from TUNACODE.md\n" + tunacode_content
+            logger.info("📄 AGENTS.md located: Loading context...")
+            result = "\n\n# Project Context from AGENTS.md\n" + tunacode_content
             _TUNACODE_CACHE[cache_key] = (result, tunacode_path.stat().st_mtime)
             return result
         else:
-            logger.info("📄 TUNACODE.md not found: Using default context")
+            logger.info("📄 AGENTS.md not found: Using default context")
             _TUNACODE_CACHE[cache_key] = ("", tunacode_path.stat().st_mtime)
             return ""
 
     except Exception as e:
-        logger.debug(f"Error loading TUNACODE.md: {e}")
+        logger.debug(f"Error loading AGENTS.md: {e}")
         return ""
 
 
@@ -164,7 +167,7 @@ def get_or_create_agent(model: ModelName, state_manager: StateManager) -> Pydant
         base_path = Path(__file__).parent.parent.parent.parent
         system_prompt = load_system_prompt(base_path)
 
-        # Load TUNACODE.md context
+        # Load AGENTS.md context
         system_prompt += load_tunacode_context()
 
         # Add plan mode context if in plan mode

tunacode/core/agents/agent_components/agent_helpers.py

@@ -201,6 +201,33 @@ def create_fallback_response(
     return fallback
 
 
+async def handle_empty_response(
+    message: str,
+    reason: str,
+    iter_index: int,
+    state: Any,
+) -> None:
+    """Handle empty responses by creating a synthetic user message with retry guidance."""
+    from tunacode.ui import console as ui
+
+    force_action_content = create_empty_response_message(
+        message,
+        reason,
+        getattr(state.sm.session, "tool_calls", []),
+        iter_index,
+        state.sm,
+    )
+    create_user_message(force_action_content, state.sm)
+
+    if state.show_thoughts:
+        await ui.warning("\nEMPTY RESPONSE FAILURE - AGGRESSIVE RETRY TRIGGERED")
+        await ui.muted(f"   Reason: {reason}")
+        await ui.muted(
+            f"   Recent tools: {get_recent_tools_context(getattr(state.sm.session, 'tool_calls', []))}"
+        )
+        await ui.muted("   Injecting retry guidance prompt")
+
+
 def format_fallback_output(fallback: FallbackResponse) -> str:
     """Format a fallback response into a comprehensive output string."""
     output_parts = [fallback.summary, ""]

tunacode/core/agents/main.py

@@ -31,20 +31,10 @@ from tunacode.types import (
     ToolCallback,
     UsageTrackerProtocol,
 )
-from tunacode.ui.tool_descriptions import get_batch_description
-
-# Optional UI console (avoid nested imports in hot paths)
-try:
-    from tunacode.ui import console as ui  # rich-style helpers with async methods
-except Exception:  # pragma: no cover - UI is optional
 
-    class _NoopUI:  # minimal no-op shim
-        async def muted(self, *_: Any, **__: Any) -> None: ...
-        async def warning(self, *_: Any, **__: Any) -> None: ...
-        async def success(self, *_: Any, **__: Any) -> None: ...
-        async def update_spinner_message(self, *_: Any, **__: Any) -> None: ...
-
-    ui = _NoopUI()  # type: ignore
+# CLAUDE_ANCHOR[key=d595ceb5] Direct UI console import aligns with removal of defensive shim
+from tunacode.ui import console as ui
+from tunacode.ui.tool_descriptions import get_batch_description
 
 # Streaming parts (keep guarded import but avoid per-iteration imports)
 try:
@@ -56,16 +46,10 @@ except Exception:  # pragma: no cover
     TextPartDelta = None  # type: ignore
     STREAMING_AVAILABLE = False
 
-# Agent components (flattned to a single module import to reduce coupling)
 from . import agent_components as ac
 
-# Configure logging
 logger = get_logger(__name__)
 
-
-# -----------------------
-# Module exports
-# -----------------------
 __all__ = [
     "process_request",
     "get_mcp_servers",
@@ -73,9 +57,6 @@ __all__ = [
     "check_query_satisfaction",
 ]
 
-# -----------------------
-# Constants & Defaults
-# -----------------------
 DEFAULT_MAX_ITERATIONS = 15
 UNPRODUCTIVE_LIMIT = 3  # iterations without tool use before forcing action
 FALLBACK_VERBOSITY_DEFAULT = "normal"
@@ -84,9 +65,6 @@ FORCED_REACT_INTERVAL = 2
 FORCED_REACT_LIMIT = 5
 
 
-# -----------------------
-# Data structures
-# -----------------------
 @dataclass(slots=True)
 class RequestContext:
     request_id: str
@@ -96,12 +74,11 @@ class RequestContext:
 
 
 class StateFacade:
-    """Thin wrapper to centralize session mutations and reads."""
+    """wrapper to centralize session mutations and reads."""
 
     def __init__(self, state_manager: StateManager) -> None:
         self.sm = state_manager
 
-    # ---- safe getters ----
     def get_setting(self, dotted: str, default: Any) -> Any:
         cfg: Dict[str, Any] = getattr(self.sm.session, "user_config", {}) or {}
         node = cfg
@@ -119,7 +96,6 @@ class StateFacade:
     def messages(self) -> list:
         return list(getattr(self.sm.session, "messages", []))
 
-    # ---- safe setters ----
     def set_request_id(self, req_id: str) -> None:
         try:
             self.sm.session.request_id = req_id
@@ -160,9 +136,6 @@ class StateFacade:
         setattr(self.sm.session, "consecutive_empty_responses", 0)
 
 
-# -----------------------
-# Helper functions
-# -----------------------
 def _init_context(state: StateFacade, fallback_enabled: bool) -> RequestContext:
     req_id = str(uuid.uuid4())[:8]
     state.set_request_id(req_id)
@@ -292,30 +265,6 @@ async def _maybe_force_react_snapshot(
         logger.debug("Forced react snapshot failed", exc_info=True)
 
 
-async def _handle_empty_response(
-    message: str,
-    reason: str,
-    iter_index: int,
-    state: StateFacade,
-) -> None:
-    force_action_content = ac.create_empty_response_message(
-        message,
-        reason,
-        getattr(state.sm.session, "tool_calls", []),
-        iter_index,
-        state.sm,
-    )
-    ac.create_user_message(force_action_content, state.sm)
-
-    if state.show_thoughts:
-        await ui.warning("\nEMPTY RESPONSE FAILURE - AGGRESSIVE RETRY TRIGGERED")
-        await ui.muted(f"   Reason: {reason}")
-        await ui.muted(
-            f"   Recent tools: {ac.get_recent_tools_context(getattr(state.sm.session, 'tool_calls', []))}"
-        )
-        await ui.muted("   Injecting retry guidance prompt")
-
-
 async def _force_action_if_unproductive(
     message: str,
     unproductive_count: int,
@@ -445,9 +394,6 @@ def _build_fallback_output(
     return ac.format_fallback_output(fallback)
 
 
-# -----------------------
-# Public API
-# -----------------------
 def get_agent_tool() -> tuple[type[Agent], type["Tool"]]:
     """Return Agent and Tool classes without importing at module load time."""
     from pydantic_ai import Agent as AgentCls
@@ -526,7 +472,7 @@ async def process_request(
                 # Handle empty response (aggressive retry prompt)
                 if empty_response:
                     if state.increment_empty_response() >= 1:
-                        await _handle_empty_response(message, empty_reason, i, state)
+                        await ac.handle_empty_response(message, empty_reason, i, state)
                         state.clear_empty_response()
                 else:
                     state.clear_empty_response()
@@ -601,11 +547,7 @@ async def process_request(
                         "Progress summary:\n"
                         f"- Tools used: {tools_str}\n"
                         f"- Iterations completed: {i}\n\n"
-                        "The task appears incomplete. Would you like me to:\n"
-                        "1. Continue working (extend limit)\n"
-                        "2. Summarize what I've done and stop\n"
-                        "3. Try a different approach\n\n"
-                        "Please let me know how to proceed."
+                        "Plese add more context to the task."
                     )
                     ac.create_user_message(extend_content, state.sm)
                     if state.show_thoughts:
@@ -617,7 +559,6 @@ async def process_request(
 
                 i += 1
 
-            # Final buffered read-only tasks (batch)
             await _finalize_buffered_tasks(tool_buffer, tool_callback, state)
 
             # Build fallback synthesis if needed

tunacode/core/setup/__init__.py

@@ -3,7 +3,6 @@ from .base import BaseSetup
 from .config_setup import ConfigSetup
 from .coordinator import SetupCoordinator
 from .environment_setup import EnvironmentSetup
-from .git_safety_setup import GitSafetySetup
 from .template_setup import TemplateSetup
 
 __all__ = [
@@ -11,7 +10,6 @@ __all__ = [
     "SetupCoordinator",
     "ConfigSetup",
     "EnvironmentSetup",
-    "GitSafetySetup",
     "AgentSetup",
     "TemplateSetup",
 ]

tunacode/prompts/{system.md → system.xml}

@@ -1,5 +1,4 @@
-###Instruction###
-
+<instructions>
 You are "TunaCode", a senior software developer AI assistant operating inside the user's terminal.
 
 YOU ARE NOT A CHATBOT. YOU ARE AN OPERATIONAL EXPERIENCED DEVELOPER WITH AGENT WITH TOOLS.
@@ -18,9 +17,10 @@ CRITICAL BEHAVIOR RULES:
 9. Prefer sequential simplicity: break complex tasks into clear, interactive steps and confirm assumptions.
 10. Use affirmative directives and directive phrasing in your own planning: "Your task is...", "You MUST..." when restating goals.
 11. you MUST follow best practises, you will be punished for cheap bandaid fixes. ALWAYS aim to fix issues properly.
+</instructions>
 
 ### Completion Signaling
-
+<completion>
 When you have fully completed the user’s task:
 
 - Start your response with a single line: `TUNACODE DONE:` followed by a brief outcome summary.
@@ -28,9 +28,10 @@ When you have fully completed the user’s task:
 - Do NOT mark DONE if you have queued tools in the same response — execute tools first, then mark DONE.
 - Example:
   - `TUNACODE DONE: Implemented enum state machine and updated completion logic`
+</completion>
 
 ###Tool Access Rules###
-
+<tools>
 You have 9 powerful tools at your disposal. Understanding their categories is CRITICAL for performance:
 
  READONLY TOOLS (Safe, ParallelExecutable)
@@ -72,11 +73,11 @@ These tools modify state and MUST run one at a time with user confirmation:
 9. `bash(command: str)` — Advanced shell with environment control
     Safety: Enhanced security, output limits (5KB)
     Use for: Complex scripts, interactive commands
+</tools>
 
 
 
-###Tool Examples  LEARN THESE PATTERNS###
-
+<examples>
 CRITICAL: These examples show EXACTLY how to use each tool. Study them carefully.
 
 1. read_file  Reading File Contents
@@ -284,6 +285,7 @@ bash("echo $PATH && which python && python --version")
 bash("python -m venv venv && source venv/bin/activate && pip list")
 → Returns: Installed packages in new venv
 ```
+</examples>
 
 REMEMBER:
  Always use these exact patterns
@@ -337,7 +339,7 @@ Tool Selection Quick Guide:
  Need to run commands? → `run_command` (simple) or `bash` (complex)
 
 ### CRITICAL JSON FORMATTING RULES ###
-
+<formatting>
 **TOOL ARGUMENT JSON RULES - MUST FOLLOW EXACTLY:**
 
 1. **ALWAYS emit exactly ONE JSON object per tool call**
@@ -363,6 +365,7 @@ read_file({"filepath": "main.py"}{"filepath": "config.py"})
 ```
 
 **VALIDATION:** Every tool argument must parse as a single, valid JSON object. Concatenated objects will cause tool execution failures.
+</formatting>
 
 OUTPUT AND STYLE RULES:
 1. Directness: Keep responses short and to the point. Avoid polite filler.

tunacode/setup.py

@@ -11,7 +11,6 @@ from tunacode.core.setup import (
     AgentSetup,
     ConfigSetup,
     EnvironmentSetup,
-    GitSafetySetup,
     SetupCoordinator,
     TemplateSetup,
 )
@@ -39,7 +38,6 @@ async def setup(
     coordinator.register_step(config_setup)
     coordinator.register_step(EnvironmentSetup(state_manager))
     coordinator.register_step(TemplateSetup(state_manager))
-    coordinator.register_step(GitSafetySetup(state_manager))
 
     # Run all setup steps
     await coordinator.run_setup(force_setup=run_setup, wizard_mode=wizard_mode)

tunacode/tools/grep.py

@@ -281,7 +281,6 @@ Usage:
         def run_enhanced_ripgrep():
             """Execute ripgrep search using the new executor."""
             start_time = time.time()
-            first_match_time = None
             results = []
 
             # Configure timeout from settings
@@ -306,17 +305,8 @@ Usage:
                     context_after=config.context_lines,
                 )
 
-                # Track first match time for metrics
-                if search_results and first_match_time is None:
-                    first_match_time = time.time() - start_time
-
-                    # Check if we exceeded the first match deadline
-                    if first_match_time > config.first_match_deadline:
-                        if self._config.get("debug", False):
-                            logger.debug(
-                                f"Search exceeded first match deadline: {first_match_time:.2f}s"
-                            )
-                        raise TooBroadPatternError(pattern, config.first_match_deadline)
+                # Ripgrep doesn't provide timing info for first match, so we rely on
+                # the overall timeout mechanism instead of first_match_deadline
 
                 # Parse results
                 for result_line in search_results:
@@ -363,10 +353,7 @@ Usage:
                 )
 
                 if self._config.get("debug", False):
-                    logger.debug(
-                        f"Ripgrep search completed in {total_time:.2f}s "
-                        f"(first match: {first_match_time:.2f}s if found)"
-                    )
+                    logger.debug(f"Ripgrep search completed in {total_time:.2f}s")
 
             return results