Merge branch 'develop' into hotfix/validate-project-type-err

Author: shethj

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

@@ -1326,8 +1326,8 @@ class Auth {
                 callback_uri: parameters.callback_uri,
                 hint: parameters.hint || 'cross_device',
                 locale: parameters.locale,
-                code_challenge: parameters.code_challenge,
-                idp_name: parameters.idp_name
+                idp_name: parameters.idp_name,
+                ...(parameters.code_challenge && {code_challenge: parameters.code_challenge})
             }
         }
 
@@ -1357,8 +1357,8 @@ class Auth {
                 channel_id: parameters.channel_id || slasClient.clientConfig.parameters.siteId,
                 client_id: parameters.client_id || slasClient.clientConfig.parameters.clientId,
                 new_password: parameters.new_password,
-                code_verifier: parameters.code_verifier,
-                hint: parameters.hint
+                hint: parameters.hint,
+                code_verifier: parameters.code_verifier
             }
         }
 

packages/pwa-kit-create-app/assets/bootstrap/js/config/default.js.hbs

@@ -6,7 +6,7 @@
  */
 /* eslint-disable @typescript-eslint/no-var-requires */
 const sites = require('./sites.js')
-const {parseCommerceAgentSettings} = require('./utils.js')
+const {parseSettings} = require('./utils.js')
 
 module.exports = {
     app: {
@@ -23,9 +23,17 @@ module.exports = {
         // Commerce shopping agent configuration for embedded messaging service
         // This enables an agentic shopping experience in the application
         // This property accepts either a JSON string or a plain JavaScript object.
-        // The value is set from the COMMERCE_AGENT_SETTINGS environment variable.
-        // If the COMMERCE_AGENT_SETTINGS environment variable is not set, the feature is disabled.
-        commerceAgent: parseCommerceAgentSettings(process.env.COMMERCE_AGENT_SETTINGS),
+        commerceAgent: parseSettings(process.env.COMMERCE_AGENT_SETTINGS) || {
+            enabled: 'false',
+            askAgentOnSearch: 'false',
+            embeddedServiceName: '',
+            embeddedServiceEndpoint: '',
+            scriptSourceUrl: '',
+            scrt2Url: '',
+            salesforceOrgId: '',
+            commerceOrgId: '',
+            siteId: ''
+        },
         // Customize how your 'site' and 'locale' are displayed in the url.
         url: {
             {{#if answers.project.demo.enableDemoSettings}}

packages/pwa-kit-create-app/assets/bootstrap/js/config/utils.js

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2021, salesforce.com, inc.
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+
+/**
+ * Safely parses settings from either a JSON string or object
+ * @param {string|object} settings - The settings
+ * @returns {object} Parsed settings object
+ */
+function parseSettings(settings) {
+    // If settings is already an object, return it
+    if (typeof settings === 'object' && settings !== null) {
+        return settings
+    }
+
+    // If settings is a string, try to parse it
+    if (typeof settings === 'string') {
+        try {
+            return JSON.parse(settings)
+        } catch (error) {
+            console.warn('Invalid json format:', error.message)
+            return
+        }
+    }
+
+    console.warn('Cannot parse settings from:', settings)
+    return
+}
+
+module.exports = {
+    parseSettings
+}

packages/pwa-kit-create-app/assets/bootstrap/js/config/utils.js.hbs

@@ -6,7 +6,7 @@
  */
 /* eslint-disable @typescript-eslint/no-var-requires */
 const sites = require('./sites.js')
-const {parseCommerceAgentSettings} = require('./utils.js')
+const {parseSettings} = require('./utils.js')
 
 module.exports = {
     app: {
@@ -23,9 +23,17 @@ module.exports = {
         // Commerce shopping agent configuration for embedded messaging service
         // This enables an agentic shopping experience in the application
         // This property accepts either a JSON string or a plain JavaScript object.
-        // The value is set from the COMMERCE_AGENT_SETTINGS environment variable.
-        // If the COMMERCE_AGENT_SETTINGS environment variable is not set, the feature is disabled.
-        commerceAgent: parseCommerceAgentSettings(process.env.COMMERCE_AGENT_SETTINGS),
+        commerceAgent: parseSettings(process.env.COMMERCE_AGENT_SETTINGS) || {
+            enabled: 'false',
+            askAgentOnSearch: 'false',
+            embeddedServiceName: '',
+            embeddedServiceEndpoint: '',
+            scriptSourceUrl: '',
+            scrt2Url: '',
+            salesforceOrgId: '',
+            commerceOrgId: '',
+            siteId: ''
+        },
         // Customize settings for your url
         url: {
             {{#if answers.project.demo.enableDemoSettings}}

packages/pwa-kit-create-app/assets/templates/@salesforce/retail-react-app/config/default.js.hbs

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2021, salesforce.com, inc.
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+
+/**
+ * Safely parses settings from either a JSON string or object
+ * @param {string|object} settings - The settings
+ * @returns {object} Parsed settings object
+ */
+function parseSettings(settings) {
+    // If settings is already an object, return it
+    if (typeof settings === 'object' && settings !== null) {
+        return settings
+    }
+
+    // If settings is a string, try to parse it
+    if (typeof settings === 'string') {
+        try {
+            return JSON.parse(settings)
+        } catch (error) {
+            console.warn('Invalid json format:', error.message)
+            return
+        }
+    }
+
+    console.warn('Cannot parse settings from:', settings)
+    return
+}
+
+module.exports = {
+    parseSettings
+}

packages/pwa-kit-create-app/assets/templates/@salesforce/retail-react-app/config/utils.js

@@ -1,4 +1,5 @@
 ## v0.2.1-dev (Aug 11, 2025)
+- Normalize tool names; Add introduction section for PWA Kit MCP and resize the images on README. [#3239](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3239)
 
 ## v0.1.1 (Aug 11, 2025)
 - Add missing `shelljs` dependency. [#3053](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3053)

packages/pwa-kit-create-app/assets/templates/@salesforce/retail-react-app/config/utils.js.hbs

@@ -12,17 +12,22 @@ It allows AI agents to query context-aware services like this server to help dev
 👉 **[Read more at modelcontextprotocol.io](https://modelcontextprotocol.io/)**
 
 
+## What is PWA-Kit-MCP?
+
+PWA-Kit-MCP is a local STDIO MCP Server that communicates via STDIO and operates in conjunction with a running local process, making it a fully locally installed MCP server. It provides an initial suite of MCP tools intended to standardize and optimize the developer workflow for PWA Kit storefront development. These tools facilitate project creation, supply development guidelines, enable the generation of new components and pages, and support site validation through performance and accessibility testing.
+
+
 ## 🧰 Features
 
 The PWA Kit MCP Server offers the following intelligent tools tailored to Salesforce Commerce Cloud PWA development:
 
-* **`create_app_guidelines`**:
+* **`create_storefront_app`**:
   Guides agents and developers through creating a new PWA Kit project with `@salesforce/pwa-kit-create-app`.
 
-* **`create_new_sample_component`**:
+* **`create_sample_component`**:
   Walks developers through a brief Q\&A to scaffold a component using the commerce data model, layout, and structure.
 
-* **`create_sample_storefront_page`**:
+* **`create_sample_page`**:
   Interactive tool to generate a new PWA storefront page with custom routing and components.
 
 * **`development_guidelines`**:
@@ -44,10 +49,10 @@ The PWA Kit MCP Server offers the following intelligent tools tailored to Salesf
 1. Open **Cursor**.
 
 2. Navigate to **Settings > Cursor Settings...**
-![](https://raw.githubusercontent.com/SalesforceCommerceCloud/pwa-kit/refs/heads/develop/packages/pwa-kit-mcp/docs/images/cursor-settings.png)
+<img src="https://raw.githubusercontent.com/SalesforceCommerceCloud/pwa-kit/refs/heads/develop/packages/pwa-kit-mcp/docs/images/cursor-settings.png" alt="Cursor Settings Screenshot" width="50%" />
 
 3. Go to **Tools & Integrations > MCP Tools > New MCP Server**
-![](https://raw.githubusercontent.com/SalesforceCommerceCloud/pwa-kit/refs/heads/develop/packages/pwa-kit-mcp/docs/images/cursor-mcp-tools.png)
+<img src="https://raw.githubusercontent.com/SalesforceCommerceCloud/pwa-kit/refs/heads/develop/packages/pwa-kit-mcp/docs/images/cursor-mcp-tools.png" alt="Cursor MCP Tools Screenshot" width="50%" />
 
 4. Update your `mcp.json` like this (edit the placeholders as needed):
 ```json
@@ -86,7 +91,7 @@ Then send JSON-RPC requests like:
 
 ```json
 {"jsonrpc": "2.0", "id": 1, "method": "tools/list", "params": {}}
-{"jsonrpc": "2.0", "id": 2, "method": "tools/call", "params": {"name": "create_new_component", "arguments": {}}}
+{"jsonrpc": "2.0", "id": 2, "method": "tools/call", "params": {"name": "create_sample_component", "arguments": {}}}
 ```
 
 ---
@@ -127,6 +132,5 @@ the output on "MCP Logs".
 | `package.json` | Node.js dependencies and project scripts                              |
 | `mcp.json`     | MCP client configuration (used by Cursor or other IDEs)               |
 | `src/server/`  | Main server entry point (`server.js`)                                 |
-| `src/tools/`   | Contains all MCP tools like `create-app-guideline`, `site-test`, etc. |
-| `src/utils/`   | Shared utility functions                                              |
-| `
+| `src/tools/`   | Contains all MCP tools like `create-storefront-app`, `site-test`, etc. |
+| `src/utils/`   | Shared utility functions                                              |

packages/pwa-kit-mcp/CHANGELOG.md

@@ -63,7 +63,7 @@ If the user requests a project using a **template**:
 `
 
 export default {
-    name: 'create_app_guidelines',
+    name: 'create_storefront_app',
     description: `
     
 This tool is used to provide the agent with the instructions on how to use the @salesforce/pwa-kit-create-app CLI tool to create a new PWA Kit projects.