diff --git a/codemcp/tools/init_project.py b/codemcp/tools/init_project.py
index c419d6a..5a23884 100644
--- a/codemcp/tools/init_project.py
+++ b/codemcp/tools/init_project.py
@@ -299,7 +299,11 @@ async def init_project(
         if project_prompt:
             combined_prompt += "\n\n" + project_prompt
 
-        return combined_prompt
+        return f"""
+# Chat ID and Git tracking
+This chat has been assigned a chat ID: {chat_id}
+When you use any tool, you MUST always include this chat ID as the chat_id parameter.
+"""
     except Exception as e:
         logging.warning(
             f"Exception suppressed during project initialization: {e!s}", exc_info=True