diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 073e93651bc3..a9dbf6e4b95e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24996,6 +24996,14 @@
     githubId = 1694705;
     name = "Sam Stites";
   };
+  storopoli = {
+    email = "jose@storopoli.com";
+    github = "storopoli";
+    githubId = 43353831;
+    name = "Jose Storopoli";
+    keys = [ { fingerprint = "B8C0 1A87 C046 33C9 F6CD  0DA2 1BD3 8BE8 D065 3A7A"; } ];
+    matrix = "@jose:storopoli.com";
+  };
   strager = {
     email = "strager.nds@gmail.com";
     github = "strager";
diff --git a/pkgs/by-name/cl/claude-code-acp/package.nix b/pkgs/by-name/cl/claude-code-acp/package.nix
new file mode 100644
index 000000000000..58701b21394f
--- /dev/null
+++ b/pkgs/by-name/cl/claude-code-acp/package.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "claude-code-acp";
+  version = "0.4.5";
+
+  src = fetchFromGitHub {
+    owner = "zed-industries";
+    repo = "claude-code-acp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-kkAQuYP2S5EwIGJV8TLrlYzHOC54vmxEHwwuZD5P1hI=";
+  };
+
+  npmDepsHash = "sha256-IR88NP1AiR6t/MLDdaZY1Np0AE7wfqEUfmnohaf0ymc=";
+
+  meta = {
+    description = "ACP-compatible coding agent powered by the Claude Code SDK";
+    homepage = "https://github.com/zed-industries/claude-code-acp";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ storopoli ];
+    mainProgram = "claude-code-acp";
+  };
+})