diff --git a/modules/programs/claude-code.nix b/modules/programs/claude-code.nix
index 6464ea15..11d0ebe4 100644
--- a/modules/programs/claude-code.nix
+++ b/modules/programs/claude-code.nix
@@ -186,6 +186,16 @@ in
       };
     };
 
+    agentsDir = lib.mkOption {
+      type = lib.types.nullOr lib.types.path;
+      default = null;
+      description = ''
+        Path to a directory containing agent files for Claude Code.
+        Agent files from this directory will be symlinked to .claude/agents/.
+      '';
+      example = lib.literalExpression "./agents";
+    };
+
     mcpServers = lib.mkOption {
       type = lib.types.attrsOf jsonFormat.type;
       default = { };
@@ -237,6 +247,10 @@ in
         assertion = !(cfg.memory.text != null && cfg.memory.source != null);
         message = "Cannot specify both `programs.claude-code.memory.text` and `programs.claude-code.memory.source`";
       }
+      {
+        assertion = !(cfg.agents != { } && cfg.agentsDir != null);
+        message = "Cannot specify both `programs.claude-code.agents` and `programs.claude-code.agentsDir`";
+      }
     ];
 
     programs.claude-code.finalPackage =
@@ -281,6 +295,11 @@ in
         ".claude/CLAUDE.md" = lib.mkIf (cfg.memory.text != null || cfg.memory.source != null) (
           if cfg.memory.text != null then { text = cfg.memory.text; } else { source = cfg.memory.source; }
         );
+
+        ".claude/agents" = lib.mkIf (cfg.agentsDir != null) {
+          source = cfg.agentsDir;
+          recursive = true;
+        };
       }
       // lib.mapAttrs' (
         name: content:
diff --git a/tests/modules/programs/claude-code/agents-dir.nix b/tests/modules/programs/claude-code/agents-dir.nix
new file mode 100644
index 00000000..c0c20030
--- /dev/null
+++ b/tests/modules/programs/claude-code/agents-dir.nix
@@ -0,0 +1,14 @@
+{
+  programs.claude-code = {
+    enable = true;
+    agentsDir = ./agents;
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.claude/agents/test-agent.md
+    assertLinkExists home-files/.claude/agents/test-agent.md
+    assertFileContent \
+      home-files/.claude/agents/test-agent.md \
+      ${./agents/test-agent.md}
+  '';
+}
diff --git a/tests/modules/programs/claude-code/agents/test-agent.md b/tests/modules/programs/claude-code/agents/test-agent.md
new file mode 100644
index 00000000..04fc61c6
--- /dev/null
+++ b/tests/modules/programs/claude-code/agents/test-agent.md
@@ -0,0 +1,6 @@
+---
+name: test-agent
+description: Test agent for agentsDir functionality
+---
+
+This is a test agent to verify that agentsDir works correctly.
\ No newline at end of file
diff --git a/tests/modules/programs/claude-code/assertion.nix b/tests/modules/programs/claude-code/assertion.nix
index 5e343e40..6736d394 100644
--- a/tests/modules/programs/claude-code/assertion.nix
+++ b/tests/modules/programs/claude-code/assertion.nix
@@ -20,10 +20,17 @@
       text = "Some text content";
       source = ./expected-memory.md;
     };
+
+    # assert fail: cannot set agents and agentsDir at the same time.
+    agents = {
+      test-agent = "test content";
+    };
+    agentsDir = ./agents;
   };
 
   test.asserts.assertions.expected = [
     "`programs.claude-code.package` cannot be null when `mcpServers` is configured"
     "Cannot specify both `programs.claude-code.memory.text` and `programs.claude-code.memory.source`"
+    "Cannot specify both `programs.claude-code.agents` and `programs.claude-code.agentsDir`"
   ];
 }
diff --git a/tests/modules/programs/claude-code/default.nix b/tests/modules/programs/claude-code/default.nix
index 6ec0ef97..138c3633 100644
--- a/tests/modules/programs/claude-code/default.nix
+++ b/tests/modules/programs/claude-code/default.nix
@@ -5,4 +5,5 @@
   claude-code-assertion = ./assertion.nix;
   claude-code-memory-management = ./memory-management.nix;
   claude-code-memory-from-source = ./memory-from-source.nix;
+  claude-code-agents-dir = ./agents-dir.nix;
 }
diff --git a/tests/modules/programs/claude-code/expected-agents-readme.md b/tests/modules/programs/claude-code/expected-agents-readme.md
new file mode 100644
index 00000000..daa414ff
--- /dev/null
+++ b/tests/modules/programs/claude-code/expected-agents-readme.md
@@ -0,0 +1,8 @@
+# Claude Code Agents
+
+## Current Configuration
+Test implementation of agents directory management.
+
+## Available Agents
+- This is a test configuration
+- AgentsDir should be created at ~/.claude/agents/README.md