tunacode-cli 0.0.70__py3-none-any.whl → 0.0.78.6__py3-none-any.whl

tunacode/types.py

@@ -6,7 +6,6 @@ used throughout the TunaCode codebase.
 """
 
 from dataclasses import dataclass, field
-from datetime import datetime
 
 # Plan types will be defined below
 from enum import Enum
@@ -17,39 +16,20 @@ from typing import (
     Callable,
     Dict,
     List,
-    Literal,
     Optional,
     Protocol,
     Tuple,
     Union,
 )
 
-# Try to import pydantic-ai types if available
-try:
-    from pydantic_ai import Agent
-    from pydantic_ai.messages import ModelRequest, ToolReturnPart
+# Import pydantic-ai types (required dependency)
+from pydantic_ai import Agent
+from pydantic_ai.messages import ModelRequest, ToolReturnPart
 
-    PydanticAgent = Agent
-    MessagePart = Union[ToolReturnPart, Any]
-    ModelRequest = ModelRequest  # type: ignore[misc]
-    ModelResponse = Any
-except ImportError:
-    # Fallback if pydantic-ai is not available
-    PydanticAgent = Any
-    MessagePart = Any  # type: ignore[misc]
-    ModelRequest = Any
-    ModelResponse = Any  # type: ignore[misc]
-
-
-@dataclass
-class TodoItem:
-    id: str
-    content: str
-    status: Literal["pending", "in_progress", "completed"]
-    priority: Literal["high", "medium", "low"]
-    created_at: datetime
-    completed_at: Optional[datetime] = None
-    tags: list[str] = field(default_factory=list)
+PydanticAgent = Agent
+MessagePart = Union[ToolReturnPart, Any]
+ModelRequest = ModelRequest  # type: ignore[misc]
+ModelResponse = Any
 
 
 # =============================================================================
@@ -129,6 +109,7 @@ class ToolConfirmationResponse:
     approved: bool
     skip_future: bool = False
     abort: bool = False
+    instructions: str = ""
 
 
 # =============================================================================
@@ -195,59 +176,13 @@ class SimpleResult:
     output: str
 
 
-# =============================================================================
-# Plan Types
-# =============================================================================
-
-
-class PlanPhase(Enum):
-    """Plan Mode phases."""
-
-    PLANNING_RESEARCH = "research"
-    PLANNING_DRAFT = "draft"
-    PLAN_READY = "ready"
-    REVIEW_DECISION = "review"
+class AgentState(Enum):
+    """Agent loop states for enhanced completion detection."""
 
-
-@dataclass
-class PlanDoc:
-    """Structured plan document with all required sections."""
-
-    # Required sections
-    title: str
-    overview: str
-    steps: List[str]
-    files_to_modify: List[str]
-    files_to_create: List[str]
-
-    # Optional but recommended sections
-    risks: List[str] = field(default_factory=list)
-    tests: List[str] = field(default_factory=list)
-    rollback: Optional[str] = None
-    open_questions: List[str] = field(default_factory=list)
-    success_criteria: List[str] = field(default_factory=list)
-    references: List[str] = field(default_factory=list)
-
-    def validate(self) -> Tuple[bool, List[str]]:
-        """
-        Validate the plan document.
-
-        Returns:
-            tuple: (is_valid, list_of_missing_sections)
-        """
-        missing = []
-
-        # Check required fields
-        if not self.title or not self.title.strip():
-            missing.append("title")
-        if not self.overview or not self.overview.strip():
-            missing.append("overview")
-        if not self.steps:
-            missing.append("steps")
-        if not self.files_to_modify and not self.files_to_create:
-            missing.append("files_to_modify or files_to_create")
-
-        return len(missing) == 0, missing
+    USER_INPUT = "user_input"  # Initial: user prompt received
+    ASSISTANT = "assistant"  # Reasoning/deciding phase
+    TOOL_EXECUTION = "tool_execution"  # Tool execution phase
+    RESPONSE = "response"  # Handling results, may complete or loop
 
 
 # =============================================================================

tunacode/ui/completers.py

@@ -1,23 +1,40 @@
 """Completers for file references and commands."""
 
 import os
-from typing import TYPE_CHECKING, Iterable, Optional
+from typing import TYPE_CHECKING, Iterable, List, Optional, Sequence, Set, Tuple
 
 from prompt_toolkit.completion import (
     CompleteEvent,
     Completer,
     Completion,
+    FuzzyCompleter,
+    FuzzyWordCompleter,
+    PathCompleter,
     merge_completers,
 )
 from prompt_toolkit.document import Document
 
+from .path_heuristics import prioritize_roots, should_skip_directory
+
 if TYPE_CHECKING:
     from ..cli.commands import CommandRegistry
+    from ..utils.models_registry import ModelInfo, ModelsRegistry
 
 
 class CommandCompleter(Completer):
     """Completer for slash commands."""
 
+    _DEFAULT_COMMANDS: Sequence[str] = (
+        "/help",
+        "/clear",
+        "/dump",
+        "/yolo",
+        "/branch",
+        "/compact",
+        "/model",
+    )
+    _FUZZY_WORD_MODE = True
+
     def __init__(self, command_registry: Optional["CommandRegistry"] = None):
         self.command_registry = command_registry
 
@@ -49,30 +66,36 @@ class CommandCompleter(Completer):
         if self.command_registry:
             command_names = self.command_registry.get_command_names()
         else:
-            # Fallback list of commands
-            command_names = ["/help", "/clear", "/dump", "/yolo", "/branch", "/compact", "/model"]
+            command_names = list(self._DEFAULT_COMMANDS)
 
-        # Get the partial command (without /)
-        partial = word_before_cursor[1:].lower()
-
-        # Yield completions for matching commands
-        for cmd in command_names:
-            if cmd.startswith("/") and cmd[1:].lower().startswith(partial):
-                yield Completion(
-                    text=cmd,
-                    start_position=-len(word_before_cursor),
-                    display=cmd,
-                    display_meta="command",
-                )
+        fuzzy_completer = FuzzyWordCompleter(command_names, WORD=self._FUZZY_WORD_MODE)
+        for completion in fuzzy_completer.get_completions(document, _complete_event):
+            yield Completion(
+                text=completion.text,
+                start_position=completion.start_position,
+                display=completion.display,
+                display_meta="command",
+            )
 
 
 class FileReferenceCompleter(Completer):
     """Completer for @file references that provides file path suggestions."""
 
+    _FUZZY_WORD_MODE = True
+    _FUZZY_RESULT_LIMIT = 10
+    _GLOBAL_ROOT_CACHE: Optional[List[str]] = None
+    _GLOBAL_ROOT_LIMIT = 128
+    _GLOBAL_MAX_DEPTH = 20
+
     def get_completions(
         self, document: Document, _complete_event: CompleteEvent
     ) -> Iterable[Completion]:
-        """Get completions for @file references."""
+        """Get completions for @file references.
+
+        Favors file matches before directory matches while allowing fuzzy
+        near-miss suggestions. Ordering:
+          exact files > fuzzy files > exact dirs > fuzzy dirs
+        """
         # Get the word before cursor
         word_before_cursor = document.get_word_before_cursor(WORD=True)
 
@@ -93,44 +116,405 @@ class FileReferenceCompleter(Completer):
             dir_path = "."
             prefix = path_part
 
-        # Get matching files
+        # If prefix itself is an existing directory (without trailing slash),
+        # treat it as browsing inside that directory
+        candidate_dir = os.path.join(dir_path, prefix) if dir_path != "." else prefix
+        if prefix and os.path.isdir(candidate_dir) and not path_part.endswith("/"):
+            dir_path = candidate_dir
+            prefix = ""
+
+        # Get matching files using prefix matching
         try:
             if os.path.exists(dir_path) and os.path.isdir(dir_path):
-                for item in sorted(os.listdir(dir_path)):
-                    if item.startswith(prefix):
-                        full_path = os.path.join(dir_path, item) if dir_path != "." else item
-
-                        # Skip hidden files unless explicitly requested
-                        if item.startswith(".") and not prefix.startswith("."):
-                            continue
-
-                        # Add / for directories
-                        if os.path.isdir(full_path):
-                            display = item + "/"
-                            completion = full_path + "/"
-                        else:
-                            display = item
-                            completion = full_path
-
-                        # Calculate how much to replace
-                        start_position = -len(path_part)
-
-                        yield Completion(
-                            text=completion,
-                            start_position=start_position,
-                            display=display,
-                            display_meta="dir" if os.path.isdir(full_path) else "file",
-                        )
+                items = sorted(os.listdir(dir_path))
+
+                # Separate files vs dirs; skip hidden unless explicitly requested
+                show_hidden = prefix.startswith(".")
+                files: List[str] = []
+                dirs: List[str] = []
+                for item in items:
+                    if item.startswith(".") and not show_hidden:
+                        continue
+                    full_item_path = os.path.join(dir_path, item) if dir_path != "." else item
+                    if os.path.isdir(full_item_path):
+                        dirs.append(item)
+                    else:
+                        files.append(item)
+
+                # Exact prefix matches (case-insensitive)
+                prefix_lower = prefix.lower()
+                exact_files = [f for f in files if f.lower().startswith(prefix_lower)]
+                exact_dirs = [d for d in dirs if d.lower().startswith(prefix_lower)]
+
+                fuzzy_file_candidates = [f for f in files if f not in exact_files]
+                fuzzy_dir_candidates = [d for d in dirs if d not in exact_dirs]
+
+                fuzzy_files = self._collect_fuzzy_matches(prefix, fuzzy_file_candidates)
+                fuzzy_dirs = self._collect_fuzzy_matches(prefix, fuzzy_dir_candidates)
+
+                ordered: List[tuple[str, str, bool]] = (
+                    [("file", name, False) for name in exact_files]
+                    + [("file", name, False) for name in fuzzy_files]
+                    + [("dir", name, False) for name in exact_dirs]
+                    + [("dir", name, False) for name in fuzzy_dirs]
+                )
+
+                local_seen: Set[str] = {
+                    os.path.normpath(os.path.join(dir_path, name))
+                    if dir_path != "."
+                    else os.path.normpath(name)
+                    for name in (*exact_files, *fuzzy_files, *exact_dirs, *fuzzy_dirs)
+                }
+
+                global_matches = self._collect_global_path_matches(
+                    prefix,
+                    dir_path,
+                    local_seen,
+                )
+                ordered += global_matches
+
+                start_position = -len(path_part)
+                for kind, name, is_global in ordered:
+                    if is_global:
+                        full_path = name
+                        display = name + "/" if kind == "dir" else name
+                    else:
+                        full_path = os.path.join(dir_path, name) if dir_path != "." else name
+                        display = name + "/" if kind == "dir" else name
+                    if kind == "dir":
+                        completion_text = full_path + "/"
+                    else:
+                        completion_text = full_path
+
+                    yield Completion(
+                        text=completion_text,
+                        start_position=start_position,
+                        display=display,
+                        display_meta="dir" if kind == "dir" else "file",
+                    )
         except (OSError, PermissionError):
             # Silently ignore inaccessible directories
             pass
 
+    @classmethod
+    # CLAUDE_ANCHOR[key=1f0911c7] Prompt Toolkit fuzzy matching consolidates file and
+    # directory suggestions
+    def _collect_fuzzy_matches(cls, prefix: str, candidates: Sequence[str]) -> List[str]:
+        """Return fuzzy-ordered candidate names respecting configured limit."""
 
-def create_completer(command_registry: Optional["CommandRegistry"] = None) -> Completer:
-    """Create a merged completer for both commands and file references."""
-    return merge_completers(
-        [
-            CommandCompleter(command_registry),
-            FileReferenceCompleter(),
-        ]
-    )
+        if not prefix or not candidates:
+            return []
+
+        fuzzy_completer = FuzzyWordCompleter(candidates, WORD=cls._FUZZY_WORD_MODE)
+        prefix_document = Document(text=prefix)
+        event = CompleteEvent(completion_requested=True)
+        matches: List[str] = []
+        for completion in fuzzy_completer.get_completions(prefix_document, event):
+            candidate = completion.text
+            if candidate in candidates and candidate not in matches:
+                matches.append(candidate)
+            if len(matches) >= cls._FUZZY_RESULT_LIMIT:
+                break
+        return matches
+
+    @classmethod
+    def _collect_global_path_matches(
+        cls,
+        prefix: str,
+        current_dir: str,
+        seen: Set[str],
+    ) -> List[Tuple[str, str, bool]]:
+        """Return global fuzzy matches outside the current directory."""
+
+        if not prefix:
+            return []
+
+        roots = cls._global_roots()
+        if not roots:
+            return []
+
+        event = CompleteEvent(completion_requested=True)
+        document = Document(text=prefix)
+        matches: List[Tuple[str, str, bool]] = []
+        normalized_current = os.path.normpath(current_dir or ".")
+
+        for root in roots:
+            normalized_root = os.path.normpath(root)
+            if normalized_root == normalized_current:
+                continue
+
+            completer = FuzzyCompleter(
+                PathCompleter(only_directories=False, get_paths=lambda root=normalized_root: [root])
+            )
+            for completion in completer.get_completions(document, event):
+                candidate_path = os.path.normpath(os.path.join(normalized_root, completion.text))
+                if candidate_path in seen:
+                    continue
+
+                seen.add(candidate_path)
+                normalized_display = os.path.relpath(candidate_path, start=".").replace("\\", "/")
+                matches.append(
+                    (
+                        "dir" if os.path.isdir(candidate_path) else "file",
+                        normalized_display,
+                        True,
+                    )
+                )
+                if len(matches) >= cls._FUZZY_RESULT_LIMIT:
+                    return matches
+
+        return matches
+
+    @classmethod
+    def _global_roots(cls) -> List[str]:
+        """Compute cached directory list for global fuzzy lookups."""
+
+        if cls._GLOBAL_ROOT_CACHE is not None:
+            return cls._GLOBAL_ROOT_CACHE
+
+        roots: List[str] = []
+        limit = cls._GLOBAL_ROOT_LIMIT
+        max_depth = cls._GLOBAL_MAX_DEPTH
+
+        for root, dirs, _ in os.walk(".", topdown=True):
+            rel_root = os.path.relpath(root, ".")
+            normalized = "." if rel_root == "." else rel_root
+            depth = 0 if normalized == "." else normalized.count(os.sep) + 1
+            if depth > max_depth:
+                dirs[:] = []
+                continue
+
+            if should_skip_directory(normalized):
+                dirs[:] = []
+                continue
+
+            if dirs:
+                rel_dir = os.path.relpath(root, ".")
+                base = "." if rel_dir == "." else rel_dir
+                filtered_dirs = []
+                for directory in dirs:
+                    candidate = directory if base == "." else f"{base}/{directory}"
+                    if should_skip_directory(candidate):
+                        continue
+                    filtered_dirs.append(directory)
+                dirs[:] = filtered_dirs
+
+            if normalized not in roots:
+                roots.append(normalized)
+
+            if len(roots) >= limit:
+                break
+
+        cls._GLOBAL_ROOT_CACHE = prioritize_roots(roots)
+        return cls._GLOBAL_ROOT_CACHE
+
+
+class ModelCompleter(Completer):
+    """Completer for model names in /model command."""
+
+    def __init__(self, registry: Optional["ModelsRegistry"] = None):
+        """Initialize the model completer."""
+        self.registry = registry
+        self._models_cache: Optional[List[ModelInfo]] = None
+        self._registry_loaded = False
+
+    async def _ensure_registry_loaded(self):
+        """Ensure the models registry is loaded."""
+        if self.registry and not self._registry_loaded:
+            try:
+                # Try to load models (this will be fast if already loaded)
+                await self.registry.load()
+                self._registry_loaded = True
+                self._models_cache = (
+                    list(self.registry.models.values()) if self.registry.models else []
+                )
+            except Exception:
+                # If loading fails, use empty cache
+                self._models_cache = []
+                self._registry_loaded = True
+
+    def get_completions(
+        self, document: Document, _complete_event: CompleteEvent
+    ) -> Iterable[Completion]:
+        """Get completions for model names."""
+        if not self.registry:
+            return
+
+        text = document.text_before_cursor
+
+        # Check if we're in a /model command context
+        lines = text.split("\n")
+        current_line = lines[-1].strip()
+
+        # Must start with /model
+        if not current_line.startswith("/model"):
+            return
+
+        # Try to load registry synchronously if not loaded
+        # Note: This is a compromise - ideally we'd use async completion
+        if not self._registry_loaded:
+            try:
+                # Quick attempt to load cached data only
+                if self.registry._is_cache_valid() and self.registry._load_from_cache():
+                    self._registry_loaded = True
+                    self._models_cache = list(self.registry.models.values())
+                elif not self._models_cache:
+                    # Use fallback models for immediate completion
+                    self.registry._load_fallback_models()
+                    self._registry_loaded = True
+                    self._models_cache = list(self.registry.models.values())
+            except Exception:
+                return  # Skip completion if we can't load models
+
+        # Get the part after /model
+        parts = current_line.split()
+        if len(parts) < 2:
+            # Just "/model" - suggest popular searches and top models
+            popular_searches = ["claude", "gpt", "gemini", "openai", "anthropic"]
+            for search_term in popular_searches:
+                yield Completion(
+                    text=search_term, display=f"{search_term} (search)", display_meta="search term"
+                )
+
+            # Also show top 3 most popular models if we have them
+            if self._models_cache:
+                popular_models = []
+                # Look for common popular models
+                for model in self._models_cache:
+                    if any(pop in model.id.lower() for pop in ["gpt-4o", "claude-3", "gemini-2"]):
+                        popular_models.append(model)
+                        if len(popular_models) >= 3:
+                            break
+
+                for model in popular_models:
+                    display = f"{model.full_id} - {model.name}"
+                    if model.cost.input is not None:
+                        display += f" (${model.cost.input}/{model.cost.output})"
+
+                    yield Completion(
+                        text=model.full_id, display=display, display_meta=f"{model.provider} model"
+                    )
+            return
+
+        # Get the current word being typed
+        word_before_cursor = document.get_word_before_cursor(WORD=True)
+        if not word_before_cursor or not self._models_cache:
+            return
+
+        query = word_before_cursor.lower()
+
+        # Use the new grouped approach to find base models with variants
+        base_models = self.registry.find_base_models(query)
+
+        if not base_models:
+            return
+
+        results = []
+        shown_base_models = 0
+
+        # Sort base models by popularity/relevance
+        sorted_base_models = sorted(
+            base_models.items(),
+            key=lambda x: (
+                # Popular models first
+                -1
+                if any(
+                    pop in x[0] for pop in ["gpt-4o", "gpt-4", "claude-3", "gemini-2", "o3", "o1"]
+                )
+                else 0,
+                # Then by name
+                x[0],
+            ),
+        )
+
+        for base_model_name, variants in sorted_base_models:
+            if shown_base_models >= 5:  # Limit to top 5 base models
+                break
+
+            shown_variants = 0
+            for i, model in enumerate(variants):
+                if shown_variants >= 3:  # Show max 3 variants per base model
+                    break
+
+                # Calculate start position for replacement
+                start_pos = -len(word_before_cursor)
+
+                # Build display text with enhanced info
+                cost_str = ""
+                if model.cost.input is not None:
+                    if model.cost.input == 0:
+                        cost_str = " (FREE)"
+                    else:
+                        cost_str = f" (${model.cost.input}/{model.cost.output})"
+
+                # Format provider info
+                provider_display = self._get_provider_display_name(model.provider)
+
+                # Primary variant gets the bullet, others get indentation
+                if i == 0:
+                    # First variant - primary option with bullet
+                    display = f"● {model.full_id} - {model.name}{cost_str}"
+                    if model.cost.input == 0:
+                        display += " ⭐"  # Star for free models
+                else:
+                    # Additional variants - indented
+                    display = f"   {model.full_id} - {model.name}{cost_str}"
+                    if model.cost.input == 0:
+                        display += " ⭐"
+
+                meta_info = f"{provider_display}"
+                if len(variants) > 1:
+                    meta_info += f" ({len(variants)} sources)"
+
+                results.append(
+                    Completion(
+                        text=model.full_id,
+                        start_position=start_pos,
+                        display=display,
+                        display_meta=meta_info,
+                    )
+                )
+
+                shown_variants += 1
+
+            shown_base_models += 1
+
+        # Limit total results for readability
+        for completion in results[:20]:
+            yield completion
+
+    def _get_provider_display_name(self, provider: str) -> str:
+        """Get a user-friendly provider display name."""
+        provider_names = {
+            "openai": "OpenAI Direct",
+            "anthropic": "Anthropic Direct",
+            "google": "Google Direct",
+            "google-gla": "Google Labs",
+            "openrouter": "OpenRouter",
+            "github-models": "GitHub Models (FREE)",
+            "azure": "Azure OpenAI",
+            "fastrouter": "FastRouter",
+            "requesty": "Requesty",
+            "cloudflare-workers-ai": "Cloudflare",
+            "amazon-bedrock": "AWS Bedrock",
+            "chutes": "Chutes AI",
+            "deepinfra": "DeepInfra",
+            "venice": "Venice AI",
+        }
+        return provider_names.get(provider, provider.title())
+
+
+def create_completer(
+    command_registry: Optional["CommandRegistry"] = None,
+    models_registry: Optional["ModelsRegistry"] = None,
+) -> Completer:
+    """Create a merged completer for commands, file references, and models."""
+    completers = [
+        CommandCompleter(command_registry),
+        FileReferenceCompleter(),
+    ]
+
+    if models_registry:
+        completers.append(ModelCompleter(models_registry))
+
+    return merge_completers(completers)