Merge develop into oms feature branch (#3009)

* Added cursor rules

* Rules updated

* Rules updated

* Updated Readme document

* Updated rules

* updated rules

* Cursor Rules for generating components

* Added MCP rules for Component creation

* @W-18737391 Add developemnt guidelines and page creation rules

* remove from .cursor/rules folder

* update rule

* condense guideliens

* update changelog

* update rule to help pattern match

* Cursor rules and cleanup of tool

* Deleting from the monorepo

* skip changelog

* Update CHANGELOG.md

* bump versions

* Bump versions in mcp server

* added cursor rules

* Added options for other

* move cursor rules to root

* move cursor rules to root

* revert change log

* Cursor rules for creating new component

* nested cursor rules

* move to nested rules location

* revert create mobify app js

* Initial Commit

Add initGit option
Update readme for create app tool
Always use latest for create app npx package version.

* Change when git init is run

also added basic gitignore for non-extension projects

* Update CHANGELOG.md

* Fix tests

* Rename pwa-kit-mcp project

* Update server.js

* Include bin entry in package.json

* update changelog.md

* update changelog.md

* Fix dependencies etc

* Add example with output dir

* remove duplicated rules under assets

* @W-19065116 fix formating issue

* Punctuation fix in readme

* @W-19054407 BOPIS fix bundle inventory and child pickup selection (#2823)

* @W-19054407 BOPIS fix bundle inventory and child pickup selection

* @W-19054407 BOPIS fix bundle inventory and child pickup selection changlelog

* Revert "@W-19054407 BOPIS fix bundle inventory and child pickup selection changlelog"

This reverts commit f5be70b.

* @W-19054407 BOPIS changelog update

---------

Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>

* Update program.json

PR feedback on description.

Signed-off-by: Ben Chypak <bchypak@mobify.com>

* @W-19053749: Updated changelog to match new accepted style (#2837)

* Updated changelog

* update changelog

* revert development guidelines changes

* revert development guidelines changes

* Rename package to pwa-kit-mcp

* Update server json in readme

* Update readme and bump version

* Ensure the latest version is used in readme example

* Version align the mcp server with the platform version

* Use --initGit flag and test for .git/ creation

* Add flag both commands for template and presets

* Ensure gitignore is created

* Ensure default command includes --initGit

* Update base command

* @W-19045349 Add better error handling for Datacloud (#2811)

* Add better error handling for Datacloud

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Update use-datacloud.js

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Update datacloud-mock-data.js

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Add new dataCloudAPI config

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Update CHANGELOG.md

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Update datacloud-mock-data.js

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Refactored to decrease duplicate code

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Fix prettier issues

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Remove comments

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Sync datacloud api values (#2843)

* Update CHANGELOG.md

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Update CHANGELOG.md

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

---------

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>
Co-authored-by: Vincent Marta <vmarta@salesforce.com>

* qa prompt

* update

* encapulate rule copy logic

* update e2e test to verify .cursor folder is generated

* feat: add feature flag to enable/disable partial hydration @W-19082948 (#2846)

* update changelog

* Bump versions

* Clean up changelogs

* Update usid expiry to match refresh_token expiry

* Linting fix

* Update changelog

* Better prompting for cursor and create app program

* Update packages/commerce-sdk-react/src/auth/index.ts

Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>
Signed-off-by: Jainam Sheth <99490559+shethj@users.noreply.github.com>

* Add unit tests for usid expiry

* Remove overlapping test cases

* update commerce-sdk-react

* update changelog

* bump version

* bump develop to next dev version

* Update changelogs

* Change version number

* Update readme

* Move tools to tools folder

* Clean up files/folders, create new tool folder.

* Lint

* A11y tests - Handle dynamic aria labels generated by chakra UI (#2864)

* Handle dynamic aria labels generated by chakra UI

* improve sanitization

---------

Co-authored-by: Alex Vuong <alex.vuong@salesforce.com>

* initial implementation of create page mcp tool

* fix

* support open url

* fix the import

* update README and changelog

* Modified create page mcp tool

* Added Image Componentsupport to Create page MCP tool

* Fixed failing tests

* Added new and fixed failing tests and corrected linting issues

* Added new test and minor update to system prompt

* Updated image component functionality

* Updated system prompt

* Fixed routes issue

* Added tests and comments

* Fixed merge conflicts and moved cursor to retail-react-app

* skip changelog

* Removed unused const

* Addressed comments

* Update reading expiry time for usid

* Removed the cursor rule

* Update codeowners file to include ownership for specific features (#2921)

* Update codeowners

* @W-18895609: 🚀 Shopper Agent Experience v3.0 (#2658)

* feat: shopper agent experience v3.0

* fix: enabling streaming (#2911)

* Committing for Rules and cleanup

* skip changelog

* Fixed tests

* Remove reference to claude and clean up readme

* Update CHANGELOG.md

* Lint fix

* Addressed comments

* Make development section more robust.

* Removed the flex hardcode in log message

* Fixing Page Tool

* Fixing Linter

* Updating the Page tool

* Fix eslint discoverability in the monorepo (@W-19068681@) (#2927)

* Attempt at fixing eslint discoverability in the monorepo

* Support other packages

* Another approach: centralize the eslint dependencies

* Add a script to sync eslint stuffs to the root

* Update package lock files

* Move timing of script to preinstall

* Update package lock files

* No need for this documentation

* Empty commit

* Simplify the script's logic

* Reverting changes for Page tool

* Added comment back

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>

* Fix link

* Reverting the test change

* Update package description

* Remove folder structure section

* @W-19179026: disable streaming responses (#2964)

* Explicitly added example of what the path to your project might look like.

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>

* @W-19248293: logMCPMessage is broken

* @W-19248293: logMCPMessage is broken

* fix lint errors

* @W-19251796 MCP a11y performance tool format fix (#3003)

* @W-19183433: Add code owners validation to the CI pipeline (#2939)

* Update codeowners

* Update codeowners

* Update codeowners

* Add codeowners validator to the pipeline

* codeowners validator

* codeowners validator

* codeowners validator

* codeowners validator

* codeowners validator

* codeowners validator

---------

Co-authored-by: Brian Feister <47546998+bfeister@users.noreply.github.com>

---------

Signed-off-by: yhsieh1 <yhsieh@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>
Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>
Signed-off-by: Jainam Sheth <99490559+shethj@users.noreply.github.com>
Co-authored-by: snilakandan <snilakandan@salesforce.com>
Co-authored-by: Yuming Hsieh <yhsieh@salesforce.com>
Co-authored-by: vcua-mobify <vcua@salesforce.com>
Co-authored-by: snilakandan13 <119348013+snilakandan13@users.noreply.github.com>
Co-authored-by: Ben Chypak <bchypak@salesforce.com>
Co-authored-by: patricksullivansf <100441292+patricksullivansf@users.noreply.github.com>
Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>
Co-authored-by: Ben Chypak <bchypak@mobify.com>
Co-authored-by: Daniel Diaz <38542490+ddiazccrz@users.noreply.github.com>
Co-authored-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>
Co-authored-by: Vincent Marta <vmarta@salesforce.com>
Co-authored-by: Shailesh Zirpe <szirpe+sf@salesforce.com>
Co-authored-by: Steffen Eckardt <3235219+seckardt@users.noreply.github.com>
Co-authored-by: Jainam Sheth <j.sheth@salesforce.com>
Co-authored-by: Jainam Sheth <99490559+shethj@users.noreply.github.com>
Co-authored-by: Joel Uong <joel.uong@salesforce.com>
Co-authored-by: sf-henry-semaganda <henry.semaganda@salesforce.com>
Co-authored-by: Alex Vuong <alex.vuong@salesforce.com>
Co-authored-by: Shailesh Zirpe <42553862+szirpesf@users.noreply.github.com>
Co-authored-by: wei-liu <wei.liu@salesforce.com>
Co-authored-by: atekur <atekur@salesforce.com>
Co-authored-by: Aditya Tekur <126732792+aditek-sf@users.noreply.github.com>
Co-authored-by: Ujwala <59447810+unandyala@users.noreply.github.com>
Co-authored-by: Avinash Kasipathy <akasipathy@salesforce.com>
Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Co-authored-by: Brian Feister <47546998+bfeister@users.noreply.github.com>

Author: 21 people

packages/pwa-kit-create-app/CHANGELOG.md

@@ -1,10 +1,5 @@
-<<<<<<< HEAD
 ## v3.12.0-dev (Jul 28, 2025)
 - This feature introduces an AI-powered shopping assistant that integrates Salesforce Embedded Messaging Service with PWA Kit applications. The shopper agent provides real-time chat support, search assistance, and personalized shopping guidance directly within the e-commerce experience. [#2658](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2658)
-=======
-## v3.12.0-dev (Jul 22, 2025)
-- Add `--initGit` to automate git repo creation for the generated project [#2817](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2817)
->>>>>>> 6978641e7 (Update OMS feature branch with develop (#2919))
 
 ## v3.11.0 (Jul 22, 2025)
 - Fix the demo instance details in `program.json`[#2800](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2800)

packages/pwa-kit-mcp/src/tools/create-new-component.js

@@ -7,6 +7,7 @@
 import {z} from 'zod'
 import fs from 'fs/promises'
 import path from 'path'
+<<<<<<< HEAD
 import {toKebabCase, toPascalCase} from '../utils'
 
 const systemPrompt = `
@@ -20,6 +21,9 @@ Please ask the user for the following, one at a time:
 **Do not** assume answers. Collect all answers before proceeding.
 Once the answers are provided, execute the createComponent tool with the collected information as input parameters.
 `
+=======
+import {toKebabCase, toPascalCase, getCopyrightHeader} from '../utils'
+>>>>>>> 61ee44428 (Merge develop into oms feature branch (#3009))
 
 const systemPromptForCustomComponent = `
 You have chosen a custom purpose for your component.

packages/pwa-kit-mcp/src/utils/utils.js

@@ -10,6 +10,8 @@ import path from 'path'
 import {spawn} from 'cross-spawn'
 import {zodToJsonSchema} from 'zod-to-json-schema'
 import {z} from 'zod'
+import os from 'os'
+import {exec} from 'child_process'
 
 // CONSTANTS
 const CREATE_APP_VERSION = 'latest'

packages/pwa-kit-mcp/src/utils/utils.test.js

@@ -325,3 +325,48 @@ describe('logMCPMessage', () => {
         expect(exists).toBe(false)
     })
 })
+
+describe('logMCPMessage', () => {
+    const logFilePath = path.join(__dirname, 'mcp-debug.log')
+    const testMessage = 'Test log message'
+
+    beforeEach(async () => {
+        process.env.DEBUG = '1'
+        // Remove log file if it exists
+        try {
+            await fs.promises.unlink(logFilePath)
+        } catch (e) {
+            // File does not exist, nothing to clean up
+        }
+    })
+
+    afterEach(async () => {
+        // Clean up log file
+        try {
+            await fs.promises.unlink(logFilePath)
+        } catch (e) {
+            // File does not exist, nothing to clean up
+        }
+        delete process.env.DEBUG
+    })
+
+    it('writes a log message to mcp-debug.log when DEBUG is set', async () => {
+        const {logMCPMessage} = await import('./utils')
+        await logMCPMessage(testMessage)
+        const content = await fs.promises.readFile(logFilePath, 'utf8')
+        expect(content).toContain(testMessage)
+    })
+
+    it('does not write log if DEBUG is not set', async () => {
+        delete process.env.DEBUG
+        const {logMCPMessage} = await import('./utils')
+        await logMCPMessage('Should not log')
+        let exists = true
+        try {
+            await fs.promises.access(logFilePath)
+        } catch {
+            exists = false
+        }
+        expect(exists).toBe(false)
+    })
+})

packages/pwa-kit-runtime/CHANGELOG.md

@@ -9,7 +9,7 @@
 ## v3.10.0 (May 22, 2025)
 
 ## v3.9.2 (Mar 08, 2025)
-- Disable CloudWatch metrics sender retries [#2304](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2304) 
+- Disable CloudWatch metrics sender retries [#2304](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2304)
 
 ## v3.9.1 (Mar 05, 2025)
 - Update PWA-Kit SDKs to v3.9.1 [#2301](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2301)

packages/template-retail-react-app/.cursor/rules/component-generation-requirements.mdc

@@ -17,7 +17,7 @@ alwaysApply: false
 Create components at the components directory: `**/components/[component-name]/index.jsx`
 
 ## Guidelines
-**IMPORTANT** 
+**IMPORTANT**
 - Use functional components with hooks
 - Use PascalCase for component names
 - Use kebab-case for directories

packages/template-retail-react-app/CHANGELOG.md

@@ -19,7 +19,7 @@
 - Support saving default shipping address on user registration from order confirmation [#2706](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2706)
 - Minor updates to support BOPIS E2E tests [#2716](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2716)
 - Provide conditional support for partial hydration (feature flag `PARTIAL_HYDRATION_ENABLED`) [#2696](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2696) [#2846](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2846)
-- Show Automatic Bonus Products on Cart Page [#2704](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2704) [#2760](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2760) [#2815](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2815) 
+- Show Automatic Bonus Products on Cart Page [#2704](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2704) [#2760](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2760) [#2815](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2815)
 - [Breaking] Support Standard Products [2697](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2697)
 - Introduce store locator [#2542](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2542)
 - Fix passwordless race conditions in form submission [#2758](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2758)