ayechat 0.36.8__py3-none-any.whl → 0.37.0__py3-none-any.whl

aye/controller/llm_handler.py

@@ -15,6 +15,11 @@ from aye.model.snapshot import apply_updates
 from aye.model.file_processor import filter_unchanged_files, make_paths_relative
 from aye.model.models import LLMResponse
 from aye.model.auth import get_user_config
+from aye.model.write_validator import (
+    check_files_against_ignore_patterns,
+    is_strict_mode_enabled,
+    format_ignored_files_warning,
+)
 
 
 _HAS_USED_RESTORE_KEY = "has_used_restore"
@@ -91,16 +96,36 @@ def process_llm_response(
     if not updated_files:
         print_no_files_changed(console)
     else:
-        # Apply updates to the model (Model update)
-        try:
-            apply_updates(updated_files, prompt)
-            file_names = [item.get("file_name") for item in updated_files if "file_name" in item]
-            if file_names:
-                # Update the view
-                print_files_updated(console, file_names)
-                _maybe_print_restore_tip(conf, console)
-        except Exception as e:
-            rprint(f"[red]Error applying updates:[/] {e}")
+        # Check files against ignore patterns (issue #50)
+        root_path = Path(conf.root) if hasattr(conf, 'root') else Path.cwd()
+        allowed_files, ignored_files = check_files_against_ignore_patterns(
+            updated_files, root_path
+        )
+
+        # Handle ignored files
+        strict_mode = is_strict_mode_enabled()
+        if ignored_files:
+            warning_msg = format_ignored_files_warning(ignored_files, strict_mode)
+            console.print(Padding(warning_msg, (1, 4, 0, 4)))
+
+            if strict_mode:
+                # In strict mode, only write allowed files
+                updated_files = allowed_files
+            # In non-strict mode, continue with all files (just warned)
+
+        if not updated_files:
+            print_no_files_changed(console)
+        else:
+            # Apply updates to the model (Model update)
+            try:
+                apply_updates(updated_files, prompt)
+                file_names = [item.get("file_name") for item in updated_files if "file_name" in item]
+                if file_names:
+                    # Update the view
+                    print_files_updated(console, file_names)
+                    _maybe_print_restore_tip(conf, console)
+            except Exception as e:
+                rprint(f"[red]Error applying updates:[/] {e}")
 
     return new_chat_id
 

aye/controller/repl.py

@@ -1,7 +1,7 @@
 import os
 import json
 from pathlib import Path
-from typing import Optional, Any
+from typing import Optional, Any, List
 import shlex
 import threading
 import glob
@@ -252,6 +252,34 @@ def create_prompt_session(completer: Any, completion_style: str = "readline") ->
     )
 
 
+def _execute_forced_shell_command(command: str, args: List[str], conf: Any) -> None:
+    """Execute a shell command with force flag (bypasses command validation).
+    
+    Used when user prefixes input with '!' to force shell execution.
+    
+    Args:
+        command: The command to execute
+        args: List of arguments to pass to the command
+        conf: Configuration object with plugin_manager
+    """
+    telemetry.record_command(command, has_args=len(args) > 0, prefix=_CMD_PREFIX)
+    shell_response = conf.plugin_manager.handle_command(
+        "execute_shell_command", 
+        {"command": command, "args": args, "force": True}
+    )
+    if shell_response is not None:
+        if "stdout" in shell_response or "stderr" in shell_response:
+            if shell_response.get("stdout", "").strip():
+                rprint(shell_response["stdout"])
+            if shell_response.get("stderr", "").strip():
+                rprint(f"[yellow]{shell_response['stderr']}[/]")
+            if "error" in shell_response:
+                rprint(f"[red]Error:[/] {shell_response['error']}")
+        elif "message" in shell_response:
+            rprint(shell_response["message"])
+    else:
+        rprint(f"[red]Error:[/] Failed to execute shell command")
+
 
 def chat_repl(conf: Any) -> None:
     is_first_run = run_first_time_tutorial_if_needed()
@@ -327,6 +355,14 @@ def chat_repl(conf: Any) -> None:
                         chat_id = new_chat_id
                     continue
 
+                # Check for '!' prefix - force shell execution
+                force_shell = False
+                if prompt.strip().startswith('!'):
+                    force_shell = True
+                    prompt = prompt.strip()[1:]  # Remove the '!'
+                    if not prompt.strip():
+                        continue  # Nothing after the '!', skip
+
                 if not prompt.strip():
                     continue
                 tokens = shlex.split(prompt.strip(), posix=False)
@@ -340,6 +376,11 @@ def chat_repl(conf: Any) -> None:
 
             original_first, lowered_first = tokens[0], tokens[0].lower()
 
+            # If force_shell is True, execute as shell command directly and skip all other checks
+            if force_shell:
+                _execute_forced_shell_command(original_first, tokens[1:], conf)
+                continue
+
             # Normalize slash-prefixed commands: /restore -> restore, /model -> model, etc.
             if lowered_first.startswith('/'):
                 lowered_first = lowered_first[1:]  # Remove leading slash

aye/model/index_manager/index_manager.py

@@ -28,6 +28,7 @@ from .index_manager_state import (
     ProgressTracker,
     InitializationCoordinator,
     ErrorHandler,
+    _is_corruption_error,
 )
 from .index_manager_executor import PhaseExecutor
 
@@ -242,7 +243,15 @@ class IndexManager:  # pylint: disable=too-many-instance-attributes
         deleted = get_deleted_files(current_paths, old_index)
         if deleted:
             self._error_handler.info(f"Deleted: {len(deleted)} file(s) from index.")
-            vector_db.delete_from_index(self._init_coordinator.collection, deleted)
+            try:
+                vector_db.delete_from_index(self._init_coordinator.collection, deleted)
+            except Exception as e:
+                if _is_corruption_error(e):
+                    rprint(f"[yellow]Detected index corruption during delete: {e}[/]")
+                    self._init_coordinator.reset_and_recover()
+                    # Don't re-raise, recovery will rebuild the index
+                else:
+                    raise
 
     def _update_state_after_categorization(
         self,
@@ -549,9 +558,21 @@ class IndexManager:  # pylint: disable=too-many-instance-attributes
         if not self._init_coordinator.collection:
             return []
 
-        return vector_db.query_index(
-            collection=self._init_coordinator.collection,
-            query_text=query_text,
-            n_results=n_results,
-            min_relevance=min_relevance
-        )
+        try:
+            return vector_db.query_index(
+                collection=self._init_coordinator.collection,
+                query_text=query_text,
+                n_results=n_results,
+                min_relevance=min_relevance
+            )
+        except Exception as e:
+            if _is_corruption_error(e):
+                rprint(f"[yellow]Detected index corruption during query: {e}[/]")
+                if self._init_coordinator.reset_and_recover():
+                    # Recovery succeeded, index will rebuild in background
+                    # Return empty results for this query
+                    return []
+                # Recovery failed, code search disabled
+                return []
+            # Not a corruption error, re-raise
+            raise

aye/model/index_manager/index_manager_state.py

@@ -267,6 +267,13 @@ _CORRUPTION_INDICATORS = (
     "OperationalError",
     "DatabaseError",
     "IntegrityError",
+    # HNSW-related errors (ChromaDB internal index corruption)
+    # See: https://github.com/acrotron/aye-chat/issues/203
+    "hnsw",
+    "segment reader",
+    "compactor",
+    "executing plan",
+    "backfill",
 )
 
 
@@ -399,22 +406,22 @@ class InitializationCoordinator:
     def _attempt_recovery(self) -> bool:
         """
         Attempt to recover from ChromaDB corruption.
-        
+
         Strategy:
         1. Quarantine the corrupt chroma_db directory
         2. Invalidate the hash index (so files get re-indexed)
         3. Retry initialization with fresh DB
-        
+
         Returns:
             True if recovery succeeded, False otherwise
         """
         from aye.model import vector_db
-        
+
         self._recovery_attempted = True
         timestamp = int(time.time())
-        
+
         rprint("[yellow]Attempting automatic recovery...[/]")
-        
+
         # Step 1: Quarantine corrupt ChromaDB
         chroma_path = self.config.chroma_db_path
         if chroma_path.exists():
@@ -429,7 +436,7 @@ class InitializationCoordinator:
                     shutil.rmtree(str(chroma_path), ignore_errors=True)
                 except Exception:
                     pass
-        
+
         # Step 2: Invalidate hash index (so all files get re-indexed)
         hash_index_path = self.config.hash_index_path
         if hash_index_path.exists():
@@ -443,7 +450,7 @@ class InitializationCoordinator:
                     hash_index_path.unlink(missing_ok=True)
                 except Exception:
                     pass
-        
+
         # Step 3: Retry initialization
         try:
             rprint("[cyan]Reinitializing code search index...[/]")
@@ -459,6 +466,26 @@ class InitializationCoordinator:
             self.collection = None
             return False
 
+    def reset_and_recover(self) -> bool:
+        """
+        Reset state and attempt recovery from corruption detected during operations.
+
+        This is called when corruption is detected during query/update operations
+        (not during initialization). It resets the initialization state and
+        attempts recovery.
+
+        Returns:
+            True if recovery succeeded, False otherwise
+        """
+        with self._lock:
+            # Reset state to allow re-initialization
+            self._is_initialized = False
+            self._recovery_attempted = False
+            self.collection = None
+
+            # Now attempt recovery
+            return self._attempt_recovery()
+
 
 # =============================================================================
 # Error Handler

aye/model/write_validator.py

@@ -0,0 +1,105 @@
+"""Validates file writes against ignore patterns.
+
+This module provides functionality to check if files being written
+match .gitignore or .ayeignore patterns, and optionally block such writes.
+
+See: https://github.com/acrotron/aye-chat/issues/50
+"""
+
+from pathlib import Path
+from typing import List, Dict, Tuple
+
+from aye.model.ignore_patterns import load_ignore_patterns
+from aye.model.auth import get_user_config
+
+
+# Config key for strict mode (block writes to ignored files)
+BLOCK_IGNORED_WRITES_KEY = "block_ignored_file_writes"
+
+
+def is_strict_mode_enabled() -> bool:
+    """Check if strict mode is enabled (block writes to ignored files).
+
+    Can be set via:
+    - Environment variable: AYE_BLOCK_IGNORED_FILE_WRITES=on
+    - Config file (~/.ayecfg): block_ignored_file_writes=on
+
+    Returns:
+        True if strict mode is enabled, False otherwise (default)
+    """
+    value = get_user_config(BLOCK_IGNORED_WRITES_KEY, "off")
+    return str(value).lower() in ("on", "true", "1", "yes")
+
+
+def check_files_against_ignore_patterns(
+    files: List[Dict[str, str]],
+    root_path: Path
+) -> Tuple[List[Dict[str, str]], List[Dict[str, str]]]:
+    """Check which files match ignore patterns.
+
+    Args:
+        files: List of file dicts with 'file_name' and 'file_content' keys
+        root_path: Project root path for loading ignore patterns
+
+    Returns:
+        Tuple of (allowed_files, ignored_files)
+        - allowed_files: Files that don't match any ignore pattern
+        - ignored_files: Files that match ignore patterns
+    """
+    if not files:
+        return [], []
+
+    ignore_spec = load_ignore_patterns(root_path)
+
+    allowed_files = []
+    ignored_files = []
+
+    for file_dict in files:
+        file_name = file_dict.get("file_name", "")
+        if not file_name:
+            continue
+
+        # Normalize path for matching
+        # The pathspec library expects forward slashes
+        rel_path = file_name.replace("\\", "/")
+
+        if ignore_spec.match_file(rel_path):
+            ignored_files.append(file_dict)
+        else:
+            allowed_files.append(file_dict)
+
+    return allowed_files, ignored_files
+
+
+def format_ignored_files_warning(
+    ignored_files: List[Dict[str, str]],
+    strict_mode: bool
+) -> str:
+    """Format a warning message about ignored files.
+
+    Args:
+        ignored_files: List of file dicts that match ignore patterns
+        strict_mode: Whether strict mode is enabled
+
+    Returns:
+        Formatted warning message
+    """
+    file_names = [f.get("file_name", "unknown") for f in ignored_files]
+    file_list = ", ".join(file_names)
+
+    if strict_mode:
+        msg = (
+            f"[yellow]Blocked write to ignored file(s): {file_list}[/]\n"
+            "[dim]These files match patterns in .gitignore or .ayeignore and were "
+            "not written.[/]"
+        )
+    else:
+        msg = (
+            f"[yellow]Warning: Writing to ignored file(s): {file_list}[/]\n"
+            "[dim]These files match patterns in .gitignore or .ayeignore. "
+            "Since they weren't read into context, their original content will be overwritten.[/]\n"
+            "[dim]To block writes to ignored files, set [bold]block_ignored_file_writes=on[/bold] "
+            "in ~/.ayecfg or use [bold]AYE_BLOCK_IGNORED_FILE_WRITES=on[/bold] environment variable.[/]"
+        )
+
+    return msg

aye/plugins/shell_executor.py

@@ -10,7 +10,7 @@ from rich import print as rprint
 
 class ShellExecutorPlugin(Plugin):
     name = "shell_executor"
-    version = "1.0.2"  # Fixed Windows localization bug in command detection
+    version = "1.0.3"  # Added force parameter for ! prefix execution
     premium = "free"
 
     # Known interactive commands that require a TTY (add more as needed)
@@ -143,15 +143,17 @@ class ShellExecutorPlugin(Plugin):
                 "returncode": e.returncode
             }
         except FileNotFoundError:
-            return None  # Command not found
+            return {"error": f"Command not found: {command}", "stdout": "", "stderr": "", "returncode": 127}
 
     def on_command(self, command_name: str, params: Dict[str, Any]) -> Optional[Dict[str, Any]]:
         """Handle shell command execution through plugin system."""
         if command_name == "execute_shell_command":
             command = params.get("command", "")
             args = params.get("args", [])
+            force = params.get("force", False)
             
-            if not self._is_valid_command(command):
+            # If force is False, validate the command exists first
+            if not force and not self._is_valid_command(command):
                 return None  # Command not found or not executable
             
             full_cmd_str = self._build_full_cmd(command, args)

aye/presenter/repl_ui.py

@@ -87,7 +87,7 @@ def print_help_message():
     commands = [
         # Some commands are intentionally undocumented: keep them as such.
         ("@filename", "Include a file in your prompt inline (e.g., \"explain @main.py\"). Supports wildcards (e.g., @*.py, @src/*.js)."),
-        ("blog <intent>", "Generate a technical deep-dive blog post derived from the current chat session and write it to blog.md."),
+        ("!command", "Force shell execution (e.g., \"!echo hello\")."),
         ("model", "Select a different model. Selection will persist between sessions."),
         (r"verbose \[on|off]", "Toggle verbose mode to increase or decrease chattiness (on/off, persists between sessions)"),
         (r"completion \[readline|multi]", "Switch auto-completion style (readline or multi, persists between sessions)"),

{ayechat-0.36.8.dist-info → ayechat-0.37.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ayechat
-Version: 0.36.8
+Version: 0.37.0
 Summary: Aye Chat: Terminal-first AI Code Generator
 Author-email: "Acrotron, Inc." <info@acrotron.com>
 License: MIT

{ayechat-0.36.8.dist-info → ayechat-0.37.0.dist-info}/RECORD

@@ -5,10 +5,10 @@ aye/__main_chat__.py,sha256=R6RaidxG3Px5TaYxcoWAuIleE5KUZlceneUB6u_9UVU,1066
 aye/controller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aye/controller/command_handlers.py,sha256=C-6beHXVhW8vR_AbH4dCPl794ycFNVGuMBQiHnH4naI,13438
 aye/controller/commands.py,sha256=sXmK_sgNBrw9Fs7mKcr93-wsu740ZlvWSisQfS-1EUE,12278
-aye/controller/llm_handler.py,sha256=9Am1vK2tv5GLQcqIzdhopjxB8iGbc9p6_Qhet5FB31U,4087
+aye/controller/llm_handler.py,sha256=BSBab6onF9BYiFndYW1647eEy377Vt52trzu0Qjm4bQ,5075
 aye/controller/llm_invoker.py,sha256=p_Vk2a3YrWKwDupLfSVRinR5llDfq1Fb_f7WrYozK6M,14127
 aye/controller/plugin_manager.py,sha256=9ZuITyA5sQJJJU-IntLQ1SsxXsDnbgZKPOF4e9VmsEU,3018
-aye/controller/repl.py,sha256=FOw8jH2gJp8DcNrSiUZkwrqB-qtDZ4b_9HwwpK4jiHY,24697
+aye/controller/repl.py,sha256=UCgH4bdL3AUYjgD6KPtIOeysCNaYbs0TvEwS3Zql8kY,26552
 aye/controller/tutorial.py,sha256=lc92jOcJOYCVrrjTEF0Suk4-8jn-ku98kTJEIL8taUA,7254
 aye/controller/util.py,sha256=gBmktDEaY63OKhgzZHA2IFrgcWUN_Iphn3e1daEeUBI,2828
 aye/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -27,11 +27,12 @@ aye/model/source_collector.py,sha256=KU84H-N7Ypj5UFKFJAqg_wa_gXyQRB5alEG_5wYeV1o
 aye/model/telemetry.py,sha256=qHnwxzTjDe7gbEah89qfKM4nKvBNa7nU_vfybFJTtRo,3255
 aye/model/vector_db.py,sha256=Bw5SKuclGR2wWKfyx7gIWS0UngjXkr5kUGnNIYtTjlw,6329
 aye/model/version_checker.py,sha256=cLAPF9tn-LyI4Q16UdDAj27BenhuzhL4K6-0nxw12IA,6169
+aye/model/write_validator.py,sha256=_tNjR8iL56TxdgIrF2M0IaZz_tY8MiDrqd6F7lVVIlE,3345
 aye/model/index_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aye/model/index_manager/index_manager.py,sha256=5cW--ivSY1fOg9gSpggTYzgLe8-MYHOu2zI9Wj6EdzA,19955
+aye/model/index_manager/index_manager.py,sha256=TkPguukV3PqJSVNEVxsjrRdUuTdRPUjcCTYppaeuV1I,20912
 aye/model/index_manager/index_manager_executor.py,sha256=rSI8OX9bFld5ta-ajfT8eWU5taYJ7ovr0hA7hH0meqI,9464
 aye/model/index_manager/index_manager_file_ops.py,sha256=petgGU0ZtXOvLkHAQuzSbzqNIew5HygBOAy4yG6rTlk,7656
-aye/model/index_manager/index_manager_state.py,sha256=8WILwoQVs9TqLKrZdIZEw54sjQ3HH6CctUL_qWZnYXM,16742
+aye/model/index_manager/index_manager_state.py,sha256=LflyC8UbE8fT7Tyag1ueh7TBisPa15cRhs0JI1-jVEw,17587
 aye/model/index_manager/index_manager_utils.py,sha256=B4NCYuScxQcG46WoUEx8mxfWKDjTlrSf3coRQCydiBM,4615
 aye/model/snapshot/__init__.py,sha256=Lqq-W5RBGxu3_7O5DzW_qY5iOF9MhogA46BAqEdu6Mw,6958
 aye/model/snapshot/base.py,sha256=5fzxM_85avxHwocv-w6PwlxDPzvMdTbuoUE_9P6D844,2009
@@ -44,17 +45,17 @@ aye/plugins/completer.py,sha256=qhxke5Q76P2u0LojSIL3V48RTNG5tWL-5-TK5tNutrE,1389
 aye/plugins/local_model.py,sha256=Jj4bHiPYaLMx6zTrKamBPrkiGQQ787jWz0F4ojRCjlQ,14394
 aye/plugins/offline_llm.py,sha256=qFmd1e8Lbl7yiMgXpXjOQkQTNxOk0_WXU7km2DTKXGY,13357
 aye/plugins/plugin_base.py,sha256=t5hTOnA0dZC237BnseAgdXbOqErlSCNLUo_Uul09TSw,1673
-aye/plugins/shell_executor.py,sha256=B4R04pJsjS6uy7z4MP_WcbxMPB6ct8V3BNFp9JMldrE,7317
+aye/plugins/shell_executor.py,sha256=a0mlZnQeURONdtPM7iageTcQ8PiNLQbjxoY54EsS32o,7502
 aye/plugins/slash_completer.py,sha256=MyrDTC_KwVWhtD_kpHbu0WjSjmSAWp36PwOBQczSuXA,2252
 aye/presenter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aye/presenter/cli_ui.py,sha256=8oHqQiMHO8hHXCTdqWoquMkJBshl2_3-YWN6SQnlbKg,8449
 aye/presenter/diff_presenter.py,sha256=cbxfOEqGomPTDvQpKdybfYeNUD2DYVAl85j1uy5--Ww,12512
-aye/presenter/repl_ui.py,sha256=OTJlcqNdNoaAwfEUqallig45rIzMoKa0dUSxk6Io4jU,7979
+aye/presenter/repl_ui.py,sha256=J6QlcFa_qvV00NP1OS5xyhDuJcfNcCrADZq9ZFY2GKQ,7917
 aye/presenter/streaming_ui.py,sha256=_3tBEuNH9UQ9Gyq2yuvRfX4SWVkcGMYirEUGj-MXVJ0,12768
 aye/presenter/ui_utils.py,sha256=6KXR4_ZZZUdF5pCHrPqO8yywlQk7AOzWe-2B4Wj_-ZQ,5441
-ayechat-0.36.8.dist-info/licenses/LICENSE,sha256=U1ou6lkMKmPo16-E9YowIu3goU7sOWKUprGo0AOA72s,1065
-ayechat-0.36.8.dist-info/METADATA,sha256=okYdZu_eftFmX9Vrq0v4sDR3X0nahKOxC3jCwyNhZhw,7699
-ayechat-0.36.8.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-ayechat-0.36.8.dist-info/entry_points.txt,sha256=KGsOma6szoefNN6vHozg3Pbf1fjZ7ZbmwrOiVwBd0Ik,41
-ayechat-0.36.8.dist-info/top_level.txt,sha256=7WZL0LOx4-GKKvgU1mtI5s4Dhk2OdieVZZvVnxFJHr8,4
-ayechat-0.36.8.dist-info/RECORD,,
+ayechat-0.37.0.dist-info/licenses/LICENSE,sha256=U1ou6lkMKmPo16-E9YowIu3goU7sOWKUprGo0AOA72s,1065
+ayechat-0.37.0.dist-info/METADATA,sha256=8BCRHQJzQlqt1wq05u1XNXJrrxc42Y0Hkw0we25mBUE,7699
+ayechat-0.37.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+ayechat-0.37.0.dist-info/entry_points.txt,sha256=KGsOma6szoefNN6vHozg3Pbf1fjZ7ZbmwrOiVwBd0Ik,41
+ayechat-0.37.0.dist-info/top_level.txt,sha256=7WZL0LOx4-GKKvgU1mtI5s4Dhk2OdieVZZvVnxFJHr8,4
+ayechat-0.37.0.dist-info/RECORD,,