@salesforce/plugin-data 3.13.4 → 3.13.6

package/oclif.manifest.json

@@ -775,14 +775,13 @@
         "record:create:data"
       ]
     },
-    "data:export:bulk": {
+    "data:delete:bulk": {
       "aliases": [],
       "args": {},
-      "description": "You can use this command to export millions of records from an org, either to migrate data or to back it up.\n\nUse a SOQL query to specify the fields of a standard or custom object that you want to export. Specify the SOQL query either at the command line with the --query flag or read it from a file with the --query-file flag; you can't specify both flags. The --output-file flag is required, which means you can only write the records to a file, in either CSV or JSON format. \n\nBulk exports can take a while, depending on how many records are returned by the SOQL query. If the command times out, or you specified the --async flag, the command displays the job ID. To see the status and get the results of the job, run \"sf data export resume\" and pass the job ID to the --job-id flag.\n\nIMPORTANT: This command uses Bulk API 2.0, which limits the type of SOQL queries you can run. For example, you can't use aggregate functions such as count(). For the complete list of limitations, see the \"SOQL Considerations\" section in the \"Bulk API 2.0 and Bulk API Developer Guide\" (https://developer.salesforce.com/docs/atlas.en-us.api_asynch.meta/api_asynch/queries.htm).",
+      "description": "The CSV file must have only one column (\"Id\") and then the list of record IDs you want to delete, one ID per line.\n\nWhen you execute this command, it starts a job, displays the ID, and then immediately returns control of the terminal to you by default. If you prefer to wait, set the --wait flag to the number of minutes; if it times out, the command outputs the IDs. Use the job ID to check the status of the job with the \"<%= config.bin %> data delete resume\" command.",
       "examples": [
-        "Export the Id, Name, and Account.Name fields of the Contact object into a CSV-formatted file; if the export doesn't complete in 10 minutes, the command ends and displays a job ID. Use the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --query \"SELECT Id, Name, Account.Name FROM Contact\" --output-file export-accounts.csv --wait 10 --target-org my-scratch",
-        "Similar to previous example, but use the default org, export the records into a JSON-formatted file, and include records that have been soft deleted:\n<%= config.bin %> <%= command.id %> --query \"SELECT Id, Name, Account.Name FROM Contact\" --output-file export-accounts.json --result-format json --wait 10 --all-rows",
-        "Export asynchronously; the command immediately returns a job ID that you then pass to the \"sf data export resume\" command:\n<%= config.bin %> <%= command.id %> --query \"SELECT Id, Name, Account.Name FROM Contact\" --output-file export-accounts.json --result-format json --async"
+        "Bulk delete Account records from your default org using the list of IDs in the \"files/delete.csv\" file:\n<%= config.bin %> <%= command.id %> --sobject Account --file files/delete.csv",
+        "Bulk delete records from a custom object in an org with alias my-scratch and wait 5 minutes for the command to complete:\n<%= config.bin %> <%= command.id %> --sobject MyObject__c --file files/delete.csv --wait 5 --target-org my-scratch"
       ],
       "flags": {
         "json": {
@@ -801,7 +800,12 @@
           "type": "option"
         },
         "target-org": {
+          "aliases": [
+            "targetusername",
+            "u"
+          ],
           "char": "o",
+          "deprecateAliases": true,
           "name": "target-org",
           "noCacheDefault": true,
           "required": true,
@@ -811,163 +815,144 @@
           "type": "option"
         },
         "api-version": {
+          "aliases": [
+            "apiversion"
+          ],
+          "deprecateAliases": true,
           "description": "Override the api version used for api requests made by this command",
           "name": "api-version",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
+        "loglevel": {
+          "deprecated": {
+            "message": "The loglevel flag is no longer in use on this command. You may use it without error, but it will be ignored.\nSet the log level using the `SFDX_LOG_LEVEL` environment variable."
+          },
+          "hidden": true,
+          "name": "loglevel",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "file": {
+          "aliases": [
+            "csvfile"
+          ],
+          "char": "f",
+          "deprecateAliases": true,
+          "name": "file",
+          "required": true,
+          "summary": "CSV file that contains the IDs of the records to update or delete.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "sobject": {
+          "aliases": [
+            "sobjecttype"
+          ],
+          "char": "s",
+          "deprecateAliases": true,
+          "name": "sobject",
+          "required": true,
+          "summary": "API name of the Salesforce object, either standard or custom, that you want to update or delete records from.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "wait": {
           "char": "w",
           "exclusive": [
             "async"
           ],
           "name": "wait",
-          "summary": "Time to wait for the command to finish, in minutes.",
+          "summary": "Number of minutes to wait for the command to complete before displaying the results.",
+          "default": "0 minutes",
           "hasDynamicHelp": true,
-          "helpValue": "<minutes>",
           "multiple": false,
           "type": "option"
         },
         "async": {
+          "char": "a",
           "exclusive": [
             "wait"
           ],
           "name": "async",
-          "summary": "Don't wait for the job to complete.",
+          "summary": "Run the command asynchronously.",
           "allowNo": false,
           "type": "boolean"
         },
-        "query": {
-          "char": "q",
-          "exclusive": [
-            "query-file"
-          ],
-          "name": "query",
-          "summary": "SOQL query to execute.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "query-file": {
-          "exclusive": [
-            "query"
-          ],
-          "name": "query-file",
-          "summary": "File that contains the SOQL query.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "all-rows": {
-          "name": "all-rows",
-          "summary": "Include records that have been soft-deleted due to a merge or delete. By default, deleted records are not returned.",
+        "verbose": {
+          "deprecated": {
+            "message": "The --verbose flag is deprecated and will be removed after March 2025, use \"sf data bulk results\" to get job results instead."
+          },
+          "name": "verbose",
+          "summary": "Print verbose output of failed records if result is available.",
           "allowNo": false,
           "type": "boolean"
         },
-        "output-file": {
-          "name": "output-file",
-          "required": true,
-          "summary": "File where records are written.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "result-format": {
-          "char": "r",
-          "name": "result-format",
-          "required": true,
-          "summary": "Format to write the results.",
-          "default": "csv",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "csv",
-            "json"
-          ],
-          "type": "option"
-        },
-        "column-delimiter": {
-          "name": "column-delimiter",
-          "relationships": [
-            {
-              "type": "some",
-              "flags": [
-                {
-                  "name": "result-format"
-                }
-              ]
-            }
-          ],
-          "summary": "Column delimiter to be used when writing CSV output. Default is COMMA.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "BACKQUOTE",
-            "CARET",
-            "COMMA",
-            "PIPE",
-            "SEMICOLON",
-            "TAB"
-          ],
-          "type": "option"
-        },
         "line-ending": {
-          "name": "line-ending",
-          "relationships": [
-            {
-              "type": "some",
-              "flags": [
-                {
-                  "name": "result-format"
-                }
-              ]
-            }
+          "dependsOn": [
+            "file"
           ],
-          "summary": "Line ending to be used when writing CSV output. Default value on Windows is is `CRLF`; on macOS and Linux it's `LR`.",
+          "name": "line-ending",
+          "summary": "Line ending used in the CSV file. Default value on Windows is `CRLF`; on macOS and Linux it's `LF`.",
           "hasDynamicHelp": false,
           "multiple": false,
           "options": [
-            "LF",
-            "CRLF"
+            "CRLF",
+            "LF"
           ],
           "type": "option"
+        },
+        "hard-delete": {
+          "description": "You must have the \"Bulk API Hard Delete\" system permission to use this flag. The permission is disabled by default and can be enabled only by a system administrator.",
+          "name": "hard-delete",
+          "summary": "Mark the records as immediately eligible for deletion by your org. If you don't specify this flag, the deleted records go into the Recycle Bin.",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "data:export:bulk",
+      "id": "data:delete:bulk",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
       "strict": true,
-      "summary": "Bulk export records from an org into a file using a SOQL query. Uses Bulk API 2.0.",
+      "summary": "Bulk delete records from an org using a CSV file. Uses Bulk API 2.0.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "data",
-        "export",
+        "delete",
         "bulk.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "data:export:bulk",
-        "export:data:bulk",
-        "export:bulk:data",
-        "data:bulk:export",
-        "bulk:data:export",
-        "bulk:export:data"
+        "data:delete:bulk",
+        "delete:data:bulk",
+        "delete:bulk:data",
+        "data:bulk:delete",
+        "bulk:data:delete",
+        "bulk:delete:data"
       ]
     },
-    "data:export:resume": {
-      "aliases": [],
+    "data:delete:record": {
+      "aliases": [
+        "force:data:record:delete"
+      ],
       "args": {},
-      "description": "When the original \"data export bulk\" command either times out or is run with the --async flag, it displays a job ID. To see the status and get the results of the bulk export, run this command by either passing it the job ID or using the --use-most-recent flag to specify the most recent bulk export job.",
+      "deprecateAliases": true,
+      "description": "Specify the record you want to delete with either its ID or with a list of field-value pairs that identify the record. If your list of fields identifies more than one record, the delete fails; the error displays how many records were found.\n\nWhen specifying field-value pairs, use the format <fieldName>=<value>. Enclose all field-value pairs in one set of double quotation marks, delimited by spaces. Enclose values that contain spaces in single quotes.\n\nThis command deletes a record from Salesforce objects by default. Use the --use-tooling-api flag to delete from a Tooling API object.",
       "examples": [
-        "Resume a bulk export job run on your default org by specifying a job ID:\nsf <%= command.id %> --job-id 750xx000000005sAAA",
-        "Resume the most recently-run bulk export job for an org with alias my-scratch:\nsf data export resume --use-most-recent --target-org my-scratch"
+        "Delete a record from Account with the specified (truncated) ID:\n<%= config.bin %> <%= command.id %> --sobject Account --record-id 00180XX",
+        "Delete a record from Account whose name equals \"Acme\":\n<%= config.bin %> <%= command.id %> --sobject Account --where \"Name=Acme\"",
+        "Delete a record from Account identified with two field values, one that contains a space; the command uses the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --sobject Account --where \"Name='Universal Containers' Phone='(123) 456-7890'\" --target-org myscratch",
+        "Delete a record from the Tooling API object TraceFlag with the specified (truncated) ID:\n<%= config.bin %> <%= command.id %> --use-tooling-api --sobject TraceFlag --record-id 7tf8c"
       ],
       "flags": {
         "json": {
@@ -985,240 +970,158 @@
           "multiple": false,
           "type": "option"
         },
-        "job-id": {
-          "char": "i",
-          "name": "job-id",
-          "summary": "Job ID of the bulk export.",
-          "hasDynamicHelp": false,
+        "target-org": {
+          "aliases": [
+            "targetusername",
+            "u"
+          ],
+          "char": "o",
+          "deprecateAliases": true,
+          "name": "target-org",
+          "noCacheDefault": true,
+          "required": true,
+          "summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
+          "hasDynamicHelp": true,
           "multiple": false,
           "type": "option"
         },
-        "use-most-recent": {
-          "name": "use-most-recent",
-          "summary": "Use the job ID of the bulk export job that was most recently run.",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "api-version": {
+          "aliases": [
+            "apiversion"
+          ],
+          "deprecateAliases": true,
           "description": "Override the api version used for api requests made by this command",
           "name": "api-version",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "data:export:resume",
-      "pluginAlias": "@salesforce/plugin-data",
-      "pluginName": "@salesforce/plugin-data",
-      "pluginType": "core",
-      "strict": true,
-      "summary": "Resume a bulk export job that you previously started. Uses Bulk API 2.0.",
-      "enableJsonFlag": true,
-      "isESM": true,
-      "relativePath": [
-        "lib",
-        "commands",
-        "data",
-        "export",
-        "resume.js"
-      ],
-      "aliasPermutations": [],
-      "permutations": [
-        "data:export:resume",
-        "export:data:resume",
-        "export:resume:data",
-        "data:resume:export",
-        "resume:data:export",
-        "resume:export:data"
-      ]
-    },
-    "data:export:tree": {
-      "aliases": [
-        "force:data:tree:export",
-        "data:export:beta:tree"
-      ],
-      "args": {},
-      "deprecateAliases": true,
-      "description": "Specify a SOQL query, either directly at the command line or read from a file, to retrieve the data you want to export. The exported data is written to JSON files in sObject tree format, which is a collection of nested, parent-child records with a single root record. Use these JSON files to import data into an org with the \"<%= config.bin %> data import tree\" command.\n\nIf your SOQL query references multiple objects, the command generates a single JSON file by default. You can specify the --plan flag to generate separate JSON files for each object and a plan definition file that aggregates them. You then specify just this plan definition file when you import the data into an org.\n\nThe SOQL query can return a maximum of 2,000 records. For more information, see the REST API Developer Guide. (https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_composite_sobject_tree.htm).",
-      "examples": [
-        "Export records retrieved with the specified SOQL query into a single JSON file in the current directory; the command uses your default org:\n<%= config.bin %> <%= command.id %> --query \"SELECT Id, Name, (SELECT Name, Address__c FROM Properties__r) FROM Broker__c\"",
-        "Export data using a SOQL query in the \"query.txt\" file and generate JSON files for each object and a plan that aggregates them:\n<%= config.bin %> <%= command.id %> --query query.txt --plan",
-        "Prepend \"export-demo\" before each generated file and generate the files in the \"export-out\" directory; run the command on the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --query query.txt --plan --prefix export-demo --output-dir export-out --target-org my-scratch"
-      ],
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
         },
-        "flags-dir": {
-          "helpGroup": "GLOBAL",
-          "name": "flags-dir",
-          "summary": "Import flag values from a directory.",
+        "loglevel": {
+          "deprecated": {
+            "message": "The loglevel flag is no longer in use on this command. You may use it without error, but it will be ignored.\nSet the log level using the `SFDX_LOG_LEVEL` environment variable."
+          },
+          "hidden": true,
+          "name": "loglevel",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "target-org": {
+        "sobject": {
           "aliases": [
-            "targetusername",
-            "u"
+            "sobjecttype"
           ],
-          "char": "o",
+          "char": "s",
           "deprecateAliases": true,
-          "name": "target-org",
-          "noCacheDefault": true,
+          "name": "sobject",
           "required": true,
-          "summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
-          "hasDynamicHelp": true,
+          "summary": "API name of the Salesforce or Tooling API object that you're deleting a record from.",
+          "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "api-version": {
+        "record-id": {
           "aliases": [
-            "apiversion"
+            "sobjectid"
           ],
+          "char": "i",
           "deprecateAliases": true,
-          "description": "Override the api version used for api requests made by this command",
-          "name": "api-version",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "loglevel": {
-          "deprecated": {
-            "message": "The loglevel flag is no longer in use on this command. You may use it without error, but it will be ignored.\nSet the log level using the `SFDX_LOG_LEVEL` environment variable."
-          },
-          "hidden": true,
-          "name": "loglevel",
+          "name": "record-id",
+          "summary": "ID of the record you’re deleting.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "query": {
-          "char": "q",
-          "name": "query",
-          "required": true,
-          "summary": "SOQL query, or filepath of a file that contains the query, to retrieve records.",
-          "hasDynamicHelp": false,
-          "multiple": true,
-          "type": "option"
-        },
-        "plan": {
-          "char": "p",
-          "name": "plan",
-          "summary": "Generate multiple sObject tree files and a plan definition file for aggregated import.",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "prefix": {
-          "char": "x",
-          "name": "prefix",
-          "summary": "Prefix of generated files.",
+        "where": {
+          "char": "w",
+          "name": "where",
+          "summary": "List of <fieldName>=<value> pairs that identify the record you want to delete.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "output-dir": {
+        "use-tooling-api": {
           "aliases": [
-            "outputdir"
+            "usetoolingapi"
           ],
-          "char": "d",
+          "char": "t",
           "deprecateAliases": true,
-          "name": "output-dir",
-          "summary": "Directory in which to generate the JSON files; default is current directory.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+          "name": "use-tooling-api",
+          "summary": "Use Tooling API so you can delete a record from a Tooling API object.",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "perflog": {
+          "deprecated": {
+            "version": "57"
+          },
+          "description": "Gets data on API performance metrics from the server. The data is stored in $HOME/.sfdx/apiPerformanceLog.json.",
+          "hidden": true,
+          "name": "perflog",
+          "summary": "Get API performance data.",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "data:export:tree",
+      "id": "data:delete:record",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
       "strict": true,
-      "summary": "Export data from an org into one or more JSON files.",
+      "summary": "Deletes a single record from a Salesforce or Tooling API object.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "data",
-        "export",
-        "tree.js"
+        "delete",
+        "record.js"
       ],
       "aliasPermutations": [
-        "force:data:tree:export",
-        "data:force:tree:export",
-        "data:tree:force:export",
-        "data:tree:export:force",
-        "force:tree:data:export",
-        "tree:force:data:export",
-        "tree:data:force:export",
-        "tree:data:export:force",
-        "force:tree:export:data",
-        "tree:force:export:data",
-        "tree:export:force:data",
-        "tree:export:data:force",
-        "force:data:export:tree",
-        "data:force:export:tree",
-        "data:export:force:tree",
-        "data:export:tree:force",
-        "force:export:data:tree",
-        "export:force:data:tree",
-        "export:data:force:tree",
-        "export:data:tree:force",
-        "force:export:tree:data",
-        "export:force:tree:data",
-        "export:tree:force:data",
-        "export:tree:data:force",
-        "data:export:beta:tree",
-        "export:data:beta:tree",
-        "export:beta:data:tree",
-        "export:beta:tree:data",
-        "data:beta:export:tree",
-        "beta:data:export:tree",
-        "beta:export:data:tree",
-        "beta:export:tree:data",
-        "data:beta:tree:export",
-        "beta:data:tree:export",
-        "beta:tree:data:export",
-        "beta:tree:export:data",
-        "data:export:tree:beta",
-        "export:data:tree:beta",
-        "export:tree:data:beta",
-        "export:tree:beta:data",
-        "data:tree:export:beta",
-        "tree:data:export:beta",
-        "tree:export:data:beta",
-        "tree:export:beta:data",
-        "data:tree:beta:export",
-        "tree:data:beta:export",
-        "tree:beta:data:export",
-        "tree:beta:export:data"
+        "force:data:record:delete",
+        "data:force:record:delete",
+        "data:record:force:delete",
+        "data:record:delete:force",
+        "force:record:data:delete",
+        "record:force:data:delete",
+        "record:data:force:delete",
+        "record:data:delete:force",
+        "force:record:delete:data",
+        "record:force:delete:data",
+        "record:delete:force:data",
+        "record:delete:data:force",
+        "force:data:delete:record",
+        "data:force:delete:record",
+        "data:delete:force:record",
+        "data:delete:record:force",
+        "force:delete:data:record",
+        "delete:force:data:record",
+        "delete:data:force:record",
+        "delete:data:record:force",
+        "force:delete:record:data",
+        "delete:force:record:data",
+        "delete:record:force:data",
+        "delete:record:data:force"
       ],
       "permutations": [
-        "data:export:tree",
-        "export:data:tree",
-        "export:tree:data",
-        "data:tree:export",
-        "tree:data:export",
-        "tree:export:data"
+        "data:delete:record",
+        "delete:data:record",
+        "delete:record:data",
+        "data:record:delete",
+        "record:data:delete",
+        "record:delete:data"
       ]
     },
-    "data:delete:bulk": {
+    "data:delete:resume": {
       "aliases": [],
       "args": {},
-      "description": "The CSV file must have only one column (\"Id\") and then the list of record IDs you want to delete, one ID per line.\n\nWhen you execute this command, it starts a job, displays the ID, and then immediately returns control of the terminal to you by default. If you prefer to wait, set the --wait flag to the number of minutes; if it times out, the command outputs the IDs. Use the job ID to check the status of the job with the \"<%= config.bin %> data delete resume\" command.",
+      "deprecateAliases": true,
+      "description": "The command uses the job ID returned by the \"<%= config.bin %> data delete bulk\" command or the most recently-run bulk delete job.",
       "examples": [
-        "Bulk delete Account records from your default org using the list of IDs in the \"files/delete.csv\" file:\n<%= config.bin %> <%= command.id %> --sobject Account --file files/delete.csv",
-        "Bulk delete records from a custom object in an org with alias my-scratch and wait 5 minutes for the command to complete:\n<%= config.bin %> <%= command.id %> --sobject MyObject__c --file files/delete.csv --wait 5 --target-org my-scratch"
+        "Resume a bulk delete job from your default org using an ID:\n<%= config.bin %> <%= command.id %> --job-id 750xx000000005sAAA",
+        "Resume the most recently run bulk delete job for an org with alias my-scratch:\n<%= config.bin %> <%= command.id %> --use-most-recent --target-org my-scratch"
       ],
       "flags": {
         "json": {
@@ -1245,17 +1148,41 @@
           "deprecateAliases": true,
           "name": "target-org",
           "noCacheDefault": true,
-          "required": true,
-          "summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
+          "summary": "Username or alias of the target org. Not required if the \"target-org\" configuration variable is already set.",
           "hasDynamicHelp": true,
           "multiple": false,
           "type": "option"
         },
-        "api-version": {
+        "job-id": {
           "aliases": [
-            "apiversion"
+            "jobid"
           ],
+          "char": "i",
           "deprecateAliases": true,
+          "name": "job-id",
+          "summary": "ID of the job you want to resume.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "use-most-recent": {
+          "exclusive": [
+            "job-id"
+          ],
+          "name": "use-most-recent",
+          "summary": "Use the ID of the most recently-run bulk job.",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "wait": {
+          "name": "wait",
+          "summary": "Number of minutes to wait for the command to complete before displaying the results.",
+          "default": "5 minutes",
+          "hasDynamicHelp": true,
+          "multiple": false,
+          "type": "option"
+        },
+        "api-version": {
           "description": "Override the api version used for api requests made by this command",
           "name": "api-version",
           "hasDynamicHelp": false,
@@ -1271,94 +1198,16 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
-        },
-        "file": {
-          "aliases": [
-            "csvfile"
-          ],
-          "char": "f",
-          "deprecateAliases": true,
-          "name": "file",
-          "required": true,
-          "summary": "CSV file that contains the IDs of the records to update or delete.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "sobject": {
-          "aliases": [
-            "sobjecttype"
-          ],
-          "char": "s",
-          "deprecateAliases": true,
-          "name": "sobject",
-          "required": true,
-          "summary": "API name of the Salesforce object, either standard or custom, that you want to update or delete records from.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "wait": {
-          "char": "w",
-          "exclusive": [
-            "async"
-          ],
-          "name": "wait",
-          "summary": "Number of minutes to wait for the command to complete before displaying the results.",
-          "default": "0 minutes",
-          "hasDynamicHelp": true,
-          "multiple": false,
-          "type": "option"
-        },
-        "async": {
-          "char": "a",
-          "exclusive": [
-            "wait"
-          ],
-          "name": "async",
-          "summary": "Run the command asynchronously.",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "verbose": {
-          "deprecated": {
-            "message": "The --verbose flag is deprecated and will be removed after March 2025, use \"sf data bulk results\" to get job results instead."
-          },
-          "name": "verbose",
-          "summary": "Print verbose output of failed records if result is available.",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "line-ending": {
-          "dependsOn": [
-            "file"
-          ],
-          "name": "line-ending",
-          "summary": "Line ending used in the CSV file. Default value on Windows is `CRLF`; on macOS and Linux it's `LF`.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "CRLF",
-            "LF"
-          ],
-          "type": "option"
-        },
-        "hard-delete": {
-          "description": "You must have the \"Bulk API Hard Delete\" system permission to use this flag. The permission is disabled by default and can be enabled only by a system administrator.",
-          "name": "hard-delete",
-          "summary": "Mark the records as immediately eligible for deletion by your org. If you don't specify this flag, the deleted records go into the Recycle Bin.",
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "data:delete:bulk",
+      "id": "data:delete:resume",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
       "strict": true,
-      "summary": "Bulk delete records from an org using a CSV file. Uses Bulk API 2.0.",
+      "summary": "Resume a bulk delete job that you previously started. Uses Bulk API 2.0.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -1366,30 +1215,26 @@
         "commands",
         "data",
         "delete",
-        "bulk.js"
+        "resume.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "data:delete:bulk",
-        "delete:data:bulk",
-        "delete:bulk:data",
-        "data:bulk:delete",
-        "bulk:data:delete",
-        "bulk:delete:data"
+        "data:delete:resume",
+        "delete:data:resume",
+        "delete:resume:data",
+        "data:resume:delete",
+        "resume:data:delete",
+        "resume:delete:data"
       ]
     },
-    "data:delete:record": {
-      "aliases": [
-        "force:data:record:delete"
-      ],
+    "data:export:bulk": {
+      "aliases": [],
       "args": {},
-      "deprecateAliases": true,
-      "description": "Specify the record you want to delete with either its ID or with a list of field-value pairs that identify the record. If your list of fields identifies more than one record, the delete fails; the error displays how many records were found.\n\nWhen specifying field-value pairs, use the format <fieldName>=<value>. Enclose all field-value pairs in one set of double quotation marks, delimited by spaces. Enclose values that contain spaces in single quotes.\n\nThis command deletes a record from Salesforce objects by default. Use the --use-tooling-api flag to delete from a Tooling API object.",
+      "description": "You can use this command to export millions of records from an org, either to migrate data or to back it up.\n\nUse a SOQL query to specify the fields of a standard or custom object that you want to export. Specify the SOQL query either at the command line with the --query flag or read it from a file with the --query-file flag; you can't specify both flags. The --output-file flag is required, which means you can only write the records to a file, in either CSV or JSON format. \n\nBulk exports can take a while, depending on how many records are returned by the SOQL query. If the command times out, or you specified the --async flag, the command displays the job ID. To see the status and get the results of the job, run \"sf data export resume\" and pass the job ID to the --job-id flag.\n\nIMPORTANT: This command uses Bulk API 2.0, which limits the type of SOQL queries you can run. For example, you can't use aggregate functions such as count(). For the complete list of limitations, see the \"SOQL Considerations\" section in the \"Bulk API 2.0 and Bulk API Developer Guide\" (https://developer.salesforce.com/docs/atlas.en-us.api_asynch.meta/api_asynch/queries.htm).",
       "examples": [
-        "Delete a record from Account with the specified (truncated) ID:\n<%= config.bin %> <%= command.id %> --sobject Account --record-id 00180XX",
-        "Delete a record from Account whose name equals \"Acme\":\n<%= config.bin %> <%= command.id %> --sobject Account --where \"Name=Acme\"",
-        "Delete a record from Account identified with two field values, one that contains a space; the command uses the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --sobject Account --where \"Name='Universal Containers' Phone='(123) 456-7890'\" --target-org myscratch",
-        "Delete a record from the Tooling API object TraceFlag with the specified (truncated) ID:\n<%= config.bin %> <%= command.id %> --use-tooling-api --sobject TraceFlag --record-id 7tf8c"
+        "Export the Id, Name, and Account.Name fields of the Contact object into a CSV-formatted file; if the export doesn't complete in 10 minutes, the command ends and displays a job ID. Use the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --query \"SELECT Id, Name, Account.Name FROM Contact\" --output-file export-accounts.csv --wait 10 --target-org my-scratch",
+        "Similar to previous example, but use the default org, export the records into a JSON-formatted file, and include records that have been soft deleted:\n<%= config.bin %> <%= command.id %> --query \"SELECT Id, Name, Account.Name FROM Contact\" --output-file export-accounts.json --result-format json --wait 10 --all-rows",
+        "Export asynchronously; the command immediately returns a job ID that you then pass to the \"sf data export resume\" command:\n<%= config.bin %> <%= command.id %> --query \"SELECT Id, Name, Account.Name FROM Contact\" --output-file export-accounts.json --result-format json --async"
       ],
       "flags": {
         "json": {
@@ -1408,12 +1253,7 @@
           "type": "option"
         },
         "target-org": {
-          "aliases": [
-            "targetusername",
-            "u"
-          ],
           "char": "o",
-          "deprecateAliases": true,
           "name": "target-org",
           "noCacheDefault": true,
           "required": true,
@@ -1423,142 +1263,241 @@
           "type": "option"
         },
         "api-version": {
-          "aliases": [
-            "apiversion"
-          ],
-          "deprecateAliases": true,
           "description": "Override the api version used for api requests made by this command",
           "name": "api-version",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "loglevel": {
-          "deprecated": {
-            "message": "The loglevel flag is no longer in use on this command. You may use it without error, but it will be ignored.\nSet the log level using the `SFDX_LOG_LEVEL` environment variable."
-          },
-          "hidden": true,
-          "name": "loglevel",
-          "hasDynamicHelp": false,
+        "wait": {
+          "char": "w",
+          "exclusive": [
+            "async"
+          ],
+          "name": "wait",
+          "summary": "Time to wait for the command to finish, in minutes.",
+          "hasDynamicHelp": true,
+          "helpValue": "<minutes>",
           "multiple": false,
           "type": "option"
         },
-        "sobject": {
-          "aliases": [
-            "sobjecttype"
+        "async": {
+          "exclusive": [
+            "wait"
           ],
-          "char": "s",
-          "deprecateAliases": true,
-          "name": "sobject",
-          "required": true,
-          "summary": "API name of the Salesforce or Tooling API object that you're deleting a record from.",
+          "name": "async",
+          "summary": "Don't wait for the job to complete.",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "query": {
+          "char": "q",
+          "exclusive": [
+            "query-file"
+          ],
+          "name": "query",
+          "summary": "SOQL query to execute.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "record-id": {
-          "aliases": [
-            "sobjectid"
+        "query-file": {
+          "exclusive": [
+            "query"
           ],
-          "char": "i",
-          "deprecateAliases": true,
-          "name": "record-id",
-          "summary": "ID of the record you’re deleting.",
+          "name": "query-file",
+          "summary": "File that contains the SOQL query.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "where": {
-          "char": "w",
-          "name": "where",
-          "summary": "List of <fieldName>=<value> pairs that identify the record you want to delete.",
+        "all-rows": {
+          "name": "all-rows",
+          "summary": "Include records that have been soft-deleted due to a merge or delete. By default, deleted records are not returned.",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "output-file": {
+          "name": "output-file",
+          "required": true,
+          "summary": "File where records are written.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "use-tooling-api": {
-          "aliases": [
-            "usetoolingapi"
+        "result-format": {
+          "char": "r",
+          "name": "result-format",
+          "required": true,
+          "summary": "Format to write the results.",
+          "default": "csv",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "csv",
+            "json"
           ],
-          "char": "t",
-          "deprecateAliases": true,
-          "name": "use-tooling-api",
-          "summary": "Use Tooling API so you can delete a record from a Tooling API object.",
-          "allowNo": false,
-          "type": "boolean"
+          "type": "option"
         },
-        "perflog": {
-          "deprecated": {
-            "version": "57"
-          },
-          "description": "Gets data on API performance metrics from the server. The data is stored in $HOME/.sfdx/apiPerformanceLog.json.",
-          "hidden": true,
-          "name": "perflog",
-          "summary": "Get API performance data.",
-          "allowNo": false,
-          "type": "boolean"
+        "column-delimiter": {
+          "name": "column-delimiter",
+          "relationships": [
+            {
+              "type": "some",
+              "flags": [
+                {
+                  "name": "result-format"
+                }
+              ]
+            }
+          ],
+          "summary": "Column delimiter to be used when writing CSV output. Default is COMMA.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "BACKQUOTE",
+            "CARET",
+            "COMMA",
+            "PIPE",
+            "SEMICOLON",
+            "TAB"
+          ],
+          "type": "option"
+        },
+        "line-ending": {
+          "name": "line-ending",
+          "relationships": [
+            {
+              "type": "some",
+              "flags": [
+                {
+                  "name": "result-format"
+                }
+              ]
+            }
+          ],
+          "summary": "Line ending to be used when writing CSV output. Default value on Windows is is `CRLF`; on macOS and Linux it's `LR`.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "LF",
+            "CRLF"
+          ],
+          "type": "option"
         }
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "data:delete:record",
+      "id": "data:export:bulk",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
       "strict": true,
-      "summary": "Deletes a single record from a Salesforce or Tooling API object.",
+      "summary": "Bulk export records from an org into a file using a SOQL query. Uses Bulk API 2.0.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "data",
-        "delete",
-        "record.js"
+        "export",
+        "bulk.js"
       ],
-      "aliasPermutations": [
-        "force:data:record:delete",
-        "data:force:record:delete",
-        "data:record:force:delete",
-        "data:record:delete:force",
-        "force:record:data:delete",
-        "record:force:data:delete",
-        "record:data:force:delete",
-        "record:data:delete:force",
-        "force:record:delete:data",
-        "record:force:delete:data",
-        "record:delete:force:data",
-        "record:delete:data:force",
-        "force:data:delete:record",
-        "data:force:delete:record",
-        "data:delete:force:record",
-        "data:delete:record:force",
-        "force:delete:data:record",
-        "delete:force:data:record",
-        "delete:data:force:record",
-        "delete:data:record:force",
-        "force:delete:record:data",
-        "delete:force:record:data",
-        "delete:record:force:data",
-        "delete:record:data:force"
+      "aliasPermutations": [],
+      "permutations": [
+        "data:export:bulk",
+        "export:data:bulk",
+        "export:bulk:data",
+        "data:bulk:export",
+        "bulk:data:export",
+        "bulk:export:data"
+      ]
+    },
+    "data:export:resume": {
+      "aliases": [],
+      "args": {},
+      "description": "When the original \"data export bulk\" command either times out or is run with the --async flag, it displays a job ID. To see the status and get the results of the bulk export, run this command by either passing it the job ID or using the --use-most-recent flag to specify the most recent bulk export job.",
+      "examples": [
+        "Resume a bulk export job run on your default org by specifying a job ID:\nsf <%= command.id %> --job-id 750xx000000005sAAA",
+        "Resume the most recently-run bulk export job for an org with alias my-scratch:\nsf data export resume --use-most-recent --target-org my-scratch"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "flags-dir": {
+          "helpGroup": "GLOBAL",
+          "name": "flags-dir",
+          "summary": "Import flag values from a directory.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "job-id": {
+          "char": "i",
+          "name": "job-id",
+          "summary": "Job ID of the bulk export.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "use-most-recent": {
+          "name": "use-most-recent",
+          "summary": "Use the job ID of the bulk export job that was most recently run.",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "api-version": {
+          "description": "Override the api version used for api requests made by this command",
+          "name": "api-version",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "data:export:resume",
+      "pluginAlias": "@salesforce/plugin-data",
+      "pluginName": "@salesforce/plugin-data",
+      "pluginType": "core",
+      "strict": true,
+      "summary": "Resume a bulk export job that you previously started. Uses Bulk API 2.0.",
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "lib",
+        "commands",
+        "data",
+        "export",
+        "resume.js"
       ],
+      "aliasPermutations": [],
       "permutations": [
-        "data:delete:record",
-        "delete:data:record",
-        "delete:record:data",
-        "data:record:delete",
-        "record:data:delete",
-        "record:delete:data"
+        "data:export:resume",
+        "export:data:resume",
+        "export:resume:data",
+        "data:resume:export",
+        "resume:data:export",
+        "resume:export:data"
       ]
     },
-    "data:delete:resume": {
-      "aliases": [],
+    "data:export:tree": {
+      "aliases": [
+        "force:data:tree:export",
+        "data:export:beta:tree"
+      ],
       "args": {},
       "deprecateAliases": true,
-      "description": "The command uses the job ID returned by the \"<%= config.bin %> data delete bulk\" command or the most recently-run bulk delete job.",
+      "description": "Specify a SOQL query, either directly at the command line or read from a file, to retrieve the data you want to export. The exported data is written to JSON files in sObject tree format, which is a collection of nested, parent-child records with a single root record. Use these JSON files to import data into an org with the \"<%= config.bin %> data import tree\" command.\n\nIf your SOQL query references multiple objects, the command generates a single JSON file by default. You can specify the --plan flag to generate separate JSON files for each object and a plan definition file that aggregates them. You then specify just this plan definition file when you import the data into an org.\n\nThe SOQL query can return a maximum of 2,000 records. For more information, see the REST API Developer Guide. (https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_composite_sobject_tree.htm).",
       "examples": [
-        "Resume a bulk delete job from your default org using an ID:\n<%= config.bin %> <%= command.id %> --job-id 750xx000000005sAAA",
-        "Resume the most recently run bulk delete job for an org with alias my-scratch:\n<%= config.bin %> <%= command.id %> --use-most-recent --target-org my-scratch"
+        "Export records retrieved with the specified SOQL query into a single JSON file in the current directory; the command uses your default org:\n<%= config.bin %> <%= command.id %> --query \"SELECT Id, Name, (SELECT Name, Address__c FROM Properties__r) FROM Broker__c\"",
+        "Export data using a SOQL query in the \"query.txt\" file and generate JSON files for each object and a plan that aggregates them:\n<%= config.bin %> <%= command.id %> --query query.txt --plan",
+        "Prepend \"export-demo\" before each generated file and generate the files in the \"export-out\" directory; run the command on the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --query query.txt --plan --prefix export-demo --output-dir export-out --target-org my-scratch"
       ],
       "flags": {
         "json": {
@@ -1585,41 +1524,17 @@
           "deprecateAliases": true,
           "name": "target-org",
           "noCacheDefault": true,
-          "summary": "Username or alias of the target org. Not required if the \"target-org\" configuration variable is already set.",
+          "required": true,
+          "summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
           "hasDynamicHelp": true,
           "multiple": false,
           "type": "option"
         },
-        "job-id": {
+        "api-version": {
           "aliases": [
-            "jobid"
+            "apiversion"
           ],
-          "char": "i",
           "deprecateAliases": true,
-          "name": "job-id",
-          "summary": "ID of the job you want to resume.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "use-most-recent": {
-          "exclusive": [
-            "job-id"
-          ],
-          "name": "use-most-recent",
-          "summary": "Use the ID of the most recently-run bulk job.",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "wait": {
-          "name": "wait",
-          "summary": "Number of minutes to wait for the command to complete before displaying the results.",
-          "default": "5 minutes",
-          "hasDynamicHelp": true,
-          "multiple": false,
-          "type": "option"
-        },
-        "api-version": {
           "description": "Override the api version used for api requests made by this command",
           "name": "api-version",
           "hasDynamicHelp": false,
@@ -1635,33 +1550,118 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "query": {
+          "char": "q",
+          "name": "query",
+          "required": true,
+          "summary": "SOQL query, or filepath of a file that contains the query, to retrieve records.",
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "plan": {
+          "char": "p",
+          "name": "plan",
+          "summary": "Generate multiple sObject tree files and a plan definition file for aggregated import.",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "prefix": {
+          "char": "x",
+          "name": "prefix",
+          "summary": "Prefix of generated files.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "output-dir": {
+          "aliases": [
+            "outputdir"
+          ],
+          "char": "d",
+          "deprecateAliases": true,
+          "name": "output-dir",
+          "summary": "Directory in which to generate the JSON files; default is current directory.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "data:delete:resume",
+      "id": "data:export:tree",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
       "strict": true,
-      "summary": "Resume a bulk delete job that you previously started. Uses Bulk API 2.0.",
+      "summary": "Export data from an org into one or more JSON files.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "data",
-        "delete",
-        "resume.js"
+        "export",
+        "tree.js"
+      ],
+      "aliasPermutations": [
+        "force:data:tree:export",
+        "data:force:tree:export",
+        "data:tree:force:export",
+        "data:tree:export:force",
+        "force:tree:data:export",
+        "tree:force:data:export",
+        "tree:data:force:export",
+        "tree:data:export:force",
+        "force:tree:export:data",
+        "tree:force:export:data",
+        "tree:export:force:data",
+        "tree:export:data:force",
+        "force:data:export:tree",
+        "data:force:export:tree",
+        "data:export:force:tree",
+        "data:export:tree:force",
+        "force:export:data:tree",
+        "export:force:data:tree",
+        "export:data:force:tree",
+        "export:data:tree:force",
+        "force:export:tree:data",
+        "export:force:tree:data",
+        "export:tree:force:data",
+        "export:tree:data:force",
+        "data:export:beta:tree",
+        "export:data:beta:tree",
+        "export:beta:data:tree",
+        "export:beta:tree:data",
+        "data:beta:export:tree",
+        "beta:data:export:tree",
+        "beta:export:data:tree",
+        "beta:export:tree:data",
+        "data:beta:tree:export",
+        "beta:data:tree:export",
+        "beta:tree:data:export",
+        "beta:tree:export:data",
+        "data:export:tree:beta",
+        "export:data:tree:beta",
+        "export:tree:data:beta",
+        "export:tree:beta:data",
+        "data:tree:export:beta",
+        "tree:data:export:beta",
+        "tree:export:data:beta",
+        "tree:export:beta:data",
+        "data:tree:beta:export",
+        "tree:data:beta:export",
+        "tree:beta:data:export",
+        "tree:beta:export:data"
       ],
-      "aliasPermutations": [],
       "permutations": [
-        "data:delete:resume",
-        "delete:data:resume",
-        "delete:resume:data",
-        "data:resume:delete",
-        "resume:data:delete",
-        "resume:delete:data"
+        "data:export:tree",
+        "export:data:tree",
+        "export:tree:data",
+        "data:tree:export",
+        "tree:data:export",
+        "tree:export:data"
       ]
     },
     "data:get:record": {
@@ -3148,18 +3148,13 @@
         "resume:upsert:data"
       ]
     },
-    "data:export:legacy:tree": {
+    "force:data:bulk:delete": {
       "aliases": [],
       "args": {},
-      "deprecationOptions": {
-        "to": "data tree export",
-        "message": "Starting on Nov 10, 2024, this command will no longer be available. Use `data export tree` instead."
-      },
-      "description": "Specify a SOQL query, either directly at the command line or read from a file, to retrieve the data you want to export. The exported data is written to JSON files in sObject tree format, which is a collection of nested, parent-child records with a single root record. Use these JSON files to import data into an org with the \"<%= config.bin %> data import tree\" command.\n\nIf your SOQL query references multiple objects, the command generates a single JSON file by default. You can specify the --plan flag to generate separate JSON files for each object and a plan definition file that aggregates them. You then specify just this plan definition file when you import the data into an org.\n\nThe SOQL query can return a maximum of 2,000 records. For more information, see the REST API Developer Guide. (https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_composite_sobject_tree.htm).",
+      "description": "The CSV file must have only one column (\"Id\") and then the list of record IDs you want to delete, one ID per line.\n\nWhen you execute this command, it starts a job and one or more batches, displays their IDs, and then immediately returns control of the terminal to you by default. If you prefer to wait, set the --wait flag to the number of minutes; if it times out, the command outputs the IDs. Use the job and batch IDs to check the status of the job with the \"<%= config.bin %> force data bulk status\" command. A single job can contain many batches, depending on the length of the CSV file.",
       "examples": [
-        "Export records retrieved with the specified SOQL query into a single JSON file in the current directory; the command uses your default org:\n<%= config.bin %> <%= command.id %> --query \"SELECT Id, Name, (SELECT Name, Address__c FROM Properties__r) FROM Broker__c\"",
-        "Export data using a SOQL query in the \"query.txt\" file and generate JSON files for each object and a plan that aggregates them:\n<%= config.bin %> <%= command.id %> --query query.txt --plan",
-        "Prepend \"export-demo\" before each generated file and generate the files in the \"export-out\" directory; run the command on the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --query query.txt --plan --prefix export-demo --output-dir export-out --target-org my-scratch"
+        "Bulk delete Account records from your default org using the list of IDs in the \"files/delete.csv\" file:\n<%= config.bin %> <%= command.id %> --sobject Account --file files/delete.csv",
+        "Bulk delete records from a custom object in an org with alias my-scratch and wait 5 minutes for the command to complete:\n<%= config.bin %> <%= command.id %> --sobject MyObject__c --file files/delete.csv --wait 5 --target-org my-scratch"
       ],
       "flags": {
         "json": {
@@ -3213,101 +3208,95 @@
           "multiple": false,
           "type": "option"
         },
-        "query": {
-          "char": "q",
-          "name": "query",
+        "file": {
+          "aliases": [
+            "csvfile"
+          ],
+          "char": "f",
+          "deprecateAliases": true,
+          "name": "file",
           "required": true,
-          "summary": "SOQL query, or filepath of a file that contains the query, to retrieve records.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "plan": {
-          "char": "p",
-          "name": "plan",
-          "summary": "Generate multiple sObject tree files and a plan definition file for aggregated import.",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "prefix": {
-          "char": "x",
-          "name": "prefix",
-          "summary": "Prefix of generated files.",
+          "summary": "CSV file that contains the IDs of the records to delete.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "output-dir": {
+        "sobject": {
           "aliases": [
-            "outputdir"
+            "sobjecttype"
           ],
-          "char": "d",
+          "char": "s",
           "deprecateAliases": true,
-          "name": "output-dir",
-          "summary": "Directory in which to generate the JSON files; default is current directory.",
+          "name": "sobject",
+          "required": true,
+          "summary": "API name of the Salesforce object, either standard or custom, that you want to delete records from.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "wait": {
+          "char": "w",
+          "name": "wait",
+          "summary": "Number of minutes to wait for the command to complete before displaying the results.",
+          "default": "0 minutes",
+          "hasDynamicHelp": true,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": true,
-      "hidden": true,
       "hiddenAliases": [],
-      "id": "data:export:legacy:tree",
+      "id": "force:data:bulk:delete",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
-      "state": "deprecated",
       "strict": true,
-      "summary": "Export data from an org into one or more JSON files.",
+      "summary": "Bulk delete records from an org using a CSV file. Uses Bulk API 1.0.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
-        "data",
-        "export",
-        "legacy",
-        "tree.js"
+        "force",
+        "data",
+        "bulk",
+        "delete.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "data:export:legacy:tree",
-        "export:data:legacy:tree",
-        "export:legacy:data:tree",
-        "export:legacy:tree:data",
-        "data:legacy:export:tree",
-        "legacy:data:export:tree",
-        "legacy:export:data:tree",
-        "legacy:export:tree:data",
-        "data:legacy:tree:export",
-        "legacy:data:tree:export",
-        "legacy:tree:data:export",
-        "legacy:tree:export:data",
-        "data:export:tree:legacy",
-        "export:data:tree:legacy",
-        "export:tree:data:legacy",
-        "export:tree:legacy:data",
-        "data:tree:export:legacy",
-        "tree:data:export:legacy",
-        "tree:export:data:legacy",
-        "tree:export:legacy:data",
-        "data:tree:legacy:export",
-        "tree:data:legacy:export",
-        "tree:legacy:data:export",
-        "tree:legacy:export:data"
+        "force:data:bulk:delete",
+        "data:force:bulk:delete",
+        "data:bulk:force:delete",
+        "data:bulk:delete:force",
+        "force:bulk:data:delete",
+        "bulk:force:data:delete",
+        "bulk:data:force:delete",
+        "bulk:data:delete:force",
+        "force:bulk:delete:data",
+        "bulk:force:delete:data",
+        "bulk:delete:force:data",
+        "bulk:delete:data:force",
+        "force:data:delete:bulk",
+        "data:force:delete:bulk",
+        "data:delete:force:bulk",
+        "data:delete:bulk:force",
+        "force:delete:data:bulk",
+        "delete:force:data:bulk",
+        "delete:data:force:bulk",
+        "delete:data:bulk:force",
+        "force:delete:bulk:data",
+        "delete:force:bulk:data",
+        "delete:bulk:force:data",
+        "delete:bulk:data:force"
       ]
     },
-    "data:import:legacy:tree": {
+    "force:data:bulk:status": {
       "aliases": [],
       "args": {},
-      "deprecationOptions": {
-        "message": "After Nov 10, 2024, this command will no longer be available. Use `data export tree`."
-      },
-      "description": "The JSON files that contain the data are in sObject tree format, which is a collection of nested, parent-child records with a single root record. Use the \"<%= config.bin %> data export tree\" command to generate these JSON files.\n\nIf you used the --plan flag when exporting the data to generate a plan definition file, use the --plan flag to reference the file when you import. If you're not using a plan, use the --files flag to list the files. If you specify multiple JSON files that depend on each other in a parent-child relationship, be sure you list them in the correct order.\n\nThe sObject Tree API supports requests that contain up to 200 records. For more information, see the REST API Developer Guide. (https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_composite_sobject_tree.htm)",
+      "description": "Run this command using the job ID or batch ID returned from the \"<%= config.bin %> force data bulk delete\" or \"<%= config.bin %> force data bulk upsert\" commands.",
       "examples": [
-        "Import the records contained in two JSON files into the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --files Contact.json,Account.json --target-org my-scratch",
-        "Import records using a plan definition file into your default org:\n<%= config.bin %> <%= command.id %> --plan Account-Contact-plan.json"
+        "View the status of a bulk load job in your default org:\n<%= config.bin %> <%= command.id %> --job-id 750xx000000005sAAA",
+        "View the status of a bulk load job and a specific batches in an org with alias my-scratch:\n<%= config.bin %> <%= command.id %> --job-id 750xx000000005sAAA --batch-id 751xx000000005nAAA --target-org my-scratch"
       ],
       "flags": {
         "json": {
@@ -3361,116 +3350,85 @@
           "multiple": false,
           "type": "option"
         },
-        "files": {
+        "batch-id": {
           "aliases": [
-            "sobjecttreefiles"
+            "batchid"
           ],
-          "char": "f",
+          "char": "b",
           "deprecateAliases": true,
-          "exclusive": [
-            "plan"
-          ],
-          "name": "files",
-          "summary": "Comma-separated and in-order JSON files that contain the records, in sObject tree format, that you want to insert.",
-          "delimiter": ",",
-          "hasDynamicHelp": false,
-          "multiple": true,
-          "type": "option"
-        },
-        "plan": {
-          "char": "p",
-          "name": "plan",
-          "summary": "Plan definition file to insert multiple data files.",
+          "name": "batch-id",
+          "summary": "ID of the batch whose status you want to view; you must also specify the job ID.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "content-type": {
+        "job-id": {
           "aliases": [
-            "contenttype"
+            "jobid"
           ],
-          "char": "c",
+          "char": "i",
           "deprecateAliases": true,
-          "deprecated": {
-            "message": "The `config-type` flag is deprecated and will be moved to a `legacy` command after July 10, 2024. It will be completely removed after Nov 10, 2024. Use the new `data tree beta import` command."
-          },
-          "hidden": true,
-          "name": "content-type",
-          "summary": "Content type of import files if their extention is not .json.",
+          "name": "job-id",
+          "required": true,
+          "summary": "ID of the job whose status you want to view.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
-        },
-        "config-help": {
-          "aliases": [
-            "confighelp"
-          ],
-          "deprecateAliases": true,
-          "deprecated": {
-            "message": "The `config-help` flag is deprecated and will be moved to a `legacy` command after July 10, 2024. It will be completely removed after Nov 10, 2024. Use the new `data tree beta import` command."
-          },
-          "hidden": true,
-          "name": "config-help",
-          "summary": "Display schema information for the --plan configuration file to stdout; if you specify this flag, all other flags except --json are ignored.",
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": true,
-      "hidden": true,
       "hiddenAliases": [],
-      "id": "data:import:legacy:tree",
+      "id": "force:data:bulk:status",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
-      "state": "deprecated",
       "strict": true,
-      "summary": "Import data from one or more JSON files into an org.",
+      "summary": "View the status of a bulk data load job or batch. Uses Bulk API 1.0.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
+        "force",
         "data",
-        "import",
-        "legacy",
-        "tree.js"
+        "bulk",
+        "status.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "data:import:legacy:tree",
-        "import:data:legacy:tree",
-        "import:legacy:data:tree",
-        "import:legacy:tree:data",
-        "data:legacy:import:tree",
-        "legacy:data:import:tree",
-        "legacy:import:data:tree",
-        "legacy:import:tree:data",
-        "data:legacy:tree:import",
-        "legacy:data:tree:import",
-        "legacy:tree:data:import",
-        "legacy:tree:import:data",
-        "data:import:tree:legacy",
-        "import:data:tree:legacy",
-        "import:tree:data:legacy",
-        "import:tree:legacy:data",
-        "data:tree:import:legacy",
-        "tree:data:import:legacy",
-        "tree:import:data:legacy",
-        "tree:import:legacy:data",
-        "data:tree:legacy:import",
-        "tree:data:legacy:import",
-        "tree:legacy:data:import",
-        "tree:legacy:import:data"
+        "force:data:bulk:status",
+        "data:force:bulk:status",
+        "data:bulk:force:status",
+        "data:bulk:status:force",
+        "force:bulk:data:status",
+        "bulk:force:data:status",
+        "bulk:data:force:status",
+        "bulk:data:status:force",
+        "force:bulk:status:data",
+        "bulk:force:status:data",
+        "bulk:status:force:data",
+        "bulk:status:data:force",
+        "force:data:status:bulk",
+        "data:force:status:bulk",
+        "data:status:force:bulk",
+        "data:status:bulk:force",
+        "force:status:data:bulk",
+        "status:force:data:bulk",
+        "status:data:force:bulk",
+        "status:data:bulk:force",
+        "force:status:bulk:data",
+        "status:force:bulk:data",
+        "status:bulk:force:data",
+        "status:bulk:data:force"
       ]
     },
-    "force:data:bulk:delete": {
+    "force:data:bulk:upsert": {
       "aliases": [],
       "args": {},
-      "description": "The CSV file must have only one column (\"Id\") and then the list of record IDs you want to delete, one ID per line.\n\nWhen you execute this command, it starts a job and one or more batches, displays their IDs, and then immediately returns control of the terminal to you by default. If you prefer to wait, set the --wait flag to the number of minutes; if it times out, the command outputs the IDs. Use the job and batch IDs to check the status of the job with the \"<%= config.bin %> force data bulk status\" command. A single job can contain many batches, depending on the length of the CSV file.",
+      "description": "An upsert refers to inserting a record into a Salesforce object if the record doesn't already exist, or updating it if it does exist.\n\nWhen you execute this command, it starts a job and one or more batches, displays their IDs, and then immediately returns control of the terminal to you by default. If you prefer to wait, set the --wait flag to the number of minutes; if it times out, the command outputs the IDs. Use the job and batch IDs to check the status of the job with the \"<%= config.bin %> force data bulk status\" command. A single job can contain many batches, depending on the length of the CSV file.\n\nSee \"Prepare CSV Files\" in the Bulk API Developer Guide for details on formatting your CSV file. (https://developer.salesforce.com/docs/atlas.en-us.api_asynch.meta/api_asynch/datafiles_csv_preparing.htm)\n\nBy default, the job runs the batches in parallel, which we recommend. You can run jobs serially by specifying the --serial flag. But don't process data in serial mode unless you know this would otherwise result in lock timeouts and you can't reorganize your batches to avoid the locks.",
       "examples": [
-        "Bulk delete Account records from your default org using the list of IDs in the \"files/delete.csv\" file:\n<%= config.bin %> <%= command.id %> --sobject Account --file files/delete.csv",
-        "Bulk delete records from a custom object in an org with alias my-scratch and wait 5 minutes for the command to complete:\n<%= config.bin %> <%= command.id %> --sobject MyObject__c --file files/delete.csv --wait 5 --target-org my-scratch"
+        "Bulk upsert records to the Contact object in your default org:\n<%= config.bin %> --sobject Contact --file files/contacts.csv --external-id Id",
+        "Bulk upsert records to a custom object in an org with alias my-scratch and wait 5 minutes for the command to complete:\n<%= config.bin %> <%= command.id %> --sobject MyObject__c --file files/file.csv --external-id MyField__c --wait 5 --target-org my-scratch"
       ],
       "flags": {
         "json": {
@@ -3524,6 +3482,19 @@
           "multiple": false,
           "type": "option"
         },
+        "external-id": {
+          "aliases": [
+            "externalid"
+          ],
+          "char": "i",
+          "deprecateAliases": true,
+          "name": "external-id",
+          "required": true,
+          "summary": "Name of the external ID field, or the Id field.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "file": {
           "aliases": [
             "csvfile"
@@ -3532,7 +3503,7 @@
           "deprecateAliases": true,
           "name": "file",
           "required": true,
-          "summary": "CSV file that contains the IDs of the records to delete.",
+          "summary": "CSV file that contains the records to upsert.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -3545,7 +3516,7 @@
           "deprecateAliases": true,
           "name": "sobject",
           "required": true,
-          "summary": "API name of the Salesforce object, either standard or custom, that you want to delete records from.",
+          "summary": "API name of the Salesforce object, either standard or custom, that you want to upsert records to.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -3558,16 +3529,23 @@
           "hasDynamicHelp": true,
           "multiple": false,
           "type": "option"
+        },
+        "serial": {
+          "char": "r",
+          "name": "serial",
+          "summary": "Run batches in serial mode.",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "force:data:bulk:delete",
+      "id": "force:data:bulk:upsert",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
       "strict": true,
-      "summary": "Bulk delete records from an org using a CSV file. Uses Bulk API 1.0.",
+      "summary": "Bulk upsert records to an org from a CSV file. Uses Bulk API 1.0.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -3576,43 +3554,48 @@
         "force",
         "data",
         "bulk",
-        "delete.js"
+        "upsert.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "force:data:bulk:delete",
-        "data:force:bulk:delete",
-        "data:bulk:force:delete",
-        "data:bulk:delete:force",
-        "force:bulk:data:delete",
-        "bulk:force:data:delete",
-        "bulk:data:force:delete",
-        "bulk:data:delete:force",
-        "force:bulk:delete:data",
-        "bulk:force:delete:data",
-        "bulk:delete:force:data",
-        "bulk:delete:data:force",
-        "force:data:delete:bulk",
-        "data:force:delete:bulk",
-        "data:delete:force:bulk",
-        "data:delete:bulk:force",
-        "force:delete:data:bulk",
-        "delete:force:data:bulk",
-        "delete:data:force:bulk",
-        "delete:data:bulk:force",
-        "force:delete:bulk:data",
-        "delete:force:bulk:data",
-        "delete:bulk:force:data",
-        "delete:bulk:data:force"
+        "force:data:bulk:upsert",
+        "data:force:bulk:upsert",
+        "data:bulk:force:upsert",
+        "data:bulk:upsert:force",
+        "force:bulk:data:upsert",
+        "bulk:force:data:upsert",
+        "bulk:data:force:upsert",
+        "bulk:data:upsert:force",
+        "force:bulk:upsert:data",
+        "bulk:force:upsert:data",
+        "bulk:upsert:force:data",
+        "bulk:upsert:data:force",
+        "force:data:upsert:bulk",
+        "data:force:upsert:bulk",
+        "data:upsert:force:bulk",
+        "data:upsert:bulk:force",
+        "force:upsert:data:bulk",
+        "upsert:force:data:bulk",
+        "upsert:data:force:bulk",
+        "upsert:data:bulk:force",
+        "force:upsert:bulk:data",
+        "upsert:force:bulk:data",
+        "upsert:bulk:force:data",
+        "upsert:bulk:data:force"
       ]
     },
-    "force:data:bulk:status": {
+    "data:export:legacy:tree": {
       "aliases": [],
       "args": {},
-      "description": "Run this command using the job ID or batch ID returned from the \"<%= config.bin %> force data bulk delete\" or \"<%= config.bin %> force data bulk upsert\" commands.",
+      "deprecationOptions": {
+        "to": "data tree export",
+        "message": "Starting on Nov 10, 2024, this command will no longer be available. Use `data export tree` instead."
+      },
+      "description": "Specify a SOQL query, either directly at the command line or read from a file, to retrieve the data you want to export. The exported data is written to JSON files in sObject tree format, which is a collection of nested, parent-child records with a single root record. Use these JSON files to import data into an org with the \"<%= config.bin %> data import tree\" command.\n\nIf your SOQL query references multiple objects, the command generates a single JSON file by default. You can specify the --plan flag to generate separate JSON files for each object and a plan definition file that aggregates them. You then specify just this plan definition file when you import the data into an org.\n\nThe SOQL query can return a maximum of 2,000 records. For more information, see the REST API Developer Guide. (https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_composite_sobject_tree.htm).",
       "examples": [
-        "View the status of a bulk load job in your default org:\n<%= config.bin %> <%= command.id %> --job-id 750xx000000005sAAA",
-        "View the status of a bulk load job and a specific batches in an org with alias my-scratch:\n<%= config.bin %> <%= command.id %> --job-id 750xx000000005sAAA --batch-id 751xx000000005nAAA --target-org my-scratch"
+        "Export records retrieved with the specified SOQL query into a single JSON file in the current directory; the command uses your default org:\n<%= config.bin %> <%= command.id %> --query \"SELECT Id, Name, (SELECT Name, Address__c FROM Properties__r) FROM Broker__c\"",
+        "Export data using a SOQL query in the \"query.txt\" file and generate JSON files for each object and a plan that aggregates them:\n<%= config.bin %> <%= command.id %> --query query.txt --plan",
+        "Prepend \"export-demo\" before each generated file and generate the files in the \"export-out\" directory; run the command on the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --query query.txt --plan --prefix export-demo --output-dir export-out --target-org my-scratch"
       ],
       "flags": {
         "json": {
@@ -3666,85 +3649,101 @@
           "multiple": false,
           "type": "option"
         },
-        "batch-id": {
-          "aliases": [
-            "batchid"
-          ],
-          "char": "b",
-          "deprecateAliases": true,
-          "name": "batch-id",
-          "summary": "ID of the batch whose status you want to view; you must also specify the job ID.",
+        "query": {
+          "char": "q",
+          "name": "query",
+          "required": true,
+          "summary": "SOQL query, or filepath of a file that contains the query, to retrieve records.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "job-id": {
+        "plan": {
+          "char": "p",
+          "name": "plan",
+          "summary": "Generate multiple sObject tree files and a plan definition file for aggregated import.",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "prefix": {
+          "char": "x",
+          "name": "prefix",
+          "summary": "Prefix of generated files.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "output-dir": {
           "aliases": [
-            "jobid"
+            "outputdir"
           ],
-          "char": "i",
+          "char": "d",
           "deprecateAliases": true,
-          "name": "job-id",
-          "required": true,
-          "summary": "ID of the job whose status you want to view.",
+          "name": "output-dir",
+          "summary": "Directory in which to generate the JSON files; default is current directory.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         }
       },
       "hasDynamicHelp": true,
+      "hidden": true,
       "hiddenAliases": [],
-      "id": "force:data:bulk:status",
+      "id": "data:export:legacy:tree",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
+      "state": "deprecated",
       "strict": true,
-      "summary": "View the status of a bulk data load job or batch. Uses Bulk API 1.0.",
+      "summary": "Export data from an org into one or more JSON files.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
-        "force",
         "data",
-        "bulk",
-        "status.js"
+        "export",
+        "legacy",
+        "tree.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "force:data:bulk:status",
-        "data:force:bulk:status",
-        "data:bulk:force:status",
-        "data:bulk:status:force",
-        "force:bulk:data:status",
-        "bulk:force:data:status",
-        "bulk:data:force:status",
-        "bulk:data:status:force",
-        "force:bulk:status:data",
-        "bulk:force:status:data",
-        "bulk:status:force:data",
-        "bulk:status:data:force",
-        "force:data:status:bulk",
-        "data:force:status:bulk",
-        "data:status:force:bulk",
-        "data:status:bulk:force",
-        "force:status:data:bulk",
-        "status:force:data:bulk",
-        "status:data:force:bulk",
-        "status:data:bulk:force",
-        "force:status:bulk:data",
-        "status:force:bulk:data",
-        "status:bulk:force:data",
-        "status:bulk:data:force"
+        "data:export:legacy:tree",
+        "export:data:legacy:tree",
+        "export:legacy:data:tree",
+        "export:legacy:tree:data",
+        "data:legacy:export:tree",
+        "legacy:data:export:tree",
+        "legacy:export:data:tree",
+        "legacy:export:tree:data",
+        "data:legacy:tree:export",
+        "legacy:data:tree:export",
+        "legacy:tree:data:export",
+        "legacy:tree:export:data",
+        "data:export:tree:legacy",
+        "export:data:tree:legacy",
+        "export:tree:data:legacy",
+        "export:tree:legacy:data",
+        "data:tree:export:legacy",
+        "tree:data:export:legacy",
+        "tree:export:data:legacy",
+        "tree:export:legacy:data",
+        "data:tree:legacy:export",
+        "tree:data:legacy:export",
+        "tree:legacy:data:export",
+        "tree:legacy:export:data"
       ]
     },
-    "force:data:bulk:upsert": {
+    "data:import:legacy:tree": {
       "aliases": [],
       "args": {},
-      "description": "An upsert refers to inserting a record into a Salesforce object if the record doesn't already exist, or updating it if it does exist.\n\nWhen you execute this command, it starts a job and one or more batches, displays their IDs, and then immediately returns control of the terminal to you by default. If you prefer to wait, set the --wait flag to the number of minutes; if it times out, the command outputs the IDs. Use the job and batch IDs to check the status of the job with the \"<%= config.bin %> force data bulk status\" command. A single job can contain many batches, depending on the length of the CSV file.\n\nSee \"Prepare CSV Files\" in the Bulk API Developer Guide for details on formatting your CSV file. (https://developer.salesforce.com/docs/atlas.en-us.api_asynch.meta/api_asynch/datafiles_csv_preparing.htm)\n\nBy default, the job runs the batches in parallel, which we recommend. You can run jobs serially by specifying the --serial flag. But don't process data in serial mode unless you know this would otherwise result in lock timeouts and you can't reorganize your batches to avoid the locks.",
+      "deprecationOptions": {
+        "message": "After Nov 10, 2024, this command will no longer be available. Use `data export tree`."
+      },
+      "description": "The JSON files that contain the data are in sObject tree format, which is a collection of nested, parent-child records with a single root record. Use the \"<%= config.bin %> data export tree\" command to generate these JSON files.\n\nIf you used the --plan flag when exporting the data to generate a plan definition file, use the --plan flag to reference the file when you import. If you're not using a plan, use the --files flag to list the files. If you specify multiple JSON files that depend on each other in a parent-child relationship, be sure you list them in the correct order.\n\nThe sObject Tree API supports requests that contain up to 200 records. For more information, see the REST API Developer Guide. (https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_composite_sobject_tree.htm)",
       "examples": [
-        "Bulk upsert records to the Contact object in your default org:\n<%= config.bin %> --sobject Contact --file files/contacts.csv --external-id Id",
-        "Bulk upsert records to a custom object in an org with alias my-scratch and wait 5 minutes for the command to complete:\n<%= config.bin %> <%= command.id %> --sobject MyObject__c --file files/file.csv --external-id MyField__c --wait 5 --target-org my-scratch"
+        "Import the records contained in two JSON files into the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --files Contact.json,Account.json --target-org my-scratch",
+        "Import records using a plan definition file into your default org:\n<%= config.bin %> <%= command.id %> --plan Account-Contact-plan.json"
       ],
       "flags": {
         "json": {
@@ -3798,108 +3797,109 @@
           "multiple": false,
           "type": "option"
         },
-        "external-id": {
+        "files": {
           "aliases": [
-            "externalid"
+            "sobjecttreefiles"
           ],
-          "char": "i",
+          "char": "f",
           "deprecateAliases": true,
-          "name": "external-id",
-          "required": true,
-          "summary": "Name of the external ID field, or the Id field.",
+          "exclusive": [
+            "plan"
+          ],
+          "name": "files",
+          "summary": "Comma-separated and in-order JSON files that contain the records, in sObject tree format, that you want to insert.",
+          "delimiter": ",",
           "hasDynamicHelp": false,
-          "multiple": false,
+          "multiple": true,
           "type": "option"
         },
-        "file": {
-          "aliases": [
-            "csvfile"
-          ],
-          "char": "f",
-          "deprecateAliases": true,
-          "name": "file",
-          "required": true,
-          "summary": "CSV file that contains the records to upsert.",
+        "plan": {
+          "char": "p",
+          "name": "plan",
+          "summary": "Plan definition file to insert multiple data files.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "sobject": {
+        "content-type": {
           "aliases": [
-            "sobjecttype"
+            "contenttype"
           ],
-          "char": "s",
+          "char": "c",
           "deprecateAliases": true,
-          "name": "sobject",
-          "required": true,
-          "summary": "API name of the Salesforce object, either standard or custom, that you want to upsert records to.",
+          "deprecated": {
+            "message": "The `config-type` flag is deprecated and will be moved to a `legacy` command after July 10, 2024. It will be completely removed after Nov 10, 2024. Use the new `data tree beta import` command."
+          },
+          "hidden": true,
+          "name": "content-type",
+          "summary": "Content type of import files if their extention is not .json.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "wait": {
-          "char": "w",
-          "name": "wait",
-          "summary": "Number of minutes to wait for the command to complete before displaying the results.",
-          "default": "0 minutes",
-          "hasDynamicHelp": true,
-          "multiple": false,
-          "type": "option"
-        },
-        "serial": {
-          "char": "r",
-          "name": "serial",
-          "summary": "Run batches in serial mode.",
+        "config-help": {
+          "aliases": [
+            "confighelp"
+          ],
+          "deprecateAliases": true,
+          "deprecated": {
+            "message": "The `config-help` flag is deprecated and will be moved to a `legacy` command after July 10, 2024. It will be completely removed after Nov 10, 2024. Use the new `data tree beta import` command."
+          },
+          "hidden": true,
+          "name": "config-help",
+          "summary": "Display schema information for the --plan configuration file to stdout; if you specify this flag, all other flags except --json are ignored.",
           "allowNo": false,
           "type": "boolean"
         }
       },
       "hasDynamicHelp": true,
+      "hidden": true,
       "hiddenAliases": [],
-      "id": "force:data:bulk:upsert",
+      "id": "data:import:legacy:tree",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
+      "state": "deprecated",
       "strict": true,
-      "summary": "Bulk upsert records to an org from a CSV file. Uses Bulk API 1.0.",
+      "summary": "Import data from one or more JSON files into an org.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
-        "force",
         "data",
-        "bulk",
-        "upsert.js"
+        "import",
+        "legacy",
+        "tree.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "force:data:bulk:upsert",
-        "data:force:bulk:upsert",
-        "data:bulk:force:upsert",
-        "data:bulk:upsert:force",
-        "force:bulk:data:upsert",
-        "bulk:force:data:upsert",
-        "bulk:data:force:upsert",
-        "bulk:data:upsert:force",
-        "force:bulk:upsert:data",
-        "bulk:force:upsert:data",
-        "bulk:upsert:force:data",
-        "bulk:upsert:data:force",
-        "force:data:upsert:bulk",
-        "data:force:upsert:bulk",
-        "data:upsert:force:bulk",
-        "data:upsert:bulk:force",
-        "force:upsert:data:bulk",
-        "upsert:force:data:bulk",
-        "upsert:data:force:bulk",
-        "upsert:data:bulk:force",
-        "force:upsert:bulk:data",
-        "upsert:force:bulk:data",
-        "upsert:bulk:force:data",
-        "upsert:bulk:data:force"
+        "data:import:legacy:tree",
+        "import:data:legacy:tree",
+        "import:legacy:data:tree",
+        "import:legacy:tree:data",
+        "data:legacy:import:tree",
+        "legacy:data:import:tree",
+        "legacy:import:data:tree",
+        "legacy:import:tree:data",
+        "data:legacy:tree:import",
+        "legacy:data:tree:import",
+        "legacy:tree:data:import",
+        "legacy:tree:import:data",
+        "data:import:tree:legacy",
+        "import:data:tree:legacy",
+        "import:tree:data:legacy",
+        "import:tree:legacy:data",
+        "data:tree:import:legacy",
+        "tree:data:import:legacy",
+        "tree:import:data:legacy",
+        "tree:import:legacy:data",
+        "data:tree:legacy:import",
+        "tree:data:legacy:import",
+        "tree:legacy:data:import",
+        "tree:legacy:import:data"
       ]
     }
   },
-  "version": "3.13.4"
+  "version": "3.13.6"
 }