diff --git a/.github/prompts/crt-to-provar.prompt.md b/.github/prompts/crt-to-provar.prompt.md
new file mode 100644
index 00000000..9aa99d4e
--- /dev/null
+++ b/.github/prompts/crt-to-provar.prompt.md
@@ -0,0 +1,35 @@
+---
+mode: agent
+description: Convert a CRT (Copado Robotic Testing) test into a Provar XML test case using the Provar MCP tools for corpus grounding and validation
+---
+
+You are a Provar test migration expert. Migrate the CRT test below to Provar.
+
+## Source format — CRT
+
+CRT is a keyword-driven framework built on Robot Framework (QEditor-authored):
+
+- `ClickText <label>` → click an element by visible label
+- `TypeText <field> <value>` → type into a field
+- `VerifyText <text>` → assert text is present on the page
+- `SelectDropdown <field> <value>` → choose a picklist option
+- `OpenBrowser <url>` → open browser / Salesforce login
+
+Robot Framework sections: `*** Keywords ***` = reusable blocks, `*** Test Cases ***` = one file per test.
+
+## Migration workflow
+
+1. **Get examples** — call `provar.qualityhub.examples.retrieve` with keywords that describe the test scenario (e.g. "create account", "close opportunity"). Use the returned XML examples as the sole reference for Provar format and step patterns.
+   If the response has `"count": 0` with a `"warning"` field (API unavailable or not configured), fall back: read the `provar://docs/step-reference` MCP resource for step types and attribute formats, then continue with generation based on that reference.
+2. **Generate** — produce valid Provar XML that captures the intent of the source test, based on the retrieved examples. Omit login/browser setup — Provar handles that via Connection Manager.
+3. **Write** — save the XML to the `tests/` directory in the Provar project.
+4. **Validate** — call `provar.testcase.validate` on the saved file. Fix any errors and re-validate until clean.
+5. **Report** — summarise what was migrated and flag any unmappable steps as `<!-- TODO: manual step — <original QWord> -->`.
+
+## CRT Source
+
+Paste your CRT test here (QWord steps or `.robot` file):
+
+```
+[PASTE CRT TEST HERE]
+```
diff --git a/.github/prompts/playwright-to-provar.prompt.md b/.github/prompts/playwright-to-provar.prompt.md
new file mode 100644
index 00000000..c56788d1
--- /dev/null
+++ b/.github/prompts/playwright-to-provar.prompt.md
@@ -0,0 +1,39 @@
+---
+mode: agent
+description: Convert a Playwright test (TypeScript/JavaScript) into a Provar XML test case using the Provar MCP tools for corpus grounding and validation
+---
+
+You are a Provar test migration expert. Migrate the Playwright test below to Provar.
+
+## Source format — Playwright
+
+Common patterns to recognise:
+
+- `page.goto(url)` / login fixture → Salesforce login
+- `getByLabel(label).click()` → click by visible label
+- `getByRole('button', {name}).click()` → click by button name
+- `getByLabel(label).fill(value)` → fill a field by label
+- `locator(selector).fill(value)` → fill by XPath/CSS
+- `locator.selectOption(value)` → choose a picklist option
+- `expect(locator).toHaveValue(val)` → assert a field value
+- `expect(locator).toBeVisible()` → assert element is visible
+- `expect(page).toContainText(text)` → assert text on page
+- `page.waitForLoadState()` / `waitForSelector()` → wait conditions
+- `beforeEach` → test setup including login
+
+## Migration workflow
+
+1. **Get examples** — call `provar.qualityhub.examples.retrieve` with keywords describing the test scenario (e.g. "create contact", "close opportunity"). Use the returned XML examples as the sole reference for Provar format and step patterns.
+   If the response has `"count": 0` with a `"warning"` field (API unavailable or not configured), fall back: read the `provar://docs/step-reference` MCP resource for step types and attribute formats, then continue with generation based on that reference.
+2. **Generate** — produce valid Provar XML based on the retrieved examples. Omit login/navigation setup — Provar handles Salesforce sessions via Connection Manager.
+3. **Write** — save the XML to the `tests/` directory in the Provar project.
+4. **Validate** — call `provar.testcase.validate` on the saved file. Fix any errors and re-validate until clean.
+5. **Report** — summarise what was migrated and flag any unmappable steps as `<!-- TODO: manual step — <original code> -->`.
+
+## Playwright Source
+
+Paste your Playwright test here (TypeScript or JavaScript):
+
+```typescript
+[PASTE PLAYWRIGHT TEST HERE]
+```
diff --git a/.github/prompts/selenium-to-provar.prompt.md b/.github/prompts/selenium-to-provar.prompt.md
new file mode 100644
index 00000000..6cee313b
--- /dev/null
+++ b/.github/prompts/selenium-to-provar.prompt.md
@@ -0,0 +1,36 @@
+---
+mode: agent
+description: Convert a Selenium WebDriver test (Java/Python/JS) into a Provar XML test case using the Provar MCP tools for corpus grounding and validation
+---
+
+You are a Provar test migration expert. Migrate the Selenium test below to Provar.
+
+## Source format — Selenium WebDriver
+
+Common patterns to recognise:
+
+- `driver.get(url)` / `navigate().to()` → Salesforce login
+- `findElement(By.linkText/name).click()` → click by visible label
+- `findElement(...).sendKeys(value)` → type into a field
+- `Select.selectByVisibleText(val)` → choose a picklist option
+- `findElement(...).getText()` + assertion → verify a field value
+- `WebDriverWait` / `ExpectedConditions` → wait for element
+- `@Before` / `setUp()` → test setup including login
+- `@After` / `tearDown()` → cleanup
+
+## Migration workflow
+
+1. **Get examples** — call `provar.qualityhub.examples.retrieve` with keywords describing the test scenario (e.g. "create opportunity", "convert lead"). Use the returned XML examples as the sole reference for Provar format and step patterns.
+   If the response has `"count": 0` with a `"warning"` field (API unavailable or not configured), fall back: read the `provar://docs/step-reference` MCP resource for step types and attribute formats, then continue with generation based on that reference.
+2. **Generate** — produce valid Provar XML based on the retrieved examples. Omit browser/login setup — Provar handles Salesforce sessions via Connection Manager.
+3. **Write** — save the XML to the `tests/` directory in the Provar project.
+4. **Validate** — call `provar.testcase.validate` on the saved file. Fix any errors and re-validate until clean.
+5. **Report** — summarise what was migrated and flag any unmappable steps as `<!-- TODO: manual step — <original code> -->`.
+
+## Selenium Source
+
+Paste your Selenium test here (Java, Python, or JavaScript):
+
+```
+[PASTE SELENIUM TEST HERE]
+```
diff --git a/README.md b/README.md
index 92d62aaf..7ea495e0 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ claude mcp add provar -s user -- sf provar mcp start --allowed-paths /path/to/yo
 
 > **Windows (Claude Desktop):** Use `sf.cmd` instead of `sf` if the server fails to start.
 
-📖 **[docs/mcp.md](https://github.com/ProvarTesting/provardx-cli/blob/main/docs/mcp.md) — full setup, all 35+ tools, troubleshooting.**
+📖 **[docs/mcp.md](https://github.com/ProvarTesting/provardx-cli/blob/main/docs/mcp.md) — full setup, all 35+ tools, 7 MCP prompts, troubleshooting.**
 
 ---
 
diff --git a/assets/icon.png b/assets/icon.png
new file mode 100644
index 00000000..f5b1738e
Binary files /dev/null and b/assets/icon.png differ
diff --git a/docs/PROVAR_TEST_STEP_REFERENCE.md b/docs/PROVAR_TEST_STEP_REFERENCE.md
new file mode 100644
index 00000000..0762ad03
--- /dev/null
+++ b/docs/PROVAR_TEST_STEP_REFERENCE.md
@@ -0,0 +1,1430 @@
+# Provar Test Step Reference
+
+> **Source of truth** for AI-assisted test generation in the provardx-cli / Quality Hub MCP toolchain.
+> All examples are sourced from the SalesCloud corpus. The `provar.qualityhub.examples.retrieve` tool returns real
+> examples for additional grounding; `provar.testcase.validate` enforces all rules documented here.
+
+---
+
+## API ID Reference
+
+| Step Type             | API ID                                                                   |
+| --------------------- | ------------------------------------------------------------------------ |
+| **Connection**        |                                                                          |
+| ApexConnect           | `com.provar.plugins.forcedotcom.core.testapis.ApexConnect`               |
+| UiConnect             | `com.provar.plugins.forcedotcom.core.ui.UiConnect`                       |
+| **Apex CRUD**         |                                                                          |
+| ApexCreateObject      | `com.provar.plugins.forcedotcom.core.testapis.ApexCreateObject`          |
+| ApexReadObject        | `com.provar.plugins.forcedotcom.core.testapis.ApexReadObject`            |
+| ApexUpdateObject      | `com.provar.plugins.forcedotcom.core.testapis.ApexUpdateObject`          |
+| ApexDeleteObject      | `com.provar.plugins.forcedotcom.core.testapis.ApexDeleteObject`          |
+| ApexSoqlQuery         | `com.provar.plugins.forcedotcom.core.testapis.ApexSoqlQuery`             |
+| **Apex Advanced**     |                                                                          |
+| ApexBulk              | `com.provar.plugins.forcedotcom.core.testapis.ApexBulk`                  |
+| ApexExecute           | `com.provar.plugins.forcedotcom.core.testapis.ApexExecute`               |
+| ApexConvertLead       | `com.provar.plugins.forcedotcom.core.testapis.ApexConvertLead`           |
+| ApexExtractLayout     | `com.provar.plugins.forcedotcom.core.testapis.ApexExtractLayout`         |
+| ApexAssertLayout      | `com.provar.plugins.forcedotcom.core.testapis.ApexAssertLayout`          |
+| ApexApproveWorkItem   | `com.provar.plugins.forcedotcom.core.testapis.ApexApproveWorkItem`       |
+| ApexSubmitForApproval | `com.provar.plugins.forcedotcom.core.testapis.ApexSubmitForApproval`     |
+| ApexLogForCleanup     | `com.provar.plugins.forcedotcom.core.testapis.ApexLogForCleanup`         |
+| **UI Steps**          |                                                                          |
+| UiWithScreen          | `com.provar.plugins.forcedotcom.core.ui.UiWithScreen`                    |
+| UiDoAction            | `com.provar.plugins.forcedotcom.core.ui.UiDoAction`                      |
+| UiAssert              | `com.provar.plugins.forcedotcom.core.ui.UiAssert`                        |
+| UiWithRow             | `com.provar.plugins.forcedotcom.core.ui.UiWithRow`                       |
+| UiHandleAlert         | `com.provar.plugins.forcedotcom.core.ui.UiHandleAlert`                   |
+| UiNavigate            | `com.provar.plugins.forcedotcom.core.ui.UiNavigate`                      |
+| **Control Flow**      |                                                                          |
+| SetValues             | `com.provar.plugins.bundled.apis.control.SetValues`                      |
+| StepGroup             | `com.provar.plugins.bundled.apis.control.StepGroup`                      |
+| If                    | `com.provar.plugins.bundled.apis.If`                                     |
+| ForEach               | `com.provar.plugins.bundled.apis.control.ForEach`                        |
+| DoWhile               | `com.provar.plugins.bundled.apis.control.DoWhile`                        |
+| WaitFor               | `com.provar.plugins.bundled.apis.control.WaitFor`                        |
+| TryCatchFinally       | `com.provar.plugins.bundled.apis.control.TryCatchFinally`                |
+| Switch                | `com.provar.plugins.bundled.apis.Switch`                                 |
+| Sleep                 | `com.provar.plugins.bundled.apis.control.Sleep`                          |
+| Fail                  | `com.provar.plugins.bundled.apis.control.Fail`                           |
+| CallTest              | `com.provar.plugins.bundled.apis.control.CallTest`                       |
+| **Assertions**        |                                                                          |
+| AssertValues          | `com.provar.plugins.bundled.apis.AssertValues`                           |
+| **BDD**               |                                                                          |
+| Given                 | `com.provar.plugins.bundled.apis.bdd.Given`                              |
+| When                  | `com.provar.plugins.bundled.apis.bdd.When`                               |
+| Then                  | `com.provar.plugins.bundled.apis.bdd.Then`                               |
+| And                   | `com.provar.plugins.bundled.apis.bdd.And`                                |
+| But                   | `com.provar.plugins.bundled.apis.bdd.But`                                |
+| **Design**            |                                                                          |
+| ActualResult          | `com.provar.plugins.bundled.apis.control.ActualResult`                   |
+| DesignStep            | `com.provar.plugins.bundled.apis.control.DesignStep`                     |
+| **Database**          |                                                                          |
+| DbConnect             | `com.provar.plugins.bundled.apis.db.DbConnect`                           |
+| DbRead                | `com.provar.plugins.bundled.apis.db.DbRead`                              |
+| DbInsert              | `com.provar.plugins.bundled.apis.db.DbInsert`                            |
+| DbUpdate              | `com.provar.plugins.bundled.apis.db.DbUpdate`                            |
+| DbDelete              | `com.provar.plugins.bundled.apis.db.DbDelete`                            |
+| SqlQuery              | `com.provar.plugins.bundled.apis.db.SqlQuery`                            |
+| **Web Service**       |                                                                          |
+| WebConnect            | `com.provar.plugins.bundled.apis.restservice.WebConnect`                 |
+| RestRequest           | `com.provar.plugins.bundled.apis.restservice.RestRequest`                |
+| SoapRequest           | `com.provar.plugins.bundled.apis.restservice.SoapRequest`                |
+| **Messaging**         |                                                                          |
+| PublishMessage        | `com.provar.plugins.bundled.apis.messaging.PublishMessage`               |
+| Subscribe             | `com.provar.plugins.bundled.apis.messaging.Subscribe`                    |
+| ReceiveMessage        | `com.provar.plugins.bundled.apis.messaging.ReceiveMessage`               |
+| SendMessage           | `com.provar.plugins.bundled.apis.messaging.SendMessage`                  |
+| **Utility**           |                                                                          |
+| ListCompare           | `com.provar.plugins.bundled.apis.list.ListCompare`                       |
+| Match                 | `com.provar.plugins.bundled.apis.string.Match`                           |
+| Read                  | `com.provar.plugins.bundled.apis.io.Read`                                |
+| Write                 | `com.provar.plugins.bundled.apis.io.Write`                               |
+| Split                 | `com.provar.plugins.bundled.apis.string.Split`                           |
+| Replace               | `com.provar.plugins.bundled.apis.string.Replace`                         |
+| **ProvarAI / Labs**   |                                                                          |
+| GenerateTestData      | `com.provar.plugins.forcedotcom.core.testapis.generate.GenerateTestData` |
+| GenerateTestCase      | `com.provar.plugins.forcedotcom.core.testapis.GenerateTestCase`          |
+| PageObjectCleaner     | `com.provar.plugins.bundled.apis.provarlabs.PageObjectCleaner`           |
+
+---
+
+## Common AI Hallucinations — Do Not Use
+
+The following argument IDs look plausible but are invalid and will fail validation:
+
+| Invalid argument              | Correct alternative                                        |
+| ----------------------------- | ---------------------------------------------------------- |
+| `autoPopulateRequiredFields`  | Not supported — populate fields explicitly                 |
+| `assertObjectFieldsPopulated` | Use `UiAssert` or `ApexReadObject` instead                 |
+| `commandTimeout`              | Not a valid argument on any step                           |
+| `waitForPageLoad`             | Use `beforeWait`/`afterWait` with `uiWait` URI             |
+| `screenshotOnFailure`         | Use `captureBefore`/`captureAfter` (string "true"/"false") |
+| `closeAllOtherTabs`           | The correct id is `closeAllPrimaryTabs` (ApexConnect only) |
+| `connectionType`              | Not a step argument; connection type is implied by apiId   |
+
+---
+
+## Connection Steps
+
+### ApexConnect
+
+Establishes a Salesforce connection (API + optional UI). Usually the first step in every test. Use `autoCleanup="true"` to automatically log out after the test; omit it only when you want the connection to persist into a parent scope.
+
+> **`connectionId` must use `valueClass="id"`** (a GUID string), not `valueClass="string"`. The validator
+> enforces this (rule APEX-CONNECT-CONNID-001).
+
+> **ApexConnect vs UiConnect:** ApexConnect opens both an API connection and (optionally) a UI browser session.
+> UiConnect opens only a browser session, using an existing ApexConnect result as its Salesforce credential.
+> In most test cases you need only ApexConnect.
+
+```xml
+<apiCall apiId="com.provar.plugins.forcedotcom.core.testapis.ApexConnect"
+         name="ApexConnect" testItemId="1"
+         title="Salesforce Connect: SalesUser (Test)">
+  <arguments>
+    <argument id="connectionName">
+      <value class="value" valueClass="string">SalesUser</value>
+    </argument>
+    <argument id="connectionId">
+      <value class="value" valueClass="id">74c34c63-ad34-43d9-bb12-cd783bd9bcdd</value>
+    </argument>
+    <argument id="resultName">
+      <value class="value" valueClass="string">DemoOrg</value>
+    </argument>
+    <argument id="resultScope">
+      <value class="value" valueClass="string">Test</value>
+    </argument>
+    <argument id="uiApplicationName">
+      <value class="value" valueClass="string">LightningSales</value>
+    </argument>
+    <argument id="quickUiLogin">
+      <value class="value" valueClass="boolean">true</value>
+    </argument>
+    <argument id="closeAllPrimaryTabs">
+      <value class="value" valueClass="boolean">true</value>
+    </argument>
+    <argument id="reuseConnectionName"/>
+    <argument id="alreadyOpenBehaviour">
+      <value class="value" valueClass="string">Fail</value>
+    </argument>
+    <argument id="privateBrowsingMode"/>
+    <argument id="enableObjectIdLogging">
+      <value class="value" valueClass="boolean">true</value>
+    </argument>
+    <argument id="autoCleanup">
+      <value class="value" valueClass="boolean">true</value>
+    </argument>
+    <argument id="cleanupConnectionName"/>
+    <argument id="lightningMode">
+      <value class="value" valueClass="string">enable</value>
+    </argument>
+    <argument id="webBrowser"/>
+  </arguments>
+</apiCall>
+```
+
+**Valid `alreadyOpenBehaviour` values:** `Reuse` | `Fail`
+**Valid `lightningMode` values:** `enable` | `default`
+**Valid `resultScope` values:** `Test` | `Global` | `Folder`
+
+### UiConnect
+
+Opens a browser-only UI session. Use this when you have a separate ApexConnect for API operations and need an independent browser window. Fewer arguments than ApexConnect — it does not manage Salesforce API credentials.
+
+> **UiConnect does NOT accept:** `autoCleanup`, `enableObjectIdLogging`, `quickUiLogin`, `closeAllPrimaryTabs`,
+> `alreadyOpenBehaviour`, `lightningMode`, `uiApplicationName`, `cleanupConnectionName`.
+> Using these on UiConnect will fail validation (rule UI-CONNECT-ARGS-001).
+
+```xml
+<apiCall apiId="com.provar.plugins.forcedotcom.core.ui.UiConnect"
+         name="UiConnect" testItemId="1"
+         title="UI Connect: DemoOrg">
+  <arguments>
+    <argument id="connectionName">
+      <value class="value" valueClass="string">DemoOrg</value>
+    </argument>
+    <argument id="resultName">
+      <value class="value" valueClass="string">DemoOrg</value>
+    </argument>
+    <argument id="resultScope">
+      <value class="value" valueClass="string">Test</value>
+    </argument>
+    <argument id="reuseConnectionName"/>
+    <argument id="privateBrowsingMode"/>
+    <argument id="webBrowser"/>
+  </arguments>
+</apiCall>
+```
+
+---
+
+## UI Steps
+
+UI steps must always be nested inside a `UiWithScreen` block. Never place `UiDoAction` or `UiAssert` directly in the top-level `<steps>` list.
+
+### UiWithScreen
+
+Navigates to (or asserts presence of) a Salesforce screen, then runs substeps against it. All UI actions and assertions go inside the `<clause name="substeps">` block.
+
+**Navigation rules:**
+
+- The first `UiWithScreen` in a test **must** use `navigate="Always"` or `navigate="IfNecessary"`. Never `"Dont"` for the first screen.
+- Subsequent screens in the same flow should use `navigate="Dont"` when Salesforce has already navigated there (e.g., after clicking Save the record view is already open).
+- `navigate="Always"` on an `Edit` or `View` action **requires** `sfUiTargetObjectId` (the record ID). Without it, Provar cannot navigate to the correct record.
+- `sfUiTargetResultName` captures the record ID that Salesforce creates (useful on `New` action screens after save).
+
+**Target URI format:** `sf:ui:target?object=OBJECT&action=ACTION`
+
+Valid `action` values: `ObjectHome` | `New` | `View` | `Edit` | `Delete` | `Clone`
+
+```xml
+<!-- First screen: navigate=Always required -->
+<apiCall apiId="com.provar.plugins.forcedotcom.core.ui.UiWithScreen"
+         name="UiWithScreen" testItemId="2"
+         title="On SF Opportunity Home screen">
+  <arguments>
+    <argument id="uiConnectionName">
+      <value class="value" valueClass="string">DemoOrg</value>
+    </argument>
+    <argument id="target">
+      <value class="uiTarget" uri="sf:ui:target?object=Opportunity&amp;action=ObjectHome"/>
+    </argument>
+    <argument id="navigate">
+      <value class="value" valueClass="string">Always</value>
+    </argument>
+    <argument id="targetDescription">
+      <value class="value" valueClass="string">On SF Opportunity Home screen</value>
+    </argument>
+    <argument id="windowSelection">
+      <value class="value" valueClass="string">Default</value>
+    </argument>
+    <argument id="windowSize">
+      <value class="value" valueClass="string">Default</value>
+    </argument>
+    <argument id="closeWindow"/>
+    <argument id="captureBefore">
+      <value class="value" valueClass="string">false</value>
+    </argument>
+    <argument id="captureAfter">
+      <value class="value" valueClass="string">false</value>
+    </argument>
+  </arguments>
+  <clauses>
+    <clause name="substeps" testItemId="3">
+      <steps>
+        <!-- UiDoAction and UiAssert steps go here -->
+      </steps>
+    </clause>
+  </clauses>
+</apiCall>
+
+<!-- New screen: navigate=Dont (already arrived via New button click), capture resulting record ID -->
+<apiCall apiId="com.provar.plugins.forcedotcom.core.ui.UiWithScreen"
+         name="UiWithScreen" testItemId="5"
+         title="On SF Opportunity New screen">
+  <arguments>
+    <argument id="uiConnectionName">
+      <value class="value" valueClass="string">DemoOrg</value>
+    </argument>
+    <argument id="target">
+      <value class="uiTarget" uri="sf:ui:target?object=Opportunity&amp;noOverride=true&amp;action=New"/>
+    </argument>
+    <argument id="navigate">
+      <value class="value" valueClass="string">Dont</value>
+    </argument>
+    <argument id="targetDescription">
+      <value class="value" valueClass="string">On SF Opportunity New screen</value>
+    </argument>
+    <argument id="windowSelection">
+      <value class="value" valueClass="string">Default</value>
+    </argument>
+    <argument id="windowSize">
+      <value class="value" valueClass="string">Default</value>
+    </argument>
+    <argument id="closeWindow"/>
+    <argument id="captureBefore">
+      <value class="value" valueClass="string">false</value>
+    </argument>
+    <argument id="captureAfter">
+      <value class="value" valueClass="string">false</value>
+    </argument>
+    <argument id="sfUiTargetResultName">
+      <value class="value" valueClass="string">opportunityId</value>
+    </argument>
+    <argument id="sfUiTargetResultScope">
+      <value class="value" valueClass="string">Test</value>
+    </argument>
+  </arguments>
+  <clauses>
+    <clause name="substeps" testItemId="6">
+      <steps>
+        <!-- fill fields, then Save -->
+      </steps>
+    </clause>
+  </clauses>
+</apiCall>
+
+<!-- View screen: navigate=Always requires sfUiTargetObjectId -->
+<apiCall apiId="com.provar.plugins.forcedotcom.core.ui.UiWithScreen"
+         name="UiWithScreen" testItemId="12"
+         title="On SF Opportunity View screen">
+  <arguments>
+    <argument id="uiConnectionName">
+      <value class="value" valueClass="string">DemoOrg</value>
+    </argument>
+    <argument id="target">
+      <value class="uiTarget" uri="sf:ui:target?object=Opportunity&amp;noOverride=true&amp;action=View"/>
+    </argument>
+    <argument id="navigate">
+      <value class="value" valueClass="string">Always</value>
+    </argument>
+    <argument id="targetDescription">
+      <value class="value" valueClass="string">On SF Opportunity View screen</value>
+    </argument>
+    <argument id="windowSelection">
+      <value class="value" valueClass="string">Default</value>
+    </argument>
+    <argument id="windowSize">
+      <value class="value" valueClass="string">Default</value>
+    </argument>
+    <argument id="closeWindow"/>
+    <argument id="captureBefore">
+      <value class="value" valueClass="string">false</value>
+    </argument>
+    <argument id="captureAfter">
+      <value class="value" valueClass="string">false</value>
+    </argument>
+    <argument id="sfUiTargetObjectId">
+      <value class="variable">
+        <path element="opportunityId"/>
+      </value>
+    </argument>
+  </arguments>
+  <clauses>
+    <clause name="substeps" testItemId="13">
+      <steps>
+        <!-- UiAssert steps go here -->
+      </steps>
+    </clause>
+  </clauses>
+</apiCall>
+```
+
+### UiDoAction
+
+Performs a single UI interaction on a field or button. The `interaction` URI determines the action type.
+
+**Interaction types:**
+
+- `ui:interaction?name=action` — click a button or link
+- `ui:interaction?name=set` — fill/type into a field or select a picklist value
+- `ui:interaction?name=file` — upload a file (uses `fileLocation` instead of `value`)
+
+**Locator URI format:** `ui:locator?name=FIELD_OR_BUTTON_NAME&binding=ENCODED_BINDING`
+
+The binding component URL-encodes `sf:ui:binding:object?object=OBJECT&field=FIELD` for field locators, or `sf:ui:binding:object?object=OBJECT&action=ACTION` for action locators.
+
+```xml
+<!-- Click a button (interaction=action) -->
+<apiCall apiId="com.provar.plugins.forcedotcom.core.ui.UiDoAction"
+         name="UiDoAction" testItemId="4"
+         title="Click the New button">
+  <arguments>
+    <argument id="locator">
+      <value class="uiLocator" uri="ui:locator?name=New&amp;binding=sf%3Aui%3Abinding%3Aobject%3Fobject%3DOpportunity%26action%3DNew"/>
+    </argument>
+    <argument id="interaction">
+      <value class="uiInteraction" uri="ui:interaction?name=action"/>
+    </argument>
+    <argument id="hover">
+      <value class="value" valueClass="boolean">false</value>
+    </argument>
+    <argument id="captureBefore">
+      <value class="value" valueClass="string">false</value>
+    </argument>
+    <argument id="captureAfter">
+      <value class="value" valueClass="string">false</value>
+    </argument>
+    <argument id="beforeWait">
+      <value class="uiWait" uri="default"/>
+    </argument>
+    <argument id="afterWait">
+      <value class="uiWait" uri="default"/>
+    </argument>
+    <argument id="interactionDescription">
+      <value class="value" valueClass="string">Click the New button</value>
+    </argument>
+    <argument id="autoRetry"/>
+  </arguments>
+</apiCall>
+
+<!-- Set a text/picklist field (interaction=set) -->
+<apiCall apiId="com.provar.plugins.forcedotcom.core.ui.UiDoAction"
+         name="UiDoAction" testItemId="7"
+         title="Set the Opportunity Name field to Test">
+  <arguments>
+    <argument id="locator">
+      <value class="uiLocator" uri="ui:locator?name=Name&amp;binding=sf%3Aui%3Abinding%3Aobject%3Fobject%3DOpportunity%26field%3DName"/>
+    </argument>
+    <argument id="interaction">
+      <value class="uiInteraction" uri="ui:interaction?name=set"/>
+    </argument>
+    <argument id="value">
+      <value class="value" valueClass="string">Test</value>
+    </argument>
+    <argument id="blur">
+      <value class="value" valueClass="boolean">false</value>
+    </argument>
+    <argument id="pressEnter">
+      <value class="value" valueClass="boolean">false</value>
+    </argument>
+    <argument id="captureBefore">
+      <value class="value" valueClass="string">false</value>
+    </argument>
+    <argument id="captureAfter">
+      <value class="value" valueClass="string">false</value>
+    </argument>
+    <argument id="beforeWait">
+      <value class="uiWait" uri="default"/>
+    </argument>
+    <argument id="afterWait">
+      <value class="uiWait" uri="default"/>
+    </argument>
+    <argument id="interactionDescription">
+      <value class="value" valueClass="string">Set the Opportunity Name field to Test</value>
+    </argument>
+    <argument id="autoRetry"/>
+  </arguments>
+</apiCall>
+
+<!-- Upload a file (interaction=file) -->
+<apiCall apiId="com.provar.plugins.forcedotcom.core.ui.UiDoAction"
+         name="UiDoAction" testItemId="15"
+         title="Upload attachment file">
+  <arguments>
+    <argument id="locator">
+      <value class="uiLocator" uri="ui:locator?name=AttachFile&amp;binding=sf%3Aui%3Abinding%3Aobject%3Fobject%3DOpportunity%26action%3DAttachFile%26relationship%3DCombinedAttachments"/>
+    </argument>
+    <argument id="interaction">
+      <value class="uiInteraction" uri="ui:interaction?name=file"/>
+    </argument>
+    <argument id="fileLocation">
+      <value class="value" valueClass="string">templates/TestData.xlsx</value>
+    </argument>
+    <argument id="fileContents"/>
+    <argument id="captureBefore">
+      <value class="value" valueClass="string">false</value>
+    </argument>
+    <argument id="captureAfter">
+      <value class="value" valueClass="string">false</value>
+    </argument>
+    <argument id="beforeWait">
+      <value class="uiWait" uri="default"/>
+    </argument>
+    <argument id="afterWait">
+      <value class="uiWait" uri="default"/>
+    </argument>
+    <argument id="interactionDescription">
+      <value class="value" valueClass="string">Upload attachment file</value>
+    </argument>
+    <argument id="autoRetry">
+      <value class="uiWait" uri="ui:wait:autoRetry:timeout=10"/>
+    </argument>
+  </arguments>
+</apiCall>
+```
+
+> **Rule UI-DOACTION-VALUE-001:** When `interaction` is `set`, the `value` argument is required.
+> When `interaction` is `action`, the `value` argument must be absent.
+
+### UiAssert
+
+Verifies field values or element state on the current screen. Must always include `columnAssertions`, `pageAssertions`, `resultScope`, `captureAfter`, `beforeWait`, and `autoRetry` — even when empty.
+
+> **Rule UI-ASSERT-STRUCT-001:** All six arguments above are required. Omitting any will fail validation.
+>
+> **Rule UI-ASSERT-STRUCT-002:** Do NOT include `generatedParameters` on `UiAssert`. Unlike `UiDoAction`,
+> `UiAssert` does not use `generatedParameters` for its field assertions.
+>
+> **Rule UI-ASSERT-FIELDLOCATOR-002:** The `uiFieldAssertion` uses a bare `<fieldLocator uri="..."/>` element,
+> NOT a `<value class="uiLocator">` wrapper.
+
+```xml
+<!-- Assert a field value -->
+<apiCall apiId="com.provar.plugins.forcedotcom.core.ui.UiAssert"
+         name="UiAssert" testItemId="14"
+         title="UI Assert: Name">
+  <arguments>
+    <argument id="resultName">
+      <value class="value" valueClass="string">Values</value>
+    </argument>
+    <argument id="resultScope">
+      <value class="value" valueClass="string">Test</value>
+    </argument>
+    <argument id="fieldAssertions">
+      <value class="valueList" mutable="Mutable">
+        <uiFieldAssertion resultName="Name">
+          <fieldLocator uri="ui:locator?name=Name&amp;binding=sf%3Aui%3Abinding%3Aobject%3Fobject%3DOpportunity%26field%3DName"/>
+          <attributeAssertions>
+            <uiAttributeAssertion attributeName="value" comparisonType="EqualTo" normalize="true">
+              <value class="value" valueClass="string">Test</value>
+            </uiAttributeAssertion>
+          </attributeAssertions>
+        </uiFieldAssertion>
+      </value>
+    </argument>
+    <argument id="captureAfter">
+      <value class="value" valueClass="string">false</value>
+    </argument>
+    <argument id="columnAssertions">
+      <value class="valueList" mutable="Mutable"/>
+    </argument>
+    <argument id="pageAssertions">
+      <value class="valueList" mutable="Mutable"/>
+    </argument>
+    <argument id="beforeWait"/>
+    <argument id="autoRetry"/>
+  </arguments>
+</apiCall>
+
+<!-- Assert a related list row count -->
+<apiCall apiId="com.provar.plugins.forcedotcom.core.ui.UiAssert"
+         name="UiAssert" testItemId="16"
+         title="UI Assert: Attachment count">
+  <arguments>
+    <argument id="resultName">
+      <value class="value" valueClass="string">Values</value>
+    </argument>
+    <argument id="resultScope">
+      <value class="value" valueClass="string">Test</value>
+    </argument>
+    <argument id="fieldAssertions">
+      <value class="valueList" mutable="Mutable">
+        <uiFieldAssertion resultName="CombinedAttachments">
+          <fieldLocator uri="ui:locator?name=CombinedAttachments&amp;binding=sf%3Aui%3Abinding%3Aobject%3Fobject%3DOpportunity%26relationship%3DCombinedAttachments"/>
+          <attributeAssertions>
+            <uiAttributeAssertion attributeName="totalRowCount" comparisonType="EqualTo">
+              <value class="value" valueClass="string">1</value>
+            </uiAttributeAssertion>
+            <uiAttributeAssertion attributeName="value" comparisonType="None"/>
+          </attributeAssertions>
+        </uiFieldAssertion>
+      </value>
+    </argument>
+    <argument id="captureAfter">
+      <value class="value" valueClass="string">false</value>
+    </argument>
+    <argument id="columnAssertions">
+      <value class="valueList" mutable="Mutable"/>
+    </argument>
+    <argument id="pageAssertions">
+      <value class="valueList" mutable="Mutable"/>
+    </argument>
+    <argument id="beforeWait"/>
+    <argument id="autoRetry"/>
+  </arguments>
+</apiCall>
+```
+
+**Valid `comparisonType` values:** `EqualTo` | `NotEqualTo` | `Contains` | `NotContains` | `StartsWith` | `EndsWith` | `None`
+
+### UiWithRow
+
+Targets a specific row in a related list or table. Substeps inside the clause operate in the row context (locators can use `rowLocator` parameter for scoping).
+
+```xml
+<apiCall apiId="com.provar.plugins.forcedotcom.core.ui.UiWithRow"
+         name="UiWithRow" testItemId="22"
+         title="With Roles rows 1">
+  <arguments>
+    <argument id="uiConnectionName">
+      <value class="value" valueClass="string">DemoOrg</value>
+    </argument>
+    <argument id="locator">
+      <value class="uiLocator" uri="sf:ui:locator:row?table=roleBlock%2Froles"/>
+    </argument>
+    <argument id="uiRowLocator">
+      <value class="value" valueClass="string">1</value>
+    </argument>
+    <argument id="locatorDescription">
+      <value class="value" valueClass="string">With Roles rows 1</value>
+    </argument>
+    <argument id="failIfNotFound">
+      <value class="value" valueClass="boolean">true</value>
+    </argument>
+    <argument id="debugRowLocator">
+      <value class="value" valueClass="boolean">true</value>
+    </argument>
+    <argument id="resultName">
+      <value class="value" valueClass="string">Row</value>
+    </argument>
+    <argument id="resultScope">
+      <value class="value" valueClass="string">Local</value>
+    </argument>
+  </arguments>
+  <clauses>
+    <clause name="substeps" testItemId="23">
+      <steps>
+        <!-- UiDoAction steps scoped to this row -->
+      </steps>
+    </clause>
+  </clauses>
+</apiCall>
+```
+
+**Row locator URI format:** `sf:ui:locator:row?table=RELATED_LIST_NAME`
+
+The `uiRowLocator` can be a row number (1-based) or a field-value match expression.
+
+### UiHandleAlert
+
+Handles browser-level alert/confirm dialogs. Place this immediately after the step that triggers the dialog (e.g., a Delete button click).
+
+```xml
+<apiCall apiId="com.provar.plugins.forcedotcom.core.ui.UiHandleAlert"
+         name="UiHandleAlert" testItemId="46"
+         title="Handle UI Alerts">
+  <arguments>
+    <argument id="alerts">
+      <value class="valueList" mutable="Mutable">
+        <namedValues mutable="Mutable">
+          <namedValue name="expectedMessage"/>
+          <namedValue name="response">
+            <value class="value" valueClass="string">OK</value>
+          </namedValue>
+          <namedValue name="beforeWait"/>
+          <namedValue name="afterWait"/>
+          <namedValue name="autoRetry"/>
+        </namedValues>
+      </value>
+    </argument>
+    <argument id="captureBefore">
+      <value class="value" valueClass="string">false</value>
+    </argument>
+    <argument id="captureAfter">
+      <value class="value" valueClass="string">false</value>
+    </argument>
+  </arguments>
+</apiCall>
+```
+
+**Valid `response` values:** `OK` | `Cancel`
+
+Set `expectedMessage` to a string value to assert the alert text matches before responding.
+
+---
+
+## Apex CRUD Operations
+
+### ApexCreateObject
+
+Creates a Salesforce record via the API. Requires `parameterGeneratorUri`, `parameterGeneratorProperties`, and `generatedParameters` — these are always present on Apex CRUD steps and the validator checks for them.
+
+> **`parameterGeneratorProperties` key format:** The full command class name prefix is required, e.g.
+> `com.provar.plugins.forcedotcom.ui.commands.CreateCustomObjectTestStepCommand.ConnectionName`
+> (not just `.ConnectionName`).
+
+```xml
+<apiCall apiId="com.provar.plugins.forcedotcom.core.testapis.ApexCreateObject"
+         name="ApexCreateObject"
+         parameterGeneratorUri="command:com.provar.plugins.forcedotcom.ui.commands.CreateCustomObjectTestStepCommand"
+         testItemId="3"
+         title="Create Object: Lead=&gt;LeadId">
+  <arguments>
+    <argument id="objectType">
+      <value class="value" valueClass="string">Lead</value>
+    </argument>
+    <argument id="resultIdName">
+      <value class="value" valueClass="string">LeadId</value>
+    </argument>
+    <argument id="apexConnectionName">
+      <value class="value" valueClass="string">Admin</value>
+    </argument>
+    <argument id="resultScope">
+      <value class="value" valueClass="string">Test</value>
+    </argument>
+    <argument id="LastName">
+      <value class="value" valueClass="string">Smith</value>
+    </argument>
+    <argument id="Company">
+      <value class="value" valueClass="string">Acme</value>
+    </argument>
+  </arguments>
+  <parameterGeneratorProperties>
+    <propertyValue name="com.provar.plugins.forcedotcom.ui.commands.CreateCustomObjectTestStepCommand.ConnectionName">Admin</propertyValue>
+    <propertyValue name="com.provar.plugins.forcedotcom.ui.commands.CreateCustomObjectTestStepCommand.CustomObjectName">Lead</propertyValue>
+  </parameterGeneratorProperties>
+  <generatedParameters>
+    <apiParam group="fields" modelBinding="sf:ui:binding:object?object=Lead&amp;field=LastName" name="LastName" title="LastName"/>
+    <apiParam group="fields" modelBinding="sf:ui:binding:object?object=Lead&amp;field=Company" name="Company" title="Company"/>
+  </generatedParameters>
+</apiCall>
+```
+
+### ApexReadObject
+
+Reads fields from an existing record by ID. `objectId` takes a variable reference to an ID stored from a prior `ApexCreateObject` or `sfUiTargetResultName` capture.
+
+```xml
+<apiCall apiId="com.provar.plugins.forcedotcom.core.testapis.ApexReadObject"
+         name="ApexReadObject"
+         parameterGeneratorUri="command:com.provar.plugins.forcedotcom.ui.commands.ReadCustomObjectTestStepCommand"
+         testItemId="1"
+         title="Read Object: Account = {AccountId}">
+  <arguments>
+    <argument id="apexConnectionName">
+      <value class="value" valueClass="string">Admin</value>
+    </argument>
+    <argument id="objectType">
+      <value class="value" valueClass="string">Account</value>
+    </argument>
+    <argument id="objectId">
+      <value class="variable">
+        <path element="AccountId"/>
+      </value>
+    </argument>
+    <argument id="resultName">
+      <value class="value" valueClass="string">AccountRecord</value>
+    </argument>
+  </arguments>
+  <parameterGeneratorProperties>
+    <propertyValue name="com.provar.plugins.forcedotcom.ui.commands.ReadCustomObjectTestStepCommand.ConnectionName">Admin</propertyValue>
+    <propertyValue name="com.provar.plugins.forcedotcom.ui.commands.ReadCustomObjectTestStepCommand.CustomObjectName">Account</propertyValue>
+  </parameterGeneratorProperties>
+  <generatedParameters>
+    <apiParam group="fields" modelBinding="sf:ui:binding:object?object=Account&amp;field=Name" name="Name" title="Name"/>
+    <apiParam group="fields" modelBinding="sf:ui:binding:object?object=Account&amp;field=Phone" name="Phone" title="Phone"/>
+  </generatedParameters>
+</apiCall>
+```
+
+### ApexUpdateObject
+
+Updates fields on an existing record. `objectId` is required and must reference a variable.
+
+```xml
+<apiCall apiId="com.provar.plugins.forcedotcom.core.testapis.ApexUpdateObject"
+         name="ApexUpdateObject"
+         parameterGeneratorUri="command:com.provar.plugins.forcedotcom.ui.commands.UpdateCustomObjectTestStepCommand"
+         testItemId="1"
+         title="Update Object: Account = {AccountId}">
+  <arguments>
+    <argument id="apexConnectionName">
+      <value class="value" valueClass="string">Admin</value>
+    </argument>
+    <argument id="objectType">
+      <value class="value" valueClass="string">Account</value>
+    </argument>
+    <argument id="objectId">
+      <value class="variable">
+        <path element="AccountId"/>
+      </value>
+    </argument>
+    <argument id="Industry">
+      <value class="value" valueClass="string">Technology</value>
+    </argument>
+  </arguments>
+  <parameterGeneratorProperties>
+    <propertyValue name="com.provar.plugins.forcedotcom.ui.commands.UpdateCustomObjectTestStepCommand.ConnectionName">Admin</propertyValue>
+    <propertyValue name="com.provar.plugins.forcedotcom.ui.commands.UpdateCustomObjectTestStepCommand.CustomObjectName">Account</propertyValue>
+  </parameterGeneratorProperties>
+  <generatedParameters>
+    <apiParam group="fields" modelBinding="sf:ui:binding:object?object=Account&amp;field=Industry" name="Industry" title="Industry"/>
+  </generatedParameters>
+</apiCall>
+```
+
+### ApexDeleteObject
+
+Deletes a record by ID. No `parameterGeneratorUri` required.
+
+```xml
+<apiCall apiId="com.provar.plugins.forcedotcom.core.testapis.ApexDeleteObject"
+         name="ApexDeleteObject" testItemId="1"
+         title="Delete Object: {AccountId}">
+  <arguments>
+    <argument id="apexConnectionName">
+      <value class="value" valueClass="string">Admin</value>
+    </argument>
+    <argument id="objectId">
+      <value class="variable">
+        <path element="AccountId"/>
+      </value>
+    </argument>
+  </arguments>
+</apiCall>
+```
+
+### ApexSoqlQuery
+
+Runs a SOQL query and stores results as a list variable. Always include `Id` and `Name` in the SELECT clause. Always specify `resultListName` and `resultScope`.
+
+```xml
+<apiCall apiId="com.provar.plugins.forcedotcom.core.testapis.ApexSoqlQuery"
+         name="ApexSoqlQuery" testItemId="1"
+         title="SOQL Query: SELECT Id, Name FROM Account=&gt;AccountRows">
+  <arguments>
+    <argument id="apexConnectionName">
+      <value class="value" valueClass="string">Admin</value>
+    </argument>
+    <argument id="soqlQuery">
+      <value class="value" valueClass="string">SELECT Id, Name FROM Account WHERE Name = 'Test Account'</value>
+    </argument>
+    <argument id="resultListName">
+      <value class="value" valueClass="string">AccountRows</value>
+    </argument>
+    <argument id="resultScope">
+      <value class="value" valueClass="string">Test</value>
+    </argument>
+  </arguments>
+</apiCall>
+```
+
+---
+
+## Control Flow
+
+### SetValues
+
+Sets one or more test variables. Use this for all test data instead of hardcoding values across multiple steps. Variable names must match `^[A-Za-z_][A-Za-z0-9_]*$`.
+
+> **`dataTable` binding is ignored by the CLI.** Always use `SetValues` for parameterized data when tests
+> run via `sf provar automation testrun` or Quality Hub.
+
+```xml
+<apiCall apiId="com.provar.plugins.bundled.apis.control.SetValues"
+         name="SetValues" testItemId="1"
+         title="Set Test Data Variables">
+  <arguments>
+    <argument id="values">
+      <value class="valueList" mutable="Mutable">
+        <namedValues mutable="Mutable">
+          <namedValue name="AccountName">
+            <value class="value" valueClass="string">Acme Corporation</value>
+          </namedValue>
+          <namedValue name="PhoneNumber">
+            <value class="value" valueClass="string">555-123-4567</value>
+          </namedValue>
+          <namedValue name="IsActive">
+            <value class="value" valueClass="boolean">true</value>
+          </namedValue>
+        </namedValues>
+      </value>
+    </argument>
+  </arguments>
+</apiCall>
+```
+
+### StepGroup
+
+Groups steps with a shared label. Substeps go in `<clause name="hidden">`.
+
+```xml
+<apiCall apiId="com.provar.plugins.bundled.apis.control.StepGroup"
+         name="StepGroup" testItemId="1"
+         title="Setup - Create Connection">
+  <arguments>
+    <argument id="description">
+      <value class="value" valueClass="string">Establish connection to Salesforce</value>
+    </argument>
+  </arguments>
+  <clauses>
+    <clause name="hidden" testItemId="2">
+      <steps>
+        <!-- Steps go here -->
+      </steps>
+    </clause>
+  </clauses>
+</apiCall>
+```
+
+### If
+
+```xml
+<apiCall apiId="com.provar.plugins.bundled.apis.If"
+         name="If" testItemId="1"
+         title="If: {IsActive}">
+  <arguments>
+    <argument id="condition">
+      <value class="value" valueClass="string">{IsActive} == true</value>
+    </argument>
+  </arguments>
+  <clauses>
+    <clause name="then" testItemId="2">
+      <steps>
+        <!-- Steps if condition is true -->
+      </steps>
+    </clause>
+    <clause name="else" testItemId="3">
+      <steps>
+        <!-- Steps if condition is false -->
+      </steps>
+    </clause>
+  </clauses>
+</apiCall>
+```
+
+### ForEach
+
+Iterates over a list variable. `list` must reference an existing variable. `valueName` must be unique within scope.
+
+```xml
+<apiCall apiId="com.provar.plugins.bundled.apis.control.ForEach"
+         name="ForEach" testItemId="1"
+         title="For Each: {AccountRows}=&gt;CurrentRow">
+  <arguments>
+    <argument id="list">
+      <value class="variable">
+        <path element="AccountRows"/>
+      </value>
+    </argument>
+    <argument id="fromItem">
+      <value class="value" valueClass="decimal">1</value>
+    </argument>
+    <argument id="valueName">
+      <value class="value" valueClass="string">CurrentRow</value>
+    </argument>
+    <argument id="continueOnFailure">
+      <value class="value" valueClass="boolean">false</value>
+    </argument>
+  </arguments>
+  <clauses>
+    <clause name="substeps" testItemId="2">
+      <steps>
+        <!-- Loop body -->
+      </steps>
+    </clause>
+  </clauses>
+</apiCall>
+```
+
+### TryCatchFinally
+
+Wraps steps with error handling. The `finally` clause always runs, making it the right place for cleanup steps (e.g., delete records created during the test).
+
+```xml
+<apiCall apiId="com.provar.plugins.bundled.apis.control.TryCatchFinally"
+         name="TryCatchFinally" testItemId="1"
+         title="Try/Catch/Finally">
+  <clauses>
+    <clause name="try" testItemId="2">
+      <steps>
+        <!-- Main test steps -->
+      </steps>
+    </clause>
+    <clause name="catch" testItemId="3">
+      <steps>
+        <!-- Steps to run on failure (optional) -->
+      </steps>
+    </clause>
+    <clause name="finally" testItemId="4">
+      <steps>
+        <!-- Cleanup: always runs, even on failure -->
+      </steps>
+    </clause>
+  </clauses>
+</apiCall>
+```
+
+### WaitFor
+
+Polls a condition at intervals until true or max iterations are reached.
+
+```xml
+<apiCall apiId="com.provar.plugins.bundled.apis.control.WaitFor"
+         name="WaitFor" testItemId="1"
+         title="Wait For: {IsComplete}">
+  <arguments>
+    <argument id="condition">
+      <value class="value" valueClass="string">{IsComplete} == true</value>
+    </argument>
+    <argument id="testAtStart">
+      <value class="value" valueClass="boolean">true</value>
+    </argument>
+    <argument id="maxIterations">
+      <value class="value" valueClass="decimal">10</value>
+    </argument>
+    <argument id="sleepSecs">
+      <value class="value" valueClass="decimal">2</value>
+    </argument>
+    <argument id="continueOnFailure">
+      <value class="value" valueClass="boolean">false</value>
+    </argument>
+  </arguments>
+  <clauses>
+    <clause name="substeps" testItemId="2">
+      <steps>
+        <!-- Steps to check the condition -->
+      </steps>
+    </clause>
+  </clauses>
+</apiCall>
+```
+
+> **Rule CONTROL-WAITFOR-002:** `maxIterations` is required — omitting it produces an infinite loop.
+
+### Sleep
+
+```xml
+<apiCall apiId="com.provar.plugins.bundled.apis.control.Sleep"
+         name="Sleep" testItemId="1"
+         title="Sleep for 5 seconds">
+  <arguments>
+    <argument id="sleepSecs">
+      <value class="value" valueClass="decimal">5</value>
+    </argument>
+  </arguments>
+</apiCall>
+```
+
+### CallTest
+
+Calls another test case as a step (callable tests have `visibility="Internal"`). Use this to share setup logic across test cases.
+
+```xml
+<apiCall apiId="com.provar.plugins.bundled.apis.control.CallTest"
+         name="CallTest" testItemId="1"
+         title="Call: Create Lead API">
+  <arguments>
+    <argument id="testCase">
+      <value class="value" valueClass="string">Callables/Create Lead API</value>
+    </argument>
+    <argument id="LastName">
+      <value class="value" valueClass="string">Smith</value>
+    </argument>
+    <argument id="Company">
+      <value class="value" valueClass="string">Acme</value>
+    </argument>
+  </arguments>
+</apiCall>
+```
+
+---
+
+## Assertions
+
+### AssertValues
+
+Variable-to-variable or variable-to-literal comparison. For UI field assertions use `UiAssert` instead.
+
+```xml
+<apiCall apiId="com.provar.plugins.bundled.apis.AssertValues"
+         name="AssertValues" testItemId="1"
+         title="Assert: {Expected} EqualTo {Actual}">
+  <arguments>
+    <argument id="expectedValue">
+      <value class="variable">
+        <path element="ExpectedValue"/>
+      </value>
+    </argument>
+    <argument id="comparisonType">
+      <value class="value" valueClass="string">EqualTo</value>
+    </argument>
+    <argument id="actualValue">
+      <value class="variable">
+        <path element="ActualValue"/>
+      </value>
+    </argument>
+    <argument id="caseSensitive">
+      <value class="value" valueClass="boolean">false</value>
+    </argument>
+    <argument id="numeric">
+      <value class="value" valueClass="boolean">false</value>
+    </argument>
+    <argument id="failureMessage">
+      <value class="value" valueClass="string">Values do not match</value>
+    </argument>
+  </arguments>
+</apiCall>
+```
+
+---
+
+## BDD Steps
+
+`Given`, `When`, `Then`, `And`, `But` all share the same structure: a `description` argument and a `hidden` clause for substeps. Use them to add a BDD narrative layer over standard steps.
+
+```xml
+<apiCall apiId="com.provar.plugins.bundled.apis.bdd.Given"
+         name="Given" testItemId="1"
+         title="Given: The user is logged in to Salesforce">
+  <arguments>
+    <argument id="description">
+      <value class="value" valueClass="string">The user is logged in to Salesforce</value>
+    </argument>
+  </arguments>
+  <clauses>
+    <clause name="hidden" testItemId="2">
+      <steps>
+        <!-- ApexConnect or UiConnect steps go here -->
+      </steps>
+    </clause>
+  </clauses>
+</apiCall>
+
+<!-- And / But follow the same structure -->
+<apiCall apiId="com.provar.plugins.bundled.apis.bdd.And"
+         name="And" testItemId="5"
+         title="And: The opportunity stage is set to Closed Won">
+  <arguments>
+    <argument id="description">
+      <value class="value" valueClass="string">The opportunity stage is set to Closed Won</value>
+    </argument>
+  </arguments>
+  <clauses>
+    <clause name="hidden" testItemId="6">
+      <steps>
+        <!-- Steps -->
+      </steps>
+    </clause>
+  </clauses>
+</apiCall>
+```
+
+---
+
+## Database Steps
+
+> **Critical constraints — read before generating any Database step XML:**
+>
+> 1. **`connectionId` must use `valueClass="id"`** — not `"string"`. Using `"string"` causes a runtime type error.
+> 2. **`DbConnect.resultName` must exactly equal `SqlQuery.dbConnectionName`** — these two values are the coupling point between the steps. A mismatch causes "connection not found" at runtime.
+> 3. **Never use `{Count(Var)}` or `{Var[0].Field}` string expressions in SetValues/AssertValues** — these are stored verbatim and never evaluated. Use `<value class="funcCall">` for Count and the structured `<value class="variable"><path>` form for indexed field access. See the examples below.
+
+### DbConnect
+
+```xml
+<apiCall apiId="com.provar.plugins.bundled.apis.db.DbConnect"
+         name="DbConnect" testItemId="1"
+         title="DB Connect: DbConnection">
+  <arguments>
+    <argument id="connectionName">
+      <value class="value" valueClass="string">MyDatabase</value>
+    </argument>
+    <argument id="connectionId">
+      <!-- MUST be valueClass="id" — not "string" -->
+      <value class="value" valueClass="id">database-connection-uuid</value>
+    </argument>
+    <argument id="autoCommit">
+      <value class="value" valueClass="boolean">true</value>
+    </argument>
+    <argument id="resultName">
+      <!-- This value must exactly match dbConnectionName on every SqlQuery that uses this connection -->
+      <value class="value" valueClass="string">DbConnection</value>
+    </argument>
+    <argument id="resultScope">
+      <value class="value" valueClass="string">Test</value>
+    </argument>
+  </arguments>
+</apiCall>
+```
+
+### SqlQuery
+
+```xml
+<apiCall apiId="com.provar.plugins.bundled.apis.db.SqlQuery"
+         name="SqlQuery" testItemId="1"
+         title="SQL Query: DbConnection=&gt;DbResults">
+  <arguments>
+    <argument id="dbConnectionName">
+      <!-- Must exactly equal the resultName on the DbConnect step above -->
+      <value class="value" valueClass="string">DbConnection</value>
+    </argument>
+    <argument id="query">
+      <value class="value" valueClass="string">SELECT Id, Name, Status FROM Users WHERE Status = 'Active'</value>
+    </argument>
+    <argument id="resultName">
+      <value class="value" valueClass="string">DbResults</value>
+    </argument>
+    <argument id="resultScope">
+      <value class="value" valueClass="string">Test</value>
+    </argument>
+  </arguments>
+</apiCall>
+```
+
+### Accessing Database Results — funcCall and structured variable paths
+
+After `SqlQuery`, the result variable (e.g. `DbResults`) is a list of rows. To use the results in `SetValues` or `AssertValues`, you must use structured XML — not `{...}` string expressions.
+
+#### Count the result rows (funcCall)
+
+```xml
+<!-- ✅ CORRECT — funcCall element evaluates at runtime -->
+<argument id="value">
+  <value class="funcCall" id="Count">
+    <argument id="value">
+      <value class="variable">
+        <path element="DbResults"/>
+      </value>
+    </argument>
+  </value>
+</argument>
+
+<!-- ❌ WRONG — string expression stored verbatim, never evaluated -->
+<argument id="value">
+  <value class="value" valueClass="string">{Count(DbResults)}</value>
+</argument>
+```
+
+#### Access a field from a specific row (structured variable path)
+
+```xml
+<!-- ✅ CORRECT — structured path with index filter (0-based) -->
+<argument id="value">
+  <value class="variable">
+    <path element="DbResults">
+      <filter class="index">
+        <index valueClass="decimal">0</index>
+      </filter>
+    </path>
+    <path element="Status"/>
+  </value>
+</argument>
+
+<!-- ❌ WRONG — string expression stored verbatim, never evaluated -->
+<argument id="value">
+  <value class="value" valueClass="string">{DbResults[0].Status}</value>
+</argument>
+```
+
+#### Full SetValues example — extract row count and first-row field
+
+```xml
+<apiCall apiId="com.provar.plugins.bundled.apis.control.SetValues"
+         name="SetValues" testItemId="3"
+         title="Extract DB result values">
+  <arguments>
+    <argument id="values">
+      <value class="list">
+        <!-- Row count into RowCount variable -->
+        <value class="namedValue" name="RowCount">
+          <value class="funcCall" id="Count">
+            <argument id="value">
+              <value class="variable">
+                <path element="DbResults"/>
+              </value>
+            </argument>
+          </value>
+        </value>
+        <!-- First row Status field into FirstStatus variable -->
+        <value class="namedValue" name="FirstStatus">
+          <value class="variable">
+            <path element="DbResults">
+              <filter class="index">
+                <index valueClass="decimal">0</index>
+              </filter>
+            </path>
+            <path element="Status"/>
+          </value>
+        </value>
+      </value>
+    </argument>
+    <argument id="resultScope">
+      <value class="value" valueClass="string">Test</value>
+    </argument>
+  </arguments>
+</apiCall>
+```
+
+---
+
+## Web Service Steps
+
+### WebConnect
+
+```xml
+<apiCall apiId="com.provar.plugins.bundled.apis.restservice.WebConnect"
+         name="WebConnect" testItemId="1"
+         title="Web Connect: WebServiceConnection">
+  <arguments>
+    <argument id="connectionName">
+      <value class="value" valueClass="string">MyWebService</value>
+    </argument>
+    <argument id="connectionId">
+      <value class="value" valueClass="string">web-service-connection-id</value>
+    </argument>
+    <argument id="resultName">
+      <value class="value" valueClass="string">WebServiceConnection</value>
+    </argument>
+    <argument id="resultScope">
+      <value class="value" valueClass="string">Test</value>
+    </argument>
+  </arguments>
+</apiCall>
+```
+
+### RestRequest
+
+```xml
+<apiCall apiId="com.provar.plugins.bundled.apis.restservice.RestRequest"
+         name="RestRequest" testItemId="1"
+         title="Web Request (REST): GET /api/users=&gt;RestResponse">
+  <arguments>
+    <argument id="connectionName">
+      <value class="value" valueClass="string">WebServiceConnection</value>
+    </argument>
+    <argument id="targetValue">
+      <value class="value" valueClass="string">GET</value>
+    </argument>
+    <argument id="resultName">
+      <value class="value" valueClass="string">RestResponse</value>
+    </argument>
+    <argument id="resultScope">
+      <value class="value" valueClass="string">Test</value>
+    </argument>
+    <argument id="statusResultName">
+      <value class="value" valueClass="string">RestStatus</value>
+    </argument>
+    <argument id="restResourceUrl">
+      <value class="value" valueClass="string">/api/users</value>
+    </argument>
+  </arguments>
+</apiCall>
+```
+
+---
+
+## Value Types Reference
+
+```xml
+<!-- String literal -->
+<value class="value" valueClass="string">Text content</value>
+
+<!-- Boolean -->
+<value class="value" valueClass="boolean">true</value>
+
+<!-- Number -->
+<value class="value" valueClass="decimal">123.45</value>
+
+<!-- GUID / record ID — required for connectionId on ApexConnect -->
+<value class="value" valueClass="id">74c34c63-ad34-43d9-bb12-cd783bd9bcdd</value>
+
+<!-- Variable reference -->
+<value class="variable">
+  <path element="VariableName"/>
+</value>
+
+<!-- Nested object field access -->
+<value class="variable">
+  <path element="ObjectName"/>
+  <path element="FieldName"/>
+</value>
+
+<!-- String concatenation (compound) -->
+<value class="compound">
+  <parts>
+    <value class="value" valueClass="string">Prefix </value>
+    <value class="variable">
+      <path element="DynamicPart"/>
+    </value>
+    <value class="value" valueClass="string"> suffix</value>
+  </parts>
+</value>
+
+<!-- UI wait (use on beforeWait / afterWait) -->
+<value class="uiWait" uri="default"/>
+
+<!-- UI wait with custom timeout (use on autoRetry) -->
+<value class="uiWait" uri="ui:wait:autoRetry:timeout=10"/>
+```
+
+---
+
+## Callable Test Structure
+
+A callable test (used by `CallTest`) declares its interface via `<params>`, `<outputParams>`, `<args>`, and `<outputArgs>` elements. Set `visibility="Internal"` on the `<testCase>` root.
+
+```xml
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<testCase guid="..." visibility="Internal">
+  <summary/>
+  <steps>
+    <!-- Steps that use input params as variables -->
+  </steps>
+  <params>
+    <param name="LastName" title="Last Name" passwordVariableAllowed="true">
+      <summary/>
+    </param>
+  </params>
+  <outputParams>
+    <param name="RecordId" title="Record Id" passwordVariableAllowed="true">
+      <summary/>
+      <sourceValue class="variable">
+        <path element="RecordId"/>
+      </sourceValue>
+    </param>
+  </outputParams>
+  <args>
+    <argument id="LastName"/>
+  </args>
+  <outputArgs>
+    <outputArgument id="RecordId">
+      <name class="value" valueClass="string">RecordId</name>
+    </outputArgument>
+  </outputArgs>
+</testCase>
+```
+
+---
+
+## Validation Checklist
+
+- [ ] **API IDs** — exact match from the reference table above (no variations, no `<UI4SF:*>` elements)
+- [ ] **Connections** — first step is `ApexConnect` or `UiConnect`; `resultName` is referenced consistently by all subsequent steps
+- [ ] **`connectionId`** — uses `valueClass="id"` (GUID), not `valueClass="string"`
+- [ ] **UI nesting** — `UiDoAction` and `UiAssert` are always inside `<clause name="substeps">` of a `UiWithScreen`
+- [ ] **First UiWithScreen** — `navigate` is `Always` or `IfNecessary`, never `Dont`
+- [ ] **UiWithScreen on Edit/View with `navigate=Always`** — includes `sfUiTargetObjectId` referencing a variable
+- [ ] **UiAssert required arguments** — `columnAssertions`, `pageAssertions`, `resultScope`, `captureAfter`, `beforeWait`, `autoRetry` all present (may be empty)
+- [ ] **UiAssert no generatedParameters** — do not add a `<generatedParameters>` block to `UiAssert`
+- [ ] **UiConnect arguments** — does NOT include `autoCleanup`, `quickUiLogin`, `closeAllPrimaryTabs`, `alreadyOpenBehaviour`, `lightningMode`, `uiApplicationName`, `cleanupConnectionName`
+- [ ] **SOQL** — queries include `SELECT` and `FROM`; include `Id` and `Name`; use `resultListName`
+- [ ] **CRUD result capture** — `ApexCreateObject` has `resultIdName`; `ApexReadObject` has `objectId` (variable)
+- [ ] **CRUD generator metadata** — `ApexCreateObject`, `ApexReadObject`, `ApexUpdateObject` include `parameterGeneratorUri`, `parameterGeneratorProperties`, and `generatedParameters`
+- [ ] **Variable definition** — variables used as `<value class="variable">` are defined by a prior step in scope
+- [ ] **Control flow** — `If` has `condition`; `ForEach` has `list` and `valueName`; `WaitFor` has `maxIterations`
+- [ ] **SetValues structure** — `values` argument contains `<value class="valueList">` wrapping `<namedValues>` wrapping `<namedValue>` elements
+- [ ] **Data types** — booleans are string `"true"`/`"false"` inside `valueClass="boolean"`; numbers use `valueClass="decimal"`
+- [ ] **Cleanup** — either `autoCleanup="true"` on the connection, or explicit `ApexDeleteObject` / `TryCatchFinally` finally block
+- [ ] **No hallucinated arguments** — see the Common AI Hallucinations table at the top of this doc
diff --git a/docs/mcp-pilot-guide.md b/docs/mcp-pilot-guide.md
index 9fa7384c..2ca3fc78 100644
--- a/docs/mcp-pilot-guide.md
+++ b/docs/mcp-pilot-guide.md
@@ -411,6 +411,34 @@ NitroX is Provar's Hybrid Model for locators — it maps Salesforce component-ba
 
 ---
 
+### Scenario 11: Migration Prompts — Convert a Test from Another Framework
+
+**Goal:** Use the MCP migration prompts to convert a test written in CRT, Selenium, or Playwright into a Provar XML test case in one step.
+
+**Prerequisites:** A Provar project on disk and (optional) a Provar API key for corpus grounding.
+
+**CRT migration** — paste a QWord step sequence or `.robot` file:
+
+> "Use the provar.migrate.crt prompt to migrate the following CRT test to Provar: `Step 1: OpenBrowser https://login.salesforce.com` `Step 2: TypeText Username myuser@example.com` `Step 3: ClickText Log In` `Step 4: VerifyText Home`"
+
+**Selenium migration:**
+
+> "Use the provar.migrate.selenium prompt to migrate my JUnit test that creates an Opportunity in Salesforce. The test calls `driver.findElement(By.id('opp-name')).sendKeys('Q4 Deal')` and `driver.findElement(By.id('save-btn')).click()`."
+
+**Playwright migration:**
+
+> "Use the provar.migrate.playwright prompt to convert this Playwright test: `await page.getByLabel('Close Date').fill('12/31/2025'); await page.getByRole('button', { name: 'Save' }).click();`"
+
+**What to look for:**
+
+- The AI calls `provar.qualityhub.examples.retrieve` first to retrieve grounding examples (if an API key is configured)
+- A valid Provar XML test case is generated, using `<apiCall>` steps that correspond to the source test's actions
+- Salesforce login/navigation is omitted from the generated XML (Provar handles this via Connection Manager)
+- `provar.testcase.validate` is called on the result and returns `is_valid: true`
+- Any steps that could not be mapped are left as `<!-- TODO: manual step -->` comments in the XML
+
+---
+
 ## Security Model
 
 ### What the server does
diff --git a/docs/mcp.md b/docs/mcp.md
index da025c98..cfa56853 100644
--- a/docs/mcp.md
+++ b/docs/mcp.md
@@ -57,6 +57,19 @@ The Provar DX CLI ships with a built-in **Model Context Protocol (MCP) server**
   - [Quality Hub API tools](#quality-hub-api-tools)
     - [provar.qualityhub.examples.retrieve](#provarqualityhubexamplesretrieve)
   - [Org metadata via Salesforce Hosted MCP](#org-metadata-via-salesforce-hosted-mcp)
+- [MCP Prompts](#mcp-prompts)
+  - [Migration prompts](#migration-prompts)
+    - [provar.migrate.crt](#provarmigratecrt)
+    - [provar.migrate.selenium](#provarmigrateselenium)
+    - [provar.migrate.playwright](#provarmigrateplaywright)
+  - [AI loop prompts](#ai-loop-prompts)
+    - [provar.loop.generate](#provarloopgenerate)
+    - [provar.loop.fix](#provarloopfix)
+    - [provar.loop.review](#provarloopreview)
+    - [provar.loop.coverage](#provarloopcoverage)
+    - [provar.loop.db](#provarloopdb)
+- [MCP Resources](#mcp-resources)
+  - [provar://docs/step-reference](#provardocsstep-reference)
 - [AI loop pattern](#ai-loop-pattern)
 - [Quality scores explained](#quality-scores-explained)
 - [API compatibility — `xml` vs `xml_content`](#api-compatibility--xml-vs-xml_content)
@@ -279,6 +292,28 @@ After saving, open the **GitHub Copilot Chat** panel and select **Agent** mode.
 >
 > On Windows, you can also try `sf.cmd` as the command.
 
+> **`TypeError: Cannot read properties of undefined (reading 'prototype')` on Windows?**
+> VS Code's MCP server process inherits the _system_ PATH, which may differ from your shell. If you have Node.js 25+ installed at `C:\Program Files\nodejs\` (e.g. from the Windows installer) and use `nvm`/`fnm` for a lower version in your terminal, VS Code will pick Node 25 and crash — see [Prerequisites](#prerequisites).
+>
+> Fix: remove or downgrade the system-wide Node.js to LTS 22, or use the `env` field in `.vscode/mcp.json` to override the PATH:
+>
+> ```json
+> {
+>   "servers": {
+>     "provar": {
+>       "type": "stdio",
+>       "command": "sf",
+>       "args": ["provar", "mcp", "start", "--allowed-paths", "${workspaceFolder}"],
+>       "env": {
+>         "PATH": "C:\\Users\\<you>\\AppData\\Roaming\\fnm\\aliases\\default;${env:PATH}"
+>       }
+>     }
+>   }
+> }
+> ```
+>
+> Replace the `fnm` path with the output of `fnm which 22` (or whichever LTS you use). Run `node --version` from a VS Code terminal to confirm which version it sees.
+
 ### Cursor
 
 Cursor supports project-level and global MCP configuration.
@@ -1552,6 +1587,166 @@ The SF Hosted MCP uses per-user OAuth 2.0, respects field-level security and sha
 
 ---
 
+## MCP Prompts
+
+The Provar MCP server registers **7 MCP prompts** that pre-wire the tool chain into guided workflows. AI clients that support MCP prompts can invoke them directly by name instead of manually orchestrating the underlying tool sequence. **Important:** prompts that need to list, read, or write local project files (for example, `.testcase` files used by `provar.loop.fix` and `provar.loop.coverage`) also require a client with its own workspace/file tools, such as Claude Code or another MCP-compatible client with local file access configured; MCP prompt support alone is not sufficient for those workflows.
+
+---
+
+### Migration prompts
+
+These prompts convert tests from other frameworks into Provar XML. Each prompt:
+
+1. Calls `provar.qualityhub.examples.retrieve` with keywords from the source test to load few-shot grounding examples.
+2. Generates a Provar XML test case using those examples as structural context.
+3. Writes the file to the target project.
+4. Calls `provar.testcase.validate` and iterates until the output is clean.
+
+---
+
+#### `provar.migrate.crt`
+
+Convert a Copado Robotic Testing (CRT) test — either a QWord step sequence or a Robot Framework `.robot` file — into a Provar XML test case.
+
+**Arguments**
+
+| Parameter     | Type   | Required | Description                                                                      |
+| ------------- | ------ | -------- | -------------------------------------------------------------------------------- |
+| `source`      | string | yes      | The CRT test content. Accepts a numbered QWord sequence or a full `.robot` file. |
+| `projectPath` | string | no       | Absolute path to the Provar project root for writing the output file.            |
+| `testName`    | string | no       | Target test case name. Inferred from the source if omitted.                      |
+
+---
+
+#### `provar.migrate.selenium`
+
+Convert a Selenium WebDriver test (Java, Python, or JavaScript) that targets a Salesforce org into a Provar XML test case.
+
+**Arguments**
+
+| Parameter     | Type   | Required | Description                                                                    |
+| ------------- | ------ | -------- | ------------------------------------------------------------------------------ |
+| `source`      | string | yes      | The Selenium test file content (JUnit/TestNG, unittest/pytest, or Jest/Mocha). |
+| `projectPath` | string | no       | Absolute path to the Provar project root for writing the output file.          |
+| `testName`    | string | no       | Target test case name. Inferred from the class/method name if omitted.         |
+
+---
+
+#### `provar.migrate.playwright`
+
+Convert a Playwright test (TypeScript or JavaScript) that targets a Salesforce org into a Provar XML test case.
+
+**Arguments**
+
+| Parameter     | Type   | Required | Description                                                                     |
+| ------------- | ------ | -------- | ------------------------------------------------------------------------------- |
+| `source`      | string | yes      | The Playwright test file content (`@playwright/test` or `playwright` library).  |
+| `projectPath` | string | no       | Absolute path to the Provar project root for writing the output file.           |
+| `testName`    | string | no       | Target test case name. Inferred from the `test()` block description if omitted. |
+
+---
+
+### AI loop prompts
+
+These prompts drive the iterative test generation and quality improvement loop.
+
+---
+
+#### `provar.loop.generate`
+
+Generate a Provar XML test case from a user story or acceptance criteria. Retrieves corpus examples for grounding, generates the test, writes it to the project, then validates it.
+
+**Arguments**
+
+| Parameter     | Type   | Required | Description                                                                           |
+| ------------- | ------ | -------- | ------------------------------------------------------------------------------------- |
+| `story`       | string | yes      | The user story or acceptance criteria. Include the Salesforce object and action.      |
+| `projectPath` | string | no       | Absolute path to the Provar project root.                                             |
+| `testName`    | string | no       | Output test case file name (without extension). Inferred from the story if omitted.   |
+| `objectName`  | string | no       | Primary Salesforce object under test (e.g. `"Opportunity"`). Scopes the corpus query. |
+
+---
+
+#### `provar.loop.fix`
+
+Fix a failing Provar test case using RCA output. Reads the current XML, interprets the failure, applies targeted fixes, and re-validates until the test passes.
+
+**Arguments**
+
+| Parameter      | Type   | Required | Description                                                            |
+| -------------- | ------ | -------- | ---------------------------------------------------------------------- |
+| `testcasePath` | string | yes      | Absolute path to the `.testcase` file to fix.                          |
+| `rcaOutput`    | string | yes      | The failure message or RCA output from `provar.testrun.rca`.           |
+| `projectPath`  | string | no       | Absolute path to the Provar project root (used for context if needed). |
+
+---
+
+#### `provar.loop.review`
+
+Review a Provar test case for quality, coverage, and best practices. Returns a scored report with specific improvement suggestions.
+
+**Arguments**
+
+| Parameter      | Type   | Required | Description                                      |
+| -------------- | ------ | -------- | ------------------------------------------------ |
+| `testcasePath` | string | yes      | Absolute path to the `.testcase` file to review. |
+| `projectPath`  | string | no       | Absolute path to the Provar project root.        |
+
+---
+
+#### `provar.loop.coverage`
+
+Analyse coverage gaps for a Salesforce object or feature area. Inspects the project's existing tests, identifies what is not covered, and generates new test cases to close the gaps.
+
+**Arguments**
+
+| Parameter     | Type   | Required | Description                                                                                                                                                                                |
+| ------------- | ------ | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `objectName`  | string | yes      | Primary Salesforce object to check coverage for (e.g. `"Opportunity"`, `"Lead"`).                                                                                                          |
+| `projectPath` | string | yes      | Absolute path to the Provar project root.                                                                                                                                                  |
+| `targetOrg`   | string | no       | Salesforce org alias or username. When provided, existing Quality Hub test cases for this object are retrieved via `provar.qualityhub.testcase.retrieve` before the coverage gap analysis. |
+
+---
+
+#### `provar.loop.db`
+
+Generate a Provar XML test case that connects to an **external database** (SQL Server, Oracle, MySQL, PostgreSQL, etc.) and verifies query results. This prompt is distinct from the Salesforce/SOQL loop — it targets `DbConnect` + `SqlQuery` steps and enforces the correct patterns for `funcCall` row counts and structured variable paths for field access, which are the most common source of errors in database test generation.
+
+**Arguments**
+
+| Parameter        | Type   | Required | Description                                                                                                                                                                          |
+| ---------------- | ------ | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `story`          | string | yes      | Description of what the database test should verify. Include the database type, table name, query intent, and what values should be asserted.                                        |
+| `projectPath`    | string | no       | Absolute path to the Provar project root. Used to locate the `tests/` directory when writing the output file.                                                                        |
+| `testName`       | string | no       | Optional file name for the test case (without extension). Inferred from the story if omitted.                                                                                        |
+| `connectionName` | string | no       | The Provar Connection Manager database connection name (`DbConnect.connectionName`). Identifies which connection entry to use. If omitted, the story should describe the connection. |
+
+**What the prompt enforces:**
+
+- `DbConnect.connectionId` must use `valueClass="id"` — not `"string"`
+- `DbConnect.resultName` must exactly equal `SqlQuery.dbConnectionName` (the coupling point)
+- Row counts use `<value class="funcCall" id="Count">` — not `{Count(Var)}` string expressions
+- Indexed field access uses a structured `<value class="variable"><path><filter class="index">` — not `{Var[0].Field}` string expressions
+
+---
+
+## MCP Resources
+
+The Provar MCP server also exposes one **MCP resource** — structured reference content that AI clients can read directly from the server.
+
+---
+
+### `provar://docs/step-reference`
+
+Canonical reference for all Provar XML test step API IDs, argument formats, validation rules, and corpus-verified examples. AI clients can read this resource to understand correct step structure when generating or reviewing test cases — without needing to fetch it from disk.
+
+**URI:** `provar://docs/step-reference`  
+**MIME type:** `text/markdown`
+
+The resource content is the same as `docs/PROVAR_TEST_STEP_REFERENCE.md` in this repository, compiled into the package at build time.
+
+---
+
 ## AI loop pattern
 
 The automation tools are designed to support an **AI-driven fix loop**: an agent can iteratively improve test quality without leaving the chat session.
diff --git a/package.json b/package.json
index 1d25ee36..829c2726 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,8 @@
 {
   "name": "@provartesting/provardx-cli",
   "description": "A plugin for the Salesforce CLI to orchestrate testing activities and report quality metrics to Provar Quality Hub",
-  "version": "1.5.0-beta.7",
+  "version": "1.5.0-beta.9",
+  "mcpName": "io.github.provartesting/provar",
   "license": "BSD-3-Clause",
   "plugins": [
     "@provartesting/provardx-plugins-automation",
@@ -145,7 +146,7 @@
       ]
     },
     "compile": {
-      "command": "tsc -p . --pretty --incremental && shx mkdir -p lib/mcp/rules && shx cp src/mcp/rules/*.json lib/mcp/rules/",
+      "command": "tsc -p . --pretty --incremental && shx mkdir -p lib/mcp/rules && shx cp src/mcp/rules/*.json lib/mcp/rules/ && shx mkdir -p lib/mcp/docs && shx cp docs/PROVAR_TEST_STEP_REFERENCE.md lib/mcp/docs/",
       "files": [
         "src/**/*.ts",
         "src/mcp/rules/*.json",
diff --git a/scripts/mcp-smoke.cjs b/scripts/mcp-smoke.cjs
index 15b7500f..5bdeb5d3 100644
--- a/scripts/mcp-smoke.cjs
+++ b/scripts/mcp-smoke.cjs
@@ -312,6 +312,50 @@ async function runTests() {
     n: 3,
   });
 
+  // ── 40. prompts/list ──────────────────────────────────────────────────────
+  await send('prompts/list', {});
+
+  // ── 41–43. provar.migrate.* prompts ──────────────────────────────────────
+  await rpc('provar.migrate.crt (prompt)', 'prompts/get', {
+    name: 'provar.migrate.crt',
+    arguments: { source: 'Step 1: ClickText Accounts' },
+  });
+  await rpc('provar.migrate.selenium (prompt)', 'prompts/get', {
+    name: 'provar.migrate.selenium',
+    arguments: { source: 'driver.get("https://example.com")' },
+  });
+  await rpc('provar.migrate.playwright (prompt)', 'prompts/get', {
+    name: 'provar.migrate.playwright',
+    arguments: { source: 'await page.goto("https://example.com")' },
+  });
+
+  // ── 44–47. provar.loop.* prompts ─────────────────────────────────────────
+  await rpc('provar.loop.generate (prompt)', 'prompts/get', {
+    name: 'provar.loop.generate',
+    arguments: { story: 'As a sales rep I want to close an opportunity so that revenue is recorded.' },
+  });
+  await rpc('provar.loop.fix (prompt)', 'prompts/get', {
+    name: 'provar.loop.fix',
+    arguments: {
+      testcasePath: '/tmp/CloseOpportunity.testcase',
+      rcaOutput: 'STEP FAILED: Click the Save button — element not found',
+    },
+  });
+  await rpc('provar.loop.review (prompt)', 'prompts/get', {
+    name: 'provar.loop.review',
+    arguments: { testcasePath: '/tmp/CloseOpportunity.testcase' },
+  });
+  await rpc('provar.loop.coverage (prompt)', 'prompts/get', {
+    name: 'provar.loop.coverage',
+    arguments: { objectName: 'Opportunity', projectPath: '/tmp/provar-project' },
+  });
+
+  // ── 48. provar.loop.db prompt ─────────────────────────────────────────────
+  await rpc('provar.loop.db (prompt)', 'prompts/get', {
+    name: 'provar.loop.db',
+    arguments: { story: 'Verify Users table has at least one Active record after Salesforce flow runs' },
+  });
+
   server.stdin.end();
 }
 
@@ -320,8 +364,8 @@ async function runTests() {
 // ----------------------------------------------------------------------------
 server.on('close', () => {
   clearTimeout(overallTimer);
-  // initialize + tools/list + 37 tools (setup excluded from default count)
-  const TOTAL_EXPECTED = 39 + (INCLUDE_SETUP ? 1 : 0);
+  // initialize + tools/list + 37 tools + prompts/list + 8 prompts/get (setup excluded from default count)
+  const TOTAL_EXPECTED = 48 + (INCLUDE_SETUP ? 1 : 0);
   let passed = 0;
   let failed = 0;
 
diff --git a/server.json b/server.json
new file mode 100644
index 00000000..5eb7110e
--- /dev/null
+++ b/server.json
@@ -0,0 +1,29 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-12-11/server.schema.json",
+  "name": "io.github.provartesting/provar",
+  "title": "Provar MCP Server",
+  "description": "Provar MCP server — AI-powered Salesforce test automation. Generate, validate, and migrate Provar test cases; connect to Quality Hub for test corpus retrieval and test run orchestration.",
+  "websiteUrl": "https://github.com/ProvarTesting/provardx-cli/blob/main/docs/mcp.md",
+  "icons": [
+    {
+      "src": "https://raw.githubusercontent.com/ProvarTesting/provardx-cli/main/assets/icon.png",
+      "mimeType": "image/png"
+    }
+  ],
+  "repository": {
+    "url": "https://github.com/ProvarTesting/provardx-cli",
+    "source": "github"
+  },
+  "version": "1.5.0-beta.8",
+  "packages": [
+    {
+      "registryType": "npm",
+      "identifier": "@provartesting/provardx-cli",
+      "version": "1.5.0-beta.8",
+      "transport": {
+        "type": "stdio"
+      },
+      "runtimeArguments": ["provar", "mcp", "start", "--allowed-paths", "${workspaceFolder}"]
+    }
+  ]
+}
diff --git a/src/mcp/prompts/index.ts b/src/mcp/prompts/index.ts
new file mode 100644
index 00000000..494ad3eb
--- /dev/null
+++ b/src/mcp/prompts/index.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2024 Provar Limited.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.md file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import {
+  registerCrtMigrationPrompt,
+  registerSeleniumMigrationPrompt,
+  registerPlaywrightMigrationPrompt,
+} from './migrationPrompts.js';
+import {
+  registerLoopGeneratePrompt,
+  registerLoopFixPrompt,
+  registerLoopReviewPrompt,
+  registerLoopCoveragePrompt,
+  registerLoopDbPrompt,
+} from './loopPrompts.js';
+
+export function registerAllPrompts(server: McpServer): void {
+  registerCrtMigrationPrompt(server);
+  registerSeleniumMigrationPrompt(server);
+  registerPlaywrightMigrationPrompt(server);
+  registerLoopGeneratePrompt(server);
+  registerLoopFixPrompt(server);
+  registerLoopReviewPrompt(server);
+  registerLoopCoveragePrompt(server);
+  registerLoopDbPrompt(server);
+}
diff --git a/src/mcp/prompts/loopPrompts.ts b/src/mcp/prompts/loopPrompts.ts
new file mode 100644
index 00000000..7d74e99b
--- /dev/null
+++ b/src/mcp/prompts/loopPrompts.ts
@@ -0,0 +1,501 @@
+/*
+ * Copyright (c) 2024 Provar Limited.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.md file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+
+import { z } from 'zod';
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+
+// ── Shared helpers ────────────────────────────────────────────────────────────
+
+function projectHint(projectPath: string | undefined): string {
+  return projectPath
+    ? `The Provar project root is: ${projectPath}`
+    : 'Ask the user for the Provar project root path if it is needed for file operations.';
+}
+
+// ── Prompt: provar.loop.generate ─────────────────────────────────────────────
+
+export function registerLoopGeneratePrompt(server: McpServer): void {
+  server.prompt(
+    'provar.loop.generate',
+    'Generate a Provar XML test case from a user story or acceptance criteria. Retrieves corpus examples for grounding, generates the test, writes it to the project, then validates it with provar.testcase.validate.',
+    {
+      story: z
+        .string()
+        .describe(
+          'The user story or acceptance criteria to test. Paste the full story text, or a numbered list of acceptance criteria. Include the Salesforce object name and the action being tested (e.g. "As a sales rep, I want to close an opportunity so that revenue is recorded").'
+        ),
+      projectPath: z
+        .string()
+        .optional()
+        .describe(
+          'Absolute path to the Provar project root. Used to locate the tests/ directory when writing the output file.'
+        ),
+      testName: z
+        .string()
+        .optional()
+        .describe(
+          'Optional name for the output test case file (without extension). Inferred from the story if omitted.'
+        ),
+      objectName: z
+        .string()
+        .optional()
+        .describe(
+          'Primary Salesforce object under test (e.g. "Opportunity", "Lead"). Helps scope the corpus query if present.'
+        ),
+    },
+    ({ story, projectPath, testName, objectName }) => ({
+      messages: [
+        {
+          role: 'user' as const,
+          content: {
+            type: 'text' as const,
+            text: `You are a Provar test automation expert. Generate a Provar XML test case from the user story below.
+
+## Workflow
+
+Follow these steps in order:
+
+1. **Extract keywords** — identify the Salesforce object, the action (create/update/close/delete/view), and key
+   scenario details from the story. Use these as the query for step 2.
+
+2. **Get corpus examples** — call \`provar.qualityhub.examples.retrieve\` with the keywords you extracted
+   (e.g. "close opportunity" or "create lead"). Use the returned XML examples as the sole reference for
+   Provar step structure and argument patterns. Do not invent XML structure from prior knowledge.
+   If the response has \`"count": 0\` with a \`"warning"\` field (API unavailable or not configured),
+   fall back: read the \`provar://docs/step-reference\` MCP resource for step types and attribute
+   formats, then continue.
+
+3. **Map acceptance criteria to steps** — for each acceptance criterion, identify the corresponding Provar
+   step type: field fills → UiDoAction (set), button clicks → UiDoAction (action), field checks →
+   UiAssert, API data setup → ApexCreateObject, API verification → ApexReadObject.
+
+4. **Generate the test case** — produce a valid Provar XML test case that tests the story's acceptance
+   criteria. Base the structure entirely on the corpus examples. Follow these rules:
+   - All UI steps must be nested inside UiWithScreen blocks
+   - The first UiWithScreen must use navigate="Always"
+   - UiAssert requires columnAssertions, pageAssertions, resultScope, captureAfter, beforeWait, autoRetry
+   - Use ApexConnect for the connection step (first step in the test)
+   - Wrap test body in TryCatchFinally if cleanup is needed (ApexDeleteObject in the finally clause)
+
+5. **Write the file** — save the XML to the tests/ directory in the Provar project.
+   ${projectHint(projectPath)}
+   ${testName ? `Target file name: ${testName}.testcase` : 'Infer the file name from the story (snake_case).'}
+
+6. **Validate** — call \`provar.testcase.validate\` on the saved file. If it reports errors, fix them
+   and re-validate until the file passes clean.
+
+7. **Report** — summarise:
+   - Which acceptance criteria were covered and how
+   - Any criteria that could not be automated (add \`<!-- TODO: manual verification — <criterion> -->\` in the XML)
+   - Any validation warnings
+
+## User Story
+
+${story}
+
+${objectName ? `Primary object: ${objectName}` : ''}
+
+Begin with step 1: extract keywords, then call provar.qualityhub.examples.retrieve.`,
+          },
+        },
+      ],
+    })
+  );
+}
+
+// ── Prompt: provar.loop.fix ───────────────────────────────────────────────────
+
+export function registerLoopFixPrompt(server: McpServer): void {
+  server.prompt(
+    'provar.loop.fix',
+    'Fix a failing Provar test case using the output from provar.testrun.rca. Reads the current XML, retrieves corpus examples for the failing step type, applies targeted fixes, then re-validates.',
+    {
+      testcasePath: z
+        .string()
+        .describe(
+          'Absolute path to the failing .testcase XML file. The file must be readable and within the --allowed-paths configured for this MCP server.'
+        ),
+      rcaOutput: z
+        .string()
+        .describe(
+          'The RCA report text from provar.testrun.rca, or a raw failure message from a test run. Include the full error text — step name, error type, and message. The more detail, the better the fix.'
+        ),
+      projectPath: z
+        .string()
+        .optional()
+        .describe('Absolute path to the Provar project root. Used to locate adjacent test files if needed.'),
+    },
+    ({ testcasePath, rcaOutput, projectPath }) => ({
+      messages: [
+        {
+          role: 'user' as const,
+          content: {
+            type: 'text' as const,
+            text: `You are a Provar test automation expert. Fix the failing test case at the path below.
+
+## Failing test case
+
+Path: ${testcasePath}
+
+## RCA output
+
+\`\`\`
+${rcaOutput}
+\`\`\`
+
+${projectPath ? `Provar project root: ${projectPath}` : ''}
+
+## Workflow
+
+Follow these steps in order:
+
+1. **Read the failing test case** — read the XML file at the path above using your file reading tools.
+
+2. **Parse the failure** — from the RCA output, identify:
+   - Which step is failing (step name, testItemId, or title)
+   - The failure category (e.g. element not found, assertion mismatch, connection error, XML structure error)
+   - The specific error message
+
+3. **Get corpus examples** — call \`provar.qualityhub.examples.retrieve\` with keywords describing the
+   failing step's scenario (e.g. "close opportunity UiDoAction" or "assert field value UiAssert").
+   Use the returned examples to verify the correct structure for the failing step type.
+   If the response has \`"count": 0\` with a \`"warning"\` field, fall back: read the
+   \`provar://docs/step-reference\` MCP resource for the correct attribute schema for the failing
+   step type, then continue.
+
+4. **Diagnose the root cause** — compare the failing step's XML against the corpus examples. Common issues:
+   - Wrong interaction URI (action vs set vs file)
+   - Missing required UiAssert arguments (columnAssertions, pageAssertions, resultScope, captureAfter, beforeWait, autoRetry)
+   - UiDoAction (set) missing the value argument
+   - UiWithScreen navigate="Dont" on the first screen
+   - navigate="Always" on Edit/View without sfUiTargetObjectId
+   - Incorrect locator URI format
+   - connectionId using valueClass="string" instead of valueClass="id"
+
+5. **Apply the fix** — rewrite only the failing step(s). Preserve all other steps unchanged. Write the
+   updated XML back to the same file path.
+
+6. **Validate** — call \`provar.testcase.validate\` on the updated file. If new errors appear, fix them
+   and re-validate until the file passes clean.
+
+7. **Report** — summarise:
+   - The root cause of the failure
+   - Exactly what was changed (step name, argument changed, before/after values)
+   - Any remaining warnings from validation
+
+Begin with step 1: read the file at: ${testcasePath}`,
+          },
+        },
+      ],
+    })
+  );
+}
+
+// ── Prompt: provar.loop.review ────────────────────────────────────────────────
+
+export function registerLoopReviewPrompt(server: McpServer): void {
+  server.prompt(
+    'provar.loop.review',
+    'Review a Provar test case for quality before committing. Runs structural validation, checks against corpus best practices, and reports quality gaps: missing assertions, hardcoded data, missing cleanup, and unmapped steps.',
+    {
+      testcasePath: z
+        .string()
+        .describe(
+          'Absolute path to the .testcase XML file to review. Must be within the --allowed-paths configured for this MCP server.'
+        ),
+      projectPath: z.string().optional().describe('Absolute path to the Provar project root.'),
+    },
+    ({ testcasePath, projectPath }) => ({
+      messages: [
+        {
+          role: 'user' as const,
+          content: {
+            type: 'text' as const,
+            text: `You are a Provar test automation expert. Review the test case at the path below for quality and completeness.
+
+## Test case to review
+
+Path: ${testcasePath}
+${projectPath ? `Provar project root: ${projectPath}` : ''}
+
+## Workflow
+
+Follow these steps in order:
+
+1. **Validate** — call \`provar.testcase.validate\` on the file. Note all errors and warnings. Do not stop
+   here even if the file is valid — continue the review.
+
+2. **Read the file** — read the XML to understand the test structure: what object is being tested, what
+   actions are performed, and what is being asserted.
+
+3. **Get corpus examples** — call \`provar.qualityhub.examples.retrieve\` with keywords describing the
+   test scenario (e.g. "create opportunity", "close opportunity"). Use the returned examples as a
+   quality baseline. If the response has \`"count": 0\` with a \`"warning"\` field, fall back: read
+   the \`provar://docs/step-reference\` MCP resource for step type schemas, then continue the review
+   using that as the quality baseline.
+
+4. **Review for quality gaps** — check for each of the following, noting pass or fail:
+
+   **Coverage**
+   - [ ] Does the test assert the outcome of each action? (e.g. after clicking Save, is there a UiAssert?)
+   - [ ] Are all required fields verified, not just the ones that were set?
+   - [ ] Is there at least one UiAssert or ApexReadObject in the test?
+
+   **Data quality**
+   - [ ] Are test data values parameterised via SetValues rather than hardcoded in multiple steps?
+   - [ ] Are dynamic values (dates, IDs) referenced via variables rather than hardcoded strings?
+
+   **Cleanup**
+   - [ ] Is cleanup handled? Either autoCleanup=true on the connection, or ApexDeleteObject steps, or
+         a TryCatchFinally with cleanup in the finally clause?
+
+   **Structure**
+   - [ ] Does the first UiWithScreen use navigate="Always" or "IfNecessary"?
+   - [ ] Do Edit/View UiWithScreen steps with navigate="Always" include sfUiTargetObjectId?
+   - [ ] Are all UiDoAction and UiAssert steps inside UiWithScreen substeps clauses?
+
+   **Unmapped steps**
+   - [ ] Are there any \`<!-- TODO: -->\` comments indicating steps that couldn't be automated?
+         Flag these for manual review.
+
+5. **Report** — produce a structured review with three sections:
+
+   ### Passes
+   List what the test does well.
+
+   ### Issues
+   For each gap found, state:
+   - What is missing or wrong
+   - Why it matters (e.g. "assertion missing after Save means the test won't catch a silent failure")
+   - A concrete fix (reference the corpus example if relevant)
+
+   ### Suggested improvements
+   Any non-blocking suggestions (e.g. parameterising a hardcoded value that appears more than once).
+
+Begin with step 1: call provar.testcase.validate on the file at: ${testcasePath}`,
+          },
+        },
+      ],
+    })
+  );
+}
+
+// ── Prompt: provar.loop.coverage ─────────────────────────────────────────────
+
+export function registerLoopCoveragePrompt(server: McpServer): void {
+  server.prompt(
+    'provar.loop.coverage',
+    'Analyse test coverage for a Salesforce object. Scans the Provar project test files to identify which CRUD operations, field validations, and UI workflows are covered, then reports gaps with suggested test outlines.',
+    {
+      objectName: z
+        .string()
+        .describe(
+          'The Salesforce API object name to analyse (e.g. "Opportunity", "Lead", "Contact", "Account"). Used to scan test cases and query the corpus for expected test patterns.'
+        ),
+      projectPath: z
+        .string()
+        .describe(
+          'Absolute path to the Provar project root. The tests/ subdirectory will be scanned for .testcase files.'
+        ),
+      targetOrg: z
+        .string()
+        .optional()
+        .describe(
+          'SF org alias or username. If provided, also queries provar.qualityhub.testcase.retrieve to include Quality Hub tests in the coverage analysis.'
+        ),
+    },
+    ({ objectName, projectPath, targetOrg }) => ({
+      messages: [
+        {
+          role: 'user' as const,
+          content: {
+            type: 'text' as const,
+            text: `You are a Provar test automation expert. Analyse test coverage for the Salesforce object "${objectName}".
+
+## Provar project
+
+Root: ${projectPath}
+Object to analyse: ${objectName}
+${targetOrg ? `Quality Hub org: ${targetOrg}` : ''}
+
+## Workflow
+
+Follow these steps in order:
+
+1. **Scan local test files** — list all .testcase files under ${projectPath}/tests/. For each file that
+   references "${objectName}" (search for the string in the file content), read it and extract:
+   - The test scenario (from the file name or meta comment)
+   - Which operations are covered: API Create, API Read, API Update, API Delete, UI New, UI View,
+     UI Edit, UI Delete, UI assertions on fields
+   - Which fields are set or asserted
+
+${
+  targetOrg
+    ? `2. **Query Quality Hub** — call \`provar.qualityhub.testcase.retrieve\` with target_org="${targetOrg}"
+   to retrieve test cases linked to the "${objectName}" object from Quality Hub. Add these to the
+   coverage inventory.
+
+3. **Get corpus examples** — call \`provar.qualityhub.examples.retrieve\` with "${objectName.toLowerCase()}"
+   as the query to understand what test patterns exist in the corpus for this object.
+   If the response has \`"count": 0\` with a \`"warning"\` field, fall back: read the
+   \`provar://docs/step-reference\` MCP resource for step type schemas, then continue.`
+    : `2. **Get corpus examples** — call \`provar.qualityhub.examples.retrieve\` with "${objectName.toLowerCase()}"
+   as the query to understand what test patterns exist in the corpus for this object.
+   If the response has \`"count": 0\` with a \`"warning"\` field, fall back: read the
+   \`provar://docs/step-reference\` MCP resource for step type schemas, then continue.`
+}
+
+${targetOrg ? '4' : '3'}. **Build the coverage matrix** — define the standard test scenarios for "${objectName}":
+
+   **API (Apex) operations**
+   - Create: ApexCreateObject with required fields
+   - Create: ApexCreateObject with optional/edge-case fields
+   - Read: ApexReadObject — verify created record
+   - Update: ApexUpdateObject — modify field values
+   - Delete: ApexDeleteObject — confirm record removed
+   - SOQL: ApexSoqlQuery — query by key fields
+
+   **UI operations**
+   - New: navigate to New screen, fill required fields, save → assert record created
+   - View: navigate to View screen → assert field values
+   - Edit: navigate to Edit screen, modify fields, save → assert changes persisted
+   - Delete: delete via UI → confirm record no longer visible
+   - Related lists: any relationships (e.g. Contacts on Account) that have UI tests
+
+   **Validation rules and required fields**
+   - Negative tests: attempt to save with missing required fields → assert error message shown
+   - Validation rule triggers: if known validation rules exist, is there a test for each?
+
+${targetOrg ? '5' : '4'}. **Report coverage gaps** — produce a report with three sections:
+
+   ### Covered
+   List each scenario that has at least one test, with the test file name.
+
+   ### Gaps
+   For each missing scenario, state:
+   - What is not covered
+   - Why it matters (e.g. "No negative test for required fields means validation rule regressions won't be caught")
+   - A brief test outline (inputs, expected outcome, which step types to use)
+
+   ### Suggested next tests
+   Rank the top 3-5 gaps by risk. For each, provide:
+   - A suggested test case name
+   - The key steps (using correct Provar step type names from the reference)
+   - Estimated effort (XS / S / M)
+
+Begin with step 1: list the .testcase files in ${projectPath}/tests/ and search for "${objectName}".`,
+          },
+        },
+      ],
+    })
+  );
+}
+
+// ── Prompt: provar.loop.db ────────────────────────────────────────────────────
+
+export function registerLoopDbPrompt(server: McpServer): void {
+  server.prompt(
+    'provar.loop.db',
+    'Generate a Provar XML test case that connects to an external database (SQL Server, Oracle, MySQL, etc.) and verifies query results. Distinct from Salesforce/SOQL flows — this targets DbConnect + SqlQuery steps. Retrieves corpus examples for grounding, enforces correct funcCall/variable-path patterns, generates the test, then validates.',
+    {
+      story: z
+        .string()
+        .describe(
+          'Description of what the database test should verify. Include the database type (e.g. "SQL Server"), table name, query intent, and what values should be asserted (e.g. "Verify that the Users table contains an active user record with Status=Active after a Salesforce flow runs").'
+        ),
+      projectPath: z
+        .string()
+        .optional()
+        .describe('Absolute path to the Provar project root. Used to locate the tests/ directory.'),
+      testName: z
+        .string()
+        .optional()
+        .describe('Optional file name for the test case (without extension). Inferred from the story if omitted.'),
+      connectionName: z
+        .string()
+        .optional()
+        .describe(
+          'The Provar Connection Manager database connection name (DbConnect.connectionName). This identifies which connection entry to use. If omitted, the story should describe the connection to use.'
+        ),
+    },
+    ({ story, projectPath, testName, connectionName }) => ({
+      messages: [
+        {
+          role: 'user' as const,
+          content: {
+            type: 'text' as const,
+            text: `You are a Provar test automation expert. Generate a Provar XML test case that validates database state using DbConnect and SqlQuery steps.
+
+This is a **database test**, NOT a Salesforce UI or Apex test. Do not use UiConnect, UiWithScreen, ApexConnect, or ApexCreateObject — use the database step types: DbConnect, SqlQuery, SetValues, AssertValues.
+
+## Workflow
+
+Follow these steps in order:
+
+1. **Get corpus examples** — call \`provar.qualityhub.examples.retrieve\` with a query that includes "database DbConnect SqlQuery" plus keywords from the story (e.g. "database SQL Server verify record count"). Use the returned XML examples as the reference for correct step structure.
+   If the response has \`"count": 0\` with a \`"warning"\` field (API unavailable or not configured), fall back: read the \`provar://docs/step-reference\` MCP resource — specifically the Database Steps section — for the correct attribute schema, then continue.
+
+2. **Generate the test case** — produce valid Provar XML. Apply these database-specific rules:
+
+   **DbConnect rules:**
+   - \`connectionName\` argument identifies the Connection Manager entry (e.g. \`"MyDatabase"\`).${
+     connectionName ? `\n   - Use connection name: ${connectionName}` : ''
+   }
+   - \`connectionId\` argument MUST use \`valueClass="id"\` — NOT \`"string"\`. Using \`"string"\` causes a runtime type error.
+   - \`resultName\` sets the **connection handle** — the variable name used to refer to this open connection (e.g. \`"DbConnection"\`). Choose any valid identifier.
+   - This handle must be reused exactly as \`dbConnectionName\` on every SqlQuery step that uses this connection.
+
+   **SqlQuery rules:**
+   - \`dbConnectionName\` must exactly equal the \`resultName\` from the DbConnect step above.
+   - \`resultName\` names the variable that will hold the query result rows (e.g. \`"DbResults"\`).
+
+   **Accessing results in SetValues/AssertValues — critical:**
+   - To count result rows: use \`<value class="funcCall" id="Count">\` — NEVER use \`{Count(Var)}\` string expressions.
+   - To access a field from row N (0-based): use the structured variable path with a \`<filter class="index">\` — NEVER use \`{Var[0].Field}\` string expressions.
+   - String \`{...}\` expressions are stored verbatim and never evaluated. They will always produce wrong results.
+
+   **Pattern for extracting values from results:**
+   \`\`\`xml
+   <!-- Count rows -->
+   <value class="funcCall" id="Count">
+     <argument id="value">
+       <value class="variable"><path element="DbResults"/></value>
+     </argument>
+   </value>
+
+   <!-- Access field from row 0 -->
+   <value class="variable">
+     <path element="DbResults">
+       <filter class="index"><index valueClass="decimal">0</index></filter>
+     </path>
+     <path element="FieldName"/>
+   </value>
+   \`\`\`
+
+3. **Write the file** — save the XML to the tests/ directory in the Provar project.
+   ${projectHint(projectPath)}
+   ${testName ? `Target file name: ${testName}.testcase` : 'Infer the file name from the story (snake_case).'}
+
+4. **Validate** — call \`provar.testcase.validate\` on the saved file. If it reports errors, fix them and re-validate until the file passes clean.
+
+5. **Report** — summarise:
+   - Which query/assertion was implemented
+   - The DbConnect resultName and SqlQuery dbConnectionName used (confirm they match)
+   - Any validation warnings
+   - Any aspects of the story that could not be automated (add \`<!-- TODO: manual verification — <reason> -->\` in the XML)
+
+## Database Test Story
+
+${story}
+
+Begin with step 1: call provar.qualityhub.examples.retrieve with "database DbConnect SqlQuery" plus keywords from the story above.`,
+          },
+        },
+      ],
+    })
+  );
+}
diff --git a/src/mcp/prompts/migrationPrompts.ts b/src/mcp/prompts/migrationPrompts.ts
new file mode 100644
index 00000000..db36abc8
--- /dev/null
+++ b/src/mcp/prompts/migrationPrompts.ts
@@ -0,0 +1,252 @@
+/*
+ * Copyright (c) 2024 Provar Limited.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.md file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+
+import { z } from 'zod';
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+
+// Source-framework context injected into each migration prompt.
+// Lightweight: just enough to interpret the source. Format knowledge lives
+// in the corpus (provar.qualityhub.examples.retrieve) and the validator
+// (provar.testcase.validate) — not hardcoded here.
+
+const CRT_CONTEXT = `
+CRT (Copado Robotic Testing) is a keyword-driven framework built on Robot Framework.
+Tests are authored in QEditor using QWords:
+- ClickText <label>         → click an element by visible label
+- TypeText <field> <value>  → type a value into a field
+- VerifyText <text>         → assert text is present on the page
+- SelectDropdown <field> <val> → choose a picklist option
+- OpenBrowser <url>         → open a browser session (maps to Salesforce login)
+
+Robot Framework sections: *** Keywords *** define reusable blocks; *** Test Cases *** are the test entries.
+Suite Setup/Teardown → login at the start and cleanup at the end.
+`.trim();
+
+const SELENIUM_CONTEXT = `
+Selenium WebDriver test patterns (Java/Python/JavaScript):
+- driver.get(url) / navigate().to() → navigate to a URL (maps to Salesforce login)
+- findElement(By.linkText/name).click() → click by visible label
+- findElement(...).sendKeys(value) → type into a field
+- Select.selectByVisibleText(val) → select a picklist option
+- findElement(...).getText() + assertion → verify a field value
+- WebDriverWait / ExpectedConditions → wait for element visibility
+- @Before / setUp() → test setup including login
+- @After / tearDown() → cleanup
+`.trim();
+
+const PLAYWRIGHT_CONTEXT = `
+Playwright test patterns (TypeScript/JavaScript):
+- page.goto(url) / login fixture → navigate to Salesforce (maps to login)
+- getByLabel(label).click() → click by visible label
+- getByRole('button', {name}).click() → click by button name
+- getByLabel(label).fill(value) → fill a field by label
+- locator(selector).fill(value) → fill by XPath/CSS selector
+- locator.selectOption(value) → choose a picklist option
+- expect(locator).toHaveValue(val) → assert a field value
+- expect(locator).toBeVisible() → assert element is visible
+- expect(page).toContainText(text) → assert text on page
+- page.waitForLoadState() / waitForSelector() → wait conditions
+- beforeEach → test setup including login
+`.trim();
+
+// ── Shared orchestration instructions ────────────────────────────────────────
+
+function migrationOrchestration(projectPath: string | undefined): string {
+  const projectHint = projectPath
+    ? `The target Provar project is at: ${projectPath}`
+    : 'Ask the user for the Provar project path if needed.';
+
+  return `
+## Migration workflow
+
+Follow these steps in order:
+
+1. **Get corpus examples** — call \`provar.qualityhub.examples.retrieve\` with keywords that
+   describe the source test's main scenario (e.g. "create opportunity", "close case", "convert lead").
+   Use the returned examples as few-shot grounding for the Provar XML format and step patterns.
+   If the response has \`"count": 0\` with a \`"warning"\` field (API unavailable or not configured),
+   fall back: read the \`provar://docs/step-reference\` MCP resource for step types and attribute
+   formats, then continue with generation based on that reference.
+
+2. **Generate the test case** — produce a valid Provar XML test case that faithfully captures
+   the intent of the source test. Base the structure entirely on the corpus examples, not on
+   prior knowledge of Provar XML. Omit Salesforce login/navigation setup — Provar handles
+   that via Connection Manager.
+
+3. **Write the file** — save the generated XML to the appropriate \`tests/\` subdirectory
+   inside the Provar project. ${projectHint}
+
+4. **Validate** — call \`provar.testcase.validate\` on the saved file. If it reports errors,
+   fix them and re-validate until the file passes clean.
+
+5. **Report** — summarise what was migrated, any steps that could not be mapped (add them
+   as \`<!-- TODO: manual step -->\` comments in the XML), and any validation warnings.
+`.trim();
+}
+
+// ── Prompt: provar.migrate.crt ────────────────────────────────────────────────
+
+export function registerCrtMigrationPrompt(server: McpServer): void {
+  server.prompt(
+    'provar.migrate.crt',
+    'Convert a Copado Robotic Testing (CRT) test — either a QWord step sequence or a Robot Framework .robot file — into a Provar XML test case. Retrieves corpus examples for grounding, generates the test case, then validates it with provar.testcase.validate.',
+    {
+      source: z
+        .string()
+        .describe(
+          'The CRT test content to migrate. Accepts either: (1) a numbered QWord step sequence (e.g. "Step 1: ClickText Accounts"), or (2) a Robot Framework .robot file with *** Settings ***, *** Keywords ***, and *** Test Cases *** sections.'
+        ),
+      projectPath: z
+        .string()
+        .optional()
+        .describe(
+          'Absolute path to the Provar project root. Used to locate the tests/ directory when writing the output file.'
+        ),
+      testName: z
+        .string()
+        .optional()
+        .describe('Optional name for the output Provar test case. Inferred from the source if omitted.'),
+    },
+    ({ source, projectPath, testName }) => ({
+      messages: [
+        {
+          role: 'user' as const,
+          content: {
+            type: 'text' as const,
+            text: `You are a Provar test migration expert. Migrate the following CRT test to Provar.
+
+## Source format — CRT
+
+${CRT_CONTEXT}
+
+${migrationOrchestration(projectPath)}
+
+## Source CRT Test
+
+\`\`\`
+${source}
+\`\`\`
+
+${testName ? `Target test case name: ${testName}` : 'Infer the test case name from the source content.'}
+
+Begin with step 1: call provar.qualityhub.examples.retrieve.`,
+          },
+        },
+      ],
+    })
+  );
+}
+
+// ── Prompt: provar.migrate.selenium ──────────────────────────────────────────
+
+export function registerSeleniumMigrationPrompt(server: McpServer): void {
+  server.prompt(
+    'provar.migrate.selenium',
+    'Convert a Selenium WebDriver test (Java, Python, or JavaScript) that tests a Salesforce org into a Provar XML test case. Retrieves corpus examples for grounding, generates the test case, then validates it with provar.testcase.validate.',
+    {
+      source: z
+        .string()
+        .describe(
+          'The Selenium test file content to migrate. Accepts Java (JUnit/TestNG), Python (unittest/pytest), or JavaScript (Jest/Mocha) with selenium-webdriver. Include the full file or the relevant test method(s).'
+        ),
+      projectPath: z
+        .string()
+        .optional()
+        .describe(
+          'Absolute path to the Provar project root. Used to locate the tests/ directory when writing the output file.'
+        ),
+      testName: z
+        .string()
+        .optional()
+        .describe(
+          'Optional name for the output Provar test case. Inferred from the source class/method name if omitted.'
+        ),
+    },
+    ({ source, projectPath, testName }) => ({
+      messages: [
+        {
+          role: 'user' as const,
+          content: {
+            type: 'text' as const,
+            text: `You are a Provar test migration expert. Migrate the following Selenium WebDriver test to Provar.
+
+## Source format — Selenium WebDriver
+
+${SELENIUM_CONTEXT}
+
+${migrationOrchestration(projectPath)}
+
+## Source Selenium Test
+
+\`\`\`
+${source}
+\`\`\`
+
+${testName ? `Target test case name: ${testName}` : 'Infer the test case name from the class and method name.'}
+
+Begin with step 1: call provar.qualityhub.examples.retrieve.`,
+          },
+        },
+      ],
+    })
+  );
+}
+
+// ── Prompt: provar.migrate.playwright ────────────────────────────────────────
+
+export function registerPlaywrightMigrationPrompt(server: McpServer): void {
+  server.prompt(
+    'provar.migrate.playwright',
+    'Convert a Playwright test (TypeScript or JavaScript) that tests a Salesforce org into a Provar XML test case. Retrieves corpus examples for grounding, generates the test case, then validates it with provar.testcase.validate.',
+    {
+      source: z
+        .string()
+        .describe(
+          'The Playwright test file content to migrate. Accepts TypeScript or JavaScript using @playwright/test or the playwright library. Include the full file or the relevant test block(s).'
+        ),
+      projectPath: z
+        .string()
+        .optional()
+        .describe(
+          'Absolute path to the Provar project root. Used to locate the tests/ directory when writing the output file.'
+        ),
+      testName: z
+        .string()
+        .optional()
+        .describe(
+          'Optional name for the output Provar test case. Inferred from the test() block description if omitted.'
+        ),
+    },
+    ({ source, projectPath, testName }) => ({
+      messages: [
+        {
+          role: 'user' as const,
+          content: {
+            type: 'text' as const,
+            text: `You are a Provar test migration expert. Migrate the following Playwright test to Provar.
+
+## Source format — Playwright
+
+${PLAYWRIGHT_CONTEXT}
+
+${migrationOrchestration(projectPath)}
+
+## Source Playwright Test
+
+\`\`\`
+${source}
+\`\`\`
+
+${testName ? `Target test case name: ${testName}` : 'Infer the test case name from the test() block description.'}
+
+Begin with step 1: call provar.qualityhub.examples.retrieve.`,
+          },
+        },
+      ],
+    })
+  );
+}
diff --git a/src/mcp/server.ts b/src/mcp/server.ts
index 33d42474..88adf9c7 100644
--- a/src/mcp/server.ts
+++ b/src/mcp/server.ts
@@ -6,6 +6,9 @@
  */
 
 import { createRequire } from 'node:module';
+import { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { dirname, join } from 'node:path';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { z } from 'zod';
 import { log } from './logging/logger.js';
@@ -29,6 +32,7 @@ import { registerAllAntTools } from './tools/antTools.js';
 import { registerAllRcaTools } from './tools/rcaTools.js';
 import { registerAllTestPlanTools } from './tools/testPlanTools.js';
 import { registerAllNitroXTools } from './tools/nitroXTools.js';
+import { registerAllPrompts } from './prompts/index.js';
 
 export interface ServerConfig {
   allowedPaths: string[];
@@ -77,5 +81,44 @@ export function createProvarMcpServer(config: ServerConfig): McpServer {
   registerAllTestPlanTools(server, config);
   registerAllNitroXTools(server, config);
 
+  // ── Provar prompts ───────────────────────────────────────────────────────────
+  registerAllPrompts(server);
+
+  // ── Documentation resources ──────────────────────────────────────────────────
+  const docsDir = join(dirname(fileURLToPath(import.meta.url)), 'docs');
+  server.resource(
+    'provar-step-reference',
+    'provar://docs/step-reference',
+    {
+      description:
+        'Canonical reference for all Provar XML test step API IDs, argument formats, validation rules, and corpus-verified examples. Use this to understand correct step structure when generating or reviewing test cases.',
+      mimeType: 'text/markdown',
+    },
+    () => {
+      try {
+        const content = readFileSync(join(docsDir, 'PROVAR_TEST_STEP_REFERENCE.md'), 'utf-8');
+        return {
+          contents: [
+            {
+              uri: 'provar://docs/step-reference',
+              mimeType: 'text/markdown',
+              text: content,
+            },
+          ],
+        };
+      } catch {
+        return {
+          contents: [
+            {
+              uri: 'provar://docs/step-reference',
+              mimeType: 'text/markdown',
+              text: '# Provar Test Step Reference\n\nReference doc not found. If you are developing from source, rebuild the package. Otherwise, reinstall or upgrade the plugin/package and try again.',
+            },
+          ],
+        };
+      }
+    }
+  );
+
   return server;
 }
diff --git a/src/mcp/tools/qualityHubApiTools.ts b/src/mcp/tools/qualityHubApiTools.ts
index e1b54f34..5e9f2f94 100644
--- a/src/mcp/tools/qualityHubApiTools.ts
+++ b/src/mcp/tools/qualityHubApiTools.ts
@@ -19,21 +19,28 @@ import {
   REQUEST_ACCESS_URL,
 } from '../../services/qualityHub/client.js';
 
+const CORPUS_FALLBACK_HINT =
+  'Fallback: read the provar://docs/step-reference MCP resource for step types and attribute formats, then continue.';
+
 const CORPUS_ONBOARDING_WARNING =
   'Corpus retrieval skipped — no Provar API key configured. Continuing without example grounding.\n' +
   'To enable corpus retrieval: run sf provar auth login\n' +
-  `No account? Request access at: ${REQUEST_ACCESS_URL}`;
+  `No account? Request access at: ${REQUEST_ACCESS_URL}\n` +
+  CORPUS_FALLBACK_HINT;
 
 const CORPUS_AUTH_WARNING =
   'Corpus retrieval skipped — API key is invalid or expired. Continuing without example grounding.\n' +
-  `Run sf provar auth login to get a new key, or request access at: ${REQUEST_ACCESS_URL}`;
+  `Run sf provar auth login to get a new key, or request access at: ${REQUEST_ACCESS_URL}\n` +
+  CORPUS_FALLBACK_HINT;
 
 const CORPUS_RATE_LIMIT_WARNING =
-  'Corpus retrieval skipped — rate limit reached. Continuing without example grounding. Try again shortly.';
+  'Corpus retrieval skipped — rate limit reached. Continuing without example grounding. Try again shortly.\n' +
+  CORPUS_FALLBACK_HINT;
 
 const CORPUS_UNREACHABLE_WARNING =
   'Corpus retrieval skipped — API unreachable. Continuing without example grounding.\n' +
-  'Check your network connection or try again later.';
+  'Check your network connection or try again later.\n' +
+  CORPUS_FALLBACK_HINT;
 
 // ── Tool: provar.qualityhub.examples.retrieve ─────────────────────────────────
 
@@ -42,8 +49,8 @@ export function registerCorpusExamplesRetrieve(server: McpServer): void {
     'provar.qualityhub.examples.retrieve',
     [
       'Retrieve N similar Provar test case examples from the Quality Hub corpus (1000+ tests in Bedrock KB).',
-      'Use this BEFORE calling provar.testcase.generate to get few-shot grounding examples.',
-      'Pass a user story, requirement, or source test file content as the query.',
+      'Use this BEFORE writing any Provar .testcase XML — whether via provar.testcase.generate, Write, or Edit.',
+      'Pass a user story, requirement, source test file content, or step type keywords as the query.',
       'Returns up to N example Provar XML test cases ordered by similarity score.',
       'If retrieval fails (no auth, network error, rate limit), returns empty examples with a warning — the',
       'generation workflow can still continue without grounding. Never hard-errors on API failure.',
diff --git a/src/mcp/tools/testCaseGenerate.ts b/src/mcp/tools/testCaseGenerate.ts
index a75ce75e..d4ec39fa 100644
--- a/src/mcp/tools/testCaseGenerate.ts
+++ b/src/mcp/tools/testCaseGenerate.ts
@@ -22,25 +22,25 @@ import { validateTestCase } from './testCaseValidate.js';
 // and expanded automatically before writing XML.
 
 const SHORTHAND_TO_FQID: Record<string, string> = {
-  UiConnect:          'com.provar.plugins.forcedotcom.core.ui.UiConnect',
-  UiDoAction:         'com.provar.plugins.forcedotcom.core.ui.UiDoAction',
-  UiWithScreen:       'com.provar.plugins.forcedotcom.core.ui.UiWithScreen',
-  UiAssert:           'com.provar.plugins.forcedotcom.core.ui.UiAssert',
-  UiNavigate:         'com.provar.plugins.forcedotcom.core.ui.UiNavigate',
-  UiWithRow:          'com.provar.plugins.forcedotcom.core.ui.UiWithRow',
-  UiScrollToElement:  'com.provar.plugins.forcedotcom.core.ui.UiScrollToElement',
-  ApexConnect:        'com.provar.plugins.forcedotcom.core.testapis.ApexConnect',
-  ApexSoqlQuery:      'com.provar.plugins.forcedotcom.core.testapis.ApexSoqlQuery',
-  ApexCreateObject:   'com.provar.plugins.forcedotcom.core.testapis.ApexCreateObject',
-  ApexReadObject:     'com.provar.plugins.forcedotcom.core.testapis.ApexReadObject',
-  ApexUpdateObject:   'com.provar.plugins.forcedotcom.core.testapis.ApexUpdateObject',
-  ApexDeleteObject:   'com.provar.plugins.forcedotcom.core.testapis.ApexDeleteObject',
-  SetValues:          'com.provar.plugins.bundled.apis.control.SetValues',
-  AssertValues:       'com.provar.plugins.bundled.apis.AssertValues',
-  StepGroup:          'com.provar.plugins.bundled.apis.control.StepGroup',
-  Sleep:              'com.provar.plugins.bundled.apis.control.Sleep',
-  ForEach:            'com.provar.plugins.bundled.apis.control.ForEach',
-  CaseCall:           'com.provar.plugins.bundled.apis.control.CaseCall',
+  UiConnect: 'com.provar.plugins.forcedotcom.core.ui.UiConnect',
+  UiDoAction: 'com.provar.plugins.forcedotcom.core.ui.UiDoAction',
+  UiWithScreen: 'com.provar.plugins.forcedotcom.core.ui.UiWithScreen',
+  UiAssert: 'com.provar.plugins.forcedotcom.core.ui.UiAssert',
+  UiNavigate: 'com.provar.plugins.forcedotcom.core.ui.UiNavigate',
+  UiWithRow: 'com.provar.plugins.forcedotcom.core.ui.UiWithRow',
+  UiScrollToElement: 'com.provar.plugins.forcedotcom.core.ui.UiScrollToElement',
+  ApexConnect: 'com.provar.plugins.forcedotcom.core.testapis.ApexConnect',
+  ApexSoqlQuery: 'com.provar.plugins.forcedotcom.core.testapis.ApexSoqlQuery',
+  ApexCreateObject: 'com.provar.plugins.forcedotcom.core.testapis.ApexCreateObject',
+  ApexReadObject: 'com.provar.plugins.forcedotcom.core.testapis.ApexReadObject',
+  ApexUpdateObject: 'com.provar.plugins.forcedotcom.core.testapis.ApexUpdateObject',
+  ApexDeleteObject: 'com.provar.plugins.forcedotcom.core.testapis.ApexDeleteObject',
+  SetValues: 'com.provar.plugins.bundled.apis.control.SetValues',
+  AssertValues: 'com.provar.plugins.bundled.apis.AssertValues',
+  StepGroup: 'com.provar.plugins.bundled.apis.control.StepGroup',
+  Sleep: 'com.provar.plugins.bundled.apis.control.Sleep',
+  ForEach: 'com.provar.plugins.bundled.apis.control.ForEach',
+  CaseCall: 'com.provar.plugins.bundled.apis.control.CaseCall',
 };
 
 function resolveApiId(apiId: string): string {
@@ -56,16 +56,16 @@ function buildStepWarnings(steps: Array<{ api_id: string }>): string[] {
   if (resolvedIds.includes(SHORTHAND_TO_FQID['ApexReadObject'] ?? '')) {
     warnings.push(
       'ApexReadObject: You must specify field names in the attributes (e.g. fieldList); ' +
-      'if none are provided Provar generates "SELECT  FROM ..." which throws MALFORMED_QUERY. ' +
-      'Prefer ApexSoqlQuery for full control over the SELECT clause and result binding.'
+        'if none are provided Provar generates "SELECT  FROM ..." which throws MALFORMED_QUERY. ' +
+        'Prefer ApexSoqlQuery for full control over the SELECT clause and result binding.'
     );
   }
 
   if (resolvedIds.includes(SHORTHAND_TO_FQID['AssertValues'] ?? '')) {
     warnings.push(
       'AssertValues: Direct index paths like "ResultList[0].FieldName" are NOT supported for ApexSoqlQuery results. ' +
-      'To assert SOQL results use either: (a) a ForEach loop over the result list with AssertValues inside, ' +
-      'or (b) a SetValues step to extract a specific field into a named variable, then assert that variable.'
+        'To assert SOQL results use either: (a) a ForEach loop over the result list with AssertValues inside, ' +
+        'or (b) a SetValues step to extract a specific field into a named variable, then assert that variable.'
     );
   }
 
@@ -79,10 +79,10 @@ const StepSchema = z.object({
     .string()
     .describe(
       'Provar step API ID. Shorthand forms are accepted and auto-expanded to fully-qualified IDs: ' +
-      'UiConnect, UiDoAction, UiWithScreen, UiAssert, UiNavigate, UiWithRow, ' +
-      'ApexConnect, ApexSoqlQuery, ApexCreateObject, ApexReadObject, ApexUpdateObject, ApexDeleteObject, ' +
-      'SetValues, AssertValues, StepGroup, Sleep, ForEach, CaseCall. ' +
-      'Or pass the fully-qualified ID directly (com.provar.plugins.*).'
+        'UiConnect, UiDoAction, UiWithScreen, UiAssert, UiNavigate, UiWithRow, ' +
+        'ApexConnect, ApexSoqlQuery, ApexCreateObject, ApexReadObject, ApexUpdateObject, ApexDeleteObject, ' +
+        'SetValues, AssertValues, StepGroup, Sleep, ForEach, CaseCall. ' +
+        'Or pass the fully-qualified ID directly (com.provar.plugins.*).'
     ),
   name: z.string().describe('Human-readable step name'),
   attributes: z
@@ -90,9 +90,9 @@ const StepSchema = z.object({
     .default({})
     .describe(
       'Step argument values as key/value pairs. Written as <arguments><argument id="key"><value .../></argument></arguments> ' +
-      'inside the <apiCall> element — the format Provar runtime requires. ' +
-      'Do NOT rely on XML attributes on <apiCall>; the runtime silently ignores them. ' +
-      'Example: { "connectionName": "MyOrg", "objectApiName": "Opportunity" }'
+        'inside the <apiCall> element — the format Provar runtime requires. ' +
+        'Do NOT rely on XML attributes on <apiCall>; the runtime silently ignores them. ' +
+        'Example: { "connectionName": "MyOrg", "objectApiName": "Opportunity" }'
     ),
 });
 
@@ -109,6 +109,7 @@ const TOOL_DESCRIPTION = [
   'AssertValues on SOQL results: index paths like "ResultList[0].Field" are not supported.',
   'Use ForEach to iterate the result list, or SetValues to extract a field into a variable first.',
   'Validation: the response always includes a validation field with is_valid, validity_score, quality_score, and any structural issues — check this before attempting to run the test case.',
+  'Grounding: call provar.qualityhub.examples.retrieve before generating to get corpus examples for the scenario — correct XML structure for the step types you need.',
 ].join(' ');
 
 export function registerTestCaseGenerate(server: McpServer, config: ServerConfig): void {
@@ -117,24 +118,12 @@ export function registerTestCaseGenerate(server: McpServer, config: ServerConfig
     TOOL_DESCRIPTION,
     {
       test_case_name: z.string().describe('Test case name (human-readable label)'),
-      test_case_id: z
-        .string()
-        .optional()
-        .describe('Explicit test case id; auto-generated UUID v4 if omitted'),
+      test_case_id: z.string().optional().describe('Explicit test case id; auto-generated UUID v4 if omitted'),
       steps: z.array(StepSchema).default([]).describe('Ordered list of test steps'),
-      output_path: z
-        .string()
-        .optional()
-        .describe('Suggested file path for the .xml file (returned in response)'),
+      output_path: z.string().optional().describe('Suggested file path for the .xml file (returned in response)'),
       overwrite: z.boolean().default(false).describe('Overwrite if output_path file already exists'),
-      dry_run: z
-        .boolean()
-        .default(true)
-        .describe('true = return XML only (default); false = write to output_path'),
-      idempotency_key: z
-        .string()
-        .optional()
-        .describe('Caller-provided key echoed back for deduplication tracking'),
+      dry_run: z.boolean().default(true).describe('true = return XML only (default); false = write to output_path'),
+      idempotency_key: z.string().optional().describe('Caller-provided key echoed back for deduplication tracking'),
     },
     (input) => {
       const requestId = makeRequestId();
@@ -146,9 +135,7 @@ export function registerTestCaseGenerate(server: McpServer, config: ServerConfig
 
       try {
         const xmlContent = buildTestCaseXml(input);
-        const filePath: string | undefined = input.output_path
-          ? path.resolve(input.output_path)
-          : undefined;
+        const filePath: string | undefined = input.output_path ? path.resolve(input.output_path) : undefined;
         let written = false;
 
         if (filePath && !input.dry_run) {
@@ -197,7 +184,7 @@ export function registerTestCaseGenerate(server: McpServer, config: ServerConfig
       } catch (err: unknown) {
         const error = err as Error & { code?: string };
         const errResult = makeError(
-          error instanceof PathPolicyError ? error.code : (error.code ?? 'GENERATE_ERROR'),
+          error instanceof PathPolicyError ? error.code : error.code ?? 'GENERATE_ERROR',
           error.message,
           requestId,
           false
@@ -215,10 +202,11 @@ function buildArgumentsXml(attributes: Record<string, string>): string {
   const entries = Object.entries(attributes);
   if (entries.length === 0) return '';
   const argLines = entries
-    .map(([k, v]) =>
-      `      <argument id="${escapeXmlAttr(k)}">\n` +
-      `        <value class="value" valueClass="String">${escapeXmlContent(v)}</value>\n` +
-      '      </argument>'
+    .map(
+      ([k, v]) =>
+        `      <argument id="${escapeXmlAttr(k)}">\n` +
+        `        <value class="value" valueClass="string">${escapeXmlContent(v)}</value>\n` +
+        '      </argument>'
     )
     .join('\n');
   return `\n      <arguments>\n${argLines}\n      </arguments>\n    `;
@@ -264,16 +252,9 @@ function buildTestCaseXml(input: {
 }
 
 function escapeXmlAttr(value: string): string {
-  return value
-    .replace(/&/g, '&amp;')
-    .replace(/"/g, '&quot;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;');
+  return value.replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 }
 
 function escapeXmlContent(value: string): string {
-  return value
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;');
+  return value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 }
diff --git a/test/unit/commands/provar/auth/status.test.ts b/test/unit/commands/provar/auth/status.test.ts
index c6763c44..fbfedc0e 100644
--- a/test/unit/commands/provar/auth/status.test.ts
+++ b/test/unit/commands/provar/auth/status.test.ts
@@ -166,9 +166,11 @@ describe('auth status — expiry warning logic', () => {
 
   it('writeCredentials stores expires_at and readStoredCredentials returns it', () => {
     const expires = new Date(NOW + 30 * 24 * 60 * 60 * 1000).toISOString();
+    // eslint-disable-next-line camelcase
     writeCredentials('pv_k_expirytestkey1', 'pv_k_expiry', 'manual', { expires_at: expires });
     const stored = readStoredCredentials();
     assert.ok(stored, 'credentials should exist');
+    // eslint-disable-next-line camelcase
     assert.equal(stored?.expires_at, expires);
   });
 });
diff --git a/test/unit/mcp/loopPrompts.test.ts b/test/unit/mcp/loopPrompts.test.ts
new file mode 100644
index 00000000..1c49a270
--- /dev/null
+++ b/test/unit/mcp/loopPrompts.test.ts
@@ -0,0 +1,355 @@
+/*
+ * Copyright (c) 2024 Provar Limited.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.md file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+
+import { strict as assert } from 'node:assert';
+import { describe, it, beforeEach } from 'mocha';
+import {
+  registerLoopGeneratePrompt,
+  registerLoopFixPrompt,
+  registerLoopReviewPrompt,
+  registerLoopCoveragePrompt,
+  registerLoopDbPrompt,
+} from '../../../src/mcp/prompts/loopPrompts.js';
+
+// ── Minimal McpServer mock ─────────────────────────────────────────────────────
+
+type PromptHandler = (args: Record<string, unknown>) => {
+  messages: Array<{ role: string; content: { type: string; text: string } }>;
+};
+
+interface PromptRegistration {
+  name: string;
+  description: string;
+  handler: PromptHandler;
+}
+
+class MockMcpServer {
+  public registrations: PromptRegistration[] = [];
+
+  public prompt(name: string, description: string, _schema: unknown, handler: PromptHandler): void {
+    this.registrations.push({ name, description, handler });
+  }
+
+  public call(name: string, args: Record<string, unknown>): ReturnType<PromptHandler> {
+    const reg = this.registrations.find((r) => r.name === name);
+    if (!reg) throw new Error(`Prompt not registered: ${name}`);
+    return reg.handler(args);
+  }
+}
+
+// ── Helpers ────────────────────────────────────────────────────────────────────
+
+function getMessageText(result: ReturnType<PromptHandler>): string {
+  assert.ok(result.messages.length > 0, 'Expected at least one message');
+  assert.equal(result.messages[0].role, 'user');
+  assert.equal(result.messages[0].content.type, 'text');
+  return result.messages[0].content.text;
+}
+
+// ── Tests ──────────────────────────────────────────────────────────────────────
+
+let server: MockMcpServer;
+
+beforeEach(() => {
+  server = new MockMcpServer();
+  registerLoopGeneratePrompt(server as never);
+  registerLoopFixPrompt(server as never);
+  registerLoopReviewPrompt(server as never);
+  registerLoopCoveragePrompt(server as never);
+  registerLoopDbPrompt(server as never);
+});
+
+describe('loopPrompts — registration', () => {
+  it('registers all 5 loop prompts', () => {
+    assert.equal(server.registrations.length, 5);
+  });
+
+  it('registers provar.loop.generate', () => {
+    const reg = server.registrations.find((r) => r.name === 'provar.loop.generate');
+    assert.ok(reg, 'provar.loop.generate should be registered');
+    assert.ok(
+      reg.description.includes('user story') || reg.description.includes('Generate'),
+      'description should describe generation use case'
+    );
+  });
+
+  it('registers provar.loop.fix', () => {
+    const reg = server.registrations.find((r) => r.name === 'provar.loop.fix');
+    assert.ok(reg, 'provar.loop.fix should be registered');
+    assert.ok(reg.description.toLowerCase().includes('fix'), 'description should describe fix use case');
+  });
+
+  it('registers provar.loop.review', () => {
+    const reg = server.registrations.find((r) => r.name === 'provar.loop.review');
+    assert.ok(reg, 'provar.loop.review should be registered');
+    assert.ok(reg.description.toLowerCase().includes('review'), 'description should describe review use case');
+  });
+
+  it('registers provar.loop.coverage', () => {
+    const reg = server.registrations.find((r) => r.name === 'provar.loop.coverage');
+    assert.ok(reg, 'provar.loop.coverage should be registered');
+    assert.ok(reg.description.toLowerCase().includes('coverage'), 'description should describe coverage use case');
+  });
+});
+
+describe('loopPrompts — provar.loop.generate', () => {
+  it('includes story text in message', () => {
+    const story = 'As a sales rep, I want to close an opportunity so revenue is recorded';
+    const result = server.call('provar.loop.generate', { story });
+    const text = getMessageText(result);
+    assert.ok(text.includes(story), 'message should contain the story text');
+  });
+
+  it('includes corpus retrieval workflow step', () => {
+    const result = server.call('provar.loop.generate', { story: 'any story' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('provar.qualityhub.examples.retrieve'), 'should reference corpus tool');
+    assert.ok(text.includes('provar.testcase.validate'), 'should reference validator tool');
+  });
+
+  it('includes objectName in message when provided', () => {
+    const result = server.call('provar.loop.generate', { story: 'any', objectName: 'Opportunity' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('Opportunity'), 'message should include object name');
+  });
+
+  it('includes testName in message when provided', () => {
+    const result = server.call('provar.loop.generate', { story: 'any', testName: 'CloseOpportunity' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('CloseOpportunity'), 'message should include target test name');
+  });
+
+  it('uses projectPath hint when provided', () => {
+    const result = server.call('provar.loop.generate', { story: 'any', projectPath: '/my/project' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('/my/project'), 'message should include project path');
+  });
+
+  it('falls back to ask-user hint when projectPath is omitted', () => {
+    const result = server.call('provar.loop.generate', { story: 'any' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('Ask the user'), 'message should prompt to ask for project path');
+  });
+});
+
+describe('loopPrompts — provar.loop.fix', () => {
+  it('includes testcasePath in message', () => {
+    const result = server.call('provar.loop.fix', {
+      testcasePath: '/provar/tests/CloseOpportunity.testcase',
+      rcaOutput: 'STEP FAILED: element not found',
+    });
+    const text = getMessageText(result);
+    assert.ok(text.includes('/provar/tests/CloseOpportunity.testcase'), 'message should include file path');
+  });
+
+  it('includes rcaOutput in message', () => {
+    const result = server.call('provar.loop.fix', {
+      testcasePath: '/any/path.testcase',
+      rcaOutput: 'STEP FAILED: assertion mismatch on field Amount',
+    });
+    const text = getMessageText(result);
+    assert.ok(text.includes('assertion mismatch on field Amount'), 'message should include RCA output');
+  });
+
+  it('includes corpus retrieval and validation in workflow', () => {
+    const result = server.call('provar.loop.fix', {
+      testcasePath: '/any/path.testcase',
+      rcaOutput: 'any failure',
+    });
+    const text = getMessageText(result);
+    assert.ok(text.includes('provar.qualityhub.examples.retrieve'), 'should reference corpus tool');
+    assert.ok(text.includes('provar.testcase.validate'), 'should reference validator tool');
+  });
+
+  it('starts workflow by reading the file', () => {
+    const result = server.call('provar.loop.fix', {
+      testcasePath: '/provar/tests/Test.testcase',
+      rcaOutput: 'error',
+    });
+    const text = getMessageText(result);
+    assert.ok(text.includes('/provar/tests/Test.testcase'), 'workflow begin instruction should reference the path');
+  });
+});
+
+describe('loopPrompts — provar.loop.review', () => {
+  it('includes testcasePath in message', () => {
+    const result = server.call('provar.loop.review', {
+      testcasePath: '/provar/tests/CreateLead.testcase',
+    });
+    const text = getMessageText(result);
+    assert.ok(text.includes('/provar/tests/CreateLead.testcase'), 'message should include file path');
+  });
+
+  it('includes review quality checklist categories', () => {
+    const result = server.call('provar.loop.review', {
+      testcasePath: '/any/path.testcase',
+    });
+    const text = getMessageText(result);
+    assert.ok(text.includes('Coverage') || text.includes('UiAssert'), 'message should include quality checklist');
+    assert.ok(text.includes('provar.testcase.validate'), 'should reference validator tool');
+  });
+
+  it('includes corpus retrieval step', () => {
+    const result = server.call('provar.loop.review', { testcasePath: '/any/path.testcase' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('provar.qualityhub.examples.retrieve'), 'should reference corpus tool');
+  });
+
+  it('includes projectPath in message when provided', () => {
+    const result = server.call('provar.loop.review', {
+      testcasePath: '/any/path.testcase',
+      projectPath: '/my/project',
+    });
+    const text = getMessageText(result);
+    assert.ok(text.includes('/my/project'), 'message should include project path');
+  });
+});
+
+describe('loopPrompts — provar.loop.coverage', () => {
+  it('includes objectName in message', () => {
+    const result = server.call('provar.loop.coverage', {
+      objectName: 'Opportunity',
+      projectPath: '/my/project',
+    });
+    const text = getMessageText(result);
+    assert.ok(text.includes('Opportunity'), 'message should include the object name');
+  });
+
+  it('includes projectPath in message', () => {
+    const result = server.call('provar.loop.coverage', {
+      objectName: 'Lead',
+      projectPath: '/provar/MyProject',
+    });
+    const text = getMessageText(result);
+    assert.ok(text.includes('/provar/MyProject'), 'message should include project path');
+  });
+
+  it('includes coverage matrix categories', () => {
+    const result = server.call('provar.loop.coverage', {
+      objectName: 'Account',
+      projectPath: '/any',
+    });
+    const text = getMessageText(result);
+    assert.ok(
+      text.includes('ApexCreateObject') || text.includes('API'),
+      'message should reference API coverage categories'
+    );
+  });
+
+  it('includes Quality Hub query step when targetOrg provided', () => {
+    const result = server.call('provar.loop.coverage', {
+      objectName: 'Contact',
+      projectPath: '/any',
+      targetOrg: 'my-org-alias',
+    });
+    const text = getMessageText(result);
+    assert.ok(
+      text.includes('provar.qualityhub.testcase.retrieve') || text.includes('my-org-alias'),
+      'message should include Quality Hub retrieval when targetOrg provided'
+    );
+  });
+
+  it('omits Quality Hub query step when targetOrg is not provided', () => {
+    const result = server.call('provar.loop.coverage', {
+      objectName: 'Contact',
+      projectPath: '/any',
+    });
+    const text = getMessageText(result);
+    // When no targetOrg, the step 2 should be corpus retrieval, not QH testcase retrieve
+    assert.ok(text.includes('provar.qualityhub.examples.retrieve'), 'should still include corpus retrieval');
+  });
+});
+
+describe('loopPrompts — provar.loop.db', () => {
+  it('registers provar.loop.db', () => {
+    const reg = server.registrations.find((r) => r.name === 'provar.loop.db');
+    assert.ok(reg, 'provar.loop.db should be registered');
+    assert.ok(reg.description.toLowerCase().includes('database'), 'description should mention database');
+  });
+
+  it('includes story text in message', () => {
+    const story = 'Verify Users table has Active records after SF flow runs';
+    const result = server.call('provar.loop.db', { story });
+    const text = getMessageText(result);
+    assert.ok(text.includes(story), 'message should contain the story text');
+  });
+
+  it('includes corpus retrieval and validate in workflow', () => {
+    const result = server.call('provar.loop.db', { story: 'any db test' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('provar.qualityhub.examples.retrieve'), 'should reference corpus tool');
+    assert.ok(text.includes('provar.testcase.validate'), 'should reference validator tool');
+  });
+
+  it('references DbConnect and SqlQuery step types', () => {
+    const result = server.call('provar.loop.db', { story: 'any db test' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('DbConnect'), 'should reference DbConnect step type');
+    assert.ok(text.includes('SqlQuery'), 'should reference SqlQuery step type');
+  });
+
+  it('warns about funcCall vs string expressions', () => {
+    const result = server.call('provar.loop.db', { story: 'any db test' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('funcCall'), 'should mention funcCall for count');
+    assert.ok(text.includes('valueClass="id"'), 'should warn about connectionId valueClass="id"');
+  });
+
+  it('warns about resultName / dbConnectionName coupling', () => {
+    const result = server.call('provar.loop.db', { story: 'any db test' });
+    const text = getMessageText(result);
+    assert.ok(
+      text.includes('resultName') && text.includes('dbConnectionName'),
+      'should mention the resultName / dbConnectionName coupling'
+    );
+  });
+
+  it('includes connectionName in message when provided', () => {
+    const result = server.call('provar.loop.db', {
+      story: 'any db test',
+      connectionName: 'MyDB',
+    });
+    const text = getMessageText(result);
+    assert.ok(text.includes('MyDB'), 'message should include provided connectionName');
+  });
+
+  it('includes projectPath when provided', () => {
+    const result = server.call('provar.loop.db', {
+      story: 'any db test',
+      projectPath: '/provar/project',
+    });
+    const text = getMessageText(result);
+    assert.ok(text.includes('/provar/project'), 'message should include project path');
+  });
+
+  it('includes testName when provided', () => {
+    const result = server.call('provar.loop.db', {
+      story: 'any db test',
+      testName: 'VerifyUsersTable',
+    });
+    const text = getMessageText(result);
+    assert.ok(text.includes('VerifyUsersTable'), 'message should include target test name');
+  });
+
+  it('explicitly forbids Salesforce UI and Apex steps', () => {
+    const result = server.call('provar.loop.db', { story: 'any db test' });
+    const text = getMessageText(result);
+    // The prompt names these steps to explicitly forbid them — verify that context
+    assert.ok(
+      text.includes('Do not use') || text.includes('do not use'),
+      'should explicitly forbid Salesforce/Apex steps'
+    );
+    assert.ok(text.includes('UiConnect'), 'should name UiConnect in the forbidden list');
+    assert.ok(text.includes('ApexConnect'), 'should name ApexConnect in the forbidden list');
+  });
+
+  it('includes step-reference fallback instruction', () => {
+    const result = server.call('provar.loop.db', { story: 'any db test' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('provar://docs/step-reference'), 'should include step-reference fallback');
+  });
+});
diff --git a/test/unit/mcp/migrationPrompts.test.ts b/test/unit/mcp/migrationPrompts.test.ts
new file mode 100644
index 00000000..cb7a8183
--- /dev/null
+++ b/test/unit/mcp/migrationPrompts.test.ts
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2024 Provar Limited.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.md file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+
+import { strict as assert } from 'node:assert';
+import { describe, it, beforeEach } from 'mocha';
+import {
+  registerCrtMigrationPrompt,
+  registerSeleniumMigrationPrompt,
+  registerPlaywrightMigrationPrompt,
+} from '../../../src/mcp/prompts/migrationPrompts.js';
+
+// ── Minimal McpServer mock ─────────────────────────────────────────────────────
+
+type PromptHandler = (args: Record<string, unknown>) => {
+  messages: Array<{ role: string; content: { type: string; text: string } }>;
+};
+
+interface PromptRegistration {
+  name: string;
+  description: string;
+  handler: PromptHandler;
+}
+
+class MockMcpServer {
+  public registrations: PromptRegistration[] = [];
+
+  public prompt(name: string, description: string, _schema: unknown, handler: PromptHandler): void {
+    this.registrations.push({ name, description, handler });
+  }
+
+  public call(name: string, args: Record<string, unknown>): ReturnType<PromptHandler> {
+    const reg = this.registrations.find((r) => r.name === name);
+    if (!reg) throw new Error(`Prompt not registered: ${name}`);
+    return reg.handler(args);
+  }
+}
+
+// ── Helpers ────────────────────────────────────────────────────────────────────
+
+function getMessageText(result: ReturnType<PromptHandler>): string {
+  assert.ok(result.messages.length > 0, 'Expected at least one message');
+  assert.equal(result.messages[0].role, 'user');
+  assert.equal(result.messages[0].content.type, 'text');
+  return result.messages[0].content.text;
+}
+
+// ── Tests ──────────────────────────────────────────────────────────────────────
+
+let server: MockMcpServer;
+
+beforeEach(() => {
+  server = new MockMcpServer();
+  registerCrtMigrationPrompt(server as never);
+  registerSeleniumMigrationPrompt(server as never);
+  registerPlaywrightMigrationPrompt(server as never);
+});
+
+describe('migrationPrompts — registration', () => {
+  it('registers provar.migrate.crt', () => {
+    const reg = server.registrations.find((r) => r.name === 'provar.migrate.crt');
+    assert.ok(reg, 'provar.migrate.crt should be registered');
+    assert.ok(reg.description.includes('CRT'), 'description should mention CRT');
+  });
+
+  it('registers provar.migrate.selenium', () => {
+    const reg = server.registrations.find((r) => r.name === 'provar.migrate.selenium');
+    assert.ok(reg, 'provar.migrate.selenium should be registered');
+    assert.ok(reg.description.includes('Selenium'), 'description should mention Selenium');
+  });
+
+  it('registers provar.migrate.playwright', () => {
+    const reg = server.registrations.find((r) => r.name === 'provar.migrate.playwright');
+    assert.ok(reg, 'provar.migrate.playwright should be registered');
+    assert.ok(reg.description.includes('Playwright'), 'description should mention Playwright');
+  });
+
+  it('registers all 3 migration prompts', () => {
+    assert.equal(server.registrations.length, 3);
+  });
+});
+
+describe('migrationPrompts — provar.migrate.crt', () => {
+  it('includes source content in message', () => {
+    const result = server.call('provar.migrate.crt', { source: 'Step 1: ClickText Accounts' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('Step 1: ClickText Accounts'), 'message should contain source content');
+  });
+
+  it('includes CRT context in message', () => {
+    const result = server.call('provar.migrate.crt', { source: 'Step 1: ClickText Accounts' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('ClickText'), 'message should include CRT keyword context');
+  });
+
+  it('includes workflow steps in message', () => {
+    const result = server.call('provar.migrate.crt', { source: 'any source' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('provar.qualityhub.examples.retrieve'), 'message should reference corpus retrieval tool');
+    assert.ok(text.includes('provar.testcase.validate'), 'message should reference validator tool');
+  });
+
+  it('uses provided testName when present', () => {
+    const result = server.call('provar.migrate.crt', { source: 'any source', testName: 'MyCustomTest' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('MyCustomTest'), 'message should include provided testName');
+  });
+
+  it('falls back to inferred name when testName is omitted', () => {
+    const result = server.call('provar.migrate.crt', { source: 'any source' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('Infer the test case name'), 'message should instruct to infer name when testName omitted');
+  });
+
+  it('includes project path hint when projectPath provided', () => {
+    const result = server.call('provar.migrate.crt', { source: 'any', projectPath: '/my/provar/project' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('/my/provar/project'), 'message should include project path');
+  });
+
+  it('falls back to ask-user hint when projectPath is omitted', () => {
+    const result = server.call('provar.migrate.crt', { source: 'any' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('Ask the user'), 'message should prompt to ask user for project path');
+  });
+});
+
+describe('migrationPrompts — provar.migrate.selenium', () => {
+  it('includes source content in message', () => {
+    const result = server.call('provar.migrate.selenium', { source: 'driver.get("https://example.com")' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('driver.get'), 'message should contain source content');
+  });
+
+  it('includes Selenium context in message', () => {
+    const result = server.call('provar.migrate.selenium', { source: 'any' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('WebDriver'), 'message should include Selenium context');
+  });
+
+  it('includes workflow steps', () => {
+    const result = server.call('provar.migrate.selenium', { source: 'any' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('provar.qualityhub.examples.retrieve'), 'should reference corpus tool');
+  });
+});
+
+describe('migrationPrompts — provar.migrate.playwright', () => {
+  it('includes source content in message', () => {
+    const result = server.call('provar.migrate.playwright', { source: 'await page.goto("https://example.com")' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('page.goto'), 'message should contain source content');
+  });
+
+  it('includes Playwright context in message', () => {
+    const result = server.call('provar.migrate.playwright', { source: 'any' });
+    const text = getMessageText(result);
+    assert.ok(text.includes('getByLabel'), 'message should include Playwright context');
+  });
+});
diff --git a/test/unit/mcp/testCaseGenerate.test.ts b/test/unit/mcp/testCaseGenerate.test.ts
index 188a19b7..cd244445 100644
--- a/test/unit/mcp/testCaseGenerate.test.ts
+++ b/test/unit/mcp/testCaseGenerate.test.ts
@@ -156,9 +156,9 @@ describe('provar.testcase.generate', () => {
       const result = server.call('provar.testcase.generate', {
         test_case_name: 'Multi Step',
         steps: [
-          { api_id: 'UiConnect',  name: 'Connect',  attributes: {} },
+          { api_id: 'UiConnect', name: 'Connect', attributes: {} },
           { api_id: 'UiNavigate', name: 'Navigate', attributes: {} },
-          { api_id: 'UiDoAction', name: 'Click',    attributes: {} },
+          { api_id: 'UiDoAction', name: 'Click', attributes: {} },
         ],
         dry_run: true,
         overwrite: false,
@@ -177,7 +177,7 @@ describe('provar.testcase.generate', () => {
       const result = server.call('provar.testcase.generate', {
         test_case_name: 'Count Test',
         steps: [
-          { api_id: 'UiConnect',  name: 'Step 1', attributes: {} },
+          { api_id: 'UiConnect', name: 'Step 1', attributes: {} },
           { api_id: 'UiNavigate', name: 'Step 2', attributes: {} },
         ],
         dry_run: true,
@@ -202,7 +202,10 @@ describe('provar.testcase.generate', () => {
       assert.equal(typeof validation['validity_score'], 'number');
       assert.equal(typeof validation['quality_score'], 'number');
       assert.equal(validation['is_valid'], true, 'Well-formed generated XML should be valid');
-      assert.ok(!('best_practices_violations' in validation), 'best_practices_violations should be omitted from slim response');
+      assert.ok(
+        !('best_practices_violations' in validation),
+        'best_practices_violations should be omitted from slim response'
+      );
     });
 
     it('emits a TODO comment when no steps are provided', () => {
@@ -368,4 +371,25 @@ describe('provar.testcase.generate', () => {
       assert.equal(parseText(result)['idempotency_key'], 'dedup-key-abc');
     });
   });
+
+  describe('XML argument valueClass casing', () => {
+    it('emits lowercase valueClass="string" not uppercase "String"', () => {
+      const result = server.call('provar.testcase.generate', {
+        test_case_name: 'ValueClass Test',
+        steps: [
+          {
+            api_id: 'UiConnect',
+            name: 'Connect',
+            attributes: { connectionName: 'MyOrg' },
+          },
+        ],
+        dry_run: true,
+        overwrite: false,
+      });
+
+      const xml = parseText(result)['xml_content'] as string;
+      assert.ok(xml.includes('valueClass="string"'), 'Expected lowercase valueClass="string"');
+      assert.ok(!xml.includes('valueClass="String"'), 'Must not emit uppercase valueClass="String"');
+    });
+  });
 });