thwip-cli 1.0.2__tar.gz → 1.0.3__tar.gz

{thwip_cli-1.0.2 → thwip_cli-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: thwip-cli
-Version: 1.0.2
+Version: 1.0.3
 Summary: Universal coding agent multiplexer: detect, switch, and route between AI coding agents seamlessly
 Project-URL: Homepage, https://github.com/tanmayhutt/thwip-cli
 Project-URL: Repository, https://github.com/tanmayhutt/thwip-cli

{thwip_cli-1.0.2 → thwip_cli-1.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "thwip-cli"
-version = "1.0.2"
+version = "1.0.3"
 description = "Universal coding agent multiplexer: detect, switch, and route between AI coding agents seamlessly"
 readme = "README.md"
 license = "MIT"

{thwip_cli-1.0.2 → thwip_cli-1.0.3}/thwip/__init__.py

@@ -1,4 +1,4 @@
 """thwip: Universal Coding Agent Multiplexer."""
 
-__version__ = "1.0.2"
+__version__ = "1.0.3"
 __app_name__ = "thwip"

{thwip_cli-1.0.2 → thwip_cli-1.0.3}/thwip/agents/base.py

@@ -158,6 +158,8 @@ class ModelInfo:
     """Information about a specific model."""
     id: str                     # "claude-sonnet-4"
     name: str                   # "Claude Sonnet 4"
+    tier: str = "balanced"      # "flagship" (high), "balanced" (mid), "fast" (low-cost)
+    description: str = ""       # e.g. "Flagship reasoning with 1M context"
     context_window: int = 0     # Max tokens
     max_output: int = 0         # Max output tokens
     supports_tools: bool = True

{thwip_cli-1.0.2 → thwip_cli-1.0.3}/thwip/agents/claude_agent.py

@@ -59,6 +59,8 @@ class ClaudeAgent(BaseAgent):
         ModelInfo(
             id="claude-sonnet-4",
             name="Claude Sonnet 4",
+            tier="flagship",
+            description="Flagship coding intelligence with hybrid thinking and tool precision",
             context_window=200_000,
             max_output=16_384,
             supports_tools=True,
@@ -72,6 +74,8 @@ class ClaudeAgent(BaseAgent):
         ModelInfo(
             id="claude-opus-4",
             name="Claude Opus 4",
+            tier="flagship",
+            description="Ultra high capability reasoning for complex systems engineering",
             context_window=200_000,
             max_output=32_000,
             supports_tools=True,
@@ -84,6 +88,8 @@ class ClaudeAgent(BaseAgent):
         ModelInfo(
             id="claude-haiku-3.5",
             name="Claude Haiku 3.5",
+            tier="fast",
+            description="Fastest lightweight Claude model for rapid iteration",
             context_window=200_000,
             max_output=8_192,
             supports_tools=True,

{thwip_cli-1.0.2 → thwip_cli-1.0.3}/thwip/agents/google_agent.py

@@ -59,6 +59,8 @@ class GoogleAgent(BaseAgent):
         ModelInfo(
             id="gemini-2.5-pro",
             name="Gemini 2.5 Pro",
+            tier="flagship",
+            description="Flagship multimodal model with 1M context and advanced reasoning",
             context_window=1_048_576,
             max_output=65_536,
             supports_tools=True,
@@ -72,6 +74,8 @@ class GoogleAgent(BaseAgent):
         ModelInfo(
             id="gemini-2.5-flash",
             name="Gemini 2.5 Flash",
+            tier="balanced",
+            description="High-speed balanced model optimized for daily coding workflows",
             context_window=1_048_576,
             max_output=65_536,
             supports_tools=True,
@@ -81,6 +85,20 @@ class GoogleAgent(BaseAgent):
             pricing_input=0.15,
             pricing_output=0.60,
         ),
+        ModelInfo(
+            id="gemini-2.5-flash-lite",
+            name="Gemini 2.5 Flash Lite",
+            tier="fast",
+            description="Ultra lightweight and cost-effective model for rapid tasks",
+            context_window=1_048_576,
+            max_output=65_536,
+            supports_tools=True,
+            supports_streaming=True,
+            supports_vision=False,
+            supports_thinking=False,
+            pricing_input=0.075,
+            pricing_output=0.30,
+        ),
     ]
 
     def __init__(self, api_key: str | None = None) -> None:
@@ -171,7 +189,7 @@ class GoogleAgent(BaseAgent):
                     pass
                 break
 
-        # Also check for Antigravity IDE or Gemini app (macOS app)
+        # Check for Antigravity IDE or Gemini app (macOS app)
         if not info["path"]:
             app_paths = [
                 Path("/Applications/Antigravity IDE.app"),
@@ -187,6 +205,17 @@ class GoogleAgent(BaseAgent):
                     info["version"] = "Installed"
                     break
 
+        # Check for Google Account in ~/.gemini/google_accounts.json
+        acc_file = Path.home() / ".gemini" / "google_accounts.json"
+        if acc_file.is_file():
+            try:
+                acc_data = json.loads(acc_file.read_text())
+                account = acc_data.get("active") or (acc_data.get("old") and acc_data["old"][0]) or ""
+                if account:
+                    info["account"] = account
+            except Exception:
+                pass
+
         return info
 
     def get_subscription_info(self) -> SubscriptionInfo:

{thwip_cli-1.0.2 → thwip_cli-1.0.3}/thwip/agents/openai_agent.py

@@ -40,9 +40,9 @@ class OpenAIAgent(BaseAgent):
     """
 
     name = "openai"
-    display_name = "Codex / OpenAI"
+    display_name = "ChatGPT / Codex"
     company = "OpenAI"
-    description = "OpenAI's coding agent with sandboxed code execution"
+    description = "OpenAI's ChatGPT and Codex models with tool execution"
     website = "https://platform.openai.com"
 
     capabilities = {
@@ -59,6 +59,8 @@ class OpenAIAgent(BaseAgent):
         ModelInfo(
             id="gpt-4.1",
             name="GPT-4.1",
+            tier="flagship",
+            description="Next-generation flagship with 1M context and advanced coding",
             context_window=1_047_576,
             max_output=32_768,
             supports_tools=True,
@@ -71,6 +73,8 @@ class OpenAIAgent(BaseAgent):
         ModelInfo(
             id="o3",
             name="O3",
+            tier="flagship",
+            description="Deep reasoning model with autonomous multi-step problem solving",
             context_window=200_000,
             max_output=100_000,
             supports_tools=True,
@@ -79,9 +83,24 @@ class OpenAIAgent(BaseAgent):
             pricing_input=2.0,
             pricing_output=8.0,
         ),
+        ModelInfo(
+            id="gpt-4o",
+            name="GPT-4o",
+            tier="balanced",
+            description="High-speed multimodal flagship for omni-modal coding and vision",
+            context_window=128_000,
+            max_output=16_384,
+            supports_tools=True,
+            supports_streaming=True,
+            supports_vision=True,
+            pricing_input=2.50,
+            pricing_output=10.0,
+        ),
         ModelInfo(
             id="o4-mini",
             name="O4 Mini",
+            tier="balanced",
+            description="Fast and affordable reasoning model for everyday programming",
             context_window=200_000,
             max_output=100_000,
             supports_tools=True,
@@ -91,19 +110,23 @@ class OpenAIAgent(BaseAgent):
             pricing_output=4.40,
         ),
         ModelInfo(
-            id="gpt-4o",
-            name="GPT-4o",
+            id="gpt-4o-mini",
+            name="GPT-4o Mini",
+            tier="fast",
+            description="Lightweight and low-latency model for fast script tasks",
             context_window=128_000,
             max_output=16_384,
             supports_tools=True,
             supports_streaming=True,
             supports_vision=True,
-            pricing_input=2.50,
-            pricing_output=10.0,
+            pricing_input=0.15,
+            pricing_output=0.60,
         ),
         ModelInfo(
             id="codex-mini",
             name="Codex Mini",
+            tier="fast",
+            description="Specialized fast code generation model",
             context_window=200_000,
             max_output=16_384,
             supports_tools=True,

{thwip_cli-1.0.2 → thwip_cli-1.0.3}/thwip/cli.py

@@ -195,8 +195,11 @@ class ThwipCLI:
         elif cmd in ("/agents", "/list"):
             self.cmd_show_agents()
 
+        elif cmd in ("/key", "/auth", "/config"):
+            self.cmd_auth_config(arg1, arg2)
+
         elif cmd in ("/models", "/m"):
-            self.cmd_show_models(arg1)
+            self.cmd_show_models(arg1, arg2)
 
         elif cmd == "/tools":
             self.cmd_show_tools()
@@ -298,7 +301,8 @@ class ThwipCLI:
             ("/about", "Display full About section, architecture, and navigation guide"),
             ("/switch [agent] [model]", "Switch active agent/model mid-conversation without losing context"),
             ("/agents", "Show all detected coding agents, company status & capabilities"),
-            ("/models [agent]", "List available models for current or target agent"),
+            ("/models [agent|tier]", "List models filtered by provider or tier (flagship, balanced, fast)"),
+            ("/key [provider] [key]", "View or configure API keys saved in ~/.thwip/config.toml"),
             ("/tools", "List all universal file, terminal, and git tools"),
             ("/status", "Display current session, project, and token stats"),
             ("/limits", "View token usage, quota, and spend metrics"),
@@ -397,33 +401,142 @@ class ThwipCLI:
         rows = [a.to_table_row() for a in self.registry.list_agents()]
         console.print(render_agents_table(rows))
 
-    def cmd_show_models(self, agent_name: str = "") -> None:
-        """List models for current or target agent."""
-        target = self.registry.get_agent(agent_name) if agent_name else self.current_agent
-        if not target:
-            print_error(f"Agent '{agent_name}' not found.")
-            return
+    def cmd_show_models(self, arg1: str = "", arg2: str = "") -> None:
+        """List models by provider or tier (flagship, balanced, fast)."""
+        tier_filter = ""
+        agent_target = None
+
+        tier_aliases = {
+            "flagship": "flagship",
+            "high": "flagship",
+            "pro": "flagship",
+            "balanced": "balanced",
+            "mid": "balanced",
+            "flash": "balanced",
+            "fast": "fast",
+            "low": "fast",
+            "lite": "fast",
+            "mini": "fast",
+        }
+
+        if arg1.lower() in tier_aliases:
+            tier_filter = tier_aliases[arg1.lower()]
+        elif arg1:
+            agent_target = self.registry.get_agent(arg1)
+            if not agent_target:
+                print_error(f"Agent '{arg1}' not found.")
+                return
+            if arg2.lower() in tier_aliases:
+                tier_filter = tier_aliases[arg2.lower()]
+
+        if not agent_target and not tier_filter:
+            agent_target = self.current_agent
 
-        table = Table(title=f"Available Models for {target.display_name}", box=box.ROUNDED)
+        if agent_target:
+            agents_to_show = [agent_target]
+            title = f"Available Models for {agent_target.display_name}"
+            if tier_filter:
+                title += f" ({tier_filter.title()} Tier)"
+        else:
+            agents_to_show = self.registry.list_agents()
+            title = f"All {tier_filter.title()} Tier Models Across Providers"
+
+        table = Table(title=title, box=box.ROUNDED)
+        if not agent_target:
+            table.add_column("Provider", style="cyan")
         table.add_column("Model ID", style="bold white")
-        table.add_column("Name", style="cyan")
-        table.add_column("Context", style="white")
-        table.add_column("Tools", style="green")
+        table.add_column("Name", style="white")
+        table.add_column("Tier", style="bold")
+        table.add_column("Context", style="dim")
         table.add_column("Thinking", style="magenta")
-        table.add_column("Price (In/Out per 1M)", style="dim")
+        table.add_column("Price (In/Out 1M)", style="green")
+
+        tier_styles = {
+            "flagship": "[bold magenta]Flagship / High[/bold magenta]",
+            "balanced": "[bold cyan]Balanced / Mid[/bold cyan]",
+            "fast": "[bold green]Fast / Low[/bold green]",
+        }
+
+        for ag in agents_to_show:
+            for m in ag.available_models:
+                m_tier = getattr(m, "tier", "balanced")
+                if tier_filter and m_tier != tier_filter:
+                    continue
+
+                ctx = f"{m.context_window:,}" if m.context_window else "-"
+                price = f"${m.pricing_input} / ${m.pricing_output}" if m.pricing_input else "Free"
+                tier_badge = tier_styles.get(m_tier, m_tier.title())
+                def_mark = " [dim](default)[/dim]" if m.is_default else ""
+
+                row = []
+                if not agent_target:
+                    row.append(ag.company)
+                row.extend([
+                    m.id + def_mark,
+                    m.name,
+                    tier_badge,
+                    ctx,
+                    "yes" if m.supports_thinking else "-",
+                    price,
+                ])
+                table.add_row(*row)
+
+        console.print(table)
+        console.print("[dim]Filter by tier: [bold]/models flagship[/bold], [bold]/models balanced[/bold], [bold]/models fast[/bold][/dim]\n")
+
+    def cmd_auth_config(self, provider: str = "", key: str = "") -> None:
+        """View or set API credentials stored in ~/.thwip/config.toml."""
+        provider_map = {
+            "google": "google",
+            "gemini": "google",
+            "antigravity": "google",
+            "openai": "openai",
+            "chatgpt": "openai",
+            "codex": "openai",
+            "claude": "anthropic",
+            "anthropic": "anthropic",
+            "deepseek": "deepseek",
+            "groq": "groq",
+            "openrouter": "openrouter",
+        }
+
+        if provider and key:
+            target_prov = provider_map.get(provider.lower(), provider.lower())
+            self.config.keys[target_prov] = key
+            self.config.key_sources[target_prov] = "config.toml"
+            self.config.save()
+
+            # Refresh agent registry
+            self.registry = AgentRegistry(self.config)
+            agent = self.registry.get_agent(self.session.current_agent)
+            if agent:
+                self.current_agent = agent
+            print_success(f"API key for '{target_prov}' saved to ~/.thwip/config.toml")
+            return
+
+        # Show interactive auth overview
+        table = Table(title="thwip API Credentials & Authentication", box=box.ROUNDED)
+        table.add_column("Provider", style="bold white")
+        table.add_column("Auth Status", style="white")
+        table.add_column("Key Source", style="dim")
+        table.add_column("Config Command", style="cyan")
+
+        for prov, label in [
+            ("google", "Google Gemini / Antigravity"),
+            ("openai", "OpenAI / ChatGPT / Codex"),
+            ("anthropic", "Anthropic Claude"),
+            ("deepseek", "DeepSeek"),
+            ("groq", "Groq"),
+            ("openrouter", "OpenRouter"),
+        ]:
+            has_key = bool(self.config.keys.get(prov))
+            source = self.config.key_sources.get(prov, "none")
+            status = "[bold green]Configured[/bold green]" if has_key else "[bold yellow]Missing[/bold yellow]"
+            cmd_hint = f"/key {prov} <your_api_key>"
+            table.add_row(label, status, source, cmd_hint)
 
-        for m in target.available_models:
-            ctx = f"{m.context_window:,}" if m.context_window else "-"
-            price = f"${m.pricing_input} / ${m.pricing_output}" if m.pricing_input else "Free / Local"
-            table.add_row(
-                m.id + (" (default)" if m.is_default else ""),
-                m.name,
-                ctx,
-                "yes" if m.supports_tools else "-",
-                "yes" if m.supports_thinking else "-",
-                price,
-            )
         console.print(table)
+        console.print("[dim]To set a key: [bold white]/key <provider> <key>[/bold white] (e.g. /key google AIzaSy...)[/dim]\n")
 
     def cmd_show_status(self) -> None:
         """Display status."""