thwip-cli 1.2.0__tar.gz → 1.4.0__tar.gz

{thwip_cli-1.2.0 → thwip_cli-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: thwip-cli
-Version: 1.2.0
+Version: 1.4.0
 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
@@ -46,6 +46,7 @@ Description-Content-Type: text/markdown
 ## Features
 
 - **Auto-Detection**: Discovers installed AI coding agents (Claude Code, Antigravity, Gemini CLI, OpenAI/Codex, Aider, Copilot, Cursor, Windsurf, Cline, Ollama) and configured credentials.
+- **Existing Sign-ins**: Chats through installed Codex, Claude Code, and Antigravity CLIs using their own logins and live model lists, with no API key required.
 - **Context Portability**: Switch providers with stored conversational text. Working files remain in the selected local project; they are not automatically uploaded.
 - **Handoff Preview**: Inspect text continuity, omitted state, capability changes, approximate context pressure, and a text fingerprint before switching. Runs locally without model calls.
 - **Dynamic UI**: Terminal interface adapts its status bar, capabilities, and theme based on the active provider.
@@ -81,6 +82,8 @@ Start the interactive terminal in your current project directory:
 
 ```bash
 thwip
+thwip --project ~/code/my-app   # open a specific project
+thwip --version
 ```
 
 ---
@@ -91,12 +94,13 @@ thwip
 |:---|:---|
 | `/switch [agent] [model]` | Switch active agent or model mid-conversation |
 | `/handoff [agent] [model]` | Preview a target locally without switching or sending data |
+| `/native codex` | Save and leave Thwip for the installed Codex CLI itself (launcher, no context transfer) |
 | `/agents` | Show all detected coding agents, company status, and capabilities |
 | `/models [agent]` | List available models for current or target agent |
 | `/key [provider]` | Enter an API key securely without placing it in prompt history |
 | `/status` | Display current session, project, and token stats |
 | `/limits` | View token usage, quota, and spend metrics |
-| `/detect` | Re-scan system for newly installed coding agents |
+| `/detect` | Re-scan installed agents and reconnect CLI sign-ins |
 | `/session save [name]` | Save current chat session |
 | `/session load <name>` | Load a previously saved session |
 | `/session list` | List all saved sessions |
@@ -105,13 +109,50 @@ thwip
 | `/cost` | Show estimated session and cumulative cost |
 | `/project [path]` | View or change project working directory |
 | `Ctrl + S` | Quick switch agent prompt |
-
-Short aliases are available for frequent commands: `/a`, `/m`, `/s`, `/k`, `/g`, and `/t`.
 | `Ctrl + T` | Show agent status |
 | `Ctrl + H` | View history |
 | `/quit` | Exit thwip |
 
----
+Short aliases are available for frequent commands: `/a`, `/m`, `/s`, `/sw`, `/k`, `/g`, and `/t`.
+
+### Existing CLI sign-ins (no API key needed)
+
+If Codex, Claude Code, or the Antigravity CLI is installed and signed in, Thwip
+connects to it at startup and uses that sign-in for chat. No API key is copied or
+required, and Thwip never reads the CLI's stored credentials. A configured direct
+API key for the same provider always takes precedence over the native connection.
+
+| Provider | Installed CLI | Transport | Model list |
+|:---|:---|:---|:---|
+| OpenAI | `codex` | Codex App Server (JSON-RPC over stdio) | Live from `model/list` |
+| Anthropic | `claude` | Claude Code print mode (`stream-json`) | Aliases `fable`, `opus`, `sonnet`, `haiku`; explicit IDs pass through |
+| Google | `agy` (Antigravity CLI) or `gemini` | Antigravity print mode (`stream-json`) or Gemini ACP | Live from `agy models` or the ACP session |
+
+`/models` refreshes the catalog supplied by each CLI. An explicit model ID that is
+not in the catalog is passed to the CLI for validation instead of being rejected by
+a bundled list. A model available in a desktop app may still be absent from the
+installed CLI's catalog or account access.
+
+Native connections are read-only by default. Codex starts with a read-only sandbox
+and asks before operations outside it; approval requests appear in Thwip with the
+command or file list and default to denial. Claude Code and the Antigravity CLI run
+in their non-interactive print modes, where tools that would need an approval are
+declined by the CLI itself. Each turn sends the portable text conversation to a
+fresh native session, so native reasoning and tool state do not carry between turns.
+Ctrl+C interrupts the current turn and stops the child process; the unanswered
+message is removed so it can be re-sent or handed to another provider.
+
+Native billing and usage limits are managed by each CLI account. Thwip records the
+token counts the CLIs report but does not estimate cost for them. Codex and Claude
+Code also report their account usage windows (5 hour and 7 day) after each response;
+`/limits` and `/status` show the used percentage and reset time. When a CLI reports
+an exhausted usage limit, the standard failover prompt offers the other connected
+providers.
+
+`/native codex` remains available as a launcher: it saves the Thwip session and
+replaces Thwip with the Codex CLI itself in the selected project. Conversation
+history is not transferred by the launcher; use `/session load` after restarting
+Thwip to resume.
 
 ## Auditable handoffs
 
@@ -150,11 +191,11 @@ See [research and prior art](docs/handoff-research.md) for the differentiation r
 
 | Company | Agent | Capabilities |
 |:---|:---|:---|
-| Anthropic | Claude API (Fable 5, Opus 5, Sonnet 5, Haiku 4.5) | Chat, File Edit, Code Run, Terminal, Git |
-| Google | Gemini API (3.1 Pro Preview, 3.7 Flash, 3.5 Flash-Lite) | Chat, File Edit, Code Run, Terminal, Git |
-| OpenAI | OpenAI API (GPT-5.6 Sol, Terra, Luna) | Chat, File Edit, Code Run, Terminal, Git |
+| Anthropic | Claude Code sign-in, or Claude API (Fable 5, Opus 5, Sonnet 5, Haiku 4.5) | Chat, File Edit, Code Run, Terminal, Git |
+| Google | Antigravity or Gemini CLI sign-in, or Gemini API (3.1 Pro Preview, 3.7 Flash, 3.5 Flash-Lite) | Chat, File Edit, Code Run, Terminal, Git |
+| OpenAI | Codex CLI sign-in, or OpenAI API (GPT-5.6 Sol, Terra, Luna) | Chat, File Edit, Code Run, Terminal, Git |
 | DeepSeek | DeepSeek V3 / R1 Reasoner | Chat, File Edit, Code Run, Reasoning |
-| Groq | Llama 3.3 70B, Mixtral | Chat, File Edit, Code Run |
+| Groq | GPT-OSS 120B (default); Llama 3.3 for eligible enterprise accounts only | Chat, File Edit, Code Run |
 | Ollama | Local Models (Llama 3.3, Qwen Coder, DeepSeek R1) | Chat, File Edit, Code Run (Local, Offline) |
 | OpenRouter | Multi-Company Models | Gateway Routing |
 
@@ -164,7 +205,7 @@ See [research and prior art](docs/handoff-research.md) for the differentiation r
 
 thwip auto-detects existing API keys from environment variables and existing agent configs (`~/.claude.json`, `~/.gemini/config.json`). Configuration can also be set manually:
 
-Installed apps, CLI sign-ins, and API access are separate. thwip can report a detected Claude, Gemini, or Codex CLI login, but the current SDK adapters require a provider API key. A ChatGPT, Claude, or Google subscription does not automatically provide a reusable third-party API key. Ollama needs no key when its local server is running.
+Installed CLI sign-ins and API access are separate paths. A signed-in Codex, Claude Code, or Antigravity CLI is used directly through its own protocol (see above). The direct SDK adapters for Anthropic, Google, OpenAI, DeepSeek, Groq, and OpenRouter require a provider API key. Ollama needs no key when its local server is running.
 
 ```toml
 [defaults]

{thwip_cli-1.2.0 → thwip_cli-1.4.0}/README.md

@@ -9,6 +9,7 @@
 ## Features
 
 - **Auto-Detection**: Discovers installed AI coding agents (Claude Code, Antigravity, Gemini CLI, OpenAI/Codex, Aider, Copilot, Cursor, Windsurf, Cline, Ollama) and configured credentials.
+- **Existing Sign-ins**: Chats through installed Codex, Claude Code, and Antigravity CLIs using their own logins and live model lists, with no API key required.
 - **Context Portability**: Switch providers with stored conversational text. Working files remain in the selected local project; they are not automatically uploaded.
 - **Handoff Preview**: Inspect text continuity, omitted state, capability changes, approximate context pressure, and a text fingerprint before switching. Runs locally without model calls.
 - **Dynamic UI**: Terminal interface adapts its status bar, capabilities, and theme based on the active provider.
@@ -44,6 +45,8 @@ Start the interactive terminal in your current project directory:
 
 ```bash
 thwip
+thwip --project ~/code/my-app   # open a specific project
+thwip --version
 ```
 
 ---
@@ -54,12 +57,13 @@ thwip
 |:---|:---|
 | `/switch [agent] [model]` | Switch active agent or model mid-conversation |
 | `/handoff [agent] [model]` | Preview a target locally without switching or sending data |
+| `/native codex` | Save and leave Thwip for the installed Codex CLI itself (launcher, no context transfer) |
 | `/agents` | Show all detected coding agents, company status, and capabilities |
 | `/models [agent]` | List available models for current or target agent |
 | `/key [provider]` | Enter an API key securely without placing it in prompt history |
 | `/status` | Display current session, project, and token stats |
 | `/limits` | View token usage, quota, and spend metrics |
-| `/detect` | Re-scan system for newly installed coding agents |
+| `/detect` | Re-scan installed agents and reconnect CLI sign-ins |
 | `/session save [name]` | Save current chat session |
 | `/session load <name>` | Load a previously saved session |
 | `/session list` | List all saved sessions |
@@ -68,13 +72,50 @@ thwip
 | `/cost` | Show estimated session and cumulative cost |
 | `/project [path]` | View or change project working directory |
 | `Ctrl + S` | Quick switch agent prompt |
-
-Short aliases are available for frequent commands: `/a`, `/m`, `/s`, `/k`, `/g`, and `/t`.
 | `Ctrl + T` | Show agent status |
 | `Ctrl + H` | View history |
 | `/quit` | Exit thwip |
 
----
+Short aliases are available for frequent commands: `/a`, `/m`, `/s`, `/sw`, `/k`, `/g`, and `/t`.
+
+### Existing CLI sign-ins (no API key needed)
+
+If Codex, Claude Code, or the Antigravity CLI is installed and signed in, Thwip
+connects to it at startup and uses that sign-in for chat. No API key is copied or
+required, and Thwip never reads the CLI's stored credentials. A configured direct
+API key for the same provider always takes precedence over the native connection.
+
+| Provider | Installed CLI | Transport | Model list |
+|:---|:---|:---|:---|
+| OpenAI | `codex` | Codex App Server (JSON-RPC over stdio) | Live from `model/list` |
+| Anthropic | `claude` | Claude Code print mode (`stream-json`) | Aliases `fable`, `opus`, `sonnet`, `haiku`; explicit IDs pass through |
+| Google | `agy` (Antigravity CLI) or `gemini` | Antigravity print mode (`stream-json`) or Gemini ACP | Live from `agy models` or the ACP session |
+
+`/models` refreshes the catalog supplied by each CLI. An explicit model ID that is
+not in the catalog is passed to the CLI for validation instead of being rejected by
+a bundled list. A model available in a desktop app may still be absent from the
+installed CLI's catalog or account access.
+
+Native connections are read-only by default. Codex starts with a read-only sandbox
+and asks before operations outside it; approval requests appear in Thwip with the
+command or file list and default to denial. Claude Code and the Antigravity CLI run
+in their non-interactive print modes, where tools that would need an approval are
+declined by the CLI itself. Each turn sends the portable text conversation to a
+fresh native session, so native reasoning and tool state do not carry between turns.
+Ctrl+C interrupts the current turn and stops the child process; the unanswered
+message is removed so it can be re-sent or handed to another provider.
+
+Native billing and usage limits are managed by each CLI account. Thwip records the
+token counts the CLIs report but does not estimate cost for them. Codex and Claude
+Code also report their account usage windows (5 hour and 7 day) after each response;
+`/limits` and `/status` show the used percentage and reset time. When a CLI reports
+an exhausted usage limit, the standard failover prompt offers the other connected
+providers.
+
+`/native codex` remains available as a launcher: it saves the Thwip session and
+replaces Thwip with the Codex CLI itself in the selected project. Conversation
+history is not transferred by the launcher; use `/session load` after restarting
+Thwip to resume.
 
 ## Auditable handoffs
 
@@ -113,11 +154,11 @@ See [research and prior art](docs/handoff-research.md) for the differentiation r
 
 | Company | Agent | Capabilities |
 |:---|:---|:---|
-| Anthropic | Claude API (Fable 5, Opus 5, Sonnet 5, Haiku 4.5) | Chat, File Edit, Code Run, Terminal, Git |
-| Google | Gemini API (3.1 Pro Preview, 3.7 Flash, 3.5 Flash-Lite) | Chat, File Edit, Code Run, Terminal, Git |
-| OpenAI | OpenAI API (GPT-5.6 Sol, Terra, Luna) | Chat, File Edit, Code Run, Terminal, Git |
+| Anthropic | Claude Code sign-in, or Claude API (Fable 5, Opus 5, Sonnet 5, Haiku 4.5) | Chat, File Edit, Code Run, Terminal, Git |
+| Google | Antigravity or Gemini CLI sign-in, or Gemini API (3.1 Pro Preview, 3.7 Flash, 3.5 Flash-Lite) | Chat, File Edit, Code Run, Terminal, Git |
+| OpenAI | Codex CLI sign-in, or OpenAI API (GPT-5.6 Sol, Terra, Luna) | Chat, File Edit, Code Run, Terminal, Git |
 | DeepSeek | DeepSeek V3 / R1 Reasoner | Chat, File Edit, Code Run, Reasoning |
-| Groq | Llama 3.3 70B, Mixtral | Chat, File Edit, Code Run |
+| Groq | GPT-OSS 120B (default); Llama 3.3 for eligible enterprise accounts only | Chat, File Edit, Code Run |
 | Ollama | Local Models (Llama 3.3, Qwen Coder, DeepSeek R1) | Chat, File Edit, Code Run (Local, Offline) |
 | OpenRouter | Multi-Company Models | Gateway Routing |
 
@@ -127,7 +168,7 @@ See [research and prior art](docs/handoff-research.md) for the differentiation r
 
 thwip auto-detects existing API keys from environment variables and existing agent configs (`~/.claude.json`, `~/.gemini/config.json`). Configuration can also be set manually:
 
-Installed apps, CLI sign-ins, and API access are separate. thwip can report a detected Claude, Gemini, or Codex CLI login, but the current SDK adapters require a provider API key. A ChatGPT, Claude, or Google subscription does not automatically provide a reusable third-party API key. Ollama needs no key when its local server is running.
+Installed CLI sign-ins and API access are separate paths. A signed-in Codex, Claude Code, or Antigravity CLI is used directly through its own protocol (see above). The direct SDK adapters for Anthropic, Google, OpenAI, DeepSeek, Groq, and OpenRouter require a provider API key. Ollama needs no key when its local server is running.
 
 ```toml
 [defaults]

thwip_cli-1.4.0/docs/verification.md

@@ -0,0 +1,58 @@
+# Verification status
+
+Verified locally on 2026-09-24 for the unreleased v1.4.0 source. The Python suite
+passes 216 offline tests. Exhaustive behavior across every provider and
+configuration has not been established.
+
+## Native CLI connections (2026-09-24)
+
+Live checks were run on macOS through a pseudo-terminal driving the real REPL with
+the installed Codex CLI 0.152.1, Claude Code 2.1.281, and Antigravity CLI 1.2.8,
+each using its existing sign-in. No API keys were configured.
+
+| Flow | Result |
+| --- | --- |
+| Startup discovery | All three CLIs connected; live model lists shown (Codex 4 models, Antigravity 14, Claude aliases) |
+| Chat turn per provider | Claude Code, Codex, and Antigravity each answered; text streamed into the Live view |
+| Context across `/switch` | Codex and Antigravity both recalled the answer given by the previous provider |
+| Codex approval request | A write command outside the read-only sandbox produced a permission prompt; denial left the workspace unchanged |
+| Ctrl+C during a response | Turn cancelled, child process terminated, REPL continued, unanswered message removed |
+| `/session save` and `/session load` | Session with a native provider saved and reloaded in a fresh run |
+| `/models`, `/models <provider>`, `/models <tier>` | Live catalogs listed with `CLI account` in place of API pricing |
+| `thwip --version`, `--help`, `--project` | Handled without starting the REPL; invalid project exits with code 2 |
+| `/limits` and `/status` usage windows | Codex and Claude Code account windows (5h, 7d) displayed with reset times after live turns |
+| Leftover processes | None after each run |
+
+The defect that blocked the previous attempt was the Codex sandbox value: the
+adapter sent `readOnly` and Codex rejected `thread/start` with an invalid-request
+error. The protocol enum is `read-only`. A regression test now checks the request.
+
+Remaining limitations: the Antigravity CLI showed intermittent network resets to
+Google's backend during testing, which surface as turn errors; Claude Code's model
+aliases are a curated list because the CLI exposes no model listing; native usage
+limit failover is unit-tested from error text, not observed live; the real Gemini
+CLI ACP path is covered by mocked tests only because it is not installed here.
+
+| Area | Evidence | Remaining limitation |
+| --- | --- | --- |
+| Commands and aliases | Offline command smoke tests, invalid input cases | Most smoke tests check exceptions, not all rendered content |
+| Sessions | Save/load, separate fresh conversations, malformed metadata, permissions, project rebinding | Concurrent writes to the same explicitly named session are not coordinated |
+| Provider switching and handoff | All seven provider catalogs, portable history, bounded failover | Live account quotas and model availability unverified |
+| Tool execution | Real temporary-file operations, path containment, process timeout/cancellation, invalid arguments | Shell and code tools retain local user privileges; output capture memory is unbounded |
+| Native Codex launcher | Save-before-launch, consent, flags, missing binary, terminal checks, failures | Mocked process replacement; no conversation transfer |
+| Native CLI connections | Live REPL runs above; mocked protocol tests for approvals, failures, limits, prompt building, discovery parsing | Gemini ACP path mocked only; live limit failover not observed |
+| Provider responses | Mocked native tool continuations; DeepSeek/Groq/OpenRouter streaming, usage-only chunks, 429/500 errors and serialized tool arguments | Other streaming and error branches still have coverage gaps |
+| Display/config/auth | Configuration validation, display settings, credential boundaries, short-key masking | No full terminal/platform matrix |
+| Usage | Atomic writes, malformed records, valid totals | Unknown catalog pricing may appear as zero estimated cost |
+| Website | Production build and deterministic demo completion/replay test | Real browser, layout, clipboard, keyboard and accessibility checks remain incomplete |
+| Dependencies | npm audit: zero advisories; Python installed-dependency audit: none found | Python audit skipped legacy local `thwip 1.0.0` metadata |
+| Packaging | Wheel/source build and metadata checks | Publication is separately verified through the release workflow |
+
+The Python suite measured 69% statement coverage with 160 passing tests before
+the final credential-masking tests were added. Coverage is diagnostic evidence,
+not proof that every feature works. The website test uses a minimal DOM stand-in
+and controlled timers, not a browser.
+
+This pass fixed default-session save collisions, malformed session/message
+metadata acceptance, tool-argument display crashes, Rich markup interpretation
+in action output, and short-key masking leakage.

{thwip_cli-1.2.0 → thwip_cli-1.4.0}/pyproject.toml

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

thwip_cli-1.4.0/tests/test_audit_regressions.py

@@ -0,0 +1,205 @@
+import json
+from io import StringIO
+from types import SimpleNamespace
+
+import pytest
+from rich.console import Console
+
+from thwip.agents import AgentRegistry
+from thwip.agents.base import AgentDone, Capability, LimitHit, LimitStatus, TextDelta
+from thwip.cli import ThwipCLI
+from thwip.config import ThwipConfig, get_usage_path
+from thwip.limits import UsageTracker
+from thwip.session import Session
+from thwip.tools import ToolManager
+
+
+@pytest.fixture
+def cli(tmp_path, monkeypatch):
+    monkeypatch.setenv('THWIP_CONFIG_DIR', str(tmp_path / 'config'))
+    cli = ThwipCLI.__new__(ThwipCLI)
+    cli.config = ThwipConfig(project=str(tmp_path), auto_save=False)
+    cli.registry = AgentRegistry(cli.config)
+    async def no_native_discovery(project):
+        return None
+    monkeypatch.setattr(cli.registry, 'connect_native_agents', no_native_discovery)
+    for a in cli.registry.list_agents():
+        monkeypatch.setattr(a, 'is_installed', lambda: True)
+        monkeypatch.setattr(a, 'is_configured', lambda: False)
+        if a.name == 'ollama':
+            a._cached_models = a.get_handoff_models()
+    cli.current_agent = cli.registry.get_agent('claude')
+    cli.session = Session(project_path=str(tmp_path), current_agent='claude', current_model=cli.current_agent.get_default_model())
+    cli.usage_tracker = UsageTracker()
+    cli.tool_manager = ToolManager(str(tmp_path))
+    cli.detector = SimpleNamespace(scan_all=list)
+    monkeypatch.setattr('builtins.input', lambda *args: '')
+    monkeypatch.setattr('getpass.getpass', lambda *args: '')
+    console = Console(file=StringIO(), width=100, color_system=None)
+    monkeypatch.setattr('thwip.cli.console', console)
+    monkeypatch.setattr('thwip.theme.console', console)
+    return cli
+
+
+@pytest.mark.parametrize('command', [
+    '/help', '/h', '/about', '/guide', '/g', '/info', '/agents', '/a', '/list',
+    '/models', '/m', '/models flagship', '/models balanced', '/models fast', '/models google',
+    '/tools', '/t', '/status', '/limits', '/detect', '/history', '/clear', '/reset', '/cost',
+    '/project', '/session save audit', '/session load missing', '/session list', '/session clear',
+    '/key', '/key google', '/key invalid', '/key openai REJECTED_TEST_KEY',
+    '/handoff', '/handoff invalid', '/handoff google invalid', '/switch', '/switch invalid',
+    '/switch google invalid', '/unknown', '/q', '/exit', '/quit',
+])
+@pytest.mark.asyncio
+async def test_command_no_exception(cli, command):
+    await cli.handle_command(command)
+
+
+@pytest.mark.parametrize('provider', ['claude','google','openai','deepseek','groq','ollama','openrouter'])
+@pytest.mark.asyncio
+async def test_all_catalogued_handoffs(cli, provider):
+    before = list(cli.session.messages)
+    for model in cli.registry.get_agent(provider).get_handoff_models():
+        await cli.handle_command(f'/handoff {provider} {model.id}')
+    assert cli.session.messages == before
+
+
+@pytest.mark.asyncio
+async def test_project_path_with_spaces(cli, tmp_path):
+    project = tmp_path / 'project with spaces'
+    project.mkdir()
+    await cli.handle_command(f'/project {project}')
+    assert cli.session.project_path == str(project)
+
+
+def test_usage_file_private(cli):
+    cli.usage_tracker.record_usage('openai', 'gpt-5.6-terra', 10, 5)
+    assert get_usage_path().stat().st_mode & 0o777 == 0o600
+
+
+@pytest.mark.parametrize('tool,args', [
+    ('read_file', {'file_path': 12}),
+    ('list_files', {'sub_dir': ['bad']}),
+    ('run_python', {'code': None}),
+])
+def test_invalid_tool_args_return_error_not_exception(cli, tool, args):
+    result = cli.tool_manager.execute_tool(tool, args)
+    assert isinstance(result, str)
+
+
+@pytest.mark.asyncio
+async def test_history_displays_literal_markup(cli):
+    cli.session.add_user_message('Show [/not-a-tag] literally')
+    await cli.handle_command('/history')
+
+
+@pytest.mark.parametrize('value', ['wrong', None, -1, True])
+def test_corrupted_handoff_counter_rejected_or_sanitized(cli, value):
+    path = cli.session.save('damaged')
+    data = json.loads(path.read_text())
+    data['observed_tool_results'] = value
+    path.write_text(json.dumps(data))
+    loaded = Session.load('damaged')
+    assert loaded is None or (type(loaded.observed_tool_results) is int and loaded.observed_tool_results >= 0)
+
+
+def test_invalid_config_type_rejected_or_defaulted(cli):
+    cli.config._apply_toml({'defaults': {'project': 123, 'confirm_tools': 'false'}})
+    assert isinstance(cli.config.project, str)
+    assert type(cli.config.confirm_tools) is bool
+
+
+@pytest.mark.asyncio
+async def test_session_roundtrip_rebinds_tools(cli, tmp_path):
+    target = tmp_path / 'other'
+    target.mkdir()
+    saved = Session(project_path=str(target), current_agent='google', current_model='missing')
+    saved.save('loadable')
+    await cli.handle_command('/session load loadable')
+    assert cli.tool_manager.file_editor.project_path == target
+    assert cli.current_agent.name == 'google'
+    assert cli.session.current_model == cli.current_agent.get_default_model()
+
+
+def test_all_tools_and_safety(cli, tmp_path):
+    tm = cli.tool_manager
+    assert 'Successfully' in tm.execute_tool('write_file', {'file_path':'a.txt','content':'one'})
+    assert tm.execute_tool('read_file', {'file_path':'a.txt'}) == 'one'
+    assert 'Successfully' in tm.execute_tool('edit_file', {'file_path':'a.txt','old_str':'one','new_str':'two'})
+    assert 'a.txt' in tm.execute_tool('list_files', {})
+    assert '42' in tm.execute_tool('run_python', {'code':'print(6 * 7)'})
+    assert 'Exit code: 0' in tm.execute_tool('run_command', {'command':'printf audit-ok'})
+    assert isinstance(tm.execute_tool('git_status', {}), str)
+    assert isinstance(tm.execute_tool('git_diff', {}), str)
+    assert 'outside' in tm.execute_tool('read_file', {'file_path':'../outside'})
+    outside = tmp_path.parent / 'audit-outside-file'
+    outside.write_text('not accessible')
+    (tmp_path / 'link').symlink_to(outside)
+    assert 'outside' in tm.execute_tool('read_file', {'file_path':'link'})
+    assert 'Error' in tm.execute_tool('unknown', {})
+    assert {t['name'] for t in tm.get_anthropic_tools()} == {t['function']['name'] for t in tm.get_openai_tools()}
+
+
+@pytest.mark.asyncio
+async def test_failover_does_not_retry_already_failed_provider(cli, monkeypatch):
+    agents = [cli.registry.get_agent('claude'), cli.registry.get_agent('google')]
+    attempts = []
+    for agent in agents:
+        monkeypatch.setattr(agent, 'is_configured', lambda: True)
+        monkeypatch.setattr(agent, 'get_capabilities_for_model', lambda model: {Capability.CHAT})
+
+        def make_chat(name):
+            async def chat(**kwargs):
+                attempts.append(name)
+                # Stop safely after four simulated rate limits; no actual network calls.
+                if len(attempts) <= 4:
+                    yield LimitHit(error_type=LimitStatus.RATE_LIMITED, message='test quota')
+                else:
+                    yield TextDelta(content='stop test')
+                    yield AgentDone()
+            return chat
+
+        monkeypatch.setattr(agent, 'chat', make_chat(agent.name))
+    monkeypatch.setattr(cli.registry, 'get_ready_agents', lambda: agents)
+    cli.config.fallback.chain = ['claude', 'google']
+    cli.config.limits.auto_switch = True
+    await cli.process_user_message('hello')
+    assert len(attempts) <= len(agents), f'Repeated failed providers: {attempts}'
+
+
+def test_main_handles_version_and_help_without_starting_the_repl(capsys):
+    from thwip import __version__
+    from thwip import cli as cli_module
+
+    with pytest.raises(SystemExit) as exit_info:
+        cli_module.main(['--version'])
+    assert exit_info.value.code == 0 and f'thwip {__version__}' in capsys.readouterr().out
+    with pytest.raises(SystemExit) as exit_info:
+        cli_module.main(['--help'])
+    assert exit_info.value.code == 0 and '--project' in capsys.readouterr().out
+    with pytest.raises(SystemExit) as exit_info:
+        cli_module.main(['--project', '/definitely/missing/dir'])
+    assert exit_info.value.code == 2
+
+
+@pytest.mark.asyncio
+async def test_failed_turn_removes_unanswered_user_message(cli, monkeypatch):
+    class Broken:
+        name = 'openai'
+        display_name = 'Broken'
+        company = 'OpenAI'
+        native_tools = True
+        project = '.'
+        def is_configured(self):
+            return True
+        def is_installed(self):
+            return True
+        def get_capabilities_for_model(self, model):
+            return set()
+        async def chat(self, **kwargs):
+            raise RuntimeError('Native CLI rejected thread/start')
+            yield
+    cli.current_agent = Broken()
+    cli.session.current_agent = 'openai'
+    await cli.process_user_message('hello')
+    assert cli.session.messages == []

{thwip_cli-1.2.0 → thwip_cli-1.4.0}/tests/test_cli.py

@@ -75,6 +75,30 @@ class UnconfiguredAgent(ToolCallingAgent):
         return False
 
 
+@pytest.mark.asyncio
+@pytest.mark.parametrize("arguments", [None, [], "bad", {"file_path": "[broken]"}])
+async def test_invalid_tool_arguments_return_errors_without_crashing(tmp_path, arguments):
+    class InvalidToolAgent(ToolCallingAgent):
+        async def chat(self, messages, **kwargs):
+            self.calls.append(messages)
+            if len(self.calls) == 1:
+                yield ToolUseStart(tool_id="bad", tool_name="read_file", args=arguments)
+                yield AgentDone()
+            else:
+                assert "Error" in messages[-1]["content"]
+                yield TextDelta(content="Recovered from invalid tool arguments.")
+                yield AgentDone()
+
+    cli = ThwipCLI.__new__(ThwipCLI)
+    cli.config = SimpleNamespace(stream=True, confirm_tools=True)
+    cli.session = Session(current_agent="fake", current_model="fake-model")
+    cli.current_agent = InvalidToolAgent()
+    cli.tool_manager = ToolManager(tmp_path)
+    cli.usage_tracker = FakeUsageTracker()
+    await cli.process_user_message("Read")
+    assert cli.session.messages[-1].content == "Recovered from invalid tool arguments."
+
+
 @pytest.mark.asyncio
 async def test_unconfigured_agent_shows_setup_guidance(tmp_path):
     cli = ThwipCLI.__new__(ThwipCLI)
@@ -91,11 +115,12 @@ async def test_unconfigured_agent_shows_setup_guidance(tmp_path):
     assert len(cli.session.messages) == 0
 
 
-def test_inline_api_key_is_rejected():
+@pytest.mark.asyncio
+async def test_inline_api_key_is_rejected():
     cli = ThwipCLI.__new__(ThwipCLI)
     cli.config = SimpleNamespace(keys={}, key_sources={}, save=lambda: None)
 
-    cli.cmd_auth_config("openai", "secret-value")
+    await cli.cmd_auth_config("openai", "secret-value")
 
     assert cli.config.keys == {}
     assert cli.config.key_sources == {}

thwip_cli-1.4.0/tests/test_compatible_streaming.py

@@ -0,0 +1,75 @@
+"""Exercise streaming completion and provider error boundaries without network calls."""
+
+import json
+from types import SimpleNamespace
+
+import httpx
+import openai
+import pytest
+
+from thwip.agents.base import AgentDone, LimitHit, LimitStatus, TextDelta
+from thwip.agents.deepseek_agent import DeepSeekAgent
+from thwip.agents.groq_agent import GroqAgent
+from thwip.agents.openrouter_agent import OpenRouterAgent
+
+
+@pytest.mark.parametrize("agent_type", [DeepSeekAgent, GroqAgent, OpenRouterAgent])
+@pytest.mark.asyncio
+async def test_tool_continuation_serializes_arguments_without_mutating_history(agent_type):
+    original = {"role": "assistant", "content": "", "tool_calls": [{
+        "id": "call1", "type": "function", "function": {
+            "name": "read_file", "arguments": {"file_path": "note.txt"},
+        },
+    }], "_native_state": {"other": "private"}}
+
+    async def create(**kwargs):
+        sent = kwargs["messages"][0]
+        assert "_native_state" not in sent
+        assert json.loads(sent["tool_calls"][0]["function"]["arguments"]) == {"file_path": "note.txt"}
+        return SimpleNamespace(choices=[SimpleNamespace(message=SimpleNamespace(content="done", tool_calls=[]))], usage=None)
+
+    agent = agent_type(api_key="test")
+    agent._client = SimpleNamespace(chat=SimpleNamespace(completions=SimpleNamespace(create=create)))
+    events = [event async for event in agent.chat([original], stream=False)]
+    assert any(isinstance(event, AgentDone) for event in events)
+    assert isinstance(original["tool_calls"][0]["function"]["arguments"], dict)
+    assert "_native_state" in original
+
+
+@pytest.mark.parametrize("agent_type", [DeepSeekAgent, GroqAgent, OpenRouterAgent])
+@pytest.mark.asyncio
+async def test_stream_text_and_usage_only_final_chunk(agent_type):
+    async def chunks():
+        yield SimpleNamespace(choices=[SimpleNamespace(delta=SimpleNamespace(
+            content="hello", tool_calls=None))], usage=None)
+        yield SimpleNamespace(choices=[], usage=SimpleNamespace(prompt_tokens=9, completion_tokens=3))
+
+    async def create(**kwargs):
+        assert kwargs["stream"] is True
+        return chunks()
+
+    agent = agent_type(api_key="test")
+    agent._client = SimpleNamespace(chat=SimpleNamespace(completions=SimpleNamespace(create=create)))
+    events = [event async for event in agent.chat([{"role": "user", "content": "hi"}])]
+    assert isinstance(events[0], TextDelta) and events[0].content == "hello"
+    assert isinstance(events[-1], AgentDone)
+    assert events[-1].usage.input_tokens == 9
+    assert events[-1].usage.output_tokens == 3
+    assert agent.check_limits() == LimitStatus.OK
+
+
+@pytest.mark.parametrize("agent_type", [DeepSeekAgent, GroqAgent, OpenRouterAgent])
+@pytest.mark.parametrize("status", [429, 500])
+@pytest.mark.asyncio
+async def test_provider_errors_emit_failure_not_success(agent_type, status):
+    response = httpx.Response(status, request=httpx.Request("POST", "https://example.invalid"))
+    error_type = openai.RateLimitError if status == 429 else openai.APIStatusError
+
+    async def create(**kwargs):
+        raise error_type("simulated failure", response=response, body=None)
+
+    agent = agent_type(api_key="test")
+    agent._client = SimpleNamespace(chat=SimpleNamespace(completions=SimpleNamespace(create=create)))
+    events = [event async for event in agent.chat([])]
+    assert len(events) == 1 and isinstance(events[0], LimitHit)
+    assert events[0].error_type == (LimitStatus.RATE_LIMITED if status == 429 else LimitStatus.UNKNOWN)