pacnpal/Roo-Code
1
0
Fork 0
mirror of https://github.com/pacnpal/Roo-Code.git synced 2025-12-20 04:11:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix auto-approved and duplicate sounds

Browse Source
This commit is contained in:
Justin Quan
2024-12-16 10:41:13 -08:00
parent c66fe25060
commit 05d6c295be
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
webview-ui/src/components/chat/ChatView.tsx
View File

@@ -100,7 +100,6 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
setSecondaryButtonText("Start New Task") setSecondaryButtonText("Start New Task")
break break
case "followup": case "followup":
playSound("notification")
setTextAreaDisabled(isPartial) setTextAreaDisabled(isPartial)
setClineAsk("followup") setClineAsk("followup")
setEnableButtons(isPartial) setEnableButtons(isPartial)
@@ -139,7 +138,7 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
setSecondaryButtonText("Reject") setSecondaryButtonText("Reject")
break break
case "command": case "command":
if (lastMessage.text && !isAutoApproved(lastMessage)) { if (!isAutoApproved(lastMessage)) {
playSound("notification") playSound("notification")
} }
setTextAreaDisabled(isPartial) setTextAreaDisabled(isPartial)
@@ -156,7 +155,7 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
setSecondaryButtonText(undefined) setSecondaryButtonText(undefined)
break break
case "use_mcp_server": case "use_mcp_server":
if (lastMessage.text && !isAutoApproved(lastMessage)) { if (!isAutoApproved(lastMessage)) {
playSound("notification") playSound("notification")
} }
setTextAreaDisabled(isPartial) setTextAreaDisabled(isPartial)
@@ -484,7 +483,10 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
}, [modifiedMessages]) }, [modifiedMessages])
const isReadOnlyToolAction = (message: ClineMessage | undefined) => { const isReadOnlyToolAction = (message: ClineMessage | undefined) => {
if (message?.type === "ask" && message.text) { if (message?.type === "ask") {
if (!message.text) {
return true
}
const tool = JSON.parse(message.text) const tool = JSON.parse(message.text)
return ["readFile", "listFiles", "listFilesTopLevel", "listFilesRecursive", "listCodeDefinitionNames", "searchFiles"].includes(tool.tool) return ["readFile", "listFiles", "listFilesTopLevel", "listFilesRecursive", "listCodeDefinitionNames", "searchFiles"].includes(tool.tool)
} }
@@ -492,7 +494,10 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
} }
const isWriteToolAction = (message: ClineMessage | undefined) => { const isWriteToolAction = (message: ClineMessage | undefined) => {
if (message?.type === "ask" && message.text) { if (message?.type === "ask") {
if (!message.text) {
return true
}
const tool = JSON.parse(message.text) const tool = JSON.parse(message.text)
return ["editedExistingFile", "appliedDiff", "newFileCreated"].includes(tool.tool) return ["editedExistingFile", "appliedDiff", "newFileCreated"].includes(tool.tool)
} }
@@ -500,7 +505,10 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
} }
const isMcpToolAlwaysAllowed = (message: ClineMessage | undefined) => { const isMcpToolAlwaysAllowed = (message: ClineMessage | undefined) => {
if (message?.type === "ask" && message.ask === "use_mcp_server" && message.text) { if (message?.type === "ask" && message.ask === "use_mcp_server") {
if (!message.text) {
return true
}
const mcpServerUse = JSON.parse(message.text) as { type: string; serverName: string; toolName: string } const mcpServerUse = JSON.parse(message.text) as { type: string; serverName: string; toolName: string }
if (mcpServerUse.type === "use_mcp_tool") { if (mcpServerUse.type === "use_mcp_tool") {
const server = mcpServers?.find((s: McpServer) => s.name === mcpServerUse.serverName) const server = mcpServers?.find((s: McpServer) => s.name === mcpServerUse.serverName)
@@ -512,8 +520,11 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
} }
const isAllowedCommand = (message: ClineMessage | undefined) => { const isAllowedCommand = (message: ClineMessage | undefined) => {
if (message?.type === "ask" && message.text) { if (message?.type === "ask") {
const command = message.text const command = message.text
if (!command) {
return true
}
// Split command by chaining operators // Split command by chaining operators
const commands = command.split(/&&|\|\||;|\||\$\(|`/).map(cmd => cmd.trim()) const commands = command.split(/&&|\|\||;|\||\$\(|`/).map(cmd => cmd.trim())
@@ -551,8 +562,12 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
case "mistake_limit_reached": case "mistake_limit_reached":
playSound("progress_loop") playSound("progress_loop")
break break
case "tool":
case "followup": case "followup":
if (!lastMessage.partial) {
playSound("notification")
}
break
case "tool":
case "browser_action_launch": case "browser_action_launch":
case "resume_task": case "resume_task":
case "use_mcp_server": case "use_mcp_server":