Merge branch 'main' into chore/bump-react-sample-b2-11.54.1

Author: scottmo

.git2gus/config.json

@@ -0,0 +1,15 @@
+{
+  "productTag": "a1aEE000002EUebYAG",
+  "productTagLabels": {
+    "area:plugins": "a1aEE000002VQOTYA4",
+    "area:skills": "a1aEE000002EUebYAG"
+  },
+  "defaultBuild": "offcore.tooling.65",
+  "issueTypeLabels": {
+    "feature": "USER STORY",
+    "regression": "BUG P1",
+    "bug": "BUG P3"
+  },
+  "hideWorkItemUrl": "true",
+  "statusWhenClosed": "CLOSED"
+}

CHANGELOG.md

@@ -1,3 +1,12 @@
+# [1.37.0](https://github.com/forcedotcom/sf-skills/compare/1.36.0...1.37.0) (2026-08-13)
+
+
+### Features
+
+* Reconcile mcpTools declarations across skills (main) @W-23536091@ ([933c8df](https://github.com/forcedotcom/sf-skills/commit/933c8dfb04878d081715b9a107670332d913f629))
+
+
+
 # [1.36.0](https://github.com/forcedotcom/sf-skills/compare/1.35.0...1.36.0) (2026-08-11)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/afv-skills",
-  "version": "1.36.0",
+  "version": "1.37.0",
   "description": "Salesforce skills for Agentforce Vibes",
   "license": "CC-BY-NC-4.0",
   "files": [

plugins/builder/salesforce-development/catalog/discovery.json

@@ -1059,8 +1059,8 @@
           "accessCheck": null
         },
         "foundation": {
-          "skillMdSha256": "a96bbc6ffd5b95a4a62647b45a34911c261e9095c92f19c79b0c7fd9e99b67fd",
-          "treeSha256": "8428f1ca98b2c7c71330f0b00924865882b36d13fdf1e29007bd7dd58caf8a0f",
+          "skillMdSha256": "ec01c071dc73fce60b7596538ed102363d4e66275b89ef70e74e9687604ac650",
+          "treeSha256": "127ae4a45988e996d55ae05a18041b9a9873ee887d30e1020410063d1a83bfb8",
           "accessCheck": null
         }
       }
@@ -1182,8 +1182,8 @@
           "accessCheck": null
         },
         "foundation": {
-          "skillMdSha256": "b1bc2ae818de80f1d25c3059128784355066778715f1b56274a4e4979f08bd46",
-          "treeSha256": "93b6603a0adcabaccbd9fde27ed5ccf19a7c37f92cd72596844450c28c8c4f8c",
+          "skillMdSha256": "1dee09a134674df7daa269c0de400a95a55ea5edb20ca9fdfbea357b25ef4874",
+          "treeSha256": "e4613ad7f80bbc8c63c8c859ea8220e856df36e6897a17e02a8b3e66aa6a01cb",
           "accessCheck": null
         }
       }
@@ -1389,8 +1389,8 @@
           "accessCheck": null
         },
         "foundation": {
-          "skillMdSha256": "7659de502ecc9005c4899dba688c6e6f8415c611497ed4accd92af6fa39fbb04",
-          "treeSha256": "646fb64b646213c55845c0ee318464361563e882dfa93911283f86bdb65770d5",
+          "skillMdSha256": "c501a9f098e521eec69f3c599c92aba8836badfa79e14aac0fbce673e0aea7a8",
+          "treeSha256": "1cca3c702d51e1afd02e75ba603c963be07266858474fb24d4e5b320292eebac",
           "accessCheck": null
         }
       }
@@ -1436,8 +1436,8 @@
       "foundationInstalled": true,
       "variants": {
         "foundation": {
-          "skillMdSha256": "1545bb0b229cfe694acb63b100be91edf69ce5243e27529e64498690f12d0841",
-          "treeSha256": "2ee459b37a347209be7aaa252fcf79c374ccf174f4b8783fd0087f9ce4036c33",
+          "skillMdSha256": "633cec0b7feefd509f9e166b6d982028826c26b42e63c039ac2cc9c216c6e2be",
+          "treeSha256": "8a7fe196104e40f950c7de557e7d86f9a3238576ddbffcad609681d00c6cce2b",
           "accessCheck": null
         }
       }
@@ -1582,8 +1582,8 @@
       "foundationInstalled": true,
       "variants": {
         "foundation": {
-          "skillMdSha256": "f003be5b421a90406265152071225b93308ccead0450758a40d783013a9e2c93",
-          "treeSha256": "2ea2573e6ce8f41e63302ab5f465b7b39e9c78b34468417a2803e92e4cc7df71",
+          "skillMdSha256": "f6ebc6524d33e1927109b51590937904ff2023f7fdc0572b1af70f9be25e64dd",
+          "treeSha256": "245297ca8f362905abb0c72e22a0021f68b8c434564582ef4f1c63c0cc1df4b0",
           "accessCheck": null
         }
       }
@@ -1639,8 +1639,8 @@
           "accessCheck": null
         },
         "foundation": {
-          "skillMdSha256": "fb156b06f0150d4526b1d4402ca8bcdb9f4b98a8618d297aba1696327b0d5e46",
-          "treeSha256": "3f69983d753fb8c20ffe999f23732b938edc124c088f100d906dfa87da5f0c17",
+          "skillMdSha256": "ea6f9b07aa765ede2a2de835d4e55e29f802fd74147c556e11cf52eea204e6f6",
+          "treeSha256": "5bb808178384d7669829ffeec14cf123ad257f95497befc3d3b2857abf6ec8ce",
           "accessCheck": null
         }
       }
@@ -1719,8 +1719,8 @@
           "accessCheck": null
         },
         "foundation": {
-          "skillMdSha256": "a926f60c3a867f0250967701e25b69e8ae7c723ac264afe7421a1475a1589ef9",
-          "treeSha256": "92cfb7968a24f613231dff508e2af1a0d9f6685e8181ba1f1b05dfe94d38dd96",
+          "skillMdSha256": "e96b0bf09278d8145cde2a705b89a19418fa4164236be5e0b2b78e8f265489a2",
+          "treeSha256": "725a0a75e7765f041862721d1305e73d79de762c6c3da85bcddaf47a497d4418",
           "accessCheck": null
         }
       }

plugins/builder/salesforce-development/skills/platform-apex-generate/SKILL.md

@@ -21,11 +21,7 @@ metadata:
     # apex.diagnostics -> ...salesforce-lsp__apex_diagnostics. refresh_org_schema
     # is natively underscored, so both forms match.
     salesforce-lsp:
-      tools:
-        - apex.diagnostics
-        - apex.hover
-        - apex.documentSymbol
-        - refresh_org_schema
+      tools: ["apex.diagnostics", "apex.documentSymbol", "apex.hover", "refresh_org_schema"]
       semver: ">=0.1.0"
   version: "1.0"
   minApiVersion: "66.0"

plugins/builder/salesforce-development/skills/platform-apex-generate/SKILL.overlay.patch

@@ -1,6 +1,6 @@
 --- a/SKILL.md
 +++ b/SKILL.md
-@@ -1,12 +1,32 @@
+@@ -1,12 +1,28 @@
  ---
  name: platform-apex-generate
  description: "Primary Apex authoring skill for class generation, refactoring, and review. ALWAYS ACTIVATE when the user mentions Apex, .cls, triggers, or asks to create/refactor a class (service, selector, domain, batch, queueable, schedulable, invocable, DTO, utility, interface, abstract, exception, REST resource). Use this skill for requests involving SObject CRUD, mapping collections, fetching related records, scheduled jobs, batch jobs, trigger design, @AuraEnabled controllers, @RestResource endpoints, custom REST APIs, or code review of existing Apex."
@@ -24,24 +24,20 @@
 +    # apex.diagnostics -> ...salesforce-lsp__apex_diagnostics. refresh_org_schema
 +    # is natively underscored, so both forms match.
 +    salesforce-lsp:
-+      tools:
-+        - apex.diagnostics
-+        - apex.hover
-+        - apex.documentSymbol
-+        - refresh_org_schema
++      tools: ["apex.diagnostics", "apex.documentSymbol", "apex.hover", "refresh_org_schema"]
 +      semver: ">=0.1.0"
    version: "1.0"
    minApiVersion: "66.0"
  ---
-@@ -46,6 +66,7 @@
+@@ -46,6 +62,7 @@
     - Service-Selector-Domain layering, logging utilities
     - Existing classes/triggers and current trigger framework or handler pattern
     - Whether Trigger Actions Framework (TAF) is already in use
 +   - When refactoring or reviewing an existing `.cls`, call `mcp__plugin_salesforce-development_salesforce-lsp__apex_documentSymbol` with `{filePath: "<absolute-path>"}` to map the class's methods, properties, and inner types before editing, and call `mcp__plugin_salesforce-development_salesforce-lsp__apex_hover` with `{filePath, line, character}` (one-based line/character) to resolve the type or signature of a symbol you are unsure about. On error envelope or unavailable (`{error: <code>}` / tool not registered), fall back to reading the source directly.
 
  2. **Choose the smallest correct pattern** (see Type-Specific Guidance below)
 
-@@ -62,15 +83,28 @@
+@@ -62,15 +79,28 @@
 
  ### Phase 2 — Validate (required before reporting)
 
@@ -77,7 +73,7 @@
     - Run org tests including `{ClassName}Test` via `sf apex run test` or MCP.
     - Delegate all test generation/fixes/coverage work to `platform-apex-test-generate`; iterate until the tests pass.
     - Capture pass/fail counts and coverage percentage for the report.
-@@ -78,10 +112,11 @@
+@@ -78,10 +108,11 @@
 
  ### Phase 3 — Report
 
@@ -93,7 +89,7 @@
 
  ---
 
-@@ -388,9 +423,10 @@
+@@ -388,9 +419,10 @@
  Apex work: <summary>
  Files: <paths>
  Design: <pattern / framework choices>

plugins/builder/salesforce-development/skills/platform-custom-field-generate/SKILL.md

@@ -4,7 +4,13 @@ description: "Use this skill when users need to create, generate, or validate Sa
 metadata:
   version: "1.0"
   minApiVersion: "60.0"
-  relatedSkills: ["platform-value-set-generate", "platform-validation-rule-generate"]
+  relatedSkills:
+    - "platform-validation-rule-generate"
+    - "platform-value-set-generate"
+  mcpTools:
+    metadata-grounding:
+      tools: ["search_metadata"]
+      semver: ">=1.0.0"
 ---
 
 # Salesforce Custom Field Generator and Validator

plugins/builder/salesforce-development/skills/platform-lightning-app-coordinate/SKILL.md

@@ -15,12 +15,12 @@ metadata:
     - "platform-permission-set-generate"
     - "platform-validation-rule-generate"
   mcpTools:
-    salesforce-api-context:
-      tools: ["get_metadata_type_sections", "get_metadata_type_context", "get_metadata_type_fields", "get_metadata_type_fields_properties", "search_metadata_types"]
-      semver: ">=1.0.0"
     metadata-experts:
       tools: ["execute_metadata_action"]
       semver: ">=1.0.0"
+    salesforce-api-context:
+      tools: ["get_metadata_type_context", "get_metadata_type_fields", "get_metadata_type_fields_properties", "get_metadata_type_sections", "search_metadata_types"]
+      semver: ">=1.0.0"
 ---
 
 # Generating Lightning App

plugins/builder/salesforce-development/skills/platform-lsp-integrate/SKILL.md

@@ -8,8 +8,7 @@ metadata:
     # dotted as lsp.health). In allowed-tools it appears in Claude Code's
     # sanitized form: mcp__plugin_salesforce-development_salesforce-lsp__lsp_health.
     salesforce-lsp:
-      tools:
-        - lsp.health
+      tools: ["lsp.health"]
       semver: ">=0.1.0"
   cliTools:
     - tool: ["sf"]

plugins/builder/salesforce-development/skills/platform-report-generate/SKILL.md

@@ -8,7 +8,7 @@ metadata:
     - "platform-custom-report-type-generate"
   mcpTools:
     salesforce-api-context:
-      tools: ["get_metadata_type_sections", "get_metadata_type_context", "get_metadata_type_shape"]
+      tools: ["get_metadata_type_context", "get_metadata_type_sections", "get_metadata_type_shape"]
       semver: ">=1.0.0"
 ---