tunacode-cli 0.0.38__tar.gz → 0.0.40__tar.gz

{tunacode_cli-0.0.38/src/tunacode_cli.egg-info → tunacode_cli-0.0.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tunacode-cli
-Version: 0.0.38
+Version: 0.0.40
 Summary: Your agentic CLI developer.
 Author-email: larock22 <noreply@github.com>
 License-Expression: MIT
@@ -31,6 +31,7 @@ Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: textual-dev; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
 Dynamic: license-file
 
 # TunaCode

{tunacode_cli-0.0.38 → tunacode_cli-0.0.40}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tunacode-cli"
-version = "0.0.38"
+version = "0.0.40"
 description = "Your agentic CLI developer."
 keywords = ["cli", "agent", "development", "automation"]
 readme = "README.md"
@@ -43,6 +43,7 @@ dev = [
     "pytest-cov",
     "pytest-asyncio",
     "textual-dev",
+    "pre-commit",
 ]
 
 [project.urls]

{tunacode_cli-0.0.38 → tunacode_cli-0.0.40}/src/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.38"
+APP_VERSION = "0.0.40"
 
 # File patterns
 GUIDE_FILE_PATTERN = "{name}.md"
@@ -18,6 +18,9 @@ CONFIG_FILE_NAME = "tunacode.json"
 # Default limits
 MAX_FILE_SIZE = 100 * 1024  # 100KB
 MAX_COMMAND_OUTPUT = 5000  # 5000 chars
+MAX_FILES_IN_DIR = 50
+MAX_TOTAL_DIR_SIZE = 2 * 1024 * 1024  # 2 MB
+
 
 # Command output processing
 COMMAND_OUTPUT_THRESHOLD = 3500  # Length threshold for truncation
@@ -115,6 +118,13 @@ ERROR_COMMAND_NOT_FOUND = "Error: Command not found or failed to execute:"
 ERROR_COMMAND_EXECUTION = (
     "Error: Command not found or failed to execute: {command}. Details: {error}"
 )
+# Directory expansion errors
+ERROR_DIR_TOO_LARGE = (
+    "Error: Directory '{path}' expansion aborted. Total size exceeds {limit_mb:.1f} MB limit."
+)
+ERROR_DIR_TOO_MANY_FILES = (
+    "Error: Directory '{path}' expansion aborted. Exceeds limit of {limit} files."
+)
 
 # Command output messages
 CMD_OUTPUT_NO_OUTPUT = "No output."

{tunacode_cli-0.0.38 → tunacode_cli-0.0.40}/src/tunacode/prompts/system.md

@@ -256,13 +256,48 @@ If deeper exploration needed:
 
 \###Meta Behavior###
 
-Use the **ReAct** (Reasoning + Action) framework:
+Use the **ReAct** (Reasoning + Action) framework internally:
 
-- {"thought": "I need to inspect the file before modifying."}
-- → run tool
-- {"thought": "I see the old import. Now I'll patch it."}
-- → update file
-- {"thought": "Patch complete. Ready for next instruction."}
+**IMPORTANT**: Thoughts are for internal reasoning only. NEVER include JSON-formatted thoughts in your responses to users.
+
+Internal process (not shown to user):
+- Think: "I need to inspect the file before modifying."
+- Act: run tool
+- Think: "I see the old import. Now I'll patch it."
+- Act: update file
+- Think: "Patch complete. Ready for next instruction."
+
+**Your responses to users should be clean, formatted text without JSON artifacts.**
+
+---
+
+\###Output Formatting Rules###
+
+**CRITICAL**: Your responses to users must be clean, readable text:
+
+1. **NO JSON in responses** - Never output {"thought": ...}, {"suggestions": ...}, or any JSON to users
+2. **Use markdown formatting** - Use headers, lists, code blocks for readability
+3. **Be direct and clear** - Provide actionable feedback and concrete suggestions
+4. **Format suggestions as numbered or bulleted lists** - Not as JSON arrays
+
+**Example of GOOD response formatting:**
+```
+Code Review Results:
+
+The JavaScript code has good structure. Here are suggestions for improvement:
+
+1. **Add comments** - Document major functions for better maintainability
+2. **Consistent error handling** - Use try-catch blocks consistently
+3. **Form validation** - Validate before submitting to ensure fields are filled
+
+These changes will improve maintainability and user experience.
+```
+
+**Example of BAD response formatting (DO NOT DO THIS):**
+```
+{"thought": "Reviewing the code..."}
+{"suggestions": ["Add comments", "Error handling", "Validation"]}
+```
 
 ---
 
@@ -281,12 +316,13 @@ When users provide @ file references, they want information, not file creation.
 ```plaintext
 User: What's the current app version?
 
-THINK: {"thought": "I should search for APP_VERSION. I'll use grep for parallel capability."}
+[Internal thinking - not shown to user]
 ACT: grep("APP_VERSION", ".")
-OBSERVE: {"thought": "Found APP_VERSION in constants.py at line 12."}
+[Found APP_VERSION in constants.py at line 12]
 ACT: read_file("constants.py")
-OBSERVE: {"thought": "APP_VERSION is set to '2.4.1'. This is the current version."}
-RESPONSE: "Current version is 2.4.1 (from constants.py)"
+[APP_VERSION is set to '2.4.1']
+
+RESPONSE TO USER: Current version is 2.4.1 (from constants.py)
 ```
 
 ````plaintext
@@ -300,8 +336,9 @@ def main():
 
 === END FILE REFERENCE: src/main.py ===
 
-THINK: {"thought": "User is asking about the referenced file, not asking me to create it."}
-RESPONSE: "The main.py file contains a simple main function that prints 'Hello World'."
+[Internal: User is asking about the referenced file, not asking me to create it]
+
+RESPONSE TO USER: The main.py file contains a simple main function that prints 'Hello World'.
 
 ```
 

tunacode_cli-0.0.40/src/tunacode/utils/text_utils.py

@@ -0,0 +1,206 @@
+"""
+Module: sidekick.utils.text_utils
+
+Provides text processing utilities.
+Includes file extension to language mapping and key formatting functions.
+"""
+
+import os
+from typing import List, Set, Tuple
+
+
+def key_to_title(key: str, uppercase_words: Set[str] = None) -> str:
+    """Convert key to title, replacing underscores with spaces and capitalizing words."""
+    if uppercase_words is None:
+        uppercase_words = {"api", "id", "url"}
+
+    words = key.split("_")
+    result_words = []
+    for word in words:
+        lower_word = word.lower()
+        if lower_word in uppercase_words:
+            result_words.append(lower_word.upper())
+        elif word:
+            result_words.append(word[0].upper() + word[1:].lower())
+        else:
+            result_words.append("")
+
+    return " ".join(result_words)
+
+
+def ext_to_lang(path: str) -> str:
+    """Get the language from the file extension. Default to `text` if not found."""
+    MAP = {
+        "py": "python",
+        "js": "javascript",
+        "ts": "typescript",
+        "java": "java",
+        "c": "c",
+        "cpp": "cpp",
+        "cs": "csharp",
+        "html": "html",
+        "css": "css",
+        "json": "json",
+        "yaml": "yaml",
+        "yml": "yaml",
+    }
+    ext = os.path.splitext(path)[1][1:]
+    if ext in MAP:
+        return MAP[ext]
+    return "text"
+
+
+def expand_file_refs(text: str) -> Tuple[str, List[str]]:
+    """
+    Expands @-references with file or directory contents wrapped in code fences.
+    - @path/to/file.ext: Reads a single file.
+    - @path/to/dir/: Reads all files in a directory (non-recursive).
+    - @path/to/dir/**: Reads all files in a directory and its subdirectories.
+
+    Args:
+        text: The input text potentially containing @-references.
+
+    Returns:
+        A tuple containing:
+            - Text with references replaced by file/directory contents.
+            - List of absolute paths of files that were successfully expanded.
+
+    Raises:
+        ValueError: If a referenced path does not exist.
+    """
+    import os
+    import re
+
+    from tunacode.constants import (
+        ERROR_DIR_TOO_LARGE,
+        ERROR_DIR_TOO_MANY_FILES,
+        ERROR_FILE_NOT_FOUND,
+        MAX_FILES_IN_DIR,
+        MAX_TOTAL_DIR_SIZE,
+    )
+
+    # Regex now includes trailing / and ** to capture directory intentions
+    pattern = re.compile(r"@([\w./\-_*]+)")
+    expanded_files = []
+
+    def replacer(match: re.Match) -> str:
+        path_spec = match.group(1)
+
+        is_recursive = path_spec.endswith("/**")
+        is_dir = path_spec.endswith("/")
+
+        # Determine the actual path to check on the filesystem
+        if is_recursive:
+            base_path = path_spec[:-3]
+        elif is_dir:
+            base_path = path_spec[:-1]
+        else:
+            base_path = path_spec
+
+        if not os.path.exists(base_path):
+            raise ValueError(ERROR_FILE_NOT_FOUND.format(filepath=base_path))
+
+        # For Recursive Directory Expansion ---
+        if is_recursive:
+            if not os.path.isdir(base_path):
+                raise ValueError(
+                    f"Error: Path '{base_path}' for recursive expansion is not a directory."
+                )
+
+            all_contents = [f"\n=== START RECURSIVE EXPANSION: {path_spec} ===\n"]
+            total_size, file_count = 0, 0
+
+            for root, _, filenames in os.walk(base_path):
+                for filename in filenames:
+                    if file_count >= MAX_FILES_IN_DIR:
+                        all_contents.append(
+                            ERROR_DIR_TOO_MANY_FILES.format(path=base_path, limit=MAX_FILES_IN_DIR)
+                        )
+                        break
+
+                    file_path = os.path.join(root, filename)
+                    content, size = _read_and_format_file(file_path, expanded_files)
+
+                    if total_size + size > MAX_TOTAL_DIR_SIZE:
+                        all_contents.append(
+                            ERROR_DIR_TOO_LARGE.format(
+                                path=base_path, limit_mb=MAX_TOTAL_DIR_SIZE / (1024 * 1024)
+                            )
+                        )
+                        break
+
+                    all_contents.append(content)
+                    total_size += size
+                    file_count += 1
+                if file_count >= MAX_FILES_IN_DIR or total_size > MAX_TOTAL_DIR_SIZE:
+                    break
+
+            all_contents.append(f"\n=== END RECURSIVE EXPANSION: {path_spec} ===\n")
+            return "".join(all_contents)
+
+        # For Non-Recursive Directory Expansion
+        if is_dir:
+            if not os.path.isdir(base_path):
+                raise ValueError(
+                    f"Error: Path '{base_path}' for directory expansion is not a directory."
+                )
+
+            all_contents = [f"\n=== START DIRECTORY EXPANSION: {path_spec} ===\n"]
+            total_size, file_count = 0, 0
+
+            for item_name in sorted(os.listdir(base_path)):
+                item_path = os.path.join(base_path, item_name)
+                if os.path.isfile(item_path):
+                    if file_count >= MAX_FILES_IN_DIR:
+                        all_contents.append(
+                            ERROR_DIR_TOO_MANY_FILES.format(path=base_path, limit=MAX_FILES_IN_DIR)
+                        )
+                        break
+
+                    content, size = _read_and_format_file(item_path, expanded_files)
+                    if total_size + size > MAX_TOTAL_DIR_SIZE:
+                        all_contents.append(
+                            ERROR_DIR_TOO_LARGE.format(
+                                path=base_path, limit_mb=MAX_TOTAL_DIR_SIZE / (1024 * 1024)
+                            )
+                        )
+                        break
+
+                    all_contents.append(content)
+                    total_size += size
+                    file_count += 1
+
+            all_contents.append(f"\n=== END DIRECTORY EXPANSION: {path_spec} ===\n")
+            return "".join(all_contents)
+
+        # For Single File Expansion
+        if os.path.isfile(base_path):
+            content, _ = _read_and_format_file(base_path, expanded_files)
+            return content
+
+        raise ValueError(f"Path '{base_path}' is not a valid file or directory specification.")
+
+    expanded_text = pattern.sub(replacer, text)
+    return expanded_text, list(set(expanded_files))
+
+
+def _read_and_format_file(file_path: str, expanded_files_tracker: List[str]) -> Tuple[str, int]:
+    """Reads a single file, formats it, and checks size limits."""
+    from tunacode.constants import MAX_FILE_SIZE
+
+    if os.path.getsize(file_path) > MAX_FILE_SIZE:
+        # Instead of raising an error, we'll just note it and skip or process gets terminated.
+        return f"\n--- SKIPPED (too large): {file_path} ---\n", 0
+
+    with open(file_path, "r", encoding="utf-8", errors="ignore") as f:
+        content = f.read()
+
+    abs_path = os.path.abspath(file_path)
+    expanded_files_tracker.append(abs_path)
+
+    lang = ext_to_lang(file_path)
+    header = f"=== FILE REFERENCE: {file_path} ==="
+    footer = f"=== END FILE REFERENCE: {file_path} ==="
+
+    formatted_content = f"\n{header}\n```{lang}\n{content}\n```\n{footer}\n"
+    return formatted_content, len(content.encode("utf-8"))

{tunacode_cli-0.0.38 → tunacode_cli-0.0.40/src/tunacode_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tunacode-cli
-Version: 0.0.38
+Version: 0.0.40
 Summary: Your agentic CLI developer.
 Author-email: larock22 <noreply@github.com>
 License-Expression: MIT
@@ -31,6 +31,7 @@ Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: textual-dev; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
 Dynamic: license-file
 
 # TunaCode

{tunacode_cli-0.0.38 → tunacode_cli-0.0.40}/src/tunacode_cli.egg-info/SOURCES.txt

@@ -95,6 +95,7 @@ src/tunacode_cli.egg-info/top_level.txt
 tests/conftest.py
 tests/test_actual_parallelism.py
 tests/test_agent_initialization.py
+tests/test_agent_output_formatting.py
 tests/test_background_manager.py
 tests/test_characterization_agent_main.py
 tests/test_characterization_bash.py
@@ -133,6 +134,7 @@ tests/test_parallel_execution_freeze_fix.py
 tests/test_parallel_execution_integration.py
 tests/test_parallel_read_only_tools.py
 tests/test_parallel_tool_execution.py
+tests/test_prompt_changes_validation.py
 tests/test_read_only_confirmation.py
 tests/test_security.py
 tests/test_streaming_panel_tool_confirmation.py
@@ -189,6 +191,7 @@ tests/characterization/ui/test_console_output.py
 tests/characterization/ui/test_diff_display.py
 tests/characterization/ui/test_prompt_rendering.py
 tests/characterization/ui/test_tool_confirmations.py
+tests/characterization/utils/test_expand_file_refs.py
 tests/characterization/utils/test_file_operations.py
 tests/characterization/utils/test_git_commands.py
 tests/characterization/utils/test_token_counting.py

{tunacode_cli-0.0.38 → tunacode_cli-0.0.40}/src/tunacode_cli.egg-info/requires.txt

@@ -11,3 +11,4 @@ pytest
 pytest-cov
 pytest-asyncio
 textual-dev
+pre-commit

tunacode_cli-0.0.40/tests/characterization/utils/test_expand_file_refs.py

@@ -0,0 +1,179 @@
+import os
+from pathlib import Path
+
+import pytest
+
+from tunacode.constants import (
+    MAX_FILE_SIZE,
+    MAX_FILES_IN_DIR,
+    MAX_TOTAL_DIR_SIZE,
+)
+from tunacode.utils.text_utils import expand_file_refs
+
+
+@pytest.fixture
+def setup_test_environment(tmp_path: Path, request) -> Path:
+    """
+    Creates a temporary directory structure for testing.
+    - /README.md
+    - /src/main.py
+    - /src/components/button.js
+    - /src/components/style.css
+    - /large_file.txt (exceeds MAX_FILE_SIZE)
+    - /many_files_dir/ (contains more than MAX_FILES_IN_DIR files)
+    - /empty_dir/
+    """
+    (tmp_path / "src" / "components").mkdir(parents=True)
+    (tmp_path / "empty_dir").mkdir()
+
+    (tmp_path / "README.md").write_text("# Project Title")
+    (tmp_path / "src/main.py").write_text("print('hello world')")
+    (tmp_path / "src/components/button.js").write_text("export const Button = () => {};")
+    (tmp_path / "src/components/style.css").write_text("button { color: blue; }")
+
+    large_file_path = tmp_path / "large_file.txt"
+    large_file_path.write_text("a" * (MAX_FILE_SIZE + 1))
+
+    many_files_dir = tmp_path / "many_files_dir"
+    many_files_dir.mkdir()
+    for i in range(MAX_FILES_IN_DIR + 5):
+        (many_files_dir / f"file_{i}.txt").write_text(f"content {i}")
+
+    original_cwd = Path.cwd()
+    os.chdir(tmp_path)
+
+    def finalizer():
+        os.chdir(original_cwd)
+
+    request.addfinalizer(finalizer)
+
+    return tmp_path
+
+
+def test_expand_single_file(setup_test_environment):
+    """Tests expanding a single, valid @file reference."""
+    text = "Please review this file: @README.md"
+    expanded_text, file_list = expand_file_refs(text)
+
+    assert "=== FILE REFERENCE: README.md ===" in expanded_text
+    assert "# Project Title" in expanded_text
+    assert len(file_list) == 1
+    assert file_list[0] == str(Path("README.md").resolve())
+
+
+def test_expand_non_recursive_directory(setup_test_environment):
+    """Tests expanding a directory with a trailing slash (non-recursive)."""
+    text = "What's in @src/ ?"
+    expanded_text, file_list = expand_file_refs(text)
+
+    assert "=== START DIRECTORY EXPANSION: src/ ===" in expanded_text
+    assert "=== FILE REFERENCE: src/main.py ===" in expanded_text
+    assert "print('hello world')" in expanded_text
+    assert "=== FILE REFERENCE: src/components/button.js ===" not in expanded_text
+    assert len(file_list) == 1
+    assert str(Path("src/main.py").resolve()) in file_list
+
+
+def test_expand_recursive_directory(setup_test_environment):
+    """Tests expanding a directory recursively with /** syntax."""
+    text = "Review the whole codebase: @src/**"
+    expanded_text, file_list = expand_file_refs(text)
+
+    assert "=== START RECURSIVE EXPANSION: src/** ===" in expanded_text
+    assert "=== FILE REFERENCE: src/main.py ===" in expanded_text
+    assert "=== FILE REFERENCE: src/components/button.js ===" in expanded_text
+    assert "=== FILE REFERENCE: src/components/style.css ===" in expanded_text
+    assert "export const Button" in expanded_text
+    assert "button { color: blue; }" in expanded_text
+    assert len(file_list) == 3
+
+
+def test_no_references(setup_test_environment):
+    """Tests that text without any @-references is returned unchanged."""
+    text = "This is a normal sentence without any file references."
+    expanded_text, file_list = expand_file_refs(text)
+
+    assert expanded_text == text
+    assert len(file_list) == 0
+
+
+def test_multiple_mixed_references(setup_test_environment):
+    """Tests a single prompt with both file and directory references."""
+    text = "Check the readme @README.md and all the components in @src/components/"
+    expanded_text, file_list = expand_file_refs(text)
+    assert "=== FILE REFERENCE: README.md ===" in expanded_text
+    assert "=== START DIRECTORY EXPANSION: src/components/ ===" in expanded_text
+    assert "=== FILE REFERENCE: src/components/button.js ===" in expanded_text
+    assert "=== FILE REFERENCE: src/components/style.css ===" in expanded_text
+    assert len(file_list) == 3
+
+
+def test_empty_directory(setup_test_environment):
+    """Tests expanding an empty directory."""
+    text = "What is in @empty_dir/ ?"
+    expanded_text, file_list = expand_file_refs(text)
+
+    assert "=== START DIRECTORY EXPANSION: empty_dir/ ===" in expanded_text
+    assert "=== END DIRECTORY EXPANSION: empty_dir/ ===" in expanded_text
+    assert "FILE REFERENCE" not in expanded_text.split("START DIRECTORY")[1]
+    assert len(file_list) == 0
+
+
+# --- Error and Limit Handling Tests ---
+
+
+def test_error_path_not_found(setup_test_environment):
+    """Tests that a ValueError is raised for a non-existent path."""
+    text = "Here is a @nonexistent/file.py"
+    with pytest.raises(ValueError) as excinfo:
+        expand_file_refs(text)
+    assert "Error: File not found" in str(excinfo.value)
+    assert "nonexistent/file.py" in str(excinfo.value)
+
+
+def test_error_path_is_file_but_used_as_dir(setup_test_environment):
+    """Tests for ValueError when a file is referenced with directory syntax."""
+    text = "This should fail: @README.md/"
+    with pytest.raises(ValueError) as excinfo:
+        expand_file_refs(text)
+    assert "for directory expansion is not a directory" in str(excinfo.value)
+
+
+def test_skip_file_too_large(setup_test_environment):
+    """Tests that files exceeding MAX_FILE_SIZE are skipped."""
+    text = "Check this huge file: @large_file.txt"
+    expanded_text, file_list = expand_file_refs(text)
+
+    assert "--- SKIPPED (too large): large_file.txt ---" in expanded_text
+    assert "aaaaaaaa" not in expanded_text
+    assert len(file_list) == 0
+
+
+def test_limit_too_many_files_in_dir(setup_test_environment):
+    """Tests that directory expansion stops after MAX_FILES_IN_DIR."""
+    text = "Check this huge directory: @many_files_dir/"
+    expanded_text, file_list = expand_file_refs(text)
+    assert f"Exceeds limit of {MAX_FILES_IN_DIR} files" in expanded_text
+    assert len(file_list) == MAX_FILES_IN_DIR
+
+
+def test_limit_total_dir_size(tmp_path):
+    """Tests that directory expansion stops if total size is exceeded."""
+    size_test_dir = tmp_path / "size_test_dir"
+    size_test_dir.mkdir()
+    original_cwd = Path.cwd()
+    os.chdir(tmp_path)
+
+    try:
+        file_size = MAX_TOTAL_DIR_SIZE // 2 + 1000
+        (size_test_dir / "file1.txt").write_text("b" * file_size)
+        (size_test_dir / "file2.txt").write_text("c" * file_size)
+        (size_test_dir / "file3.txt").write_text("d" * 10000)
+        text = "Check this large content dir: @size_test_dir/"
+        expanded_text, file_list = expand_file_refs(text)
+
+        assert "SKIPPED (too large)" in expanded_text
+        assert "FILE REFERENCE:" in expanded_text
+        assert len(file_list) == 1
+    finally:
+        os.chdir(original_cwd)