Merge branch 'upstream-main'

Change-Id: If54609a9f26d3faef80d821b6d80fcd9696a4f62
Signed-off-by: Thomas Kosiewski <tk@coder.com>

Author: ThomasK33

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "agent-client-protocol"
 authors = ["Zed <hi@zed.dev>"]
-version = "0.2.0-alpha.5"
+version = "0.2.0-alpha.8"
 edition = "2024"
 license = "Apache-2.0"
 description = "A protocol for standardizing communication between code editors and AI coding agents"
@@ -58,3 +58,4 @@ futures-util = { version = "0.3", features = ["io"] }
 async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "82d00a04211cf4e1236029aa03e6b6ce2a74c553" }
 env_logger = "0.11"
 rustyline = "17.0.1"
+pretty_assertions = "1.4.1"

Cargo.toml

@@ -10,6 +10,21 @@ The protocol is still under heavy development, and we aim to mature it as we get
 
 Learn more at [agentclientprotocol.com](https://agentclientprotocol.com/).
 
+## Integrations
+
+### Editors
+
+- [Zed](https://zed.dev/docs/ai/external-agents)
+- [neovim](https://neovim.io) through the [CodeCompanion](https://github.com/olimorris/codecompanion.nvim) plugin
+- [yetone/avante.nvim](https://github.com/yetone/avante.nvim): A Neovim plugin designed to emulate the behaviour of the Cursor AI IDE.
+
+### Agents
+
+- [Gemini](https://github.com/google-gemini/gemini-cli)
+- [Claude Code](https://docs.anthropic.com/en/docs/claude-code/overview)
+  - [via Zed's SDK adapter](https://github.com/zed-industries/claude-code-acp)
+  - [via Xuanwo's SDK adapter](https://github.com/Xuanwo/acp-claude-code)
+
 ## Libraries and Schema
 
 - **Rust**: [`agent-client-protocol`](https://crates.io/crates/agent-client-protocol) - See [example_agent.rs](./rust/example_agent.rs) and [example_client.rs](./rust/example_client.rs)

README.md

@@ -28,13 +28,3 @@ ACP assumes that the user is primarily in their editor, and wants to reach out a
 Agents run as sub-processes of the code editor, and communicate using JSON-RPC over stdio. The protocol re-uses the JSON representations used in MCP where possible, but includes custom types for useful agentic coding UX elements, like displaying diffs.
 
 The default format for user-readable text is Markdown, which allows enough flexibility to represent rich formatting without requiring that the code editor is capable of rendering HTML.
-
-## Supported Editors
-
-- [Zed](https://zed.dev/docs/ai/external-agents)
-- [neovim](https://neovim.io) through the [CodeCompanion](https://github.com/olimorris/codecompanion.nvim) plugin
-
-## Supported Agents
-
-- [Gemini](https://github.com/google-gemini/gemini-cli)
-- ... more coming soon ;)

docs/overview/introduction.mdx

@@ -141,6 +141,19 @@ Optionally, they **MAY** support richer types of [content](./content) by specify
   The prompt may include `ContentBlock::Resource`
 </ResponseField>
 
+#### MCP capabilities
+
+<ResponseField name="http" type="boolean" post={["default: false"]}>
+  The Agent supports connecting to MCP servers over HTTP.
+</ResponseField>
+
+<ResponseField name="sse" type="boolean" post={["default: false"]}>
+  The Agent supports connecting to MCP servers over SSE.
+
+Note: This transport has been deprecated by the MCP spec.
+
+</ResponseField>
+
 ---
 
 Once the connection is initialized, you're ready to [create a session](./session-setup) and begin the conversation with the Agent.