Merge branch 'develop' into phale/W-21567195-fix-org-logout

peternhale · peternhale · commit dfe0f879669c · 2026-03-19T06:00:07.000-06:00
diff --git a/.claude/skills/feature-branch/SKILL.md b/.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`
diff --git a/.claude/skills/pr-draft/SKILL.md b/.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?
diff --git a/.cursor/hooks.json b/.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" }]
   }
 }
diff --git a/.cursor/hooks/block-no-verify.sh b/.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"}'
diff --git a/package.json b/package.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",
diff --git a/packages/salesforcedx-vscode-core/src/index.ts b/packages/salesforcedx-vscode-core/src/index.ts
@@ -263,8 +263,12 @@ export const activate = async (extensionContext: vscode.ExtensionContext): Promi
     CommandEventDispatcher.getInstance()
   );
 
-  if (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 0) {
-    // Refresh SObject definitions if there aren't any faux classes
+  if (
+    metadataExtension &&
+    vscode.workspace.workspaceFolders &&
+    vscode.workspace.workspaceFolders.length > 0
+  ) {
+    // Refresh SObject definitions if there aren't any faux classes (metadata ext registers the command)
     const sobjectRefreshStartup: boolean = vscode.workspace
       .getConfiguration(SFDX_CORE_CONFIGURATION_NAME)
       .get<boolean>(ENABLE_SOBJECT_REFRESH_ON_STARTUP, false);
diff --git a/packages/salesforcedx-vscode-metadata/package.json b/packages/salesforcedx-vscode-metadata/package.json
@@ -287,10 +287,6 @@
           "command": "sf.metadata.apex.generate.class",
           "when": "salesforcedx-vscode-metadata.showSharedCommands"
         },
-        {
-          "command": "sf.metadata.lightning.generate.lwc",
-          "when": "salesforcedx-vscode-metadata.showSharedCommands"
-        },
         {
           "command": "sf.metadata.delete.source",
           "when": "never"
@@ -393,7 +389,7 @@
         },
         {
           "command": "sf.metadata.lightning.generate.lwc",
-          "when": "explorerResourceIsFolder && resourceFilename == lwc && salesforcedx-vscode-metadata.showSharedCommands && sf:project_opened"
+          "when": "explorerResourceIsFolder && resourceFilename == lwc && sf:project_opened"
         }
       ]
     },
diff --git a/packages/salesforcedx-vscode-metadata/src/commands/projectDeployStart.ts b/packages/salesforcedx-vscode-metadata/src/commands/projectDeployStart.ts
@@ -7,15 +7,23 @@
 
 import { ExtensionProviderService } from '@salesforce/effect-ext-utils';
 import * as Effect from 'effect/Effect';
+import * as vscode from 'vscode';
+import { nls } from '../messages';
 import { deployComponentSet } from '../shared/deploy/deployComponentSet';
 
 /** Deploy local changes to the default org */
 export const projectDeployStartCommand = (ignoreConflicts = false) =>
   Effect.gen(function* () {
     const api = yield* (yield* ExtensionProviderService).getServicesApi;
-    const componentSet = yield* (yield* api.services.ComponentSetService).ensureNonEmptyComponentSet(
-      yield* api.services.MetadataDeployService.getComponentSetForDeploy({ ignoreConflicts })
-    );
+    const [componentSetService] = yield* Effect.all([api.services.ComponentSetService], { concurrency: 'unbounded' });
+    const componentSet = yield* api.services.MetadataDeployService.getComponentSetForDeploy({ ignoreConflicts });
 
-    yield* deployComponentSet({ componentSet });
-  });
+    const nonEmpty = yield* componentSetService.ensureNonEmptyComponentSet(componentSet);
+    yield* deployComponentSet({ componentSet: nonEmpty });
+  }).pipe(
+    Effect.catchTag('EmptyComponentSetError', () =>
+      Effect.sync(() => {
+        void vscode.window.showInformationMessage(nls.localize('no_local_changes_to_deploy'));
+      })
+    )
+  );
diff --git a/packages/salesforcedx-vscode-metadata/src/commands/retrieveStart/projectRetrieveStart.ts b/packages/salesforcedx-vscode-metadata/src/commands/retrieveStart/projectRetrieveStart.ts
@@ -8,9 +8,19 @@
 import { ExtensionProviderService } from '@salesforce/effect-ext-utils';
 import type { ComponentSet } from '@salesforce/source-deploy-retrieve';
 import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
+import * as vscode from 'vscode';
 import { nls } from '../../messages';
 import { retrieveComponentSet } from '../../shared/retrieve/retrieveComponentSet';
 
+class SourceTrackingComponentsFailedError extends Schema.TaggedError<SourceTrackingComponentsFailedError>()(
+  'SourceTrackingComponentsFailedError',
+  {
+    message: Schema.String,
+    cause: Schema.optional(Schema.Unknown)
+  }
+) {}
+
 // Type guard function to ensure result has expected shape
 const isApplyResult = (
   value: unknown
@@ -26,8 +36,8 @@ export const projectRetrieveStartCommand = (ignoreConflicts: boolean) =>
     yield* Effect.annotateCurrentSpan({ ignoreConflicts });
 
     const api = yield* (yield* ExtensionProviderService).getServicesApi;
-    const [sourceTrackingService, channelService] = yield* Effect.all(
-      [api.services.SourceTrackingService, api.services.ChannelService],
+    const [sourceTrackingService, channelService, componentSetService] = yield* Effect.all(
+      [api.services.SourceTrackingService, api.services.ChannelService, api.services.ComponentSetService],
       { concurrency: 'unbounded' }
     );
 
@@ -48,26 +58,30 @@ export const projectRetrieveStartCommand = (ignoreConflicts: boolean) =>
     const result = yield* Effect.tryPromise({
       try: () => tracking.maybeApplyRemoteDeletesToLocal(true),
       catch: e =>
-        new Error(nls.localize('error_source_tracking_components_failed', e instanceof Error ? e.message : String(e)))
+        new SourceTrackingComponentsFailedError({
+          message: nls.localize('error_source_tracking_components_failed', e instanceof Error ? e.message : String(e)),
+          cause: e
+        })
     }).pipe(Effect.withSpan('maybeApplyRemoteDeletesToLocal'));
 
     if (!isApplyResult(result)) {
       return yield* Effect.fail(
-        new Error(nls.localize('error_source_tracking_components_failed', 'Invalid result from source tracking'))
+        new SourceTrackingComponentsFailedError({
+          message: nls.localize('error_source_tracking_components_failed', 'Invalid result from source tracking')
+        })
       );
     }
 
     const componentSet = result.componentSetFromNonDeletes;
-
-    const changeCount = componentSet.size;
+    const nonEmpty = yield* componentSetService.ensureNonEmptyComponentSet(componentSet);
     yield* channelService.appendToChannel(
-      `Found ${changeCount} remote change${changeCount === 1 ? '' : 's'} to retrieve`
+      `Found ${nonEmpty.size} remote change${nonEmpty.size === 1 ? '' : 's'} to retrieve`
     );
-
-    if (componentSet.size === 0) {
-      yield* channelService.appendToChannel('No remote changes to retrieve');
-      return;
-    }
-
-    yield* retrieveComponentSet({ componentSet, ignoreConflicts: true });
-  });
+    yield* retrieveComponentSet({ componentSet: nonEmpty, ignoreConflicts: true });
+  }).pipe(
+    Effect.catchTag('EmptyComponentSetError', () =>
+      Effect.sync(() => {
+        void vscode.window.showInformationMessage(nls.localize('no_remote_changes_to_retrieve'));
+      })
+    )
+  );
diff --git a/packages/salesforcedx-vscode-metadata/src/messages/i18n.ts b/packages/salesforcedx-vscode-metadata/src/messages/i18n.ts
@@ -60,6 +60,8 @@ export const messages = {
     'You can run SFDX: Retrieve This Source from Org only on a source file or directory.',
   retrieve_select_manifest: 'You can run SFDX: Retrieve Source in Manifest from Org only on a manifest file.',
   retrieve_completed_with_errors_message: 'Retrieve completed with errors. Check output for details.',
+  no_remote_changes_to_retrieve: 'No remote changes to retrieve.',
+  no_local_changes_to_deploy: 'No local changes to deploy.',
   retrieve_source_conflicts_detected: 'Conflicts detected. Resolve conflicts before retrieving. \n Conflicts: %s',
   error_source_tracking_components_failed: 'Failed to retrieve components using source tracking: %s',
   delete_source_text: 'SFDX: Delete from Project and Org',
diff --git a/scripts/check-branch.js b/scripts/check-branch.js
@@ -0,0 +1,32 @@
+#!/usr/bin/env node
+/**
+ * Block commits and pushes to develop/main on the upstream repo from local dev machines.
+ * Skipped in GitHub Actions: GITHUB_ACTIONS is always "true" when running there.
+ * https://docs.github.com/en/actions/reference/workflows-and-actions/variables#default-environment-variables
+ *
+ * Skipped on forks: only enforced when origin points to forcedotcom/salesforcedx-vscode.
+ */
+const { execSync } = require('child_process');
+
+const run = (cmd) => execSync(cmd, { encoding: 'utf8' }).trim();
+
+if (process.env.GITHUB_ACTIONS === 'true') process.exit(0);
+
+const PROTECTED = ['develop', 'main'];
+const UPSTREAM_PATTERN = /forcedotcom\/salesforcedx-vscode/;
+
+const originUrl = run('git remote get-url origin 2>/dev/null || echo ""');
+if (!UPSTREAM_PATTERN.test(originUrl)) process.exit(0);
+
+const branch = run('git rev-parse --abbrev-ref HEAD');
+if (PROTECTED.includes(branch)) {
+  console.error(`ERROR: Direct commits/pushes to '${branch}' are not allowed. Use a feature branch.`);
+  process.exit(1);
+}
+
+const upstream = run('git rev-parse --abbrev-ref --symbolic-full-name @{upstream} 2>/dev/null || echo ""');
+const blockedUpstreams = PROTECTED.map((b) => `origin/${b}`);
+if (blockedUpstreams.includes(upstream)) {
+  console.error(`ERROR: Branch '${branch}' tracks '${upstream}'. Fix with: git branch --unset-upstream`);
+  process.exit(1);
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,12 @@`
`1`	`1`	`{`
`2`	`2`	`"version": 1,`
`3`	`3`	`"hooks": {`
	`4`	`+ "beforeShellExecution": [`
	`5`	`+ {`
	`6`	`+ "command": ".cursor/hooks/block-no-verify.sh",`
	`7`	`+ "matcher": "git.*--no-verify"`
	`8`	`+ }`
	`9`	`+ ],`
`4`	`10`	`"stop": [{ "command": ".cursor/hooks/verify-stop.sh" }]`
`5`	`11`	`}`
`6`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -287,10 +287,6 @@`
`287`	`287`	`"command": "sf.metadata.apex.generate.class",`
`288`	`288`	`"when": "salesforcedx-vscode-metadata.showSharedCommands"`
`289`	`289`	`},`
`290`		`- {`
`291`		`- "command": "sf.metadata.lightning.generate.lwc",`
`292`		`- "when": "salesforcedx-vscode-metadata.showSharedCommands"`
`293`		`- },`
`294`	`290`	`{`
`295`	`291`	`"command": "sf.metadata.delete.source",`
`296`	`292`	`"when": "never"`
`@@ -393,7 +389,7 @@`
`393`	`389`	`},`
`394`	`390`	`{`
`395`	`391`	`"command": "sf.metadata.lightning.generate.lwc",`
`396`		`- "when": "explorerResourceIsFolder && resourceFilename == lwc && salesforcedx-vscode-metadata.showSharedCommands && sf:project_opened"`
	`392`	`+ "when": "explorerResourceIsFolder && resourceFilename == lwc && sf:project_opened"`
`397`	`393`	`}`
`398`	`394`	`]`
`399`	`395`	`},`