skills: point to the strix cloud CLI in every skill

.pre-commit-config.yaml

@@ -1,6 +1,3 @@
-# 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
@@ -12,18 +9,21 @@ repos:
       - id: ruff-format
         name: ruff-format
 
-  # 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
+  # MyPy for static type checking
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.17.1
     hooks:
       - id: mypy
-        name: mypy
-        entry: uv run mypy
-        language: system
-        types_or: [python, pyi]
-        files: ^(strix|tests)/
-        require_serial: true
+        additional_dependencies: [
+          types-requests,
+          types-python-dateutil,
+          pydantic,
+          fastapi,
+          pytest,
+          hatchling,
+          "openai-agents[litellm]>=0.19.0,<0.20",
+        ]
+        args: [--install-types, --non-interactive]
 
   # Built-in hooks for basic file checks
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -62,6 +62,5 @@ ci:
   autoupdate_branch: ""
   autoupdate_commit_msg: "[pre-commit.ci] pre-commit autoupdate"
   autoupdate_schedule: weekly
-  # pre-commit.ci cannot run `language: system` hooks; mypy runs via `make check-all`.
-  skip: [mypy]
+  skip: []
   submodules: false

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="openrouter/z-ai/glm-5.3"        # any LiteLLM model id
+  export STRIX_LLM="openai/gpt-5.4"                 # any LiteLLM model id
   export LLM_API_KEY="<key>"
   strix -n -t ./ --scan-mode quick --max-budget 10  # headless scan; always use -n
   ```

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="openrouter/z-ai/glm-5.3"
+   export STRIX_LLM="openai/gpt-5.4"
    export LLM_API_KEY="your-api-key"
    ```
 

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="openrouter/z-ai/glm-5.3"
+export STRIX_LLM="openai/gpt-5.4"
 export LLM_API_KEY="your-api-key"
 
 # Run your first security assessment
@@ -116,9 +116,7 @@ Strix is agent-ready. Give Claude Code, Cursor, Codex, or any [SKILL.md-compatib
 npx skills add usestrix/strix
 ```
 
-This installs nine skills for running pentests, fixing findings, and CI scanning, against code, web apps, APIs, and the OWASP Top 10. Agents can use the local CLI or the managed cloud with the same engine.
-
-See [`AGENTS.md`](AGENTS.md) for the quick reference, [docs.strix.ai/llms.txt](https://docs.strix.ai/llms.txt) for the CLI, and [docs.app.strix.ai](https://docs.app.strix.ai) for the API.
+This installs nine skills: **penetration-testing-with-strix** (run headless scans and read results), **managed-pentesting-with-strix** (drive the managed [app.strix.ai](https://app.strix.ai) platform via REST — no local Docker or LLM key), **fix-security-vulnerabilities-with-strix** (remediate + re-scan to verify), **ci-security-scanning-with-strix** (PR scanning in CI), plus target-specific workflows: **application-security-testing**, **web-app-penetration-testing**, **api-security-testing**, **owasp-top-10-testing**, and **find-security-vulnerabilities-in-code**. Agents can run Strix two ways with the same engine — the open-source CLI locally, or the managed cloud when there's no local infra — and read [`AGENTS.md`](AGENTS.md) for a quick reference, [docs.strix.ai/llms.txt](https://docs.strix.ai/llms.txt) for the CLI docs, and [docs.app.strix.ai](https://docs.app.strix.ai) for the API.
 
 ---
 
@@ -174,9 +172,18 @@ strix view my-run-name
 strix view --host 0.0.0.0 --port 8080 --no-open
 ```
 
-The dashboard shows the findings, a live map of the agent team, and past runs. Nothing leaves your machine, and the UI ships prebuilt. `strix view` binds to `127.0.0.1` and prints a tokened link that grants access to the run, so share it carefully.
+`strix view` starts a lightweight local server (bound to `127.0.0.1` on a random port) and opens your browser to a private, tokened link. Nothing leaves your machine: the dashboard reads the run's files straight off disk, with no cloud account or upload required. The UI ships prebuilt with Strix, so there is no extra install and no JS build step.
 
-See the [viewer documentation](https://docs.strix.ai/usage/viewer) for the options and for reaching the viewer from another machine.
+Use `--host 0.0.0.0` to make the viewer reachable from other machines. Replace `0.0.0.0` in the printed URL with the server's reachable IP or hostname. The token in that URL grants access to the selected run's scan data, history, and steering, so only share it with trusted users and restrict the port with your firewall. Requests without the token-derived session cannot read run data.
+
+### What's in the dashboard
+
+- **Overview**: run status, target, and a severity breakdown of everything found so far.
+- **Vulnerabilities**: each validated finding with its severity, details, and reproduction steps.
+- **Agent graph**: a live map of the multi-agent team, showing which agent is doing what.
+- **Steering**: send instructions to a live scan from the browser to redirect the agents mid-run.
+- **History**: browse past runs on this machine and jump between them.
+- **Reports**: generate a shareable report and email it to yourself or your team.
 
 ---
 
@@ -202,9 +209,18 @@ having to discover them by crawling. Pair the spec with the live base URL so the
 agent knows where to send traffic:
 
 ```bash
-# OpenAPI / Swagger file, Postman export, or a live collection by id
+# OpenAPI / Swagger file (.json / .yaml)
 strix --target ./openapi.yaml --target https://api.your-app.com
-strix --target postman://<collection-uuid> --target https://api.your-app.com
+
+# Postman collection export
+strix --target ./collection.postman_collection.json --target https://api.your-app.com
+
+# Postman collection pulled live by id (no manual export)
+export POSTMAN_API_KEY="PMAK-..."
+strix --target postman://<collection-uuid>
+
+# ...with a Postman environment to resolve {{baseUrl}} / token variables
+strix --target "postman://<collection-uuid>?env=<environment-uuid>"
 ```
 
 
@@ -219,9 +235,19 @@ strix -t https://github.com/org/app -t https://your-app.com
 
 # Targets from a file, one target per non-empty, non-comment line
 strix --target-list ./targets.txt
-```
 
-See the [CLI reference](https://docs.strix.ai/usage/cli) for every option, including scan modes, diff scope, instruction files, and budgets.
+# White-box source-aware scan (local repository)
+strix --target ./app-directory --scan-mode standard
+
+# Focused testing with custom instructions
+strix --target api.your-app.com --instruction "Focus on business logic flaws and IDOR vulnerabilities"
+
+# Provide detailed instructions through file (e.g., rules of engagement, scope, exclusions)
+strix --target api.your-app.com --instruction-file ./instruction.md
+
+# Force PR diff-scope against a specific base branch
+strix -n --target ./ --scan-mode quick --scope-mode diff --diff-base origin/main
+```
 
 ### Headless Mode
 
@@ -261,56 +287,153 @@ jobs:
 ```
 
 > [!TIP]
-> In CI pull request runs, Strix automatically scopes quick reviews to changed files, which is why the
-> checkout above fetches full history. See the
-> [CI/CD documentation](https://docs.strix.ai/integrations/github-actions) for the details.
+> In CI pull request runs, Strix automatically scopes quick reviews to changed files.
+> If diff-scope cannot resolve, ensure checkout uses full history (`fetch-depth: 0`) or pass
+> `--diff-base` explicitly.
 
 ### Configuration
 
 ```bash
-export STRIX_LLM="openrouter/z-ai/glm-5.3"
+export STRIX_LLM="openai/gpt-5.4"
 export LLM_API_KEY="your-api-key"
 
 # Optional
 export LLM_API_BASE="your-api-base-url"  # if using a local model, e.g. Ollama, LMStudio
 export PERPLEXITY_API_KEY="your-api-key"  # for search capabilities
+export STRIX_REASONING_EFFORT="high"  # control thinking effort (default: high, quick scan: medium)
 ```
 
 > [!NOTE]
 > Strix automatically saves your configuration to `~/.strix/cli-config.json`, so you don't have to re-enter it on every run.
-> See the [configuration reference](https://docs.strix.ai/advanced/configuration) for every environment variable.
 
 #### Sign in with a ChatGPT subscription
 
 Instead of a metered API key, you can run Strix on your ChatGPT Plus/Pro subscription:
 
 ```bash
-strix auth login chatgpt             # sign in with your ChatGPT account
+strix auth login chatgpt      # sign in with your ChatGPT account
+
 export STRIX_LLM="chatgpt/gpt-5.4"   # chatgpt/<model> runs on the subscription
-strix auth status                    # show the active sign-in, or logout to forget it
+strix --target ./app-directory
+
+strix auth status             # show the active sign-in
+strix auth logout             # forget the sign-in
 ```
 
 #### Use the managed platform: `strix cloud`
 
-Run scans on [app.strix.ai](https://app.strix.ai) from the terminal, without Docker or an LLM key:
+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`:
 
 ```bash
-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 vulns list --severity critical
+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
 ```
 
-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.
+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`.
 
-See the [cloud CLI documentation](https://docs.strix.ai/cloud/cli) for scopes, workspaces, billing, and source-upload options.
+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 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:
+
+```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
+```
 
 #### Connect your own MCP servers
 
-Strix can connect to Model Context Protocol (MCP) servers you list and expose their tools to the agent during a run. Create `~/.strix/mcp-servers.json` with a JSON list of local `stdio` servers or remote `http` servers:
+Strix can connect to Model Context Protocol (MCP) servers you list and expose their tools to the agent during a run. Create `~/.strix/mcp-servers.json` with a JSON list of servers. Each entry is either a local `stdio` server that Strix launches as a subprocess, or a remote `http` server:
 
 ```json
 [
+  {
+    "name": "local_fs",
+    "transport": "stdio",
+    "command": "npx",
+    "args": ["-y", "@modelcontextprotocol/server-filesystem", "/path/to/project"]
+  },
   {
     "name": "github",
     "transport": "http",
@@ -321,16 +444,13 @@ Strix can connect to Model Context Protocol (MCP) servers you list and expose th
 ]
 ```
 
-Each server's tools are namespaced by `name`, for example `github_list_issues`. See the [MCP documentation](https://docs.strix.ai/integrations/mcp) for the full schema, tool filtering, and `stdio` servers.
+Each server's tools are namespaced by `name` (for example `local_fs_read_file`). Omit `allowed_tools` to expose every tool the server offers, or set it to a list to restrict which tools the agent can call. The file is optional, and a server that fails to connect is skipped without failing the run. You can point Strix at a different file with `STRIX_MCP_CONFIG`.
 
 **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.
 

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., `openrouter/z-ai/glm-5.3`, `openai/gpt-5.4`).
+  Model name in LiteLLM format (e.g., `openai/gpt-5.4`, `anthropic/claude-sonnet-4-6`).
 </ParamField>
 
 <ParamField path="LLM_API_KEY" type="string">
@@ -145,7 +145,7 @@ strix --target ./app --config /path/to/config.json
 ```json
 {
   "env": {
-    "STRIX_LLM": "openrouter/z-ai/glm-5.3",
+    "STRIX_LLM": "openai/gpt-5.4",
     "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="openrouter/z-ai/glm-5.3"
+export STRIX_LLM="openai/gpt-5.4"
 export LLM_API_KEY="sk-..."
 
 # Optional: Enable web search

docs/cloud/cli.mdx

@@ -1,105 +0,0 @@
----
-title: "Cloud CLI"
-description: "Drive app.strix.ai from the terminal with strix cloud"
----
-
-The `strix cloud` commands drive the managed platform ([app.strix.ai](https://app.strix.ai)) from the terminal. You do not need Docker or an LLM key.
-
-## Sign In
-
-Sign in once with the browser device flow. The sign-in creates your account and workspace on first use, and it stores a personal API token in `~/.strix/platform-auth.json`.
-
-```bash
-strix cloud login                         # browser approval, then workspace and scope profile
-strix cloud login --workspace "My Team"   # select a workspace by name or ID
-strix cloud whoami                        # local account and workspace status
-strix cloud session                       # verify the remote session and consent ceiling
-strix cloud logout                        # revoke remotely, then remove the local token
-```
-
-On your first sign-in in a terminal, the CLI asks for a workspace name and offers to open the GitHub App installation page. Press Enter to keep the generated name. After each sign-in, the CLI lists the next steps for the workspace, for example the rename command, the GitHub installation link, or the first scan. Without a terminal, the CLI shows no prompts and only prints the steps.
-
-A browser sign-in creates one reusable credential for each CLI installation. A second sign-in on the same installation replaces the secret instead of adding another key. `strix cloud logout` revokes the server session before it deletes the local token. Use `--local-only` when you cannot reach the server.
-
-## Scopes
-
-The default **Recommended** preset covers normal scan work, local source uploads, workspace switching, and user-approved credit top-ups. It excludes credential creation, so request `tokens:write` when you need it.
-
-```bash
-strix cloud login --scopes scans:read scans:write uploads:write billing:read
-strix cloud login --scope-profile minimal   # also accepts recommended or full
-strix cloud session scopes                  # granted scopes and the login ceiling
-strix cloud session scopes set minimal      # narrow without another browser sign-in
-```
-
-A workspace switch keeps the credential and its expiry, preserves the server-side scope preference, and caps access by the target role. A switch can never exceed the login consent ceiling. Each process pins the workspace it started with, so a concurrent switch fails safely instead of sending a stale command to another organization.
-
-## Commands
-
-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 scans start --engagement-type live_test --domain-ids <uuid> --wait
-strix cloud vulns list --severity critical
-strix cloud credits                           # credit balance
-```
-
-Write commands take request fields as flags. 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
-```
-
-`--token` and `STRIX_API_TOKEN` are stateless overrides for a single command, and they never replace the stored sign-in. Pair a CLI-session override with `--workspace-id` or `STRIX_WORKSPACE_ID`.
-
-## Workspaces And Account Setup
-
-```bash
-strix cloud workspaces list                       # numbered list; workspace is also accepted
-strix cloud workspaces create --name "My Team"    # needs admin and organizations:write
-strix cloud workspaces use 2                      # switch by list number, exact name, or ID
-strix cloud billing topup --credits 20 --yes      # approve an agent payment after HTTP 402
-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.
-
-## Output And Exit Codes
-
-The commands work for people and for agents. Terminal output favors names, branches, lifecycle states, and numbered selectors. Redirected output, and `--json`, preserve the complete machine-readable record.
-
-- Human lists keep the selectors that follow-up commands need, and they omit internal organization and user IDs. A selector that is too long for the compact table is repeated losslessly in a copyable block.
-- Paginated lists print the next `--page` or `--offset`. Detail views keep useful prose within a safe terminal bound, so use `--json` for the complete record.
-- Token lists separate API keys from named CLI device sessions.
-- Binary downloads are the exception to JSON output. Redirect the raw bytes on purpose, 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.
-
-## Credits And Plan Limits
-
-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. A plan block exits `4`. An insufficient credit wallet exits `5` without the creation of a scan and without a charge.
-
-## Local Source Scans
-
-See [Scan Local Source](/cloud/overview#scan-local-source) for the upload approval flow, the exclusion rules, and the size limits.
-
-## Tab Completion
-
-Enable native tab completion once for each shell session:
-
-```bash
-source <(strix completions zsh)       # use bash instead of zsh when appropriate
-strix completions fish | source
-```

docs/contributing.mdx

@@ -33,7 +33,7 @@ description: "Contribute to Strix development"
   </Step>
   <Step title="Configure LLM">
     ```bash
-    export STRIX_LLM="openrouter/z-ai/glm-5.3"
+    export STRIX_LLM="openai/gpt-5.4"
     export LLM_API_KEY="your-api-key"
     ```
   </Step>

docs/docs.json

@@ -25,8 +25,7 @@
             "pages": [
               "usage/cli",
               "usage/scan-modes",
-              "usage/instructions",
-              "usage/viewer"
+              "usage/instructions"
             ]
           },
           {
@@ -78,8 +77,7 @@
           {
             "group": "Strix Cloud",
             "pages": [
-              "cloud/overview",
-              "cloud/cli"
+              "cloud/overview"
             ]
           }
         ]

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="openrouter/z-ai/glm-5.3"
+export STRIX_LLM="openai/gpt-5.4"
 export LLM_API_KEY="your-api-key"
 
 # Scan

docs/integrations/github-actions.mdx

@@ -37,7 +37,7 @@ Add these secrets to your repository:
 
 | Secret | Description |
 |--------|-------------|
-| `STRIX_LLM` | Model name (e.g., `openrouter/z-ai/glm-5.3`) |
+| `STRIX_LLM` | Model name (e.g., `openai/gpt-5.4`) |
 | `LLM_API_KEY` | API key for your LLM provider |
 
 ## Exit Codes

docs/llm-providers/novita.mdx

@@ -17,9 +17,6 @@ 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` |

docs/llm-providers/openrouter.mdx

@@ -8,7 +8,7 @@ description: "Configure Strix with models via OpenRouter"
 ## Setup
 
 ```bash
-export STRIX_LLM="openrouter/z-ai/glm-5.3"
+export STRIX_LLM="openrouter/openai/gpt-5.4"
 export LLM_API_KEY="sk-or-..."
 ```
 
@@ -18,12 +18,9 @@ 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

docs/llm-providers/overview.mdx

@@ -9,17 +9,14 @@ Strix uses [LiteLLM](https://docs.litellm.ai/docs/providers) for model compatibi
 
 Set your model and API key:
 
-| 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`               |
+| 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` |
 
 ```bash
-export STRIX_LLM="openrouter/z-ai/glm-5.3"
+export STRIX_LLM="openai/gpt-5.4"
 export LLM_API_KEY="your-api-key"
 ```
 
@@ -65,7 +62,6 @@ 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

docs/quickstart.mdx

@@ -28,12 +28,12 @@ description: "Install Strix and run your first security scan"
 Set your LLM provider:
 
 ```bash
-export STRIX_LLM="openrouter/z-ai/glm-5.3"
+export STRIX_LLM="openai/gpt-5.4"
 export LLM_API_KEY="your-api-key"
 ```
 
 <Tip>
-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`.
+For best results, use `openai/gpt-5.4`, `anthropic/claude-opus-4-6`, or `openai/gpt-5.2`.
 </Tip>
 
 ## Run Your First Scan

docs/usage/viewer.mdx

@@ -1,49 +0,0 @@
----
-title: "Local Web Viewer"
-description: "Browse a run in a local dashboard with strix view"
----
-
-Every scan writes its results to disk as it runs. `strix view` serves those files in a local dashboard, for a live run or a finished one.
-
-```bash
-strix view                                    # the most recent run
-strix view my-run-name                        # a specific run under ./strix_runs
-strix view --host 0.0.0.0 --port 8080 --no-open
-```
-
-The UI ships prebuilt with Strix, so there is no extra install and no JavaScript build step. The dashboard reads the run files straight off disk. Nothing leaves your machine, and you do not need a cloud account.
-
-## Options
-
-<ParamField path="run" type="string">
-  Run name under `./strix_runs`. Defaults to the most recent run.
-</ParamField>
-
-<ParamField path="--host" type="string" default="127.0.0.1">
-  Host to bind to. Use `0.0.0.0` to reach the viewer from other machines.
-</ParamField>
-
-<ParamField path="--port" type="number" default="0">
-  Port to serve on. The default selects an available ephemeral port.
-</ParamField>
-
-<ParamField path="--no-open" type="boolean">
-  Do not open the browser automatically.
-</ParamField>
-
-## What Is In The Dashboard
-
-- **Overview** — run status, target, and a severity breakdown of everything found so far.
-- **Vulnerabilities** — each validated finding with its severity, details, and reproduction steps.
-- **Agent graph** — a live map of the multi-agent team, and what each agent is doing.
-- **Steering** — send instructions to a live scan to redirect the agents during the run. Steering works only in the dashboard the running scan opens. A standalone `strix view` has no live scan to steer.
-- **History** — browse past runs on this machine and move between them. Verify your email address in the dashboard to unlock the other runs.
-- **Reports** — generate a shareable report and send it by email. Verify your email address first.
-
-## Sharing The Link
-
-<Warning>
-  The token in the printed URL grants access to the run data, and to the steering of a live scan. Share it only with trusted users.
-</Warning>
-
-To reach the viewer from another machine, start it with `--host 0.0.0.0` and replace `0.0.0.0` in the printed URL with a reachable IP address or hostname. Restrict the port with your firewall. A request without the token-derived session cannot read run data.

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "strix-agent"
-version = "1.6.1"
+version = "1.6.0"
 description = "Open-source AI Hackers for your apps"
 readme = "README.md"
 license = "Apache-2.0"
@@ -250,7 +250,6 @@ 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
@@ -414,8 +413,6 @@ known_third_party = ["pydantic", "litellm"]
 # ============================================================================
 
 [tool.bandit]
-# 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"]
+exclude_dirs = ["docs", "build", "dist"]
 skips = ["B101", "B601", "B404", "B603", "B607"]  # Skip assert, shell injection, subprocess import and partial path checks
 severity = "medium"

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",  # nosec B105 - boolean flag, not a secret
+        "id_token_add_organizations": "true",
         "codex_cli_simplified_flow": "true",
         "originator": ORIGINATOR,
     }

strix/config/loader.py

@@ -10,13 +10,11 @@ from typing import TYPE_CHECKING, Any
 
 from pydantic import AliasChoices, BaseModel
 
-from strix.config.settings import LlmSettings, Settings
+from strix.config.settings import Settings
 from strix.utils.secret_files import write_secret_text
 
 
 if TYPE_CHECKING:
-    from collections.abc import Mapping
-
     from pydantic.fields import FieldInfo
 
 
@@ -27,11 +25,6 @@ _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.
@@ -61,31 +54,22 @@ def apply_config_override(path: Path) -> None:
 
 
 def persist_current() -> None:
-    """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.
-    """
+    """Write currently-set env vars to the active config file (0o600)."""
     s = load_settings()
     target = _override or _DEFAULT_PATH
     target.parent.mkdir(parents=True, exist_ok=True)
 
-    env_block = _drop_stale_llm_connection(_read_env_block(target))
-    for sub_name in type(s).model_fields:
+    env_block: dict[str, str] = {}
+    for sub_name in 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():
-            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]
+            for alias in _aliases_for(finfo):
+                value = os.environ.get(alias.upper())
+                if value:
+                    env_block[alias.upper()] = value
+                    break
 
     write_secret_text(target, json.dumps({"env": env_block}, indent=2))
 
@@ -109,9 +93,17 @@ 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.
     """
-    env_block_upper = _drop_stale_llm_connection(_read_env_block(path))
-    if not env_block_upper:
+    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 {}
+
+    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]] = {}
@@ -131,38 +123,3 @@ 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()}

strix/config/models.py

@@ -562,8 +562,6 @@ 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",
@@ -572,7 +570,6 @@ 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",
@@ -580,8 +577,6 @@ 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",
@@ -603,7 +598,6 @@ 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")),
 )
 
 

strix/core/agents.py

@@ -24,8 +24,6 @@ logger = logging.getLogger(__name__)
 
 Status = Literal["running", "waiting", "completed", "stopped", "crashed", "failed", "budget_paused"]
 
-TERMINAL_STATUSES: frozenset[str] = frozenset({"completed", "stopped", "crashed", "failed"})
-
 # Why an agent parked. The user can message any agent, so this - not the agent's
 # position in the tree - decides whether waiting is bounded: only an agent waiting
 # on other agents is re-checked on a timer.
@@ -38,10 +36,6 @@ class AgentRuntime:
     task: asyncio.Task[Any] | None = None
     stream: Any | None = None
     interrupt_on_message: bool = False
-    # Whether the agent's loop parks after a terminal state and can be woken by a
-    # later message. A non-interactive loop returns instead, so once such an
-    # agent is terminal nothing will ever read its mailbox again.
-    resumable: bool = True
     wake: asyncio.Event = field(default_factory=asyncio.Event)
     mailbox: list[dict[str, Any]] = field(default_factory=list)
     user_wake_required: bool = False
@@ -181,7 +175,6 @@ class AgentCoordinator:
         session: Session | None = None,
         task: asyncio.Task[Any] | None = None,
         interrupt_on_message: bool | None = None,
-        resumable: bool | None = None,
     ) -> None:
         async with self._lock:
             runtime = self.runtimes.setdefault(agent_id, AgentRuntime())
@@ -191,8 +184,6 @@ class AgentCoordinator:
                 runtime.task = task
             if interrupt_on_message is not None:
                 runtime.interrupt_on_message = interrupt_on_message
-            if resumable is not None:
-                runtime.resumable = resumable
 
     async def mark_running(self, agent_id: str) -> None:
         async with self._lock:
@@ -284,29 +275,10 @@ class AgentCoordinator:
             self._parent_notified.add(agent_id)
             return True
 
-    def _unreachable_locked(self, agent_id: str) -> bool:
-        """True when the agent is terminal and no loop will ever read its mailbox."""
-        if self.statuses.get(agent_id) not in TERMINAL_STATUSES:
-            return False
-        runtime = self.runtimes.get(agent_id)
-        return runtime is not None and not runtime.resumable
-
-    async def reachability(self, agent_id: str) -> tuple[bool, Status | None]:
-        """Whether a message to ``agent_id`` can still be acted on, plus its status."""
-        async with self._lock:
-            status = self.statuses.get(agent_id)
-            if status is None:
-                return False, None
-            return not self._unreachable_locked(agent_id), status
-
     async def send(
         self, target_agent_id: str, message: dict[str, Any], *, interrupt: bool = True
     ) -> bool:
-        """Queue a user/peer message in the target's mailbox and wake it.
-
-        Returns False when nothing will ever read the message: the target is
-        unknown, or it is terminal and its loop does not park for wake-ups.
-        """
+        """Queue a user/peer message in the target's mailbox and wake it."""
         from_user = message.get("from") == "user"
         if from_user and self._budget_paused:
             await self.resume_from_budget_pause(exclude=target_agent_id)
@@ -314,13 +286,6 @@ class AgentCoordinator:
             if target_agent_id not in self.statuses:
                 logger.debug("agent.send dropped unknown target=%s", target_agent_id)
                 return False
-            if self._unreachable_locked(target_agent_id):
-                logger.info(
-                    "agent.send dropped: target=%s is %s and cannot be woken",
-                    target_agent_id,
-                    self.statuses[target_agent_id],
-                )
-                return False
             runtime = self.runtimes.setdefault(target_agent_id, AgentRuntime())
             runtime.mailbox.append(dict(message))
             self.pending_counts[target_agent_id] = self.pending_counts.get(target_agent_id, 0) + 1

strix/core/execution.py

@@ -202,7 +202,6 @@ async def run_agent_loop(
         agent_id,
         session=session,
         interrupt_on_message=interactive,
-        resumable=interactive,
     )
     result: RunResultBase | None = None
 
@@ -1007,7 +1006,7 @@ async def _start_child_runner(
 ) -> None:
     session = open_agent_session(child_id, agents_db_path)
     sessions_to_close.append(session)
-    await coordinator.attach_runtime(child_id, session=session, resumable=interactive)
+    await coordinator.attach_runtime(child_id, session=session)
 
     child_ctx: dict[str, Any] = dict(parent_ctx)
     child_ctx["agent_id"] = child_id

strix/core/runner.py

@@ -428,7 +428,6 @@ 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

strix/interface/cloud/__init__.py

@@ -14,7 +14,7 @@ import sys
 from rich.console import Console
 from rich.markup import escape
 
-from strix.interface.cloud import http
+import strix.interface.cloud.http as http  # noqa: PLR0402
 from strix.interface.cloud.render import json_mode
 from strix.interface.cloud.runner import resolve, run
 from strix.interface.cloud.session import run_session

strix/interface/cloud/http.py

@@ -34,30 +34,13 @@ EXIT_AUTH = 4
 EXIT_PAYMENT = 5
 
 
-TOPUP_COMMAND = "strix cloud billing topup --credits <count>"
-BALANCE_COMMAND = "strix cloud billing credits"
-
-
 class CloudError(Exception):
-    """A failed cloud command. Carries the process exit code.
+    """A failed cloud command. Carries the process exit code."""
 
-    `next_step` is a short recovery instruction that the runner prints on its
-    own line after the error, so a person or an agent can act without reading
-    the docs.
-    """
-
-    def __init__(
-        self,
-        message: str,
-        *,
-        exit_code: int = EXIT_ERROR,
-        payload: Any = None,
-        next_step: str | None = None,
-    ) -> None:
+    def __init__(self, message: str, *, exit_code: int = EXIT_ERROR, payload: Any = None) -> None:
         super().__init__(message)
         self.exit_code = exit_code
         self.payload = payload
-        self.next_step = next_step
 
 
 class CloudTransportError(CloudError):
@@ -366,43 +349,13 @@ def check(response: requests.Response) -> Any:
             error_code = error_code or str(nested.get("code") or "")
             detail = str(nested.get("message") or detail)
     message = detail or f"HTTP {response.status_code}"
-    if error_code == "scan_credit_limit_reached" or response.status_code == 402:
-        raise payment_required_error(data, detail=detail)
+    if error_code == "scan_credit_limit_reached":
+        raise CloudError(message, exit_code=EXIT_PAYMENT, payload=data)
     if response.status_code in (401, 403):
         raise CloudError(message, exit_code=EXIT_AUTH, payload=data)
+    if response.status_code == 402:
+        hint = detail or (
+            "not enough credits. Run `strix cloud billing topup --credits N` to buy credits."
+        )
+        raise CloudError(hint, exit_code=EXIT_PAYMENT, payload=data)
     raise CloudError(message, exit_code=EXIT_ERROR, payload=data)
-
-
-def topup_url() -> str:
-    return f"{app_url()}/settings/billing"
-
-
-def topup_next_step(url: str | None = None) -> str:
-    return (
-        f"Buy credits with `{TOPUP_COMMAND}` or at {url or topup_url()}. "
-        f"Run `{BALANCE_COMMAND}` to see the balance. Then retry this command."
-    )
-
-
-def payment_required_error(data: Any, *, detail: str = "") -> CloudError:
-    """Build the error for an exhausted credit balance.
-
-    The platform sends the recovery instruction in `hint` and repeats it inside
-    `detail`. The CLI shows the instruction once, on its own line, and adds its
-    own instruction when the platform sends none.
-    """
-    server_hint = ""
-    server_url: str | None = None
-    if isinstance(data, dict):
-        raw = cast("dict[str, Any]", data)
-        server_hint = str(raw.get("hint") or "").strip()
-        raw_url = raw.get("topup_url")
-        if isinstance(raw_url, str) and raw_url.startswith("https://"):
-            server_url = raw_url
-    message = detail.strip()
-    if server_hint and message.endswith(server_hint):
-        message = message[: -len(server_hint)].strip()
-    if not message:
-        message = "Not enough credits to run this command."
-    next_step = server_hint or topup_next_step(server_url)
-    return CloudError(message, exit_code=EXIT_PAYMENT, payload=data, next_step=next_step)

strix/interface/cloud/runner.py

@@ -1035,14 +1035,10 @@ def _emit_error(
             payload = {"error": str(exc)}
             if exc.payload is not None:
                 payload["detail"] = exc.payload
-        if exc.next_step:
-            payload["next_step"] = exc.next_step
         sys.stdout.write(json.dumps(payload, indent=2, default=str) + "\n")
         return
     target = Console(stderr=True) if to_stderr else console
     target.print(f"[red]Error:[/] {escape(sanitize_terminal_text(exc))}")
-    if exc.next_step:
-        target.print(f"[yellow]Next step:[/] {escape(sanitize_terminal_text(exc.next_step))}")
 
 
 def _emit_interrupted(console: Console, *, as_json: bool, to_stderr: bool) -> None:

strix/interface/cloud/source_upload.py

@@ -203,17 +203,6 @@ def prepare_source(
     """Select safe source files and build a bounded temporary ZIP archive."""
     source = Path(value).expanduser().resolve()
     if not source.is_dir():
-        if source.is_file() and (
-            source.name.lower().endswith(_ARCHIVE_SUFFIXES) or _has_archive_magic(source)
-        ):
-            raise http.CloudError(
-                f"--source must be a directory, not an archive: {source}",
-                next_step=(
-                    "Extract the archive and pass the directory to --source. Strix packs the "
-                    "directory and excludes dependencies, build output, and secret-like files. "
-                    "Add --dry-run --show-files to review the selection first."
-                ),
-            )
         raise http.CloudError(f"--source must be a directory: {source}")
     manifest = select_source(
         source,
@@ -235,34 +224,14 @@ def prepare_source(
     archive_bytes = archive_path.stat().st_size
     if archive_bytes > MAX_ARCHIVE_BYTES:
         archive_path.unlink(missing_ok=True)
-        raise _archive_too_large_error(manifest, archive_bytes)
+        raise http.CloudError(
+            "source archive is larger than the 50 MB upload limit; narrow --source or "
+            "add --exclude patterns."
+        )
     digest = _sha256(archive_path)
     return SourceBundle(manifest, archive_path, archive_bytes, digest)
 
 
-_LARGEST_FILES_SHOWN = 5
-
-
-def _format_mib(size: int) -> str:
-    return f"{size / (1024 * 1024):.1f} MiB"
-
-
-def _archive_too_large_error(manifest: SourceManifest, archive_bytes: int) -> http.CloudError:
-    """Name the largest selected files so the user knows what to exclude."""
-    largest = sorted(manifest.files, key=lambda item: item.size, reverse=True)
-    listed = ", ".join(
-        f"{item.archive_name} ({_format_mib(item.size)})" for item in largest[:_LARGEST_FILES_SHOWN]
-    )
-    return http.CloudError(
-        f"the source archive is {_format_mib(archive_bytes)}, larger than the "
-        f"{_format_mib(MAX_ARCHIVE_BYTES)} upload limit. Largest files: {listed}.",
-        next_step=(
-            "Add --exclude patterns for large files or directories, or point --source at a "
-            "smaller directory. Run with --dry-run --show-files to review the selection."
-        ),
-    )
-
-
 def select_source(
     source: Path,
     *,

strix/interface/cloud/spec.py

@@ -1066,8 +1066,7 @@ SPEC: dict[str, dict[str, Cmd]] = {
         "request": Cmd(
             "POST",
             "/uploads/request",
-            "Request an upload URL. To scan local source, prefer `strix cloud scans start "
-            "--source DIR`, which packs, uploads, and starts the scan in one step.",
+            "Request an upload URL.",
             body=(
                 P("file_name", required=True, help="File name."),
                 P("file_size", "int", required=True, help="File size in bytes."),

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., 'openrouter/z-ai/glm-5.3' or "
+                    " - Model name to use (e.g., 'openai/gpt-5.4' 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='openrouter/z-ai/glm-5.3'\n", style="dim white")
+        error_text.append("export STRIX_LLM='openai/gpt-5.4'\n", style="dim white")
 
         if missing_optional_vars:
             for var in missing_optional_vars:

strix/interface/main.py

@@ -391,10 +391,13 @@ 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 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.
+    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.
     """
+    validate_environment()
+    if not args.non_interactive:
+        return
     try:
         asyncio.run(warm_up_llm(show_model_warning=True))
     except ModelConnectionError as exc:
@@ -464,9 +467,10 @@ def main() -> None:
 
     check_docker_installed()
     pull_docker_image()
-    validate_environment()
 
-    if args.non_interactive:
+    # 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:
         _bootstrap_scan(args)
 
     from strix.report.state import get_global_report_state
@@ -507,7 +511,6 @@ 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)

strix/interface/platform_cli.py

@@ -39,16 +39,6 @@ _MAX_POLL_INTERVAL_S = 60
 _MAX_EXPIRES_IN_S = 30 * 60
 
 _ROLE_RANK = {"viewer": 0, "analyst": 1, "admin": 2}
-_MAX_WORKSPACE_NAME_LENGTH = 100
-
-# Sign-in guidance is shown once and never written to the credential file.
-_LOGIN_GUIDANCE_KEYS = (
-    "is_new_user",
-    "onboarding",
-    "next_steps",
-    "next_steps_hint",
-    "dashboard_url",
-)
 
 
 class PlatformAuthError(Exception):
@@ -182,7 +172,6 @@ def _login(console: Console, argv: list[str]) -> int:
         console.print("\n[yellow]Sign-in cancelled.[/]")
         return 130
 
-    record, guidance = _split_login_guidance(record)
     try:
         save_record(record)
     except OSError as exc:
@@ -195,18 +184,10 @@ def _login(console: Console, argv: list[str]) -> int:
         )
         return 1
     _revoke_replaced_legacy_session(previous_record, record)
-    _print_success(console, record, guidance)
-    _offer_github_install(console, guidance, open_browser=not args.no_browser)
+    _print_success(console, record)
     return 0
 
 
-def _split_login_guidance(record: dict[str, Any]) -> tuple[dict[str, Any], dict[str, Any]]:
-    """Separate the one-time setup guidance from the credential that is stored."""
-    guidance = {key: record[key] for key in _LOGIN_GUIDANCE_KEYS if key in record}
-    stored = {key: value for key, value in record.items() if key not in guidance}
-    return stored, guidance
-
-
 def _run_device_flow(  # noqa: PLR0912, PLR0915
     console: Console,
     *,
@@ -414,9 +395,6 @@ def _complete_selection(
 
     chosen_org = _choose_workspace(console, organizations, workspace)
     role = str(chosen_org.get("role") or "admin")
-    workspace_name: str | None = None
-    if sys.stdin.isatty() and selection.get("is_new_user") and chosen_org.get("has_default_name"):
-        workspace_name = _choose_workspace_name(console, str(chosen_org.get("name") or ""))
     chosen_scopes = scopes
     chosen_profile = scope_profile
     if chosen_scopes is None and chosen_profile is None and sys.stdin.isatty():
@@ -426,8 +404,6 @@ def _complete_selection(
         "selection_token": selection_token,
         "organization_id": chosen_org.get("id"),
     }
-    if workspace_name is not None:
-        body["workspace_name"] = workspace_name
     if chosen_scopes is not None:
         body["scopes"] = chosen_scopes
         body["scope_profile"] = "custom"
@@ -500,29 +476,6 @@ def _choose_workspace(
         console.print("[yellow]Enter a number from the list.[/]")
 
 
-def _choose_workspace_name(console: Console, current: str) -> str | None:
-    """Prompt a first-time user for a workspace name. None keeps the generated name."""
-    console.print()
-    console.print(
-        "[bold]Name your workspace.[/] "
-        "[dim]Teammates see this name. Press Enter to keep the default. "
-        "You can change it later with `strix cloud org update --name`.[/]"
-    )
-    while True:
-        try:
-            answer = console.input(f"Workspace name ({_terminal_markup(current)}): ").strip()
-        except EOFError:
-            return None
-        if not answer or answer == current:
-            return None
-        if len(answer) > _MAX_WORKSPACE_NAME_LENGTH:
-            console.print(
-                f"[yellow]Use a name with {_MAX_WORKSPACE_NAME_LENGTH} characters or less.[/]"
-            )
-            continue
-        return answer
-
-
 def _choose_scopes(
     console: Console, catalog: list[dict[str, Any]], role: str
 ) -> tuple[str, list[str] | None]:
@@ -679,30 +632,19 @@ def _revoke_replaced_legacy_session(
         )
 
 
-def _print_success(
-    console: Console, record: dict[str, Any], guidance: dict[str, Any] | None = None
-) -> None:
-    guidance = guidance or {}
-    onboarding = _onboarding_state(guidance)
+def _print_success(console: Console, record: dict[str, Any]) -> None:
     email = record.get("email", "")
     organization = record.get("organization_name") or record.get("organization_id", "")
     console.print()
-    if guidance.get("is_new_user"):
-        console.print("[green]✓ Welcome to Strix. Your account and workspace are ready.[/]")
-    else:
-        console.print("[green]✓ Signed in to the Strix platform.[/]")
+    console.print("[green]✓ Signed in to the Strix platform.[/]")
     if email:
         console.print(f"  Account:   [bold]{_terminal_markup(email)}[/]")
     if organization:
-        default_note = (
-            " [dim](default name)[/]" if onboarding.get("workspace_named") is False else ""
-        )
-        console.print(f"  Workspace: [bold]{_terminal_markup(organization)}[/]{default_note}")
+        console.print(f"  Workspace: [bold]{_terminal_markup(organization)}[/]")
     scopes = record.get("scopes")
     if isinstance(scopes, list) and scopes:
         console.print(f"  Access:    [dim]{_terminal_markup(_scope_summary(record))}[/]")
     console.print(f"  Token:     stored in [dim]{_terminal_markup(AUTH_PATH)}[/]")
-    _print_next_steps(console, guidance)
     console.print()
     console.print(
         "[dim]The managed platform is ready. Run `strix cloud` to list the commands. "
@@ -710,63 +652,6 @@ def _print_success(
     )
 
 
-def _onboarding_state(guidance: dict[str, Any]) -> dict[str, Any]:
-    onboarding = guidance.get("onboarding")
-    if not isinstance(onboarding, dict):
-        return {}
-    return cast("dict[str, Any]", onboarding)
-
-
-def _github_install_url(guidance: dict[str, Any]) -> str | None:
-    url = _onboarding_state(guidance).get("github_install_url")
-    return url if is_safe_web_url(url) else None
-
-
-def _print_next_steps(console: Console, guidance: dict[str, Any]) -> None:
-    """Render the server-provided setup steps for a person."""
-    steps = [
-        step
-        for step in _dict_items(guidance.get("next_steps"))
-        if isinstance(step.get("action"), str) and step.get("action")
-    ]
-    github_url = _github_install_url(guidance)
-    if not steps and github_url is None:
-        return
-    console.print()
-    console.print("[bold]Next steps:[/]")
-    for index, step in enumerate(steps, start=1):
-        console.print(f"  [cyan]{index}[/]. {_terminal_markup(step['action'])}")
-        cli = step.get("cli")
-        if isinstance(cli, str) and cli:
-            console.print(f"     [dim]{_terminal_markup(cli)}[/]")
-    if github_url is not None:
-        console.print()
-        console.print("Install the Strix GitHub App to connect repositories:")
-        console.print(sanitize_terminal_text(github_url), markup=False, soft_wrap=True)
-
-
-def _offer_github_install(
-    console: Console, guidance: dict[str, Any], *, open_browser: bool
-) -> None:
-    """On a first sign-in in a terminal, offer to open the GitHub App installation page."""
-    github_url = _github_install_url(guidance)
-    if github_url is None or not open_browser or not guidance.get("is_new_user"):
-        return
-    if not sys.stdin.isatty() or not sys.stdout.isatty():
-        return
-    console.print()
-    try:
-        answer = console.input("Open the GitHub App installation page now? [y/N]: ").strip()
-    except EOFError:
-        return
-    if answer.casefold() not in {"y", "yes"}:
-        console.print("[dim]Run `strix cloud integrations install github` when you are ready.[/]")
-        return
-    with contextlib.suppress(Exception):
-        webbrowser.open(github_url)
-    console.print("[dim]Approve the installation in the browser. Then run `strix cloud repos`.[/]")
-
-
 def _status(console: Console, argv: list[str]) -> int:  # noqa: PLR0912
     parser = _SessionArgumentParser(
         prog="strix cloud whoami",

strix/interface/tui/backend/controller.py

@@ -36,8 +36,7 @@ if TYPE_CHECKING:
 _STOPPABLE_AGENT_STATUSES = frozenset({"running", "waiting", "budget_paused"})
 
 ChangeCallback = Callable[[], None]
-StartCallback = Callable[[], Awaitable[None]]
-VerifyCallback = Callable[[], Awaitable[None]]
+StartCallback = Callable[[bool], Awaitable[None]]
 QuitCallback = Callable[[], Awaitable[None]]
 
 
@@ -52,7 +51,6 @@ 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:
@@ -101,6 +99,7 @@ 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
@@ -113,7 +112,6 @@ 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
 
@@ -330,6 +328,12 @@ 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)
@@ -340,44 +344,27 @@ 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()
+        await self._begin_scan(verify)
         return {"started": True}
 
-    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:
+    async def _begin_scan(self, verify: bool) -> None:
         if self._on_start is None:
             raise RuntimeError("Scan start is unavailable")
         self._start_in_progress = True
         try:
-            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
+            await self._on_start(verify)
         finally:
             self._start_in_progress = False
         self.setup_mode = False
@@ -397,7 +384,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()
+        await self._begin_scan(self._pending_verify)
         return {"approved": approved}
 
     async def _send_message(self, payload: dict[str, Any]) -> dict[str, Any]:

strix/interface/tui/internal/app/setup.go

@@ -45,20 +45,23 @@ 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}))
 	}
-	// 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 {
+	// 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 {
 		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 if setup.start
-	// wins 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 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.
 	return *m, tea.Sequence(commands...)
 }
 

strix/interface/tui/internal/app/setup_prompt_test.go

@@ -94,6 +94,25 @@ 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 {
@@ -141,6 +160,10 @@ 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)
@@ -250,8 +273,9 @@ func TestSetupPromptWithTargetLaunches(t *testing.T) {
 			t.Fatalf("missing %s in %v", want, types)
 		}
 	}
-	if _, found := startPayloadFlag(t, envelopes, "mount_working_dir"); found {
-		t.Fatalf("a targeted prompt must not ask to mount the working directory: %v", 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)
 	}
 	// The target and instruction must reach the backend before setup.start
 	// closes the setup guard.

strix/interface/tui/runtime.py

@@ -63,14 +63,11 @@ 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)
@@ -110,51 +107,7 @@ class GoTuiRuntime:
         )
         self.controller.notify_changed()
 
-    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:
+    async def start_from_setup(self, verify: bool = True) -> None:
         candidate = deepcopy(self.args)
         candidate.scan_mode = self.controller.scan_mode
         candidate.instruction = self.controller.instruction
@@ -171,7 +124,16 @@ class GoTuiRuntime:
             if isinstance(target, dict) and target.get("original")
         ]
         targets_changed = self.controller.targets != existing_targets
-        persist_current()
+        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
         # 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
@@ -414,7 +376,9 @@ class GoTuiRuntime:
                 )
             process, backend_socket = await launch_tui_process(command, env, cwd)
             await self.server.start(backend_socket)
-            prepare_task = self._start_preparation()
+            if not self.controller.setup_mode:
+                self.controller.begin_preparation()
+                prepare_task = asyncio.create_task(self.prepare_and_start())
             sync_task = asyncio.create_task(self.sync_state())
             return_code = await wait_process(process)
             check_return_code(return_code)

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: Optional["ReportState"]) -> None:
+def set_global_report_state(report_state: "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.

strix/tools/agents_graph/tools.py

@@ -15,7 +15,6 @@ from agents import RunContextWrapper, function_tool
 from strix.core.agents import Status, coordinator_from_context
 from strix.core.execution import notify_parent_on_terminal
 from strix.core.hooks import LLM_TURN_KEY
-from strix.report.state import get_global_report_state
 from strix.skills import validate_requested_skills
 
 
@@ -29,40 +28,6 @@ def _ctx(ctx: RunContextWrapper) -> dict[str, Any]:
     return ctx.context if isinstance(ctx.context, dict) else {}
 
 
-def _filed_reports_by(agent_id: str) -> list[dict[str, Any]]:
-    """Vulnerability reports the agent actually filed, from report state.
-
-    The narrative ``findings`` an agent hands to ``agent_finish`` is prose; a
-    parent that wants to act on a child's work needs the report ids. Read them
-    from the report state rather than trusting the child's description.
-    """
-    state = get_global_report_state()
-    if state is None:
-        return []
-    filed: list[dict[str, Any]] = []
-    seen: set[str] = set()
-    for report in state.get_existing_vulnerabilities():
-        if report.get("agent_id") != agent_id:
-            continue
-        report_id = str(report.get("id") or "")
-        if not report_id or report_id in seen:
-            continue
-        seen.add(report_id)
-        filed.append(report)
-    return filed
-
-
-def _render_filed_report(report: dict[str, Any]) -> str:
-    line = f"- {report.get('id')}"
-    severity = report.get("severity")
-    if severity:
-        line += f" [{str(severity).upper()}]"
-    title = report.get("title")
-    if title:
-        line += f" {title}"
-    return line
-
-
 def _render_completion_report(
     *,
     agent_name: str,
@@ -73,7 +38,6 @@ def _render_completion_report(
     findings: list[str],
     recommendations: list[str],
     open_items: list[str],
-    filed_reports: list[dict[str, Any]] | None = None,
 ) -> str:
     """Render a child's completion report as plain structured text.
 
@@ -99,12 +63,6 @@ def _render_completion_report(
         lines.append("Findings:")
         lines.extend(f"- {f}" for f in findings)
     lines.append("")
-    lines.append("Vulnerability reports filed by this agent (authoritative; use these ids):")
-    if filed_reports:
-        lines.extend(_render_filed_report(r) for r in filed_reports)
-    else:
-        lines.append("- (none)")
-    lines.append("")
     lines.append("Open items (unresolved, need follow-up):")
     if open_items:
         lines.extend(f"- {o}" for o in open_items)
@@ -191,11 +149,8 @@ async def send_message_to_agent(
     **Don't** use for routine "hello/status" pings, for context the
     target already has (children inherit parent history), or when
     parent/child completion via ``agent_finish`` already covers the
-    flow. In interactive runs a message wakes the target regardless of
+    flow. Messages to any registered agent wake it, regardless of
     status, so a follow-up can restart a completed/stopped/failed agent.
-    In non-interactive runs a finished agent is gone for good: the call
-    fails with the target's status, and you should read its filed
-    reports (``list_reports``) or spawn a new agent instead of waiting.
 
     Args:
         target_agent_id: Recipient's 8-char id.
@@ -240,23 +195,10 @@ async def send_message_to_agent(
         },
     )
     if not delivered:
-        _, status = await coordinator.reachability(target_agent_id)
-        if status is None:
-            error = f"Target agent '{target_agent_id}' not found"
-        else:
-            error = (
-                f"Target agent '{target_agent_id}' is '{status}' and cannot be woken in "
-                "this run; it will never read this message. Its filed reports are in "
-                "list_reports / get_report. Do not wait_for_agents on it - spawn a new "
-                "agent if more work is needed."
-            )
         return json.dumps(
             {
                 "success": False,
-                "error": error,
-                "target_agent_id": target_agent_id,
-                "target_status": status,
-                "delivery_status": "not_delivered",
+                "error": f"Target agent '{target_agent_id}' not found or message delivery failed",
             },
             ensure_ascii=False,
             default=str,
@@ -422,31 +364,6 @@ async def wait_for_agents(  # noqa: PLR0911
             default=str,
         )
 
-    # Non-interactive agents cannot be woken once terminal, so with nobody
-    # running or waiting there is no message left to wait for.
-    if not await coordinator.active_agents_except(me):
-        _, statuses, names, _ = await coordinator.graph_snapshot()
-        return json.dumps(
-            {
-                "success": True,
-                "wait_outcome": "no_active_agents",
-                "reason": reason,
-                "agents": [
-                    {"agent_id": aid, "name": names.get(aid, aid), "status": status}
-                    for aid, status in statuses.items()
-                    if aid != me
-                ],
-                "note": (
-                    "No other agent is running or waiting, so no message can arrive. "
-                    "Finished agents' results are in list_reports / get_report and their "
-                    "completion reports are already in your history. Continue your own "
-                    "work, spawn a new agent, or finish."
-                ),
-            },
-            ensure_ascii=False,
-            default=str,
-        )
-
     await coordinator.park_waiting(me, wait_kind="agents")
     try:
         await asyncio.wait_for(coordinator.wait_for_message(me), timeout_seconds)
@@ -693,9 +610,6 @@ async def agent_finish(
             default=str,
         )
 
-    filed_reports = _filed_reports_by(me)
-    filed_report_ids = [str(r.get("id")) for r in filed_reports]
-
     parent_notified = False
     if report_to_parent and await coordinator.claim_parent_notice(me):
         async with coordinator._lock:
@@ -709,7 +623,6 @@ async def agent_finish(
             findings=list(findings or []),
             recommendations=list(final_recommendations or []),
             open_items=list(open_items or []),
-            filed_reports=filed_reports,
         )
         await coordinator.send(
             parent_id,
@@ -719,7 +632,6 @@ async def agent_finish(
                 "content": report,
                 "type": "completion",
                 "priority": "high",
-                "filed_report_ids": filed_report_ids,
             },
         )
         parent_notified = True
@@ -730,11 +642,10 @@ async def agent_finish(
         await notify_parent_on_terminal(coordinator, me, "completed")
 
     logger.info(
-        "agent_finish: %s success=%s findings=%d filed_reports=%d parent_notified=%s",
+        "agent_finish: %s success=%s findings=%d parent_notified=%s",
         me,
         success,
         len(findings or []),
-        len(filed_report_ids),
         parent_notified,
     )
 
@@ -745,7 +656,6 @@ async def agent_finish(
             "parent_notified": parent_notified,
             "agent_id": me,
             "summary": result_summary,
-            "filed_report_ids": filed_report_ids,
             "findings_count": len(findings or []),
             "open_items_count": len(open_items or []),
             "has_recommendations": bool(final_recommendations),

strix/tools/mcp/agent_tools.py

@@ -50,6 +50,13 @@ 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)"
@@ -107,8 +114,8 @@ async def describe_mcp(ctx: RunContextWrapper, connection: str) -> str:
         return _unknown_connection(connection, registry)
     try:
         tools = await entry.session.list_tools()
-    except McpConnectionUnavailableError as exc:
-        return str(exc)
+    except McpConnectionUnavailableError:
+        return _unavailable_connection(connection)
     if not tools:
         return f"MCP connection {connection!r} offers no tools."
     header = f"MCP connection {connection!r} offers {len(tools)} tool(s):"
@@ -163,8 +170,8 @@ async def call_mcp(
         return invalid_arguments
     try:
         available = await entry.session.list_tools()
-    except McpConnectionUnavailableError as exc:
-        return _errored_tool_output(str(exc))
+    except McpConnectionUnavailableError:
+        return _errored_tool_output(_unavailable_connection(connection))
     valid_names = {mcp_tool.name for mcp_tool in available}
     if tool not in valid_names:
         offered = ", ".join(sorted(valid_names)) or "(none)"

strix/tools/mcp/session.py

@@ -109,12 +109,10 @@ def _call_semaphore(name: str, limit: int) -> asyncio.Semaphore:
 
 
 class McpConnectionUnavailableError(RuntimeError):
-    """The MCP connection cannot take requests right now.
+    """A dead MCP connection could not be reached and did not come back.
 
     Raised by :meth:`SupervisedMcpSession.list_tools` when the connection is dead
-    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.
+    so the read-only dispatch tools (``describe_mcp``) can report it cleanly.
     :meth:`SupervisedMcpSession.dispatch` does not raise it: a call to a dead
     connection returns the standard failed-tool output instead.
     """
@@ -609,7 +607,12 @@ class SupervisedMcpSession:
                 return _Outcome(call_failure=failure)
             self._mark_dead(failure, attempt=attempt)
             return _Outcome(dead=True)
-        if phase == "call" and failure.kind == "protocol":
+        if (
+            phase == "call"
+            and failure.kind == "protocol"
+            and failure.status is not None
+            and 400 <= failure.status <= 499
+        ):
             return _Outcome(call_failure=failure)
         if attempt == _MAX_ATTEMPTS:
             await self._quarantine(failure, attempt=attempt)
@@ -726,13 +729,6 @@ 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 "

tests/conftest.py

@@ -24,30 +24,3 @@ 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)

tests/test_agent_graph_coordination.py

@@ -1,258 +0,0 @@
-"""Tests for parent/child coordination once a non-interactive child has finished.
-
-A non-interactive agent's loop returns after its terminal state, so nothing will
-ever read a message sent to it afterwards. Messaging it must say so instead of
-reporting delivery, waiting on it must return at once, and its completion report
-must carry the ids of the reports it actually filed so the parent does not have
-to go asking.
-"""
-
-from __future__ import annotations
-
-import json
-from typing import TYPE_CHECKING, Any, cast
-
-import pytest
-from agents.tool_context import ToolContext
-
-from strix.core.agents import AgentCoordinator
-from strix.report.state import ReportState, set_global_report_state
-from strix.tools.agents_graph.tools import agent_finish, send_message_to_agent, wait_for_agents
-
-
-if TYPE_CHECKING:
-    from collections.abc import Iterator
-    from pathlib import Path
-
-
-@pytest.fixture
-def report_state(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> Iterator[ReportState]:
-    monkeypatch.chdir(tmp_path)
-    state = ReportState(run_name="test-run")
-    set_global_report_state(state)
-    yield state
-    set_global_report_state(None)
-
-
-async def _graph(*, interactive: bool) -> AgentCoordinator:
-    coordinator = AgentCoordinator()
-    await coordinator.register("root", "strix", parent_id=None)
-    await coordinator.register("child", "Validator", parent_id="root")
-    await coordinator.attach_runtime("root", resumable=interactive)
-    await coordinator.attach_runtime("child", resumable=interactive)
-    return coordinator
-
-
-async def _call(
-    tool: Any, coordinator: AgentCoordinator, agent_id: str, args: dict[str, Any], **extra: Any
-) -> dict[str, Any]:
-    ctx = ToolContext(
-        context={"coordinator": coordinator, "agent_id": agent_id, **extra},
-        tool_name=tool.name,
-        tool_call_id="call-1",
-        tool_arguments="{}",
-    )
-    raw: str = await tool.on_invoke_tool(ctx, json.dumps(args))
-    return cast("dict[str, Any]", json.loads(raw))
-
-
-# --- send_message_to_agent -------------------------------------------------------
-
-
-@pytest.mark.asyncio
-async def test_message_to_finished_non_interactive_child_is_not_delivered() -> None:
-    coordinator = await _graph(interactive=False)
-    await coordinator.set_status("child", "completed")
-
-    result = await _call(
-        send_message_to_agent,
-        coordinator,
-        "root",
-        {"target_agent_id": "child", "message": "did you file it?", "message_type": "query"},
-    )
-
-    assert result["success"] is False
-    assert result["delivery_status"] == "not_delivered"
-    assert result["target_status"] == "completed"
-    assert "list_reports" in result["error"]
-    assert coordinator.pending_counts.get("child", 0) == 0
-    assert coordinator.runtimes["child"].mailbox == []
-
-
-@pytest.mark.asyncio
-@pytest.mark.parametrize("status", ["stopped", "failed", "crashed"])
-async def test_every_terminal_non_interactive_status_is_unreachable(status: str) -> None:
-    coordinator = await _graph(interactive=False)
-    await coordinator.set_status("child", status)
-
-    assert await coordinator.send("child", {"from": "root", "content": "hi"}) is False
-    assert await coordinator.reachability("child") == (False, status)
-
-
-@pytest.mark.asyncio
-@pytest.mark.parametrize("status", ["running", "waiting"])
-async def test_message_to_live_child_is_delivered(status: str) -> None:
-    coordinator = await _graph(interactive=False)
-    await coordinator.set_status("child", status)
-
-    result = await _call(
-        send_message_to_agent,
-        coordinator,
-        "root",
-        {"target_agent_id": "child", "message": "wrap up"},
-    )
-
-    assert result["success"] is True
-    assert result["delivery_status"] == "delivered"
-    assert coordinator.pending_counts["child"] == 1
-
-
-@pytest.mark.asyncio
-async def test_message_to_finished_interactive_child_still_wakes_it() -> None:
-    # An interactive loop parks after finishing and resumes on a message.
-    coordinator = await _graph(interactive=True)
-    await coordinator.set_status("child", "completed")
-
-    result = await _call(
-        send_message_to_agent,
-        coordinator,
-        "root",
-        {"target_agent_id": "child", "message": "one more thing"},
-    )
-
-    assert result["success"] is True
-    assert coordinator.pending_counts["child"] == 1
-
-
-@pytest.mark.asyncio
-async def test_unknown_target_is_reported_as_not_found() -> None:
-    coordinator = await _graph(interactive=False)
-
-    result = await _call(
-        send_message_to_agent,
-        coordinator,
-        "root",
-        {"target_agent_id": "ghost", "message": "hello"},
-    )
-
-    assert result["success"] is False
-    assert result["target_status"] is None
-    assert "not found" in result["error"]
-
-
-# --- wait_for_agents -------------------------------------------------------------
-
-
-@pytest.mark.asyncio
-async def test_wait_returns_at_once_when_no_child_can_answer() -> None:
-    coordinator = await _graph(interactive=False)
-    await coordinator.set_status("child", "completed")
-    # The completion report was already consumed in an earlier turn.
-
-    result = await _call(
-        wait_for_agents,
-        coordinator,
-        "root",
-        {"reason": "waiting for validator", "timeout_seconds": 240},
-    )
-
-    assert result["wait_outcome"] == "no_active_agents"
-    assert result["agents"] == [{"agent_id": "child", "name": "Validator", "status": "completed"}]
-    assert coordinator.statuses["root"] == "running"
-
-
-@pytest.mark.asyncio
-async def test_wait_delivers_a_pending_report_before_checking_liveness() -> None:
-    coordinator = await _graph(interactive=False)
-    await coordinator.send("root", {"from": "child", "type": "completion", "content": "done"})
-    await coordinator.set_status("child", "completed")
-
-    result = await _call(wait_for_agents, coordinator, "root", {"timeout_seconds": 5})
-
-    assert result["wait_outcome"] == "message_arrived"
-    assert result["pending_messages"] == 1
-
-
-@pytest.mark.asyncio
-async def test_wait_still_parks_while_a_child_is_running() -> None:
-    coordinator = await _graph(interactive=False)
-
-    result = await _call(wait_for_agents, coordinator, "root", {"timeout_seconds": 1})
-
-    assert result["wait_outcome"] == "timeout"
-
-
-@pytest.mark.asyncio
-async def test_interactive_wait_parks_even_without_active_children() -> None:
-    # In an interactive run a finished child can be woken later, so parking is
-    # legitimate; the run loop's own auto-resume bounds the wait.
-    coordinator = await _graph(interactive=True)
-    await coordinator.set_status("child", "completed")
-
-    result = await _call(
-        wait_for_agents, coordinator, "root", {"timeout_seconds": 5}, interactive=True
-    )
-
-    assert result["wait_outcome"] == "waiting"
-
-
-# --- agent_finish ----------------------------------------------------------------
-
-
-@pytest.mark.asyncio
-async def test_agent_finish_lists_the_reports_the_child_filed(report_state: ReportState) -> None:
-    coordinator = await _graph(interactive=False)
-    mine = report_state.add_vulnerability_report(
-        title="IDOR on /api/audits", severity="high", agent_id="child", agent_name="Validator"
-    )
-    report_state.add_vulnerability_report(title="Root's own", severity="low", agent_id="root")
-
-    result = await _call(
-        agent_finish,
-        coordinator,
-        "child",
-        {"result_summary": "confirmed", "findings": ["IDOR confirmed"]},
-        parent_id="root",
-    )
-
-    assert result["filed_report_ids"] == [mine]
-    delivered = coordinator.runtimes["root"].mailbox
-    assert len(delivered) == 1
-    assert delivered[0]["filed_report_ids"] == [mine]
-    body = delivered[0]["content"]
-    assert f"- {mine} [HIGH] IDOR on /api/audits" in body
-    assert "Root's own" not in body
-
-
-@pytest.mark.asyncio
-async def test_agent_finish_states_explicitly_when_nothing_was_filed(
-    report_state: ReportState,
-) -> None:
-    coordinator = await _graph(interactive=False)
-    report_state.add_vulnerability_report(title="Someone else's", severity="low", agent_id="root")
-
-    result = await _call(
-        agent_finish,
-        coordinator,
-        "child",
-        {"result_summary": "nothing exploitable", "findings": ["ruled out X"]},
-        parent_id="root",
-    )
-
-    assert result["filed_report_ids"] == []
-    body = coordinator.runtimes["root"].mailbox[0]["content"]
-    assert "Vulnerability reports filed by this agent" in body
-    assert body.index("filed by this agent") < body.index("- (none)")
-
-
-@pytest.mark.asyncio
-async def test_agent_finish_without_report_state_still_completes() -> None:
-    set_global_report_state(None)
-    coordinator = await _graph(interactive=False)
-
-    result = await _call(
-        agent_finish, coordinator, "child", {"result_summary": "done"}, parent_id="root"
-    )
-
-    assert result["success"] is True
-    assert result["filed_report_ids"] == []

tests/test_cloud_cli.py

@@ -6,7 +6,6 @@ import io
 import json
 import shutil
 import subprocess
-import sys
 import urllib.request
 import webbrowser
 from pathlib import Path
@@ -17,7 +16,7 @@ import requests
 from rich.console import Console
 
 from strix.interface import cloud, platform_cli
-from strix.interface.cloud import http, render, runner, workspaces
+from strix.interface.cloud import billing, http, payment_proxy, render, runner, workspaces
 from strix.interface.cloud.spec import GROUP_HELP, SPEC
 
 
@@ -148,7 +147,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 SPEC[group][verb]
+    assert command is runner.SPEC[group][verb]
     assert remaining == []
 
 
@@ -534,69 +533,6 @@ def test_insufficient_credits_exits_with_payment_code(monkeypatch: pytest.Monkey
     assert cloud.run_cloud(["scans", "start", "--domain-ids", "d1"]) == http.EXIT_PAYMENT
 
 
-def test_insufficient_credits_always_prints_topup_instruction(
-    monkeypatch: pytest.MonkeyPatch, capsys: Any
-) -> None:
-    monkeypatch.setattr(
-        http,
-        "request",
-        lambda *_a, **_k: FakeResponse(
-            status_code=402,
-            payload={"detail": "Out of credits.", "code": "scan_credit_limit_reached"},
-        ),
-    )
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
-    argv = ["scans", "start", "--domain-ids", "d1", "--app-url", "https://app.strix.ai"]
-    assert cloud.run_cloud(argv) == http.EXIT_PAYMENT
-    output = " ".join(capsys.readouterr().out.split())
-    assert "Error: Out of credits." in output
-    assert "Next step:" in output
-    assert "strix cloud billing topup --credits <count>" in output
-    assert "https://app.strix.ai/settings/billing" in output
-    assert "strix cloud billing credits" in output
-
-
-def test_insufficient_credits_shows_platform_hint_once(
-    monkeypatch: pytest.MonkeyPatch, capsys: Any
-) -> None:
-    hint = "Buy credits at https://app.strix.ai/settings/billing. Then retry this request."
-    payload = {
-        "detail": f"Out of credits. {hint}",
-        "code": "scan_credit_limit_reached",
-        "hint": hint,
-        "topup_url": "https://app.strix.ai/settings/billing",
-    }
-    monkeypatch.setattr(
-        http, "request", lambda *_a, **_k: FakeResponse(status_code=402, payload=payload)
-    )
-    assert cloud.run_cloud(["scans", "start", "--domain-ids", "d1", "--json"]) == http.EXIT_PAYMENT
-    result = json.loads(capsys.readouterr().out)
-    assert result["error"] == "Out of credits."
-    assert result["next_step"] == hint
-    assert result["topup_url"] == "https://app.strix.ai/settings/billing"
-
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
-    assert cloud.run_cloud(["scans", "start", "--domain-ids", "d1"]) == http.EXIT_PAYMENT
-    output = " ".join(capsys.readouterr().out.split())
-    assert output.count(hint) == 1
-    assert "Error: Out of credits." in output
-    assert f"Next step: {hint}" in output
-
-
-def test_payment_required_without_body_names_the_topup_command(
-    monkeypatch: pytest.MonkeyPatch, capsys: Any
-) -> None:
-    monkeypatch.setattr(
-        http, "request", lambda *_a, **_k: FakeResponse(status_code=402, payload={})
-    )
-    argv = ["scans", "start", "--domain-ids", "d1", "--json", "--app-url", "https://app.strix.ai"]
-    assert cloud.run_cloud(argv) == http.EXIT_PAYMENT
-    result = json.loads(capsys.readouterr().out)
-    assert result["error"] == "Not enough credits to run this command."
-    assert "strix cloud billing topup --credits <count>" in result["next_step"]
-    assert "https://app.strix.ai/settings/billing" in result["next_step"]
-
-
 def test_data_rejects_non_object() -> None:
     assert cloud.run_cloud(["scans", "start", "--data", "[1,2]"]) == http.EXIT_USAGE
     assert cloud.run_cloud(["scans", "start", "--data", "not json"]) == http.EXIT_USAGE
@@ -625,7 +561,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(
-        requests,
+        http.requests,
         "request",
         lambda *_args, **_kwargs: pytest.fail("a mismatched origin must not receive the token"),
     )
@@ -640,7 +576,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(
-        requests,
+        http.requests,
         "request",
         lambda *_args, **_kwargs: pytest.fail("an unbound token must not be sent"),
     )
@@ -666,7 +602,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(requests, "request", request)
+    monkeypatch.setattr(http.requests, "request", request)
     response = http.request("GET", "/billing/credits")
 
     assert response.status_code == 200
@@ -690,7 +626,7 @@ def test_explicit_token_can_target_an_explicit_platform(
         seen.update(url=url, headers=kwargs["headers"])
         return FakeResponse(payload={"balance": 1})
 
-    monkeypatch.setattr(requests, "request", request)
+    monkeypatch.setattr(http.requests, "request", request)
     override_value = "explicit-preview-" + str(1)
     response = http.request("GET", "/billing/credits", token=override_value)
 
@@ -770,9 +706,9 @@ def test_topup_noninteractive_requires_explicit_payment_approval(
     monkeypatch.setattr(
         http, "request", lambda *_a, **_k: FakeResponse(status_code=402, payload=challenge)
     )
-    monkeypatch.setattr(sys.stdin, "isatty", lambda: False)
+    monkeypatch.setattr(runner.sys.stdin, "isatty", lambda: False)
     monkeypatch.setattr(
-        subprocess,
+        billing.subprocess,
         "run",
         lambda *_a, **_k: pytest.fail("wallet must not run without --yes"),
     )
@@ -796,10 +732,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(sys.stdin, "isatty", lambda: True)
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: stdout_tty)
+    monkeypatch.setattr(runner.sys.stdin, "isatty", lambda: True)
+    monkeypatch.setattr(runner.sys.stdout, "isatty", lambda: stdout_tty)
     monkeypatch.setattr(
-        Console,
+        runner.Console,
         "input",
         lambda *_a, **_k: pytest.fail("machine-readable top-up must not prompt"),
     )
@@ -903,7 +839,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(requests, "request", fake_upstream_request)
+    monkeypatch.setattr(payment_proxy.requests, "request", fake_upstream_request)
 
     def fake_run(command: list[str], **kwargs: Any) -> Any:
         commands.append(command)
@@ -969,7 +905,6 @@ 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,
@@ -1011,7 +946,6 @@ 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)
@@ -1037,7 +971,6 @@ 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,
@@ -1064,7 +997,6 @@ 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,
@@ -1104,7 +1036,6 @@ 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,
@@ -1125,7 +1056,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(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(
         http,
         "request",
@@ -1135,10 +1066,9 @@ 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(
-        requests,
+        payment_proxy.requests,
         "request",
         lambda *_a, **_k: FakeResponse(status_code=200, content=b"<html>not a receipt</html>"),
     )
@@ -1667,7 +1597,7 @@ def test_handoff_links_reject_non_http_schemes(
     monkeypatch: pytest.MonkeyPatch,
     capsys: Any,
 ) -> None:
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(runner.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(
         http,
         "request",
@@ -1952,7 +1882,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(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     assert cloud.run_cloud(["workspaces", "-h"]) == 0
     output = capsys.readouterr().out
     assert "workspaces verbs" in output
@@ -1976,7 +1906,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(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(
         http,
         "request",
@@ -2024,7 +1954,7 @@ def test_integrations_human_list_exposes_installation_id_and_json_stays_full(
         ],
         "bitbucket_oauth_enabled": True,
     }
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(http, "request", lambda *_a, **_k: FakeResponse(payload=payload))
 
     assert cloud.run_cloud(["integrations", "list"]) == 0
@@ -2042,7 +1972,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(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(
         http,
         "request",
@@ -2117,7 +2047,7 @@ def test_pr_review_human_list_shows_pull_request_state(
     capsys: Any,
     pr_state: str,
 ) -> None:
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(
         http,
         "request",
@@ -2180,7 +2110,7 @@ def test_scan_human_list_identifies_internal_and_uploaded_targets(
     record: dict[str, Any],
     expected_targets: tuple[str, ...],
 ) -> None:
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(
         http,
         "request",
@@ -2344,7 +2274,7 @@ def test_human_lists_prioritize_actionable_fields(
     visible: tuple[str, ...],
     hidden: tuple[str, ...],
 ) -> None:
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(http, "request", lambda *_a, **_k: FakeResponse(payload=payload))
 
     assert cloud.run_cloud(command) == 0
@@ -2358,7 +2288,7 @@ def test_human_lists_prioritize_actionable_fields(
 def test_token_human_list_shows_lifecycle_status(
     monkeypatch: pytest.MonkeyPatch, capsys: Any
 ) -> None:
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(
         http,
         "request",
@@ -2715,7 +2645,7 @@ def test_nonstandard_human_list_envelopes_are_actionable(
     visible: tuple[str, ...],
     hidden: tuple[str, ...],
 ) -> None:
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(http, "request", lambda *_a, **_k: FakeResponse(payload=payload))
 
     assert cloud.run_cloud(command) == 0
@@ -2765,7 +2695,7 @@ def test_chat_credentials_human_view_separates_attached_and_available_sources(
             }
         ],
     }
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.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"]
@@ -2991,7 +2921,7 @@ def test_named_human_list_views_match_api_fields(
     visible: tuple[str, ...],
     hidden: tuple[str, ...],
 ) -> None:
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(http, "request", lambda *_a, **_k: FakeResponse(payload=payload))
 
     assert cloud.run_cloud(command) == 0
@@ -3005,7 +2935,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(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(
         http,
         "request",
@@ -3166,7 +3096,7 @@ def test_wrapped_detail_human_views_are_unwrapped_and_actionable(
     visible: tuple[str, ...],
     hidden: tuple[str, ...],
 ) -> None:
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(http, "request", lambda *_a, **_k: FakeResponse(payload=payload))
 
     assert cloud.run_cloud(command) == 0
@@ -3180,7 +3110,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(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     seen_query: dict[str, Any] = {}
 
     def fake_trace_request(_method: str, _path: str, **kwargs: Any) -> FakeResponse:
@@ -3276,7 +3206,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(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(
         http,
         "request",
@@ -3378,7 +3308,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(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     description = (
         " ".join(["authorization context"] * 12) + " final-description-marker\nsecond-line-marker"
     )
@@ -3456,7 +3386,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(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(
         http,
         "request",
@@ -3553,7 +3483,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(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(
         http,
         "request",

tests/test_cloud_cli_runtime.py

@@ -6,17 +6,13 @@ import argparse
 import io
 import json
 import sys
-import time
-import webbrowser
 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
 
 
@@ -173,7 +169,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(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(
         http,
         "request",
@@ -297,8 +293,8 @@ def test_source_prompt_shows_paths_and_literal_confirmation(
         return "n"
 
     monkeypatch.setattr(console, "input", answer)
-    monkeypatch.setattr(sys.stdin, "isatty", lambda: True)
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(source_scan.sys.stdin, "isatty", lambda: True)
+    monkeypatch.setattr(source_scan.sys.stdout, "isatty", lambda: True)
     args = argparse.Namespace(
         source=str(tmp_path),
         dry_run=False,
@@ -328,7 +324,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 = prepare_source
+    original_prepare = source_scan.prepare_source
 
     def capture_bundle(*args: Any, **kwargs: Any) -> Any:
         bundle = original_prepare(*args, **kwargs)
@@ -340,8 +336,8 @@ def test_source_prompt_interruption_removes_temporary_archive(
 
     monkeypatch.setattr(source_scan, "prepare_source", capture_bundle)
     monkeypatch.setattr(console, "input", interrupt)
-    monkeypatch.setattr(sys.stdin, "isatty", lambda: True)
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(source_scan.sys.stdin, "isatty", lambda: True)
+    monkeypatch.setattr(source_scan.sys.stdout, "isatty", lambda: True)
     args = argparse.Namespace(
         source=str(tmp_path),
         dry_run=False,
@@ -398,7 +394,7 @@ def test_device_login_rejects_non_http_verification_url(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     monkeypatch.setattr(
-        requests,
+        platform_cli.requests,
         "post",
         lambda *_a, **_k: FakeResponse(
             {
@@ -431,7 +427,7 @@ def test_boolean_query_values_are_lowercase_for_url_search_params(
         seen["params"] = kwargs.get("params")
         return FakeResponse({"items": []})
 
-    monkeypatch.setattr(requests, "request", fake_request)
+    monkeypatch.setattr(http.requests, "request", fake_request)
     http.request("GET", "/test", query={"enabled": True, "disabled": False})
     assert seen["params"] == {"enabled": "true", "disabled": "false"}
 
@@ -485,7 +481,7 @@ def test_binary_response_refuses_to_write_to_a_terminal(
     monkeypatch: pytest.MonkeyPatch,
     capsys: Any,
 ) -> None:
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(runner.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(
         http,
         "request",
@@ -517,7 +513,7 @@ def test_binary_response_can_be_intentionally_redirected(
             return None
 
     redirected = RedirectedStdout()
-    monkeypatch.setattr(sys, "stdout", redirected)
+    monkeypatch.setattr(runner.sys, "stdout", redirected)
     monkeypatch.setattr(
         http,
         "request",
@@ -538,7 +534,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 requests.ConnectionError("connection lost")
+            raise http.requests.ConnectionError("connection lost")
 
     response = (
         FakeResponse({"detail": "report rejected"}, status_code=500)
@@ -649,7 +645,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 requests.ConnectionError("connection lost")
+            raise http.requests.ConnectionError("connection lost")
 
         def close(self) -> None:
             self.closed = True
@@ -774,7 +770,7 @@ def test_session_help_is_specific_and_human_whoami_shows_scopes(
             "scopes": ["scans:read", "organizations:read"],
         }
     )
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(platform_cli.sys.stdout, "isatty", lambda: True)
     assert cloud.run_cloud(["whoami", "--help"]) == 0
     who_help = capsys.readouterr().out
     assert "strix cloud whoami" in who_help
@@ -788,7 +784,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(sys.stdout, "isatty", lambda: False)
+    monkeypatch.setattr(platform_cli.sys.stdout, "isatty", lambda: False)
     platform_cli.save_record(
         {
             "api_token": "secret",
@@ -803,7 +799,7 @@ def test_non_tty_whoami_and_logout_emit_json(
     assert json.loads(capsys.readouterr().out)["email"] == "agent@example.test"
 
     monkeypatch.setattr(
-        requests,
+        platform_cli.requests,
         "delete",
         lambda *_args, **_kwargs: type("Response", (), {"status_code": 200})(),
     )
@@ -835,7 +831,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(sys.stdin, "isatty", lambda: False)
+    monkeypatch.setattr(platform_cli.sys.stdin, "isatty", lambda: False)
     console = Console(file=io.StringIO())
     console.input = lambda *_args, **_kwargs: pytest.fail("must not prompt")  # type: ignore[method-assign]
 
@@ -863,281 +859,6 @@ def test_login_workspace_selector_prefers_ids_and_rejects_duplicate_names() -> N
         platform_cli._choose_workspace(console, organizations, "Strix")
 
 
-_NEW_USER_ONBOARDING: dict[str, Any] = {
-    "workspace_named": False,
-    "repositories_connected": False,
-    "domains_added": False,
-    "github_install_url": "https://github.com/apps/strix/installations/new?state=abc",
-}
-
-_NEW_USER_LOGIN: dict[str, Any] = {
-    "api_token": "strix_pat_test",
-    "email": "alex@example.com",
-    "organization_id": "org-1",
-    "organization_name": "Alex's Workspace",
-    "scopes": ["scans:read"],
-    "is_new_user": True,
-    "onboarding": _NEW_USER_ONBOARDING,
-    "next_steps_hint": "Run the steps in order.",
-    "next_steps": [
-        {
-            "action": "Name your workspace",
-            "cli": 'strix cloud org update --name "Acme Security"',
-            "method": "PATCH",
-            "path": "/api/v1/organization",
-        },
-        {
-            "action": "Add a domain",
-            "cli": "strix cloud domains add --domain example.com --asset-type web_app",
-            "method": "POST",
-            "path": "/api/v1/domains",
-        },
-    ],
-    "dashboard_url": "https://app.strix.ai",
-}
-
-
-def test_login_guidance_is_shown_once_and_never_stored() -> None:
-    stored, guidance = platform_cli._split_login_guidance(dict(_NEW_USER_LOGIN))
-
-    assert stored["api_token"] == _NEW_USER_LOGIN["api_token"]
-    assert stored["organization_name"] == "Alex's Workspace"
-    assert set(guidance) == {
-        "is_new_user",
-        "onboarding",
-        "next_steps",
-        "next_steps_hint",
-        "dashboard_url",
-    }
-    assert not any(key in stored for key in guidance)
-
-
-def test_new_user_success_renders_setup_steps_and_github_link() -> None:
-    output = io.StringIO()
-    console = Console(file=output, width=120)
-    stored, guidance = platform_cli._split_login_guidance(dict(_NEW_USER_LOGIN))
-
-    platform_cli._print_success(console, stored, guidance)
-
-    rendered = output.getvalue()
-    assert "Welcome to Strix" in rendered
-    assert "Alex's Workspace" in rendered
-    assert "(default name)" in rendered
-    assert "Next steps:" in rendered
-    assert "1. Name your workspace" in rendered
-    assert 'strix cloud org update --name "Acme Security"' in rendered
-    assert "2. Add a domain" in rendered
-    assert "https://github.com/apps/strix/installations/new?state=abc" in rendered
-
-
-def test_returning_user_success_stays_compact_without_guidance() -> None:
-    output = io.StringIO()
-    console = Console(file=output, width=120)
-
-    platform_cli._print_success(
-        console,
-        {"email": "alex@example.com", "organization_name": "Acme", "scopes": ["scans:read"]},
-    )
-
-    rendered = output.getvalue()
-    assert "Signed in to the Strix platform." in rendered
-    assert "Welcome" not in rendered
-    assert "Next steps" not in rendered
-    assert "default name" not in rendered
-
-
-def test_success_ignores_unsafe_github_link_and_malformed_steps() -> None:
-    output = io.StringIO()
-    console = Console(file=output, width=120)
-
-    platform_cli._print_success(
-        console,
-        {"organization_name": "Acme"},
-        {
-            "onboarding": {"github_install_url": "javascript:alert(1)"},
-            "next_steps": ["not a step", {"cli": "strix cloud"}],
-        },
-    )
-
-    rendered = output.getvalue()
-    assert "javascript:" not in rendered
-    assert "Next steps" not in rendered
-
-
-def test_first_login_prompts_for_a_workspace_name_and_sends_it(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
-    monkeypatch.setattr(sys.stdin, "isatty", lambda: True)
-    sent: dict[str, Any] = {}
-
-    def post(_url: str, **kwargs: Any) -> FakeResponse:
-        sent.update(kwargs["json"])
-        return FakeResponse(_NEW_USER_LOGIN)
-
-    monkeypatch.setattr(requests, "post", post)
-    console = Console(file=io.StringIO(), width=120)
-    answers = iter(["Acme Security", "1"])
-    console.input = lambda *_args, **_kwargs: next(answers)  # type: ignore[method-assign]
-
-    record = platform_cli._complete_selection(
-        console,
-        "https://example.test",
-        {
-            "selection_token": "sel-1",
-            "is_new_user": True,
-            "organizations": [
-                {
-                    "id": "org-1",
-                    "name": "Alex's Workspace",
-                    "role": "admin",
-                    "has_default_name": True,
-                }
-            ],
-            "scopes": [{"scope": "scans:read", "min_role": "viewer", "minimum": True}],
-        },
-        scopes=None,
-        scope_profile=None,
-        workspace=None,
-    )
-
-    assert sent["workspace_name"] == "Acme Security"
-    assert sent["organization_id"] == "org-1"
-    assert record["api_token"] == _NEW_USER_LOGIN["api_token"]
-
-
-def test_first_login_keeps_the_default_name_on_enter(monkeypatch: pytest.MonkeyPatch) -> None:
-    monkeypatch.setattr(sys.stdin, "isatty", lambda: True)
-    sent: dict[str, Any] = {}
-
-    def post(_url: str, **kwargs: Any) -> FakeResponse:
-        sent.update(kwargs["json"])
-        return FakeResponse(_NEW_USER_LOGIN)
-
-    monkeypatch.setattr(requests, "post", post)
-    console = Console(file=io.StringIO(), width=120)
-    console.input = lambda *_args, **_kwargs: ""  # type: ignore[method-assign]
-
-    platform_cli._complete_selection(
-        console,
-        "https://example.test",
-        {
-            "selection_token": "sel-1",
-            "is_new_user": True,
-            "organizations": [
-                {
-                    "id": "org-1",
-                    "name": "Alex's Workspace",
-                    "role": "admin",
-                    "has_default_name": True,
-                }
-            ],
-            "scopes": [],
-        },
-        scopes=None,
-        scope_profile="recommended",
-        workspace=None,
-    )
-
-    assert "workspace_name" not in sent
-
-
-def test_workspace_name_prompt_rejects_overlong_names() -> None:
-    output = io.StringIO()
-    console = Console(file=output, width=120)
-    answers = iter(["x" * 101, "Acme"])
-    console.input = lambda *_args, **_kwargs: next(answers)  # type: ignore[method-assign]
-
-    assert platform_cli._choose_workspace_name(console, "Alex's Workspace") == "Acme"
-    assert "100 characters or less" in output.getvalue()
-
-
-@pytest.mark.parametrize(
-    ("is_new_user", "has_default_name", "tty"),
-    [(False, True, True), (True, False, True), (True, True, False)],
-)
-def test_workspace_name_prompt_is_skipped_for_returning_named_or_noninteractive_logins(
-    monkeypatch: pytest.MonkeyPatch, is_new_user: bool, has_default_name: bool, tty: bool
-) -> None:
-    monkeypatch.setattr(sys.stdin, "isatty", lambda: tty)
-    sent: dict[str, Any] = {}
-
-    def post(_url: str, **kwargs: Any) -> FakeResponse:
-        sent.update(kwargs["json"])
-        return FakeResponse(_NEW_USER_LOGIN)
-
-    monkeypatch.setattr(requests, "post", post)
-    console = Console(file=io.StringIO(), width=120)
-    console.input = lambda *_args, **_kwargs: pytest.fail("must not prompt")  # type: ignore[method-assign]
-
-    platform_cli._complete_selection(
-        console,
-        "https://example.test",
-        {
-            "selection_token": "sel-1",
-            "is_new_user": is_new_user,
-            "organizations": [
-                {
-                    "id": "org-1",
-                    "name": "Alex's Workspace",
-                    "role": "admin",
-                    "has_default_name": has_default_name,
-                }
-            ],
-            "scopes": [],
-        },
-        scopes=["scans:read"],
-        scope_profile=None,
-        workspace=None,
-    )
-
-    assert "workspace_name" not in sent
-
-
-def test_github_install_offer_opens_the_browser_only_on_yes(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
-    monkeypatch.setattr(sys.stdin, "isatty", lambda: True)
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
-    opened: list[str] = []
-
-    def fake_open(url: str) -> bool:
-        opened.append(url)
-        return True
-
-    monkeypatch.setattr(webbrowser, "open", fake_open)
-    guidance: dict[str, Any] = {"is_new_user": True, "onboarding": dict(_NEW_USER_ONBOARDING)}
-
-    output = io.StringIO()
-    console = Console(file=output, width=120)
-    console.input = lambda *_args, **_kwargs: "n"  # type: ignore[method-assign]
-    platform_cli._offer_github_install(console, guidance, open_browser=True)
-    assert opened == []
-    assert "strix cloud integrations install github" in output.getvalue()
-
-    console.input = lambda *_args, **_kwargs: "y"  # type: ignore[method-assign]
-    platform_cli._offer_github_install(console, guidance, open_browser=True)
-    assert opened == ["https://github.com/apps/strix/installations/new?state=abc"]
-
-
-def test_github_install_offer_never_prompts_without_a_terminal_or_browser(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
-    monkeypatch.setattr(webbrowser, "open", lambda _url: pytest.fail("must not open"))
-    guidance: dict[str, Any] = {"is_new_user": True, "onboarding": dict(_NEW_USER_ONBOARDING)}
-    console = Console(file=io.StringIO(), width=120)
-    console.input = lambda *_args, **_kwargs: pytest.fail("must not prompt")  # type: ignore[method-assign]
-
-    monkeypatch.setattr(sys.stdin, "isatty", lambda: False)
-    platform_cli._offer_github_install(console, guidance, open_browser=True)
-
-    monkeypatch.setattr(sys.stdin, "isatty", lambda: True)
-    monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
-    platform_cli._offer_github_install(console, guidance, open_browser=False)
-    platform_cli._offer_github_install(
-        console, {**guidance, "is_new_user": False}, open_browser=True
-    )
-
-
 def test_device_flow_slow_down_never_exceeds_the_poll_interval_cap(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
@@ -1175,10 +896,10 @@ def test_device_flow_slow_down_never_exceeds_the_poll_interval_cap(
         sleeps.append(seconds)
         now += seconds
 
-    monkeypatch.setattr(requests, "post", post)
+    monkeypatch.setattr(platform_cli.requests, "post", post)
     monkeypatch.setattr(platform_cli, "_app_url", lambda: "https://example.test")
-    monkeypatch.setattr(time, "monotonic", monotonic)
-    monkeypatch.setattr(time, "sleep", sleep)
+    monkeypatch.setattr(platform_cli.time, "monotonic", monotonic)
+    monkeypatch.setattr(platform_cli.time, "sleep", sleep)
 
     with pytest.raises(platform_cli.PlatformAuthError, match="expired"):
         platform_cli._run_device_flow(
@@ -1212,9 +933,9 @@ def test_device_flow_accepts_external_authkit_url_and_binds_token_origin(
             ),
         ]
     )
-    monkeypatch.setattr(requests, "post", lambda *_a, **_k: next(responses))
+    monkeypatch.setattr(platform_cli.requests, "post", lambda *_a, **_k: next(responses))
     monkeypatch.setattr(platform_cli, "_app_url", lambda: "https://preview.strix.ai")
-    monkeypatch.setattr(time, "sleep", lambda _seconds: None)
+    monkeypatch.setattr(platform_cli.time, "sleep", lambda _seconds: None)
 
     record = platform_cli._run_device_flow(
         Console(file=io.StringIO()),
@@ -1263,7 +984,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(sys.stdout, "isatty", lambda: False)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: False)
 
     assert cloud.run_cloud([]) == 0
     assert json.loads(capsys.readouterr().out)["command"] == "strix cloud"
@@ -1299,7 +1020,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(
-        requests,
+        http.requests,
         "put",
         lambda *_args, **_kwargs: pytest.fail("an untrusted URL must not receive source bytes"),
     )
@@ -1338,7 +1059,7 @@ def test_source_upload_allows_only_managed_or_same_origin_storage(
         return response
 
     monkeypatch.setattr(http, "_app_url_override", app_url)
-    monkeypatch.setattr(requests, "put", put)
+    monkeypatch.setattr(http.requests, "put", put)
     http.upload_file(signed_url, "upload-token", source)
 
     assert request_options["allow_redirects"] is False
@@ -1359,7 +1080,7 @@ def test_source_upload_refuses_redirects_without_following_them(
         return response
 
     monkeypatch.setattr(http, "_app_url_override", "https://app.strix.ai")
-    monkeypatch.setattr(requests, "put", put)
+    monkeypatch.setattr(http.requests, "put", put)
 
     with pytest.raises(http.CloudError, match="unexpected redirect"):
         http.upload_file(
@@ -1374,7 +1095,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(sys.stdout, "isatty", lambda: True)
+    monkeypatch.setattr(render.sys.stdout, "isatty", lambda: True)
     monkeypatch.setattr(
         http,
         "request",

tests/test_cloud_idempotency.py

@@ -3,11 +3,9 @@
 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
@@ -32,7 +30,7 @@ class FakeResponse:
 @pytest.fixture(autouse=True)
 def _token(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setenv("STRIX_API_TOKEN", "idempotency-test-token")
-    monkeypatch.setattr(time, "sleep", lambda _seconds: None)
+    monkeypatch.setattr(runner.time, "sleep", lambda _seconds: None)
 
 
 def test_scan_start_generates_and_sends_one_stable_key(
@@ -199,7 +197,7 @@ def test_http_client_places_key_in_the_header(monkeypatch: pytest.MonkeyPatch) -
         seen.update(kwargs)
         return FakeResponse({"ok": True})
 
-    monkeypatch.setattr(requests, "request", request)
+    monkeypatch.setattr(http.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"

tests/test_cloud_payment_proxy.py

@@ -7,7 +7,6 @@ import urllib.request
 from typing import TYPE_CHECKING, Any
 
 import pytest
-import requests
 
 from strix.interface.cloud import payment_proxy
 
@@ -40,8 +39,7 @@ 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
-        body_bytes: bytes = response.read()
-    return body_bytes
+        return response.read()
 
 
 def test_bridge_bounds_decompressed_upstream_response(monkeypatch: pytest.MonkeyPatch) -> None:
@@ -52,7 +50,7 @@ def test_bridge_bounds_decompressed_upstream_response(monkeypatch: pytest.Monkey
         return response
 
     monkeypatch.setattr(payment_proxy, "_MAX_UPSTREAM_RESPONSE_BYTES", 4)
-    monkeypatch.setattr(requests, "request", fake_request)
+    monkeypatch.setattr(payment_proxy.requests, "request", fake_request)
 
     with payment_proxy.wallet_payment_bridge(
         upstream_url="https://app.example.test/api/v1/billing/topup",
@@ -82,7 +80,7 @@ def test_bridge_forwards_only_the_approved_request_and_protected_headers(
         captured.append(kwargs)
         return _StreamingResponse([b'{"ok":true}'])
 
-    monkeypatch.setattr(requests, "request", fake_request)
+    monkeypatch.setattr(payment_proxy.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
@@ -126,7 +124,7 @@ def test_bridge_limits_valid_wallet_attempts(monkeypatch: pytest.MonkeyPatch) ->
         calls += 1
         return _StreamingResponse([b"{}"])
 
-    monkeypatch.setattr(requests, "request", fake_request)
+    monkeypatch.setattr(payment_proxy.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

tests/test_cloud_session.py

@@ -6,7 +6,6 @@ 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
@@ -56,7 +55,7 @@ def test_http_workspace_pin_is_captured_once(
         sent.append(dict(kwargs["headers"]))
         return Response({})
 
-    monkeypatch.setattr(requests, "request", fake_request)
+    monkeypatch.setattr(http.requests, "request", fake_request)
     http.configure()
     platform_cli.save_record(
         {
@@ -117,7 +116,7 @@ def test_logout_keeps_local_token_when_remote_outcome_is_not_definitive(
         }
     )
     monkeypatch.setattr(
-        requests,
+        platform_cli.requests,
         "delete",
         lambda *_args, **_kwargs: Response({"detail": "unavailable"}, 503),
     )

tests/test_cloud_source_upload.py

@@ -655,44 +655,3 @@ def test_incomplete_upload_credentials_delete_the_reserved_upload(
     monkeypatch.setattr(http, "request", fake_request)
     assert cloud.run_cloud(["scans", "start", "--source", str(tmp_path), "--yes", "--json"]) == 1
     assert ("DELETE", "/uploads/upload-incomplete") in paths
-
-
-def test_archive_source_is_rejected_with_directory_guidance(tmp_path: Path) -> None:
-    archive = tmp_path / "backend.zip"
-    with zipfile.ZipFile(archive, "w") as bundle:
-        bundle.writestr("app.py", "print('safe')\n")
-
-    with pytest.raises(http.CloudError, match="not an archive") as raised:
-        source_upload.prepare_source(
-            str(archive),
-            include_hidden=False,
-            include_sensitive=False,
-            include_archives=False,
-            exclude=[],
-        )
-    assert raised.value.next_step is not None
-    assert "--source" in raised.value.next_step
-    assert "--dry-run --show-files" in raised.value.next_step
-
-
-def test_oversize_archive_names_largest_files_and_exclude_guidance(
-    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    (tmp_path / "app.py").write_text("print('safe')\n", encoding="utf-8")
-    (tmp_path / "big.bin").write_bytes(os.urandom(4096))
-    monkeypatch.setattr(source_upload, "MAX_ARCHIVE_BYTES", 1024)
-
-    with pytest.raises(http.CloudError, match=r"larger than the 0\.0 MiB upload limit") as raised:
-        source_upload.prepare_source(
-            str(tmp_path),
-            include_hidden=False,
-            include_sensitive=False,
-            include_archives=False,
-            exclude=[],
-        )
-    message = str(raised.value)
-    assert message.index("big.bin") < message.index("app.py")
-    assert raised.value.next_step is not None
-    assert "--exclude" in raised.value.next_step
-    assert "--dry-run --show-files" in raised.value.next_step
-    assert not list(tmp_path.glob("strix-source-*.zip"))

tests/test_config_loader.py

@@ -208,191 +208,6 @@ 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"

tests/test_dedupe_model.py

@@ -114,14 +114,7 @@ def test_config_file_loads_dedupe_model(
     tmp_path: Path,
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
-    for key in (
-        "STRIX_LLM",
-        "LLM_API_KEY",
-        "OPENAI_API_KEY",
-        "LLM_API_BASE",
-        "STRIX_DEDUPE_MODEL",
-        "STRIX_DEDUPE_REASONING_EFFORT",
-    ):
+    for key in ("STRIX_LLM", "STRIX_DEDUPE_MODEL", "STRIX_DEDUPE_REASONING_EFFORT"):
         monkeypatch.delenv(key, raising=False)
     path = tmp_path / "config.json"
     path.write_text(

tests/test_docker_client_delete.py

@@ -12,7 +12,6 @@ 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
@@ -23,10 +22,6 @@ 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)
@@ -36,10 +31,9 @@ def _client_with_kill_error(exc: Exception) -> StrixDockerSandboxClient:
     return client
 
 
-def _session(container_id: str | None = "abc123") -> SandboxSession:
+def _session() -> object:
     # delete() reads session._inner.state.container_id
-    fake = SimpleNamespace(_inner=SimpleNamespace(state=SimpleNamespace(container_id=container_id)))
-    return cast("SandboxSession", fake)
+    return SimpleNamespace(_inner=SimpleNamespace(state=SimpleNamespace(container_id="abc123")))
 
 
 @pytest.mark.parametrize(
@@ -51,7 +45,7 @@ def _session(container_id: str | None = "abc123") -> SandboxSession:
     ],
 )
 @pytest.mark.asyncio
-async def test_delete_swallows_best_effort_kill_errors(exc: Exception) -> None:
+async def test_delete_swallows_best_effort_kill_errors(exc):
     """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()."""
@@ -68,7 +62,7 @@ async def test_delete_swallows_best_effort_kill_errors(exc: Exception) -> None:
 
 
 @pytest.mark.asyncio
-async def test_delete_does_not_swallow_unrelated_errors() -> None:
+async def test_delete_does_not_swallow_unrelated_errors():
     """A programming error (e.g. ValueError) is not part of best-effort kill and
     must still propagate."""
     client = _client_with_kill_error(ValueError("boom"))
@@ -77,11 +71,11 @@ async def test_delete_does_not_swallow_unrelated_errors() -> None:
 
 
 @pytest.mark.asyncio
-async def test_delete_noop_without_container_id() -> None:
+async def test_delete_noop_without_container_id():
     """No container_id -> no kill attempt, just delegate."""
     client = StrixDockerSandboxClient.__new__(StrixDockerSandboxClient)
     client.docker_client = MagicMock()
-    session = _session(container_id=None)
+    session = SimpleNamespace(_inner=SimpleNamespace(state=SimpleNamespace(container_id=None)))
 
     with patch.object(
         DockerSandboxClient, "delete", new=AsyncMock(return_value=session)

tests/test_go_tui_runtime.py

@@ -343,19 +343,15 @@ 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()
 
-    # 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 calls == ["preflight", "targets", "prepare", "telemetry", "state", "scan"]
     assert runtime.args.scan_mode == "quick"
     assert runtime.args.instruction == ""
     assert runtime.args.max_budget_usd == 8.5
@@ -364,138 +360,35 @@ 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"
+@pytest.mark.asyncio
+async def test_optimistic_setup_skips_model_preflight(
+    monkeypatch: pytest.MonkeyPatch,
 ) -> None:
+    runtime = GoTuiRuntime(args())
+    runtime.controller.targets = [str(Path.cwd())]
+    calls: list[str] = []
+
+    async def preflight(_model: str) -> None:
+        calls.append("preflight")
+
     monkeypatch.setattr(
         go_tui,
         "load_settings",
-        lambda: SimpleNamespace(llm=SimpleNamespace(model=model)),
+        lambda: SimpleNamespace(llm=SimpleNamespace(model="openrouter/test-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_setup_model_check_reports_success_in_the_setup_log(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
-    runtime = GoTuiRuntime(args())
-    calls: list[str] = []
-
-    async def preflight(model: str) -> None:
-        calls.append(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"))
 
-    await runtime.check_setup_model()
+    await runtime.start_from_setup(verify=False)
 
-    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()
-
-    _setup_model(monkeypatch)
-    monkeypatch.setattr(go_tui, "preflight_model_connection", preflight)
-    runtime._setup_preflight = asyncio.create_task(runtime.check_setup_model())
-    await asyncio.sleep(0)
-
-    # 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
-
-    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
+    # 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"]
 
 
 @pytest.mark.asyncio
@@ -507,8 +400,15 @@ async def test_confirmed_target_less_launch_mounts_workspace_without_targets(
     runtime.controller.workspace_mount = str(Path.home())
     prepared: list[argparse.Namespace] = []
 
-    _setup_model(monkeypatch)
-    monkeypatch.setattr(go_tui, "persist_current", lambda: None)
+    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)
     monkeypatch.setattr(
         go_tui,
         "build_targets_info",
@@ -519,7 +419,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()
+    await runtime.start_from_setup(verify=False)
 
     assert prepared[0].workspace_mount == str(Path.home())
     assert prepared[0].targets_info == []
@@ -542,8 +442,15 @@ async def test_setup_preserves_prepared_cli_targets(
     runtime = GoTuiRuntime(runtime_args)
     calls: list[str] = []
 
-    _setup_model(monkeypatch)
-    monkeypatch.setattr(go_tui, "persist_current", lambda: calls.append("persist"))
+    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)
     monkeypatch.setattr(
         go_tui,
         "build_targets_info",
@@ -558,7 +465,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 == ["persist", "prepare", "telemetry", "state", "scan"]
+    assert calls == ["preflight", "prepare", "telemetry", "state", "scan"]
 
 
 @pytest.mark.asyncio
@@ -891,17 +798,19 @@ async def test_setup_preflight_failure_does_not_start_scan(
         nonlocal started
         started = True
 
-    _setup_model(monkeypatch)
+    monkeypatch.setattr(
+        go_tui,
+        "load_settings",
+        lambda: SimpleNamespace(llm=SimpleNamespace(model="openrouter/test-model")),
+    )
     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.ensure_model_verified()
+        await runtime.start_from_setup()
 
-    assert runtime.model_verified is False
     assert started is False
     assert runtime.scan_task is None
 

tests/test_mcp_resilience.py

@@ -301,62 +301,6 @@ 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))

tests/test_models.py

@@ -72,13 +72,6 @@ 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:
@@ -99,9 +92,6 @@ 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:

tests/test_optional_deps.py

@@ -11,8 +11,7 @@ PYPROJECT = Path(__file__).resolve().parent.parent / "pyproject.toml"
 
 def _optional_dependencies() -> dict[str, list[str]]:
     data = tomllib.loads(PYPROJECT.read_text(encoding="utf-8"))
-    extras: dict[str, list[str]] = data["project"]["optional-dependencies"]
-    return extras
+    return data["project"]["optional-dependencies"]
 
 
 def test_vertex_extra_pins_google_auth() -> None:

tests/test_runner_mcp.py

@@ -185,4 +185,6 @@ 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}
+    ]

tests/test_sarif_stride.py

@@ -34,8 +34,7 @@ def _finding(**overrides: Any) -> dict[str, Any]:
 
 
 def _rule_tags(doc: dict[str, Any]) -> list[str]:
-    tags: list[str] = doc["runs"][0]["tool"]["driver"]["rules"][0]["properties"]["tags"]
-    return tags
+    return doc["runs"][0]["tool"]["driver"]["rules"][0]["properties"]["tags"]
 
 
 def test_stride_tags_on_rule_for_known_cwe() -> None:

tests/test_session_fd.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import asyncio
-import os
 from pathlib import Path
 from typing import Any, cast
 
@@ -10,40 +9,13 @@ import pytest
 from strix.core.sessions import open_agent_session
 
 
-def _fd_dir() -> Path | None:
+def _count_open_fds() -> int | None:
     for path in (Path("/proc/self/fd"), Path("/dev/fd")):
         if path.is_dir():
-            return path
+            return len(list(path.iterdir()))
     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.
@@ -53,20 +25,21 @@ 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.
     """
-    if _fd_dir() is None:
+    baseline = _count_open_fds()
+    if baseline is None:
         pytest.skip("no /proc/self/fd or /dev/fd on this platform")
 
-    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)]
+    sessions = [open_agent_session(f"a{i}", tmp_path / f"s{i}.db") for i in range(60)]
     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_to(db_paths)
-        # 60 parked sessions, yet none of them holds its database open.
-        assert parked == 0, f"parked sessions hold {parked} database descriptors"
+        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}"
     finally:
         for s in sessions:
             s.close()

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() -> None:
+    async def start(_verify: bool = True) -> 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() -> None:
+    async def start(_verify: bool = True) -> 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() -> None:
+    async def start(_verify: bool = True) -> 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", {})
+        await controller.handle("setup.start", {"verify": False})
     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() -> None:
+    async def start(_verify: bool = True) -> 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", {"mount_working_dir": True})
+    result = await controller.handle("setup.start", {"verify": False, "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,23 +236,26 @@ 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() -> None:
-        nonlocal started
+    async def start(verify: bool = True) -> None:
+        nonlocal started, seen_verify
         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", {"mount_working_dir": True})
+    await controller.handle("setup.start", {"verify": False, "mount_working_dir": True})
 
     result = await controller.handle("setup.confirm_mount", {"approved": True})
 
     assert result == {"approved": True}
     assert started is True
-    # Mounted as a workspace: the scan genuinely has no target, so the
-    # instruction is the only source of truth.
+    # 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
     assert controller.workspace_mount == str(Path.cwd())
     assert controller.targets == []
     assert controller.scan_state == "running"
@@ -261,23 +264,22 @@ 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 = 0
+    started: list[bool] = []
 
-    async def start() -> None:
-        nonlocal started
-        started += 1
+    async def start(verify: bool = True) -> None:
+        started.append(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", {"mount_working_dir": True})
+    await controller.handle("setup.start", {"verify": False, "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 == 1
+    assert started == [False]
     assert controller.workspace_mount is None
     assert controller.pending_workspace_mount is None
     assert controller.setup_mode is False
@@ -287,22 +289,21 @@ async def test_declining_the_mount_runs_without_one() -> None:
 
 @pytest.mark.asyncio
 async def test_approving_the_mount_runs_with_it() -> None:
-    started = 0
+    started: list[bool] = []
 
-    async def start() -> None:
-        nonlocal started
-        started += 1
+    async def start(verify: bool = True) -> None:
+        started.append(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", {"mount_working_dir": True})
+    await controller.handle("setup.start", {"verify": False, "mount_working_dir": True})
 
     result = await controller.handle("setup.confirm_mount", {"approved": True})
 
     assert result == {"approved": True}
-    assert started == 1
+    assert started == [False]
     assert controller.workspace_mount == str(Path.cwd())
     assert controller.scan_state == "running"
 
@@ -351,91 +352,23 @@ async def test_user_message_updates_live_agent_projection_immediately() -> None:
 
 
 @pytest.mark.asyncio
-async def test_start_verifies_the_model_before_a_targeted_launch() -> None:
-    order: list[str] = []
+async def test_start_forwards_verify_flag_by_default() -> None:
+    seen_verify: bool | None = None
 
-    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")
+    async def start(verify: bool = True) -> None:
+        nonlocal seen_verify
+        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", {"mount_working_dir": True})
+    await controller.handle("setup.add_target", {"target": "https://example.com"})
 
-    with pytest.raises(ValueError, match="Scan preparation failed"):
-        await controller.handle("setup.confirm_mount", {"approved": True})
+    # A named target keeps the upfront model check.
+    await controller.handle("setup.start", {})
 
-    assert controller.scan_state == "failed"
-    assert controller.error == "Scan preparation failed"
+    assert seen_verify is True
 
 
 @pytest.mark.asyncio
@@ -443,7 +376,7 @@ async def test_start_rejects_concurrent_and_repeated_submissions() -> None:
     entered = asyncio.Event()
     release = asyncio.Event()
 
-    async def start() -> None:
+    async def start(_verify: bool = True) -> None:
         entered.set()
         await release.wait()
 

tests/test_wait_dedupe.py

@@ -41,8 +41,6 @@ def _fast_wait(monkeypatch: pytest.MonkeyPatch) -> Iterator[None]:
 async def _context() -> dict[str, Any]:
     coordinator = AgentCoordinator()
     await coordinator.register("root", "strix", parent_id=None)
-    # A live child keeps the wait genuine: with nobody to hear from it returns at once.
-    await coordinator.register("child", "recon", parent_id="root")
     return {"agent_id": "root", "coordinator": coordinator}
 
 

uv.lock

@@ -2378,7 +2378,7 @@ wheels = [
 
 [[package]]
 name = "strix-agent"
-version = "1.6.1"
+version = "1.6.0"
 source = { editable = "." }
 dependencies = [
     { name = "caido-sdk-client" },