fix(mcp): resolve resource auto-approval issues

- Fix state persistence for MCP resource auto-approve checkbox
- Refactor ChatRow to use live state from mcpServers instead of temporary objects
- Fix auto-approval logic in ChatView to check alwaysAllow before pattern matching
- Add proper type imports for McpResource and McpResourceTemplate
- Ensure resource auto-approval works exactly like tool auto-approval

Addresses review feedback from PR #5709

Author: MuriloFP

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

@@ -6,6 +6,7 @@ import deepEqual from "fast-deep-equal"
 import { VSCodeBadge, VSCodeButton } from "@vscode/webview-ui-toolkit/react"
 
 import type { ClineMessage } from "@roo-code/types"
+import type { McpResource, McpResourceTemplate } from "../../../../src/shared/mcp"
 
 import { ClineApiReqInfo, ClineAskUseMcpServer, ClineSayTool } from "@roo/ExtensionMessage"
 import { COMMAND_OUTPUT_STRING } from "@roo/combineCommandSequences"
@@ -14,7 +15,6 @@ import { FollowUpData, SuggestionItem } from "@roo-code/types"
 
 import { useCopyToClipboard } from "@src/utils/clipboard"
 import { useExtensionState } from "@src/context/ExtensionStateContext"
-import { findMatchingResourceOrTemplate } from "@src/utils/mcp"
 import { vscode } from "@src/utils/vscode"
 import { removeLeadingNonAlphanumeric } from "@src/utils/removeLeadingNonAlphanumeric"
 import { getLanguageFromPath } from "@src/utils/getLanguageFromPath"
@@ -1233,26 +1233,68 @@ export const ChatRowContent = ({
 								{title}
 							</div>
 							<div className="w-full bg-vscode-editor-background border border-vscode-border rounded-xs p-2 mt-2">
-								{useMcpServer.type === "access_mcp_resource" && (
-									<McpResourceRow
-										item={{
-											// Use the matched resource/template details, with fallbacks
-											...(findMatchingResourceOrTemplate(
-												useMcpServer.uri || "",
-												server?.resources,
-												server?.resourceTemplates,
-											) || {
-												name: "",
-												mimeType: "",
-												description: "",
-											}),
-											// Always use the actual URI from the request
-											uri: useMcpServer.uri || "",
-										}}
-										serverName={useMcpServer.serverName}
-										alwaysAllowMcp={alwaysAllowMcp}
-									/>
-								)}
+								{useMcpServer.type === "access_mcp_resource" &&
+									(() => {
+										// Find the exact resource match first
+										const exactResource = server?.resources?.find(
+											(r: McpResource) => r.uri === useMcpServer.uri,
+										)
+										if (exactResource) {
+											return (
+												<McpResourceRow
+													item={exactResource}
+													serverName={useMcpServer.serverName}
+													serverSource={server?.source || "global"}
+													alwaysAllowMcp={alwaysAllowMcp}
+												/>
+											)
+										}
+
+										// If no exact match, check templates
+										const matchedTemplate = server?.resourceTemplates?.find(
+											(template: McpResourceTemplate) => {
+												try {
+													const pattern = template.uriTemplate
+														.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
+														.replace(/\\\{[^}]+\\\}/g, "[^/]+")
+													const regex = new RegExp(`^${pattern}$`)
+													return regex.test(useMcpServer.uri || "")
+												} catch {
+													return false
+												}
+											},
+										)
+
+										if (matchedTemplate) {
+											return (
+												<McpResourceRow
+													item={{
+														...matchedTemplate,
+														uri: useMcpServer.uri || "",
+													}}
+													serverName={useMcpServer.serverName}
+													serverSource={server?.source || "global"}
+													alwaysAllowMcp={alwaysAllowMcp}
+												/>
+											)
+										}
+
+										// Fallback if no match found
+										return (
+											<McpResourceRow
+												item={{
+													uri: useMcpServer.uri || "",
+													name: "",
+													mimeType: "",
+													description: "",
+													alwaysAllow: false,
+												}}
+												serverName={useMcpServer.serverName}
+												serverSource={server?.source || "global"}
+												alwaysAllowMcp={alwaysAllowMcp}
+											/>
+										)
+									})()}
 								{useMcpServer.type === "use_mcp_tool" && (
 									<McpExecution
 										executionId={message.ts.toString()}

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

@@ -1004,20 +1004,26 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 
 				if (mcpServerUse.type === "access_mcp_resource") {
 					const server = mcpServers?.find((s: McpServer) => s.name === mcpServerUse.serverName)
-					const resource = server?.resources?.find((r: McpResource) => r.uri === mcpServerUse.uri)
 
+					// First check exact resource match
+					const resource = server?.resources?.find((r: McpResource) => r.uri === mcpServerUse.uri)
 					if (resource?.alwaysAllow) {
 						return true
 					}
 
-					// Check resource templates
+					// Then check resource templates
 					if (server?.resourceTemplates && mcpServerUse.uri) {
 						// Validate URI format first
 						if (!isValidUriFormat(mcpServerUse.uri)) {
 							return false
 						}
 
 						for (const template of server.resourceTemplates) {
+							// Check if template has alwaysAllow set
+							if (!template.alwaysAllow) {
+								continue
+							}
+
 							try {
 								// Convert template pattern to regex with more restrictive matching
 								const pattern = template.uriTemplate
@@ -1035,7 +1041,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 									return false
 								}
 
-								if (matches && template.alwaysAllow) {
+								if (matches) {
 									return true
 								}
 							} catch (error) {