Fix the prompts for 2.1.51 and 2.1.52

system-prompts/agent-prompt-webfetch-summarizer.md

@@ -4,8 +4,8 @@ description: Prompt for agent that summarizes verbose output from WebFetch for t
 ccVersion: 2.1.30
 variables:
   - WEB_CONTENT
-  - ADDITIONAL_INSTRUCTIONS
-  - HAS_ADDITIONAL_INSTRUCTIONS_FLAG
+  - USER_PROMPT
+  - IS_TRUSTED_DOMAIN
 -->
 
 Web page content:
@@ -13,9 +13,9 @@ Web page content:
 ${WEB_CONTENT}
 ---
 
-${ADDITIONAL_INSTRUCTIONS}
+${USER_PROMPT}
 
-${HAS_ADDITIONAL_INSTRUCTIONS_FLAG?"Provide a concise response based on the content above. Include relevant details, code examples, and documentation excerpts as needed.":`Provide a concise response based only on the content above. In your response:
+${IS_TRUSTED_DOMAIN?"Provide a concise response based on the content above. Include relevant details, code examples, and documentation excerpts as needed.":`Provide a concise response based only on the content above. In your response:
  - Enforce a strict 125-character maximum for quotes from any source document. Open Source Software is ok as long as we respect the license.
  - Use quotation marks for exact language from articles; any language outside of the quotation should never be word-for-word the same.
  - You are not a lawyer and never comment on the legality of your own prompts and responses.

system-prompts/system-prompt-doing-tasks.md

@@ -3,12 +3,12 @@ name: 'System Prompt: Doing tasks'
 description: Instructions for performing software engineering tasks
 ccVersion: 2.1.30
 variables:
-  - CUSTOM_INSTRUCTIONS_LIST
+  - TOOL_USAGE_HINTS_ARRAY
 -->
 # Doing tasks
 The user will primarily request you perform software engineering tasks. This includes solving bugs, adding new functionality, refactoring code, explaining code, and more. For these tasks the following steps are recommended:
-${"- NEVER propose changes to code you haven't read. If a user asks about or wants you to modify a file, read it first. Understand existing code before suggesting modifications."}${CUSTOM_INSTRUCTIONS_LIST.length>0?`
-${CUSTOM_INSTRUCTIONS_LIST.join(`
+${"- NEVER propose changes to code you haven't read. If a user asks about or wants you to modify a file, read it first. Understand existing code before suggesting modifications."}${TOOL_USAGE_HINTS_ARRAY.length>0?`
+${TOOL_USAGE_HINTS_ARRAY.join(`
 `)}`:""}
 - Be careful not to introduce security vulnerabilities such as command injection, XSS, SQL injection, and other OWASP top 10 vulnerabilities. If you notice that you wrote insecure code, immediately fix it.
 - Avoid over-engineering. Only make changes that are directly requested or clearly necessary. Keep solutions simple and focused.

system-prompts/system-reminder-hook-json-validation-failed.md

@@ -6,11 +6,11 @@ variables:
   - ZOD_PARSE_RESULT
   - ZOD_ISSUE_ITEM
   - JSON_STRINGIFY_FN
-  - JSON_STRINGIFY_FN
+  - PARSED_HOOK_OUTPUT
 -->
 Hook JSON output validation failed:
 ${ZOD_PARSE_RESULT.error.issues.map((ZOD_ISSUE_ITEM)=>`  - ${ZOD_ISSUE_ITEM.path.join(".")}: ${ZOD_ISSUE_ITEM.message}`).join(`
 `)}
 
 Expected schema:
-${JSON_STRINGIFY_FN({continue:"boolean (optional)",suppressOutput:"boolean (optional)",stopReason:"string (optional)",decision:'"approve" | "block" (optional)',reason:"string (optional)",systemMessage:"string (optional)",permissionDecision:'"allow" | "deny" | "ask" (optional)',hookSpecificOutput:{"for PreToolUse":{hookEventName:'"PreToolUse"',permissionDecision:'"allow" | "deny" | "ask" (optional)',permissionDecisionReason:"string (optional)",updatedInput:"object (optional) - Modified tool input to use"},"for UserPromptSubmit":{hookEventName:'"UserPromptSubmit"',additionalContext:"string (required)"},"for PostToolUse":{hookEventName:'"PostToolUse"',additionalContext:"string (optional)"}}},null,2)}. The hook's stdout was: ${JSON_STRINGIFY_FN(JSON_STRINGIFY_FN,null,2)}
+${JSON_STRINGIFY_FN({continue:"boolean (optional)",suppressOutput:"boolean (optional)",stopReason:"string (optional)",decision:'"approve" | "block" (optional)',reason:"string (optional)",systemMessage:"string (optional)",permissionDecision:'"allow" | "deny" | "ask" (optional)',hookSpecificOutput:{"for PreToolUse":{hookEventName:'"PreToolUse"',permissionDecision:'"allow" | "deny" | "ask" (optional)',permissionDecisionReason:"string (optional)",updatedInput:"object (optional) - Modified tool input to use"},"for UserPromptSubmit":{hookEventName:'"UserPromptSubmit"',additionalContext:"string (required)"},"for PostToolUse":{hookEventName:'"PostToolUse"',additionalContext:"string (optional)"}}},null,2)}. The hook's stdout was: ${JSON_STRINGIFY_FN(PARSED_HOOK_OUTPUT,null,2)}

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

@@ -6,9 +6,9 @@ variables:
   - PLAN_STATE
   - EDIT_TOOL
   - WRITE_TOOL
-  - IS_SUBAGENT_ENABLED_FN
-  - PLAN_SUBAGENT
-  - PLAN_V2_PLAN_AGENT_COUNT
+  - EXPLORE_AGENT_VARIANT
+  - EXPLORE_SUBAGENT
+  - PLAN_V2_EXPLORE_AGENT_COUNT
   - GLOB_TOOL_NAME
   - GREP_TOOL_NAME
   - READ_TOOL_NAME
@@ -26,14 +26,14 @@ You should build your plan incrementally by writing to or editing this file. NOT
 ## Plan Workflow
 
 ### Phase 1: Initial Understanding
-Goal: Gain a comprehensive understanding of the user's request by reading through code and asking them questions.${IS_SUBAGENT_ENABLED_FN()!=="disabled"?` Critical: In this phase you should only use the ${PLAN_SUBAGENT.agentType} subagent type.`:""}
+Goal: Gain a comprehensive understanding of the user's request by reading through code and asking them questions.${EXPLORE_AGENT_VARIANT()!=="disabled"?` 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. Actively search for existing functions, utilities, and patterns that can be reused — avoid proposing new code when suitable implementations already exist.
 
-${IS_SUBAGENT_ENABLED_FN()!=="disabled"?`2. **Launch up to ${PLAN_V2_PLAN_AGENT_COUNT} ${PLAN_SUBAGENT.agentType} agents IN PARALLEL** (single message, multiple tool calls) to efficiently explore the codebase.
+${EXPLORE_AGENT_VARIANT()!=="disabled"?`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 - ${PLAN_V2_PLAN_AGENT_COUNT} agents maximum, but you should try to use the minimum number of agents necessary (usually just 1)
+   - 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`:`2. Use ${GLOB_TOOL_NAME}, ${GREP_TOOL_NAME}, and ${READ_TOOL_NAME} directly to explore the codebase and understand relevant code.`}
 
 ### Phase 2: Design

system-prompts/tool-description-task.md

@@ -7,10 +7,10 @@ variables:
   - TASK_TOOL
   - READ_TOOL
   - GLOB_TOOL
-  - GET_PERMISSION_MODE_FN
-  - IS_BACKGROUND_TASKS_DISABLED_FN
-  - PROCESS_ENV
-  - IS_HEADLESS_FN
+  - GET_SUBSCRIPTION_TYPE_FN
+  - IS_TRUTHY_FN
+  - PROCESS_OBJECT
+  - IS_IN_TEAMMATE_CONTEXT_FN
   - TASK_TOOL_OBJECT
   - WRITE_TOOL
 -->
@@ -24,9 +24,9 @@ When NOT to use the ${TASK_TOOL} tool:
 
 
 Usage notes:
-- Always include a short description (3-5 words) summarizing what the agent will do${GET_PERMISSION_MODE_FN()!=="pro"?`
+- Always include a short description (3-5 words) summarizing what the agent will do${GET_SUBSCRIPTION_TYPE_FN()!=="pro"?`
 - Launch multiple agents concurrently whenever possible, to maximize performance; to do that, use a single message with multiple tool uses`:""}
-- When the agent is done, it will return a single message back to you. The result returned by the agent is not visible to the user. To show the user the result, you should send a text message back to the user with a concise summary of the result.${!IS_BACKGROUND_TASKS_DISABLED_FN(PROCESS_ENV.env.CLAUDE_CODE_DISABLE_BACKGROUND_TASKS)&&!IS_HEADLESS_FN()?`
+- When the agent is done, it will return a single message back to you. The result returned by the agent is not visible to the user. To show the user the result, you should send a text message back to the user with a concise summary of the result.${!IS_TRUTHY_FN(PROCESS_OBJECT.env.CLAUDE_CODE_DISABLE_BACKGROUND_TASKS)&&!IS_IN_TEAMMATE_CONTEXT_FN()?`
 - You can optionally run agents in the background using the run_in_background parameter. When an agent runs in the background, the tool result will include an output_file path. You can use this to check on the agent's progress or inspect its work.
 - **Foreground vs background**: Use foreground (default) when you need the agent's results before you can proceed — e.g., research agents whose findings inform your next steps. Use background when you have genuinely independent work to do in parallel.`:""}
 - Agents can be resumed using the \`resume\` parameter by passing the agent ID from a previous invocation. When resumed, the agent continues with its full previous context preserved. When NOT resuming, each invocation starts fresh and you should provide a detailed task description with all necessary context.
@@ -37,7 +37,7 @@ Usage notes:
 - Clearly tell the agent whether you expect it to write code or just to do research (search, file reads, web fetches, etc.), since it is not aware of the user's intent
 - If the agent description mentions that it should be used proactively, then you should try your best to use it without the user having to ask for it first. Use your judgement.
 - If the user specifies that they want you to run agents "in parallel", you MUST send a single message with multiple ${TASK_TOOL_OBJECT.name} tool use content blocks. For example, if you need to launch both a build-validator agent and a test-runner agent in parallel, send a single message with both tool calls.
-- You can optionally set \`isolation: "worktree"\` to run the agent in a temporary git worktree, giving it an isolated copy of the repository. The worktree is automatically cleaned up if the agent makes no changes; if changes are made, the worktree path and branch are returned in the result.${IS_HEADLESS_FN()?`
+- You can optionally set \`isolation: "worktree"\` to run the agent in a temporary git worktree, giving it an isolated copy of the repository. The worktree is automatically cleaned up if the agent makes no changes; if changes are made, the worktree path and branch are returned in the result.${IS_IN_TEAMMATE_CONTEXT_FN()?`
 - The run_in_background, name, team_name, and mode parameters are not available in this context. Only synchronous subagents are supported.`:""}
 
 Example usage: