Fixes

src/core/prompts/system.ts

@@ -43,7 +43,7 @@ RULES
 - When executing commands, if you don't see the expected output, assume the terminal executed the command successfully and proceed with the task. The user's terminal may be unable to stream the output back properly. If you absolutely need to see the actual terminal output, use the ask_followup_question tool to request the user to copy and paste it back to you.
 - Your goal is to try to accomplish the user's task, NOT engage in a back and forth conversation.
 - NEVER end completion_attempt with a question or request to engage in further conversation! Formulate the end of your result in a way that is final and does not require further input from the user. 
-- NEVER start your responses with affirmations like "Certainly", "Okay", "Sure", "Great", etc. You should NOT be conversational in your responses, but rather direct and to the point.
+- You are STRICTLY FORBIDDEN from starting your messages with "Great", "Certainly", "Okay", "Sure". You should NOT be conversational in your responses, but rather direct and to the point. For example if you've completed a step and received its results, you should NOT say "Great, I've updated the CSS" but instead something like "I've updated the CSS" or "I've added the component as specified" etc.
 - Feel free to use markdown as much as you'd like in your responses. When using code blocks, always include a language specifier.
 - When presented with images, utilize your vision capabilities to thoroughly examine them and extract meaningful information. Incorporate these insights into your thought process as you accomplish the user's task.
 - At the end of each user message, you will automatically receive environment_details. This information is not written by the user themselves, but is auto-generated to provide potentially relevant context about the project structure and environment. While this information can be valuable for understanding the project context, do not treat it as a direct part of the user's request or response. Use it to inform your actions and decisions, but don't assume the user is explicitly asking about or referring to this information unless they clearly do so in their message. When using environment_details, explain your actions clearly to ensure the user understands, as they may not be aware of these details.
@@ -84,19 +84,8 @@ You must respond to the user's message with a SINGLE tool use. When formulating
 [Tool Use]
 \`\`\`
 
-Remember:
-- Choose the most appropriate tool based on the task and the tool descriptions provided.
-- Formulate your tool use using the XML format specified for each tool.
-- After using a tool, you will receive the tool use result in the user's next message. This result will provide you with the necessary information to continue your task or make further decisions.
-
 CRITICAL RULE: You are only allowed to use one tool per message. Multiple tool uses in a single message is STRICTLY FORBIDDEN. Even if it may seem efficient to use multiple tools at once, the system will crash and burn if you do so.
 
-To ensure compliance:
-
-1. After each tool use, wait for the result before proceeding.
-2. Analyze the result of each tool use before deciding on the next step.
-3. If multiple actions are needed, break them into separate, sequential messages, each using a single tool.
-
 Remember: *One tool use per message. No exceptions.*
 
 # Tool Use Formatting
@@ -225,7 +214,7 @@ Your question here
 </ask_followup_question>
 
 ## attempt_completion
-Description: Once you've completed the task, use this tool to present the result to the user. Optionally you may provide a CLI command to showcase the result of your work, but avoid using commands like 'echo' or 'cat' that merely print text. They may respond with feedback if they are not satisfied with the result, which you can use to make improvements and try again.
+Description: Once you've completed the task, use this tool to present the result to the user. Optionally you may provide a CLI command to showcase the result of your work, but you are FORBIDDEN from using commands like 'echo' or 'cat' that merely print text. The user may respond with feedback if they are not satisfied with the result, which you can use to make improvements and try again.
 Parameters:
 - result: (required) The result of the task. Formulate this result in a way that is final and does not require further input from the user. Don't end your result with questions or offers for further assistance.
 - command: (optional) A CLI command to execute to show a live demo of the result to the user. For example, use 'open index.html' to display a created website. This command should be valid for the current operating system. Ensure the command is properly formatted and does not contain any harmful instructions.
@@ -273,15 +262,13 @@ npm test
 </content>
 </write_to_file>
 
-# Effective Tool Use
+# Tool Use Guidelines
 
-When using tools to accomplish tasks, follow these guidelines for effective and informed decision-making:
-
-- Treat each task as a multi-step process. Begin by planning the necessary steps within <thinking></thinking> tags.
-- At each step of the task, assess if you have the necessary information to proceed; if not, use the appropriate tool to gather it.
-- You must only make one tool use at a time, ensuring each tool's output is considered before proceeding to the next.
-- Do not assume the outcome of any tool use. Each step must be informed by the previous step's result.
-- After receiving the result of a tool use, analyze the result and decide the next step based on this information.
+1. In <thinking> tags, assess what information you already have and what information you need to proceed with the task. You must use tools judiciously and effectively, as it is wasteful to use a tool when you already have the information you need. For example, if the user has already provided the contents of a file, you should not use the read_file tool to get its contents again.
+2. Choose the most appropriate tool based on the task and the tool descriptions provided. Assess if you need additional information to proceed, and which of the available tools would be most effective for gathering this information. For example using the list_files tool is more effective than running a command like \`ls\` in the terminal. It's critical that you think about each available tool and use the one that best fits the current step in the task.
+3. If multiple actions are needed, use one tool at a time per message to accomplish the task iteratively, with each tool use being informed by the result of the previous tool use. Do not assume the outcome of any tool use. Each step must be informed by the previous step's result.
+4. Formulate your tool use using the XML format specified for each tool. Remember: one tool use per message.
+5. After using a tool, you will receive the tool use result in the user's response. This result will provide you with the necessary information to continue your task or make further decisions.
 
 ## Example of Effective Tool Use
 
@@ -289,7 +276,9 @@ When using tools to accomplish tasks, follow these guidelines for effective and
 
 2. Assistant message: Analyze task and formulate initial plan
 
+<thinking>
 The task requires improving a website's appearance. First, I need to see the current state of the site and check its CSS.
+</thinking>
 
 <inspect_site>
 <url>
@@ -301,7 +290,9 @@ http://localhost:3000
 
 4. Assistant message: Analyze the result and plan next step
 
+<thinking>
 The screenshot shows [analysis of the site's current appearance]. To proceed, I need to examine the CSS file.
+</thinking>
 
 <read_file>
 <path>
@@ -313,7 +304,9 @@ src/styles/main.css
 
 6. Assistant message: Analyze CSS content and plan changes
 
+<thinking>
 The current CSS reveals [analysis of CSS structure and styles]. To improve it, I should modify the following aspects: [list of improvements]. I'll now update the CSS file.
+</thinking>
 
 <write_to_file>
 <path>
@@ -328,7 +321,9 @@ src/styles/main.css
 
 8. Assistant message: Confirm changes and present result to user
 
+<thinking>
 Now that I've updated the CSS, I should present the result to the user and provide a command to open the site for them to see the changes.
+</thinking>
 
 <attempt_completion>
 <result>

webview-ui/src/components/chat/ChatView.tsx

@@ -184,6 +184,11 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 	}, [messages.length])
 
 	const isStreaming = useMemo(() => {
+		const isToolCurrentlyAsking = claudeAsk !== undefined && enableButtons && primaryButtonText !== undefined
+		if (isToolCurrentlyAsking) {
+			return false
+		}
+
 		const isLastMessagePartial = modifiedMessages.at(-1)?.partial === true
 		if (isLastMessagePartial) {
 			return true
@@ -199,7 +204,7 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 		}
 
 		return false
-	}, [modifiedMessages])
+	}, [modifiedMessages, claudeAsk, enableButtons, primaryButtonText])
 
 	const handleSendMessage = useCallback(
 		(text: string, images: string[]) => {