tunacode-cli 0.0.7__py3-none-any.whl → 0.0.9__py3-none-any.whl

tunacode/cli/main.py

@@ -6,6 +6,8 @@ Manages application startup, version checking, and REPL initialization.
 """
 
 import asyncio
+import os
+from pathlib import Path
 
 import typer
 
@@ -17,16 +19,26 @@ from tunacode.ui import console as ui
 from tunacode.utils.system import check_for_updates
 
 app_settings = ApplicationSettings()
-app = typer.Typer(help=app_settings.name)
 state_manager = StateManager()
 
 
-@app.command()
 def main(
     version: bool = typer.Option(False, "--version", "-v", help="Show version and exit."),
     run_setup: bool = typer.Option(False, "--setup", help="Run setup process."),
     update: bool = typer.Option(False, "--update", "--upgrade", help="Update TunaCode to the latest version."),
+    model: str = typer.Option(None, "--model", "-m", help="Set the model to use (e.g., 'openai:gpt-4o', 'openrouter:anthropic/claude-3.5-sonnet')."),
+    base_url: str = typer.Option(None, "--base-url", help="Override the API base URL for OpenAI-compatible endpoints (e.g., 'https://openrouter.ai/api/v1')."),
 ):
+    """TunaCode - Your agentic CLI developer."""
+    # Load .env file if it exists
+    env_file = Path(".env")
+    if env_file.exists():
+        try:
+            from dotenv import load_dotenv
+            load_dotenv()
+        except ImportError:
+            # dotenv not installed, skip loading
+            pass
     if version:
         asyncio.run(ui.version())
         return
@@ -36,6 +48,15 @@ def main(
         asyncio.run(update_tunacode())
         return
 
+    # Apply CLI overrides to state manager before setup
+    if model:
+        state_manager.session.model = model
+        state_manager.session.user_config["default_model"] = model
+    
+    if base_url:
+        import os
+        os.environ["OPENAI_BASE_URL"] = base_url
+
     asyncio.run(ui.banner())
 
     has_update, latest_version = check_for_updates()
@@ -49,5 +70,13 @@ def main(
         asyncio.run(ui.error(str(e)))
 
 
+app = typer.Typer(
+    name="tunacode",
+    help="TunaCode - Your agentic CLI developer",
+    add_completion=False,
+)
+
+app.command()(main)
+
 if __name__ == "__main__":
     app()

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.1.0"
+APP_VERSION = "0.0.9"
 
 # File patterns
 GUIDE_FILE_PATTERN = "{name}.md"

tunacode/core/agents/tinyagent_main.py

@@ -1,7 +1,9 @@
 """TinyAgent-based agent implementation."""
 
+import os
 from contextlib import asynccontextmanager
 from datetime import datetime, timezone
+from pathlib import Path
 from typing import Any, Dict, Optional
 
 from tinyagent import ReactAgent
@@ -10,6 +12,25 @@ from tunacode.core.state import StateManager
 from tunacode.tools.tinyagent_tools import read_file, run_command, update_file, write_file
 from tunacode.types import ModelName, ToolCallback
 
+# Set up tinyagent configuration
+# First check if config exists in the package directory
+_package_dir = Path(__file__).parent.parent.parent.parent  # Navigate to tunacode root
+_config_candidates = [
+    _package_dir / "tunacode_config.yml",  # In package root
+    Path.home() / ".config" / "tunacode_config.yml",  # In user config dir
+    Path.cwd() / "tunacode_config.yml",  # In current directory
+]
+
+# Find the first existing config file
+for config_path in _config_candidates:
+    if config_path.exists():
+        os.environ["TINYAGENT_CONFIG"] = str(config_path)
+        break
+else:
+    # If no config found, we'll rely on tinyagent to handle it
+    # This prevents the immediate error on import
+    pass
+
 
 def get_or_create_react_agent(model: ModelName, state_manager: StateManager) -> ReactAgent:
     """

tunacode/core/setup/config_setup.py

@@ -65,14 +65,14 @@ class ConfigSetup(BaseSetup):
         # Check if the configured model still exists
         default_model = self.state_manager.session.user_config["default_model"]
         if not self.model_registry.get_model(default_model):
+            # If model not found, run the onboarding again
             await ui.panel(
                 "Model Not Found",
                 f"The configured model '[bold]{default_model}[/bold]' is no longer available.\n"
-                "Please select a new default model.",
+                "Let's reconfigure your setup.",
                 border_style=UI_COLORS["warning"],
             )
-            await self._step2_default_model()
-            user_configuration.save_config(self.state_manager)
+            await self._onboarding()
 
         self.state_manager.session.current_model = self.state_manager.session.user_config[
             "default_model"
@@ -114,66 +114,74 @@ class ConfigSetup(BaseSetup):
         """Run the onboarding process for new users."""
         initial_config = json.dumps(self.state_manager.session.user_config, sort_keys=True)
 
-        await self._step1_api_keys()
-
-        # Only continue if at least one API key was provided
-        env = self.state_manager.session.user_config.get("env", {})
-        has_api_key = any(key.endswith("_API_KEY") and env.get(key) for key in env)
+        # Welcome message
+        message = (
+            f"Welcome to {APP_NAME}!\n\n"
+            "Let's configure your AI provider. TunaCode supports:\n"
+            "• OpenAI (api.openai.com)\n"
+            "• OpenRouter (openrouter.ai) - Access 100+ models\n"
+            "• Any OpenAI-compatible API\n"
+        )
+        await ui.panel("Setup", message, border_style=UI_COLORS["primary"])
 
-        if has_api_key:
-            if not self.state_manager.session.user_config.get("default_model"):
-                await self._step2_default_model()
+        # Step 1: Ask for base URL
+        base_url = await ui.input(
+            "step1",
+            pretext="  API Base URL (press Enter for OpenAI): ",
+            default="https://api.openai.com/v1",
+            state_manager=self.state_manager,
+        )
+        base_url = base_url.strip()
+        if not base_url:
+            base_url = "https://api.openai.com/v1"
+
+        # Step 2: Ask for API key
+        if "openrouter.ai" in base_url.lower():
+            key_prompt = "  OpenRouter API Key: "
+            key_name = "OPENROUTER_API_KEY"
+            default_model = "openrouter:openai/gpt-4o-mini"
+        else:
+            key_prompt = "  API Key: "
+            key_name = "OPENAI_API_KEY"
+            default_model = "openai:gpt-4o"
 
-            # Compare configs to see if anything changed
+        api_key = await ui.input(
+            "step2",
+            pretext=key_prompt,
+            is_password=True,
+            state_manager=self.state_manager,
+        )
+        api_key = api_key.strip()
+
+        if api_key:
+            # Set the environment variable
+            self.state_manager.session.user_config["env"][key_name] = api_key
+            
+            # Set base URL in environment for OpenRouter
+            if "openrouter.ai" in base_url.lower():
+                import os
+                os.environ["OPENAI_BASE_URL"] = base_url
+            
+            # Set default model
+            self.state_manager.session.user_config["default_model"] = default_model
+
+            # Save configuration
             current_config = json.dumps(self.state_manager.session.user_config, sort_keys=True)
             if initial_config != current_config:
                 if user_configuration.save_config(self.state_manager):
-                    message = f"Config saved to: [bold]{self.config_file}[/bold]"
-                    await ui.panel("Finished", message, top=0, border_style=UI_COLORS["success"])
+                    message = (
+                        f"✅ Configuration saved!\n\n"
+                        f"Default model: {default_model}\n"
+                        f"Config file: {self.config_file}\n\n"
+                        f"You can change models anytime with /model"
+                    )
+                    await ui.panel("Setup Complete", message, top=0, border_style=UI_COLORS["success"])
                 else:
                     await ui.error("Failed to save configuration.")
         else:
             await ui.panel(
                 "Setup canceled",
-                "At least one API key is required.",
+                "An API key is required to use TunaCode.",
                 border_style=UI_COLORS["warning"],
             )
 
-    async def _step1_api_keys(self):
-        """Onboarding step 1: Collect API keys."""
-        message = (
-            f"Welcome to {APP_NAME}!\n"
-            "Let's get you setup. First, we'll need to set some environment variables.\n"
-            "Skip the ones you don't need."
-        )
-        await ui.panel("Setup", message, border_style=UI_COLORS["primary"])
-        env_keys = self.state_manager.session.user_config["env"].copy()
-        for key in env_keys:
-            provider = key_to_title(key)
-            val = await ui.input(
-                "step1",
-                pretext=f"  {provider}: ",
-                is_password=True,
-                state_manager=self.state_manager,
-            )
-            val = val.strip()
-            if val:
-                self.state_manager.session.user_config["env"][key] = val
-
-    async def _step2_default_model(self):
-        """Onboarding step 2: Select default model."""
-        message = "Which model would you like to use by default?\n\n"
-
-        model_ids = self.model_registry.list_model_ids()
-        for index, model_id in enumerate(model_ids):
-            message += f"  {index} - {model_id}\n"
-        message = message.strip()
-
-        await ui.panel("Default Model", message, border_style=UI_COLORS["primary"])
-        choice = await ui.input(
-            "step2",
-            pretext="  Default model (#): ",
-            validator=ui.ModelValidator(len(model_ids)),
-            state_manager=self.state_manager,
-        )
-        self.state_manager.session.user_config["default_model"] = model_ids[int(choice)]

tunacode/ui/input.py

@@ -32,6 +32,7 @@ async def input(
     lexer=None,
     timeoutlen: float = 0.05,
     state_manager: Optional[StateManager] = None,
+    default: str = "",
 ) -> str:
     """
     Prompt for user input using simplified prompt management.
@@ -48,6 +49,7 @@ async def input(
         lexer: Optional lexer for syntax highlighting
         timeoutlen: Timeout length for input
         state_manager: The state manager for session storage
+        default: Default value to pre-fill in the input
 
     Returns:
         User input string
@@ -62,6 +64,7 @@ async def input(
         completer=completer,
         lexer=lexer,
         timeoutlen=timeoutlen,
+        default=default,
     )
 
     # Create prompt manager

tunacode/ui/prompt_manager.py

@@ -28,6 +28,7 @@ class PromptConfig:
     completer: Optional[Completer] = None
     lexer: Optional[Lexer] = None
     timeoutlen: float = 0.05
+    default: str = ""
 
 
 class PromptManager:
@@ -107,6 +108,7 @@ class PromptManager:
                 is_password=config.is_password,
                 validator=config.validator,
                 multiline=config.multiline,
+                default=config.default,
             )
 
             # Clean up response

{tunacode_cli-0.0.7.dist-info → tunacode_cli-0.0.9.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: tunacode-cli
-Version: 0.0.7
+Version: 0.0.9
 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
+Project-URL: Homepage, https://github.com/alchemiststudiosDOTai/tunacode
+Project-URL: Repository, https://github.com/alchemiststudiosDOTai/tunacode
 Keywords: cli,agent,development,automation
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
@@ -23,7 +23,7 @@ Requires-Dist: prompt_toolkit==3.0.51
 Requires-Dist: tiny_agent_os>=0.1.0
 Requires-Dist: pygments==2.19.1
 Requires-Dist: rich==14.0.0
-Requires-Dist: typer==0.15.3
+Requires-Dist: typer==0.12.5
 Requires-Dist: pyyaml>=6.0
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
@@ -107,6 +107,12 @@ tunacode
 
 # Update to latest version
 tunacode --update
+
+# Start with a specific model
+tunacode --model openrouter:openai/gpt-4o-mini
+
+# Use a custom OpenAI-compatible API endpoint
+tunacode --base-url https://your-api.com/v1 --model custom:gpt-4
 ```
 
 ## 📋 Commands
@@ -144,19 +150,72 @@ Configuration is stored in `~/.config/tunacode.json`:
 }
 ```
 
+### Environment Variables
+
+TunaCode automatically loads environment variables from a `.env` file in your current directory:
+
+```bash
+# .env file
+OPENAI_API_KEY=sk-...
+OPENROUTER_API_KEY=sk-or-v1-...
+ANTHROPIC_API_KEY=sk-ant-...
+```
+
+Environment variables take precedence over config file values.
+
+### TinyAgent Configuration
+
+TunaCode uses [TinyAgent](https://github.com/alchemiststudiosDOTai/tiny_agent_os) under the hood. Advanced configuration is stored in `~/.config/tunacode_config.yml`:
+
+```yaml
+# Model and API configuration
+base_url: ${OPENAI_BASE_URL:-https://api.openai.com/v1}
+model:
+  default: "gpt-4o"  # Overridden by TunaCode's model selection
+
+# File operations
+file_operations:
+  max_file_size: 10_485_760  # 10 MB
+  allow_overwrite: true
+
+# Retry configuration
+retries:
+  max_attempts: 3
+  temperature: { initial: 0.2, increment: 0.3, max: 0.8 }
+```
+
+This file is automatically created during installation. Most users won't need to modify it.
+
 ### Using OpenRouter (100+ Models)
 
 ```bash
-# Add your OpenRouter API key to config
-# Then run with OpenRouter base URL:
-OPENAI_BASE_URL="https://openrouter.ai/api/v1" tunacode
+# Add your OpenRouter API key to config or .env file
+# TunaCode automatically sets the correct base URL for OpenRouter models
 
 # Use any OpenRouter model:
+tunacode --model openrouter:openai/gpt-4o-mini
+tunacode --model openrouter:anthropic/claude-3.5-sonnet
+
+# Or switch models inside TunaCode:
 /model openrouter:anthropic/claude-3-opus
 /model openrouter:mistralai/devstral-small
 /model openrouter:openai/gpt-4.1
 ```
 
+### OpenAI-Compatible APIs
+
+TunaCode supports any OpenAI-compatible API endpoint. The `--base-url` flag overrides the API endpoint for providers that use the OpenAI API format:
+
+```bash
+# Use a local LLM server
+tunacode --base-url http://localhost:8080/v1 --model local:llama2
+
+# Use alternative OpenAI-compatible services
+tunacode --base-url https://api.together.ai/v1 --model together:llama-2-70b
+```
+
+**Note**: The base URL override only works with OpenAI-compatible APIs that follow the same request/response format as OpenAI's API.
+
 ## 🛡️ Undo System
 
 TunaCode provides **three layers of protection** for your files:

{tunacode_cli-0.0.7.dist-info → tunacode_cli-0.0.9.dist-info}/RECORD

@@ -1,5 +1,5 @@
 tunacode/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tunacode/constants.py,sha256=6QxZ_VpAzjWSx5-tndEUjTeUVSrNSTAlWSRuboqr-DQ,4218
+tunacode/constants.py,sha256=zM9SjJENwnUTXEx5SwM6g1kl_4Vc_lM1uJaRN2TqfBY,4218
 tunacode/context.py,sha256=6sterdRvPOyG3LU0nEAXpBsEPZbO3qtPyTlJBi-_VXE,2612
 tunacode/exceptions.py,sha256=_Dyj6cC0868dMABekdQHXCg5XhucJumbGUMXaSDzgB4,2645
 tunacode/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -7,7 +7,7 @@ tunacode/setup.py,sha256=KCNhnu8FY5bFRqR0JMIh22xVakCC97kchmyGsUGUaJ4,1811
 tunacode/types.py,sha256=5mMJDgFqVcKzhtHh9unPISBFqkeNje6KISGUpRkqRjY,7146
 tunacode/cli/__init__.py,sha256=zgs0UbAck8hfvhYsWhWOfBe5oK09ug2De1r4RuQZREA,55
 tunacode/cli/commands.py,sha256=IHUza0gJUrN30sUHK9gU6-cSRV0TufViBU8qq0yzYbI,22979
-tunacode/cli/main.py,sha256=-ZDDJHd4LUACrWxZ153fFgVcdSlr7GcQfXAcxyfxT7E,1470
+tunacode/cli/main.py,sha256=jZa-KU7YO8ExAJAJTA917KtPcxU1yvHP3dihLW3lti4,2482
 tunacode/cli/model_selector.py,sha256=EO3GY_YM6pByn4IuYYNn5bKQUCz6vaObFw7clJaJQD8,6190
 tunacode/cli/repl.py,sha256=-KvGMyYQk4WslSkGk0MVOUCB15DEp0BSPVWGj4TIZlo,8864
 tunacode/configuration/__init__.py,sha256=MbVXy8bGu0yKehzgdgZ_mfWlYGvIdb1dY2Ly75nfuPE,17
@@ -19,11 +19,11 @@ tunacode/core/state.py,sha256=0U_WU92yn5EQ27BLlHIkNIJJqjLMNHKNYSoba1rQqbQ,1376
 tunacode/core/tool_handler.py,sha256=OKx7jM8pml6pSEnoARu33_uBY8awJBqvhbVeBn6T4ow,1804
 tunacode/core/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tunacode/core/agents/main.py,sha256=zsfSmUUHNFfEz9ludq9CZ13qaGJn91TrOyu1Pha_3-M,2339
-tunacode/core/agents/tinyagent_main.py,sha256=xVVlTY8BPfzdn7T_ORCKi9rqkmd_jWwN7QYo6zRk81s,5925
+tunacode/core/agents/tinyagent_main.py,sha256=gFHJomHeIE45r5PUbwVb5JtIYcl9HjfNXnMgyum9n-Y,6669
 tunacode/core/setup/__init__.py,sha256=jlveyriTXRcnoBLU6_TJ7Z-3E6EXjT9L5GD1vW4dei0,427
 tunacode/core/setup/agent_setup.py,sha256=k1bmQ21ue17_zZsWlhIfc7ZWN6vZtmOgKMMzR4Xu9-k,1410
 tunacode/core/setup/base.py,sha256=x9uYOITulrf4faP70NPTNBPb-wW1ZJGmcjAe0Sk5slk,961
-tunacode/core/setup/config_setup.py,sha256=1eDS8iIG9z_BvrmeL8d9QUEBtPXSjOcrNu-2vHtvSFk,7474
+tunacode/core/setup/config_setup.py,sha256=KrOEQu3w_NAu7Yi-IeF9G-aHcWwe9x3aztMvZcXEcrg,7508
 tunacode/core/setup/coordinator.py,sha256=pT1mI24Kllo2H6Hjb-uULLsA1E3X3BqQB7nSGe70SRw,1598
 tunacode/core/setup/environment_setup.py,sha256=u6Anb9uDicmdMA_9xLkP0j2uoiVY16ojsA7XnFz--yQ,2234
 tunacode/core/setup/git_safety_setup.py,sha256=43NqLHxUxzG5GAI0lgtU3cyIoV2izfEEe8zWig_GosE,6910
@@ -47,12 +47,12 @@ tunacode/ui/completers.py,sha256=OL4c8cSQnb2WWRfD73MkRBw1lOxa03512MKDFPli9eY,723
 tunacode/ui/console.py,sha256=7ua1LaBP3ZCRHzV0SqVCkgNlgBuBcBTcvybRjWl5jew,1943
 tunacode/ui/constants.py,sha256=NxegAWaoDaEa4gzNZ7p67M0ZsHJJxZMtf2bW8E5WeZE,421
 tunacode/ui/decorators.py,sha256=I09tETtxPfcWdh1B3kEM0nJ8E6HvdBZAdYhRzYUa_p8,1901
-tunacode/ui/input.py,sha256=aiM5Kv2CI0Vqj05srR2R2Z4e4dZ8QY6yoNKQ04RlQhg,2909
+tunacode/ui/input.py,sha256=3JQtQAByf9Fv9fdx58BAkp2mkK8GBphYuiOxqN2WJm0,3013
 tunacode/ui/keybindings.py,sha256=Tiw7L57Q-I7mc-qdE1aWVUxa4TCHgO4niUdoRvzO-6o,691
 tunacode/ui/lexers.py,sha256=tmg4ic1enyTRLzanN5QPP7D_0n12YjX_8ZhsffzhXA4,1340
 tunacode/ui/output.py,sha256=L7VdlwbxqiOlQLPvcty76zX2ImXAtSioK1w_BO5F7Hc,3859
 tunacode/ui/panels.py,sha256=kuhCPvLwqorrqyS0ZF-RfuzbDZHwhKOC7KG2wQOqXds,5931
-tunacode/ui/prompt_manager.py,sha256=uqmS796nXn7me-zcATyK8A_dz0M037zkPYhMZMbI6jI,4036
+tunacode/ui/prompt_manager.py,sha256=L1hs0RJ71OT5qjbCaogNvJ7mfWqIrT9AsoSsjHbQTmY,4098
 tunacode/ui/tool_ui.py,sha256=XqJhVm3NNGwvIbMYQ8JmmLwjGeIT3WHCf5INrgBfpY8,6530
 tunacode/ui/validators.py,sha256=wkg-lQrP-Wjm5phUHKD3Mte8F1J3A2EjESQgPPtRcvQ,758
 tunacode/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -65,9 +65,9 @@ tunacode/utils/ripgrep.py,sha256=AXUs2FFt0A7KBV996deS8wreIlUzKOlAHJmwrcAr4No,583
 tunacode/utils/system.py,sha256=-mmYdP5_kkNVo2xUnKUL8JxtN-SVAlYx5erofEkYnUA,12641
 tunacode/utils/text_utils.py,sha256=B9M1cuLTm_SSsr15WNHF6j7WdLWPvWzKZV0Lvfgdbjg,2458
 tunacode/utils/user_configuration.py,sha256=uFrpSRTUf0CijZjw1rOp1sovqy1uyr0UNcn85S6jvdk,1790
-tunacode_cli-0.0.7.dist-info/licenses/LICENSE,sha256=SgvEceNP-y3_WodntkMGAkZyl_hAUvzBw5T9W--7YpM,1070
-tunacode_cli-0.0.7.dist-info/METADATA,sha256=JoBpfeN_0GZaB3qbRNoaSTBXEvs0EQHDhcN7dNTn-BU,7859
-tunacode_cli-0.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tunacode_cli-0.0.7.dist-info/entry_points.txt,sha256=hbkytikj4dGu6rizPuAd_DGUPBGF191RTnhr9wdhORY,51
-tunacode_cli-0.0.7.dist-info/top_level.txt,sha256=lKy2P6BWNi5XSA4DHFvyjQ14V26lDZctwdmhEJrxQbU,9
-tunacode_cli-0.0.7.dist-info/RECORD,,
+tunacode_cli-0.0.9.dist-info/licenses/LICENSE,sha256=SgvEceNP-y3_WodntkMGAkZyl_hAUvzBw5T9W--7YpM,1070
+tunacode_cli-0.0.9.dist-info/METADATA,sha256=h_MJy8QtHg_mijLntUry9SYSOHXcfH2FCDU2AkrgvO8,9708
+tunacode_cli-0.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tunacode_cli-0.0.9.dist-info/entry_points.txt,sha256=hbkytikj4dGu6rizPuAd_DGUPBGF191RTnhr9wdhORY,51
+tunacode_cli-0.0.9.dist-info/top_level.txt,sha256=lKy2P6BWNi5XSA4DHFvyjQ14V26lDZctwdmhEJrxQbU,9
+tunacode_cli-0.0.9.dist-info/RECORD,,