Skip to content

fix(acp): update Claude ACP adapter to @agentclientprotocol scope #447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
theahura merged 2 commits into from
Apr 21, 2026
Merged

fix(acp): update Claude ACP adapter to @agentclientprotocol scope #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
912077e
fix(acp): update Claude ACP adapter to @agentclientprotocol scope
theahura Apr 21, 2026
eebe7e3
Merge remote-tracking branch 'origin/main' into auto/update-acp-adapt…
theahura Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions nori-rs/acp/src/config/types/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@ name = "Claude Code"
slug = "claude-code"

[agents.distribution.npx]
package = "@zed-industries/claude-agent-acp"
package = "@agentclientprotocol/claude-agent-acp"
"#,
)
.unwrap();
Expand All @@ -1033,7 +1033,7 @@ package = "@zed-industries/claude-agent-acp"
assert!(config.agents[0].distribution.npx.is_some());
assert_eq!(
config.agents[0].distribution.npx.as_ref().unwrap().package,
"@zed-industries/claude-agent-acp"
"@agentclientprotocol/claude-agent-acp"
);
}

Expand Down Expand Up @@ -1130,7 +1130,7 @@ name = "Claude Code"
slug = "claude-code"

[agents.distribution.npx]
package = "@zed-industries/claude-agent-acp"
package = "@agentclientprotocol/claude-agent-acp"

[[agents]]
name = "Kimi"
Expand Down Expand Up @@ -1217,15 +1217,15 @@ fn test_agent_distribution_resolve_rejects_multiple() {
fn test_agent_distribution_resolve_npx() {
let dist = AgentDistributionToml {
npx: Some(PackageDistribution {
package: "@zed-industries/claude-agent-acp".to_string(),
package: "@agentclientprotocol/claude-agent-acp".to_string(),
args: vec![],
}),
..Default::default()
};
let resolved = dist.resolve().unwrap();
assert!(matches!(resolved, ResolvedDistribution::Npx { .. }));
if let ResolvedDistribution::Npx { package, args } = resolved {
assert_eq!(package, "@zed-industries/claude-agent-acp");
assert_eq!(package, "@agentclientprotocol/claude-agent-acp");
assert!(args.is_empty());
}
}
Expand Down
9 changes: 4 additions & 5 deletions nori-rs/acp/src/registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ impl AgentKind {
/// Get the ACP adapter package name for launching this agent
pub fn acp_package(&self) -> &'static str {
match self {
// Claude and Codex use Zed's ACP adapters
AgentKind::ClaudeCode => "@zed-industries/claude-agent-acp",
AgentKind::ClaudeCode => "@agentclientprotocol/claude-agent-acp",
// Codex uses Zed's ACP adapter
AgentKind::Codex => "@zed-industries/codex-acp",
// Gemini has native ACP support
AgentKind::Gemini => "@google/gemini-cli",
Expand Down Expand Up @@ -703,7 +703,7 @@ pub fn get_agent_config(agent_name: &str) -> Result<AcpAgentConfig> {
let package_manager = detect_preferred_package_manager();

let (command, args) = match agent {
// Claude and Codex use Zed's ACP adapters
// Claude and Codex use external ACP adapters
AgentKind::ClaudeCode | AgentKind::Codex => (
package_manager.command().to_string(),
vec![agent.acp_package().to_string()],
Expand Down Expand Up @@ -999,11 +999,10 @@ mod tests {
"Command should be npx or bunx, got: {}",
config.command
);
// Uses Zed's ACP adapter
assert!(
config
.args
.contains(&"@zed-industries/claude-agent-acp".to_string())
.contains(&"@agentclientprotocol/claude-agent-acp".to_string())
);
assert_eq!(config.provider_info.name, "Claude Code ACP");
}
Expand Down
Loading