zai-cli 0.1.1__tar.gz → 0.1.3__tar.gz

{zai_cli-0.1.1 → zai_cli-0.1.3}/CHANGELOG.md

@@ -5,6 +5,29 @@ All notable changes to this project are documented in this file.
 The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and the project uses [Semantic Versioning](https://semver.org/).
 
+## [0.1.3] - 2026-06-24
+
+### Fixed
+
+- Made Ctrl+C exit predictable in interactive mode: one Ctrl+C cancels the
+  current prompt/operation, and a second consecutive Ctrl+C exits the session.
+- Added in-chat key setup: starting `zai` without a provider now offers API-key
+  setup immediately, and `/setup` can save keys without leaving interactive mode.
+
+## [0.1.2] - 2026-06-24
+
+### Changed
+
+- Improved interactive slash-command discovery: typing `/` now shows the
+  commands menu.
+- Improved interactive model discovery: bare `/model` now shows the model list.
+- Clarified the interactive startup hint to point users at `/` and `/help`.
+
+### Fixed
+
+- Prevented common help words such as `commands`, `setup`, and `model list`
+  from being sent to the AI as ordinary project requests.
+
 ## [0.1.1] - 2026-06-24
 
 ### Added

{zai_cli-0.1.1/zai_cli.egg-info → zai_cli-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zai-cli
-Version: 0.1.1
+Version: 0.1.3
 Summary: Your personal AI CLI — free, fast, and smart
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/HumaizaNaz/zai_cli

{zai_cli-0.1.1 → zai_cli-0.1.3}/tests/test_input.py

@@ -11,7 +11,7 @@ def test_slash_command_completion():
         {"resume", "review", "help"},
     )
 
-    assert candidates == [("/resume", "/resume", "command")]
+    assert candidates == [("/resume", "/resume", "slash command")]
 
 
 def test_model_completion():

{zai_cli-0.1.1 → zai_cli-0.1.3}/tests/test_interactive.py

@@ -19,6 +19,7 @@ def test_slash_command_typo_is_corrected():
 
 
 def test_plain_command_aliases_do_not_go_to_ai():
+    assert _normalize_plain_command("/") == "/commands"
     assert _normalize_plain_command("commands") == "/commands"
     assert _normalize_plain_command("setup") == "/setup"
     assert _normalize_plain_command("model list") == "/model list"
@@ -34,17 +35,61 @@ def test_interactive_plain_commands_show_local_help(tmp_path, monkeypatch, capsy
                     with patch("zai.cli.interactive._connect_mcp_servers"):
                         with patch(
                             "zai.cli.interactive.InteractiveInput.prompt",
-                            side_effect=["commands", "setup", EOFError()],
+                            side_effect=["/", "commands", "setup", "/model", EOFError()],
                         ):
                             with patch("zai.cli.interactive.run_agent") as run_agent:
-                                run_interactive("groq")
+                                with patch(
+                                    "zai.cli.interactive._run_key_setup_interactive",
+                                    return_value=True,
+                                ) as setup:
+                                    run_interactive("groq")
 
     output = capsys.readouterr().out
     assert "Interactive slash commands" in output
-    assert "API key setup" in output
+    setup.assert_called_once()
+    assert "Available models" in output
     run_agent.assert_not_called()
 
 
+def test_interactive_offers_setup_when_no_provider(tmp_path, monkeypatch, capsys):
+    monkeypatch.chdir(tmp_path)
+    with patch("zai.cli.interactive.has_available_provider", return_value=False):
+        with patch("zai.cli.interactive.Confirm.ask", return_value=True):
+            with patch(
+                "zai.cli.interactive._run_key_setup_interactive",
+                return_value=True,
+            ) as setup:
+                with patch("zai.cli.interactive.fire_hook", return_value=True):
+                    with patch("zai.cli.interactive.plugin_loader.load_all", return_value={}):
+                        with patch("zai.cli.interactive.plugin_loader.get_errors", return_value={}):
+                            with patch("zai.cli.interactive._connect_mcp_servers"):
+                                with patch(
+                                    "zai.cli.interactive.InteractiveInput.prompt",
+                                    side_effect=EOFError(),
+                                ):
+                                    run_interactive("groq")
+
+    output = capsys.readouterr().out
+    assert "No AI provider available" in output
+    setup.assert_called_once()
+
+
+def test_interactive_key_setup_saves_entered_key(capsys):
+    from zai.cli.interactive import _run_key_setup_interactive
+
+    answers = iter(["gemini-key", "", "", "", "", "", ""])
+
+    with patch("zai.cli.interactive.get_api_key", return_value=None):
+        with patch("zai.cli.interactive.Prompt.ask", side_effect=lambda *a, **k: next(answers)):
+            with patch("zai.cli.interactive.save_api_key") as save_key:
+                with patch("zai.cli.interactive.has_available_provider", return_value=True):
+                    assert _run_key_setup_interactive()
+
+    output = capsys.readouterr().out
+    assert "Provider key setup" in output
+    save_key.assert_called_once_with("gemini", "gemini-key")
+
+
 def test_interactive_help_then_exit(tmp_path, monkeypatch, capsys):
     monkeypatch.chdir(tmp_path)
     with patch("zai.cli.interactive.has_available_provider", return_value=True):
@@ -85,6 +130,25 @@ def test_interactive_fires_session_end(tmp_path, monkeypatch):
     assert any(call.args[0] == "SessionEnd" for call in fire.call_args_list)
 
 
+def test_interactive_exits_after_second_input_cancel(tmp_path, monkeypatch, capsys):
+    monkeypatch.chdir(tmp_path)
+    with patch("zai.cli.interactive.has_available_provider", return_value=True):
+        with patch("zai.cli.interactive.fire_hook", return_value=True) as fire:
+            with patch("zai.cli.interactive.plugin_loader.load_all", return_value={}):
+                with patch("zai.cli.interactive.plugin_loader.get_errors", return_value={}):
+                    with patch("zai.cli.interactive._connect_mcp_servers"):
+                        with patch(
+                            "zai.cli.interactive.InteractiveInput.prompt",
+                            side_effect=[KeyboardInterrupt(), KeyboardInterrupt()],
+                        ):
+                            run_interactive("groq")
+
+    output = capsys.readouterr().out
+    assert "Press Ctrl+C again to exit" in output
+    assert "Goodbye" in output
+    assert any(call.args[0] == "SessionEnd" for call in fire.call_args_list)
+
+
 def test_interactive_session_rename_routes_arguments(tmp_path, monkeypatch):
     monkeypatch.chdir(tmp_path)
     with patch("zai.cli.interactive.has_available_provider", return_value=True):

zai_cli-0.1.3/zai/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.3"

{zai_cli-0.1.1 → zai_cli-0.1.3}/zai/cli/interactive.py

@@ -7,7 +7,7 @@ from rich.panel import Panel
 from rich.prompt import Confirm, Prompt
 from rich.table import Table
 
-from ..config import get_api_key, get_models, load_config
+from ..config import ENV_FILE, get_api_key, get_models, load_config, save_api_key, save_config
 from ..core.agent import plan_agent, run_agent, undo_last
 from ..core.commands import get_command_prompt, list_commands, load_commands
 from ..core.hooks import fire as fire_hook
@@ -73,6 +73,16 @@ PLAIN_COMMAND_ALIASES = {
     "undo": "/undo",
 }
 
+KEY_SETUP_PROVIDERS = [
+    ("gemini", "Google Gemini (free, recommended)", "https://aistudio.google.com/app/apikey"),
+    ("groq", "Groq (free, fast)", "https://console.groq.com/keys"),
+    ("openai", "OpenAI (paid)", "https://platform.openai.com/api-keys"),
+    ("cerebras", "Cerebras (free)", "https://cloud.cerebras.ai/platform"),
+    ("openrouter", "OpenRouter", "https://openrouter.ai/keys"),
+    ("qwen", "Qwen/DashScope", "https://dashscope.aliyun.com/"),
+    ("anthropic", "Anthropic Claude (paid)", "https://console.anthropic.com/settings/keys"),
+]
+
 
 def _show_help() -> None:
     console.print(
@@ -140,8 +150,73 @@ def _show_setup_hint() -> None:
     ))
 
 
+def _show_models() -> None:
+    table = Table(title="Available models", border_style="cyan")
+    table.add_column("Name", style="cyan")
+    table.add_column("Model")
+    table.add_column("Key")
+    for key, data in get_models().items():
+        key_status = "ok" if get_api_key(data["provider"]) else "no key"
+        table.add_row(key, data["name"], key_status)
+    console.print(table)
+
+
+def _run_key_setup_interactive() -> bool:
+    console.print(Panel(
+        "[bold cyan]Provider key setup[/bold cyan]\n"
+        "Add at least one API key. Gemini and Groq are good free starting points; "
+        "OpenAI is paid.\n"
+        f"[dim]Keys are saved locally in {ENV_FILE}[/dim]",
+        border_style="cyan",
+    ))
+    for provider, label, url in KEY_SETUP_PROVIDERS:
+        existing = get_api_key(provider)
+        if existing:
+            console.print(f"[green]✓[/green] {label} already set")
+            value = Prompt.ask(
+                f"[cyan]{label}[/cyan] new API key [dim](Enter to keep)[/dim]",
+                default="",
+                password=True,
+            )
+        else:
+            console.print(f"[dim]{label} key: {url}[/dim]")
+            value = Prompt.ask(
+                f"[cyan]{label}[/cyan] API key [dim](Enter to skip)[/dim]",
+                default="",
+                password=True,
+            )
+        if value.strip():
+            save_api_key(provider, value.strip())
+            console.print("[green]✓ Saved[/green]")
+
+    config = load_config()
+    models = get_models(config)
+    available_free = [
+        name for name, data in models.items()
+        if data["free"] and get_api_key(data["provider"])
+    ]
+    if available_free:
+        current = config.get("default_model")
+        default = current if current in models else available_free[0]
+        selected = Prompt.ask(
+            "Default model",
+            choices=list(models.keys()),
+            default=default,
+        )
+        config["default_model"] = selected
+        save_config(config)
+
+    if has_available_provider():
+        console.print("[green]zai is ready.[/green]")
+        return True
+    console.print("[yellow]No provider key was saved. Run /setup when ready.[/yellow]")
+    return False
+
+
 def _normalize_plain_command(message: str) -> str:
     stripped = message.strip()
+    if stripped == "/":
+        return "/commands"
     if stripped.startswith("/") or not stripped:
         return message
     return PLAIN_COMMAND_ALIASES.get(stripped.lower(), message)
@@ -230,10 +305,13 @@ def run_interactive(model: str = None) -> None:
     if not has_available_provider():
         console.print(Panel(
             "[red]No AI provider available![/red]\n"
-            "Run [cyan]zai setup[/cyan] or start Ollama.",
+            "Set up an API key now, run [cyan]zai setup[/cyan], or start Ollama.",
             border_style="red",
         ))
-        return
+        if not Confirm.ask("Set up an API key now?", default=True):
+            return
+        if not _run_key_setup_interactive():
+            return
 
     try:
         visible = [name for name in sorted(os.listdir(cwd)) if not name.startswith(".")]
@@ -244,7 +322,7 @@ def run_interactive(model: str = None) -> None:
         f"[dim]Folder: {cwd}[/dim]\n"
         f"[dim]Files: {', '.join(visible[:12])}"
         f"{'...' if len(visible) > 12 else ''}[/dim]\n"
-        "[dim]Ctrl+C to exit  |  /help for commands[/dim]",
+        "[dim]Ctrl+C to exit  |  type / for commands  |  /help for help[/dim]",
         border_style="cyan",
     ))
 
@@ -315,15 +393,23 @@ def run_interactive(model: str = None) -> None:
             session_context.compress(preferred)
         save_auto_history(history, cwd)
 
+    cancelled_once = False
+
     while True:
         try:
             try:
                 message = terminal_input.prompt()
             except KeyboardInterrupt:
-                console.print("[dim]Input cancelled.[/dim]")
+                if cancelled_once:
+                    fire_hook("SessionEnd", {"cwd": cwd, "messages": len(history)})
+                    console.print("\n[dim]Goodbye![/dim]")
+                    break
+                cancelled_once = True
+                console.print("[dim]Input cancelled. Press Ctrl+C again to exit.[/dim]")
                 continue
             if not message.strip():
                 continue
+            cancelled_once = False
             message = _correct_slash_command(message)
             message = _normalize_plain_command(message)
             stripped = message.strip()
@@ -333,23 +419,15 @@ def run_interactive(model: str = None) -> None:
             elif stripped == "/commands":
                 _show_commands()
             elif stripped == "/setup":
-                _show_setup_hint()
+                _run_key_setup_interactive()
             elif stripped == "/clear":
                 console.clear()
             elif stripped == "/files":
                 _show_files(cwd)
-            elif stripped.startswith("/model "):
-                name = stripped.split(" ", 1)[1].strip()
+            elif stripped == "/model" or stripped.startswith("/model "):
+                name = stripped.split(" ", 1)[1].strip() if " " in stripped else "list"
                 if name == "list":
-                    for key, data in get_models().items():
-                        key_status = (
-                            "[green]ok[/green]"
-                            if get_api_key(data["provider"])
-                            else "[red]no key[/red]"
-                        )
-                        console.print(
-                            f"  [cyan]{key}[/cyan] — {data['name']} ({key_status})"
-                        )
+                    _show_models()
                 elif name in get_models():
                     preferred = name
                     session_context.set_model(name)
@@ -579,7 +657,15 @@ def run_interactive(model: str = None) -> None:
                     remember_turn(stripped, result)
                     save_session(task=stripped[:80], model=preferred)
         except KeyboardInterrupt:
-            console.print("\n[yellow]Current operation cancelled.[/yellow]")
+            if cancelled_once:
+                fire_hook("SessionEnd", {"cwd": cwd, "messages": len(history)})
+                console.print("\n[dim]Goodbye![/dim]")
+                break
+            cancelled_once = True
+            console.print(
+                "\n[yellow]Current operation cancelled. "
+                "Press Ctrl+C again to exit.[/yellow]"
+            )
             continue
         except EOFError:
             fire_hook("SessionEnd", {"cwd": cwd, "messages": len(history)})

{zai_cli-0.1.1 → zai_cli-0.1.3}/zai/ui/input.py

@@ -59,7 +59,7 @@ def completion_candidates(
     command_token = parts[0]
     if len(parts) == 1 and not before.endswith(" "):
         return [
-            (f"/{name}", f"/{name}", "command")
+            (f"/{name}", f"/{name}", "slash command")
             for name in sorted(set(commands))
             if f"/{name}".startswith(command_token.lower())
         ]

{zai_cli-0.1.1 → zai_cli-0.1.3/zai_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zai-cli
-Version: 0.1.1
+Version: 0.1.3
 Summary: Your personal AI CLI — free, fast, and smart
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/HumaizaNaz/zai_cli

zai_cli-0.1.1/zai/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.1"