tunacode-cli 0.0.44__py3-none-any.whl → 0.0.46__py3-none-any.whl

tunacode/core/recursive/aggregator.py

@@ -39,7 +39,7 @@ class TaskResult:
 
     task_id: str
     task_title: str
-    result_data: Any
+    result_data: object
     status: str  # completed, failed, partial
     timestamp: datetime = field(default_factory=datetime.now)
     error: Optional[str] = None
@@ -50,7 +50,7 @@ class TaskResult:
 class AggregatedResult:
     """Aggregated result from multiple tasks."""
 
-    primary_result: Any
+    primary_result: object
     task_results: List[TaskResult]
     strategy_used: AggregationStrategy
     conflicts_resolved: int = 0

tunacode/core/recursive/decomposer.py

@@ -73,7 +73,7 @@ class TaskDecomposer:
         # Get the main agent
         agent = self.state_manager.session.agents.get("main")
         if not agent:
-            logger.warning("Main agent not available, using heuristic decomposition")
+            logger.debug("Main agent not available, using heuristic decomposition")
             return self._heuristic_decomposition(task_description)
 
         # Build context-aware prompt

tunacode/core/recursive/executor.py

@@ -32,7 +32,7 @@ class TaskNode:
     iteration_budget: int = 10
     subtasks: List["TaskNode"] = field(default_factory=list)
     status: str = "pending"  # pending, in_progress, completed, failed
-    result: Optional[Any] = None
+    result: Optional[object] = None
     error: Optional[str] = None
     context: Dict[str, Any] = field(default_factory=dict)
     depth: int = 0
@@ -128,15 +128,17 @@ class RecursiveTaskExecutor:
                 and depth < self.max_depth - 1
             ):
                 # Decompose into subtasks
-                logger.info(
-                    f"Decomposing complex task (score: {complexity_result.complexity_score:.2f})"
-                )
+                if self.state_manager.session.show_thoughts:
+                    logger.info(
+                        f"Decomposing complex task (score: {complexity_result.complexity_score:.2f})"
+                    )
                 return await self._execute_with_decomposition(task_node, complexity_result)
             else:
                 # Execute directly
-                logger.info(
-                    f"Executing task directly (score: {complexity_result.complexity_score:.2f})"
-                )
+                if self.state_manager.session.show_thoughts:
+                    logger.info(
+                        f"Executing task directly (score: {complexity_result.complexity_score:.2f})"
+                    )
                 return await self._execute_directly(task_node)
 
         except Exception as e:
@@ -255,7 +257,8 @@ Respond in JSON format:
             )
 
         for i, (subtask_desc, budget) in enumerate(zip(subtasks, subtask_budgets)):
-            logger.info(f"Executing subtask {i + 1}/{len(subtasks)}: {subtask_desc[:50]}...")
+            if self.state_manager.session.show_thoughts:
+                logger.info(f"Executing subtask {i + 1}/{len(subtasks)}: {subtask_desc[:50]}...")
 
             # Create subtask context
             subtask_context = {

tunacode/ui/input.py

@@ -75,12 +75,13 @@ async def multiline_input(
     state_manager: Optional[StateManager] = None, command_registry=None
 ) -> str:
     """Get multiline input from the user with @file completion and highlighting."""
-    kb = create_key_bindings()
+    kb = create_key_bindings(state_manager)
     placeholder = formatted_text(
         (
             "<darkgrey>"
             "<bold>Enter</bold> to submit • "
             "<bold>Esc + Enter</bold> for new line • "
+            "<bold>Esc</bold> to cancel • "
             "<bold>/help</bold> for commands"
             "</darkgrey>"
         )

tunacode/ui/keybindings.py

@@ -1,9 +1,15 @@
 """Key binding handlers for TunaCode UI."""
 
+import logging
+
 from prompt_toolkit.key_binding import KeyBindings
 
+from ..core.state import StateManager
+
+logger = logging.getLogger(__name__)
 
-def create_key_bindings() -> KeyBindings:
+
+def create_key_bindings(state_manager: StateManager = None) -> KeyBindings:
     """Create and configure key bindings for the UI."""
     kb = KeyBindings()
 
@@ -22,4 +28,14 @@ def create_key_bindings() -> KeyBindings:
         """Insert a newline when escape then enter is pressed."""
         event.current_buffer.insert_text("\n")
 
+    @kb.add("escape")
+    def _escape(event):
+        """Immediately interrupts the current operation."""
+        current_task = state_manager.session.current_task if state_manager else None
+        if current_task and not current_task.done():
+            logger.debug("Interrupting current task")
+            current_task.cancel()
+        else:
+            logger.debug("Escape key pressed outside task context")
+
     return kb

tunacode/ui/panels.py

@@ -9,6 +9,7 @@ from rich.padding import Padding
 from rich.panel import Panel
 from rich.pretty import Pretty
 from rich.table import Table
+from rich.text import Text
 
 from tunacode.configuration.models import ModelRegistry
 from tunacode.constants import (
@@ -89,9 +90,15 @@ class StreamingAgentPanel:
         # Use the UI_THINKING_MESSAGE constant instead of hardcoded text
         from tunacode.constants import UI_THINKING_MESSAGE
 
-        markdown_content = Markdown(self.content or UI_THINKING_MESSAGE)
+        # If no content, show thinking message with Rich markup
+        if not self.content:
+            content_to_display = Text.from_markup(UI_THINKING_MESSAGE)
+        else:
+            # Normal content is markdown
+            content_to_display = Markdown(self.content)
+
         panel_obj = Panel(
-            Padding(markdown_content, (0, 1, 0, 1)),
+            Padding(content_to_display, (0, 1, 0, 1)),
             title=f"[bold]{self.title}[/bold]",
             title_align="left",
             border_style=colors.primary,

{tunacode_cli-0.0.44.dist-info → tunacode_cli-0.0.46.dist-info}/METADATA

@@ -1,11 +1,13 @@
 Metadata-Version: 2.4
 Name: tunacode-cli
-Version: 0.0.44
+Version: 0.0.46
 Summary: Your agentic CLI developer.
 Author-email: larock22 <noreply@github.com>
-License-Expression: MIT
-Project-URL: Homepage, https://github.com/larock22/tunacode
-Project-URL: Repository, https://github.com/larock22/tunacode
+License: MIT
+Project-URL: Homepage, https://tunacode.xyz/
+Project-URL: Repository, https://github.com/alchemiststudiosDOTai/tunacode
+Project-URL: Issues, https://github.com/alchemiststudiosDOTai/tunacode/issues
+Project-URL: Documentation, https://github.com/alchemiststudiosDOTai/tunacode#readme
 Keywords: cli,agent,development,automation
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
@@ -16,7 +18,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development
 Classifier: Topic :: Utilities
-Requires-Python: >=3.10
+Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: typer==0.15.3
@@ -25,8 +27,6 @@ Requires-Dist: pydantic-ai[logfire]==0.2.6
 Requires-Dist: pygments==2.19.1
 Requires-Dist: rich==14.0.0
 Requires-Dist: tiktoken>=0.5.2
-Requires-Dist: dspy-ai>=0.1.0
-Requires-Dist: python-dotenv>=1.0.0
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
@@ -48,7 +48,7 @@ Dynamic: license-file
 
 **AI-powered CLI coding assistant**
 
-![Demo](docs/assets/demo.gif)
+![TunaCode Example](assets/tunacode_example.png)
 
 </div>
 
@@ -64,6 +64,29 @@ wget -qO- https://raw.githubusercontent.com/alchemiststudiosDOTai/tunacode/maste
 pip install tunacode-cli
 ```
 
+## Development Installation
+
+For contributors and developers who want to work on TunaCode:
+
+```bash
+# Clone the repository
+git clone https://github.com/alchemiststudiosDOTai/tunacode.git
+cd tunacode
+
+# Quick setup (recommended)
+./scripts/setup_dev_env.sh
+
+# Or manual setup
+python3 -m venv venv
+source venv/bin/activate  # On Windows: venv\Scripts\activate
+pip install -e ".[dev]"
+
+# Verify installation
+python -m tunacode --version
+```
+
+See [Development Guide](docs/DEVELOPMENT.md) for detailed instructions.
+
 ## Configuration
 
 Choose your AI provider and set your API key:
@@ -141,6 +164,7 @@ _Note: While the tool is fully functional, we're focusing on stability and core
 - [**Advanced Configuration**](docs/ADVANCED-CONFIG.md) - Provider setup, MCP, customization
 - [**Architecture**](docs/ARCHITECTURE.md) - Source code organization and design
 - [**Development**](docs/DEVELOPMENT.md) - Contributing and development setup
+- [**Troubleshooting**](docs/TROUBLESHOOTING.md) - Common issues and solutions
 
 ## Links
 

{tunacode_cli-0.0.44.dist-info → tunacode_cli-0.0.46.dist-info}/RECORD

@@ -1,5 +1,5 @@
 tunacode/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tunacode/constants.py,sha256=e5ew-znjhA7bItbVdVDnF51SR7xhvENeVOR541rc9_E,5168
+tunacode/constants.py,sha256=o1NSdboUcXjPgeYQJ7sCC7HtStJP2e8fE9lo0Jio0N4,5168
 tunacode/context.py,sha256=_gXVCyjU052jlyRAl9tklZSwl5U_zI_EIX8XN87VVWE,2786
 tunacode/exceptions.py,sha256=oDO1SVKOgjcKIylwqdbqh_g5my4roU5mB9Nv4n_Vb0s,3877
 tunacode/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -7,7 +7,7 @@ tunacode/setup.py,sha256=XPt4eAK-qcIZQv64jGZ_ryxcImDwps9OmXjJfIS1xcs,1899
 tunacode/types.py,sha256=Czq7jYXHq7fZQtyqkCN5_7eEu1wyYUcB50C6v3sTWDw,8188
 tunacode/cli/__init__.py,sha256=zgs0UbAck8hfvhYsWhWOfBe5oK09ug2De1r4RuQZREA,55
 tunacode/cli/main.py,sha256=erP6jNXcxVQOVn8sm6uNaLEAYevniVXl6Sem872mW68,2755
-tunacode/cli/repl.py,sha256=CMvl5wlxj7hr45mxil26fwbmWpDYxRsRVS9aIGJvKK0,18525
+tunacode/cli/repl.py,sha256=rSsUievdOdTkxzHNIEgUHbuWbk0ki78743Wz5hVFe9s,18917
 tunacode/cli/commands/__init__.py,sha256=zmE9JcJ9Qd2xJhgdS4jMDJOoZsrAZmL5MAFxbKkk7F8,1670
 tunacode/cli/commands/base.py,sha256=GxUuDsDSpz0iXryy8MrEw88UM3C3yxL__kDK1QhshoA,2517
 tunacode/cli/commands/registry.py,sha256=XVuLpp5S4Fw7GfIZfLrVZFo4jMLMNmYNpYN7xWgXyOk,8223
@@ -19,7 +19,7 @@ tunacode/cli/commands/implementations/model.py,sha256=uthx6IX9KwgwywNTDklkJpqCba
 tunacode/cli/commands/implementations/system.py,sha256=2cGw5iCJO3aNhXTFF28CgAIyLgslvHmpfyL2ZHVB6oQ,7903
 tunacode/cli/commands/implementations/todo.py,sha256=Dtz5bgcuK2VXGPWEBBZQgnWUMYkRXNzTGf_qkVPLF2U,8125
 tunacode/configuration/__init__.py,sha256=MbVXy8bGu0yKehzgdgZ_mfWlYGvIdb1dY2Ly75nfuPE,17
-tunacode/configuration/defaults.py,sha256=Qny32BhbSeRBrE9baWZcAit3XFXgWuXFMDJUZudj55M,922
+tunacode/configuration/defaults.py,sha256=lK_qf3BexmoQh7lbtxYG_ef0Kq3WyiLGOYmiVDO_amQ,840
 tunacode/configuration/models.py,sha256=buH8ZquvcYI3OQBDIZeJ08cu00rSCeNABtUwl3VQS0E,4103
 tunacode/configuration/settings.py,sha256=KoN0u6GG3Hh_TWt02D_wpRfbACYri3gCDTXHtJfHl2w,994
 tunacode/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -27,18 +27,16 @@ tunacode/core/code_index.py,sha256=jgAx3lSWP_DwnyiP5Jkm1YvX4JJyI4teMzlNrJSpEOA,1
 tunacode/core/state.py,sha256=2lsDgq0uIIc_MnXPE9SG_1fYFBDWWlgqgqm2Ik1iFBs,5599
 tunacode/core/tool_handler.py,sha256=BPjR013OOO0cLXPdLeL2FDK0ixUwOYu59FfHdcdFhp4,2277
 tunacode/core/agents/__init__.py,sha256=UUJiPYb91arwziSpjd7vIk7XNGA_4HQbsOIbskSqevA,149
-tunacode/core/agents/dspy_integration.py,sha256=h3gJ-qr0fXpB2CRaU-MVv_8xG--ah-8nra7WO960Gbo,9152
-tunacode/core/agents/dspy_tunacode.py,sha256=tIluqDsHAv3nbNYtqFh4oyZA9yqMrnyY2G-QOpkTLCs,17398
-tunacode/core/agents/main.py,sha256=xYzstmOJgxC1aJ2VbMWw5cevPp87IjpdWU45xydAKMQ,48882
+tunacode/core/agents/main.py,sha256=BRy3joJnn4GpUW47PyhiKK1JLMSamlK7wDMLwAGzSG0,47441
 tunacode/core/agents/utils.py,sha256=7kJAiUlkyWO3-b4T07XsGgycVrcNhv3NEPLdaktBnP4,12847
 tunacode/core/background/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tunacode/core/background/manager.py,sha256=rJdl3eDLTQwjbT7VhxXcJbZopCNR3M8ZGMbmeVnwwMc,1126
 tunacode/core/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tunacode/core/recursive/__init__.py,sha256=S9_dN0faJqam3Pnaum9PRC8Hd90bpES8syFgAD8-QbI,446
-tunacode/core/recursive/aggregator.py,sha256=iKKKd_tZT1sXaPjpjRVVoCG8zFfuxilktSGUdalzTUM,15719
+tunacode/core/recursive/aggregator.py,sha256=KlWajEyT8OokWeY6ZwQ4EsVu05V4KeH3o2cYUz-Ce1Y,15725
 tunacode/core/recursive/budget.py,sha256=0wY6xSrZKmudUwthwX1mlcF5yat2_y3fNu5shX_IzvA,14131
-tunacode/core/recursive/decomposer.py,sha256=7JbRPPXK083jipaaMSpnWIH4wtJC_yjhxBY-ZSkKqr0,14552
-tunacode/core/recursive/executor.py,sha256=5UcFPK57KP2WhtUeHrBPE3BxkKsZ7QxoMaSUHTYrsoE,16436
+tunacode/core/recursive/decomposer.py,sha256=k8rgaPEMMb2mZ9W0m_Yg0oEBqbYpqDnK0zyTkx6eTPs,14550
+tunacode/core/recursive/executor.py,sha256=7taFsjYjSfL8OUQLM1ZVn9Xix7YoputFBAZSo9tDtDM,16646
 tunacode/core/recursive/hierarchy.py,sha256=67tdDCKB5mTSn6VIwm-knEHB_VKUkeljFdwH62U5chE,15648
 tunacode/core/setup/__init__.py,sha256=lzdpY6rIGf9DDlDBDGFvQZaSOQeFsNglHbkpq1-GtU8,376
 tunacode/core/setup/agent_setup.py,sha256=trELO8cPnWo36BBnYmXDEnDPdhBg0p-VLnx9A8hSSSQ,1401
@@ -50,8 +48,6 @@ tunacode/core/setup/git_safety_setup.py,sha256=CRIqrQt0QUJQRS344njty_iCqTorrDhHl
 tunacode/core/token_usage/api_response_parser.py,sha256=CTtqGaFaxpkzkW3TEbe00QJzyRULpWN1EQxIYMleseg,1622
 tunacode/core/token_usage/cost_calculator.py,sha256=oQPMphGhqIt7NKdOg1o5Zbo59_nwFWmRJMQ30ViiCWs,1835
 tunacode/core/token_usage/usage_tracker.py,sha256=uKCpdZgmDfLauwsawSCifMu0kJE3lAnK7Sjd-0KYUgA,3894
-tunacode/prompts/dspy_task_planning.md,sha256=RNimkmnFcNgskwQrguGb3wB8A-Zngp6Qc9lXfPj61OU,2512
-tunacode/prompts/dspy_tool_selection.md,sha256=CPBHrI4QlWD2mzNdoVkFK7GydgCLW9Bi20sD8ZEysRo,3070
 tunacode/prompts/system.md,sha256=hXpjZ8Yiv2Acr2_6EmC2uOklP8FbmvyYR9oais-1KLk,16290
 tunacode/services/__init__.py,sha256=w_E8QK6RnvKSvU866eDe8BCRV26rAm4d3R-Yg06OWCU,19
 tunacode/services/mcp.py,sha256=R48X73KQjQ9vwhBrtbWHSBl-4K99QXmbIhh5J_1Gezo,3046
@@ -72,11 +68,11 @@ tunacode/ui/completers.py,sha256=Jx1zyCESwdm_4ZopvCBtb0bCJF-bRy8aBWG2yhPQtDc,487
 tunacode/ui/console.py,sha256=icb7uYrV8XmZg9glreEy5MrvDkmrKxbf_ZkNqElN1uE,2120
 tunacode/ui/constants.py,sha256=A76B_KpM8jCuBYRg4cPmhi8_j6LLyWttO7_jjv47r3w,421
 tunacode/ui/decorators.py,sha256=e2KM-_pI5EKHa2M045IjUe4rPkTboxaKHXJT0K3461g,1914
-tunacode/ui/input.py,sha256=E_zAJqNYoAVFA-j4xE9Qgs22y-GrdSZNqiseX-Or0ho,2955
-tunacode/ui/keybindings.py,sha256=h0MlD73CW_3i2dQzb9EFSPkqy0raZ_isgjxUiA9u6ts,691
+tunacode/ui/input.py,sha256=x_7G9VVdvydpEk2kcyG-OBKND5lL5ADbiGcDXF1n5UA,3014
+tunacode/ui/keybindings.py,sha256=tn0q0eRw72j8xPWX0673Xc-vmwlvFEyuhy3C451ntfE,1233
 tunacode/ui/lexers.py,sha256=tmg4ic1enyTRLzanN5QPP7D_0n12YjX_8ZhsffzhXA4,1340
 tunacode/ui/output.py,sha256=51O0VHajte4dXHK5Az5SSP4IOb2q5SbCwvqdAoxyg7c,5665
-tunacode/ui/panels.py,sha256=ckL-TYxYWlpBAFj8SC9Od8vrW7Kf5N92bZRYBWR14jE,8338
+tunacode/ui/panels.py,sha256=dBZEVIJqliWreY-hz6HpW5rdBmPOJZ6sPrv8KQ3eNhk,8570
 tunacode/ui/prompt_manager.py,sha256=U2cntB34vm-YwOj3gzFRUK362zccrz8pigQfpxr5sv8,4650
 tunacode/ui/recursive_progress.py,sha256=V0dGpJWt19TVArOYcQ3Lki8cR3ZepFT6iGwnChSFhFI,12906
 tunacode/ui/tool_ui.py,sha256=qp1aZUpLO5UOdJziY8tw0URC8gjoWoSKdGu5y2wuTUU,7013
@@ -95,9 +91,9 @@ tunacode/utils/system.py,sha256=FSoibTIH0eybs4oNzbYyufIiV6gb77QaeY2yGqW39AY,1138
 tunacode/utils/text_utils.py,sha256=6YBD9QfkDO44-6jxnwRWIpmfIifPG-NqMzy_O2NAouc,7277
 tunacode/utils/token_counter.py,sha256=lLbkrNUraRQn5RMhwnGurqq1RHFDyn4AaFhruONWIxo,2690
 tunacode/utils/user_configuration.py,sha256=Ilz8dpGVJDBE2iLWHAPT0xR8D51VRKV3kIbsAz8Bboc,3275
-tunacode_cli-0.0.44.dist-info/licenses/LICENSE,sha256=Btzdu2kIoMbdSp6OyCLupB1aRgpTCJ_szMimgEnpkkE,1056
-tunacode_cli-0.0.44.dist-info/METADATA,sha256=MNphC8b7Fo9Q2kGx7pWgCkqM5k9dNaON0d02wKOu-9o,5203
-tunacode_cli-0.0.44.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tunacode_cli-0.0.44.dist-info/entry_points.txt,sha256=hbkytikj4dGu6rizPuAd_DGUPBGF191RTnhr9wdhORY,51
-tunacode_cli-0.0.44.dist-info/top_level.txt,sha256=lKy2P6BWNi5XSA4DHFvyjQ14V26lDZctwdmhEJrxQbU,9
-tunacode_cli-0.0.44.dist-info/RECORD,,
+tunacode_cli-0.0.46.dist-info/licenses/LICENSE,sha256=Btzdu2kIoMbdSp6OyCLupB1aRgpTCJ_szMimgEnpkkE,1056
+tunacode_cli-0.0.46.dist-info/METADATA,sha256=kO5Xol8ooArWqyfluRNjVq9t3MmZh9J02-ySYlpW_WA,5902
+tunacode_cli-0.0.46.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tunacode_cli-0.0.46.dist-info/entry_points.txt,sha256=hbkytikj4dGu6rizPuAd_DGUPBGF191RTnhr9wdhORY,51
+tunacode_cli-0.0.46.dist-info/top_level.txt,sha256=lKy2P6BWNi5XSA4DHFvyjQ14V26lDZctwdmhEJrxQbU,9
+tunacode_cli-0.0.46.dist-info/RECORD,,

tunacode/core/agents/dspy_integration.py

@@ -1,223 +0,0 @@
-"""DSPy Integration for TunaCode - Enhanced Tool Selection and Task Planning.
-
-This module integrates DSPy's optimized prompts and tool selection logic
-into TunaCode's agent system for 3x performance improvements.
-"""
-
-import logging
-import os
-import re
-from pathlib import Path
-from typing import Any, Dict, List, Optional
-
-from tunacode.core.state import StateManager
-
-logger = logging.getLogger(__name__)
-
-
-class DSPyIntegration:
-    """Integrates DSPy optimization into TunaCode's agent system."""
-
-    def __init__(self, state_manager: StateManager):
-        self.state_manager = state_manager
-        self._dspy_agent = None
-        self._tool_selection_prompt = None
-        self._task_planning_prompt = None
-        self._load_prompts()
-
-    def _load_prompts(self):
-        """Load DSPy-optimized prompts from files."""
-        prompts_dir = Path(__file__).parent.parent.parent / "prompts"
-
-        try:
-            # Load tool selection prompt
-            tool_selection_path = prompts_dir / "dspy_tool_selection.md"
-            if tool_selection_path.exists():
-                self._tool_selection_prompt = tool_selection_path.read_text(encoding="utf-8")
-                logger.debug("Loaded DSPy tool selection prompt")
-
-            # Load task planning prompt
-            task_planning_path = prompts_dir / "dspy_task_planning.md"
-            if task_planning_path.exists():
-                self._task_planning_prompt = task_planning_path.read_text(encoding="utf-8")
-                logger.debug("Loaded DSPy task planning prompt")
-        except Exception as e:
-            logger.error(f"Failed to load DSPy prompts: {e}")
-
-    def get_dspy_agent(self, api_key: Optional[str] = None):
-        """Get or create the DSPy agent instance."""
-        if self._dspy_agent is None:
-            try:
-                # Import DSPy components
-                from tunacode.core.agents.dspy_tunacode import create_optimized_agent
-
-                # Use API key from environment or config
-                if not api_key:
-                    api_key = os.getenv(
-                        "OPENROUTER_API_KEY"
-                    ) or self.state_manager.session.user_config.get("env", {}).get(
-                        "OPENROUTER_API_KEY"
-                    )
-
-                if api_key:
-                    self._dspy_agent = create_optimized_agent(api_key)
-                    logger.info("DSPy agent initialized successfully")
-                else:
-                    logger.warning("No OpenRouter API key found for DSPy optimization")
-            except Exception as e:
-                logger.error(f"Failed to initialize DSPy agent: {e}")
-
-        return self._dspy_agent
-
-    def enhance_system_prompt(self, base_prompt: str) -> str:
-        """Enhance the system prompt with DSPy optimizations."""
-        if not self._tool_selection_prompt:
-            return base_prompt
-
-        # Extract the learned patterns from DSPy prompts
-        enhanced_sections = []
-
-        # Add DSPy tool selection insights
-        enhanced_sections.append("\n\n# DSPy-Optimized Tool Selection Patterns\n")
-        enhanced_sections.append("**Based on learned optimization patterns:**\n")
-        enhanced_sections.append("- Always batch 3-4 read-only tools for parallel execution")
-        enhanced_sections.append("- Group grep, list_dir, glob, read_file operations together")
-        enhanced_sections.append("- Execute write/modify operations sequentially")
-        enhanced_sections.append("- Use Chain of Thought reasoning for tool selection\n")
-
-        # Add specific examples from DSPy prompt
-        if "Example" in self._tool_selection_prompt:
-            enhanced_sections.append("\n## Optimal Tool Batching Examples:\n")
-            # Extract examples section
-            examples_match = re.search(
-                r"### Example.*?(?=###|\Z)", self._tool_selection_prompt, re.DOTALL
-            )
-            if examples_match:
-                enhanced_sections.append(examples_match.group(0))
-
-        return base_prompt + "".join(enhanced_sections)
-
-    def should_use_task_planner(self, user_request: str) -> bool:
-        """Determine if the request is complex enough for task planning."""
-        complex_indicators = [
-            "implement",
-            "create",
-            "build",
-            "refactor",
-            "add feature",
-            "fix all",
-            "update multiple",
-            "migrate",
-            "integrate",
-            "debug",
-            "optimize performance",
-            "authentication",
-            "setup",
-        ]
-
-        request_lower = user_request.lower()
-
-        # Check for multiple files
-        file_pattern = r"\b\w+\.\w+\b"
-        files_mentioned = len(re.findall(file_pattern, user_request)) > 2
-
-        # Check for complex keywords
-        has_complex_keyword = any(indicator in request_lower for indicator in complex_indicators)
-
-        # Check for multiple operations
-        operation_words = ["and", "then", "also", "after", "before", "plus"]
-        has_multiple_ops = sum(1 for word in operation_words if word in request_lower) >= 2
-
-        return files_mentioned or has_complex_keyword or has_multiple_ops
-
-    def optimize_tool_selection(
-        self, user_request: str, tools_to_execute: List[Dict[str, Any]]
-    ) -> List[List[Dict[str, Any]]]:
-        """Optimize tool selection using DSPy patterns.
-
-        Returns tool calls organized in optimal batches for parallel execution.
-        """
-        if not tools_to_execute:
-            return []
-
-        # Try to use DSPy agent if available
-        dspy_agent = self.get_dspy_agent()
-        if dspy_agent:
-            try:
-                result = dspy_agent(user_request, self.state_manager.session.cwd or ".")
-                if hasattr(result, "tool_batches") and result.tool_batches:
-                    return result.tool_batches
-            except Exception as e:
-                logger.debug(f"DSPy optimization failed, using fallback: {e}")
-
-        # Fallback: Apply DSPy-learned patterns manually
-        return self._apply_dspy_patterns(tools_to_execute)
-
-    def _apply_dspy_patterns(self, tools: List[Dict[str, Any]]) -> List[List[Dict[str, Any]]]:
-        """Apply DSPy-learned batching patterns manually."""
-        from tunacode.constants import READ_ONLY_TOOLS
-
-        batches = []
-        current_batch = []
-
-        for tool in tools:
-            tool_name = tool.get("tool", "")
-
-            if tool_name in READ_ONLY_TOOLS:
-                current_batch.append(tool)
-                # Optimal batch size is 3-4 tools
-                if len(current_batch) >= 4:
-                    batches.append(current_batch)
-                    current_batch = []
-            else:
-                # Flush current batch if any
-                if current_batch:
-                    batches.append(current_batch)
-                    current_batch = []
-                # Add write/execute tool as single batch
-                batches.append([tool])
-
-        # Add remaining tools
-        if current_batch:
-            batches.append(current_batch)
-
-        return batches
-
-    def get_task_breakdown(self, complex_request: str) -> Optional[Dict[str, Any]]:
-        """Get task breakdown for complex requests using DSPy."""
-        dspy_agent = self.get_dspy_agent()
-        if not dspy_agent:
-            return None
-
-        try:
-            result = dspy_agent(complex_request, self.state_manager.session.cwd or ".")
-            if result.get("is_complex") and result.get("subtasks"):
-                return {
-                    "subtasks": result["subtasks"],
-                    "total_tool_calls": result.get("total_tool_calls", 0),
-                    "requires_todo": result.get("requires_todo", False),
-                    "parallelization_opportunities": result.get("parallelization_opportunities", 0),
-                }
-        except Exception as e:
-            logger.error(f"Failed to get task breakdown: {e}")
-
-        return None
-
-    def format_chain_of_thought(self, request: str, tools: List[str]) -> str:
-        """Format a Chain of Thought reasoning for tool selection."""
-        reasoning = f"Let's think step by step about '{request}':\n"
-
-        if "search" in request.lower() or "find" in request.lower():
-            reasoning += "1. This requires searching for information\n"
-            reasoning += "2. I'll use grep for content search and glob for file patterns\n"
-            reasoning += "3. These read-only tools can be executed in parallel\n"
-        elif "read" in request.lower() or "show" in request.lower():
-            reasoning += "1. This requires reading file contents\n"
-            reasoning += "2. I'll batch multiple read_file operations together\n"
-            reasoning += "3. All reads can happen in parallel for speed\n"
-        elif "fix" in request.lower() or "update" in request.lower():
-            reasoning += "1. First, I need to understand the current state\n"
-            reasoning += "2. I'll search and read relevant files in parallel\n"
-            reasoning += "3. Then make modifications sequentially for safety\n"
-
-        return reasoning