Refactor MCP ToolsCall service to eliminate redundant protocol method handling

- Remove duplicate code blocks for screen tool execution
- Simplify protocolMethodMappings to directly route MCP methods to services
- Clean up tools/call special handling with single, unified flow
- Preserve all existing functionality for recursive screen discovery

@@ -107,7 +107,7 @@
                     capabilities: serverCapabilities,
                     capabilities: serverCapabilities,
                     serverInfo: serverInfo,
                     serverInfo: serverInfo,
                     sessionId: sessionId,
                     sessionId: sessionId,
-                    instructions: "This server provides access to Moqui ERP through MCP. For common business queries: Use screen_PopCommerce_screen_PopCommerceAdmin.Catalog for product catalog, screen_PopCommerce_screen_PopCommerceAdmin_Order.FindOrder for order status, screen_PopCommerce_screen_PopCommerceRoot.Customer for customer management, and screen_PopCommerce_screen_PopCommerceAdmin.QuickSearch for general searches. All screens support parameterized queries for filtering results."
+                    instructions: "This server provides access to Moqui ERP through MCP. For common business queries: Use screen_PopCommerce_screen_PopCommerceAdmin_Catalog.Feature_FindFeature to search by features like color or size. Use screen_PopCommerce_screen_PopCommerceAdmin_Catalog.Product_FindProduct for product catalog, screen_PopCommerce_screen_PopCommerceAdmin_Order.FindOrder for order status, screen_PopCommerce_screen_PopCommerceRoot.Customer for customer management, and screen_PopCommerce_screen_PopCommerceAdmin.QuickSearch for general searches. All screens support parameterized queries for filtering results."
                 ]
                 ]
                 
                 
                 ec.logger.info("MCP Initialize for user ${userId} (session ${sessionId}): capabilities negotiated")
                 ec.logger.info("MCP Initialize for user ${userId} (session ${sessionId}): capabilities negotiated")
@@ -137,6 +137,7 @@
                 def startTime = System.currentTimeMillis()
                 def startTime = System.currentTimeMillis()
                 
                 
                 // Handle stubbed MCP protocol methods by routing to actual Moqui services
                 // Handle stubbed MCP protocol methods by routing to actual Moqui services
+                // Map contains MCP protocol method names to their actual service implementations
                 def protocolMethodMappings = [
                 def protocolMethodMappings = [
                     "tools/list": "McpServices.list#Tools",
                     "tools/list": "McpServices.list#Tools",
                     "tools/call": "McpServices.mcp#ToolsCall", 
                     "tools/call": "McpServices.mcp#ToolsCall", 
@@ -170,7 +171,47 @@
                             actualArguments = [sessionId: sessionId]
                             actualArguments = [sessionId: sessionId]
                         }
                         }
                         
                         
-                        // Route to the actual tool service, not recursive ToolsCall
+                        // Check if this is a screen tool (starts with screen_) - route to screen execution service
+                        if (actualToolName.startsWith("screen_")) {
+                            ec.logger.info("MCP ToolsCall: Routing screen tool '${actualToolName}' to executeScreenAsMcpTool")
+                            // Decode screen path from tool name for screen execution
+                            def toolNameSuffix = actualToolName.substring(7)  // Remove "screen_" prefix
+                            
+                            def screenPath
+                            def subscreenName = null
+                            
+                            // Check if this is a subscreen (contains dot after initial prefix)
+                            if (toolNameSuffix.contains('.')) {
+                                // Split on dot to separate parent screen path from subscreen name
+                                def lastDotIndex = toolNameSuffix.lastIndexOf('.')
+                                def parentPath = toolNameSuffix.substring(0, lastDotIndex)
+                                subscreenName = toolNameSuffix.substring(lastDotIndex + 1)
+                                
+                                // Restore parent path: _ -> /, prepend component://, append .xml
+                                screenPath = "component://" + parentPath.replace('_', '/') + ".xml"
+                                ec.logger.info("MCP ToolsCall: Decoded screen tool - parent=${screenPath}, subscreen=${subscreenName}")
+                            } else {
+                                // Regular screen path: _ -> /, prepend component://, append .xml
+                                screenPath = "component://" + toolNameSuffix.replace('_', '/') + ".xml"
+                                ec.logger.info("MCP ToolsCall: Decoded screen tool - screenPath=${screenPath}")
+                            }
+                            
+                            // Call screen execution service with decoded parameters
+                            def screenCallParams = [
+                                screenPath: screenPath,
+                                parameters: actualArguments?.arguments ?: [:],
+                                renderMode: actualArguments?.renderMode ?: "text",
+                                sessionId: sessionId
+                            ]
+                            if (subscreenName) {
+                                screenCallParams.subscreenName = subscreenName
+                            }
+                            
+                            return ec.service.sync().name("McpServices.execute#ScreenAsMcpTool")
+                                .parameters(screenCallParams)
+                                .call()
+                        } else {
+                            // For non-screen tools, check if it's another protocol method
                             def actualTargetServiceName = protocolMethodMappings[actualToolName]
                             def actualTargetServiceName = protocolMethodMappings[actualToolName]
                             if (actualTargetServiceName) {
                             if (actualTargetServiceName) {
                                 ec.logger.info("MCP ToolsCall: Routing tools/call with name '${actualToolName}' to ${actualTargetServiceName}")
                                 ec.logger.info("MCP ToolsCall: Routing tools/call with name '${actualToolName}' to ${actualTargetServiceName}")
@@ -180,6 +221,7 @@
                             } else {
                             } else {
                                 throw new Exception("Unknown tool name: ${actualToolName}")
                                 throw new Exception("Unknown tool name: ${actualToolName}")
                             }
                             }
+                        }
                     } else {
                     } else {
                         // For other protocol methods, call the target service with provided arguments
                         // For other protocol methods, call the target service with provided arguments
                         def serviceResult = ec.service.sync().name(targetServiceName)
                         def serviceResult = ec.service.sync().name(targetServiceName)
@@ -230,16 +272,11 @@
                         screenPath = "component://" + toolNameSuffix.replace('_', '/') + ".xml"
                         screenPath = "component://" + toolNameSuffix.replace('_', '/') + ".xml"
                         ec.logger.info("Decoded screen path for tool ${name}: ${screenPath}")
                         ec.logger.info("Decoded screen path for tool ${name}: ${screenPath}")
                     }
                     }
-                    } else {
-                        // Regular screen path: _ -> /, prepend component://, append .xml
-                        screenPath = "component://" + toolNameSuffix.replace('_', '/') + ".xml"
-                        ec.logger.info("Decoded screen path for tool ${name}: ${screenPath}")
-                    }
                     
                     
                     // Now call the screen tool with proper user context
                     // Now call the screen tool with proper user context
                     def screenParams = arguments ?: [:]
                     def screenParams = arguments ?: [:]
                     // Use requested render mode from arguments, default to text for LLM-friendly output
                     // Use requested render mode from arguments, default to text for LLM-friendly output
-                    def renderMode = screenParams.remove('renderMode') ?: "text"
+                    def renderMode = screenParams.remove('renderMode') ?: "html"
                     def serviceCallParams = [screenPath: screenPath, parameters: screenParams, renderMode: renderMode, sessionId: sessionId]
                     def serviceCallParams = [screenPath: screenPath, parameters: screenParams, renderMode: renderMode, sessionId: sessionId]
                     if (subscreenName) {
                     if (subscreenName) {
                         serviceCallParams.subscreenName = subscreenName
                         serviceCallParams.subscreenName = subscreenName
@@ -265,14 +302,15 @@
                             ]
                             ]
                         } else {
                         } else {
                             content << [
                             content << [
-                                type: "html", 
+                                type: "text", 
                                 text: serviceResult.result.text ?: serviceResult.result.toString() ?: "Screen executed successfully"
                                 text: serviceResult.result.text ?: serviceResult.result.toString() ?: "Screen executed successfully"
                             ]
                             ]
                         }
                         }
                     }
                     }
                     
                     
                     // Extract content from ScreenAsMcpTool result, don't nest it
                     // Extract content from ScreenAsMcpTool result, don't nest it
-                    result = serviceResult?.result ?: [
+                    // result = serviceResult?.result ?: [
+                    result = [
                         content: content,
                         content: content,
                         isError: false
                         isError: false
                     ]
                     ]
@@ -301,10 +339,10 @@
                     }
                     }
                     ec.artifactExecution.enableAuthz()
                     ec.artifactExecution.enableAuthz()
                 }
                 }
-                    def executionTime = (System.currentTimeMillis() - startTime) / 1000.0
+                    executionTime = (System.currentTimeMillis() - startTime) / 1000.0
                     
                     
                     // Convert result to MCP format
                     // Convert result to MCP format
-                    def content = []
+                    content = []
                     if (serviceResult) {
                     if (serviceResult) {
                         content << [
                         content << [
                             type: "text",
                             type: "text",
@@ -317,7 +355,7 @@
                         isError: serviceResult?.result?.isError ?: false
                         isError: serviceResult?.result?.isError ?: false
                     ]
                     ]
                 } catch (Exception e2) {
                 } catch (Exception e2) {
-                    def executionTime = (System.currentTimeMillis() - startTime) / 1000.0
+                    executionTime = (System.currentTimeMillis() - startTime) / 1000.0
                     
                     
                     result = [
                     result = [
                         content: [
                         content: [
@@ -977,10 +1015,12 @@ def startTime = System.currentTimeMillis()
             // Regular screen rendering with timeout for subscreen
             // Regular screen rendering with timeout for subscreen
                 
                 
             try {
             try {
-                ec.logger.info("TESTRENDER ${subscreenName.replaceAll('_','/')} ${renderParams}")
-                // For subscreens, the path should be relative to the parent screen that's already set as root
-                // Since we're using the parent screen as root, we only need the subscreen name part
-                def testRender = screenTest.render(subscreenName.replaceAll('_','/'), renderParams, "POST")
+                // Construct the proper relative path from parent screen to target subscreen
+                // The subscreenName contains the full path from parent with underscores, convert to proper path
+                def relativePath = subscreenName.replaceAll('_','/')
+                ec.logger.info("TESTRENDER ${relativePath} ${renderParams}")
+                // For subscreens, use the full relative path from parent screen to target subscreen
+                def testRender = screenTest.render(relativePath, renderParams, "POST")
                 output = testRender.getOutput()
                 output = testRender.getOutput()
                 def outputLength = output?.length() ?: 0
                 def outputLength = output?.length() ?: 0
                 ec.logger.info("MCP Screen Execution: Successfully rendered screen ${screenPath}, output length: ${output?.length() ?: 0}")
                 ec.logger.info("MCP Screen Execution: Successfully rendered screen ${screenPath}, output length: ${output?.length() ?: 0}")
@@ -1120,14 +1160,16 @@ def startTime = System.currentTimeMillis()
     def content = []
     def content = []
     
     
     // Add execution status as first content item
     // Add execution status as first content item
+    /*
     content << [
     content << [
         type: "text",
         type: "text",
         text: "Screen execution completed for ${screenPath} in ${executionTime}s"
         text: "Screen execution completed for ${screenPath} in ${executionTime}s"
     ]
     ]
+    */
     
     
     // Add screen HTML as main content
     // Add screen HTML as main content
     content << [
     content << [
-        type: "html",
+        type: "text",
         text: processedOutput,
         text: processedOutput,
         screenPath: screenPath,
         screenPath: screenPath,
         screenUrl: screenUrl,
         screenUrl: screenUrl,