chore: merge main, resolve conflicts

Author: WillieRuemmele

.github/workflows/just-nuts.yml

@@ -23,6 +23,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest]
         repository:
+          # - salesforcecli/plugin-agent
           - salesforcecli/plugin-auth
           - salesforcecli/plugin-apex
           - salesforcecli/plugin-api

README.md

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/cli",
   "description": "The Salesforce CLI",
-  "version": "2.86.5",
+  "version": "2.93.0",
   "author": "Salesforce",
   "bin": {
     "sf": "./bin/run.js",
@@ -56,6 +56,7 @@
       "@oclif/plugin-version",
       "@oclif/plugin-warn-if-update-available",
       "@oclif/plugin-which",
+      "@salesforce/plugin-agent",
       "@salesforce/plugin-apex",
       "@salesforce/plugin-api",
       "@salesforce/plugin-auth",
@@ -75,14 +76,15 @@
       "@salesforce/plugin-user"
     ],
     "jitPlugins": {
-      "@salesforce/plugin-code-analyzer": "5.0.0-beta.3",
-      "@salesforce/plugin-custom-metadata": "3.3.50",
-      "@salesforce/plugin-community": "3.3.20",
+      "@salesforce/plugin-code-analyzer": "5.1.0",
+      "@salesforce/plugin-community": "3.3.26",
+      "@salesforce/plugin-custom-metadata": "3.3.56",
       "@salesforce/plugin-dev": "2.5.1",
       "@salesforce/plugin-devops-center": "1.2.27",
-      "@salesforce/plugin-signups": "2.6.22",
+      "@salesforce/plugin-flow": "1.0.2",
+      "@salesforce/plugin-signups": "2.6.28",
       "@salesforce/sfdx-plugin-lwc-test": "1.2.1",
-      "@salesforce/sfdx-scanner": "4.11.0"
+      "@salesforce/sfdx-scanner": "4.12.0"
     },
     "devPlugins": [
       "@oclif/plugin-command-snapshot",
@@ -143,37 +145,38 @@
   },
   "dependencies": {
     "@inquirer/select": "^2.3.5",
-    "@oclif/core": "4.2.10",
-    "@oclif/plugin-autocomplete": "3.2.27",
-    "@oclif/plugin-commands": "4.1.24",
-    "@oclif/plugin-help": "6.2.27",
-    "@oclif/plugin-not-found": "3.2.49",
-    "@oclif/plugin-plugins": "5.4.36",
-    "@oclif/plugin-search": "1.2.23",
-    "@oclif/plugin-update": "4.6.38",
-    "@oclif/plugin-version": "2.2.27",
-    "@oclif/plugin-warn-if-update-available": "3.1.38",
-    "@oclif/plugin-which": "3.2.34",
+    "@oclif/core": "4.3.1",
+    "@oclif/plugin-autocomplete": "3.2.29",
+    "@oclif/plugin-commands": "4.1.25",
+    "@oclif/plugin-help": "6.2.28",
+    "@oclif/plugin-not-found": "3.2.55",
+    "@oclif/plugin-plugins": "5.4.39",
+    "@oclif/plugin-search": "1.2.24",
+    "@oclif/plugin-update": "4.6.42",
+    "@oclif/plugin-version": "2.2.28",
+    "@oclif/plugin-warn-if-update-available": "3.1.40",
+    "@oclif/plugin-which": "3.2.35",
     "@salesforce/core": "^8.9.1",
     "@salesforce/kit": "^3.1.6",
-    "@salesforce/plugin-apex": "3.6.13",
+    "@salesforce/plugin-agent": "1.22.8",
+    "@salesforce/plugin-apex": "3.6.19",
     "@salesforce/plugin-api": "1.3.3",
-    "@salesforce/plugin-auth": "3.6.113",
-    "@salesforce/plugin-data": "4.0.27",
-    "@salesforce/plugin-deploy-retrieve": "3.22.4",
-    "@salesforce/plugin-info": "3.4.54",
-    "@salesforce/plugin-limits": "3.3.52",
+    "@salesforce/plugin-auth": "3.6.126",
+    "@salesforce/plugin-data": "4.0.37",
+    "@salesforce/plugin-deploy-retrieve": "3.22.19",
+    "@salesforce/plugin-info": "3.4.65",
+    "@salesforce/plugin-limits": "3.3.56",
     "@salesforce/plugin-marketplace": "1.3.8",
-    "@salesforce/plugin-org": "5.6.3",
+    "@salesforce/plugin-org": "5.7.13",
     "@salesforce/plugin-packaging": "2.15.0",
-    "@salesforce/plugin-schema": "3.3.59",
-    "@salesforce/plugin-settings": "2.4.24",
-    "@salesforce/plugin-sobject": "1.4.55",
-    "@salesforce/plugin-telemetry": "3.6.38",
-    "@salesforce/plugin-templates": "56.3.45",
-    "@salesforce/plugin-trust": "3.7.83",
-    "@salesforce/plugin-user": "3.6.18",
-    "@salesforce/sf-plugins-core": "12.2.1",
+    "@salesforce/plugin-schema": "3.3.65",
+    "@salesforce/plugin-settings": "2.4.29",
+    "@salesforce/plugin-sobject": "1.4.59",
+    "@salesforce/plugin-telemetry": "3.6.43",
+    "@salesforce/plugin-templates": "56.3.49",
+    "@salesforce/plugin-trust": "3.7.97",
+    "@salesforce/plugin-user": "3.6.25",
+    "@salesforce/sf-plugins-core": "12.2.2",
     "ansis": "^3.12.0"
   },
   "pinnedDependencies": [
@@ -189,6 +192,7 @@
     "@oclif/plugin-warn-if-update-available",
     "@oclif/plugin-which",
     "@salesforce/sf-plugins-core",
+    "@salesforce/plugin-agent",
     "@salesforce/plugin-apex",
     "@salesforce/plugin-api",
     "@salesforce/plugin-auth",
@@ -253,6 +257,7 @@
   "types": "dist/index.d.ts",
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^5.2.3",
+    "@oclif/test": "^4.1.13",
     "@salesforce/dev-scripts": "^11.0.2",
     "@salesforce/plugin-release-management": "^5.7.0",
     "@salesforce/ts-sinon": "^1.4.30",

package.json

@@ -7,9 +7,8 @@
 
 import { type Hook } from '@oclif/core/hooks';
 
-// eslint-disable-next-line @typescript-eslint/require-await
-const hook: Hook.Prerun = async function ({ Command, config }) {
-  if (process.argv.includes('--json')) return;
+const hook: Hook.Prerun = async function ({ Command, config, argv }) {
+  if (argv.includes('--json') || process.argv.includes('--json')) return;
   const { plugin } = Command;
   if (!plugin) return;
   if (plugin.type === 'link') return;
@@ -20,10 +19,31 @@ const hook: Hook.Prerun = async function ({ Command, config }) {
   const specifiedVersion = jitPlugins[plugin.name] ?? deps[plugin.name];
   if (!specifiedVersion) return;
 
-  if (plugin.version !== specifiedVersion) {
+  // Simple semver comparison without external library
+  const parseVersion = (version: string): number[] =>
+    version
+      .replace(/^[^\d]*/, '')
+      .split('.')
+      .map((n) => parseInt(n, 10) || 0);
+
+  const isLessThan = (version1: string, version2: string): boolean => {
+    const v1 = parseVersion(version1);
+    const v2 = parseVersion(version2);
+
+    for (let i = 0; i < Math.max(v1.length, v2.length); i++) {
+      const num1 = v1[i] || 0;
+      const num2 = v2[i] || 0;
+
+      if (num1 < num2) return true;
+      if (num1 > num2) return false;
+    }
+    return false;
+  };
+
+  if (isLessThan(plugin.version, specifiedVersion)) {
     const { ux } = await import('@oclif/core/ux');
     ux.warn(
-      `Plugin ${plugin.name} (${plugin.version}) differs from the version specified by ${config.bin} (${specifiedVersion})`
+      `Plugin ${plugin.name} (${plugin.version}) is older than the version specified by ${config.bin} (${specifiedVersion})`
     );
   }
 };

src/hooks/prerun.ts

@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2025, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { expect } from 'chai';
+import { runHook } from '@oclif/test';
+import { Config } from '@oclif/core/config';
+
+function sanitize(stderr: string): string {
+  return stderr
+    .replaceAll('›   ', ' ')
+    .replaceAll('»   ', ' ')
+    .split('\n')
+    .map((s) => s.trim())
+    .join(' ');
+}
+
+describe('Prerun Hook', () => {
+  const WARNING_REGEX =
+    /Warning: Plugin ([^ ]+) \((\d+\.\d+\.\d+(?:-[^)]*)?)\) is older than the version specified by ([^ ]+) \((\d+\.\d+\.\d+(?:-[^)]*)?)\)/;
+  let config: Config;
+
+  before(async () => {
+    config = await Config.load({ root: dirname(fileURLToPath(import.meta.url)) });
+  });
+
+  it('should do nothing when --json is present', async () => {
+    const { stderr } = await runHook('prerun', { argv: ['--json'] });
+    expect(sanitize(stderr)).to.not.match(WARNING_REGEX);
+  });
+
+  it('should do nothing if plugin type is "link"', async () => {
+    const command = {
+      type: 'link',
+    };
+    const { stderr } = await runHook('prerun', { Command: command, argv: [] });
+    expect(sanitize(stderr)).to.not.match(WARNING_REGEX);
+  });
+
+  it('should do nothing if plugin is not JIT or core', async () => {
+    const command = {
+      plugin: {
+        type: 'core',
+        name: '@salesforce/plugin-foo',
+        version: '1.0.0',
+      },
+    };
+    const { stderr } = await runHook('prerun', { Command: command, argv: [] });
+    expect(sanitize(stderr)).to.not.match(WARNING_REGEX);
+  });
+
+  it('should warn if plugin version is less than specified version', async () => {
+    const command = {
+      plugin: {
+        type: 'core',
+        name: '@salesforce/plugin-packaging',
+        version: '0.0.1',
+      },
+    };
+    const { stderr } = await runHook('prerun', { Command: command, argv: [] });
+    expect(sanitize(stderr)).to.match(WARNING_REGEX);
+  });
+
+  it('should not warn if plugin version is greater than specified version', async () => {
+    const command = {
+      plugin: {
+        type: 'core',
+        name: '@salesforce/plugin-packaging',
+        version: '10000.0.0',
+      },
+    };
+    const { stderr } = await runHook('prerun', { Command: command, argv: [] });
+    expect(sanitize(stderr)).to.not.match(WARNING_REGEX);
+  });
+
+  it('should not warn if plugin version is equal to specified version', async () => {
+    const command = {
+      plugin: {
+        type: 'core',
+        name: '@salesforce/plugin-packaging',
+        version: '1.0.0',
+      },
+    };
+
+    config.pjson.dependencies = {
+      ...config.pjson.dependencies,
+      '@salesforce/plugin-packaging': '1.0.0',
+    };
+    const { stderr } = await runHook('prerun', { Command: command, argv: [] }, config);
+    expect(sanitize(stderr)).to.not.match(WARNING_REGEX);
+  });
+
+  it('should warn if plugin version is an older prerelease', async () => {
+    const command = {
+      plugin: {
+        type: 'core',
+        name: '@salesforce/plugin-packaging',
+        version: '1.0.0-beta.1',
+      },
+    };
+
+    config.pjson.dependencies = {
+      ...config.pjson.dependencies,
+      '@salesforce/plugin-packaging': '1.0.0-beta.2',
+    };
+    const { stderr } = await runHook('prerun', { Command: command, argv: [] }, config);
+    expect(sanitize(stderr)).to.match(WARNING_REGEX);
+  });
+
+  it('should not warn if plugin version is a newer prerelease', async () => {
+    const command = {
+      plugin: {
+        type: 'core',
+        name: '@salesforce/plugin-packaging',
+        version: '1.0.0-beta.2',
+      },
+    };
+
+    config.pjson.dependencies = {
+      ...config.pjson.dependencies,
+      '@salesforce/plugin-packaging': '1.0.0-beta.1',
+    };
+    const { stderr } = await runHook('prerun', { Command: command, argv: [] }, config);
+    expect(sanitize(stderr)).to.not.match(WARNING_REGEX);
+  });
+
+  it('should not warn if plugin version is a newer prerelease and specified version is an older stable release', async () => {
+    const command = {
+      plugin: {
+        type: 'core',
+        name: '@salesforce/plugin-packaging',
+        version: '1.0.0-beta.1',
+      },
+    };
+
+    config.pjson.dependencies = {
+      ...config.pjson.dependencies,
+      '@salesforce/plugin-packaging': '1.0.0',
+    };
+    const { stderr } = await runHook('prerun', { Command: command, argv: [] }, config);
+    expect(sanitize(stderr)).to.not.match(WARNING_REGEX);
+  });
+
+  it('should warn if plugin version is an older prerelease and specified version is a newer stable release', async () => {
+    const command = {
+      plugin: {
+        type: 'core',
+        name: '@salesforce/plugin-packaging',
+        version: '1.0.0-beta.1',
+      },
+    };
+    config.pjson.dependencies = {
+      ...config.pjson.dependencies,
+      '@salesforce/plugin-packaging': '1.0.1',
+    };
+    const { stderr } = await runHook('prerun', { Command: command, argv: [] }, config);
+    expect(sanitize(stderr)).to.match(WARNING_REGEX);
+  });
+});