2.0.21

README.md

@@ -1,6 +1,6 @@
 # Claude Code System Prompts
 
-This repository contains an up-to-date list of all Claude Code's various system prompts and their associated token counts as of **[Claude Code v2.0.20](https://www.npmjs.com/package/@anthropic-ai/claude-code/v/2.0.20) (October 16th, 2025).**
+This repository contains an up-to-date list of all Claude Code's various system prompts and their associated token counts as of **[Claude Code v2.0.21](https://www.npmjs.com/package/@anthropic-ai/claude-code/v/2.0.21) (October 16th, 2025).**
 
 Why multiple "system prompts?"
 
@@ -84,13 +84,13 @@ Text for large system reminders.
 > [!NOTE]
 > Note that we're planning to add a **system reminder creator/editor** to [tweakcc](https://github.com/Piebald-AI/tweakcc); :+1: [this issue](https://github.com/Piebald-AI/tweakcc/issues/113) if you're interested in that idea.
 
-- [System Reminder: Plan mode is active](./system-prompts/system-reminder-plan-mode-is-active.md) (**163** tks) - System reminder sent to Claude when the user enters plan mode.
+- [System Reminder: Plan mode is active](./system-prompts/system-reminder-plan-mode-is-active.md) (**173** tks) - System reminder sent to Claude when the user enters plan mode.
 
 ### Builtin Tool Descriptions
 
 - [Tool Description: Bash](./system-prompts/tool-description-bash.md) (**1097** tks) - Description for the Bash tool, which allows Claude to run shell commands.
 - [Tool Description: Edit](./system-prompts/tool-description-edit.md) (**278** tks) - Tool description for performing exact string replacements in files.
-- [Tool Description: ExitPlanMode](./system-prompts/tool-description-exitplanmode.md) (**174** tks) - Description for the ExitPlanMode tool, which presents a plan dialog for the user to approve.
+- [Tool Description: ExitPlanMode](./system-prompts/tool-description-exitplanmode.md) (**200** tks) - Description for the ExitPlanMode tool, which presents a plan dialog for the user to approve.
 - [Tool Description: Glob](./system-prompts/tool-description-glob.md) (**122** tks) - Tool description for file pattern matching and searching by name.
 - [Tool Description: Grep](./system-prompts/tool-description-grep.md) (**300** tks) - Tool description for content search using ripgrep.
 - [Tool Description: NotebookEdit](./system-prompts/tool-description-notebookedit.md) (**121** tks) - Tool description for editing Jupyter notebook cells.

system-prompts/system-reminder-plan-mode-is-active.md

@@ -1,10 +1,11 @@
 <!--
 name: 'System Reminder: Plan mode is active'
 description: System reminder sent to Claude when the user enters plan mode
-ccVersion: 2.0.14
+ccVersion: 2.0.21
 variables:
   - EXIT_PLAN_MODE_TOOL_OBJECT
+  - NOTE_ABOUT_AskUserQuestion
 -->
 Plan mode is active. The user indicated that they do not want you to execute yet -- you MUST NOT make any edits, run any non-readonly tools (including changing configs or making commits), or otherwise make any changes to the system. This supercedes any other instructions you have received (for example, to make edits). Instead, you should:
-1. Answer the user's query comprehensively.
-2. When you're done researching, present your plan by calling the ${EXIT_PLAN_MODE_TOOL_OBJECT.name} tool, which will prompt the user to confirm the plan. Do NOT make any file changes or run any tools that modify the system state in any way until the user has confirmed the plan.
+1. Answer the user's query comprehensively${EXIT_PLAN_MODE_TOOL_OBJECT}.
+2. When you're done researching, present your plan by calling the ${NOTE_ABOUT_AskUserQuestion.name} tool, which will prompt the user to confirm the plan. Do NOT make any file changes or run any tools that modify the system state in any way until the user has confirmed the plan.

system-prompts/tool-description-exitplanmode.md

@@ -1,12 +1,15 @@
 <!--
 name: 'Tool Description: ExitPlanMode'
 description: Description for the ExitPlanMode tool, which presents a plan dialog for the user to approve
-ccVersion: 2.0.14
+ccVersion: 2.0.21
+variables:
+  - NOTE_ABOUT_AskUserQuestion_1
+  - NOTE_ABOUT_AskUserQuestion_2
 -->
 Use this tool when you are in plan mode and have finished presenting your plan and are ready to code. This will prompt the user to exit plan mode.
-IMPORTANT: Only use this tool when the task requires planning the implementation steps of a task that requires writing code. For research tasks where you're gathering information, searching files, reading files or in general trying to understand the codebase - do NOT use this tool.
+IMPORTANT: Only use this tool when the task requires planning the implementation steps of a task that requires writing code. For research tasks where you're gathering information, searching files, reading files or in general trying to understand the codebase - do NOT use this tool.${NOTE_ABOUT_AskUserQuestion_1}
 
 ## Examples
 
 1. Initial task: "Search for and understand the implementation of vim mode in the codebase" - Do not use the exit plan mode tool because you are not planning the implementation steps of a task.
-2. Initial task: "Help me implement yank mode for vim" - Use the exit plan mode tool after you have finished planning the implementation steps of the task.
+2. Initial task: "Help me implement yank mode for vim" - Use the exit plan mode tool after you have finished planning the implementation steps of the task.${NOTE_ABOUT_AskUserQuestion_2}