diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index e96d910..cb70e18 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -4,10 +4,11 @@
 clds (C Lockless Data Structures) is a library implementing high-performance, lock-free data structures for multi-threaded applications. It provides hazard pointer-based memory management for safe concurrent access to shared data structures without traditional locking mechanisms.
 
 ## External Dependencies and Standards
-All code must follow the comprehensive coding standards defined in #file:../deps/c-build-tools/.github/general_coding_instructions.md. For detailed patterns and conventions, refer to dependency-specific instructions:
+All code must follow the comprehensive coding standards defined in #file:../deps/azure-messaging-ai-context/.github/general_coding_instructions.md. For detailed patterns and conventions, refer to dependency-specific instructions:
 
 - **Build Infrastructure**: #file:../deps/c-build-tools/.github/copilot-instructions.md
-- **Utilities & Collections**: #file:../deps/c-util/.github/copilot-instructions.md (THANDLE patterns, async operations, generic programming)
+- **AI Context & Coding Standards**: #file:../deps/azure-messaging-ai-context/.github/copilot-instructions.md (git conventions, terminal rules, agent skills)
+- **Utilities & Collections**: #file:../deps/c-util/.github/copilot-instructions.md(THANDLE patterns, async operations, generic programming)
 - **Platform Abstraction**: #file:../deps/c-pal/.github/copilot-instructions.md (memory management, threading primitives)
 - **Logging Framework**: #file:../deps/c-logging/.github/copilot-instructions.md
 - **Macro Utilities**: #file:../deps/macro-utils-c/.github/copilot-instructions.md
diff --git a/.gitmodules b/.gitmodules
index 0dc6158..2b87975 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -31,3 +31,6 @@
 [submodule "deps/vcpkg"]
 	path = deps/vcpkg
 	url = https://github.com/microsoft/vcpkg.git
+[submodule "deps/azure-messaging-ai-context"]
+	path = deps/azure-messaging-ai-context
+	url = https://github.com/Azure/azure-messaging-ai-context.git
diff --git a/build/devops_gated.yml b/build/devops_gated.yml
index 2a97862..e5a852c 100644
--- a/build/devops_gated.yml
+++ b/build/devops_gated.yml
@@ -7,7 +7,7 @@ resources:
     type: github
     name: azure/c-build-tools
     endpoint: github.com_azure
-    ref: 58f5fd9678eb2a960f53f0b77cb78b505b13f673
+    ref: 4ff459918e6526a0c53417cf69071812f3db83dc
 jobs:
 - template: /pipeline_templates/build_all_flavors.yml@c_build_tools
   parameters:
diff --git a/deps/azure-messaging-ai-context b/deps/azure-messaging-ai-context
new file mode 160000
index 0000000..1cd417e
--- /dev/null
+++ b/deps/azure-messaging-ai-context
@@ -0,0 +1 @@
+Subproject commit 1cd417e108a56bb822aa5d561ce4f5394a453860
diff --git a/deps/c-build-tools b/deps/c-build-tools
index 58f5fd9..4ff4599 160000
--- a/deps/c-build-tools
+++ b/deps/c-build-tools
@@ -1 +1 @@
-Subproject commit 58f5fd9678eb2a960f53f0b77cb78b505b13f673
+Subproject commit 4ff459918e6526a0c53417cf69071812f3db83dc