diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e6e37b9..88cb4831 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ Repo: https://github.com/openclaw/acpx
 
 - Agents/built-ins: bump the default Claude ACP adapter range to `@agentclientprotocol/claude-agent-acp@^0.37.0`. Thanks @trumpyla.
 - Runtime/embedding: surface cost, token usage breakdowns, and advertised command metadata on runtime status/events. Thanks @DaniAkash.
-- Agents/built-ins: add `fast-agent` as a built-in EvalState fast-agent ACP adapter via `uvx fast-agent-mcp acp`.
+- Agents/built-ins: add `fast-agent` as a built-in fast-agent ACP adapter via `uvx fast-agent-mcp acp`.
 
 ### Breaking
 
diff --git a/README.md b/README.md
index dc40fda3..9fe7dc4e 100644
--- a/README.md
+++ b/README.md
@@ -351,7 +351,7 @@ Built-ins:
 | `cursor`     | native (`cursor-agent acp`)                                                 | [Cursor CLI](https://cursor.com/docs/cli/acp)                                                                   |
 | `copilot`    | native (`copilot --acp --stdio`)                                            | [GitHub Copilot CLI](https://docs.github.com/copilot/how-tos/copilot-chat/use-copilot-chat-in-the-command-line) |
 | `droid`      | native (`droid exec --output-format acp`)                                   | [Factory Droid](https://www.factory.ai)                                                                         |
-| `fast-agent` | `uvx fast-agent-mcp acp`                                                    | [EvalState fast-agent](https://github.com/evalstate/fast-agent)                                                 |
+| `fast-agent` | `uvx fast-agent-mcp acp`                                                    | [fast-agent](https://fast-agent.ai)                                                                             |
 | `iflow`      | native (`iflow --experimental-acp`)                                         | [iFlow CLI](https://github.com/iflow-ai/iflow-cli)                                                              |
 | `kilocode`   | `npx -y @kilocode/cli acp`                                                  | [Kilocode](https://kilocode.ai)                                                                                 |
 | `kimi`       | native (`kimi acp`)                                                         | [Kimi CLI](https://github.com/MoonshotAI/kimi-cli)                                                              |
diff --git a/agents/FastAgent.md b/agents/FastAgent.md
index 39093f42..c648b198 100644
--- a/agents/FastAgent.md
+++ b/agents/FastAgent.md
@@ -2,8 +2,8 @@
 
 - Built-in name: `fast-agent`
 - Default command: `uvx fast-agent-mcp acp`
-- Upstream: https://github.com/evalstate/fast-agent
+- Upstream: https://fast-agent.ai/acp
 
-`acpx fast-agent` starts EvalState fast-agent through its ACP entrypoint. It requires `uvx` on `PATH`.
+`acpx fast-agent` starts fast-agent through its ACP entrypoint. It requires `uvx` on `PATH`.
 
 Configure model/provider settings through fast-agent environment variables, fast-agent configuration, or an `acpx` agent override with additional `fast-agent-mcp acp` arguments.
diff --git a/agents/README.md b/agents/README.md
index 5c650b0f..abc2ea8e 100644
--- a/agents/README.md
+++ b/agents/README.md
@@ -26,7 +26,7 @@ Harness-specific docs in this directory:
 - [Claude](Claude.md): built-in `claude -> npx -y @agentclientprotocol/claude-agent-acp`
 - [Copilot](Copilot.md): built-in `copilot -> copilot --acp --stdio`
 - [Droid](Droid.md): built-in `droid -> droid exec --output-format acp` with `factory-droid` and `factorydroid` aliases
-- [FastAgent](FastAgent.md): built-in `fast-agent -> uvx fast-agent-mcp acp`
+- [fast-agent](FastAgent.md): built-in `fast-agent -> uvx fast-agent-mcp acp`
 - [Cursor](Cursor.md): built-in `cursor -> cursor-agent acp`
 - [Gemini](Gemini.md): built-in `gemini -> gemini --acp`
 - [iFlow](Iflow.md): built-in `iflow -> iflow --experimental-acp`
diff --git a/docs/agents.md b/docs/agents.md
index 866af3b1..dcbb4eb3 100644
--- a/docs/agents.md
+++ b/docs/agents.md
@@ -19,7 +19,7 @@ The default agent for top-level commands like `acpx exec …` and `acpx prompt 
 | `cursor`     | `cursor-agent acp`                             | [Cursor CLI](https://cursor.com/docs/cli/acp)                                                                   |
 | `copilot`    | `copilot --acp --stdio`                        | [GitHub Copilot CLI](https://docs.github.com/copilot/how-tos/copilot-chat/use-copilot-chat-in-the-command-line) |
 | `droid`      | `droid exec --output-format acp`               | [Factory Droid](https://www.factory.ai)                                                                         |
-| `fast-agent` | `uvx fast-agent-mcp acp`                       | [EvalState fast-agent](https://github.com/evalstate/fast-agent)                                                 |
+| `fast-agent` | `uvx fast-agent-mcp acp`                       | [fast-agent](https://fast-agent.ai/)                                                                            |
 | `iflow`      | `iflow --experimental-acp`                     | [iFlow CLI](https://github.com/iflow-ai/iflow-cli)                                                              |
 | `kilocode`   | `npx -y @kilocode/cli acp`                     | [Kilocode](https://kilocode.ai)                                                                                 |
 | `kimi`       | `kimi acp`                                     | [Kimi CLI](https://github.com/MoonshotAI/kimi-cli)                                                              |
@@ -124,12 +124,15 @@ If your Cursor install exposes ACP as `agent acp` instead of `cursor-agent acp`,
 - Default command: `droid exec --output-format acp`
 - Upstream: [factory.ai](https://www.factory.ai)
 
-### Fast Agent
+### fast-agent
 
 - Built-in name: `fast-agent`
 - Default command: `uvx fast-agent-mcp acp`
-- Upstream: [EvalState fast-agent](https://github.com/evalstate/fast-agent)
-- Requires `uvx` on `PATH`. Configure fast-agent model/provider settings through environment variables, fast-agent configuration, or an `acpx` agent override with additional `fast-agent-mcp acp` arguments.
+- Upstream: https://fast-agent.ai/acp
+
+`acpx fast-agent` starts fast-agent through its ACP entrypoint. It requires `uvx` on `PATH`.
+
+Configure model/provider settings through fast-agent environment variables, fast-agent configuration, or an `acpx` agent override with additional `fast-agent-mcp acp` arguments.
 
 ### Qoder