Merge remote-tracking branch 'upstream/main' into W-21766978-Add-scheduling-user-email-management-ODS

charithaT07 · charithaT07 · commit 76cc29d9305b · 2026-04-24T11:13:07.000+05:30
diff --git a/.changeset/RELEASE b/.changeset/RELEASE
@@ -1 +1 @@
-Wed Apr 22 18:56:56 UTC 2026
+Thu Apr 23 15:00:58 UTC 2026
diff --git a/.changeset/docs-default-user-scope.md b/.changeset/docs-default-user-scope.md
diff --git a/.changeset/vscode-activate-on-startup.md b/.changeset/vscode-activate-on-startup.md
diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
@@ -17,7 +17,7 @@
       "source": "./skills/b2c-cli",
       "category": "productivity",
       "strict": false,
-      "version": "1.1.2"
+      "version": "1.1.3"
     },
     {
       "name": "b2c",
@@ -29,7 +29,7 @@
       "source": "./skills/b2c",
       "category": "productivity",
       "strict": false,
-      "version": "1.1.2"
+      "version": "1.1.3"
     },
     {
       "name": "b2c-dx-mcp",
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -395,7 +395,7 @@ jobs:
         if: steps.release-type.outputs.type == 'stable' && steps.changesets.outputs.skip != 'true' && steps.quick-check.outputs.skip != 'true'
         run: |
           # Determine the release tag — prefer CLI as the user-facing product.
-          # VSX is excluded: it gets its own dedicated release to avoid tag collisions.
+          # Plugins and VSX get their own dedicated releases, so they are excluded here.
           if [[ "${{ steps.packages.outputs.publish_cli }}" == "true" ]]; then
             RELEASE_TAG="@salesforce/b2c-cli@${{ steps.packages.outputs.version_cli }}"
           elif [[ "${{ steps.packages.outputs.publish_sdk }}" == "true" ]]; then
@@ -406,10 +406,8 @@ jobs:
             RELEASE_TAG="@salesforce/mrt-utilities@${{ steps.packages.outputs.version_mrt }}"
           elif [[ "${{ steps.packages.outputs.publish_docs }}" == "true" ]]; then
             RELEASE_TAG="docs@${{ steps.packages.outputs.version_docs }}"
-          elif [[ "${{ steps.packages.outputs.publish_plugins }}" == "true" ]]; then
-            RELEASE_TAG="b2c-agent-plugins@${{ steps.packages.outputs.version_plugins }}"
           else
-            echo "No non-VSX packages published, skipping main release"
+            echo "No non-VSX/non-plugins packages published, skipping main release"
             exit 0
           fi
 
@@ -421,7 +419,6 @@ jobs:
           [[ "${{ steps.packages.outputs.publish_mrt }}" == "true" ]] && TITLE_PARTS+=("mrt-utilities ${{ steps.packages.outputs.version_mrt }}")
           [[ "${{ steps.packages.outputs.publish_vsx }}" == "true" ]] && TITLE_PARTS+=("b2c-vs-extension ${{ steps.packages.outputs.version_vsx }}")
           [[ "${{ steps.packages.outputs.publish_docs }}" == "true" ]] && TITLE_PARTS+=("docs ${{ steps.packages.outputs.version_docs }}")
-          [[ "${{ steps.packages.outputs.publish_plugins }}" == "true" ]] && TITLE_PARTS+=("agent-plugins ${{ steps.packages.outputs.version_plugins }}")
           RELEASE_TITLE="Version Packages — $(IFS=', '; echo "${TITLE_PARTS[*]}")"
 
           gh release create "$RELEASE_TAG" --title "$RELEASE_TITLE" --notes-file /tmp/release-notes.md
@@ -443,20 +440,11 @@ jobs:
       - name: Upload skills to release
         if: steps.release-type.outputs.type == 'stable' && steps.changesets.outputs.skip != 'true' && steps.quick-check.outputs.skip != 'true' && steps.packages.outputs.publish_plugins == 'true'
         run: |
-          # Determine the release tag (same priority as Create GitHub Release, excludes VSX)
-          if [[ "${{ steps.packages.outputs.publish_cli }}" == "true" ]]; then
-            RELEASE_TAG="@salesforce/b2c-cli@${{ steps.packages.outputs.version_cli }}"
-          elif [[ "${{ steps.packages.outputs.publish_sdk }}" == "true" ]]; then
-            RELEASE_TAG="@salesforce/b2c-tooling-sdk@${{ steps.packages.outputs.version_sdk }}"
-          elif [[ "${{ steps.packages.outputs.publish_mcp }}" == "true" ]]; then
-            RELEASE_TAG="@salesforce/b2c-dx-mcp@${{ steps.packages.outputs.version_mcp }}"
-          elif [[ "${{ steps.packages.outputs.publish_mrt }}" == "true" ]]; then
-            RELEASE_TAG="@salesforce/mrt-utilities@${{ steps.packages.outputs.version_mrt }}"
-          elif [[ "${{ steps.packages.outputs.publish_docs }}" == "true" ]]; then
-            RELEASE_TAG="docs@${{ steps.packages.outputs.version_docs }}"
-          else
-            RELEASE_TAG="b2c-agent-plugins@${{ steps.packages.outputs.version_plugins }}"
-          fi
+          RELEASE_TAG="b2c-agent-plugins@${{ steps.packages.outputs.version_plugins }}"
+
+          gh release create "$RELEASE_TAG" \
+            --title "Agent Plugins ${{ steps.packages.outputs.version_plugins }}" \
+            --notes "Skills artifacts for b2c-agent-plugins v${{ steps.packages.outputs.version_plugins }}"
 
           gh release upload "$RELEASE_TAG" b2c-skills.zip b2c-cli-skills.zip
         env:
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @salesforce/b2c-dx-docs
 
+## 0.2.18
+
+### Patch Changes
+
+- [`c5edd5d`](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/commit/c5edd5dccc5e472528c08c3fb2fc12b1872440c6) - Updated plugin install examples to default to user scope (Thanks [@clavery](https://github.com/clavery)!)
+
 ## 0.2.17
 
 ### Patch Changes
diff --git a/docs/package.json b/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/b2c-dx-docs",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "private": true,
   "description": "Documentation for B2C Developer Tooling",
   "scripts": {
diff --git a/packages/b2c-cli/CHANGELOG.md b/packages/b2c-cli/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @salesforce/b2c-cli
 
+## 1.7.1
+
+### Patch Changes
+
+- Updated dependencies [[`485ef63`](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/commit/485ef63b901d91f7b08c56366d1f1756a03f60dc)]:
+  - @salesforce/b2c-tooling-sdk@1.6.1
+
 ## 1.7.0
 
 ### Minor Changes
diff --git a/packages/b2c-cli/package.json b/packages/b2c-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/b2c-cli",
   "description": "A Salesforce B2C Commerce CLI",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "author": "Charles Lavery",
   "bin": {
     "b2c": "./bin/run.js"
diff --git a/packages/b2c-dx-mcp/CHANGELOG.md b/packages/b2c-dx-mcp/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @salesforce/b2c-dx-mcp
 
+## 1.0.12
+
+### Patch Changes
+
+- Updated dependencies [[`485ef63`](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/commit/485ef63b901d91f7b08c56366d1f1756a03f60dc)]:
+  - @salesforce/b2c-tooling-sdk@1.6.1
+
 ## 1.0.11
 
 ### Patch Changes
diff --git a/packages/b2c-dx-mcp/package.json b/packages/b2c-dx-mcp/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/b2c-dx-mcp",
   "description": "MCP server for B2C Commerce developer experience tools",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "author": "Salesforce",
   "license": "Apache-2.0",
   "repository": "SalesforceCommerceCloud/b2c-developer-tooling",
diff --git a/packages/b2c-tooling-sdk/CHANGELOG.md b/packages/b2c-tooling-sdk/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @salesforce/b2c-tooling-sdk
 
+## 1.6.1
+
+### Patch Changes
+
+- [`485ef63`](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/commit/485ef63b901d91f7b08c56366d1f1756a03f60dc) - Fix skills version resolution to correctly parse release tags and invalidate cached version on download errors (Thanks [@clavery](https://github.com/clavery)!)
+
 ## 1.6.0
 
 ### Minor Changes
diff --git a/packages/b2c-tooling-sdk/package.json b/packages/b2c-tooling-sdk/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/b2c-tooling-sdk",
   "description": "Core tooling library for Salesforce B2C Commerce CLI",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "author": "Charles Lavery",
   "license": "Apache-2.0",
   "repository": "SalesforceCommerceCloud/b2c-developer-tooling",
diff --git a/packages/b2c-tooling-sdk/src/skills/github.ts b/packages/b2c-tooling-sdk/src/skills/github.ts
@@ -52,6 +52,15 @@ function writeLatestVersionCache(version: string): void {
   }
 }
 
+function clearLatestVersionCache(): void {
+  try {
+    const p = getLatestVersionCachePath();
+    if (fs.existsSync(p)) fs.unlinkSync(p);
+  } catch {
+    // Best-effort
+  }
+}
+
 function isRateLimited(response: Response): boolean {
   if (response.status !== 403 && response.status !== 429) return false;
   const remaining = response.headers.get('x-ratelimit-remaining');
@@ -130,9 +139,12 @@ function parseRelease(release: {
   const b2cAsset = release.assets.find((a) => a.name === b2cSource.assetName);
   const b2cCliAsset = release.assets.find((a) => a.name === b2cCliSource.assetName);
 
+  const versionMatch = release.tag_name.match(/@(\d+\.\d+\.\d+.*)$/);
+  const version = versionMatch ? versionMatch[1] : release.tag_name.replace(/^v/, '');
+
   return {
     tagName: release.tag_name,
-    version: release.tag_name.replace(/^v/, ''),
+    version,
     publishedAt: release.published_at,
     b2cSkillsAssetUrl: b2cAsset?.browser_download_url ?? null,
     b2cCliSkillsAssetUrl: b2cCliAsset?.browser_download_url ?? null,
@@ -167,6 +179,7 @@ export async function getRelease(version: string = 'latest'): Promise<ReleaseInf
   });
 
   if (!response.ok) {
+    clearLatestVersionCache();
     if (response.status === 404) {
       throw new Error(`Release not found: ${tag}`);
     }
@@ -212,7 +225,10 @@ export async function listReleases(limit: number = 10): Promise<ReleaseInfo[]> {
     assets: Array<{name: string; browser_download_url: string}>;
   }>;
 
-  return data.map(parseRelease).filter((r) => r.b2cSkillsAssetUrl || r.b2cCliSkillsAssetUrl);
+  return data
+    .filter((r) => r.tag_name.startsWith('b2c-agent-plugins@'))
+    .map(parseRelease)
+    .filter((r) => r.b2cSkillsAssetUrl || r.b2cCliSkillsAssetUrl);
 }
 
 /**
@@ -264,6 +280,7 @@ async function downloadReleaseArtifact(
   });
 
   if (!response.ok) {
+    clearLatestVersionCache();
     if (response.status === 404) {
       throw new Error(`Skills artifact '${source.assetName}' not found for release ${tag}`);
     }
diff --git a/packages/b2c-vs-extension/CHANGELOG.md b/packages/b2c-vs-extension/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Change Log
 
+## 0.4.3
+
+### Patch Changes
+
+- [`63bcb49`](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/commit/63bcb4907585bea7ea41a6be483e7078a2cf5113) - Activate extension on startup so the instance selector status bar appears without needing to open the B2C sidebar first (Thanks [@clavery](https://github.com/clavery)!)
+
+- Updated dependencies [[`485ef63`](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/commit/485ef63b901d91f7b08c56366d1f1756a03f60dc)]:
+  - @salesforce/b2c-tooling-sdk@1.6.1
+
 ## 0.4.2
 
 ### Patch Changes
diff --git a/packages/b2c-vs-extension/package.json b/packages/b2c-vs-extension/package.json
@@ -2,7 +2,7 @@
   "name": "b2c-vs-extension",
   "displayName": "B2C DX VSCE",
   "description": "VS Code extension for B2C Commerce developer experience (Page Designer assistant, B2C CLI integration)",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "publisher": "Salesforce",
   "license": "Apache-2.0",
   "repository": "SalesforceCommerceCloud/b2c-developer-tooling",
diff --git a/skills/CHANGELOG.md b/skills/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @salesforce/b2c-agent-plugins
 
+## 1.1.3
+
+### Patch Changes
+
+- [`485ef63`](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/commit/485ef63b901d91f7b08c56366d1f1756a03f60dc) - Fix skills artifact download by publishing zip assets to dedicated agent-plugins releases (Thanks [@clavery](https://github.com/clavery)!)
+
 ## 1.1.2
 
 ### Patch Changes
diff --git a/skills/b2c-cli/.codex-plugin/plugin.json b/skills/b2c-cli/.codex-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
   "name": "b2c-cli",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "B2C CLI Skills for Salesforce Commerce Cloud development.",
   "author": {
     "name": "Salesforce"
diff --git a/skills/b2c/.codex-plugin/plugin.json b/skills/b2c/.codex-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
   "name": "b2c",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "B2C Commerce development skills including Custom API development guides.",
   "author": {
     "name": "Salesforce"
diff --git a/skills/package.json b/skills/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/b2c-agent-plugins",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "B2C Commerce agent skills plugins (b2c-cli, b2c). Private — distributed via GitHub release zips.",
   "private": true
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Wed Apr 22 18:56:56 UTC 2026`
	`1`	`+Thu Apr 23 15:00:58 UTC 2026`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@salesforce/b2c-dx-docs",`
`3`		`- "version": "0.2.17",`
	`3`	`+ "version": "0.2.18",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "Documentation for B2C Developer Tooling",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@salesforce/b2c-cli",`
`3`	`3`	`"description": "A Salesforce B2C Commerce CLI",`
`4`		`- "version": "1.7.0",`
	`4`	`+ "version": "1.7.1",`
`5`	`5`	`"author": "Charles Lavery",`
`6`	`6`	`"bin": {`
`7`	`7`	`"b2c": "./bin/run.js"`