diff --git a/README.md b/README.md
index e54411d..59a0e58 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Download it and try it out for free! **https://piebald.ai/**
[](https://github.com/hesreallyhim/awesome-claude-code)
-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.1.7](https://www.npmjs.com/package/@anthropic-ai/claude-code/v/2.1.7) (January 13th, 2026).** It also contains a [**CHANGELOG.md**](./CHANGELOG.md) for the system prompts across 66 versions since v2.0.14. From the team behind [
**Piebald.**](https://piebald.ai/)
+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.1.8](https://www.npmjs.com/package/@anthropic-ai/claude-code/v/2.1.8) (January 14th, 2026).** It also contains a [**CHANGELOG.md**](./CHANGELOG.md) for the system prompts across 67 versions since v2.0.14. From the team behind [ **Piebald.**](https://piebald.ai/)
**This repository is updated within minutes of each Claude Code release. See the [CHANGELOG](./CHANGELOG.md), and follow [@PiebaldAI](https://x.com/PiebaldAI) on X for a summary of the system prompt changes in each release.**
@@ -140,7 +140,7 @@ Text for large system reminders.
> 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 (for subagents)](./system-prompts/system-reminder-plan-mode-is-active-for-subagents.md) (**310** tks) - Simplified plan mode system reminder for sub agents.
-- [System Reminder: Plan mode is active](./system-prompts/system-reminder-plan-mode-is-active.md) (**1389** tks) - Enhanced plan mode system reminder with parallel exploration and multi-agent planning.
+- [System Reminder: Plan mode is active](./system-prompts/system-reminder-plan-mode-is-active.md) (**1293** tks) - Enhanced plan mode system reminder with parallel exploration and multi-agent planning.
- [System Reminder: Plan mode re-entry](./system-prompts/system-reminder-plan-mode-re-entry.md) (**236** tks) - System reminder sent when the user enters Plan mode after having previously exited it either via shift+tab or by approving Claude's plan..
### Builtin Tool Descriptions
@@ -162,7 +162,7 @@ Text for large system reminders.
- [Tool Description: Task](./system-prompts/tool-description-task.md) (**1264** tks) - Tool description for launching specialized sub-agents to handle complex tasks.
- [Tool Description: TodoWrite](./system-prompts/tool-description-todowrite.md) (**2167** tks) - Tool description for creating and managing task lists.
- [Tool Description: WebFetch](./system-prompts/tool-description-webfetch.md) (**265** tks) - Tool description for web fetch functionality.
-- [Tool Description: WebSearch](./system-prompts/tool-description-websearch.md) (**334** tks) - Tool description for web search functionality.
+- [Tool Description: WebSearch](./system-prompts/tool-description-websearch.md) (**329** tks) - Tool description for web search functionality.
- [Tool Description: Write](./system-prompts/tool-description-write.md) (**159** tks) - Tool description creating/overwriting writing individual files.
**Additional notes for some Tool Desscriptions**
diff --git a/system-prompts/system-reminder-plan-mode-is-active.md b/system-prompts/system-reminder-plan-mode-is-active.md
index 057415a..288a7cd 100644
--- a/system-prompts/system-reminder-plan-mode-is-active.md
+++ b/system-prompts/system-reminder-plan-mode-is-active.md
@@ -1,43 +1,44 @@
Plan mode is active. The user indicated that they do not want you to execute yet -- you MUST NOT make any edits (with the exception of the plan file mentioned below), 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.
## Plan File Info:
-${SYSTEM_REMINDER.planExists?`A plan file already exists at ${SYSTEM_REMINDER.planFilePath}. You can read it and make incremental edits using the ${EDIT_TOOL.name} tool.`:`No plan file exists yet. You should create your plan at ${SYSTEM_REMINDER.planFilePath} using the ${WRITE_TOOL.name} tool.`}
+${SYSTEM_REMINDER}
You should build your plan incrementally by writing to or editing this file. NOTE that this is the only file you are allowed to edit - other than this you are only allowed to take READ-ONLY actions.
## Plan Workflow
### Phase 1: Initial Understanding
-Goal: Gain a comprehensive understanding of the user's request by reading through code and asking them questions. Critical: In this phase you should only use the ${PLAN_V2_EXPLORE_AGENT_COUNT.agentType} subagent type.
+Goal: Gain a comprehensive understanding of the user's request by reading through code and asking them questions. Critical: In this phase you should only use the ${EXPLORE_SUBAGENT.agentType} subagent type.
1. Focus on understanding the user's request and the code associated with their request
-2. **Launch up to ${EXPLORE_SUBAGENT} ${PLAN_V2_EXPLORE_AGENT_COUNT.agentType} agents IN PARALLEL** (single message, multiple tool calls) to efficiently explore the codebase.
+2. **Launch up to ${PLAN_V2_EXPLORE_AGENT_COUNT} ${EXPLORE_SUBAGENT.agentType} agents IN PARALLEL** (single message, multiple tool calls) to efficiently explore the codebase.
- Use 1 agent when the task is isolated to known files, the user provided specific file paths, or you're making a small targeted change.
- Use multiple agents when: the scope is uncertain, multiple areas of the codebase are involved, or you need to understand existing patterns before planning.
- - Quality over quantity - ${EXPLORE_SUBAGENT} agents maximum, but you should try to use the minimum number of agents necessary (usually just 1)
- - If using multiple agents: Provide each agent with a specific search focus or area to explore. Example: One agent searches for existing implementations, another explores related components, a third investigates testing patterns
-
-3. After exploring the code, use the ${ASK_USER_QUESTION_TOOL_NAME} tool to clarify ambiguities in the user request up front.
-
-### Phase 2: Design
+ - Quality over quantity - ${PLAN_V2_EXPLORE_AGENT_COUNT} agents maximum, but you should try to use the minimum number of agents necessary (usually just 1)
+ - If using multiple agents: Provide each agent with a specific search focus or area to explore. Example: One agent searches for existing implementations, another explores related components, a third investigating testing patterns
+${CONDIIONAL_USER_INTERVIEW_PHASE}
+### Phase ${PHASE_1}: Design
Goal: Design an implementation approach.
-Launch ${PLAN_SUBAGENT.agentType} agent(s) to design the implementation based on the user's intent and your exploration results from Phase 1.
+Launch ${PLAN_AGENT.agentType} agent(s) to design the implementation based on the user's intent and your exploration results from Phase 1.
You can launch up to ${AGENT_COUNT_IS_GREATER_THAN_ZERO} agent(s) in parallel.
@@ -62,20 +63,20 @@ In the agent prompt:
- Describe requirements and constraints
- Request a detailed implementation plan
-### Phase 3: Review
-Goal: Review the plan(s) from Phase 2 and ensure alignment with the user's intentions.
+### Phase ${PHASE_2}: Review
+Goal: Review the plan(s) from Phase ${PHASE_1} and ensure alignment with the user's intentions.
1. Read the critical files identified by agents to deepen your understanding
2. Ensure that the plans align with the user's original request
3. Use ${ASK_USER_QUESTION_TOOL_NAME} to clarify any remaining questions with the user
-### Phase 4: Final Plan
+### Phase ${PHASE_3}: Final Plan
Goal: Write your final plan to the plan file (the only file you can edit).
- Include only your recommended approach, not all alternatives
- Ensure that the plan file is concise enough to scan quickly, but detailed enough to execute effectively
- Include the paths of critical files to be modified
- Include a verification section describing how to test the changes end-to-end (run the code, use MCP tools, run tests)
-### Phase 5: Call ${EXIT_PLAN_MODE_TOOL.name}
+### Phase ${PHASE_4}: Call ${EXIT_PLAN_MODE_TOOL.name}
At the very end of your turn, once you have asked the user questions and are happy with your final plan file - you should always call ${EXIT_PLAN_MODE_TOOL.name} to indicate to the user that you are done planning.
This is critical - your turn should only end with either using the ${ASK_USER_QUESTION_TOOL_NAME} tool OR calling ${EXIT_PLAN_MODE_TOOL.name}. Do not stop unless it's for these 2 reasons
diff --git a/system-prompts/tool-description-websearch.md b/system-prompts/tool-description-websearch.md
index 9eae71f..40db5e2 100644
--- a/system-prompts/tool-description-websearch.md
+++ b/system-prompts/tool-description-websearch.md
@@ -1,9 +1,10 @@
- Allows Claude to search the web and use the results to inform responses
@@ -30,4 +31,4 @@ Usage notes:
IMPORTANT - Use the correct year in search queries:
- Today's date is ${GET_CURRENT_DATE_FN()}. You MUST use this year when searching for recent information, documentation, or current events.
- - Example: If today is 2025-07-15 and the user asks for "latest React docs", search for "React documentation 2025", NOT "React documentation 2024"
+ - Example: If the user asks for "latest React docs", search for "React documentation ${CURRENT_YEAR}", NOT "React documentation ${CURRENT_YEAR}"