diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/Models/Agent.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/Models/Agent.cs
index adf4d334..3ea59c4f 100644
--- a/src/Infrastructure/BotSharp.Abstraction/Agents/Models/Agent.cs
+++ b/src/Infrastructure/BotSharp.Abstraction/Agents/Models/Agent.cs
@@ -114,6 +114,10 @@ public class Agent
     /// </summary>
     public bool MergeUtility { get; set; }
 
+    /// <summary>When true, the CodeGraph (code-intelligence) standard tools are loaded into
+    /// this agent at load time (see w4c_chatapi.Services.CodeGraphToolsHook).</summary>
+    public bool CodeGraphEnabled { get; set; }
+
     /// <summary>
     /// Agent Utility
     /// </summary>
@@ -184,6 +188,7 @@ public class Agent
             IsPublic = agent.IsPublic,
             Disabled = agent.Disabled,
             MergeUtility = agent.MergeUtility,
+            CodeGraphEnabled = agent.CodeGraphEnabled,
             MaxMessageCount = agent.MaxMessageCount,
             Profiles = agent.Profiles,
             Labels = agent.Labels,