docs(readme): state the binary download output flags

docs(readme): approve the upload in the source example and qualify the JSON output claim
docs(readme): trim the strix cloud section to the essentials
2026-09-21 00:23:52 +08:00 · 2026-09-02 14:02:06 +00:00 · 2026-09-02 13:59:07 +00:00 · 2026-09-02 13:55:26 +00:00 · 2026-09-02 16:52:53 +03:00 · 2026-09-02 16:52:53 +03:00
44 changed files with 898 additions and 411 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,3 +1,6 @@
+# Built viewer bundles are generated output, not hand-edited source.
+exclude: ^strix/interface/viewer/static/assets/
+
 repos:
  # Ruff for fast linting and formatting
  - repo: https://github.com/astral-sh/ruff-pre-commit
@@ -9,21 +12,18 @@ repos:
      - id: ruff-format
        name: ruff-format

-  # MyPy for static type checking
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.17.1
+  # MyPy for static type checking. Runs the project's own mypy from the uv
+  # environment (`make dev-install`) so it sees the same dependencies and
+  # stubs as `make check-all`.
+  - repo: local
    hooks:
      - id: mypy
-        additional_dependencies: [
-          types-requests,
-          types-python-dateutil,
-          pydantic,
-          fastapi,
-          pytest,
-          hatchling,
-          "openai-agents[litellm]>=0.19.0,<0.20",
-        ]
-        args: [--install-types, --non-interactive]
+        name: mypy
+        entry: uv run mypy
+        language: system
+        types_or: [python, pyi]
+        files: ^(strix|tests)/
+        require_serial: true

  # Built-in hooks for basic file checks
  - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -62,5 +62,6 @@ ci:
  autoupdate_branch: ""
  autoupdate_commit_msg: "[pre-commit.ci] pre-commit autoupdate"
  autoupdate_schedule: weekly
-  skip: []
+  # pre-commit.ci cannot run `language: system` hooks; mypy runs via `make check-all`.
+  skip: [mypy]
  submodules: false
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -28,7 +28,7 @@ Target-specific workflows built on the same engine:
 - **Open-source CLI (self-hosted):** free, fully local, BYO LLM key, needs Docker. Best for local dev loops, air-gapped/offline, and full control.
  ```bash
  curl -sSL https://strix.ai/install | bash        # install
-  export STRIX_LLM="openai/gpt-5.4"                 # any LiteLLM model id
+  export STRIX_LLM="openrouter/z-ai/glm-5.3"        # any LiteLLM model id
  export LLM_API_KEY="<key>"
  strix -n -t ./ --scan-mode quick --max-budget 10  # headless scan; always use -n
  ```
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,7 +31,7 @@ Thank you for your interest in contributing to Strix! This guide will help you g

 3. **Configure your LLM provider**
   ```bash
-   export STRIX_LLM="openai/gpt-5.4"
+   export STRIX_LLM="openrouter/z-ai/glm-5.3"
   export LLM_API_KEY="your-api-key"
   ```

--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ Strix are autonomous AI penetration testing agents that act just like real hacke
 curl -sSL https://strix.ai/install | bash

 # Configure your AI provider
-export STRIX_LLM="openai/gpt-5.4"
+export STRIX_LLM="openrouter/z-ai/glm-5.3"
 export LLM_API_KEY="your-api-key"

 # Run your first security assessment
@@ -294,7 +294,7 @@ jobs:
 ### Configuration

 ```bash
-export STRIX_LLM="openai/gpt-5.4"
+export STRIX_LLM="openrouter/z-ai/glm-5.3"
 export LLM_API_KEY="your-api-key"

 # Optional
@@ -322,105 +322,18 @@ strix auth logout             # forget the sign-in

 #### Use the managed platform: `strix cloud`

-The `strix cloud` commands drive the managed platform ([app.strix.ai](https://app.strix.ai)) from the terminal. Sign in once with the device flow. The sign-in creates your account and workspace on first use and stores a personal API token in `~/.strix/platform-auth.json`:
+Run scans on [app.strix.ai](https://app.strix.ai) from the terminal, without Docker or an LLM key:

 ```bash
-strix cloud login                         # browser approval, then workspace + scope profile
-strix cloud login --workspace "My Team"   # select a workspace by name or ID
-strix cloud whoami                        # fast local account/workspace status
-strix cloud session                       # verify remote session + consent ceiling
-strix cloud logout                        # revoke remotely, then remove locally
-```
-
-The default **Recommended** scope preset supports normal scan work, local source uploads,
-workspace switching, and user-approved credit top-ups. It excludes credential creation;
-request `tokens:write` explicitly (or choose Full) when needed. For strict least privilege, pass an explicit list such as
-`--scopes scans:read scans:write uploads:write billing:read`. Named automation
-profiles are also available with `--scope-profile minimal|recommended|full`.
-
-Every operation of the [REST API](https://docs.app.strix.ai) has a matching command in the form `strix cloud <resource> <verb>`:
-
-```bash
-strix cloud                                   # list all resources
-strix cloud scans                             # run the safe default (`scans list`)
-strix cloud scans help                        # list the verbs of a resource
-strix cloud domains add --domain example.com --asset-type web_app
+strix cloud login                                  # browser sign-in, one credential per install
+strix cloud scans start --source . --yes --wait    # scan local code, approving the upload
 strix cloud scans start --engagement-type live_test --domain-ids <uuid> --wait
-strix cloud scans start --source . --dry-run --show-files --json  # review + capture source.archive_sha256
-SOURCE_SHA256="<reviewed source.archive_sha256>"
-strix cloud scans start --source . --approve-sha256 "$SOURCE_SHA256" --wait
 strix cloud vulns list --severity critical
-strix cloud credits                           # credit balance
-strix cloud billing topup --credits 20 --yes  # explicitly approve agent payment after HTTP 402
 ```

-Workspaces and account setup also work from the terminal:
+Every [REST API](https://docs.app.strix.ai) operation has a matching `strix cloud <resource> <verb>` command. Run `strix cloud` to list the resources, and add `help` to a resource to list its verbs. Output is JSON when stdout is not a terminal or when you pass `--json`. Binary downloads are the exception: redirect the raw bytes, or combine `--output FILE --json` for download metadata.

-```bash
-strix cloud workspaces list                   # numbered list; `workspace` is also accepted
-strix cloud workspaces create --name "My Team" # admin + organizations:write
-strix cloud workspaces use 2                  # switch by list number, exact name, or ID
-strix cloud session scopes                    # granted scopes + login ceiling
-strix cloud session scopes set minimal        # narrow without another browser sign-in
-strix cloud billing subscribe --plan strix_cloud # opens the hosted checkout page
-strix cloud billing portal                    # opens the billing portal
-strix cloud integrations install github       # opens the app installation page
-strix cloud domains verify <domain-id>        # prints the DNS record to add
-```
-
-The last four commands end at a person. Strix creates the link, opens the browser for an interactive terminal, and always prints the URL. The user enters the card, approves the installation, or adds the DNS record. Pass `--no-browser` to print the URL only.
-
-The commands work for humans and agents: terminal output favors names, branches, lifecycle states, and numbered selectors, while redirected output (or `--json`) preserves complete machine-readable records and IDs. Human lists retain the selectors needed by follow-up commands but omit internal organization/user IDs; a selector too long for the compact table is repeated losslessly in a copyable block. Paginated lists print the next `--page` or `--offset`, and detail views preserve useful prose within a safe terminal bound; use `--json` for the complete record. Token lists distinguish API keys from named CLI device sessions. Binary downloads are the exception: intentionally redirect their raw bytes, or use `--output FILE --json` to write the file and receive structured download metadata. There are no prompts when stdin is not a terminal. Exit codes: `0` success, `1` error, `2` invalid usage, `4` authentication or plan limit, `5` payment required. `--token` and `STRIX_API_TOKEN` are stateless per-command overrides and never replace the stored sign-in; pair a CLI-session override with `--workspace-id` or `STRIX_WORKSPACE_ID`.
-
-A browser sign-in creates one reusable credential per CLI installation. Logging in again on the
-same installation replaces its secret instead of accumulating keys. Workspace switches keep that
-credential and expiry, preserve the server-side scope preference, cap access by the target role,
-and can never exceed the login consent ceiling. Each process pins its starting workspace, so a
-concurrent switch fails safely instead of sending a stale command to another organization.
-`strix cloud logout` revokes the server session before deleting the local token; use
-`--local-only` only when you deliberately cannot reach the server.
-
-Write commands take request fields as flags, and every write command also accepts one JSON object with `--data`:
-
-```bash
-strix cloud scans start --data '{"engagement_type":"code_review"}'   # literal JSON
-strix cloud scans start --data @request.json                         # read a file
-cat request.json | strix cloud scans start --data -                  # read standard input
-```
-
-For an agent or CI local-source scan, run `--dry-run --show-files --json`, review the manifest,
-and capture `source.archive_sha256`. Rerun with the same `--source`, every `--exclude`, and any
-`--include-*` selection flags, replacing `--dry-run` with `--approve-sha256 HASH`; Strix
-rebuilds the archive and refuses to upload it if the digest changed. `--yes` instead approves
-only the snapshot built in that one invocation. It is suitable for a deliberate human or
-one-shot approval, not as a digest-bound two-step agent/CI handoff.
-
-The safe default honors `.gitignore` and `.strixignore` and excludes hidden paths, secret-like
-files, VCS metadata, dependencies/build output, symlinks, and nested archives. Opt in
-separately with `--include-hidden`, `--include-sensitive`, or `--include-archives`. The client
-caps a bundle at 20,000 files, 25 MiB per file, 250 MiB expanded, and 50 MiB compressed, and
-the service independently validates the archive. Source alone infers a code review; adding a
-domain infers a live test. You can always pass `--engagement-type` explicitly.
-
-Strix removes the temporary local archive after every invocation. It deletes a staged remote
-upload after a definitive scan rejection. If a network error, `5xx` response, malformed
-success response, or interruption makes the launch outcome ambiguous, it retains the upload and reports its `upload_id` with
-`launch_outcome_unknown: true`; if automatic deletion cannot be confirmed, it reports the ID
-with `cleanup_unknown: true`. Check `strix cloud scans list` before retrying. If no scan is
-linked to the retained upload, delete it with `strix cloud uploads delete UPLOAD_ID`.
-
-Non-Enterprise scans consume the deterministic estimate shown for their scope (a source-only
-code review at the default `ultra` tier currently starts at 60 credits). Enterprise scans are
-plan-included and do not consume the credit wallet. Report downloads need Enterprise,
-schedules need Pro, and billing writes need an admin token. Plan blocks exit `4`; an
-insufficient credit wallet exits `5` without creating or charging a scan.
-
-Enable native tab completion once per shell session:
-
-```bash
-source <(strix completions zsh)       # use bash instead of zsh when appropriate
-strix completions fish | source
-```
+See the [platform documentation](https://docs.app.strix.ai) for scopes, workspaces, billing, and source-upload options.

 #### Connect your own MCP servers

@@ -448,9 +361,12 @@ Each server's tools are namespaced by `name` (for example `local_fs_read_file`).

 **Recommended models for best results:**

+- [Z.ai GLM-5.3 on OpenRouter](https://openrouter.ai/z-ai/glm-5.3) - `openrouter/z-ai/glm-5.3` (the default pick)
 - [OpenAI GPT-5.4](https://openai.com/api/) - `openai/gpt-5.4`
 - [Anthropic Claude Sonnet 4.6](https://claude.com/platform/api) - `anthropic/claude-sonnet-4-6`
 - [Google Gemini 3 Pro Preview](https://cloud.google.com/vertex-ai) - `vertex_ai/gemini-3-pro-preview`
+- [DeepSeek V4 Pro](https://platform.deepseek.com) - `deepseek/deepseek-v4-pro`
+- [Moonshot Kimi K3](https://platform.kimi.ai) - `moonshot/kimi-k3`

 See the [LLM Providers documentation](https://docs.strix.ai/llm-providers/overview) for all supported providers including Vertex AI, Bedrock, Azure, and local models.

--- a/docs/advanced/configuration.mdx
+++ b/docs/advanced/configuration.mdx
@@ -8,7 +8,7 @@ Configure Strix using environment variables or a config file.
 ## LLM Configuration

 <ParamField path="STRIX_LLM" type="string" required>
-  Model name in LiteLLM format (e.g., `openai/gpt-5.4`, `anthropic/claude-sonnet-4-6`).
+  Model name in LiteLLM format (e.g., `openrouter/z-ai/glm-5.3`, `openai/gpt-5.4`).
 </ParamField>

 <ParamField path="LLM_API_KEY" type="string">
@@ -145,7 +145,7 @@ strix --target ./app --config /path/to/config.json
 ```json
 {
  "env": {
-    "STRIX_LLM": "openai/gpt-5.4",
+    "STRIX_LLM": "openrouter/z-ai/glm-5.3",
    "LLM_API_KEY": "sk-...",
    "STRIX_REASONING_EFFORT": "high"
  }
@@ -156,7 +156,7 @@ strix --target ./app --config /path/to/config.json

 ```bash
 # Required
-export STRIX_LLM="openai/gpt-5.4"
+export STRIX_LLM="openrouter/z-ai/glm-5.3"
 export LLM_API_KEY="sk-..."

 # Optional: Enable web search
--- a/docs/contributing.mdx
+++ b/docs/contributing.mdx
@@ -33,7 +33,7 @@ description: "Contribute to Strix development"
  </Step>
  <Step title="Configure LLM">
    ```bash
-    export STRIX_LLM="openai/gpt-5.4"
+    export STRIX_LLM="openrouter/z-ai/glm-5.3"
    export LLM_API_KEY="your-api-key"
    ```
  </Step>
--- a/docs/index.mdx
+++ b/docs/index.mdx
@@ -78,7 +78,7 @@ Strix uses a graph of specialized agents for comprehensive security testing:
 curl -sSL https://strix.ai/install | bash

 # Configure
-export STRIX_LLM="openai/gpt-5.4"
+export STRIX_LLM="openrouter/z-ai/glm-5.3"
 export LLM_API_KEY="your-api-key"

 # Scan
--- a/docs/integrations/github-actions.mdx
+++ b/docs/integrations/github-actions.mdx
@@ -37,7 +37,7 @@ Add these secrets to your repository:

 | Secret | Description |
 |--------|-------------|
-| `STRIX_LLM` | Model name (e.g., `openai/gpt-5.4`) |
+| `STRIX_LLM` | Model name (e.g., `openrouter/z-ai/glm-5.3`) |
 | `LLM_API_KEY` | API key for your LLM provider |

 ## Exit Codes
--- a/docs/llm-providers/novita.mdx
+++ b/docs/llm-providers/novita.mdx
@@ -17,6 +17,9 @@ export LLM_API_BASE="https://api.novita.ai/openai"

 | Model | Configuration |
 |-------|---------------|
+| GLM-5.3 | `openai/zai-org/glm-5.3` |
+| Kimi K3 | `openai/moonshotai/kimi-k3` |
+| DeepSeek V4 Pro | `openai/deepseek/deepseek-v4-pro` |
 | Kimi K2.5 | `openai/moonshotai/kimi-k2.5` |
 | GLM-5 | `openai/zai-org/glm-5` |
 | MiniMax M2.5 | `openai/minimax/minimax-m2.5` |
--- a/docs/llm-providers/openrouter.mdx
+++ b/docs/llm-providers/openrouter.mdx
@@ -8,7 +8,7 @@ description: "Configure Strix with models via OpenRouter"
 ## Setup

 ```bash
-export STRIX_LLM="openrouter/openai/gpt-5.4"
+export STRIX_LLM="openrouter/z-ai/glm-5.3"
 export LLM_API_KEY="sk-or-..."
 ```

@@ -18,9 +18,12 @@ Access any model on OpenRouter using the format `openrouter/<provider>/<model>`:

 | Model | Configuration |
 |-------|---------------|
+| GLM-5.3 (default) | `openrouter/z-ai/glm-5.3` |
 | GPT-5.4 | `openrouter/openai/gpt-5.4` |
 | Claude Sonnet 4.6 | `openrouter/anthropic/claude-sonnet-4.6` |
 | Gemini 3 Pro | `openrouter/google/gemini-3-pro-preview` |
+| DeepSeek V4 Pro | `openrouter/deepseek/deepseek-v4-pro` |
+| Kimi K3 | `openrouter/moonshotai/kimi-k3` |
 | GLM-4.7 | `openrouter/z-ai/glm-4.7` |

 ## Get API Key
--- a/docs/llm-providers/overview.mdx
+++ b/docs/llm-providers/overview.mdx
@@ -9,14 +9,17 @@ Strix uses [LiteLLM](https://docs.litellm.ai/docs/providers) for model compatibi

 Set your model and API key:

-| Model             | Provider      | Configuration                    |
-| ----------------- | ------------- | -------------------------------- |
-| GPT-5.4           | OpenAI        | `openai/gpt-5.4`                 |
-| Claude Sonnet 4.6 | Anthropic     | `anthropic/claude-sonnet-4-6`    |
-| Gemini 3 Pro      | Google Vertex | `vertex_ai/gemini-3-pro-preview` |
+| Model                | Provider          | Configuration                    |
+| -------------------- | ----------------- | -------------------------------- |
+| GLM-5.3 (default)    | Z.ai (OpenRouter) | `openrouter/z-ai/glm-5.3`        |
+| GPT-5.4              | OpenAI            | `openai/gpt-5.4`                 |
+| Claude Sonnet 4.6    | Anthropic         | `anthropic/claude-sonnet-4-6`    |
+| Gemini 3 Pro         | Google Vertex     | `vertex_ai/gemini-3-pro-preview` |
+| DeepSeek V4 Pro      | DeepSeek          | `deepseek/deepseek-v4-pro`       |
+| Kimi K3              | Moonshot          | `moonshot/kimi-k3`               |

 ```bash
-export STRIX_LLM="openai/gpt-5.4"
+export STRIX_LLM="openrouter/z-ai/glm-5.3"
 export LLM_API_KEY="your-api-key"
 ```

@@ -62,6 +65,7 @@ See the [Local Models guide](/llm-providers/local) for setup instructions and re
 Use LiteLLM's `provider/model-name` format:

 ```
+openrouter/z-ai/glm-5.3
 openai/gpt-5.4
 anthropic/claude-sonnet-4-6
 vertex_ai/gemini-3-pro-preview
--- a/docs/quickstart.mdx
+++ b/docs/quickstart.mdx
@@ -28,12 +28,12 @@ description: "Install Strix and run your first security scan"
 Set your LLM provider:

 ```bash
-export STRIX_LLM="openai/gpt-5.4"
+export STRIX_LLM="openrouter/z-ai/glm-5.3"
 export LLM_API_KEY="your-api-key"
 ```

 <Tip>
-For best results, use `openai/gpt-5.4`, `anthropic/claude-opus-4-6`, or `openai/gpt-5.2`.
+For best results, use `openrouter/z-ai/glm-5.3` (the default pick), `openai/gpt-5.4`, `anthropic/claude-opus-4-6`, or `openai/gpt-5.2`.
 </Tip>

 ## Run Your First Scan
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -250,6 +250,7 @@ ignore = [
 # Stdlib HTTP handler overrides (do_GET/do_POST) and lazy imports that avoid a
 # circular dependency with strix.telemetry / strix.interface.viewer.report_pdf.
 "strix/interface/viewer/server.py" = ["N802", "PLC0415"]
+"strix/interface/cloud/payment_proxy.py" = ["N802"]
 # Lazy telemetry import to avoid importing PostHog before the viewer starts.
 "strix/interface/viewer/cli.py" = ["PLC0415"]
 # Lazy imports inside functions to avoid circular dependency with
@@ -413,6 +414,8 @@ known_third_party = ["pydantic", "litellm"]
 # ============================================================================

 [tool.bandit]
-exclude_dirs = ["docs", "build", "dist"]
+# Tests are covered by ruff's flake8-bandit rules (see per-file-ignores above),
+# which is where fixture tokens and loopback URL opens are already waived.
+exclude_dirs = ["docs", "build", "dist", "tests"]
 skips = ["B101", "B601", "B404", "B603", "B607"]  # Skip assert, shell injection, subprocess import and partial path checks
 severity = "medium"
--- a/strix/config/codex.py
+++ b/strix/config/codex.py
@@ -183,7 +183,7 @@ def build_authorize_url(challenge: str, state: str) -> str:
        "code_challenge": challenge,
        "code_challenge_method": "S256",
        "state": state,
-        "id_token_add_organizations": "true",
+        "id_token_add_organizations": "true",  # nosec B105 - boolean flag, not a secret
        "codex_cli_simplified_flow": "true",
        "originator": ORIGINATOR,
    }
--- a/strix/config/loader.py
+++ b/strix/config/loader.py
@@ -10,11 +10,13 @@ from typing import TYPE_CHECKING, Any

 from pydantic import AliasChoices, BaseModel

-from strix.config.settings import Settings
+from strix.config.settings import LlmSettings, Settings
 from strix.utils.secret_files import write_secret_text


 if TYPE_CHECKING:
+    from collections.abc import Mapping
+
    from pydantic.fields import FieldInfo


@@ -25,6 +27,11 @@ _DEFAULT_PATH: Path = Path.home() / ".strix" / "cli-config.json"
 _override: Path | None = None
 _cached: Settings | None = None

+# Model, API key, and API base describe one provider connection. When the shell
+# changes any of them, the stored values of the others no longer belong together
+# and are dropped rather than mixed with the new value.
+_LINKED_LLM_FIELDS = ("model", "api_key", "api_base")
+

 def load_settings() -> Settings:
    """Resolve settings from env + JSON file + defaults. Memoized.
@@ -54,22 +61,31 @@ def apply_config_override(path: Path) -> None:


 def persist_current() -> None:
-    """Write currently-set env vars to the active config file (0o600)."""
+    """Merge currently-set env vars into the active config file (0o600).
+
+    Values already in the file survive when their env var is unset, so a
+    run that gets its settings from the file does not erase them. An env
+    var set to the empty string clears the field from the file. A change to
+    any linked LLM connection var drops the whole stored connection first.
+    """
    s = load_settings()
    target = _override or _DEFAULT_PATH
    target.parent.mkdir(parents=True, exist_ok=True)

-    env_block: dict[str, str] = {}
-    for sub_name in s.model_fields:
+    env_block = _drop_stale_llm_connection(_read_env_block(target))
+    for sub_name in type(s).model_fields:
        sub_model = getattr(s, sub_name)
        if not isinstance(sub_model, BaseModel):
            continue
        for finfo in type(sub_model).model_fields.values():
-            for alias in _aliases_for(finfo):
-                value = os.environ.get(alias.upper())
-                if value:
-                    env_block[alias.upper()] = value
-                    break
+            aliases = [alias.upper() for alias in _aliases_for(finfo)]
+            active = next((alias for alias in aliases if alias in os.environ), None)
+            if active is None:
+                continue
+            for alias in aliases:
+                env_block.pop(alias, None)
+            if os.environ[active]:
+                env_block[active] = os.environ[active]

    write_secret_text(target, json.dumps({"env": env_block}, indent=2))

@@ -93,17 +109,9 @@ def _read_json_overrides(path: Path) -> dict[str, dict[str, Any]]:
    Only includes keys whose env var is NOT already set, so env always
    wins over the persisted file.
    """
-    if not path.exists():
+    env_block_upper = _drop_stale_llm_connection(_read_env_block(path))
+    if not env_block_upper:
        return {}
-    try:
-        data = json.loads(path.read_text(encoding="utf-8"))
-    except (json.JSONDecodeError, OSError):
-        return {}
-    env_block = data.get("env", {}) if isinstance(data, dict) else {}
-    if not isinstance(env_block, dict):
-        return {}
-
-    env_block_upper = {str(k).upper(): v for k, v in env_block.items()}
    env_present = {k.upper() for k in os.environ}

    nested: dict[str, dict[str, Any]] = {}
@@ -123,3 +131,38 @@ def _read_json_overrides(path: Path) -> dict[str, dict[str, Any]]:
        if sub_data:
            nested[sub_name] = sub_data
    return nested
+
+
+def _first_alias_value(aliases: list[str], source: Mapping[str, Any]) -> Any | None:
+    return next((source[alias] for alias in aliases if alias in source), None)
+
+
+def _drop_stale_llm_connection(env_block: dict[str, Any]) -> dict[str, Any]:
+    """Remove every linked LLM var from ``env_block`` if the shell changed any of them."""
+    linked_aliases = [
+        [alias.upper() for alias in _aliases_for(LlmSettings.model_fields[name])]
+        for name in _LINKED_LLM_FIELDS
+    ]
+    changed = any(
+        (env_value := _first_alias_value(aliases, os.environ)) is not None
+        and env_value != _first_alias_value(aliases, env_block)
+        for aliases in linked_aliases
+    )
+    if not changed:
+        return env_block
+    stale = {alias for aliases in linked_aliases for alias in aliases}
+    return {k: v for k, v in env_block.items() if k not in stale}
+
+
+def _read_env_block(path: Path) -> dict[str, Any]:
+    """Return the ``env`` block stored in ``path`` with upper-cased keys, or ``{}``."""
+    if not path.exists():
+        return {}
+    try:
+        data = json.loads(path.read_text(encoding="utf-8"))
+    except (json.JSONDecodeError, OSError):
+        return {}
+    env_block = data.get("env", {}) if isinstance(data, dict) else {}
+    if not isinstance(env_block, dict):
+        return {}
+    return {str(k).upper(): v for k, v in env_block.items()}
--- a/strix/config/models.py
+++ b/strix/config/models.py
@@ -562,6 +562,8 @@ DEFAULT_MODEL_RETRY = ModelRetrySettings(
 )

 RECOMMENDED_MODEL_NAMES = (
+    "zai/glm-5.3",
+    "zai/glm-5.3-flash",
    "openai/gpt-5.6-sol",
    "openai/gpt-5.6-terra",
    "openai/gpt-5.6-luna",
@@ -570,6 +572,7 @@ RECOMMENDED_MODEL_NAMES = (
    "openai/gpt-5.5",
    "openai/gpt-5.4",
    "openai/gpt-5.3-codex",
+    "anthropic/claude-fable-5-1",
    "anthropic/claude-fable-5",
    "anthropic/claude-opus-5",
    "anthropic/claude-opus-4-8",
@@ -577,6 +580,8 @@ RECOMMENDED_MODEL_NAMES = (
    "anthropic/claude-sonnet-4-6",
    "vertex_ai/gemini-3.1-pro-preview",
    "gemini/gemini-3.1-pro-preview",
+    "vertex_ai/gemini-3.7-flash",
+    "gemini/gemini-3.7-flash",
    "gemini/gemini-3.6-flash",
    "deepseek/deepseek-v4-pro",
    "deepseek/deepseek-v4-flash",
@@ -598,6 +603,7 @@ FRONTIER_MODEL_FAMILIES = (
    (("deepseek",), ("deepseek-v4", "deepseek-r1", "deepseek-reasoner")),
    (("alibaba", "dashscope", "qwen"), ("qwen3.8", "qwen3.7", "qwen3-max")),
    (("moonshot", "moonshotai", "kimi"), ("kimi-k3", "kimi-k2.7", "kimi-k2.6")),
+    (("zai", "z-ai", "zai-org", "zhipuai"), ("glm-5.3", "glm-5.2")),
 )


--- a/strix/core/runner.py
+++ b/strix/core/runner.py
@@ -428,6 +428,7 @@ async def run_strix_scan(
                        }
                        for summary in mcp_registry.summaries()
                    ]
+
                    # Feed a non-secret connection roster (name / provider /
                    # tool_count / dead) to two consumers: once now (all
                    # currently healthy) and again whenever a connection later
--- a/strix/interface/cloud/init.py
+++ b/strix/interface/cloud/init.py
@@ -14,7 +14,7 @@ import sys
 from rich.console import Console
 from rich.markup import escape

-import strix.interface.cloud.http as http  # noqa: PLR0402
+from strix.interface.cloud import http
 from strix.interface.cloud.render import json_mode
 from strix.interface.cloud.runner import resolve, run
 from strix.interface.cloud.session import run_session
--- a/strix/interface/environment.py
+++ b/strix/interface/environment.py
@@ -70,7 +70,7 @@ def validate_environment() -> None:
                error_text.append("• ", style="white")
                error_text.append("STRIX_LLM", style="bold cyan")
                error_text.append(
-                    " - Model name to use (e.g., 'openai/gpt-5.4' or "
+                    " - Model name to use (e.g., 'openrouter/z-ai/glm-5.3' or "
                    "'anthropic/claude-opus-4-7')\n",
                    style="white",
                )
@@ -102,7 +102,7 @@ def validate_environment() -> None:
                    )

        error_text.append("\nExample setup:\n", style="white")
-        error_text.append("export STRIX_LLM='openai/gpt-5.4'\n", style="dim white")
+        error_text.append("export STRIX_LLM='openrouter/z-ai/glm-5.3'\n", style="dim white")

        if missing_optional_vars:
            for var in missing_optional_vars:
--- a/strix/interface/main.py
+++ b/strix/interface/main.py
@@ -391,13 +391,10 @@ def _print_model_connection_error(exc: BaseException, model_name: str) -> None:
 def _bootstrap_scan(args: argparse.Namespace) -> None:
    """Warm up the model and prepare the run for a non-interactive scan.

-    Interactive launches only validate the environment here; the model
-    preflight and run preparation happen inside the TUI so the interface
-    paints immediately instead of waiting on a model round trip.
+    Interactive launches skip this: the model preflight and run preparation
+    happen inside the TUI so the interface paints immediately instead of
+    waiting on a model round trip.
    """
-    validate_environment()
-    if not args.non_interactive:
-        return
    try:
        asyncio.run(warm_up_llm(show_model_warning=True))
    except ModelConnectionError as exc:
@@ -467,10 +464,9 @@ def main() -> None:

    check_docker_installed()
    pull_docker_image()
+    validate_environment()

-    # In setup mode the TUI collects the target, then runs prepare_run(),
-    # warm-up, and telemetry itself once the user starts the scan.
-    if not args.needs_setup:
+    if args.non_interactive:
        _bootstrap_scan(args)

    from strix.report.state import get_global_report_state
@@ -511,6 +507,7 @@ def main() -> None:

    if not args.run_name:
        # Setup mode where the user quit before starting a scan: nothing ran.
+        notify_update(Console())
        return

    results_path = run_dir_for(args.run_name)
--- a/strix/interface/tui/backend/controller.py
+++ b/strix/interface/tui/backend/controller.py
@@ -36,7 +36,8 @@ if TYPE_CHECKING:
 _STOPPABLE_AGENT_STATUSES = frozenset({"running", "waiting", "budget_paused"})

 ChangeCallback = Callable[[], None]
-StartCallback = Callable[[bool], Awaitable[None]]
+StartCallback = Callable[[], Awaitable[None]]
+VerifyCallback = Callable[[], Awaitable[None]]
 QuitCallback = Callable[[], Awaitable[None]]


@@ -51,6 +52,7 @@ class TuiController:
        coordinator: Any = None,
        report_state: ReportState | None = None,
        on_start: StartCallback | None = None,
+        on_verify: VerifyCallback | None = None,
        on_quit: QuitCallback | None = None,
        on_change: ChangeCallback | None = None,
    ) -> None:
@@ -99,7 +101,6 @@ class TuiController:
        # A target-less launch enters the live view and asks there before
        # anything is prepared; this holds the directory awaiting that answer.
        self.pending_workspace_mount: str | None = None
-        self._pending_verify = True
        self.messages: list[dict[str, str]] = []
        self._next_message_id = 1
        self.error: str | None = None
@@ -112,6 +113,7 @@ class TuiController:
        self.viewer_url: str | None = None
        self._viewer_httpd: Any = None
        self._on_start = on_start
+        self._on_verify = on_verify
        self._on_quit = on_quit
        self._on_change = on_change

@@ -328,12 +330,6 @@ class TuiController:
    async def _start(self, payload: dict[str, Any]) -> dict[str, Any]:
        if self.scan_started or self._start_in_progress:
            raise RuntimeError("Scan is already starting or running")
-        # A bare prompt launches optimistically, like a coding agent: it skips
-        # the network model preflight and surfaces any model error live. A named
-        # target keeps the preflight so a real scan does not commit blind.
-        verify = payload.get("verify", True)
-        if not isinstance(verify, bool):
-            raise TypeError("verify must be a boolean")
        # Launching with no target mounts the working directory, so it requires
        # the user's explicit confirmation rather than happening silently.
        mount_working_dir = payload.get("mount_working_dir", False)
@@ -344,27 +340,44 @@ class TuiController:
            raise ValueError("No model configured. Set STRIX_LLM first.")
        if self._on_start is None:
            raise RuntimeError("Scan start is unavailable")
+        if not self.targets and not mount_working_dir:
+            raise ValueError("No target set. Add a target first.")
+        # The model check runs while still on the start screen, for a bare
+        # prompt as much as for a named target, so a failure lands in the setup
+        # log where the user can fix it and retry rather than in a dead run.
+        await self._verify_model()
        if not self.targets:
-            if not mount_working_dir:
-                raise ValueError("No target set. Add a target first.")
            # Mounting the working directory needs the user's confirmation, and
            # that is asked in the live view. Enter it now and prepare nothing
            # until the answer arrives, so declining leaves no run behind.
            self.pending_workspace_mount = str(Path.cwd())
-            self._pending_verify = verify
            self.setup_mode = False
            self.scan_started = True
            self.scan_state = "preparing"
            return {"started": True}
-        await self._begin_scan(verify)
+        await self._begin_scan()
        return {"started": True}

-    async def _begin_scan(self, verify: bool) -> None:
+    async def _verify_model(self) -> None:
+        if self._on_verify is None:
+            return
+        self._start_in_progress = True
+        try:
+            await self._on_verify()
+        finally:
+            self._start_in_progress = False
+
+    async def _begin_scan(self) -> None:
        if self._on_start is None:
            raise RuntimeError("Scan start is unavailable")
        self._start_in_progress = True
        try:
-            await self._on_start(verify)
+            await self._on_start()
+        except Exception as exc:
+            if not self.setup_mode:
+                # The live view is already up, so the failure has to show there.
+                self.fail_preparation(str(exc))
+            raise
        finally:
            self._start_in_progress = False
        self.setup_mode = False
@@ -384,7 +397,7 @@ class TuiController:
        # the whole of the input either way; the working directory is only an
        # extra the agent may look at, so the run goes ahead without one.
        self.workspace_mount = mount if approved else None
-        await self._begin_scan(self._pending_verify)
+        await self._begin_scan()
        return {"approved": approved}

    async def _send_message(self, payload: dict[str, Any]) -> dict[str, Any]:
--- a/strix/interface/tui/internal/app/setup.go
+++ b/strix/interface/tui/internal/app/setup.go
@@ -45,23 +45,20 @@ func (m *Model) submitSetupPrompt(value string) (tea.Model, tea.Cmd) {
 	if len(fields) > targets {
 		commands = append(commands, send(m.client, "setup.set_instruction", map[string]any{"instruction": value}))
 	}
-	// With a target, verify the model connection before the scan commits to it.
-	// A bare prompt launches optimistically, like a coding agent, and mounts the
-	// working directory - the backend asks about that from the live view, so the
-	// prompt is held here in case it is declined.
-	verify := targets > 0 || len(m.snapshot.Targets) > 0
-	payload := map[string]any{"verify": verify}
-	if verify {
-		m.setupMsg("Verifying model connection...", render.Col(amber))
-	} else {
+	// The backend verifies the model connection before either kind of launch
+	// and reports on it through the setup log. A bare prompt mounts the working
+	// directory - the backend asks about that from the live view, so the prompt
+	// is held here in case it is declined.
+	payload := map[string]any{}
+	if targets == 0 && len(m.snapshot.Targets) == 0 {
 		m.pendingPrompt = value
 		payload["mount_working_dir"] = true
 	}
 	commands = append(commands, send(m.client, "setup.start", payload))
 	// Ordered, not batched: setup.start leaves setup mode, so it must be the
-	// last command to reach the backend. Batched sends race, and once the
-	// preflight is skipped setup.start wins, making the target and instruction
-	// commands land after the guard closes and fail with a red error.
+	// last command to reach the backend. Batched sends race, and if setup.start
+	// wins the target and instruction commands land after the guard closes and
+	// fail with a red error.
 	return *m, tea.Sequence(commands...)
 }

--- a/strix/interface/tui/internal/app/setup_prompt_test.go
+++ b/strix/interface/tui/internal/app/setup_prompt_test.go
@@ -94,25 +94,6 @@ func commandTypes(envelopes []protocol.Envelope) []string {
 	return types
 }

-// startVerify returns the verify flag on the setup.start command, and whether
-// a setup.start command was present at all.
-func startVerify(t *testing.T, envelopes []protocol.Envelope) (verify, found bool) {
-	t.Helper()
-	for _, envelope := range envelopes {
-		if envelope.Type != "setup.start" {
-			continue
-		}
-		var payload struct {
-			Verify bool `json:"verify"`
-		}
-		if err := json.Unmarshal(envelope.Payload, &payload); err != nil {
-			t.Fatal(err)
-		}
-		return payload.Verify, true
-	}
-	return false, false
-}
-
 func contains(values []string, want string) bool {
 	for _, value := range values {
 		if value == want {
@@ -160,10 +141,6 @@ func TestSetupPromptWithoutTargetLaunchesAndRequestsMount(t *testing.T) {
 	if mount, found := startPayloadFlag(t, envelopes, "mount_working_dir"); !found || !mount {
 		t.Fatalf("mount was not requested: mount_working_dir=%v found=%v", mount, found)
 	}
-	// A bare prompt launches optimistically: no model preflight.
-	if verify, found := startVerify(t, envelopes); !found || verify {
-		t.Fatalf("bare prompt should launch with verify=false, got verify=%v found=%v", verify, found)
-	}
 	// setup.start leaves setup mode, so it must be the last command sent.
 	if start, instr := firstIndex(types, "setup.start"), lastIndex(types, "setup.set_instruction"); start < instr {
 		t.Fatalf("setup.start (%d) must come after setup.set_instruction (%d): %v", start, instr, types)
@@ -273,9 +250,8 @@ func TestSetupPromptWithTargetLaunches(t *testing.T) {
 			t.Fatalf("missing %s in %v", want, types)
 		}
 	}
-	// A named target keeps the upfront model check.
-	if verify, found := startVerify(t, envelopes); !found || !verify {
-		t.Fatalf("targeted prompt should launch with verify=true, got verify=%v found=%v", verify, found)
+	if _, found := startPayloadFlag(t, envelopes, "mount_working_dir"); found {
+		t.Fatalf("a targeted prompt must not ask to mount the working directory: %v", types)
 	}
 	// The target and instruction must reach the backend before setup.start
 	// closes the setup guard.
--- a/strix/interface/tui/runtime.py
+++ b/strix/interface/tui/runtime.py
@@ -63,11 +63,14 @@ class GoTuiRuntime:
        self.scan_error: BaseException | None = None
        self._last_sync_fingerprint = ""
        self._error_noted_agents: set[str] = set()
+        self.model_verified = False
+        self._setup_preflight: asyncio.Task[None] | None = None
        self.controller = TuiController(
            args,
            live_view=self.live_view,
            coordinator=self.coordinator,
            on_start=self.start_from_setup,
+            on_verify=self.ensure_model_verified,
            on_quit=self.quit,
        )
        self.server = TuiBackendServer(self.controller)
@@ -107,7 +110,51 @@ class GoTuiRuntime:
        )
        self.controller.notify_changed()

-    async def start_from_setup(self, verify: bool = True) -> None:
+    async def check_setup_model(self) -> None:
+        """Verify the model route as soon as the start screen is up.
+
+        The same round trip a direct launch makes in prepare_and_start, run in
+        the background so the screen paints first and the outcome lands in the
+        setup log before the user has finished typing.
+        """
+        if not (load_settings().llm.model or "").strip():
+            return
+        try:
+            await self._preflight_model()
+        except Exception as exc:
+            logger.exception("Go TUI setup model preflight failed")
+            self.controller.add_message(f"Model connection failed: {exc}", "error")
+            return
+        self.controller.add_message("Model connection verified")
+
+    async def ensure_model_verified(self) -> None:
+        """Hold a setup launch until the model has answered once."""
+        preflight = self._setup_preflight
+        if preflight is not None and not preflight.done():
+            await asyncio.shield(preflight)
+        if self.model_verified:
+            return
+        try:
+            await self._preflight_model()
+        except Exception as exc:
+            logger.exception("Go TUI setup model preflight failed")
+            raise RuntimeError(f"Model connection failed: {exc}") from exc
+
+    async def _preflight_model(self) -> None:
+        model = (load_settings().llm.model or "").strip()
+        self.controller.add_message("Verifying model connection...")
+        await preflight_model_connection(model)
+        self.model_verified = True
+
+    def _start_preparation(self) -> asyncio.Task[None]:
+        """Kick off the work that runs behind the freshly painted TUI."""
+        if self.controller.setup_mode:
+            self._setup_preflight = asyncio.create_task(self.check_setup_model())
+            return self._setup_preflight
+        self.controller.begin_preparation()
+        return asyncio.create_task(self.prepare_and_start())
+
+    async def start_from_setup(self) -> None:
        candidate = deepcopy(self.args)
        candidate.scan_mode = self.controller.scan_mode
        candidate.instruction = self.controller.instruction
@@ -124,16 +171,7 @@ class GoTuiRuntime:
            if isinstance(target, dict) and target.get("original")
        ]
        targets_changed = self.controller.targets != existing_targets
-        model = (load_settings().llm.model or "").strip()
-        # A bare prompt launches optimistically: it skips the network preflight
-        # and lets any model error surface once the agent starts, like a coding
-        # agent. A named target keeps the upfront check.
-        if verify:
-            try:
-                await preflight_model_connection(model)
-            except Exception as exc:
-                logger.exception("Go TUI setup model preflight failed")
-                raise RuntimeError(f"Model connection failed: {exc}") from exc
+        persist_current()
        # A confirmed target-less launch mounts the working directory for the
        # agent to work in, without making it a scan target.
        candidate.workspace_mount = self.controller.workspace_mount
@@ -376,9 +414,7 @@ class GoTuiRuntime:
                )
            process, backend_socket = await launch_tui_process(command, env, cwd)
            await self.server.start(backend_socket)
-            if not self.controller.setup_mode:
-                self.controller.begin_preparation()
-                prepare_task = asyncio.create_task(self.prepare_and_start())
+            prepare_task = self._start_preparation()
            sync_task = asyncio.create_task(self.sync_state())
            return_code = await wait_process(process)
            check_return_code(return_code)
--- a/strix/report/state.py
+++ b/strix/report/state.py
@@ -167,7 +167,7 @@ def get_global_report_state() -> Optional["ReportState"]:
    return _global_report_state


-def set_global_report_state(report_state: "ReportState") -> None:
+def set_global_report_state(report_state: Optional["ReportState"]) -> None:
    global _global_report_state  # noqa: PLW0603
    _global_report_state = report_state
    # New run: drop any streamed-cost entries a prior run left unconsumed.
--- a/strix/tools/mcp/agent_tools.py
+++ b/strix/tools/mcp/agent_tools.py
@@ -50,13 +50,6 @@ def _unknown_connection(connection: str, registry: McpRegistry) -> str:
    return f"Unknown MCP connection {connection!r}. Available connections: {available}."


-def _unavailable_connection(connection: str) -> str:
-    return (
-        f"MCP connection {connection!r} is unavailable: its live session failed and "
-        "could not be reconnected, so it is unavailable for the rest of this run."
-    )
-
-
 def _format_tool(tool: MCPTool) -> str:
    schema = json.dumps(tool.inputSchema or {"type": "object"}, indent=2, ensure_ascii=False)
    description = (tool.description or "").strip() or "(no description)"
@@ -114,8 +107,8 @@ async def describe_mcp(ctx: RunContextWrapper, connection: str) -> str:
        return _unknown_connection(connection, registry)
    try:
        tools = await entry.session.list_tools()
-    except McpConnectionUnavailableError:
-        return _unavailable_connection(connection)
+    except McpConnectionUnavailableError as exc:
+        return str(exc)
    if not tools:
        return f"MCP connection {connection!r} offers no tools."
    header = f"MCP connection {connection!r} offers {len(tools)} tool(s):"
@@ -170,8 +163,8 @@ async def call_mcp(
        return invalid_arguments
    try:
        available = await entry.session.list_tools()
-    except McpConnectionUnavailableError:
-        return _errored_tool_output(_unavailable_connection(connection))
+    except McpConnectionUnavailableError as exc:
+        return _errored_tool_output(str(exc))
    valid_names = {mcp_tool.name for mcp_tool in available}
    if tool not in valid_names:
        offered = ", ".join(sorted(valid_names)) or "(none)"
--- a/strix/tools/mcp/session.py
+++ b/strix/tools/mcp/session.py
@@ -109,10 +109,12 @@ def _call_semaphore(name: str, limit: int) -> asyncio.Semaphore:


 class McpConnectionUnavailableError(RuntimeError):
-    """A dead MCP connection could not be reached and did not come back.
+    """The MCP connection cannot take requests right now.

    Raised by :meth:`SupervisedMcpSession.list_tools` when the connection is dead
-    so the read-only dispatch tools (``describe_mcp``) can report it cleanly.
+    or in a quarantine cooldown. Its message is the session's own status text, so
+    the dispatch tools (``describe_mcp``, ``call_mcp``) can pass it to the agent
+    as-is: a cooldown reads as temporary, a dead connection as final.
    :meth:`SupervisedMcpSession.dispatch` does not raise it: a call to a dead
    connection returns the standard failed-tool output instead.
    """
@@ -607,12 +609,7 @@ class SupervisedMcpSession:
                return _Outcome(call_failure=failure)
            self._mark_dead(failure, attempt=attempt)
            return _Outcome(dead=True)
-        if (
-            phase == "call"
-            and failure.kind == "protocol"
-            and failure.status is not None
-            and 400 <= failure.status <= 499
-        ):
+        if phase == "call" and failure.kind == "protocol":
            return _Outcome(call_failure=failure)
        if attempt == _MAX_ATTEMPTS:
            await self._quarantine(failure, attempt=attempt)
@@ -729,6 +726,13 @@ class SupervisedMcpSession:
                "that resource, then retry."
            )
        if failure.kind == "protocol":
+            if failure.status is None:
+                return (
+                    f"MCP connection {self._name!r} rejected this call: the provider "
+                    "returned an error for this request, not the connection. The connection "
+                    "is still available. The resource may not exist or the arguments may be "
+                    "wrong. Check them with describe_mcp, then retry or move on."
+                )
            return (
                f"MCP connection {self._name!r} rejected this call as invalid "
                f"(status={failure.status}): the request itself was malformed, not the "
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -24,3 +24,30 @@ def _isolate_mcp_config(
    monkeypatch.setenv("STRIX_MCP_CONFIG", str(missing))
    monkeypatch.delenv("STRIX_MCP_ONLY", raising=False)
    monkeypatch.delenv("STRIX_MCP_EXCLUDE", raising=False)
+
+
+@pytest.fixture(autouse=True)
+def _plain_terminal(monkeypatch: pytest.MonkeyPatch) -> None:
+    """Make Rich output identical on every developer's machine.
+
+    Many CLI tests force ``isatty()`` to ``True`` to exercise the human-readable
+    code path and then assert on the plain text. Rich picks its color system
+    from ``TERM``, ``COLORTERM``, and ``FORCE_COLOR``, so on a real terminal
+    those assertions would meet ANSI escape codes instead of the words they
+    look for. A dumb terminal renders the same text without any styling.
+    """
+    monkeypatch.setenv("TERM", "dumb")
+    for name in ("COLORTERM", "FORCE_COLOR", "NO_COLOR", "TTY_COMPATIBLE"):
+        monkeypatch.delenv(name, raising=False)
+
+
+@pytest.fixture(autouse=True)
+def _isolate_wallet_config(monkeypatch: pytest.MonkeyPatch) -> None:
+    """Keep a developer's real mppx wallet out of the top-up tests.
+
+    ``strix cloud billing topup`` chooses the Stripe Link flow or the
+    preconfigured mppx wallet from these variables, so leaving them set would
+    silently switch which branch a test runs.
+    """
+    for name in ("MPPX_ACCOUNT", "MPPX_STRIPE_SECRET_KEY", "MPPX_STRIPE_PAYMENT_METHOD"):
+        monkeypatch.delenv(name, raising=False)
--- a/tests/test_cloud_cli.py
+++ b/tests/test_cloud_cli.py
@@ -6,6 +6,7 @@ import io
 import json
 import shutil
 import subprocess
+import sys
 import urllib.request
 import webbrowser
 from pathlib import Path
@@ -16,7 +17,7 @@ import requests
 from rich.console import Console

 from strix.interface import cloud, platform_cli
-from strix.interface.cloud import billing, http, payment_proxy, render, runner, workspaces
+from strix.interface.cloud import http, render, runner, workspaces
 from strix.interface.cloud.spec import GROUP_HELP, SPEC


@@ -147,7 +148,7 @@ def test_read_groups_have_safe_defaults(group: str, verb: str) -> None:
    resolved = runner.resolve(group, [])
    assert resolved is not None
    command, remaining = resolved
-    assert command is runner.SPEC[group][verb]
+    assert command is SPEC[group][verb]
    assert remaining == []


@@ -561,7 +562,7 @@ def test_stored_token_is_never_sent_to_a_different_platform_origin(
        lambda: {"api_token": "stored-secret", "app_url": "https://app.strix.ai"},
    )
    monkeypatch.setattr(
-        http.requests,
+        requests,
        "request",
        lambda *_args, **_kwargs: pytest.fail("a mismatched origin must not receive the token"),
    )
@@ -576,7 +577,7 @@ def test_stored_token_requires_an_issuer_binding(monkeypatch: pytest.MonkeyPatch
    monkeypatch.setattr(http, "_app_url_override", "https://app.strix.ai")
    monkeypatch.setattr(http, "read_record", lambda: {"api_token": "legacy-secret"})
    monkeypatch.setattr(
-        http.requests,
+        requests,
        "request",
        lambda *_args, **_kwargs: pytest.fail("an unbound token must not be sent"),
    )
@@ -602,7 +603,7 @@ def test_stored_token_is_sent_only_to_its_bound_platform(
        seen.update(url=url, headers=kwargs["headers"])
        return FakeResponse(payload={"balance": 1})

-    monkeypatch.setattr(http.requests, "request", request)
+    monkeypatch.setattr(requests, "request", request)
    response = http.request("GET", "/billing/credits")

    assert response.status_code == 200
@@ -626,7 +627,7 @@ def test_explicit_token_can_target_an_explicit_platform(
        seen.update(url=url, headers=kwargs["headers"])
        return FakeResponse(payload={"balance": 1})

-    monkeypatch.setattr(http.requests, "request", request)
+    monkeypatch.setattr(requests, "request", request)
    override_value = "explicit-preview-" + str(1)
    response = http.request("GET", "/billing/credits", token=override_value)

@@ -706,9 +707,9 @@ def test_topup_noninteractive_requires_explicit_payment_approval(
    monkeypatch.setattr(
        http, "request", lambda *_a, **_k: FakeResponse(status_code=402, payload=challenge)
    )
-    monkeypatch.setattr(runner.sys.stdin, "isatty", lambda: False)
+    monkeypatch.setattr(sys.stdin, "isatty", lambda: False)
    monkeypatch.setattr(
-        billing.subprocess,
+        subprocess,
        "run",
        lambda *_a, **_k: pytest.fail("wallet must not run without --yes"),
    )
@@ -732,10 +733,10 @@ def test_topup_machine_output_never_prompts_even_with_terminal_stdin(
    monkeypatch.setattr(
        http, "request", lambda *_a, **_k: FakeResponse(status_code=402, payload=challenge)
    )
-    monkeypatch.setattr(runner.sys.stdin, "isatty", lambda: True)
-    monkeypatch.setattr(runner.sys.stdout, "isatty", lambda: stdout_tty)
+    monkeypatch.setattr(sys.stdin, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: stdout_tty)
    monkeypatch.setattr(
-        runner.Console,
+        Console,
        "input",
        lambda *_a, **_k: pytest.fail("machine-readable top-up must not prompt"),
    )
@@ -839,7 +840,7 @@ def test_topup_keeps_token_out_of_wallet_process_and_forwards_payment(
        upstream.update(method=method, url=url, **kwargs)
        return FakeResponse(payload=receipt, content=json.dumps(receipt).encode())

-    monkeypatch.setattr(payment_proxy.requests, "request", fake_upstream_request)
+    monkeypatch.setattr(requests, "request", fake_upstream_request)

    def fake_run(command: list[str], **kwargs: Any) -> Any:
        commands.append(command)
@@ -905,6 +906,7 @@ def test_topup_wallet_failure_is_one_redacted_json_object(
        http, "request", lambda *_a, **_k: FakeResponse(status_code=402, payload=challenge)
    )
    monkeypatch.setattr(http, "api_token", lambda *_a, **_k: "tok")
+    monkeypatch.setenv("MPPX_ACCOUNT", "agent")
    monkeypatch.setattr(shutil, "which", lambda _name: "/usr/bin/npx")
    monkeypatch.setattr(
        subprocess,
@@ -946,6 +948,7 @@ def test_topup_wallet_interruption_reports_unknown_payment_outcome(
        ),
    )
    monkeypatch.setattr(http, "api_token", lambda *_a, **_k: "tok")
+    monkeypatch.setenv("MPPX_ACCOUNT", "agent")
    monkeypatch.setattr(shutil, "which", lambda _name: "/usr/bin/npx")
    monkeypatch.setattr(
        subprocess, "run", lambda *_a, **_k: (_ for _ in ()).throw(KeyboardInterrupt)
@@ -971,6 +974,7 @@ def test_topup_non_json_wallet_success_requires_balance_verification(
        ),
    )
    monkeypatch.setattr(http, "api_token", lambda *_a, **_k: "tok")
+    monkeypatch.setenv("MPPX_ACCOUNT", "agent")
    monkeypatch.setattr(shutil, "which", lambda _name: "/usr/bin/npx")
    monkeypatch.setattr(
        subprocess,
@@ -997,6 +1001,7 @@ def test_topup_rejects_parseable_wallet_error_as_a_success(
        ),
    )
    monkeypatch.setattr(http, "api_token", lambda *_a, **_k: "tok")
+    monkeypatch.setenv("MPPX_ACCOUNT", "agent")
    monkeypatch.setattr(shutil, "which", lambda _name: "/usr/bin/npx")
    monkeypatch.setattr(
        subprocess,
@@ -1036,6 +1041,7 @@ def test_topup_does_not_trust_an_unobserved_wallet_receipt(
        ),
    )
    monkeypatch.setattr(http, "api_token", lambda *_a, **_k: "tok")
+    monkeypatch.setenv("MPPX_ACCOUNT", "agent")
    monkeypatch.setattr(shutil, "which", lambda _name: "/usr/bin/npx")
    monkeypatch.setattr(
        subprocess,
@@ -1056,7 +1062,7 @@ def test_topup_does_not_trust_an_unobserved_wallet_receipt(
 def test_topup_human_mode_requires_a_bridge_confirmed_receipt(
    monkeypatch: pytest.MonkeyPatch, capsys: Any
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(
        http,
        "request",
@@ -1066,9 +1072,10 @@ def test_topup_human_mode_requires_a_bridge_confirmed_receipt(
        ),
    )
    monkeypatch.setattr(http, "api_token", lambda *_a, **_k: "tok")
+    monkeypatch.setenv("MPPX_ACCOUNT", "agent")
    monkeypatch.setattr(shutil, "which", lambda _name: "/usr/bin/npx")
    monkeypatch.setattr(
-        payment_proxy.requests,
+        requests,
        "request",
        lambda *_a, **_k: FakeResponse(status_code=200, content=b"<html>not a receipt</html>"),
    )
@@ -1597,7 +1604,7 @@ def test_handoff_links_reject_non_http_schemes(
    monkeypatch: pytest.MonkeyPatch,
    capsys: Any,
 ) -> None:
-    monkeypatch.setattr(runner.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(
        http,
        "request",
@@ -1882,7 +1889,7 @@ def test_workspace_use_preserves_definitive_conflict(
 def test_group_help_lists_all_verbs_instead_of_default_verb_help(
    monkeypatch: pytest.MonkeyPatch, capsys: Any
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    assert cloud.run_cloud(["workspaces", "-h"]) == 0
    output = capsys.readouterr().out
    assert "workspaces verbs" in output
@@ -1906,7 +1913,7 @@ def test_workspace_alias_routes_to_workspaces(monkeypatch: pytest.MonkeyPatch) -
 def test_workspace_human_list_is_numbered_and_hides_ids(
    monkeypatch: pytest.MonkeyPatch, capsys: Any
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(
        http,
        "request",
@@ -1954,7 +1961,7 @@ def test_integrations_human_list_exposes_installation_id_and_json_stays_full(
        ],
        "bitbucket_oauth_enabled": True,
    }
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(http, "request", lambda *_a, **_k: FakeResponse(payload=payload))

    assert cloud.run_cloud(["integrations", "list"]) == 0
@@ -1972,7 +1979,7 @@ def test_integrations_human_list_exposes_installation_id_and_json_stays_full(
 def test_pr_review_human_list_prioritizes_actionable_fields(
    monkeypatch: pytest.MonkeyPatch, capsys: Any
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(
        http,
        "request",
@@ -2047,7 +2054,7 @@ def test_pr_review_human_list_shows_pull_request_state(
    capsys: Any,
    pr_state: str,
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(
        http,
        "request",
@@ -2110,7 +2117,7 @@ def test_scan_human_list_identifies_internal_and_uploaded_targets(
    record: dict[str, Any],
    expected_targets: tuple[str, ...],
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(
        http,
        "request",
@@ -2274,7 +2281,7 @@ def test_human_lists_prioritize_actionable_fields(
    visible: tuple[str, ...],
    hidden: tuple[str, ...],
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(http, "request", lambda *_a, **_k: FakeResponse(payload=payload))

    assert cloud.run_cloud(command) == 0
@@ -2288,7 +2295,7 @@ def test_human_lists_prioritize_actionable_fields(
 def test_token_human_list_shows_lifecycle_status(
    monkeypatch: pytest.MonkeyPatch, capsys: Any
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(
        http,
        "request",
@@ -2645,7 +2652,7 @@ def test_nonstandard_human_list_envelopes_are_actionable(
    visible: tuple[str, ...],
    hidden: tuple[str, ...],
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(http, "request", lambda *_a, **_k: FakeResponse(payload=payload))

    assert cloud.run_cloud(command) == 0
@@ -2695,7 +2702,7 @@ def test_chat_credentials_human_view_separates_attached_and_available_sources(
            }
        ],
    }
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(http, "request", lambda *_a, **_k: FakeResponse(payload=payload))

    command = ["chat", "credentials", "chat-id", "--scan-ids", "source-scan-id"]
@@ -2921,7 +2928,7 @@ def test_named_human_list_views_match_api_fields(
    visible: tuple[str, ...],
    hidden: tuple[str, ...],
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(http, "request", lambda *_a, **_k: FakeResponse(payload=payload))

    assert cloud.run_cloud(command) == 0
@@ -2935,7 +2942,7 @@ def test_named_human_list_views_match_api_fields(
 def test_supply_chain_org_summary_human_view_shows_totals_and_repository_risk(
    monkeypatch: pytest.MonkeyPatch, capsys: Any
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(
        http,
        "request",
@@ -3096,7 +3103,7 @@ def test_wrapped_detail_human_views_are_unwrapped_and_actionable(
    visible: tuple[str, ...],
    hidden: tuple[str, ...],
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(http, "request", lambda *_a, **_k: FakeResponse(payload=payload))

    assert cloud.run_cloud(command) == 0
@@ -3110,7 +3117,7 @@ def test_wrapped_detail_human_views_are_unwrapped_and_actionable(
 def test_trace_human_view_summarizes_events_and_preserves_selector(
    monkeypatch: pytest.MonkeyPatch, capsys: Any
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    seen_query: dict[str, Any] = {}

    def fake_trace_request(_method: str, _path: str, **kwargs: Any) -> FakeResponse:
@@ -3206,7 +3213,7 @@ def test_trace_human_view_summarizes_events_and_preserves_selector(
 def test_paginated_human_list_shows_total_and_continuation_command(
    monkeypatch: pytest.MonkeyPatch, capsys: Any
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(
        http,
        "request",
@@ -3308,7 +3315,7 @@ def test_page_pagination_explains_an_out_of_range_page() -> None:
 def test_human_detail_preserves_long_prose_beyond_table_cell_limit(
    monkeypatch: pytest.MonkeyPatch, capsys: Any
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    description = (
        " ".join(["authorization context"] * 12) + " final-description-marker\nsecond-line-marker"
    )
@@ -3386,7 +3393,7 @@ def test_large_vulnerability_detail_prioritizes_evidence_and_remediation() -> No
 def test_test_user_human_view_joins_latest_verification(
    monkeypatch: pytest.MonkeyPatch, capsys: Any
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(
        http,
        "request",
@@ -3483,7 +3490,7 @@ def test_wide_knowledge_table_keeps_title_readable_with_long_identifiers() -> No
 def test_human_get_prioritizes_details_and_hides_internal_identity_fields(
    monkeypatch: pytest.MonkeyPatch, capsys: Any
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(
        http,
        "request",
--- a/tests/test_cloud_cli_runtime.py
+++ b/tests/test_cloud_cli_runtime.py
@@ -6,13 +6,16 @@ import argparse
 import io
 import json
 import sys
+import time
 from typing import TYPE_CHECKING, Any

 import pytest
+import requests
 from rich.console import Console

 from strix.interface import cloud, platform_cli
 from strix.interface.cloud import http, render, runner, source_scan
+from strix.interface.cloud.source_upload import prepare_source
 from strix.interface.main import main as interface_main


@@ -169,7 +172,7 @@ def test_connector_enrollment_command_is_complete_multiline_and_terminal_safe(
        "  -e LABEL=before\x1b]52;c;copied\x07after \\\n"
        "  ghcr.io/usestrix/connector:latest"
    )
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(
        http,
        "request",
@@ -293,8 +296,8 @@ def test_source_prompt_shows_paths_and_literal_confirmation(
        return "n"

    monkeypatch.setattr(console, "input", answer)
-    monkeypatch.setattr(source_scan.sys.stdin, "isatty", lambda: True)
-    monkeypatch.setattr(source_scan.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdin, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    args = argparse.Namespace(
        source=str(tmp_path),
        dry_run=False,
@@ -324,7 +327,7 @@ def test_source_prompt_interruption_removes_temporary_archive(
    (tmp_path / "app.py").write_text("print('ok')\n", encoding="utf-8")
    console = Console(file=io.StringIO(), width=100)
    archive_paths: list[Path] = []
-    original_prepare = source_scan.prepare_source
+    original_prepare = prepare_source

    def capture_bundle(*args: Any, **kwargs: Any) -> Any:
        bundle = original_prepare(*args, **kwargs)
@@ -336,8 +339,8 @@ def test_source_prompt_interruption_removes_temporary_archive(

    monkeypatch.setattr(source_scan, "prepare_source", capture_bundle)
    monkeypatch.setattr(console, "input", interrupt)
-    monkeypatch.setattr(source_scan.sys.stdin, "isatty", lambda: True)
-    monkeypatch.setattr(source_scan.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdin, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    args = argparse.Namespace(
        source=str(tmp_path),
        dry_run=False,
@@ -394,7 +397,7 @@ def test_device_login_rejects_non_http_verification_url(
    monkeypatch: pytest.MonkeyPatch,
 ) -> None:
    monkeypatch.setattr(
-        platform_cli.requests,
+        requests,
        "post",
        lambda *_a, **_k: FakeResponse(
            {
@@ -427,7 +430,7 @@ def test_boolean_query_values_are_lowercase_for_url_search_params(
        seen["params"] = kwargs.get("params")
        return FakeResponse({"items": []})

-    monkeypatch.setattr(http.requests, "request", fake_request)
+    monkeypatch.setattr(requests, "request", fake_request)
    http.request("GET", "/test", query={"enabled": True, "disabled": False})
    assert seen["params"] == {"enabled": "true", "disabled": "false"}

@@ -481,7 +484,7 @@ def test_binary_response_refuses_to_write_to_a_terminal(
    monkeypatch: pytest.MonkeyPatch,
    capsys: Any,
 ) -> None:
-    monkeypatch.setattr(runner.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(
        http,
        "request",
@@ -513,7 +516,7 @@ def test_binary_response_can_be_intentionally_redirected(
            return None

    redirected = RedirectedStdout()
-    monkeypatch.setattr(runner.sys, "stdout", redirected)
+    monkeypatch.setattr(sys, "stdout", redirected)
    monkeypatch.setattr(
        http,
        "request",
@@ -534,7 +537,7 @@ def test_redirected_binary_errors_never_append_diagnostics_to_stdout(
        def iter_content(self, *, chunk_size: int) -> Any:
            assert chunk_size == 1024 * 1024
            yield b"%PDF-partial"
-            raise http.requests.ConnectionError("connection lost")
+            raise requests.ConnectionError("connection lost")

    response = (
        FakeResponse({"detail": "report rejected"}, status_code=500)
@@ -645,7 +648,7 @@ def test_binary_download_streams_and_preserves_existing_file_on_failure(
        def iter_content(self, *, chunk_size: int) -> Any:
            assert chunk_size == 1024 * 1024
            yield b"partial"
-            raise http.requests.ConnectionError("connection lost")
+            raise requests.ConnectionError("connection lost")

        def close(self) -> None:
            self.closed = True
@@ -770,7 +773,7 @@ def test_session_help_is_specific_and_human_whoami_shows_scopes(
            "scopes": ["scans:read", "organizations:read"],
        }
    )
-    monkeypatch.setattr(platform_cli.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    assert cloud.run_cloud(["whoami", "--help"]) == 0
    who_help = capsys.readouterr().out
    assert "strix cloud whoami" in who_help
@@ -784,7 +787,7 @@ def test_non_tty_whoami_and_logout_emit_json(
 ) -> None:
    monkeypatch.delenv("STRIX_API_TOKEN", raising=False)
    monkeypatch.setattr(platform_cli, "AUTH_PATH", tmp_path / "auth.json")
-    monkeypatch.setattr(platform_cli.sys.stdout, "isatty", lambda: False)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: False)
    platform_cli.save_record(
        {
            "api_token": "secret",
@@ -799,7 +802,7 @@ def test_non_tty_whoami_and_logout_emit_json(
    assert json.loads(capsys.readouterr().out)["email"] == "agent@example.test"

    monkeypatch.setattr(
-        platform_cli.requests,
+        requests,
        "delete",
        lambda *_args, **_kwargs: type("Response", (), {"status_code": 200})(),
    )
@@ -831,7 +834,7 @@ def test_scope_picker_labels_match_the_server_presets() -> None:
 def test_noninteractive_login_never_prompts_for_workspace(
    monkeypatch: pytest.MonkeyPatch,
 ) -> None:
-    monkeypatch.setattr(platform_cli.sys.stdin, "isatty", lambda: False)
+    monkeypatch.setattr(sys.stdin, "isatty", lambda: False)
    console = Console(file=io.StringIO())
    console.input = lambda *_args, **_kwargs: pytest.fail("must not prompt")  # type: ignore[method-assign]

@@ -896,10 +899,10 @@ def test_device_flow_slow_down_never_exceeds_the_poll_interval_cap(
        sleeps.append(seconds)
        now += seconds

-    monkeypatch.setattr(platform_cli.requests, "post", post)
+    monkeypatch.setattr(requests, "post", post)
    monkeypatch.setattr(platform_cli, "_app_url", lambda: "https://example.test")
-    monkeypatch.setattr(platform_cli.time, "monotonic", monotonic)
-    monkeypatch.setattr(platform_cli.time, "sleep", sleep)
+    monkeypatch.setattr(time, "monotonic", monotonic)
+    monkeypatch.setattr(time, "sleep", sleep)

    with pytest.raises(platform_cli.PlatformAuthError, match="expired"):
        platform_cli._run_device_flow(
@@ -933,9 +936,9 @@ def test_device_flow_accepts_external_authkit_url_and_binds_token_origin(
            ),
        ]
    )
-    monkeypatch.setattr(platform_cli.requests, "post", lambda *_a, **_k: next(responses))
+    monkeypatch.setattr(requests, "post", lambda *_a, **_k: next(responses))
    monkeypatch.setattr(platform_cli, "_app_url", lambda: "https://preview.strix.ai")
-    monkeypatch.setattr(platform_cli.time, "sleep", lambda _seconds: None)
+    monkeypatch.setattr(time, "sleep", lambda _seconds: None)

    record = platform_cli._run_device_flow(
        Console(file=io.StringIO()),
@@ -984,7 +987,7 @@ def test_root_help_accepts_json_before_help_and_leaf_help_stays_specific(
 def test_non_tty_dispatcher_always_emits_structured_json(
    monkeypatch: pytest.MonkeyPatch, capsys: Any
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: False)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: False)

    assert cloud.run_cloud([]) == 0
    assert json.loads(capsys.readouterr().out)["command"] == "strix cloud"
@@ -1020,7 +1023,7 @@ def test_source_upload_rejects_untrusted_destinations_before_reading_file(
    source.write_bytes(b"approved source")
    monkeypatch.setattr(http, "_app_url_override", "https://app.strix.ai")
    monkeypatch.setattr(
-        http.requests,
+        requests,
        "put",
        lambda *_args, **_kwargs: pytest.fail("an untrusted URL must not receive source bytes"),
    )
@@ -1059,7 +1062,7 @@ def test_source_upload_allows_only_managed_or_same_origin_storage(
        return response

    monkeypatch.setattr(http, "_app_url_override", app_url)
-    monkeypatch.setattr(http.requests, "put", put)
+    monkeypatch.setattr(requests, "put", put)
    http.upload_file(signed_url, "upload-token", source)

    assert request_options["allow_redirects"] is False
@@ -1080,7 +1083,7 @@ def test_source_upload_refuses_redirects_without_following_them(
        return response

    monkeypatch.setattr(http, "_app_url_override", "https://app.strix.ai")
-    monkeypatch.setattr(http.requests, "put", put)
+    monkeypatch.setattr(requests, "put", put)

    with pytest.raises(http.CloudError, match="unexpected redirect"):
        http.upload_file(
@@ -1095,7 +1098,7 @@ def test_source_upload_refuses_redirects_without_following_them(
 def test_one_time_api_token_has_save_now_warning(
    monkeypatch: pytest.MonkeyPatch, capsys: Any
 ) -> None:
-    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
    monkeypatch.setattr(
        http,
        "request",
--- a/tests/test_cloud_idempotency.py
+++ b/tests/test_cloud_idempotency.py
@@ -3,9 +3,11 @@
 from __future__ import annotations

 import json
+import time
 from typing import Any

 import pytest
+import requests

 from strix.interface import cloud
 from strix.interface.cloud import http, runner
@@ -30,7 +32,7 @@ class FakeResponse:
@pytest.fixture(autouse=True)
 def _token(monkeypatch: pytest.MonkeyPatch) -> None:
    monkeypatch.setenv("STRIX_API_TOKEN", "idempotency-test-token")
-    monkeypatch.setattr(runner.time, "sleep", lambda _seconds: None)
+    monkeypatch.setattr(time, "sleep", lambda _seconds: None)


 def test_scan_start_generates_and_sends_one_stable_key(
@@ -197,7 +199,7 @@ def test_http_client_places_key_in_the_header(monkeypatch: pytest.MonkeyPatch) -
        seen.update(kwargs)
        return FakeResponse({"ok": True})

-    monkeypatch.setattr(http.requests, "request", request)
+    monkeypatch.setattr(requests, "request", request)
    http.request("POST", "/scans", body={}, idempotency_key="header-key")
    assert seen["headers"]["Idempotency-Key"] == "header-key"
    assert seen["headers"]["Authorization"] == "Bearer idempotency-test-token"
--- a/tests/test_cloud_payment_proxy.py
+++ b/tests/test_cloud_payment_proxy.py
@@ -7,6 +7,7 @@ import urllib.request
 from typing import TYPE_CHECKING, Any

 import pytest
+import requests

 from strix.interface.cloud import payment_proxy

@@ -39,7 +40,8 @@ def _post(url: str, body: bytes, headers: dict[str, str] | None = None) -> bytes
        method="POST",
    )
    with urllib.request.urlopen(request, timeout=2) as response:  # noqa: S310
-        return response.read()
+        body_bytes: bytes = response.read()
+    return body_bytes


 def test_bridge_bounds_decompressed_upstream_response(monkeypatch: pytest.MonkeyPatch) -> None:
@@ -50,7 +52,7 @@ def test_bridge_bounds_decompressed_upstream_response(monkeypatch: pytest.Monkey
        return response

    monkeypatch.setattr(payment_proxy, "_MAX_UPSTREAM_RESPONSE_BYTES", 4)
-    monkeypatch.setattr(payment_proxy.requests, "request", fake_request)
+    monkeypatch.setattr(requests, "request", fake_request)

    with payment_proxy.wallet_payment_bridge(
        upstream_url="https://app.example.test/api/v1/billing/topup",
@@ -80,7 +82,7 @@ def test_bridge_forwards_only_the_approved_request_and_protected_headers(
        captured.append(kwargs)
        return _StreamingResponse([b'{"ok":true}'])

-    monkeypatch.setattr(payment_proxy.requests, "request", fake_request)
+    monkeypatch.setattr(requests, "request", fake_request)
    with payment_proxy.wallet_payment_bridge(
        upstream_url="https://app.example.test/api/v1/billing/topup",
        api_token="strix-secret",  # noqa: S106
@@ -124,7 +126,7 @@ def test_bridge_limits_valid_wallet_attempts(monkeypatch: pytest.MonkeyPatch) ->
        calls += 1
        return _StreamingResponse([b"{}"])

-    monkeypatch.setattr(payment_proxy.requests, "request", fake_request)
+    monkeypatch.setattr(requests, "request", fake_request)
    with payment_proxy.wallet_payment_bridge(
        upstream_url="https://app.example.test/api/v1/billing/topup",
        api_token="strix-secret",  # noqa: S106
--- a/tests/test_cloud_session.py
+++ b/tests/test_cloud_session.py
@@ -6,6 +6,7 @@ import json
 from typing import TYPE_CHECKING, Any

 import pytest
+import requests
 from rich.console import Console

 from strix.interface import cloud, platform_cli, platform_identity
@@ -55,7 +56,7 @@ def test_http_workspace_pin_is_captured_once(
        sent.append(dict(kwargs["headers"]))
        return Response({})

-    monkeypatch.setattr(http.requests, "request", fake_request)
+    monkeypatch.setattr(requests, "request", fake_request)
    http.configure()
    platform_cli.save_record(
        {
@@ -116,7 +117,7 @@ def test_logout_keeps_local_token_when_remote_outcome_is_not_definitive(
        }
    )
    monkeypatch.setattr(
-        platform_cli.requests,
+        requests,
        "delete",
        lambda *_args, **_kwargs: Response({"detail": "unavailable"}, 503),
    )
--- a/tests/test_config_loader.py
+++ b/tests/test_config_loader.py
@@ -208,6 +208,191 @@ def test_persist_current_writes_env_block(tmp_path: Path, monkeypatch: pytest.Mo
    }


+def test_persist_current_keeps_file_values_when_env_is_unset(tmp_path: Path) -> None:
+    target = tmp_path / "cli-config.json"
+    target.write_text(
+        json.dumps({"env": {"STRIX_LLM": "file-model", "LLM_API_KEY": "file-key"}}),
+        encoding="utf-8",
+    )
+    loader.apply_config_override(target)
+    assert loader.load_settings().llm.model == "file-model"
+
+    loader.persist_current()
+
+    assert json.loads(target.read_text(encoding="utf-8")) == {
+        "env": {"STRIX_LLM": "file-model", "LLM_API_KEY": "file-key"}
+    }
+
+
+def test_persist_current_env_overrides_file_value(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    target = tmp_path / "cli-config.json"
+    target.write_text(
+        json.dumps({"env": {"STRIX_LLM": "file-model", "PERPLEXITY_API_KEY": "file-pplx"}}),
+        encoding="utf-8",
+    )
+    loader.apply_config_override(target)
+    monkeypatch.setenv("PERPLEXITY_API_KEY", "env-pplx")
+
+    loader.persist_current()
+
+    assert json.loads(target.read_text(encoding="utf-8")) == {
+        "env": {"STRIX_LLM": "file-model", "PERPLEXITY_API_KEY": "env-pplx"}
+    }
+
+
+def test_linked_llm_model_change_drops_stored_key_and_base(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    target = tmp_path / "cli-config.json"
+    target.write_text(
+        json.dumps(
+            {
+                "env": {
+                    "STRIX_LLM": "file-model",
+                    "LLM_API_KEY": "file-key",
+                    "LLM_API_BASE": "http://file-base",
+                    "PERPLEXITY_API_KEY": "pplx",
+                }
+            }
+        ),
+        encoding="utf-8",
+    )
+    loader.apply_config_override(target)
+    monkeypatch.setenv("STRIX_LLM", "env-model")
+
+    llm = loader.load_settings().llm
+    assert llm.model == "env-model"
+    assert llm.api_key is None
+    assert llm.api_base is None
+
+    loader.persist_current()
+
+    assert json.loads(target.read_text(encoding="utf-8")) == {
+        "env": {"STRIX_LLM": "env-model", "PERPLEXITY_API_KEY": "pplx"}
+    }
+
+
+def test_linked_llm_key_change_drops_stored_model(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    target = tmp_path / "cli-config.json"
+    target.write_text(
+        json.dumps({"env": {"STRIX_LLM": "file-model", "LLM_API_KEY": "file-key"}}),
+        encoding="utf-8",
+    )
+    loader.apply_config_override(target)
+    monkeypatch.setenv("LLM_API_KEY", "new-key")
+
+    assert loader.load_settings().llm.model is None
+
+    loader.persist_current()
+
+    assert json.loads(target.read_text(encoding="utf-8")) == {"env": {"LLM_API_KEY": "new-key"}}
+
+
+def test_linked_llm_secondary_alias_in_env_is_not_a_change(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    target = tmp_path / "cli-config.json"
+    target.write_text(
+        json.dumps({"env": {"STRIX_LLM": "file-model", "LLM_API_KEY": "file-key"}}),
+        encoding="utf-8",
+    )
+    loader.apply_config_override(target)
+    monkeypatch.setenv("LLM_API_KEY", "file-key")
+    monkeypatch.setenv("OPENAI_API_KEY", "unrelated-global-key")
+
+    llm = loader.load_settings().llm
+    assert llm.model == "file-model"
+    assert llm.api_key == "file-key"
+
+    loader.persist_current()
+
+    assert json.loads(target.read_text(encoding="utf-8")) == {
+        "env": {"STRIX_LLM": "file-model", "LLM_API_KEY": "file-key"}
+    }
+
+
+def test_linked_llm_unchanged_env_keeps_stored_key(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    target = tmp_path / "cli-config.json"
+    target.write_text(
+        json.dumps({"env": {"STRIX_LLM": "file-model", "LLM_API_KEY": "file-key"}}),
+        encoding="utf-8",
+    )
+    loader.apply_config_override(target)
+    monkeypatch.setenv("STRIX_LLM", "file-model")
+
+    assert loader.load_settings().llm.api_key == "file-key"
+
+    loader.persist_current()
+
+    assert json.loads(target.read_text(encoding="utf-8")) == {
+        "env": {"STRIX_LLM": "file-model", "LLM_API_KEY": "file-key"}
+    }
+
+
+def test_persist_current_env_alias_replaces_other_alias_in_file(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    target = tmp_path / "cli-config.json"
+    target.write_text(json.dumps({"env": {"OPENAI_API_KEY": "old-key"}}), encoding="utf-8")
+    loader.apply_config_override(target)
+    monkeypatch.setenv("LLM_API_KEY", "new-key")
+
+    loader.persist_current()
+
+    assert json.loads(target.read_text(encoding="utf-8")) == {"env": {"LLM_API_KEY": "new-key"}}
+
+
+def test_persist_current_empty_env_clears_file_value(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    target = tmp_path / "cli-config.json"
+    target.write_text(
+        json.dumps({"env": {"STRIX_LLM": "file-model", "PERPLEXITY_API_KEY": "pplx"}}),
+        encoding="utf-8",
+    )
+    loader.apply_config_override(target)
+    monkeypatch.setenv("PERPLEXITY_API_KEY", "")
+
+    loader.persist_current()
+
+    assert json.loads(target.read_text(encoding="utf-8")) == {"env": {"STRIX_LLM": "file-model"}}
+
+
+def test_persist_current_empty_primary_alias_does_not_save_sibling(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    target = tmp_path / "cli-config.json"
+    target.write_text(json.dumps({"env": {"PERPLEXITY_API_KEY": "pplx"}}), encoding="utf-8")
+    loader.apply_config_override(target)
+    monkeypatch.setenv("LLM_API_KEY", "")
+    monkeypatch.setenv("OPENAI_API_KEY", "sibling-key")
+
+    assert loader.load_settings().llm.api_key == ""
+
+    loader.persist_current()
+
+    assert json.loads(target.read_text(encoding="utf-8")) == {"env": {"PERPLEXITY_API_KEY": "pplx"}}
+
+
+def test_persist_current_replaces_corrupt_file(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    target = tmp_path / "cli-config.json"
+    target.write_text("{not json", encoding="utf-8")
+    loader.apply_config_override(target)
+    monkeypatch.setenv("STRIX_LLM", "env-model")
+
+    loader.persist_current()
+
+    assert json.loads(target.read_text(encoding="utf-8")) == {"env": {"STRIX_LLM": "env-model"}}
+
+
 def test_persist_current_sets_0600_mode(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
    monkeypatch.setenv("STRIX_LLM", "persisted-model")
    target = tmp_path / "cli-config.json"
--- a/tests/test_dedupe_model.py
+++ b/tests/test_dedupe_model.py
@@ -114,7 +114,14 @@ def test_config_file_loads_dedupe_model(
    tmp_path: Path,
    monkeypatch: pytest.MonkeyPatch,
 ) -> None:
-    for key in ("STRIX_LLM", "STRIX_DEDUPE_MODEL", "STRIX_DEDUPE_REASONING_EFFORT"):
+    for key in (
+        "STRIX_LLM",
+        "LLM_API_KEY",
+        "OPENAI_API_KEY",
+        "LLM_API_BASE",
+        "STRIX_DEDUPE_MODEL",
+        "STRIX_DEDUPE_REASONING_EFFORT",
+    ):
        monkeypatch.delenv(key, raising=False)
    path = tmp_path / "config.json"
    path.write_text(
--- a/tests/test_docker_client_delete.py
+++ b/tests/test_docker_client_delete.py
@@ -12,6 +12,7 @@ would let it escape and surface a traceback on every teardown.
 from __future__ import annotations

 from types import SimpleNamespace
+from typing import TYPE_CHECKING, cast
 from unittest.mock import AsyncMock, MagicMock, patch

 import pytest
@@ -22,6 +23,10 @@ from requests.exceptions import ConnectionError as RequestsConnectionError
 from strix.runtime.docker_client import StrixDockerSandboxClient


+if TYPE_CHECKING:
+    from agents.sandbox.session.sandbox_session import SandboxSession
+
+
 def _client_with_kill_error(exc: Exception) -> StrixDockerSandboxClient:
    """A StrixDockerSandboxClient whose containers.get(...).kill() raises ``exc``."""
    client = StrixDockerSandboxClient.__new__(StrixDockerSandboxClient)
@@ -31,9 +36,10 @@ def _client_with_kill_error(exc: Exception) -> StrixDockerSandboxClient:
    return client


-def _session() -> object:
+def _session(container_id: str | None = "abc123") -> SandboxSession:
    # delete() reads session._inner.state.container_id
-    return SimpleNamespace(_inner=SimpleNamespace(state=SimpleNamespace(container_id="abc123")))
+    fake = SimpleNamespace(_inner=SimpleNamespace(state=SimpleNamespace(container_id=container_id)))
+    return cast("SandboxSession", fake)


@pytest.mark.parametrize(
@@ -45,7 +51,7 @@ def _session() -> object:
    ],
 )
@pytest.mark.asyncio
-async def test_delete_swallows_best_effort_kill_errors(exc):
+async def test_delete_swallows_best_effort_kill_errors(exc: Exception) -> None:
    """A torn-down socket (ConnectionError) or a gone/unhappy container
    (NotFound/APIError) during the kill must not propagate; delete() still
    delegates to the SDK's delete()."""
@@ -62,7 +68,7 @@ async def test_delete_swallows_best_effort_kill_errors(exc):


@pytest.mark.asyncio
-async def test_delete_does_not_swallow_unrelated_errors():
+async def test_delete_does_not_swallow_unrelated_errors() -> None:
    """A programming error (e.g. ValueError) is not part of best-effort kill and
    must still propagate."""
    client = _client_with_kill_error(ValueError("boom"))
@@ -71,11 +77,11 @@ async def test_delete_does_not_swallow_unrelated_errors():


@pytest.mark.asyncio
-async def test_delete_noop_without_container_id():
+async def test_delete_noop_without_container_id() -> None:
    """No container_id -> no kill attempt, just delegate."""
    client = StrixDockerSandboxClient.__new__(StrixDockerSandboxClient)
    client.docker_client = MagicMock()
-    session = SimpleNamespace(_inner=SimpleNamespace(state=SimpleNamespace(container_id=None)))
+    session = _session(container_id=None)

    with patch.object(
        DockerSandboxClient, "delete", new=AsyncMock(return_value=session)
--- a/tests/test_go_tui_runtime.py
+++ b/tests/test_go_tui_runtime.py
@@ -343,15 +343,19 @@ async def test_setup_preflights_model_before_starting(
        assert candidate.scope_mode == "diff"
        assert candidate.diff_base == "origin/main"

+    monkeypatch.setattr(go_tui, "persist_current", lambda: calls.append("persist"))
    monkeypatch.setattr(go_tui, "build_targets_info", build)
    monkeypatch.setattr(go_tui, "prepare_run", prepare)
    monkeypatch.setattr(go_tui, "telemetry_start", lambda _args: calls.append("telemetry"))
    monkeypatch.setattr(runtime, "init_run_state", lambda: calls.append("state"))
    monkeypatch.setattr(runtime, "start_scan", lambda: calls.append("scan"))

+    # The controller runs these two in turn for every setup launch.
+    await runtime.ensure_model_verified()
    await runtime.start_from_setup()

-    assert calls == ["preflight", "targets", "prepare", "telemetry", "state", "scan"]
+    # The same steps, in the same order, as a direct launch's prepare_and_start.
+    assert calls == ["preflight", "persist", "targets", "prepare", "telemetry", "state", "scan"]
    assert runtime.args.scan_mode == "quick"
    assert runtime.args.instruction == ""
    assert runtime.args.max_budget_usd == 8.5
@@ -360,35 +364,138 @@ async def test_setup_preflights_model_before_starting(
    assert runtime.args.diff_base == "origin/main"


+def _setup_model(
+    monkeypatch: pytest.MonkeyPatch, model: str | None = "openrouter/test-model"
+) -> None:
+    monkeypatch.setattr(
+        go_tui,
+        "load_settings",
+        lambda: SimpleNamespace(llm=SimpleNamespace(model=model)),
+    )
+
+
+def _setup_messages(runtime: GoTuiRuntime) -> list[tuple[str, str]]:
+    return [(message["level"], message["text"]) for message in runtime.controller.messages]
+
+
@pytest.mark.asyncio
-async def test_optimistic_setup_skips_model_preflight(
+async def test_setup_model_check_reports_success_in_the_setup_log(
    monkeypatch: pytest.MonkeyPatch,
 ) -> None:
    runtime = GoTuiRuntime(args())
-    runtime.controller.targets = [str(Path.cwd())]
+    calls: list[str] = []
+
+    async def preflight(model: str) -> None:
+        calls.append(model)
+
+    _setup_model(monkeypatch)
+    monkeypatch.setattr(go_tui, "preflight_model_connection", preflight)
+
+    await runtime.check_setup_model()
+
+    assert calls == ["openrouter/test-model"]
+    assert runtime.model_verified is True
+    assert _setup_messages(runtime) == [
+        ("info", "Verifying model connection..."),
+        ("info", "Model connection verified"),
+    ]
+
+
+@pytest.mark.asyncio
+async def test_setup_model_check_reports_failure_without_leaving_setup(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    runtime = GoTuiRuntime(args())
+
+    async def preflight(_model: str) -> None:
+        raise TimeoutError("connection timed out")
+
+    _setup_model(monkeypatch)
+    monkeypatch.setattr(go_tui, "preflight_model_connection", preflight)
+
+    await runtime.check_setup_model()
+
+    assert runtime.model_verified is False
+    assert runtime.controller.setup_mode is True
+    assert runtime.controller.scan_state == "setup"
+    assert _setup_messages(runtime)[-1] == (
+        "error",
+        "Model connection failed: connection timed out",
+    )
+
+
+@pytest.mark.asyncio
+async def test_setup_model_check_waits_for_a_configured_model(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    runtime = GoTuiRuntime(args())
+
+    _setup_model(monkeypatch, model=None)
+    monkeypatch.setattr(
+        go_tui,
+        "preflight_model_connection",
+        lambda _model: pytest.fail("nothing to check without a model"),
+    )
+
+    await runtime.check_setup_model()
+
+    assert runtime.model_verified is False
+    assert runtime.controller.messages == []
+
+
+@pytest.mark.asyncio
+async def test_ensure_model_verified_reuses_the_startup_check(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    runtime = GoTuiRuntime(args())
+    release = asyncio.Event()
    calls: list[str] = []

    async def preflight(_model: str) -> None:
        calls.append("preflight")
+        await release.wait()

-    monkeypatch.setattr(
-        go_tui,
-        "load_settings",
-        lambda: SimpleNamespace(llm=SimpleNamespace(model="openrouter/test-model")),
-    )
+    _setup_model(monkeypatch)
    monkeypatch.setattr(go_tui, "preflight_model_connection", preflight)
-    monkeypatch.setattr(go_tui, "build_targets_info", lambda _args, **_kw: calls.append("targets"))
-    monkeypatch.setattr(go_tui, "prepare_run", lambda _args: calls.append("prepare"))
-    monkeypatch.setattr(go_tui, "telemetry_start", lambda _args: calls.append("telemetry"))
-    monkeypatch.setattr(runtime, "init_run_state", lambda: calls.append("state"))
-    monkeypatch.setattr(runtime, "start_scan", lambda: calls.append("scan"))
+    runtime._setup_preflight = asyncio.create_task(runtime.check_setup_model())
+    await asyncio.sleep(0)

-    await runtime.start_from_setup(verify=False)
+    # A launch that arrives mid-check waits for it rather than racing a second
+    # round trip.
+    ensure = asyncio.create_task(runtime.ensure_model_verified())
+    await asyncio.sleep(0)
+    assert not ensure.done()
+    release.set()
+    await ensure

-    # No preflight: the scan launches straight through and any model error
-    # surfaces once the agent runs.
-    assert "preflight" not in calls
-    assert calls == ["targets", "prepare", "telemetry", "state", "scan"]
+    assert calls == ["preflight"]
+    assert runtime.model_verified is True
+
+
+@pytest.mark.asyncio
+async def test_ensure_model_verified_retries_after_a_failed_startup_check(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    runtime = GoTuiRuntime(args())
+    outcomes = iter([TimeoutError("connection timed out"), None])
+    calls: list[str] = []
+
+    async def preflight(_model: str) -> None:
+        calls.append("preflight")
+        outcome = next(outcomes)
+        if outcome is not None:
+            raise outcome
+
+    _setup_model(monkeypatch)
+    monkeypatch.setattr(go_tui, "preflight_model_connection", preflight)
+
+    await runtime.check_setup_model()
+    assert runtime.model_verified is False
+
+    await runtime.ensure_model_verified()
+
+    assert calls == ["preflight", "preflight"]
+    assert runtime.model_verified is True


@pytest.mark.asyncio
@@ -400,15 +507,8 @@ async def test_confirmed_target_less_launch_mounts_workspace_without_targets(
    runtime.controller.workspace_mount = str(Path.home())
    prepared: list[argparse.Namespace] = []

-    async def preflight(_model: str) -> None:
-        return None
-
-    monkeypatch.setattr(
-        go_tui,
-        "load_settings",
-        lambda: SimpleNamespace(llm=SimpleNamespace(model="openrouter/test-model")),
-    )
-    monkeypatch.setattr(go_tui, "preflight_model_connection", preflight)
+    _setup_model(monkeypatch)
+    monkeypatch.setattr(go_tui, "persist_current", lambda: None)
    monkeypatch.setattr(
        go_tui,
        "build_targets_info",
@@ -419,7 +519,7 @@ async def test_confirmed_target_less_launch_mounts_workspace_without_targets(
    monkeypatch.setattr(runtime, "init_run_state", lambda: None)
    monkeypatch.setattr(runtime, "start_scan", lambda: None)

-    await runtime.start_from_setup(verify=False)
+    await runtime.start_from_setup()

    assert prepared[0].workspace_mount == str(Path.home())
    assert prepared[0].targets_info == []
@@ -442,15 +542,8 @@ async def test_setup_preserves_prepared_cli_targets(
    runtime = GoTuiRuntime(runtime_args)
    calls: list[str] = []

-    async def preflight(_model: str) -> None:
-        calls.append("preflight")
-
-    monkeypatch.setattr(
-        go_tui,
-        "load_settings",
-        lambda: SimpleNamespace(llm=SimpleNamespace(model="openrouter/test-model")),
-    )
-    monkeypatch.setattr(go_tui, "preflight_model_connection", preflight)
+    _setup_model(monkeypatch)
+    monkeypatch.setattr(go_tui, "persist_current", lambda: calls.append("persist"))
    monkeypatch.setattr(
        go_tui,
        "build_targets_info",
@@ -465,7 +558,7 @@ async def test_setup_preserves_prepared_cli_targets(

    assert runtime.controller.targets == ["https://example.com"]
    assert runtime.args.targets_info[0]["type"] == "web"
-    assert calls == ["preflight", "prepare", "telemetry", "state", "scan"]
+    assert calls == ["persist", "prepare", "telemetry", "state", "scan"]


@pytest.mark.asyncio
@@ -798,19 +891,17 @@ async def test_setup_preflight_failure_does_not_start_scan(
        nonlocal started
        started = True

-    monkeypatch.setattr(
-        go_tui,
-        "load_settings",
-        lambda: SimpleNamespace(llm=SimpleNamespace(model="openrouter/test-model")),
-    )
+    _setup_model(monkeypatch)
    monkeypatch.setattr(go_tui, "preflight_model_connection", preflight)
+    monkeypatch.setattr(go_tui, "persist_current", mark_started)
    monkeypatch.setattr(go_tui, "build_targets_info", mark_started)
    monkeypatch.setattr(runtime, "init_run_state", mark_started)
    monkeypatch.setattr(runtime, "start_scan", mark_started)

    with pytest.raises(RuntimeError, match="Model connection failed: 401 Unauthorized"):
-        await runtime.start_from_setup()
+        await runtime.ensure_model_verified()

+    assert runtime.model_verified is False
    assert started is False
    assert runtime.scan_task is None

--- a/tests/test_mcp_resilience.py
+++ b/tests/test_mcp_resilience.py
@@ -301,6 +301,62 @@ async def test_call_http_rejection_preserves_session(
    await session.aclose()


+@pytest.mark.asyncio
+async def test_call_jsonrpc_error_preserves_session(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    # A JSON-RPC error is a well-formed reply to this request, so the session stays
+    # up: no reconnect, no retry, no quarantine. The streamable-HTTP client also
+    # synthesizes one (status-less "Session terminated") for an HTTP 404, which some
+    # providers return for a missing resource.
+    error = McpError(ErrorData(code=32600, message="Session terminated"))
+    builds = 0
+
+    def build(_config: Any) -> Any:
+        nonlocal builds
+        builds += 1
+        return _built_server(_sequence_server("rpc-error", error))
+
+    monkeypatch.setattr(mcp_client, "_build_server", build)
+    monkeypatch.setattr(mcp_session, "_retry_delay", _zero_delay)
+
+    session = mcp_session.SupervisedMcpSession(_config("rpc-error"))
+    assert await session.start()
+    result = await session.dispatch("read", {}, label="rpc_error_read")
+    assert result["success"] is False
+    assert "not the connection" in result["content"]
+    assert "still available" in result["content"]
+    assert session.is_dead is False
+    assert session.is_unavailable is False
+    assert session._quarantine_count == 0
+    assert builds == 1
+    await session.aclose()
+
+
+@pytest.mark.asyncio
+async def test_list_tools_during_quarantine_reports_temporary_state(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setattr(mcp_session, "_retry_delay", _zero_delay)
+    monkeypatch.setattr(asyncio, "sleep", _no_sleep)
+    clock = [100.0]
+    monkeypatch.setattr("strix.tools.mcp.session.time.monotonic", lambda: clock[0])
+    builds = iter([_sequence_server("cooldown", _http_error(500)) for _ in range(3)])
+    monkeypatch.setattr(mcp_client, "_build_server", lambda _config: _built_server(next(builds)))
+    session = mcp_session.SupervisedMcpSession(_config("cooldown"))
+    assert await session.start()
+    await session.dispatch("read", {}, label="cooldown_read")
+    assert session.is_unavailable is True
+
+    with pytest.raises(mcp_session.McpConnectionUnavailableError) as excinfo:
+        await session.list_tools()
+    message = str(excinfo.value)
+    assert "temporarily unavailable" in message
+    assert "retrying in about 30 seconds" in message
+    assert "rest of this run" not in message
+    await session.aclose()
+
+
@pytest.mark.asyncio
 async def test_call_http_403_during_list_tools_dies() -> None:
    server = _list_tools_error_server("connect-403", _http_error(403))
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -72,6 +72,13 @@ def test_recommended_models_are_matched_case_insensitively() -> None:
        "moonshot/kimi-k2.6",
        "kimi-k2.7-code",
        "moonshot/kimi-k3",
+        "anthropic/claude-fable-5-1",
+        "vertex_ai/claude-fable-5-1@default",
+        "gemini/gemini-3.7-flash",
+        "glm-5.3",
+        "zai/glm-5.3-flash",
+        "openrouter/z-ai/glm-5.3",
+        "novita/zai-org/glm-5.2",
    ],
 )
 def test_frontier_model_families_are_accepted(model_name: str) -> None:
@@ -92,6 +99,9 @@ def test_frontier_model_families_are_accepted(model_name: str) -> None:
        "openrouter/x-ai/grok-4",
        "mistral/mistral-medium-3-5",
        "mistral/magistral-medium-latest",
+        "zai/glm-4.7",
+        "openrouter/z-ai/glm-5",
+        "custom-provider/glm-5.3-local",
    ],
 )
 def test_non_frontier_models_are_rejected(model_name: str) -> None:
--- a/tests/test_optional_deps.py
+++ b/tests/test_optional_deps.py
@@ -11,7 +11,8 @@ PYPROJECT = Path(__file__).resolve().parent.parent / "pyproject.toml"

 def _optional_dependencies() -> dict[str, list[str]]:
    data = tomllib.loads(PYPROJECT.read_text(encoding="utf-8"))
-    return data["project"]["optional-dependencies"]
+    extras: dict[str, list[str]] = data["project"]["optional-dependencies"]
+    return extras


 def test_vertex_extra_pins_google_auth() -> None:
--- a/tests/test_runner_mcp.py
+++ b/tests/test_runner_mcp.py
@@ -185,6 +185,4 @@ async def test_roster_is_persisted_even_without_a_status_sink(
    )

    assert persisted, "roster must persist even when no status sink is attached"
-    assert persisted[-1] == [
-        {"name": "local_fs", "provider": None, "tool_count": 3, "dead": False}
-    ]
+    assert persisted[-1] == [{"name": "local_fs", "provider": None, "tool_count": 3, "dead": False}]
--- a/tests/test_sarif_stride.py
+++ b/tests/test_sarif_stride.py
@@ -34,7 +34,8 @@ def _finding(**overrides: Any) -> dict[str, Any]:


 def _rule_tags(doc: dict[str, Any]) -> list[str]:
-    return doc["runs"][0]["tool"]["driver"]["rules"][0]["properties"]["tags"]
+    tags: list[str] = doc["runs"][0]["tool"]["driver"]["rules"][0]["properties"]["tags"]
+    return tags


 def test_stride_tags_on_rule_for_known_cwe() -> None:
--- a/tests/test_session_fd.py
+++ b/tests/test_session_fd.py
@@ -1,6 +1,7 @@
 from __future__ import annotations

 import asyncio
+import os
 from pathlib import Path
 from typing import Any, cast

@@ -9,13 +10,40 @@ import pytest
 from strix.core.sessions import open_agent_session


-def _count_open_fds() -> int | None:
+def _fd_dir() -> Path | None:
    for path in (Path("/proc/self/fd"), Path("/dev/fd")):
        if path.is_dir():
-            return len(list(path.iterdir()))
+            return path
    return None


+def _count_open_fds() -> int | None:
+    fd_dir = _fd_dir()
+    return None if fd_dir is None else len(list(fd_dir.iterdir()))
+
+
+def _count_open_fds_to(files: list[Path]) -> int | None:
+    """Count the descriptors this process holds on exactly ``files``.
+
+    Matching on inode rather than on the process-wide total keeps the check
+    immune to sockets and pipes that unrelated background threads open while
+    the test runs.
+    """
+    fd_dir = _fd_dir()
+    if fd_dir is None:
+        return None
+    wanted = {(stat.st_dev, stat.st_ino) for stat in (path.stat() for path in files)}
+    held = 0
+    for entry in fd_dir.iterdir():
+        try:
+            stat = os.fstat(int(entry.name))
+        except (OSError, ValueError):
+            continue
+        if (stat.st_dev, stat.st_ino) in wanted:
+            held += 1
+    return held
+
+
@pytest.mark.asyncio
 async def test_sessions_hold_no_descriptors_while_parked(tmp_path: Path) -> None:
    """Descriptor use must track live operations, not the number of sessions.
@@ -25,21 +53,20 @@ async def test_sessions_hold_no_descriptors_while_parked(tmp_path: Path) -> None
    scan, and fan-out multiplies those handles until the process runs out of file
    descriptors (#1018). A session that is not mid-operation should hold none.
    """
-    baseline = _count_open_fds()
-    if baseline is None:
+    if _fd_dir() is None:
        pytest.skip("no /proc/self/fd or /dev/fd on this platform")

-    sessions = [open_agent_session(f"a{i}", tmp_path / f"s{i}.db") for i in range(60)]
+    db_paths = [tmp_path / f"s{i}.db" for i in range(60)]
+    sessions = [open_agent_session(f"a{i}", path) for i, path in enumerate(db_paths)]
    try:
        for _ in range(4):
            await asyncio.gather(
                *(s.add_items([{"role": "user", "content": "x"}]) for s in sessions)
            )
            await asyncio.gather(*(s.get_items() for s in sessions))
-        parked = _count_open_fds()
-        assert parked is not None
-        # 60 parked sessions, yet descriptors are back at the baseline.
-        assert parked - baseline <= 5, f"parked fds grew by {parked - baseline}"
+        parked = _count_open_fds_to(db_paths)
+        # 60 parked sessions, yet none of them holds its database open.
+        assert parked == 0, f"parked sessions hold {parked} database descriptors"
    finally:
        for s in sessions:
            s.close()
--- a/tests/test_tui_backend_controller.py
+++ b/tests/test_tui_backend_controller.py
@@ -155,7 +155,7 @@ def test_setup_restores_prepared_cli_targets() -> None:
 async def test_start_validates_model_before_callback() -> None:
    started = False

-    async def start(_verify: bool = True) -> None:
+    async def start() -> None:
        nonlocal started
        started = True

@@ -170,7 +170,7 @@ async def test_start_validates_model_before_callback() -> None:
 async def test_start_launches_with_a_configured_model() -> None:
    started = False

-    async def start(_verify: bool = True) -> None:
+    async def start() -> None:
        nonlocal started
        started = True

@@ -189,7 +189,7 @@ async def test_start_launches_with_a_configured_model() -> None:
 async def test_start_without_target_requires_mount_consent() -> None:
    started = False

-    async def start(_verify: bool = True) -> None:
+    async def start() -> None:
        nonlocal started
        started = True

@@ -200,7 +200,7 @@ async def test_start_without_target_requires_mount_consent() -> None:

    # Mounting the working directory is never silent.
    with pytest.raises(ValueError, match="No target set"):
-        await controller.handle("setup.start", {"verify": False})
+        await controller.handle("setup.start", {})
    assert started is False
    assert controller.targets == []
    assert controller.workspace_mount is None
@@ -211,7 +211,7 @@ async def test_target_less_start_enters_live_view_and_waits_for_the_mount() -> N
    """Nothing is prepared until the live-view confirmation is answered."""
    started = False

-    async def start(_verify: bool = True) -> None:
+    async def start() -> None:
        nonlocal started
        started = True

@@ -220,7 +220,7 @@ async def test_target_less_start_enters_live_view_and_waits_for_the_mount() -> N
    loader._cached = None
    controller = TuiController(args(), on_start=start)

-    result = await controller.handle("setup.start", {"verify": False, "mount_working_dir": True})
+    result = await controller.handle("setup.start", {"mount_working_dir": True})

    assert result == {"started": True}
    # The live view is up so the prompt can be shown there, but the scan has not
@@ -236,26 +236,23 @@ async def test_target_less_start_enters_live_view_and_waits_for_the_mount() -> N
@pytest.mark.asyncio
 async def test_confirming_the_mount_starts_the_scan_without_a_target() -> None:
    started = False
-    seen_verify: bool | None = None

-    async def start(verify: bool = True) -> None:
-        nonlocal started, seen_verify
+    async def start() -> None:
+        nonlocal started
        started = True
-        seen_verify = verify

    os.environ["STRIX_LLM"] = "anthropic/claude-sonnet-4"
    os.environ["ANTHROPIC_API_KEY"] = "test-key"
    loader._cached = None
    controller = TuiController(args(), on_start=start)
-    await controller.handle("setup.start", {"verify": False, "mount_working_dir": True})
+    await controller.handle("setup.start", {"mount_working_dir": True})

    result = await controller.handle("setup.confirm_mount", {"approved": True})

    assert result == {"approved": True}
    assert started is True
-    # Launched optimistically, and mounted as a workspace: the scan genuinely
-    # has no target, so the instruction is the only source of truth.
-    assert seen_verify is False
+    # Mounted as a workspace: the scan genuinely has no target, so the
+    # instruction is the only source of truth.
    assert controller.workspace_mount == str(Path.cwd())
    assert controller.targets == []
    assert controller.scan_state == "running"
@@ -264,22 +261,23 @@ async def test_confirming_the_mount_starts_the_scan_without_a_target() -> None:

@pytest.mark.asyncio
 async def test_declining_the_mount_runs_without_one() -> None:
-    started: list[bool] = []
+    started = 0

-    async def start(verify: bool = True) -> None:
-        started.append(verify)
+    async def start() -> None:
+        nonlocal started
+        started += 1

    os.environ["STRIX_LLM"] = "anthropic/claude-sonnet-4"
    os.environ["ANTHROPIC_API_KEY"] = "test-key"
    loader._cached = None
    controller = TuiController(args(), on_start=start)
-    await controller.handle("setup.start", {"verify": False, "mount_working_dir": True})
+    await controller.handle("setup.start", {"mount_working_dir": True})

    result = await controller.handle("setup.confirm_mount", {"approved": False})

    assert result == {"approved": False}
    # Declining skips the directory; it does not abandon the scan.
-    assert started == [False]
+    assert started == 1
    assert controller.workspace_mount is None
    assert controller.pending_workspace_mount is None
    assert controller.setup_mode is False
@@ -289,21 +287,22 @@ async def test_declining_the_mount_runs_without_one() -> None:

@pytest.mark.asyncio
 async def test_approving_the_mount_runs_with_it() -> None:
-    started: list[bool] = []
+    started = 0

-    async def start(verify: bool = True) -> None:
-        started.append(verify)
+    async def start() -> None:
+        nonlocal started
+        started += 1

    os.environ["STRIX_LLM"] = "anthropic/claude-sonnet-4"
    os.environ["ANTHROPIC_API_KEY"] = "test-key"
    loader._cached = None
    controller = TuiController(args(), on_start=start)
-    await controller.handle("setup.start", {"verify": False, "mount_working_dir": True})
+    await controller.handle("setup.start", {"mount_working_dir": True})

    result = await controller.handle("setup.confirm_mount", {"approved": True})

    assert result == {"approved": True}
-    assert started == [False]
+    assert started == 1
    assert controller.workspace_mount == str(Path.cwd())
    assert controller.scan_state == "running"

@@ -352,23 +351,91 @@ async def test_user_message_updates_live_agent_projection_immediately() -> None:


@pytest.mark.asyncio
-async def test_start_forwards_verify_flag_by_default() -> None:
-    seen_verify: bool | None = None
+async def test_start_verifies_the_model_before_a_targeted_launch() -> None:
+    order: list[str] = []

-    async def start(verify: bool = True) -> None:
-        nonlocal seen_verify
-        seen_verify = verify
+    async def verify() -> None:
+        order.append("verify")
+
+    async def start() -> None:
+        order.append("start")
+
+    os.environ["STRIX_LLM"] = "anthropic/claude-sonnet-4"
+    os.environ["ANTHROPIC_API_KEY"] = "test-key"
+    loader._cached = None
+    controller = TuiController(args(), on_start=start, on_verify=verify)
+    await controller.handle("setup.add_target", {"target": "https://example.com"})
+
+    await controller.handle("setup.start", {})
+
+    assert order == ["verify", "start"]
+
+
+@pytest.mark.asyncio
+async def test_start_verifies_the_model_before_a_bare_prompt_leaves_setup() -> None:
+    """A bare prompt gets the same model check as a named target, while the
+    setup log is still on screen to show the outcome."""
+    verified = 0
+
+    async def verify() -> None:
+        nonlocal verified
+        verified += 1
+
+    async def start() -> None:
+        return None
+
+    os.environ["STRIX_LLM"] = "anthropic/claude-sonnet-4"
+    os.environ["ANTHROPIC_API_KEY"] = "test-key"
+    loader._cached = None
+    controller = TuiController(args(), on_start=start, on_verify=verify)
+
+    await controller.handle("setup.start", {"mount_working_dir": True})
+
+    assert verified == 1
+    assert controller.setup_mode is False
+    assert controller.pending_workspace_mount == str(Path.cwd())
+
+
+@pytest.mark.asyncio
+async def test_failed_model_check_keeps_the_start_screen() -> None:
+    async def verify() -> None:
+        raise RuntimeError("Model connection failed: timed out")
+
+    async def start() -> None:
+        pytest.fail("the scan must not start when the model check fails")
+
+    os.environ["STRIX_LLM"] = "anthropic/claude-sonnet-4"
+    os.environ["ANTHROPIC_API_KEY"] = "test-key"
+    loader._cached = None
+    controller = TuiController(args(), on_start=start, on_verify=verify)
+
+    with pytest.raises(RuntimeError, match="Model connection failed"):
+        await controller.handle("setup.start", {"mount_working_dir": True})
+
+    # Still on the start screen, so the error lands in the setup log and the
+    # user can retry; no run was prepared behind a stuck live view.
+    assert controller.setup_mode is True
+    assert controller.scan_started is False
+    assert controller.scan_state == "setup"
+    assert controller.pending_workspace_mount is None
+
+
+@pytest.mark.asyncio
+async def test_confirmed_mount_launch_failure_is_reported_in_the_live_view() -> None:
+    async def start() -> None:
+        raise ValueError("Scan preparation failed")

    os.environ["STRIX_LLM"] = "anthropic/claude-sonnet-4"
    os.environ["ANTHROPIC_API_KEY"] = "test-key"
    loader._cached = None
    controller = TuiController(args(), on_start=start)
-    await controller.handle("setup.add_target", {"target": "https://example.com"})
+    await controller.handle("setup.start", {"mount_working_dir": True})

-    # A named target keeps the upfront model check.
-    await controller.handle("setup.start", {})
+    with pytest.raises(ValueError, match="Scan preparation failed"):
+        await controller.handle("setup.confirm_mount", {"approved": True})

-    assert seen_verify is True
+    assert controller.scan_state == "failed"
+    assert controller.error == "Scan preparation failed"


@pytest.mark.asyncio
@@ -376,7 +443,7 @@ async def test_start_rejects_concurrent_and_repeated_submissions() -> None:
    entered = asyncio.Event()
    release = asyncio.Event()

-    async def start(_verify: bool = True) -> None:
+    async def start() -> None:
        entered.set()
        await release.wait()
Author	SHA1	Message	Date
Ahmed Allam	6fbf6dbd97	docs(readme): state the binary download output flags	2026-09-02 14:02:06 +00:00
Ahmed Allam	ddae2cdc4b	docs(readme): approve the upload in the source example and qualify the JSON output claim	2026-09-02 13:59:07 +00:00
Ahmed Allam	32afcc2d03	docs(readme): trim the strix cloud section to the essentials	2026-09-02 13:55:26 +00:00
Ahmed Allam	75b89018d3	docs: use openrouter/z-ai/glm-5.3 as the default model in setup examples	2026-09-02 16:52:53 +03:00
Ahmed Allam	129f938094	fix(models): keep aggregator routes out of RECOMMENDED_MODEL_NAMES, family matching already accepts them	2026-09-02 16:52:53 +03:00
Ahmed Allam	b438632e12	fix(models): keep list additions-only, restore gpt-5.4 examples, make openrouter/z-ai/glm-5.3 the top pick	2026-09-02 16:52:53 +03:00
Ahmed Allam	0ab7244807	feat(models): refresh the recommended model list and docs examples Add Claude Fable 5.1, Gemini 3.7 Flash, and Z.ai GLM-5.3 / GLM-5.3-Flash to RECOMMENDED_MODEL_NAMES, add a Z.ai GLM frontier family so GLM-5.x is accepted through OpenRouter and Novita routes, and drop the superseded GPT-5.4, GPT-5.3-codex, Opus 4.8, Sonnet 4.6, Gemini 3.6 Flash, and Qwen3.7 entries. Update the README, docs provider pages, quickstart, and CLI hint strings to the same current models, including DeepSeek V4, Kimi K3, and GLM-5.3.	2026-09-02 16:52:53 +03:00
Ahmed Allam	c514f712f4	fix(config): persist only the alias the runtime settings read pydantic-settings takes the first alias present in the environment, even when it is empty. persist_current() must save that same alias, so an empty LLM_API_KEY does not let a non-empty OPENAI_API_KEY sibling land in the file and restore a credential the run did not use.	2026-09-02 16:10:52 +03:00
Ahmed Allam	3e88e498b9	fix(config): drop the stored LLM connection when a linked env var changes A new STRIX_LLM, LLM_API_KEY, or LLM_API_BASE exported in the shell must not be combined with the key, base, or model still stored in cli-config.json. Restore the pre-refactor rule: when any linked LLM connection var differs from the stored value, discard the whole stored connection before loading and before persisting. Unrelated stored settings are kept.	2026-09-02 16:10:52 +03:00
Ahmed Allam	ce0db30252	fix(config): merge env into cli-config.json instead of overwriting it persist_current rewrote the config file with only the env vars set in the shell, so a run whose STRIX_LLM or LLM_API_KEY came from the file erased them and the next launch failed with MISSING REQUIRED ENVIRONMENT VARIABLES. Start from the stored env block, let a set env var override or replace the aliases of its field, and let an empty env var clear it.	2026-09-02 16:10:52 +03:00
Ahmed Allam	941c960650	fix(ci): make the pre-commit mypy hook and the test suite pass on a fresh checkout	2026-09-02 15:15:51 +03:00
Ahmed Allam	46b4e6cb64	fix(tui): run environment and model checks on the no-target start screen The interactive start screen skipped validate_environment() entirely, and a bare prompt sent verify=false so the model preflight never ran. Both kinds of setup launch now verify the model before leaving the start screen, environment validation runs for every mode, and quitting setup without a scan still shows the update notice.	2026-09-02 15:03:19 +03:00
yoni-at-strix	b5c3807fef	fix(mcp): keep the session on tool-call protocol errors and report quarantine truthfully (#1228 )	2026-09-01 22:43:54 -04:00
alex s	42baa7c09e	skills: point to the strix cloud CLI in every skill (#1227 )	2026-09-01 18:12:29 -04:00