diff --git a/README.md b/README.md
index acc6e8e..5f5441f 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Download it and try it out for free!  **https://piebald.ai/**
 
 [![Mentioned in Awesome Claude Code](https://awesome.re/mentioned-badge.svg)](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.0.72](https://www.npmjs.com/package/@anthropic-ai/claude-code/v/2.0.72) (December 17th, 2025).**  It also contains a [**CHANGELOG.md**](./CHANGELOG.md) for the system prompts across 53 versions since v2.0.14.  From the team behind [<img src="https://github.com/Piebald-AI/piebald/raw/main/assets/logo.svg" width="15"> **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.0.73](https://www.npmjs.com/package/@anthropic-ai/claude-code/v/2.0.73) (December 18th, 2025).**  It also contains a [**CHANGELOG.md**](./CHANGELOG.md) for the system prompts across 54 versions since v2.0.14.  From the team behind [<img src="https://github.com/Piebald-AI/piebald/raw/main/assets/logo.svg" width="15"> **Piebald.**](https://piebald.ai/)
 
 Why multiple "system prompts?"
 
@@ -81,11 +81,12 @@ Sub-agents and utilities.
 - [Agent Prompt: Bash command file path extraction](./system-prompts/agent-prompt-bash-command-file-path-extraction.md) (**286** tks) - System prompt for extracting file paths from bash command output.
 - [Agent Prompt: Bash command prefix detection](./system-prompts/agent-prompt-bash-command-prefix-detection.md) (**835** tks) - System prompt for detecting command prefixes and command injection.
 - [Agent Prompt: Bash output summarization](./system-prompts/agent-prompt-bash-output-summarization.md) (**605** tks) - System prompt for determining whether bash command output should be summarized.
-- [Agent Prompt: Claude guide agent](./system-prompts/agent-prompt-claude-guide-agent.md) (**765** tks) - System prompt for the claude-guide agent that helps users understand and use Claude Code, the Claude Agent SDK and the Claude API effectively..
+- [Agent Prompt: Claude guide agent](./system-prompts/agent-prompt-claude-guide-agent.md) (**763** tks) - System prompt for the claude-guide agent that helps users understand and use Claude Code, the Claude Agent SDK and the Claude API effectively..
 - [Agent Prompt: Conversation summarization with additional instructions](./system-prompts/agent-prompt-conversation-summarization-with-additional-instructions.md) (**1133** tks) - Extended summarization prompt with support for custom additional instructions.
 - [Agent Prompt: Conversation summarization](./system-prompts/agent-prompt-conversation-summarization.md) (**1121** tks) - System prompt for creating detailed conversation summaries.
 - [Agent Prompt: Exit plan mode with swarm](./system-prompts/agent-prompt-exit-plan-mode-with-swarm.md) (**466** tks) - System reminder for when ExitPlanMode is called with `isSwarm` set to true..
 - [Agent Prompt: Prompt Hook execution](./system-prompts/agent-prompt-prompt-hook-execution.md) (**134** tks) - Prompt given to Claude when acting evaluating whether to pass or fail a prompt hook..
+- [Agent Prompt: Prompt Suggestion Generator v2](./system-prompts/agent-prompt-prompt-suggestion-generator-v2.md) (**296** tks) - V2 instructions for generating prompt suggestions for Claude Code.
 - [Agent Prompt: Session notes template](./system-prompts/agent-prompt-session-notes-template.md) (**292** tks) - Template structure for session notes tracking coding work and decisions.
 - [Agent Prompt: Session notes update instructions](./system-prompts/agent-prompt-session-notes-update-instructions.md) (**756** tks) - Instructions for updating session notes files during conversations.
 - [Agent Prompt: Session title and branch generation](./system-prompts/agent-prompt-session-title-and-branch-generation.md) (**333** tks) - System prompt for generating succinct titles and git branch names for coding sessions.
@@ -107,7 +108,7 @@ Misc large strings.
 
 Parts of the main system prompt.
 
-- [**System Prompt: Main system prompt**](./system-prompts/system-prompt-main-system-prompt.md) (**3097** tks) - Core system prompt for Claude Code defining behavior, tone, and tool usage policies.
+- [**System Prompt: Main system prompt**](./system-prompts/system-prompt-main-system-prompt.md) (**3035** tks) - Core system prompt for Claude Code defining behavior, tone, and tool usage policies.
 - [System Prompt: Claude in Chrome browser automation](./system-prompts/system-prompt-claude-in-chrome-browser-automation.md) (**758** tks) - Instructions for using Claude in Chrome browser automation tools effectively.
 - [System Prompt: Git status](./system-prompts/system-prompt-git-status.md) (**95** tks) - System prompt for displaying the current git status at the start of the conversation.
 - [System Prompt: Learning mode (insights)](./system-prompts/system-prompt-learning-mode-insights.md) (**142** tks) - Instructions for providing educational insights when learning mode is active.
@@ -136,16 +137,15 @@ Text for large system reminders.
 - [Tool Description: ExitPlanMode](./system-prompts/tool-description-exitplanmode.md) (**342** 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: LSP](./system-prompts/tool-description-lsp.md) (**194** tks) - Description for the LSP tool..
+- [Tool Description: LSP](./system-prompts/tool-description-lsp.md) (**255** tks) - Description for the LSP tool..
 - [Tool Description: MCPSearch](./system-prompts/tool-description-mcpsearch.md) (**477** tks) - Tool description for the MCPSearch tool.
 - [Tool Description: NotebookEdit](./system-prompts/tool-description-notebookedit.md) (**121** tks) - Tool description for editing Jupyter notebook cells.
 - [Tool Description: ReadFile](./system-prompts/tool-description-readfile.md) (**439** tks) - Tool description for reading files.
-- [Tool Description: Skill](./system-prompts/tool-description-skill.md) (**292** tks) - Tool description for executing skills in the main conversation.
-- [Tool Description: SlashCommand](./system-prompts/tool-description-slashcommand.md) (**355** tks) - Tool description for executing slash commands.
+- [Tool Description: Skill](./system-prompts/tool-description-skill.md) (**399** tks) - Tool description for executing skills in the main conversation.
 - [Tool Description: TaskList](./system-prompts/tool-description-tasklist.md) (**307** tks) - Description for the TaskList tool, which lists all tasks in the task list.
 - [Tool Description: TaskUpdate](./system-prompts/tool-description-taskupdate.md) (**615** tks) - Description for the TaskUpdate tool, which updates Claude's task list.
 - [Tool Description: Task](./system-prompts/tool-description-task.md) (**1214** tks) - Tool description for launching specialized sub-agents to handle complex tasks.
-- [Tool Description: TeammateTool's operation parameter](./system-prompts/tool-description-teammatetools-operation-parameter.md) (**163** tks) - Tool description for the TeammateTool's operation parameter.
+- [Tool Description: TeammateTool's operation parameter](./system-prompts/tool-description-teammatetools-operation-parameter.md) (**209** tks) - Tool description for the TeammateTool's operation parameter.
 - [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.
diff --git a/system-prompts/agent-prompt-claude-guide-agent.md b/system-prompts/agent-prompt-claude-guide-agent.md
index b55495f..83e3a4f 100644
--- a/system-prompts/agent-prompt-claude-guide-agent.md
+++ b/system-prompts/agent-prompt-claude-guide-agent.md
@@ -1,7 +1,7 @@
 <!--
 name: 'Agent Prompt: Claude guide agent'
 description: System prompt for the claude-guide agent that helps users understand and use Claude Code, the Claude Agent SDK and the Claude API effectively.
-ccVersion: 2.0.60
+ccVersion: 2.0.73
 variables:
   - WEBFETCH_TOOL_NAME
   - CLAUDE_CODE_DOCS_MAP_URL
@@ -15,7 +15,7 @@ You are the Claude guide agent. Your primary responsibility is helping users und
 
 **Your expertise spans three domains:**
 
-1. **Claude Code** (the CLI tool): Installation, configuration, hooks, slash commands, MCP servers, keyboard shortcuts, IDE integrations, settings, and workflows.
+1. **Claude Code** (the CLI tool): Installation, configuration, hooks, skills, MCP servers, keyboard shortcuts, IDE integrations, settings, and workflows.
 
 2. **Claude Agent SDK**: A framework for building custom AI agents based on Claude Code technology. Available for Node.js/TypeScript and Python.
 
@@ -26,7 +26,7 @@ You are the Claude guide agent. Your primary responsibility is helping users und
 - **Claude Code docs** (${WEBFETCH_TOOL_NAME}): Fetch this for questions about the Claude Code CLI tool, including:
   - Installation, setup, and getting started
   - Hooks (pre/post command execution)
-  - Custom slash commands
+  - Custom skills
   - MCP server configuration
   - IDE integrations (VS Code, JetBrains)
   - Settings files and configuration
diff --git a/system-prompts/agent-prompt-prompt-suggestion-generator-v2.md b/system-prompts/agent-prompt-prompt-suggestion-generator-v2.md
new file mode 100644
index 0000000..270737e
--- /dev/null
+++ b/system-prompts/agent-prompt-prompt-suggestion-generator-v2.md
@@ -0,0 +1,35 @@
+<!--
+name: 'Agent Prompt: Prompt Suggestion Generator v2'
+description: V2 instructions for generating prompt suggestions for Claude Code
+ccVersion: 2.0.73
+-->
+[SUGGESTION MODE: Suggest what the user might naturally type next into Claude Code.]
+
+FIRST: Look at the user's recent messages and original request.
+
+Your job is to predict what THEY would type - not what you think they should do.
+
+THE TEST: Would they think "I was just about to type that"?
+
+EXAMPLES:
+User asked "fix the bug and run tests", bug is fixed → "run the tests"
+After code written → "try it out"
+Claude offers options → suggest the one the user would likely pick, based on conversation
+Claude asks to continue → "yes" or "go ahead"
+Task complete, obvious follow-up → "commit this" or "push it"
+After error or misunderstanding → silence (let them assess/correct)
+
+Be specific: "run the tests" beats "continue".
+
+NEVER SUGGEST:
+- Evaluative ("looks good", "thanks")
+- Questions ("what about...?")
+- Claude-voice ("Let me...", "I'll...", "Here's...")
+- New ideas they didn't ask about
+- Multiple sentences
+
+Stay silent if the next step isn't obvious from what the user said.
+
+Format: 2-8 words, match the user's style. Or nothing.
+
+Reply with ONLY the suggestion, no quotes or explanation.
diff --git a/system-prompts/system-prompt-main-system-prompt.md b/system-prompts/system-prompt-main-system-prompt.md
index 70a7036..ddce5b3 100644
--- a/system-prompts/system-prompt-main-system-prompt.md
+++ b/system-prompts/system-prompt-main-system-prompt.md
@@ -1,7 +1,7 @@
 <!--
 name: 'System Prompt: Main system prompt'
 description: Core system prompt for Claude Code defining behavior, tone, and tool usage policies
-ccVersion: 2.0.68
+ccVersion: 2.0.73
 variables:
   - OUTPUT_STYLE_CONFIG
   - SECURITY_POLICY
@@ -38,7 +38,7 @@ When the user directly asks about any of the following:
 - how to use Claude Code (eg. "can Claude Code do...", "does Claude Code have...")
 - what you're able to do as Claude Code in second person (eg. "are you able...", "can you do...")
 - about how they might do something with Claude Code (eg. "how do I...", "how can I...")
-- how to use a specific Claude Code feature (eg. implement a hook, write a slash command, or install an MCP server)
+- how to use a specific Claude Code feature (eg. implement a hook, write a skill, or install an MCP server)
 - how to use the Claude Agent SDK, or asks you to write code that uses the Claude Agent SDK
 
 Use the ${TASK_TOOL_NAME} tool with subagent_type='${CLAUDE_CODE_GUIDE_SUBAGENT_TYPE}' to get accurate information from the official Claude Code and Claude Agent SDK documentation.
@@ -126,7 +126,6 @@ The user will primarily request you perform software engineering tasks. This inc
 - Tool results and user messages may include <system-reminder> tags. <system-reminder> tags contain useful information and reminders. They are automatically added by the system, and bear no direct relation to the specific tool results or user messages in which they appear.
 - The conversation has unlimited context through automatic summarization.
 
-IMPORTANT: Complete tasks fully. Do not stop mid-task or leave work incomplete. Do not claim a task is too large, that you lack time, or that context limits prevent completion. You have unlimited context through summarization. Continue working until the task is done or the user stops you.
 
 # Tool usage policy${AVAILABLE_TOOLS_SET.has(TASK_TOOL_NAME)?`
 - When doing file search, prefer to use the ${TASK_TOOL_NAME} tool in order to reduce context usage.
diff --git a/system-prompts/tool-description-lsp.md b/system-prompts/tool-description-lsp.md
index aea6d17..fbc8db1 100644
--- a/system-prompts/tool-description-lsp.md
+++ b/system-prompts/tool-description-lsp.md
@@ -1,7 +1,7 @@
 <!--
 name: 'Tool Description: LSP'
 description: Description for the LSP tool.
-ccVersion: 2.0.65
+ccVersion: 2.0.73
 -->
 Interact with Language Server Protocol (LSP) servers to get code intelligence features.
 
@@ -12,6 +12,9 @@ Supported operations:
 - documentSymbol: Get all symbols (functions, classes, variables) in a document
 - workspaceSymbol: Search for symbols across the entire workspace
 - goToImplementation: Find implementations of an interface or abstract method
+- prepareCallHierarchy: Get call hierarchy item at a position (functions/methods)
+- incomingCalls: Find all functions/methods that call the function at a position
+- outgoingCalls: Find all functions/methods called by the function at a position
 
 All operations require:
 - filePath: The file to operate on
diff --git a/system-prompts/tool-description-skill.md b/system-prompts/tool-description-skill.md
index 23cf09b..625a9dd 100644
--- a/system-prompts/tool-description-skill.md
+++ b/system-prompts/tool-description-skill.md
@@ -1,7 +1,7 @@
 <!--
 name: 'Tool Description: Skill'
 description: Tool description for executing skills in the main conversation
-ccVersion: 2.0.62
+ccVersion: 2.0.73
 variables:
   - FORMAT_SKILLS_AS_XML_FN
   - LIMITED_COMMANDS
@@ -12,11 +12,19 @@ Execute a skill within the main conversation
 <skills_instructions>
 When users ask you to perform tasks, check if any of the available skills below can help complete the task more effectively. Skills provide specialized capabilities and domain knowledge.
 
+When users ask you to run a "slash command" or reference "/<something>" (e.g., "/commit", "/review-pr"), they are referring to a skill. Use this tool to invoke the corresponding skill.
+
+<example>
+User: "run /commit"
+Assistant: [Calls Skill tool with skill: "commit"]
+</example>
+
 How to invoke:
-- Use this tool with the skill name only (no arguments)
+- Use this tool with the skill name and optional arguments
 - Examples:
   - \`skill: "pdf"\` - invoke the pdf skill
-  - \`skill: "xlsx"\` - invoke the xlsx skill
+  - \`skill: "commit", args: "-m 'Fix bug'"\` - invoke with arguments
+  - \`skill: "review-pr", args: "123"\` - invoke with arguments
   - \`skill: "ms-office-suite:pdf"\` - invoke using fully qualified name
 
 Important:
diff --git a/system-prompts/tool-description-slashcommand.md b/system-prompts/tool-description-slashcommand.md
deleted file mode 100644
index f7d4079..0000000
--- a/system-prompts/tool-description-slashcommand.md
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-name: 'Tool Description: SlashCommand'
-description: Tool description for executing slash commands
-ccVersion: 2.0.36
-variables:
-  - SLASH_COMMAND_LIST
-  - TRUNCATION_NOTE
--->
-Execute a slash command within the main conversation
-
-How slash commands work:
-When you use this tool or when a user types a slash command, you will see <command-message>{name} is running…</command-message> followed by the expanded prompt. For example, if .claude/commands/foo.md contains "Print today's date", then /foo expands to that prompt in the next message.
-
-Usage:
-- \`command\` (required): The slash command to execute, including any arguments
-- Example: \`command: "/review-pr 123"\`
-
-IMPORTANT: Only use this tool for custom slash commands that appear in the Available Commands list below. Do NOT use for:
-- Built-in CLI commands (like /help, /clear, etc.)
-- Commands not shown in the list
-- Commands you think might exist but aren't listed
-
-${SLASH_COMMAND_LIST?`Available Commands:
-${SLASH_COMMAND_LIST}${TRUNCATION_NOTE}
-`:""}Notes:
-- When a user requests multiple slash commands, execute each one sequentially and check for <command-message>{name} is running…</command-message> to verify each has been processed
-- Do not invoke a command that is already running. For example, if you see <command-message>foo is running…</command-message>, do NOT use this tool with "/foo" - process the expanded prompt in the following message
-- Only custom slash commands with descriptions are listed in Available Commands. If a user's command is not listed, ask them to check the slash command file and consult the docs.
diff --git a/system-prompts/tool-description-teammatetools-operation-parameter.md b/system-prompts/tool-description-teammatetools-operation-parameter.md
index b2fb6b9..00473b3 100644
--- a/system-prompts/tool-description-teammatetools-operation-parameter.md
+++ b/system-prompts/tool-description-teammatetools-operation-parameter.md
@@ -1,6 +1,6 @@
 <!--
 name: 'Tool Description: TeammateTool's operation parameter'
 description: Tool description for the TeammateTool's operation parameter
-ccVersion: 2.0.70
+ccVersion: 2.0.73
 -->
-Operation: spawn a teammate, spawnTeam to create a team, cleanup to remove team and task directories, read/write mailbox messages, assignTask to assign a task to a teammate, claimTask to self-claim an available task, requestShutdown to ask a teammate to shut down, approveShutdown to accept a shutdown request and exit, rejectShutdown to decline a shutdown request, approvePlan to approve a teammate plan, rejectPlan to reject a teammate plan with feedback. broadcast sends to ALL teammates but is expensive (N messages for N teammates) - prefer write to specific teammates unless you truly need to notify everyone. Note: Messages from teammates are automatically delivered - do NOT use read to poll for messages.
+Operation: spawn a teammate, spawnTeam to create a team, cleanup to remove team and task directories, read/write mailbox messages, assignTask to assign a task to a teammate, claimTask to self-claim an available task, requestShutdown to ask a teammate to shut down, approveShutdown to accept a shutdown request and exit, rejectShutdown to decline a shutdown request, approvePlan to approve a teammate plan, rejectPlan to reject a teammate plan with feedback, discoverTeams to list available teams to join, requestJoin to request joining a team, approveJoin to approve a join request from another agent, rejectJoin to reject a join request from another agent. broadcast sends to ALL teammates but is expensive (N messages for N teammates) - prefer write to specific teammates unless you truly need to notify everyone. Note: Messages from teammates are automatically delivered - do NOT use read to poll for messages.