Merge branch 'develop' into phale/multi

Author: peternhale

.claude/skills/feature-branch/SKILL.md

@@ -0,0 +1,38 @@
+---
+name: feature-branch
+description: Create feature branches for all work. Use when creating branches, checking out, or pushing. Prevents accidental push to develop.
+---
+
+# Feature Branch
+
+All work must be on feature branches. Never commit directly to develop or main.
+
+## Do
+
+```bash
+git fetch origin develop
+git checkout develop
+git pull
+git checkout -b feature/W-XXXXX
+# ... work, commit ...
+git push -u origin feature/W-XXXXX
+```
+
+Or, branch from remote without tracking it:
+
+```bash
+git fetch origin develop
+git checkout -b feature/W-XXXXX origin/develop --no-track
+```
+
+## Don't
+
+**Never** `git checkout -b feature/W-XXXXX origin/develop` without `--no-track`.
+
+That sets the new branch to track `origin/develop`. A bare `git push` would then push to develop instead of creating a remote feature branch.
+
+## Summary
+
+- All work on feature branches
+- Use `--no-track` when branching from `origin/<base>`, or branch from local `<base>` after pull
+- Always push with explicit branch: `git push -u origin feature/W-XXXXX`

.claude/skills/pr-draft/SKILL.md

@@ -16,7 +16,7 @@ Draft PR titles and bodies per salesforcedx-vscode conventions. Requires a Gus w
 1. If branch name contains `W-XXXXX`, confirm it exists in GUS, resembles the work done on the branch, and use that
 2. Else ask: "Do you have a Gus work item (W-XXXXX) for this PR?"
 3. If yes → try to find it using [gus-cli/SKILL.md](../gus-cli/SKILL.md). Confirm with the user that you got it right, or ask them to choose if several could be right.
-4. If no → offer to create via Gus. Follow [gus-cli/SKILL.md](../gus-cli/SKILL.md). **Before creating:** show user Subject, Epic, Details, assignee. Ask: "Create this work item?" Do not run `sf data create record` until user says yes.
+4. If no → offer to create via Gus. Follow [gus-cli/SKILL.md](../gus-cli/SKILL.md). **Before creating:** show user Subject, Epic, Details, assignee. Ask: "Create this work item?" Do not run `sf data create record` until user says yes. If user declines creation and still wants to proceed with the PR, include `[skip-validate-pr]` in the PR body.
 5. Before creating PR: push current branch to remote if it doesn't already exist (`git push -u origin $(git branch --show-current)` or equivalent). Never push to `develop`/`main`
 6. After PR created: update work item `Details__c` with PR link. Query current `Details__c`, append `"\nPR: <url>"` (or prepend if empty). **Before updating:** show user the new Details\_\_c. Ask: "Update work item with PR link?" Do not run `sf data update record` until user says yes.
 7. After PR created: offer Ready for Review. Ask: "Put WI in Ready for Review? Who should review?" Choices:
@@ -43,6 +43,7 @@ Draft PR titles and bodies per salesforcedx-vscode conventions. Requires a Gus w
 - Write body content per [concise/SKILL.md](../concise/SKILL.md)
 - Include `@W-XXXXX@` in "What issues does this PR fix or reference?" per [.github/PULL_REQUEST_TEMPLATE.md](../../../.github/PULL_REQUEST_TEMPLATE.md):
 - Delete the before/after section if you have nothing to say there
+- **User declined WI:** Only when user explicitly declines to create a work item and still wants the PR, include `[skip-validate-pr]` in the PR body (e.g. at end of body)
 
 ```
 ### What issues does this PR fix or reference?

.cursor/hooks.json

@@ -1,6 +1,12 @@
 {
   "version": 1,
   "hooks": {
+    "beforeShellExecution": [
+      {
+        "command": ".cursor/hooks/block-no-verify.sh",
+        "matcher": "git.*--no-verify"
+      }
+    ],
     "stop": [{ "command": ".cursor/hooks/verify-stop.sh" }]
   }
 }

.cursor/hooks/block-no-verify.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Block git with --no-verify. beforeShellExecution hook (matcher: git.*--no-verify).
+input=$(cat)
+command=$(echo "$input" | jq -r '.command // empty')
+[[ "$command" =~ git.*--no-verify ]] && echo '{"permission":"deny","agent_message":"git with --no-verify is blocked. Run without --no-verify so hooks run."}' || echo '{"permission":"allow"}'

.github/dependabot.yml

@@ -25,6 +25,19 @@ updates:
     open-pull-requests-limit: 3
     rebase-strategy: auto
     versioning-strategy: increase
+  # Daily updates for @salesforce/templates only
+  - package-ecosystem: 'npm'
+    directory: '/'
+    target-branch: 'develop'
+    schedule:
+      interval: 'daily'
+      time: '06:00'
+      timezone: 'America/Los_Angeles'
+    allow:
+      - dependency-name: '@salesforce/templates'
+    open-pull-requests-limit: 1
+    rebase-strategy: auto
+    versioning-strategy: increase
   # Exclude updates to doc tools
   # TODO: Enable after adding automated check(s) for doc generation
   - package-ecosystem: 'bundler'

SHA256.md

@@ -8,31 +8,31 @@ make sure that their SHA values match the values in the list below.
    following the instructions at
    https://code.visualstudio.com/docs/editor/extension-gallery#_common-questions.
    For example, download,
-   https://salesforce.gallery.vsassets.io/_apis/public/gallery/publisher/salesforce/extension/salesforcedx-vscode-core/66.2.1/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage.
+   https://salesforce.gallery.vsassets.io/_apis/public/gallery/publisher/salesforce/extension/salesforcedx-vscode-core/66.2.2/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage.
 
 2. From a terminal, run:
 
 shasum -a 256 <location_of_the_downloaded_file>
 
 3. Confirm that the SHA in your output matches the value in this list of SHAs.
 
-8d95ae4468e720bf160f586d055e77ec4634cbd3bcc2e1ddb974fd218087e8e0  salesforcedx-vscode-66.2.1.vsix
-4ddc839fc6631608bb3b2e58af9dd15e3795c7cbadbe72c7a9afee2778be7b3b  salesforcedx-vscode-apex-66.2.1.vsix
-ef8730f71b436afbed103c5c0d0df81eecc0d5bd494e98a05ebacf47e790ac37  salesforcedx-vscode-apex-debugger-66.2.1.vsix
-921faf96f07df6e329cdd61f90453bbbdd6ac17d453f53890a798252fa25c7e3  salesforcedx-vscode-apex-log-66.2.1.vsix
-be3ca86e6a2cbaed7c99da97475b9576d51b9dbcc03f04bfe0b4e117d8cf811f  salesforcedx-vscode-apex-oas-66.2.1.vsix
-c22942d52b3e441b450dccb60422d289eaca5286f82ad95ebea5ffd26bc2aa61  salesforcedx-vscode-apex-replay-debugger-66.2.1.vsix
-7bde71ef460257b6b26872eeabe9e389986f689e4395d6123c205634a4db2d15  salesforcedx-vscode-apex-testing-66.2.1.vsix
-c01f7f7ab1bf41273cb15cf5754cb943d3cc0f86bfb443376600528c57966ecd  salesforcedx-vscode-core-66.2.1.vsix
-da9cc58fa45ebfc0e84663d32553c825f0965266bf1fa180573d72dd5f0585d2  salesforcedx-vscode-expanded-66.2.1.vsix
-9223d4517c8c90f7c35eea5501c865a2c206cce6666da89ab51fdd2c013a1d0a  salesforcedx-vscode-lightning-66.2.1.vsix
-4cc1f39f807775b442bd9fe9d364156ac031f368c05e162b26afaa77f5046a55  salesforcedx-vscode-lwc-66.2.1.vsix
-3d19b51e57b13a91502075c94451244b0f8687939cdbbd8c0e809fa65a5d19f5  salesforcedx-vscode-metadata-66.2.1.vsix
-ca7de667067fb98ad20671aa4c29725ba622ff5019570f124731a1032b5ccd63  salesforcedx-vscode-org-66.2.1.vsix
-80c8ca22287f7a20576641e63aa18aaf7c605cfba21204c166d5421ff553030c  salesforcedx-vscode-org-browser-66.2.1.vsix
-acf69f1dd10237f9022af772dc25ae2a0e9e5dce6db1bf3f10eb899c49ed8683  salesforcedx-vscode-services-66.2.1.vsix
-9ce26246b6ce9fa6e2a45f1859e1e306f5edc9650a210f2eed6f6940c1465b6f  salesforcedx-vscode-soql-66.2.1.vsix
-e43186c9b419cc71983859bec39b891d5ada12e2ed90c280a095bcf0c195990c  salesforcedx-vscode-visualforce-66.2.1.vsix
+873889f888490d6b645e6d7f445b7126d0fe03d18b0cff9f76d75d060b5a90b4  salesforcedx-vscode-66.2.2.vsix
+9d449f268947accfc4f57a115413b53236a734c8900fcf8f96b5ab56b4e0f053  salesforcedx-vscode-apex-66.2.2.vsix
+f6047d0dbae3fdcc6dbc7afbaf328c1929415c6d048e81602e26db16d9805aa6  salesforcedx-vscode-apex-debugger-66.2.2.vsix
+e2da1a7a666921629e0ff895e85a40e2514a2dc544cfb1c9e420ce40f526e1a6  salesforcedx-vscode-apex-log-66.2.2.vsix
+179687a759744fe8289e2b881606de73e64f2a3d3b6bb7d1f0205418171e08f3  salesforcedx-vscode-apex-oas-66.2.2.vsix
+ced22fe0996f30d442cd43f6ec0c47d573be4834c4066a0a57325a2b12cbc6fc  salesforcedx-vscode-apex-replay-debugger-66.2.2.vsix
+615e31bbeea6c63fa1f00e2bb0547c2e6e318c38ca5988fe773f79f2be09f714  salesforcedx-vscode-apex-testing-66.2.2.vsix
+3a44959d195d2d5c5659132672cd77fe75999815e99d270c76101d75397d06e1  salesforcedx-vscode-core-66.2.2.vsix
+710351ca75b73904190a776c63e78038027963b63531d9014b19a281cd13e026  salesforcedx-vscode-expanded-66.2.2.vsix
+8edb1f7d896e9abc051f6a6a5f921cb9b9ae7d59324c0bca779b118c36adca4e  salesforcedx-vscode-lightning-66.2.2.vsix
+7f7afa4192db15de240fe12ea46558aa9f07309284b9e186204527e3e55e5266  salesforcedx-vscode-lwc-66.2.2.vsix
+56a59f038bee85abece2f43796c3e0330f7df23a0025585baffa9326c22b7c98  salesforcedx-vscode-metadata-66.2.2.vsix
+59086f2dac9dba9f34381c586db44a0244d3b22dc1e5800c64ea0a7c1d9d96fe  salesforcedx-vscode-org-66.2.2.vsix
+f20fe0c55931494ff8238fc3cbcaa9f778f681e72122230b45e009c23a2f344f  salesforcedx-vscode-org-browser-66.2.2.vsix
+fbe1c28f075f4e8ee001ed01bd3d7fff724f8a3c2618c36a483c68a396f5b38c  salesforcedx-vscode-services-66.2.2.vsix
+fb70245929df247d8733f499be588a4894856a27dd15de82b4362138885fe8ae  salesforcedx-vscode-soql-66.2.2.vsix
+77e6bae98bd782191af9f6baf8d0191868561b7c6abd213114e8345b58b0ed96  salesforcedx-vscode-visualforce-66.2.2.vsix
 
 
 4. Change the filename extension for the file that you downloaded from .zip to

package-lock.json

@@ -136,6 +136,7 @@
     "capture:results": "shx mkdir -p ./test-results && npm run junit:report && npm run coverage:report",
     "check:links": "find . -name \\*.md -not -path '*/node_modules/*' -print0 | xargs -0 -n1 npx markdown-link-check --quiet --alive 200,206,429",
     "check:dupes": "npx jscpd",
+    "check:branch": "wireit",
     "precommit": "wireit",
     "prepush": "wireit",
     "vscode:bundle": "wireit",
@@ -371,8 +372,12 @@
       ],
       "output": []
     },
+    "check:branch": {
+      "command": "node scripts/check-branch.js"
+    },
     "precommit": {
       "dependencies": [
+        "check:branch",
         "compile",
         "lint",
         "check:peer-deps",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/effect-ext-utils",
-  "version": "66.2.1",
+  "version": "66.2.2",
   "description": "Utility functions and helpers for Effect-based VS Code extensions",
   "author": "Salesforce",
   "license": "BSD-3-Clause",

packages/effect-ext-utils/package.json

@@ -14,7 +14,7 @@
     "color": "#ECECEC",
     "theme": "light"
   },
-  "version": "66.2.1",
+  "version": "66.2.2",
   "publisher": "salesforce",
   "o11yUploadEndpoint": "https://794testsite.my.site.com/byolwr/webruntime/log/metrics",
   "enableO11y": "true",