Fix action execution - resolve screen path and traverse default subscreens

Critical fixes:
- Set resolvedScreenDef after successful literal path resolution (was falling back to webroot)
- Traverse default subscreens when looking up transitions (matching action discovery logic)
- Build full path including subscreens for framework transition execution

New features:
- moqui_batch_operations tool for multi-step workflows
- Enhanced validation error handling with field-level details
- ARIA mode now includes value, ref, description, describedby attributes

Documentation:
- Added render modes table and examples to AGENTS.md
- Updated README with MARIA format explanation
- Added MCP_SERVICE_DOCS wiki space with service parameter docs

-# Moqui MCP: AI in the Corporate Cockpit
+# Moqui MCP: AI Agents in the Enterprise
 
 
-**⚠️ WARNING: THIS DOG MAY EAT YOUR HOMEWORK! ⚠️**
+**Give AI agents real jobs in real business systems.**
 
 
-This system can give AI agents god-mode access to an entire ERP system - that's not a feature, it's a loaded weapon requiring serious security consideration.
+[![Moqui MCP Demo](https://img.youtube.com/vi/Tauucda-NV4/0.jpg)](https://www.youtube.com/watch?v=Tauucda-NV4)
 
 
-## 🎥 **SEE IT WORK**
+## What This Is
 
 
-[![Moqui MCP Demo](https://img.youtube.com/vi/Tauucda-NV4/0.jpg)](https://www.youtube.com/watch?v=Tauucda-NV4)
+Moqui MCP connects AI agents to [Moqui Framework](https://www.moqui.org/), an open-source ERP platform. Through MCP (Model Context Protocol), agents can browse screens, fill forms, execute transactions, and query data - the same operations humans perform through the web interface.
+
+**This isn't a chatbot bolted onto an ERP. It's AI with direct access to business operations.**
 
 
-**AI agents running real business operations.**
+## What Agents Can Do
 
 
----
+- **Browse** the complete application hierarchy - catalog, orders, parties, accounting
+- **Search** products, customers, inventory with full query capabilities  
+- **Create** orders, invoices, shipments, parties, products
+- **Update** prices, quantities, statuses, relationships
+- **Execute** workflows spanning multiple screens and services
 
 
-## 🚀 **THE POSSIBILITIES**
+All operations respect Moqui's security model. Agents see only what their user account permits.
+
+## Why Moqui?
+
+ERP systems are the operational backbone of business. They contain:
+
+- **Real data**: Actual inventory levels, customer records, financial transactions
+- **Real processes**: Order-to-cash, procure-to-pay, hire-to-retire workflows
+- **Real constraints**: Business rules, approval chains, compliance requirements
+
+Moqui provides all of this as open-source software with a uniquely AI-friendly architecture:
 
 
-### **Autonomous Business Operations**
-- **AI Purchasing Agents**: Negotiate with suppliers using real inventory data
-- **Dynamic Pricing**: Adjust prices based on live demand and supply constraints  
-- **Workforce Intelligence**: Optimize scheduling with real financial modeling
-- **Supply Chain Orchestration**: Coordinate global logistics automatically
+- **Declarative screens**: XML definitions with rich semantic metadata
+- **Service-oriented**: Clean separation between UI and business logic
+- **Artifact security**: Fine-grained permissions on every screen, service, and entity
+- **Extensible**: Add AI-specific screens and services without forking
+
+## The MARIA Format
 
 
-### **Real-World Intelligence**
-- **Market Analysis**: AI sees actual sales data, not just trends
-- **Financial Forecasting**: Ground predictions in real business metrics
-- **Risk Management**: Monitor operations for anomalies and opportunities
-- **Compliance Automation**: Enforce business rules across all processes
+Enterprise screens are built for humans with visual context. AI agents need structured semantics. We solved this with **MARIA (MCP Accessible Rich Internet Applications)** - a JSON format based on W3C accessibility standards.
 
 
-### **The Agentic Economy**
-- **Multi-Agent Systems**: Sales, purchasing, operations AI working together
-- **ECA/SECA Integration**: Event-driven autonomous decision making
-- **Cross-Company Coordination**: AI agents negotiating with other AI agents
-- **Economic Simulation**: Test strategies in real business environment
+MARIA transforms Moqui screens into accessibility trees that LLMs naturally understand:
 
 
-ERP systems naturally create the perfect **agentic theater** - casting distinct roles around HR, Sales, Production, Accounting, and more. This organizational structure provides a powerful grounding framework where AI agents can inhabit authentic business personas with clear responsibilities, workflows, and relationships. The departmental boundaries and process flows that govern human collaboration become the stage directions for autonomous agents, turning corporate hierarchy into a narrative engine for AI coordination.
+```json
+{
+  "role": "document",
+  "name": "FindParty",
+  "children": [
+    {
+      "role": "form",
+      "name": "CreatePersonForm", 
+      "children": [
+        {"role": "textbox", "name": "First Name", "required": true},
+        {"role": "textbox", "name": "Last Name", "required": true},
+        {"role": "combobox", "name": "Role", "options": 140},
+        {"role": "button", "name": "createPerson"}
+      ]
+    },
+    {
+      "role": "grid",
+      "name": "PartyListForm",
+      "rowcount": 47,
+      "columns": ["ID", "Name", "Username", "Role"],
+      "children": [
+        {"role": "row", "name": "John Sales"},
+        {"role": "row", "name": "Jane Accountant"}
+      ],
+      "moreRows": 45
+    }
+  ]
+}
+```
 
 
-**Every product you touch passed through an inventory system. Now AI touches back.**
+The insight: **AI agents are a new kind of accessibility-challenged user.** They can't see pixels or interpret visual layout - they need structured semantics. This is exactly the problem ARIA solved for screen readers decades ago. But ARIA has no JSON serialization, and screen readers access accessibility trees via local OS APIs, not network protocols. MARIA fills this gap: the ARIA vocabulary, serialized as JSON, transported over MCP.
 
 
----
+Because humans and agents interact through the same semantic model, they can explain actions to each other in the same terms. "I selected 'Shipped' from the Order Status dropdown" means the same thing whether a human or an agent did it - no translation layer needed.
 
 
-### 💬 **From the Maintainer**
+### Why Integrated MARIA Beats Browser Automation
 
 
-> *"About 50% of this is slop. Ideas for JobSandbox integration?"*
+Tools like Playwright MCP let agents control browsers by capturing screenshots and accessibility snapshots. This works, but it's the wrong abstraction for enterprise systems:
 
 
-**Your input shapes the roadmap.**
+| Aspect | Playwright/Browser | Integrated MARIA |
+|--------|-------------------|------------------|
+| **Latency** | Screenshot → Vision model → Action | Direct JSON-RPC round-trip |
+| **Token cost** | Images + DOM snapshots burn tokens | Semantic-only payload |
+| **State access** | Limited to visible DOM | Full server-side context |
+| **Security** | Browser session = full UI access | Fine-grained artifact authorization |
+| **Reliability** | CSS changes break selectors | Stable semantic contracts |
+| **Batch operations** | One click at a time | Bulk actions in single call |
 
 
----
+MARIA delivers the accessibility tree directly from the source - no browser rendering, no vision model, no DOM scraping. The agent gets exactly the semantic structure it needs with none of the overhead.
 
 
+### Render Modes
 
 
+| Mode | Output | Use Case |
+|------|--------|----------|
+| `aria` | MARIA accessibility tree | Structured agent interaction |
+| `compact` | Condensed JSON summary | Quick screen overview |
+| `mcp` | Full semantic state | Complete metadata access |
+| `text` | Plain text | Simple queries |
+| `html` | Standard HTML | Debugging, human review |
 
 
-## Overview
+## Example Session
 
 
-This implementation provides the **foundational bridge** between AI assistants and real-world business operations through Moqui ERP. It exposes the complete corporate operating system - screens, services, entities, workflows, and business rules - as MCP tools with **recursive discovery** to arbitrary depth.
+```
+Agent: moqui_browse_screens(path="PopCommerce/PopCommerceAdmin/Catalog/Product/FindProduct")
 
 
-**Think of this as giving AI agents actual jobs in real companies, with real responsibilities, real consequences, and real accountability.**
+Server: {
+  "summary": "20 products. Forms: NewProductForm. Actions: createProduct",
+  "grids": {"ProductsForm": {"rowCount": 20, "columns": ["ID", "Name", "Type"]}},
+  "actions": {"createProduct": {"service": "create#mantle.product.Product"}}
+}
+
+Agent: I need to create a new product with variants.
+       moqui_browse_screens(
+         path="PopCommerce/PopCommerceAdmin/Catalog/Product/FindProduct",
+         action="createProduct",
+         parameters={"productName": "Widget Pro", "productTypeEnumId": "PtVirtual"}
+       )
+
+Server: {
+  "result": {"status": "executed", "productId": "100042"},
+  "summary": "Product created. Navigate to EditProduct to add features."
+}
+```
+
+## Getting Started
+
+```bash
+# Clone with submodules
+git clone --recursive https://github.com/moqui/moqui-mcp
+
+# Build and load demo data  
+./gradlew load
+
+# Start server
+./gradlew run
+
+# MCP endpoint: http://localhost:8080/mcp
+```
+
+### MCP Tools
+
+| Tool | Purpose |
+|------|---------|
+| `moqui_browse_screens` | Navigate screens, execute actions, render content |
+| `moqui_search_screens` | Find screens by name |
+| `moqui_get_screen_details` | Get field metadata, dropdown options |
 
 
 ## Architecture
 ## Architecture
 
 
-The implementation consists of:
+```
+┌─────────────────┐     ┌──────────────────┐     ┌─────────────────┐
+│   AI Agent      │────▶│   MCP Servlet    │────▶│  Moqui Screen   │
+│                 │◀────│  (JSON-RPC 2.0)  │◀────│   Framework     │
+└─────────────────┘     └──────────────────┘     └─────────────────┘
+                                │
+                        ┌───────┴───────┐
+                        ▼               ▼
+                ┌──────────────┐ ┌──────────────┐
+                │    MARIA     │ │  Wiki Docs   │
+                │  Transform   │ │  (Guidance)  │
+                └──────────────┘ └──────────────┘
+```
 
 
-- **EnhancedMcpServlet** - Main MCP servlet handling JSON-RPC 2.0 protocol
-- **McpServices** - Core services for initialization, tool discovery, and execution
-- **Screen Discovery** - Recursive screen traversal with XML parsing
-- **Security Integration** - Moqui artifact authorization system
-- **Test Suite** - Java/Groovy tests (help please!)
+- **MCP Servlet**: JSON-RPC 2.0 protocol, session management, authentication
+- **Screen Framework**: Moqui's rendering engine with MCP output mode
+- **MARIA Transform**: Converts semantic state to accessibility tree format
+- **Wiki Docs**: Screen-specific instructions with path inheritance
 
 
+## Use Cases
 
 
+### Autonomous Operations
+- Purchasing agents negotiating with supplier catalogs
+- Inventory agents reordering based on demand forecasts
+- Pricing agents adjusting margins in real-time
 
 
-## License
+### Assisted Workflows  
+- Customer service agents with full order history access
+- Sales agents generating quotes from live pricing
+- Warehouse agents coordinating picks and shipments
+
+### Analysis & Reporting
+- Financial agents querying actuals vs. budgets
+- Operations agents identifying bottlenecks
+- Compliance agents auditing transaction trails
+
+## Security
 
 
-This project is in the public domain under CC0 1.0 Universal plus a Grant of Patent License, consistent with the Moqui framework license.
+Production deployments should:
 
 
+- Create dedicated service accounts for AI agents
+- Use Moqui artifact authorization to limit permissions
+- Enable comprehensive audit logging
+- Consider human-in-the-loop for sensitive operations
+- Start with read-only access, expand incrementally
 
 
+## Status
 
 
-## Related Projects
+This is an active proof-of-concept. Working:
 
 
-- **Moqui Framework** - https://github.com/moqui/moqui-framework
-- **PopCommerce** - https://github.com/moqui/PopCommerce
-- **MCP Specification** - https://modelcontextprotocol.io/
+- Screen browsing and discovery
+- Form submission and action execution  
+- MARIA/compact/MCP render modes
+- Wiki documentation with inheritance
+- Artifact security integration
 
 
+Roadmap:
 
 
+- Entity-level queries (beyond screen context)
+- Service direct invocation
+- Real-time notifications (ARIA live regions)
+- Multi-agent coordination patterns
+
+## Contributing
+
+Contributions welcome:
+
+- Test coverage and edge cases
+- Additional ARIA role mappings  
+- Performance optimization
+- Documentation and examples
+- Integration patterns for other MCP clients
+
+## License
 
 
-## Support
+Public domain under CC0 1.0 Universal plus Grant of Patent License, consistent with Moqui Framework.
 
 
-For issues and questions:
+## Links
 
 
-1. [Moqui Forum Discussion](https://forum.moqui.org/t/poc-mcp-server-as-a-moqui-component)
-2. Review test examples in `test/`
-3. Consult Moqui documentation
-4. Check server logs for detailed error information
+- [Moqui Framework](https://github.com/moqui/moqui-framework)
+- [MCP Specification](https://modelcontextprotocol.io/)
+- [W3C ARIA](https://www.w3.org/WAI/ARIA/apg/)
+- [Forum Discussion](https://forum.moqui.org/t/poc-mcp-server-as-a-moqui-component)

@@ -24,7 +24,7 @@
     <!-- WikiSpace Root Page -->
     <!-- WikiSpace Root Page -->
     <moqui.resource.DbResource
     <moqui.resource.DbResource
         resourceId="WIKI_MCP_SCREEN_DOCS"
         resourceId="WIKI_MCP_SCREEN_DOCS"
-        parentResourceId=""
+        parentResourceId="WIKI_SPACE_ROOT"
         filename="MCP_SCREEN_DOCS.md"
         filename="MCP_SCREEN_DOCS.md"
         isFile="Y"/>
         isFile="Y"/>
     <moqui.resource.DbResourceFile
     <moqui.resource.DbResourceFile
@@ -653,23 +653,46 @@ parameters: {productFeatureId: "ColorBlue"}
 
 
 ## Creating Products
 ## Creating Products
 
 
+**IMPORTANT: productId vs pseudoId**
+
+When creating products, Moqui uses TWO different identifiers:
+- **pseudoId**: User-visible ID (e.g., `DEMO_VAR_GR_SM`) - used for display and searches
+- **productId**: Internal database ID (e.g., `100000`) - auto-generated, used by all services
+
+After calling `createProduct`, the response includes `productId` in the result. **You must use this internal productId** (not the pseudoId) for all subsequent operations like:
+- Adding features (`createProductFeature`)
+- Creating associations (`createProductAssoc`)
+- Setting prices (`createProductPrice`)
+
+Example response after createProduct:
+```
+actionResult: {
+  status: "executed",
+  result: { productId: "100000" }  // Use THIS ID
+}
+```
+
 ### Standard Product
 ### Standard Product
 ```
 ```
 action: createProduct
 action: createProduct
 parameters: {
 parameters: {
+  pseudoId: "MY_WIDGET_001",  // Optional user-visible ID
   productName: "New Widget",
   productName: "New Widget",
   productTypeEnumId: "PtAsset",
   productTypeEnumId: "PtAsset",
   assetTypeEnumId: "AstTpInventory"
   assetTypeEnumId: "AstTpInventory"
 }
 }
+// Response includes: productId: "100XXX" - use this for subsequent calls
 ```
 ```
 
 
 ### Virtual Product (for variants)
 ### Virtual Product (for variants)
 ```
 ```
 action: createProduct
 action: createProduct
 parameters: {
 parameters: {
+  pseudoId: "MY_VIRTUAL_001",  // Optional user-visible ID  
   productName: "Widget with Options",
   productName: "Widget with Options",
   productTypeEnumId: "PtVirtual"
   productTypeEnumId: "PtVirtual"
 }
 }
+// Response includes: productId: "100XXX" - use this for subsequent calls
 ```
 ```
 
 
 ## Product Types
 ## Product Types
@@ -723,7 +746,9 @@ Manage product details, features, prices, categories, and associations.
 
 
 ## Required Parameter
 ## Required Parameter
 
 
-- **productId**: Product to edit (e.g., `DEMO_1`, `100000`)
+- **productId**: Internal product ID to edit (e.g., `DEMO_1`, `100000`)
+
+**Note:** Always use the internal `productId` (returned from createProduct), NOT the user-visible `pseudoId`. Using pseudoId will cause referential integrity errors.
 
 
 ## Key Subscreens
 ## Key Subscreens
 
 
@@ -735,9 +760,11 @@ Manage product details, features, prices, categories, and associations.
 
 
 ## Managing Features
 ## Managing Features
 
 
+Features are managed directly on the EditProduct screen (not a separate EditFeatures subscreen).
+
 ### Add Selectable Feature (Virtual Products)
 ### Add Selectable Feature (Virtual Products)
 ```
 ```
-path: PopCommerce/PopCommerceAdmin/Catalog/Product/EditProduct/EditFeatures
+path: PopCommerce/PopCommerceAdmin/Catalog/Product/EditProduct
 action: createProductFeature
 action: createProductFeature
 parameters: {
 parameters: {
   productId: "DEMO_VAR",
   productId: "DEMO_VAR",
@@ -748,6 +775,7 @@ parameters: {
 
 
 ### Add Distinguishing Feature (Variant Products)
 ### Add Distinguishing Feature (Variant Products)
 ```
 ```
+path: PopCommerce/PopCommerceAdmin/Catalog/Product/EditProduct
 action: createProductFeature
 action: createProductFeature
 parameters: {
 parameters: {
   productId: "DEMO_VAR_RED",
   productId: "DEMO_VAR_RED",
@@ -765,9 +793,11 @@ parameters: {
 
 
 ## Managing Associations
 ## Managing Associations
 
 
+EditAssocs is a sibling screen to EditProduct under Product (not a child of EditProduct).
+
 ### Link Variant to Parent
 ### Link Variant to Parent
 ```
 ```
-path: PopCommerce/PopCommerceAdmin/Catalog/Product/EditProduct/EditAssocs
+path: PopCommerce/PopCommerceAdmin/Catalog/Product/EditAssocs
 action: createProductAssoc
 action: createProductAssoc
 parameters: {
 parameters: {
   productId: "DEMO_VAR",
   productId: "DEMO_VAR",
@@ -807,4 +837,400 @@ parameters: {
         userId="EX_JOHN_DOE"
         userId="EX_JOHN_DOE"
         changeDateTime="2025-01-19 00:00:00.000"/>
         changeDateTime="2025-01-19 00:00:00.000"/>
 
 
+    <!-- ============================================== -->
+    <!-- MCP Service Documentation Wiki Space          -->
+    <!-- Referenced by describedby in ARIA responses   -->
+    <!-- ============================================== -->
+    
+    <moqui.resource.wiki.WikiSpace wikiSpaceId="MCP_SERVICE_DOCS"
+        description="MCP Service Documentation - Parameter and usage docs for common services"
+        restrictView="N"
+        restrictUpdate="Y"
+        rootPageLocation="dbresource://WikiSpace/MCP_SERVICE_DOCS.md"/>
+
+    <!-- Service Docs Root -->
+    <moqui.resource.DbResource
+        resourceId="WIKI_MCP_SERVICE_DOCS"
+        parentResourceId="WIKI_SPACE_ROOT"
+        filename="MCP_SERVICE_DOCS.md"
+        isFile="Y"/>
+    <moqui.resource.DbResourceFile
+        resourceId="WIKI_MCP_SERVICE_DOCS"
+        mimeType="text/markdown"
+        versionName="v1">
+        <fileData><![CDATA[# MCP Service Documentation
+
+Documentation for common Moqui services used via MCP actions.
+
+Services are referenced by `describedby` in ARIA mode responses.
+
+## Service Naming Convention
+
+- `create#Entity` - Create new record
+- `update#Entity` - Update existing record  
+- `delete#Entity` - Delete record
+- `store#Entity` - Create or update (upsert)
+- `Namespace.ServiceName.verb#Noun` - Custom service]]></fileData>
+    </moqui.resource.DbResourceFile>
+
+    <!-- ==================== -->
+    <!-- Product Services     -->
+    <!-- ==================== -->
+
+    <!-- Product Entity -->
+    <moqui.resource.DbResource
+        resourceId="WIKI_SVC_PRODUCT"
+        parentResourceId="WIKI_MCP_SERVICE_DOCS"
+        filename="Product.md"
+        isFile="Y"/>
+    <moqui.resource.DbResourceFile
+        resourceId="WIKI_SVC_PRODUCT"
+        mimeType="text/markdown"
+        versionName="v1">
+        <fileData><![CDATA[# Product Service
+
+Create and update products.
+
+## create#mantle.product.Product
+
+**Required:**
+- `productName` (string): Display name
+
+**Optional:**
+- `pseudoId` (string): User-visible ID (auto-generated if omitted)
+- `productTypeEnumId`: PtAsset (default), PtVirtual, PtService, PtDigital
+- `ownerPartyId`: Organization that owns this product
+- `description`: Long description
+- `assetTypeEnumId`: For physical products - AstTpInventory, AstTpFixed
+- `assetClassEnumId`: AstClsInventoryFin (standard inventory)
+
+**Returns:**
+- `productId`: Internal ID (use this for subsequent operations)
+
+**Example:**
+```
+action: createProduct
+parameters: {
+  productName: "Blue Widget",
+  productTypeEnumId: "PtAsset",
+  ownerPartyId: "ORG_ZIZI_RETAIL"
+}
+```
+
+## update#mantle.product.Product
+
+**Required:**
+- `productId`: Internal product ID to update
+
+**Optional:** Any Product field (productName, description, etc.)]]></fileData>
+    </moqui.resource.DbResourceFile>
+
+    <moqui.resource.wiki.WikiPage
+        wikiPageId="MCP_SERVICE_DOCS/Product"
+        wikiSpaceId="MCP_SERVICE_DOCS"
+        pagePath="Product"
+        publishedVersionName="v1"
+        restrictView="N"/>
+
+    <!-- ProductFeature Service -->
+    <moqui.resource.DbResource
+        resourceId="WIKI_SVC_PRODUCT_FEATURE"
+        parentResourceId="WIKI_MCP_SERVICE_DOCS"
+        filename="ProductFeature.md"
+        isFile="Y"/>
+    <moqui.resource.DbResourceFile
+        resourceId="WIKI_SVC_PRODUCT_FEATURE"
+        mimeType="text/markdown"
+        versionName="v1">
+        <fileData><![CDATA[# ProductFeature Service
+
+Apply features (like color, size) to products.
+
+## mantle.product.ProductServices.create#ProductFeature
+
+**Required:**
+- `productId`: Product to add feature to
+- `productFeatureId`: Feature ID (e.g., ColorRed, SizeMedium)
+- `applTypeEnumId`: How feature applies to product
+
+**Application Types (applTypeEnumId):**
+- `PfatSelectable`: Customer can choose (use on virtual parent)
+- `PfatDistinguishing`: Identifies specific variant (use on variants)
+- `PfatStandard`: Always included
+- `PfatRequired`: Must be selected at purchase
+
+**Optional:**
+- `fromDate`: When feature becomes active (default: now)
+- `sequenceNum`: Display order
+
+**Example - Virtual Parent:**
+```
+action: createProductFeature
+parameters: {
+  productId: "DEMO_VAR",
+  productFeatureId: "ColorGreen",
+  applTypeEnumId: "PfatSelectable"
+}
+```
+
+**Example - Variant:**
+```
+action: createProductFeature  
+parameters: {
+  productId: "DEMO_VAR_GR_SM",
+  productFeatureId: "ColorGreen",
+  applTypeEnumId: "PfatDistinguishing"
+}
+```
+
+## Common Feature IDs
+
+Colors: ColorRed, ColorBlue, ColorGreen, ColorBlack, ColorWhite
+Sizes: SizeSmall, SizeMedium, SizeLarge, SizeXL]]></fileData>
+    </moqui.resource.DbResourceFile>
+
+    <moqui.resource.wiki.WikiPage
+        wikiPageId="MCP_SERVICE_DOCS/ProductFeature"
+        wikiSpaceId="MCP_SERVICE_DOCS"
+        pagePath="ProductFeature"
+        publishedVersionName="v1"
+        restrictView="N"/>
+
+    <!-- ProductAssoc Service -->
+    <moqui.resource.DbResource
+        resourceId="WIKI_SVC_PRODUCT_ASSOC"
+        parentResourceId="WIKI_MCP_SERVICE_DOCS"
+        filename="ProductAssoc.md"
+        isFile="Y"/>
+    <moqui.resource.DbResourceFile
+        resourceId="WIKI_SVC_PRODUCT_ASSOC"
+        mimeType="text/markdown"
+        versionName="v1">
+        <fileData><![CDATA[# ProductAssoc Service
+
+Link products together (variants, accessories, etc.)
+
+## create#mantle.product.ProductAssoc
+
+**Required:**
+- `productId`: Parent/source product
+- `toProductId`: Related product
+- `productAssocTypeEnumId`: Type of relationship
+
+**Association Types:**
+- `PatVariant`: Links virtual parent to variant product
+- `PatAccessory`: Suggested accessory
+- `PatComplement`: Complementary product
+- `PatSubstitute`: Equivalent alternative
+- `PatUpSell`: Higher-tier recommendation
+- `PatCrossSell`: Related product suggestion
+
+**Optional:**
+- `fromDate`: When association starts (default: now)
+- `quantity`: For BOM/kits
+- `sequenceNum`: Display order
+
+**Example - Link Variant:**
+```
+action: createProductAssoc
+parameters: {
+  productId: "DEMO_VAR",
+  toProductId: "DEMO_VAR_GR_SM",
+  productAssocTypeEnumId: "PatVariant"
+}
+```
+
+**Note:** Use internal `productId` values, not pseudoId.]]></fileData>
+    </moqui.resource.DbResourceFile>
+
+    <moqui.resource.wiki.WikiPage
+        wikiPageId="MCP_SERVICE_DOCS/ProductAssoc"
+        wikiSpaceId="MCP_SERVICE_DOCS"
+        pagePath="ProductAssoc"
+        publishedVersionName="v1"
+        restrictView="N"/>
+
+    <!-- ProductPrice Service -->
+    <moqui.resource.DbResource
+        resourceId="WIKI_SVC_PRODUCT_PRICE"
+        parentResourceId="WIKI_MCP_SERVICE_DOCS"
+        filename="ProductPrice.md"
+        isFile="Y"/>
+    <moqui.resource.DbResourceFile
+        resourceId="WIKI_SVC_PRODUCT_PRICE"
+        mimeType="text/markdown"
+        versionName="v1">
+        <fileData><![CDATA[# ProductPrice Service
+
+Manage product pricing.
+
+## create#mantle.product.ProductPrice
+
+**Required:**
+- `productId`: Product to price
+- `price`: Amount
+- `priceTypeEnumId`: Type of price
+- `pricePurposeEnumId`: Purpose/context
+
+**Price Types (priceTypeEnumId):**
+- `PptList`: Standard list price
+- `PptCurrent`: Current selling price
+- `PptMin`: Minimum allowed price
+- `PptMax`: Maximum allowed price
+- `PptCompetitive`: Competitor price
+- `PptPromotional`: Sale/promo price
+
+**Price Purposes (pricePurposeEnumId):**
+- `PppPurchase`: Buying price (from supplier)
+- `PppSales`: Selling price (to customer)
+
+**Optional:**
+- `priceUomId`: Currency (default: USD)
+- `minQuantity`: Quantity break (for tiered pricing)
+- `fromDate`: When price becomes active
+- `thruDate`: When price expires
+- `productStoreId`: Store-specific pricing
+
+**Example - Basic Price:**
+```
+action: createProductPrice
+parameters: {
+  productId: "DEMO_VAR_GR_SM",
+  price: 19.99,
+  priceTypeEnumId: "PptList",
+  pricePurposeEnumId: "PppSales",
+  priceUomId: "USD"
+}
+```
+
+**Example - Quantity Break:**
+```
+action: createProductPrice
+parameters: {
+  productId: "DEMO_VAR_GR_SM",
+  price: 17.99,
+  priceTypeEnumId: "PptList",
+  pricePurposeEnumId: "PppSales",
+  minQuantity: 10
+}
+```]]></fileData>
+    </moqui.resource.DbResourceFile>
+
+    <moqui.resource.wiki.WikiPage
+        wikiPageId="MCP_SERVICE_DOCS/ProductPrice"
+        wikiSpaceId="MCP_SERVICE_DOCS"
+        pagePath="ProductPrice"
+        publishedVersionName="v1"
+        restrictView="N"/>
+
+    <!-- ==================== -->
+    <!-- Party Services       -->
+    <!-- ==================== -->
+
+    <!-- Person Service -->
+    <moqui.resource.DbResource
+        resourceId="WIKI_SVC_PERSON"
+        parentResourceId="WIKI_MCP_SERVICE_DOCS"
+        filename="Person.md"
+        isFile="Y"/>
+    <moqui.resource.DbResourceFile
+        resourceId="WIKI_SVC_PERSON"
+        mimeType="text/markdown"
+        versionName="v1">
+        <fileData><![CDATA[# Person Service
+
+Create and manage people (parties).
+
+## mantle.party.PartyServices.create#Person
+
+**Required:**
+- `firstName`: First name
+- `lastName`: Last name
+
+**Optional:**
+- `middleName`: Middle name
+- `emailAddress`: Primary email
+- `roleTypeId`: Role (Customer, Employee, etc.)
+- `ownerPartyId`: Organization that owns this party record
+
+**Returns:**
+- `partyId`: Internal party ID
+
+**Example:**
+```
+action: createPerson
+parameters: {
+  firstName: "Jane",
+  lastName: "Smith",
+  emailAddress: "jane@example.com"
+}
+```
+
+## mantle.party.PartyServices.update#PartyDetail
+
+**Required:**
+- `partyId`: Party to update
+
+**Optional:** firstName, lastName, middleName, comments, etc.]]></fileData>
+    </moqui.resource.DbResourceFile>
+
+    <moqui.resource.wiki.WikiPage
+        wikiPageId="MCP_SERVICE_DOCS/Person"
+        wikiSpaceId="MCP_SERVICE_DOCS"
+        pagePath="Person"
+        publishedVersionName="v1"
+        restrictView="N"/>
+
+    <!-- CommunicationEvent (Message) Service -->
+    <moqui.resource.DbResource
+        resourceId="WIKI_SVC_MESSAGE"
+        parentResourceId="WIKI_MCP_SERVICE_DOCS"
+        filename="Message.md"
+        isFile="Y"/>
+    <moqui.resource.DbResourceFile
+        resourceId="WIKI_SVC_MESSAGE"
+        mimeType="text/markdown"
+        versionName="v1">
+        <fileData><![CDATA[# Message Service
+
+Send messages between parties.
+
+## mantle.party.CommunicationServices.create#Message
+
+**Required:**
+- `toPartyId`: Recipient party ID
+- `subject`: Message subject
+- `body`: Message content
+
+**Optional:**
+- `fromPartyId`: Sender (defaults to current user)
+- `purposeEnumId`: Message purpose
+- `communicationEventTypeId`: Message type
+
+**Purpose Types (purposeEnumId):**
+- `CpComment`: General comment
+- `CpSupport`: Support request
+- `CpActivityRequest`: Activity/task request
+- `CpBilling`: Billing inquiry
+
+**Example:**
+```
+action: createMessage
+parameters: {
+  toPartyId: "EX_JOHN_DOE",
+  subject: "Green variants ready",
+  body: "The green product variants have been created and are ready for review."
+}
+```
+
+**Screen Path:** Party/PartyMessages]]></fileData>
+    </moqui.resource.DbResourceFile>
+
+    <moqui.resource.wiki.WikiPage
+        wikiPageId="MCP_SERVICE_DOCS/Message"
+        wikiSpaceId="MCP_SERVICE_DOCS"
+        pagePath="Message"
+        publishedVersionName="v1"
+        restrictView="N"/>
+
 </entity-facade-xml>
 </entity-facade-xml>

@@ -59,4 +59,10 @@
     <moqui.security.UserGroupMember userGroupId="MCP_BUSINESS" userId="ORG_ZIZI_JD" fromDate="2025-01-01 00:00:00.000"/>
     <moqui.security.UserGroupMember userGroupId="MCP_BUSINESS" userId="ORG_ZIZI_JD" fromDate="2025-01-01 00:00:00.000"/>
     <moqui.security.UserGroupMember userGroupId="MCP_BUSINESS" userId="ORG_ZIZI_BD" fromDate="2025-01-01 00:00:00.000"/>
     <moqui.security.UserGroupMember userGroupId="MCP_BUSINESS" userId="ORG_ZIZI_BD" fromDate="2025-01-01 00:00:00.000"/>
     -->
     -->
+    
+    <!-- Add EX_JOHN_DOE to PopcAdminSales so JohnSales can see/message John Doe in searches -->
+    <moqui.security.UserGroupMember userGroupId="PopcAdminSales" userId="EX_JOHN_DOE" fromDate="2025-01-01 00:00:00.000"/>
+    
+    <!-- Set EX_JOHN_DOE's ownerPartyId to ORG_ZIZI_RETAIL so they appear in org-filtered searches -->
+    <mantle.party.Party partyId="EX_JOHN_DOE" ownerPartyId="ORG_ZIZI_RETAIL"/>
 </entity-facade-xml>
 </entity-facade-xml>

@@ -128,6 +128,11 @@
         <#assign formName = (.node["@name"]!"")?string>
         <#assign formName = (.node["@name"]!"")?string>
         <#assign fieldMetaList = []>
         <#assign fieldMetaList = []>
         <#assign dummy = ec.resource.expression("if (mcpSemanticData.formMetadata == null) mcpSemanticData.formMetadata = [:]; mcpSemanticData.formMetadata.put('" + formName?js_string + "', [name: '" + formName?js_string + "', map: '" + (mapName!"")?js_string + "'])", "")!>
         <#assign dummy = ec.resource.expression("if (mcpSemanticData.formMetadata == null) mcpSemanticData.formMetadata = [:]; mcpSemanticData.formMetadata.put('" + formName?js_string + "', [name: '" + formName?js_string + "', map: '" + (mapName!"")?js_string + "'])", "")!>
+        <#-- Store the actual form data (current entity values) in semanticData -->
+        <#if formMap?has_content>
+            <#assign dummy = ec.context.put("tempFormMapData", formMap)!>
+            <#assign dummy = ec.resource.expression("mcpSemanticData.put('" + formName?js_string + "_data', tempFormMapData)", "")!>
+        </#if>
     </#if>
     </#if>
     <#t>${sri.pushSingleFormMapContext(mapName)}
     <#t>${sri.pushSingleFormMapContext(mapName)}
     <#list formNode["field"] as fieldNode>
     <#list formNode["field"] as fieldNode>

@@ -195,7 +195,9 @@
                     // Handle internal discovery/utility tools
                     // Handle internal discovery/utility tools
                     def internalToolMappings = [
                     def internalToolMappings = [
                         "moqui_search_screens": "McpServices.mcp#SearchScreens",
                         "moqui_search_screens": "McpServices.mcp#SearchScreens",
-                        "moqui_get_screen_details": "McpServices.mcp#GetScreenDetails"
+                        "moqui_get_screen_details": "McpServices.mcp#GetScreenDetails",
+                        "moqui_get_help": "McpServices.mcp#GetHelp",
+                        "moqui_batch_operations": "McpServices.mcp#BatchOperations"
                     ]
                     ]
                     
                     
                     def targetServiceName = internalToolMappings[name]
                     def targetServiceName = internalToolMappings[name]
@@ -759,6 +761,7 @@ serializeMoquiObject = { obj, depth = 0 ->
 
 
 // Convert MCP semantic state to ARIA accessibility tree format
 // Convert MCP semantic state to ARIA accessibility tree format
 // This produces a compact, standard representation matching W3C ARIA roles
 // This produces a compact, standard representation matching W3C ARIA roles
+// Following ARIA naming guidelines: name (short label), description (brief explanation), details (extended help)
 def convertToAriaTree = { semanticState, targetScreenPath ->
 def convertToAriaTree = { semanticState, targetScreenPath ->
     if (!semanticState) return null
     if (!semanticState) return null
     
     
@@ -781,55 +784,91 @@ def convertToAriaTree = { semanticState, targetScreenPath ->
             case "number": return "spinbutton"
             case "number": return "spinbutton"
             case "password": return "textbox"
             case "password": return "textbox"
             case "hidden": return null  // skip hidden fields
             case "hidden": return null  // skip hidden fields
+            case "display": return "text"  // read-only display
+            case "link": return "link"
             default: return "textbox"
             default: return "textbox"
         }
         }
     }
     }
     
     
-    // Convert a field to ARIA node
-    def fieldToAriaNode = { field ->
+    // Convert a field to ARIA node with full attributes
+    def fieldToAriaNode = { field, formDataMap ->
         def role = fieldToAriaRole(field)
         def role = fieldToAriaRole(field)
         if (!role) return null
         if (!role) return null
         
         
         def node = [
         def node = [
             role: role,
             role: role,
-            name: field.title ?: field.name
+            name: field.title ?: field.name,
+            ref: field.name  // Reference for interaction
         ]
         ]
         
         
+        // Add current value if available from form data
+        if (formDataMap && formDataMap[field.name] != null) {
+            node.value = formDataMap[field.name]?.toString()
+        }
+        
         // Add required attribute
         // Add required attribute
         if (field.required) node.required = true
         if (field.required) node.required = true
         
         
-        // For dropdowns, show option count instead of all options
+        // For dropdowns, show option count and examples
         if (field.type == "dropdown") {
         if (field.type == "dropdown") {
             def optionCount = field.options?.size() ?: 0
             def optionCount = field.options?.size() ?: 0
             if (field.totalOptions) optionCount = field.totalOptions
             if (field.totalOptions) optionCount = field.totalOptions
             if (optionCount > 0) {
             if (optionCount > 0) {
                 node.options = optionCount
                 node.options = optionCount
+                // Show first few example values
+                if (field.options instanceof List && field.options.size() > 0) {
+                    node.examples = field.options.take(3).collect { opt ->
+                        opt instanceof Map ? (opt.value ?: opt.label) : opt.toString()
+                    }
+                }
                 if (field.optionsTruncated) {
                 if (field.optionsTruncated) {
-                    node.fetchHint = field.fetchHint
+                    node.description = "Use moqui_get_screen_details for all ${optionCount} options"
                 }
                 }
             }
             }
             // Check for dynamic options
             // Check for dynamic options
             if (field.dynamicOptions) {
             if (field.dynamicOptions) {
                 node.autocomplete = true
                 node.autocomplete = true
+                node.description = "Type to search, options load dynamically"
             }
             }
         }
         }
         
         
         return node
         return node
     }
     }
     
     
+    // Generate description for an action based on its name and service
+    def actionDescription = { actionName, serviceName ->
+        def verb = actionName.replaceAll(/([A-Z])/, ' $1').trim().toLowerCase()
+        if (serviceName) {
+            // Extract entity/operation from service name like "create#mantle.product.Product"
+            def parts = serviceName.split('#')
+            if (parts.length == 2) {
+                def operation = parts[0]
+                def entity = parts[1].split('\\.').last()
+                return "${operation} ${entity}"
+            }
+            return serviceName.split('\\.').last()
+        }
+        return verb
+    }
+    
     // Process forms (form-single types become form landmarks)
     // Process forms (form-single types become form landmarks)
     formMetadata.each { formName, formData ->
     formMetadata.each { formName, formData ->
         if (formData.type == "form-list") return  // Handle separately
         if (formData.type == "form-list") return  // Handle separately
         
         
+        // Look for form data (current values)
+        def formDataKey = "${formName}_data"
+        def formDataMap = data[formDataKey] ?: [:]
+        
         def formNode = [
         def formNode = [
             role: "form",
             role: "form",
             name: formData.name ?: formName,
             name: formData.name ?: formName,
+            ref: formName,
             children: []
             children: []
         ]
         ]
         
         
-        // Add fields
+        // Add fields with values
         formData.fields?.each { field ->
         formData.fields?.each { field ->
-            def fieldNode = fieldToAriaNode(field)
+            def fieldNode = fieldToAriaNode(field, formDataMap)
             if (fieldNode) formNode.children << fieldNode
             if (fieldNode) formNode.children << fieldNode
         }
         }
         
         
@@ -841,7 +880,15 @@ def convertToAriaTree = { semanticState, targetScreenPath ->
             a.name == expectedActionName || a.name?.equalsIgnoreCase(expectedActionName)
             a.name == expectedActionName || a.name?.equalsIgnoreCase(expectedActionName)
         }
         }
         if (submitAction) {
         if (submitAction) {
-            formNode.children << [role: "button", name: submitAction.name]
+            def btnNode = [
+                role: "button", 
+                name: submitAction.name,
+                ref: submitAction.name
+            ]
+            if (submitAction.service) {
+                btnNode.description = actionDescription(submitAction.name, submitAction.service)
+            }
+            formNode.children << btnNode
         }
         }
         
         
         if (formNode.children) children << formNode
         if (formNode.children) children << formNode
@@ -860,6 +907,7 @@ def convertToAriaTree = { semanticState, targetScreenPath ->
         def gridNode = [
         def gridNode = [
             role: "grid",
             role: "grid",
             name: formData.name ?: formName,
             name: formData.name ?: formName,
+            ref: formName,
             rowcount: itemCount
             rowcount: itemCount
         ]
         ]
         
         
@@ -867,14 +915,17 @@ def convertToAriaTree = { semanticState, targetScreenPath ->
         def columns = formData.fields?.collect { it.title ?: it.name }
         def columns = formData.fields?.collect { it.title ?: it.name }
         if (columns) gridNode.columns = columns
         if (columns) gridNode.columns = columns
         
         
-        // Add sample rows (first 3)
+        // Add sample rows with more detail
         if (listData instanceof List && listData.size() > 0) {
         if (listData instanceof List && listData.size() > 0) {
             gridNode.children = []
             gridNode.children = []
             listData.take(3).each { row ->
             listData.take(3).each { row ->
                 def rowNode = [role: "row"]
                 def rowNode = [role: "row"]
                 // Extract key identifying info
                 // Extract key identifying info
-                def name = row.combinedName ?: row.name ?: row.productName ?: row.pseudoId ?: row.id
+                def id = row.pseudoId ?: row.partyId ?: row.productId ?: row.id
+                def name = row.combinedName ?: row.name ?: row.productName
+                if (id) rowNode.ref = id
                 if (name) rowNode.name = name
                 if (name) rowNode.name = name
+                if (id && name && id != name) rowNode.description = id
                 gridNode.children << rowNode
                 gridNode.children << rowNode
             }
             }
             if (listData.size() > 3) {
             if (listData.size() > 3) {
@@ -892,7 +943,8 @@ def convertToAriaTree = { semanticState, targetScreenPath ->
             role: "navigation",
             role: "navigation",
             name: "Links",
             name: "Links",
             children: navLinks.take(10).collect { link ->
             children: navLinks.take(10).collect { link ->
-                [role: "link", name: link.text, path: link.path]
+                def linkNode = [role: "link", name: link.text, ref: link.path]
+                linkNode
             }
             }
         ]
         ]
         if (navLinks.size() > 10) {
         if (navLinks.size() > 10) {
@@ -901,27 +953,59 @@ def convertToAriaTree = { semanticState, targetScreenPath ->
         children << navNode
         children << navNode
     }
     }
     
     
-    // Process actions as a toolbar
-    def serviceActions = semanticState.actions?.findAll { it.type == "service-action" }
-    if (serviceActions && serviceActions.size() > 0) {
+    // Process ALL actions as buttons (unified - no separate transitions/actions)
+    def allActions = semanticState.actions ?: []
+    if (allActions && allActions.size() > 0) {
         def toolbarNode = [
         def toolbarNode = [
             role: "toolbar",
             role: "toolbar",
             name: "Actions",
             name: "Actions",
-            children: serviceActions.take(10).collect { action ->
-                [role: "button", name: action.name]
+            description: "Available operations on this screen",
+            children: allActions.take(15).collect { action ->
+                def btnNode = [
+                    role: "button", 
+                    name: action.name,
+                    ref: action.name
+                ]
+                // Add description based on service or action type
+                if (action.service) {
+                    btnNode.description = actionDescription(action.name, action.service)
+                    btnNode.service = action.service
+                    // Add describedby for service documentation
+                    // e.g., "mantle.product.ProductServices.create#ProductFeature" -> "wiki:service:ProductServices.create#ProductFeature"
+                    def serviceParts = action.service.split('\\.')
+                    if (serviceParts.length > 0) {
+                        btnNode.describedby = "wiki:service:${serviceParts[-1]}"
+                    }
+                } else if (action.type == "screen-transition") {
+                    btnNode.description = "Navigate"
+                } else if (action.type == "form-action") {
+                    btnNode.description = "Form operation"
+                }
+                btnNode
             }
             }
         ]
         ]
-        if (serviceActions.size() > 10) {
-            toolbarNode.moreActions = serviceActions.size() - 10
+        if (allActions.size() > 15) {
+            toolbarNode.moreActions = allActions.size() - 15
         }
         }
         children << toolbarNode
         children << toolbarNode
     }
     }
     
     
-    return [
+    // Build the main node
+    def mainNode = [
         role: "main",
         role: "main",
         name: targetScreenPath?.split('/')?.last() ?: "Screen",
         name: targetScreenPath?.split('/')?.last() ?: "Screen",
+        description: "Use ref values with action parameter to interact",
         children: children
         children: children
     ]
     ]
+    
+    // Add describedby reference if wiki instructions exist for this screen
+    // This follows ARIA pattern: describedby points to extended documentation
+    // Use full screen path since that's how WikiPage.pagePath is stored
+    if (targetScreenPath) {
+        mainNode.describedby = "wiki:screen:${targetScreenPath}"
+    }
+    
+    return mainNode
 }
 }
 
 
 // Convert MCP semantic state to compact actionable format
 // Convert MCP semantic state to compact actionable format
@@ -1049,16 +1133,60 @@ def convertToCompactFormat = { semanticState, targetScreenPath ->
         // Rows with key data and links
         // Rows with key data and links
         if (listData instanceof List && listData.size() > 0) {
         if (listData instanceof List && listData.size() > 0) {
             gridInfo.rowCount = listData.size()
             gridInfo.rowCount = listData.size()
+            
+            // Get field names from form definition for determining key fields
+            def fieldNames = formData.fields?.collect { it.name } ?: []
+            
             gridInfo.rows = listData.take(10).collect { row ->
             gridInfo.rows = listData.take(10).collect { row ->
                 def rowInfo = [:]
                 def rowInfo = [:]
                 
                 
                 // Get identifying info
                 // Get identifying info
-                def id = row.pseudoId ?: row.partyId ?: row.productId ?: row.orderId ?: row.id
-                def name = row.combinedName ?: row.productName ?: row.name
+                def id = row.pseudoId ?: row.partyId ?: row.productId ?: row.orderId ?: row.communicationEventId ?: row.id
+                def name = row.combinedName ?: row.productName ?: row.organizationName ?: row.subject ?: row.name
                 
                 
                 if (id) rowInfo.id = id
                 if (id) rowInfo.id = id
                 if (name && name != id) rowInfo.name = name
                 if (name && name != id) rowInfo.name = name
                 
                 
+                // Add key display values (2-3 additional fields beyond id/name)
+                // Priority: status, type, date, amount, role, class fields
+                def keyFieldPriority = [
+                    'statusId', 'status', 'productTypeEnumId', 'productAssocTypeEnumId', 
+                    'communicationEventTypeId', 'roleTypeId', 'partyClassificationId',
+                    'orderPartStatusId', 'placedDate', 'entryDate', 'fromDate', 'thruDate',
+                    'grandTotal', 'quantity', 'price', 'amount',
+                    'username', 'emailAddress', 'fromPartyId', 'toPartyId'
+                ]
+                
+                def extraFields = [:]
+                def extraCount = 0
+                for (fieldName in keyFieldPriority) {
+                    if (extraCount >= 3) break
+                    def value = row[fieldName]
+                    if (value != null && value != '' && value != id && value != name) {
+                        // Simplify enumId suffixes for display
+                        def displayKey = fieldName.replaceAll(/EnumId$/, '').replaceAll(/Id$/, '')
+                        extraFields[displayKey] = value.toString()
+                        extraCount++
+                    }
+                }
+                
+                // If no priority fields found, add first 2-3 non-empty visible fields
+                if (extraCount == 0) {
+                    for (fieldDef in formData.fields?.take(8)) {
+                        if (extraCount >= 3) break
+                        def fieldName = fieldDef.name
+                        if (fieldDef.type == 'hidden') continue
+                        if (fieldName in ['id', 'pseudoId', 'name', 'productId', 'partyId', 'submitButton']) continue
+                        def value = row[fieldName]
+                        if (value != null && value != '' && value != id && value != name) {
+                            extraFields[fieldName] = value.toString()
+                            extraCount++
+                        }
+                    }
+                }
+                
+                if (extraFields) rowInfo.data = extraFields
+                
                 // Find link for this row
                 // Find link for this row
                 def rowLinks = data.links?.findAll { link ->
                 def rowLinks = data.links?.findAll { link ->
                     link.path?.contains(id?.toString()) && link.type == "navigation"
                     link.path?.contains(id?.toString()) && link.type == "navigation"
@@ -1178,6 +1306,12 @@ def wikiInstructions = getWikiInstructions(inputScreenPath)
                     }
                     }
                 }
                 }
                 
                 
+                // Set resolvedScreenDef if we successfully traversed the path
+                if (reachedIndex >= 0 && currentSd && reachedIndex == (screenPathList.size() - 1)) {
+                    resolvedScreenDef = currentSd
+                    ec.logger.info("MCP Path Resolution: Resolved to screen '${resolvedScreenDef?.getScreenName()}' via literal path")
+                }
+                
                 // 2. If literal resolution failed, try Component-based resolution
                 // 2. If literal resolution failed, try Component-based resolution
                 if (reachedIndex == -1 && pathSegments.size() >= 2) {
                 if (reachedIndex == -1 && pathSegments.size() >= 2) {
                     def componentName = pathSegments[0]
                     def componentName = pathSegments[0]
@@ -1261,20 +1395,62 @@ def wikiInstructions = getWikiInstructions(inputScreenPath)
             def actionResult = [:]
             def actionResult = [:]
             
             
             if (action && resolvedScreenDef) {
             if (action && resolvedScreenDef) {
-                // Verify the transition exists
-                def transition = resolvedScreenDef.getAllTransitions().find { it.getName() == action }
+                // Find the transition - must traverse default subscreens like discovery does
+                // because transitions may be defined on default subscreens, not the parent screen
+                def transition = null
+                def transitionScreenDef = null
+                def subscreenPath = ""  // Track the path through default subscreens
+                
+                def currentScreenDef = resolvedScreenDef
+                def depth = 0
+                while (currentScreenDef && depth < 5 && !transition) {
+                    // Check this screen for the transition
+                    transition = currentScreenDef.getAllTransitions().find { it.getName() == action }
+                    if (transition) {
+                        transitionScreenDef = currentScreenDef
+                        ec.logger.info("MCP: Found transition '${action}' on screen '${currentScreenDef.getScreenName()}' at depth ${depth}")
+                        break
+                    }
+                    
+                    // Check for default subscreen to continue traversal
+                    def defaultSubscreenName = currentScreenDef.getDefaultSubscreensItem()
+                    if (defaultSubscreenName) {
+                        def subscreenItem = currentScreenDef.getSubscreensItem(defaultSubscreenName)
+                        if (subscreenItem?.location) {
+                            try {
+                                def subscreenDef = currentScreenDef.sfi.getScreenDefinition(subscreenItem.location)
+                                if (subscreenDef) {
+                                    subscreenPath += "/" + defaultSubscreenName
+                                    currentScreenDef = subscreenDef
+                                    depth++
+                                } else {
+                                    currentScreenDef = null
+                                }
+                            } catch (Exception e) {
+                                ec.logger.warn("MCP: Could not load subscreen for transition lookup: ${e.message}")
+                                currentScreenDef = null
+                            }
+                        } else {
+                            currentScreenDef = null
+                        }
+                    } else {
+                        currentScreenDef = null
+                    }
+                }
+                
                 if (transition) {
                 if (transition) {
-                    // Append transition to path - framework will execute it via recursiveRunTransition
-                    relativePath = "${testScreenPath}/${action}"
+                    // Append subscreen path and transition to the render path
+                    // The framework needs the full path including default subscreens to find the transition
+                    relativePath = testScreenPath + subscreenPath + "/" + action
                     def serviceName = transition.getSingleServiceName()
                     def serviceName = transition.getSingleServiceName()
                     actionResult = [
                     actionResult = [
                         action: action,
                         action: action,
                         service: serviceName,
                         service: serviceName,
                         status: "pending"  // Will be updated after render based on errors
                         status: "pending"  // Will be updated after render based on errors
                     ]
                     ]
-                    ec.logger.info("MCP Screen Execution: Will execute transition '${action}' via framework (service: ${serviceName ?: 'none'})")
+                    ec.logger.info("MCP Screen Execution: Will execute transition '${action}' via framework path '${relativePath}' (service: ${serviceName ?: 'none'})")
                 } else {
                 } else {
-                    ec.logger.warn("MCP Screen Execution: Action '${action}' not found in screen transitions")
+                    ec.logger.warn("MCP Screen Execution: Action '${action}' not found in screen transitions (checked ${depth + 1} screens in hierarchy)")
                     actionResult = [
                     actionResult = [
                         action: action,
                         action: action,
                         status: "error",
                         status: "error",
@@ -1300,9 +1476,52 @@ def wikiInstructions = getWikiInstructions(inputScreenPath)
                 def errorMessages = testRender.getErrorMessages()
                 def errorMessages = testRender.getErrorMessages()
                 def hasError = errorMessages && errorMessages.size() > 0
                 def hasError = errorMessages && errorMessages.size() > 0
                 
                 
+                // Also check JSON response for validation errors (more structured)
+                def jsonResponse = testRender.getJsonObject()
+                def validationErrors = []
+                def jsonErrors = []
+                if (jsonResponse instanceof Map) {
+                    // Extract structured validation errors from JSON response
+                    if (jsonResponse.validationErrors) {
+                        validationErrors = jsonResponse.validationErrors.collect { ve ->
+                            // ValidationError.getMap() returns: form, field, serviceName, message
+                            [
+                                field: ve.field ?: ve.fieldPretty,
+                                form: ve.form,
+                                service: ve.serviceName,
+                                message: ve.message ?: ve.messageWithFieldPretty ?: ve.toString()
+                            ]
+                        }
+                        hasError = true
+                    }
+                    // Also capture general errors from JSON
+                    if (jsonResponse.errors) {
+                        jsonErrors = jsonResponse.errors
+                        hasError = true
+                    }
+                }
+                
                 if (hasError) {
                 if (hasError) {
                     actionResult.status = "error"
                     actionResult.status = "error"
-                    actionResult.message = errorMessages.join("; ")
+                    
+                    // Build comprehensive error message
+                    def allMessages = []
+                    if (errorMessages) allMessages.addAll(errorMessages)
+                    if (jsonErrors) allMessages.addAll(jsonErrors)
+                    actionResult.message = allMessages.join("; ") ?: "Validation failed"
+                    
+                    // Add structured validation errors for field-level feedback
+                    if (validationErrors) {
+                        actionResult.validationErrors = validationErrors
+                        // Also add field-specific summary
+                        def fieldSummary = validationErrors.collect { ve ->
+                            ve.field ? "${ve.field}: ${ve.message}" : ve.message
+                        }.join("; ")
+                        if (!actionResult.message || actionResult.message == "Validation failed") {
+                            actionResult.message = fieldSummary
+                        }
+                    }
+                    
                     ec.logger.error("MCP Screen Execution: Transition '${action}' completed with errors: ${actionResult.message}")
                     ec.logger.error("MCP Screen Execution: Transition '${action}' completed with errors: ${actionResult.message}")
                 } else {
                 } else {
                     actionResult.status = "executed"
                     actionResult.status = "executed"
@@ -1329,6 +1548,24 @@ def wikiInstructions = getWikiInstructions(inputScreenPath)
                             }
                             }
                         }
                         }
                     }
                     }
+                    
+                    // Also check JSON response for result data
+                    if (jsonResponse instanceof Map) {
+                        // Copy any IDs from JSON response
+                        jsonResponse.each { key, value ->
+                            if (key.toString().endsWith('Id') && value && !key.toString().startsWith('_')) {
+                                def keyStr = key.toString()
+                                if (!['userId', 'username', 'sessionId', 'requestId'].contains(keyStr)) {
+                                    result[keyStr] = value
+                                }
+                            }
+                        }
+                        // Copy messages if present
+                        if (jsonResponse.messages) {
+                            actionResult.messages = jsonResponse.messages
+                        }
+                    }
+                    
                     if (result) {
                     if (result) {
                         actionResult.result = result
                         actionResult.result = result
                     }
                     }
@@ -1339,8 +1576,22 @@ def wikiInstructions = getWikiInstructions(inputScreenPath)
             // --- Semantic State Extraction ---
             // --- Semantic State Extraction ---
             def semanticState = [:]
             def semanticState = [:]
 
 
-            // Get final screen definition using resolved screen location
+            // Get final screen definition - prefer the actual rendered screen from ScreenRender
+            // This ensures we get the deepest screen in the path, not just the root
             def finalScreenDef = resolvedScreenDef
             def finalScreenDef = resolvedScreenDef
+            try {
+                def screenRender = testRender.getScreenRender()
+                if (screenRender?.screenUrlInfo?.screenPathDefList) {
+                    def pathDefList = screenRender.screenUrlInfo.screenPathDefList
+                    if (pathDefList.size() > 0) {
+                        // Get the last (deepest) screen in the path
+                        finalScreenDef = pathDefList.get(pathDefList.size() - 1)
+                        ec.logger.info("MCP: Using actual rendered screen '${finalScreenDef?.getScreenName()}' from screenPathDefList (${pathDefList.size()} screens in path)")
+                    }
+                }
+            } catch (Exception e) {
+                ec.logger.warn("MCP: Could not get screen from ScreenRender, using resolved: ${e.message}")
+            }
 
 
             if (finalScreenDef && postContext) {
             if (finalScreenDef && postContext) {
                 semanticState.screenPath = inputScreenPath
                 semanticState.screenPath = inputScreenPath
@@ -1355,30 +1606,72 @@ def wikiInstructions = getWikiInstructions(inputScreenPath)
                 }
                 }
                 
                 
                 // Extract transitions (Actions) with type classification and metadata
                 // Extract transitions (Actions) with type classification and metadata
+                // Collect from current screen AND active subscreens (iterative traversal)
                 semanticState.actions = []
                 semanticState.actions = []
-                finalScreenDef.getAllTransitions().each { trans ->
-                    def transName = trans.getName()
-                    def service = trans.getSingleServiceName()
+                def collectedTransitionNames = [] as Set
+                
+                // Build list of screens to process (current + default subscreens chain)
+                def screensToProcess = []
+                def currentScreenDef = finalScreenDef
+                def depth = 0
+                while (currentScreenDef && depth < 5) {
+                    screensToProcess << currentScreenDef
                     
                     
-                    // Classify action type
-                    def actionType = "screen-transition"
-                    def transNameLower = transName?.toString()?.toLowerCase() ?: ''
-                    
-                    if (service) {
-                        actionType = "service-action"
-                    } else if (transNameLower.contains('delete')) {
-                        actionType = "delete-action"
-                    } else if (transNameLower.startsWith('form') || transNameLower == 'find' || transNameLower == 'search') {
-                        actionType = "form-action"
+                    // Check for default subscreen
+                    def defaultSubscreenName = currentScreenDef.getDefaultSubscreensItem()
+                    if (defaultSubscreenName) {
+                        def subscreenItem = currentScreenDef.getSubscreensItem(defaultSubscreenName)
+                        if (subscreenItem?.location) {
+                            try {
+                                def subscreenDef = currentScreenDef.sfi.getScreenDefinition(subscreenItem.location)
+                                if (subscreenDef) {
+                                    ec.logger.info("MCP: Adding default subscreen '${defaultSubscreenName}' at ${subscreenItem.location} to traversal")
+                                    currentScreenDef = subscreenDef
+                                    depth++
+                                } else {
+                                    currentScreenDef = null
+                                }
+                            } catch (Exception e) {
+                                ec.logger.warn("MCP: Could not load subscreen ${subscreenItem.location}: ${e.message}")
+                                currentScreenDef = null
+                            }
+                        } else {
+                            currentScreenDef = null
+                        }
+                    } else {
+                        currentScreenDef = null
+                    }
+                }
+                
+                // Now collect transitions from all screens
+                screensToProcess.each { screenDef ->
+                    screenDef.getAllTransitions().each { trans ->
+                        def transName = trans.getName()
+                        if (collectedTransitionNames.contains(transName)) return // skip duplicates
+                        collectedTransitionNames.add(transName)
+                        
+                        def service = trans.getSingleServiceName()
+                        
+                        // Classify action type
+                        def actionType = "screen-transition"
+                        def transNameLower = transName?.toString()?.toLowerCase() ?: ''
+                        
+                        if (service) {
+                            actionType = "service-action"
+                        } else if (transNameLower.contains('delete')) {
+                            actionType = "delete-action"
+                        } else if (transNameLower.startsWith('form') || transNameLower == 'find' || transNameLower == 'search') {
+                            actionType = "form-action"
+                        }
+                        
+                        def actionInfo = [
+                            name: transName,
+                            service: service,
+                            type: actionType
+                        ]
+                        
+                        semanticState.actions << actionInfo
                     }
                     }
-                    
-                    def actionInfo = [
-                        name: transName,
-                        service: service,
-                        type: actionType
-                    ]
-                    
-                    semanticState.actions << actionInfo
                 }
                 }
                 
                 
                 // 3. Extract parameters with metadata
                 // 3. Extract parameters with metadata
@@ -2236,7 +2529,7 @@ def wikiInstructions = getWikiInstructions(inputScreenPath)
     </service>
     </service>
 
 
     <service verb="mcp" noun="SearchScreens" authenticate="false" allow-remote="true" transaction-timeout="60">
     <service verb="mcp" noun="SearchScreens" authenticate="false" allow-remote="true" transaction-timeout="60">
-        <description>Search for screens by name or path.</description>
+        <description>Search for screens by name, path, or description. Builds an index by walking the screen tree.</description>
         <in-parameters>
         <in-parameters>
             <parameter name="query" required="true"/>
             <parameter name="query" required="true"/>
             <parameter name="sessionId"/>
             <parameter name="sessionId"/>
@@ -2250,39 +2543,178 @@ def wikiInstructions = getWikiInstructions(inputScreenPath)
                 
                 
                 ExecutionContext ec = context.ec
                 ExecutionContext ec = context.ec
                 def matches = []
                 def matches = []
+                def queryLower = query.toLowerCase()
                 
                 
-                // Helper to convert full component path to simple forward-slash path
-                def convertToSimplePath = { fullPath ->
-                    if (!fullPath) return null
-                    String cleanPath = fullPath
-                    if (cleanPath.startsWith("component://")) cleanPath = cleanPath.substring(12)
-                    if (cleanPath.endsWith(".xml")) cleanPath = cleanPath.substring(0, cleanPath.length() - 4)
-                    List<String> parts = cleanPath.split('/').toList()
-                    if (parts.size() > 1 && parts[1] == "screen") parts.remove(1)
-                    return parts.join('/')
+                // Screen index cache key - use Moqui's cache API properly
+                def cacheKey = "MCP_SCREEN_INDEX"
+                def mcpCache = ec.cache.getCache("mcp.screen.index")
+                def screenIndex = mcpCache.get(cacheKey)
+                
+                if (!screenIndex) {
+                    ec.logger.info("SearchScreens: Building screen index...")
+                    screenIndex = []
+                    
+                    // Helper to load wiki description for a path
+                    def loadWikiDescription = { simplePath ->
+                        try {
+                            def wikiPage = ec.entity.find("moqui.resource.wiki.WikiPage")
+                                .condition("wikiSpaceId", "MCP_SCREEN_DOCS")
+                                .condition("pagePath", simplePath)
+                                .useCache(true)
+                                .one()
+                            
+                            if (wikiPage) {
+                                def dbResource = ec.entity.find("moqui.resource.DbResource")
+                                    .condition("parentResourceId", "WIKI_MCP_SCREEN_DOCS")
+                                    .condition("filename", wikiPage.pagePath + ".md")
+                                    .one()
+                                
+                                if (dbResource) {
+                                    def dbResourceFile = ec.entity.find("moqui.resource.DbResourceFile")
+                                        .condition("resourceId", dbResource.resourceId)
+                                        .one()
+                                    
+                                    if (dbResourceFile && dbResourceFile.fileData) {
+                                        def content = new String(dbResourceFile.fileData.getBytes(1L, dbResourceFile.fileData.length() as int), "UTF-8")
+                                        // Extract first line or sentence as description
+                                        def lines = content.split('\n')
+                                        for (line in lines) {
+                                            line = line.trim()
+                                            if (line && !line.startsWith('#')) {
+                                                return line.length() > 150 ? line.substring(0, 147) + "..." : line
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        } catch (Exception e) {
+                            ec.logger.debug("SearchScreens: Error loading wiki for ${simplePath}: ${e.message}")
+                        }
+                        return null
+                    }
+                    
+                    // Recursive function to walk screen tree
+                    def walkScreenTree
+                    walkScreenTree = { screenDef, basePath, depth ->
+                        if (depth > 6 || !screenDef) return  // Limit depth to prevent infinite loops
+                        
+                        try {
+                            screenDef.getSubscreensItemsSorted().each { subItem ->
+                                def subName = subItem.getName()
+                                def subPath = basePath ? "${basePath}/${subName}" : subName
+                                def subLocation = subItem.getLocation()
+                                
+                                if (subLocation) {
+                                    // Get wiki description or generate from name
+                                    def description = loadWikiDescription(subPath)
+                                    if (!description) {
+                                        // Generate description from screen name
+                                        def humanName = subName.replaceAll(/([A-Z])/, ' $1').trim()
+                                        description = "Screen: ${humanName}"
+                                    }
+                                    
+                                    // Extract screen name for search
+                                    def screenName = subName
+                                    
+                                    screenIndex << [
+                                        path: subPath,
+                                        name: screenName,
+                                        description: description,
+                                        depth: depth
+                                    ]
+                                    
+                                    // Recurse into subscreen
+                                    try {
+                                        def subScreenDef = ec.screen.getScreenDefinition(subLocation)
+                                        if (subScreenDef) {
+                                            walkScreenTree(subScreenDef, subPath, depth + 1)
+                                        }
+                                    } catch (Exception e) {
+                                        ec.logger.debug("SearchScreens: Could not load subscreen ${subPath}: ${e.message}")
+                                    }
+                                }
+                            }
+                        } catch (Exception e) {
+                            ec.logger.debug("SearchScreens: Error walking ${basePath}: ${e.message}")
+                        }
+                    }
+                    
+                    // Start from webroot
+                    def webrootSd = ec.screen.getScreenDefinition("component://webroot/screen/webroot.xml")
+                    if (webrootSd) {
+                        walkScreenTree(webrootSd, "", 0)
+                    }
+                    
+                    // Cache the index
+                    mcpCache.put(cacheKey, screenIndex)
+                    ec.logger.info("SearchScreens: Built index with ${screenIndex.size()} screens")
                 }
                 }
-
-                // Search all screens known to the system
-                def aacvList = ec.entity.find("moqui.security.ArtifactAuthzCheckView")
-                    .condition("artifactTypeEnumId", "AT_XML_SCREEN")
-                    .condition("artifactName", "like", "%${query}%")
-                    .selectField("artifactName")
-                    .distinct(true)
-                    .disableAuthz()
-                    .limit(20)
-                    .list()
                 
                 
-                for (hit in aacvList) {
-                    def simplePath = convertToSimplePath(hit.artifactName)
-                    if (simplePath) {
-                        matches << [
-                            path: simplePath,
-                            description: "Screen: ${hit.artifactName}"
-                        ]
+                // Search the index
+                def scored = []
+                for (screen in screenIndex) {
+                    def score = 0
+                    def nameLower = screen.name?.toLowerCase() ?: ""
+                    def pathLower = screen.path?.toLowerCase() ?: ""
+                    def descLower = screen.description?.toLowerCase() ?: ""
+                    
+                    // Exact name match (highest priority)
+                    if (nameLower == queryLower) {
+                        score += 100
+                    }
+                    // Name starts with query
+                    else if (nameLower.startsWith(queryLower)) {
+                        score += 50
                     }
                     }
+                    // Name contains query
+                    else if (nameLower.contains(queryLower)) {
+                        score += 30
+                    }
+                    
+                    // Path contains query
+                    if (pathLower.contains(queryLower)) {
+                        score += 20
+                    }
+                    
+                    // Description contains query
+                    if (descLower.contains(queryLower)) {
+                        score += 10
+                    }
+                    
+                    // Prefer shallower screens (more likely to be entry points)
+                    if (score > 0) {
+                        score -= (screen.depth ?: 0) * 2
+                        scored << [screen: screen, score: score]
+                    }
+                }
+                
+                // Sort by score descending, take top 15
+                scored.sort { -it.score }
+                def topMatches = scored.take(15)
+                
+                for (item in topMatches) {
+                    matches << [
+                        path: item.screen.path,
+                        name: item.screen.name,
+                        description: item.screen.description
+                    ]
                 }
                 }
                 
                 
-                result = [matches: matches]
+                // Add hint if no matches
+                def hint = null
+                if (matches.isEmpty()) {
+                    hint = "No screens found matching '${query}'. Try broader terms like 'product', 'order', 'party', or use moqui_browse_screens to explore."
+                } else if (matches.size() >= 15) {
+                    hint = "Showing top 15 results. Refine your search for more specific matches."
+                }
+                
+                def resultMap = hint ? [matches: matches, hint: hint] : [matches: matches]
+                
+                // Return in MCP format - content array with JSON text
+                result = [
+                    content: [[type: "text", text: new groovy.json.JsonBuilder(resultMap).toString()]],
+                    isError: false
+                ]
             ]]></script>
             ]]></script>
         </actions>
         </actions>
     </service>
     </service>
@@ -2343,6 +2775,45 @@ def wikiInstructions = getWikiInstructions(inputScreenPath)
                             required: ["path"]
                             required: ["path"]
                         ]
                         ]
                      ],
                      ],
+                     [
+                        name: "moqui_get_help",
+                        title: "Get Help",
+                        description: "Fetch extended documentation for a screen or service. Use URIs from 'describedby' fields in ARIA responses.",
+                        inputSchema: [
+                            type: "object",
+                            properties: [
+                                "uri": [type: "string", description: "Help URI (e.g., 'wiki:screen:EditProduct' or 'wiki:service:ProductFeature')"]
+                            ],
+                            required: ["uri"]
+                        ]
+                     ],
+                     [
+                        name: "moqui_batch_operations",
+                        title: "Batch Operations",
+                        description: "Execute multiple screen operations in sequence. Stops on first error. Returns results for each operation.",
+                        inputSchema: [
+                            type: "object",
+                            properties: [
+                                "operations": [
+                                    type: "array",
+                                    description: "Array of operations to execute in sequence",
+                                    items: [
+                                        type: "object",
+                                        properties: [
+                                            "id": [type: "string", description: "Optional operation identifier for result tracking"],
+                                            "path": [type: "string", description: "Screen path"],
+                                            "action": [type: "string", description: "Action/transition to execute"],
+                                            "parameters": [type: "object", description: "Parameters for the action"]
+                                        ],
+                                        required: ["path", "action"]
+                                    ]
+                                ],
+                                "stopOnError": [type: "boolean", description: "Stop execution on first error (default: true)"],
+                                "returnLastOnly": [type: "boolean", description: "Return only last operation result (default: false)"]
+                            ],
+                            required: ["operations"]
+                        ]
+                     ],
                       [
                       [
                         name: "prompts_list",
                         name: "prompts_list",
                         title: "List Prompts",
                         title: "List Prompts",
@@ -2402,6 +2873,270 @@ def wikiInstructions = getWikiInstructions(inputScreenPath)
         </actions>
         </actions>
     </service>
     </service>
 
 
+    <service verb="mcp" noun="GetHelp" authenticate="true" allow-remote="true" transaction-timeout="30">
+        <description>Fetch extended documentation for a screen or service. Use URIs from 'describedby' fields in ARIA responses.</description>
+        <in-parameters>
+            <parameter name="uri" required="true"><description>Help URI (e.g., 'wiki:screen:EditProduct' or 'wiki:service:ProductFeature')</description></parameter>
+        </in-parameters>
+        <out-parameters>
+            <parameter name="result" type="Map"/>
+        </out-parameters>
+        <actions>
+            <script><![CDATA[
+                import org.moqui.context.ExecutionContext
+                import groovy.json.JsonBuilder
+                
+                ExecutionContext ec = context.ec
+                
+                def content = null
+                def metadata = [uri: uri]
+                
+                // Parse URI format: wiki:type:name
+                // e.g., wiki:screen:EditProduct, wiki:service:ProductFeature
+                if (uri?.startsWith("wiki:")) {
+                    def parts = uri.split(":", 3)
+                    if (parts.length >= 3) {
+                        def wikiType = parts[1]  // screen, service
+                        def pageName = parts[2]
+                        
+                        metadata.type = wikiType
+                        metadata.name = pageName
+                        
+                        // Determine wiki space based on type
+                        def wikiSpaceId = null
+                        def pagePath = null
+                        
+                        switch (wikiType) {
+                            case "screen":
+                                wikiSpaceId = "MCP_SCREEN_DOCS"
+                                // Try to find by screen name in page path
+                                pagePath = pageName
+                                break
+                            case "service":
+                                wikiSpaceId = "MCP_SERVICE_DOCS"
+                                pagePath = pageName
+                                break
+                            default:
+                                wikiSpaceId = "MCP_SCREEN_DOCS"
+                                pagePath = pageName
+                        }
+                        
+                        // Try to find wiki page by path
+                        def wikiPage = ec.entity.find("moqui.resource.wiki.WikiPage")
+                            .condition("wikiSpaceId", wikiSpaceId)
+                            .condition("pagePath", pagePath)
+                            .useCache(true)
+                            .one()
+                        
+                        // If not found by exact path, try partial match
+                        if (!wikiPage) {
+                            def allPages = ec.entity.find("moqui.resource.wiki.WikiPage")
+                                .condition("wikiSpaceId", wikiSpaceId)
+                                .useCache(true)
+                                .list()
+                            wikiPage = allPages.find { it.pagePath?.endsWith(pagePath) || it.pagePath?.contains(pagePath) }
+                        }
+                        
+                        if (wikiPage) {
+                            // Use direct DbResource/DbResourceFile lookup (like BrowseScreens does)
+                            def parentResourceId = (wikiType == "service") ? "WIKI_MCP_SERVICE_DOCS" : "WIKI_MCP_SCREEN_DOCS"
+                            
+                            def dbResource = ec.entity.find("moqui.resource.DbResource")
+                                .condition("parentResourceId", parentResourceId)
+                                .condition("filename", wikiPage.pagePath + ".md")
+                                .one()
+                            
+
+                            
+                            if (dbResource) {
+                                def dbResourceFile = ec.entity.find("moqui.resource.DbResourceFile")
+                                    .condition("resourceId", dbResource.resourceId)
+                                    .condition("versionName", wikiPage.publishedVersionName)
+                                    .one()
+                                
+                                if (!dbResourceFile) {
+                                    dbResourceFile = ec.entity.find("moqui.resource.DbResourceFile")
+                                        .condition("resourceId", dbResource.resourceId)
+                                        .one()
+                                }
+                                
+                                if (dbResourceFile && dbResourceFile.fileData) {
+                                    content = new String(dbResourceFile.fileData.getBytes(new Long(1).longValue(), new Long(dbResourceFile.fileData.length()).intValue()), "UTF-8")
+                                    metadata.found = true
+                                    metadata.pagePath = wikiPage.pagePath
+                                    metadata.resourceId = dbResource.resourceId
+                                }
+                            }
+                        }
+                        
+                        if (!content) {
+                            metadata.found = false
+                            content = "No documentation found for ${wikiType}: ${pageName}. Available documentation can be found in the MCP_SCREEN_DOCS and MCP_SERVICE_DOCS wiki spaces."
+                        }
+                    }
+                } else {
+                    metadata.error = "Invalid URI format. Expected 'wiki:type:name' (e.g., 'wiki:service:ProductFeature')"
+                    content = metadata.error
+                }
+                
+                def resultData = [
+                    content: content,
+                    metadata: metadata
+                ]
+                
+                result = [
+                    content: [[type: "text", text: new JsonBuilder(resultData).toString()]],
+                    isError: false
+                ]
+            ]]></script>
+        </actions>
+    </service>
+
     <!-- NOTE: handle#McpRequest service removed - functionality moved to screen/webapp.xml for unified handling -->
     <!-- NOTE: handle#McpRequest service removed - functionality moved to screen/webapp.xml for unified handling -->
 
 
+    <service verb="mcp" noun="BatchOperations" authenticate="true" allow-remote="true" transaction-timeout="120">
+        <description>Execute multiple screen operations in sequence. Stops on first error by default. Returns results for each operation.</description>
+        <in-parameters>
+            <parameter name="operations" type="List" required="true"><description>Array of operations to execute in sequence</description></parameter>
+            <parameter name="stopOnError" type="Boolean" default="true"><description>Stop execution on first error (default: true)</description></parameter>
+            <parameter name="returnLastOnly" type="Boolean" default="false"><description>Return only last operation result (default: false)</description></parameter>
+        </in-parameters>
+        <out-parameters>
+            <parameter name="result" type="Map"/>
+        </out-parameters>
+        <actions>
+            <script><![CDATA[
+                import org.moqui.context.ExecutionContext
+                import groovy.json.JsonBuilder
+                import groovy.json.JsonSlurper
+                
+                ExecutionContext ec = context.ec
+                
+                def results = []
+                def hasError = false
+                def lastResult = null
+                def executedCount = 0
+                
+                ec.logger.info("BatchOperations: Starting batch with ${operations?.size()} operations, stopOnError=${stopOnError}")
+                
+                for (int i = 0; i < operations.size(); i++) {
+                    def op = operations[i]
+                    def opId = op.id ?: "op_${i + 1}"
+                    
+                    ec.logger.info("BatchOperations: Executing operation ${opId}: path=${op.path}, action=${op.action}")
+                    
+                    try {
+                        // Call browse screens for each operation
+                        def browseResult = ec.service.sync().name("McpServices.mcp#BrowseScreens")
+                            .parameters([
+                                path: op.path,
+                                action: op.action,
+                                parameters: op.parameters ?: [:],
+                                renderMode: "compact"  // Use compact mode for efficiency
+                            ])
+                            .call()
+                        
+                        // Extract the result content
+                        def opResult = [
+                            id: opId,
+                            path: op.path,
+                            action: op.action,
+                            status: "success"
+                        ]
+                        
+                        // Parse the result to check for errors
+                        if (browseResult?.result?.content) {
+                            def contentList = browseResult.result.content
+                            if (contentList && contentList.size() > 0) {
+                                def rawText = contentList[0].text
+                                if (rawText && rawText.startsWith("{")) {
+                                    try {
+                                        def parsed = new JsonSlurper().parseText(rawText)
+                                        
+                                        // Check if there's an action result with error
+                                        if (parsed.result?.status == "error" || parsed.actionResult?.status == "error") {
+                                            opResult.status = "error"
+                                            opResult.message = parsed.result?.message ?: parsed.actionResult?.message
+                                            opResult.validationErrors = parsed.result?.validationErrors ?: parsed.actionResult?.validationErrors
+                                            hasError = true
+                                        } else {
+                                            // Success - extract relevant data
+                                            opResult.result = parsed.result ?: parsed.actionResult
+                                            if (parsed.result?.result) {
+                                                // Copy any IDs for use in subsequent operations
+                                                opResult.outputIds = parsed.result.result
+                                            }
+                                        }
+                                    } catch (e) {
+                                        // JSON parse failed, treat as success but no parsed data
+                                        opResult.rawOutput = rawText
+                                    }
+                                }
+                            }
+                        }
+                        
+                        executedCount++
+                        lastResult = opResult
+                        results << opResult
+                        
+                        ec.logger.info("BatchOperations: Operation ${opId} completed with status=${opResult.status}")
+                        
+                        // Stop on error if requested
+                        if (hasError && stopOnError) {
+                            ec.logger.info("BatchOperations: Stopping batch due to error in operation ${opId}")
+                            break
+                        }
+                        
+                    } catch (Exception e) {
+                        def opResult = [
+                            id: opId,
+                            path: op.path,
+                            action: op.action,
+                            status: "error",
+                            message: "Exception: ${e.message}"
+                        ]
+                        results << opResult
+                        lastResult = opResult
+                        hasError = true
+                        executedCount++
+                        
+                        ec.logger.error("BatchOperations: Exception in operation ${opId}: ${e.message}", e)
+                        
+                        if (stopOnError) {
+                            break
+                        }
+                    }
+                }
+                
+                def summary = [
+                    totalOperations: operations.size(),
+                    executedOperations: executedCount,
+                    successCount: results.count { it.status == "success" },
+                    errorCount: results.count { it.status == "error" },
+                    hasError: hasError
+                ]
+                
+                def resultData
+                if (returnLastOnly) {
+                    resultData = [
+                        summary: summary,
+                        result: lastResult
+                    ]
+                } else {
+                    resultData = [
+                        summary: summary,
+                        results: results
+                    ]
+                }
+                
+                ec.logger.info("BatchOperations: Completed. Summary: ${summary}")
+                
+                result = [
+                    content: [[type: "text", text: new JsonBuilder(resultData).toString()]],
+                    isError: hasError
+                ]
+            ]]></script>
+        </actions>
+    </service>
+
 </services>
 </services>
\ No newline at end of file