tunacode-cli 0.0.38__py3-none-any.whl → 0.0.40__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.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/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/utils/text_utils.py

@@ -51,50 +51,156 @@ def ext_to_lang(path: str) -> str:
 
 
 def expand_file_refs(text: str) -> Tuple[str, List[str]]:
-    """Expand @file references with file contents wrapped in code fences.
+    """
+    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 @file references.
+        text: The input text potentially containing @-references.
 
     Returns:
-        Tuple[str, List[str]]: A tuple containing:
-            - Text with any @file references replaced by the file's contents
-            - List of absolute paths of files that were successfully expanded
+        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 file does not exist or is too large.
+        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,
-        ERROR_FILE_TOO_LARGE,
-        MAX_FILE_SIZE,
-        MSG_FILE_SIZE_LIMIT,
+        MAX_FILES_IN_DIR,
+        MAX_TOTAL_DIR_SIZE,
     )
 
-    pattern = re.compile(r"@([\w./_-]+)")
+    # Regex now includes trailing / and ** to capture directory intentions
+    pattern = re.compile(r"@([\w./\-_*]+)")
     expanded_files = []
 
     def replacer(match: re.Match) -> str:
-        path = match.group(1)
-        if not os.path.exists(path):
-            raise ValueError(ERROR_FILE_NOT_FOUND.format(filepath=path))
+        path_spec = match.group(1)
 
-        if os.path.getsize(path) > MAX_FILE_SIZE:
-            raise ValueError(ERROR_FILE_TOO_LARGE.format(filepath=path) + MSG_FILE_SIZE_LIMIT)
+        is_recursive = path_spec.endswith("/**")
+        is_dir = path_spec.endswith("/")
 
-        with open(path, "r", encoding="utf-8") as f:
-            content = f.read()
+        # 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.")
 
-        # Track the absolute path of the file
-        abs_path = os.path.abspath(path)
-        expanded_files.append(abs_path)
+    expanded_text = pattern.sub(replacer, text)
+    return expanded_text, list(set(expanded_files))
 
-        lang = ext_to_lang(path)
-        # Add clear headers to indicate this is a file reference, not code to write
-        return f"\n=== FILE REFERENCE: {path} ===\n```{lang}\n{content}\n```\n=== END FILE REFERENCE: {path} ===\n"
 
-    expanded_text = pattern.sub(replacer, text)
-    return expanded_text, 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.dist-info → tunacode_cli-0.0.40.dist-info}/METADATA

@@ -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.dist-info → tunacode_cli-0.0.40.dist-info}/RECORD

@@ -1,5 +1,5 @@
 tunacode/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tunacode/constants.py,sha256=jeHuCL2EDeSD4sheoW_Sxx50SyuojIo_1RrhqelGIWo,4074
+tunacode/constants.py,sha256=70p2W_hEiyypHaSXzMjnsHlbJsS8kg95-YRDi-iNEs8,4406
 tunacode/context.py,sha256=6sterdRvPOyG3LU0nEAXpBsEPZbO3qtPyTlJBi-_VXE,2612
 tunacode/exceptions.py,sha256=mTWXuWyr1k16CGLWN2tsthDGi7lbx1JK0ekIqogYDP8,3105
 tunacode/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -40,7 +40,7 @@ tunacode/core/setup/config_setup.py,sha256=xOQcjlFEL7HtGXH7wtpu83S6oA9K02wLYR1r-
 tunacode/core/setup/coordinator.py,sha256=oVTN2xIeJERXitVJpkIk9tDGLs1D1bxIRmaogJwZJFI,2049
 tunacode/core/setup/environment_setup.py,sha256=n3IrObKEynHZSwtUJ1FddMg2C4sHz7ca42awemImV8s,2225
 tunacode/core/setup/git_safety_setup.py,sha256=CRIqrQt0QUJQRS344njty_iCqTorrDhHlXRuET7w0Tk,6714
-tunacode/prompts/system.md,sha256=qnTXKEVsQY7o54B2kFNsdkbbCHhxdqVXytUQbhKy7PM,12027
+tunacode/prompts/system.md,sha256=YgcHMlksWHzi_R8XKGN7B7vz1rsqUZKHYq05Dlqewt0,13202
 tunacode/services/__init__.py,sha256=w_E8QK6RnvKSvU866eDe8BCRV26rAm4d3R-Yg06OWCU,19
 tunacode/services/mcp.py,sha256=R48X73KQjQ9vwhBrtbWHSBl-4K99QXmbIhh5J_1Gezo,3046
 tunacode/tools/__init__.py,sha256=ECBuUWWF1JjHW42CCceaPKgVTQyuljbz3RlhuA2fe2s,314
@@ -76,12 +76,12 @@ tunacode/utils/import_cache.py,sha256=q_xjJbtju05YbFopLDSkIo1hOtCx3DOTl3GQE5FFDg
 tunacode/utils/ripgrep.py,sha256=AXUs2FFt0A7KBV996deS8wreIlUzKOlAHJmwrcAr4No,583
 tunacode/utils/security.py,sha256=e_zo9VmcOKFjgFMr9GOBIFhAmND4PBlJZgY7zqnsGjI,6548
 tunacode/utils/system.py,sha256=FSoibTIH0eybs4oNzbYyufIiV6gb77QaeY2yGqW39AY,11381
-tunacode/utils/text_utils.py,sha256=IiRviMqz5uoAbid8emkRXxgvQz6KE27ZeQom-qh9ymI,2984
+tunacode/utils/text_utils.py,sha256=6YBD9QfkDO44-6jxnwRWIpmfIifPG-NqMzy_O2NAouc,7277
 tunacode/utils/token_counter.py,sha256=nGCWwrHHFbKywqeDCEuJnADCkfJuzysWiB6cCltJOKI,648
 tunacode/utils/user_configuration.py,sha256=Ilz8dpGVJDBE2iLWHAPT0xR8D51VRKV3kIbsAz8Bboc,3275
-tunacode_cli-0.0.38.dist-info/licenses/LICENSE,sha256=Btzdu2kIoMbdSp6OyCLupB1aRgpTCJ_szMimgEnpkkE,1056
-tunacode_cli-0.0.38.dist-info/METADATA,sha256=ZZQZxF20NxdGVHTGu5q0KV1vniDyg9QmPSD4vKfRVlI,5064
-tunacode_cli-0.0.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tunacode_cli-0.0.38.dist-info/entry_points.txt,sha256=hbkytikj4dGu6rizPuAd_DGUPBGF191RTnhr9wdhORY,51
-tunacode_cli-0.0.38.dist-info/top_level.txt,sha256=lKy2P6BWNi5XSA4DHFvyjQ14V26lDZctwdmhEJrxQbU,9
-tunacode_cli-0.0.38.dist-info/RECORD,,
+tunacode_cli-0.0.40.dist-info/licenses/LICENSE,sha256=Btzdu2kIoMbdSp6OyCLupB1aRgpTCJ_szMimgEnpkkE,1056
+tunacode_cli-0.0.40.dist-info/METADATA,sha256=77mabiAPHOIxkWTQjhTkzhKxENwIGRO4yA_xhbkHW3c,5106
+tunacode_cli-0.0.40.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tunacode_cli-0.0.40.dist-info/entry_points.txt,sha256=hbkytikj4dGu6rizPuAd_DGUPBGF191RTnhr9wdhORY,51
+tunacode_cli-0.0.40.dist-info/top_level.txt,sha256=lKy2P6BWNi5XSA4DHFvyjQ14V26lDZctwdmhEJrxQbU,9
+tunacode_cli-0.0.40.dist-info/RECORD,,