diff --git a/commands/gsd/plan-phase.md b/commands/gsd/plan-phase.md
index bd01aa0eb..025976bd1 100644
--- a/commands/gsd/plan-phase.md
+++ b/commands/gsd/plan-phase.md
@@ -293,7 +293,9 @@ Fill prompt with inlined content and spawn:
 {uat_content}
 
 **Codebase Intel (if exists):**
+<codebase-intel>
 {intel_content}
+</codebase-intel>
 
 </planning_context>
 
diff --git a/hooks/gsd-intel-index.js b/hooks/gsd-intel-index.js
index 3256efee9..b9b054afb 100755
--- a/hooks/gsd-intel-index.js
+++ b/hooks/gsd-intel-index.js
@@ -551,7 +551,7 @@ function generateSummary(index, conventions) {
  * Check if a file path is an entity file
  */
 function isEntityFile(filePath) {
-  return filePath.includes('.planning/intel/entities/') &&
+  return filePath.includes(ENTITY_DIR + '/') &&
          filePath.endsWith('.md');
 }