@uipath/solution-tool 1.203.0-preview.203 → 1.204.0-preview.206

package/dist/{packager-tool-x6gzyxnn.js → packager-tool-752zvh64.js}

@@ -1,7 +1,10 @@
 import {
   getStudioWebAuthWithOrganizationId,
   useStudioWebAuth
-} from "./packager-tool-1haahq17.js";
+} from "./packager-tool-3enm2h28.js";
+import {
+  resolveFeedScopeOrFailureAsync
+} from "./packager-tool-zw3036b8.js";
 import {
   activateDeploymentAsync,
   deployRunAsync,
@@ -11,11 +14,11 @@ import {
   listPackagesAsync,
   uninstallDeploymentAsync,
   upgradeDeploymentAsync
-} from "./packager-tool-4rzjjv2p.js";
+} from "./packager-tool-n1nzj2b9.js";
 import {
   SolutionInitError,
   solutionInitAsync
-} from "./packager-tool-vas0xg5h.js";
+} from "./packager-tool-2cntqvdv.js";
 import {
   GOVERNANCE_OPTION_INSTRUCTIONS,
   PackCommandService,
@@ -28,32 +31,29 @@ import {
   readSolutionFileAsUint8Array,
   resolveSdkLogLevel,
   validateGovernanceOptions
-} from "./packager-tool-07bqr90h.js";
+} from "./packager-tool-3fyq6wjs.js";
 import {
   prepareSolutionResources
-} from "./packager-tool-7znqtw3f.js";
+} from "./packager-tool-9vvdgbay.js";
 import {
   ensurePackagerTools,
   isUnpackableProjectTypeError,
   toolVerbForProjectType
-} from "./packager-tool-k4mskzww.js";
+} from "./packager-tool-5dzjsw5q.js";
 import {
   publishSolutionAsync
-} from "./packager-tool-j2cqgegq.js";
+} from "./packager-tool-he7ak44z.js";
 import {
   Configuration,
-  PipelinesApi,
-  feedResolutionFailureInstructions,
+  PipelinesApi
+} from "./packager-tool-qgaqqq41.js";
+import {
   feedScopeInitOverride,
-  listSelectablePublishLocations,
-  resolveFeedScope
-} from "./packager-tool-h4wn0y42.js";
+  listSelectablePublishLocations
+} from "./packager-tool-dh0m3ebf.js";
 import {
-  Configuration as Configuration2,
   DeploymentActivationStatus,
   DeploymentOperationStatus,
-  PackagesApi,
-  SearchApi,
   StudioWebIncompatibleProjectError,
   buildSolutionUploadFailureOutput,
   bundleSolution,
@@ -63,20 +63,22 @@ import {
   isDebugProvisioningTerminal,
   isSolutionUploadHttpError,
   overwriteSolution,
-  searchPackageVersions,
   solutionExistsOnStudioWeb
-} from "./packager-tool-ge4rvy7p.js";
+} from "./packager-tool-t12hj6pd.js";
 import {
-  Tokens,
   applyEntryPointEnhancementAsync,
   assertSolutionManifest,
   createLocalResource,
   createProjectInSolutionBuilder,
   createResourceBuilderServices,
   createResourceKindMetadataResolver,
+  exportResourceDefinitionAsync,
+  findCatalogEntityAsync,
   findMatchingLocalResource,
   findProjectFile,
   findResourceByKeyInRcs,
+  formatResourceSubtypes,
+  getRemoteResourceClients,
   hasAnyTemplateRow,
   hasBareTemplateRow,
   isMissingProjectTypeError,
@@ -85,41 +87,47 @@ import {
   normalizeResourceFileCasing,
   readProjectFile,
   readSolutionFile,
+  readSpecProperty,
+  resolveResourceKindMetadata,
   resolveSolutionFilePath,
   resourceRefreshAsync,
   resourceRemoteSyncAsync,
   restoreSolutionFile,
+  sameResourceSubtype,
   saveCasingNormalized,
   searchRcsResources,
   syncResourcesFromBindings,
+  toResourceReference,
+  validateResourceName,
   writeSolutionFile
-} from "./packager-tool-bkwnetqn.js";
+} from "./packager-tool-83rzavkx.js";
 import {
   ToolResult
-} from "./packager-tool-nzghfa48.js";
+} from "./packager-tool-fv7xyzg2.js";
 import {
   getSolutionAuthContext
-} from "./packager-tool-2syrt51a.js";
+} from "./packager-tool-f5gq77m5.js";
 import {
-  getLoginStatusAsync,
   resolveSolutionDir,
   toPortableRelativePath,
   updateUipxSolutionId
-} from "./packager-tool-3jrq7smt.js";
+} from "./packager-tool-vmsxq1pc.js";
 import {
+  CommandDimensions,
   DEFAULT_PAGE_SIZE,
   Option,
   OutputFormatter,
   Pagination,
   PollOutcome,
   RESULTS,
+  ShipDimensions,
   carriedErrorCode,
   carriedInstructions,
+  carriedRetry,
   catchError,
   createHiddenDeprecatedTenantOption,
   extractErrorDetails,
   extractErrorMessage,
-  getFileSystem,
   isGuid,
   isPreviewBuild,
   logger,
@@ -137,7 +145,13 @@ import {
   unsupportedSolutionProjectType,
   warnDeprecatedOptionAlias,
   withCompleter
-} from "./packager-tool-0f0wt9vh.js";
+} from "./packager-tool-5fjp60dk.js";
+import {
+  getLoginStatusAsync
+} from "./packager-tool-gb35b4qs.js";
+import {
+  getFileSystem
+} from "./packager-tool-zf3929se.js";
 import {
   strFromU8,
   unzip,
@@ -151,7 +165,7 @@ var package_default = {
   name: "@uipath/solution-tool",
   author: "UiPath",
   license: "SEE LICENSE IN LICENSE.txt",
-  version: "1.203.0-preview.203",
+  version: "1.204.0-preview.206",
   description: "Create, pack, publish, and deploy UiPath Automation Solutions.",
   repository: {
     type: "git",
@@ -214,8 +228,8 @@ var package_default = {
     "@uipath/packager-tool-connector": "workspace:*",
     "@uipath/pipelines-sdk": "workspace:*",
     "@uipath/project-executor": "workspace:*",
-    "@uipath/resource-builder-sdk": "2025.11.0-alpha5891-4020",
-    "@uipath/resource-builder-tool": "2025.11.0-alpha4535-3530",
+    "@uipath/resource-builder-sdk": "2025.11.0-alpha6004-4107",
+    "@uipath/resource-builder-tool": "2025.11.0-alpha6004-4107",
     "@uipath/solution-packager": "workspace:*",
     "@uipath/solution-sdk": "workspace:*",
     "@uipath/solutionpackager-tool-core": "workspace:*",
@@ -489,7 +503,9 @@ var registerDeployActivateCommand = (program) => {
       OutputFormatter.error({
         Result: RESULTS.Failure,
         Message: result.message,
-        Instructions: result.instructions
+        Instructions: result.instructions,
+        ErrorCode: result.errorCode,
+        Retry: result.retry
       });
       processContext.exit(result.exitCode);
       return;
@@ -1016,6 +1032,54 @@ var registerDeployConfigCommand = (program) => {
   registerDeployConfigUnlinkCommand(config);
 };
 
+// src/commands/deploy-delete.ts
+var SOLUTION_DEPLOY_DELETE_EXAMPLES = [
+  {
+    Description: "Delete an inactive deployment record left behind by 'deploy uninstall'",
+    Command: "uip solution deploy delete my-deployment --yes",
+    Output: {
+      Code: "SolutionDeployDelete",
+      Data: {
+        Status: "Deleted",
+        DeploymentName: "my-deployment",
+        DeploymentKey: "a1b2c3d4-0000-0000-0000-000000000001"
+      }
+    }
+  }
+];
+var registerDeployDeleteCommand = (program) => {
+  program.command("delete").description("Delete a deployment from the tenant. Use this for a deployment that 'deploy uninstall' cannot remove: one left inactive after an uninstall, one superseded by a newer version, or one left behind by a failed install — Orchestrator refuses to uninstall those with error 4007. The command reads the deployment first, and refuses when its own action list offers actions but not Delete, naming the state and the actions that are available. A record that lists no actions at all says nothing, so there the request goes to the server and the server decides.").argument("<deployment-name>", "Name of the deployment to delete. Use 'solution deploy list' to find deployment names.").addOption(createHiddenDeprecatedTenantOption("-t, --tenant <tenant-name>")).option("--login-validity <minutes>", "Minimum minutes before token expiration to trigger a refresh (default: 10)", parseInt, 10).option("-y, --yes", "Confirm this irreversible operation (required; the CLI never prompts)").examples(SOLUTION_DEPLOY_DELETE_EXAMPLES).trackedAction(processContext, async (deploymentName, options) => {
+    if (!requireConfirmation(options, `delete deployment '${deploymentName}'`)) {
+      return;
+    }
+    const { deleteDeploymentAsync } = await import("./deploy-delete-service-y9dwehmn.js");
+    const result = await deleteDeploymentAsync(deploymentName, {
+      tenant: options.tenant,
+      loginValidity: options.loginValidity
+    });
+    if (!result.ok) {
+      OutputFormatter.error({
+        Result: RESULTS.Failure,
+        Message: result.message,
+        Instructions: result.instructions,
+        ErrorCode: result.errorCode,
+        Retry: result.retry
+      });
+      processContext.exit(result.exitCode);
+      return;
+    }
+    OutputFormatter.success({
+      Result: RESULTS.Success,
+      Code: "SolutionDeployDelete",
+      Data: {
+        Status: "Deleted",
+        DeploymentName: result.deploymentName,
+        DeploymentKey: result.deploymentKey
+      }
+    });
+  });
+};
+
 // src/commands/deploy-list.ts
 var OPERATION_STATUS_VALUES = Object.values(DeploymentOperationStatus);
 var ACTIVATION_STATUS_VALUES = Object.values(DeploymentActivationStatus);
@@ -1096,7 +1160,7 @@ var SOLUTION_DEPLOY_LIST_EXAMPLES = [
   }
 ];
 var registerDeployListCommand = (program) => {
-  const command = program.command("list").description("List solution deployments. Shows deployment name, status, package version (current/target), pending operation, and folder path. --operation-status/--activation-status filter server-side; --folder-path filters after fetching.").addOption(createHiddenDeprecatedTenantOption("-t, --tenant <tenant-name>")).option("--folder-path <path>", "Filter by parent folder path (e.g., 'Shared')").option("--folder-key <key>", "Filter by parent folder key (GUID). Alternative to --folder-path.").option("-l, --limit <number>", "Max deployments to fetch. Note: --folder-path filtering happens after fetching, so increase this value if results seem incomplete.", parseLimit, DEFAULT_PAGE_SIZE).option("--offset <number>", "Number of deployments to skip (applied before --folder-path/--folder-key filtering)", parseOffset, 0).option("--sort-by <column>", "Column to sort by (default: startTime)", "startTime").option("--sort-order <direction>", "Sort direction: Ascending or Descending (default: Descending)", "Descending").option("--operation-status <statuses>", `Filter by deployment operation status, server-side (comma-separated). One or more of: ${OPERATION_STATUS_VALUES.join(", ")}.`).option("--activation-status <statuses>", `Filter by deployment activation status, server-side (comma-separated). One or more of: ${ACTIVATION_STATUS_VALUES.join(", ")}.`).option("--login-validity <minutes>", "Minimum minutes before token expiration to trigger a refresh (default: 10)", parseInt, 10);
+  const command = program.command("list").description("List solution deployments. Shows deployment name, status, package version (current/target), pending operation, and folder path. --operation-status, --activation-status and --folder-path/--folder-key all filter server-side.").addOption(createHiddenDeprecatedTenantOption("-t, --tenant <tenant-name>")).option("--folder-path <path>", "Filter by the full path of the folder the deployment was installed into (e.g., 'Shared' or 'Shared/Finance'). Exact match, not case-sensitive; subfolders are not included.").option("--folder-key <key>", "Filter by the key (GUID) of the folder the deployment was installed into. Alternative to --folder-path.").option("-l, --limit <number>", "Max deployments to return", parseLimit, DEFAULT_PAGE_SIZE).option("--offset <number>", "Number of deployments to skip", parseOffset, 0).option("--sort-by <column>", "Column to sort by (default: startTime)", "startTime").option("--sort-order <direction>", "Sort direction: Ascending or Descending (default: Descending)", "Descending").option("--operation-status <statuses>", `Filter by deployment operation status, server-side (comma-separated). One or more of: ${OPERATION_STATUS_VALUES.join(", ")}.`).option("--activation-status <statuses>", `Filter by deployment activation status, server-side (comma-separated). One or more of: ${ACTIVATION_STATUS_VALUES.join(", ")}.`).option("--login-validity <minutes>", "Minimum minutes before token expiration to trigger a refresh (default: 10)", parseInt, 10);
   command.addOption(new Option("--feed <name-or-key>", "Only list deployments from this feed (name or folder key, from 'solution feeds list'). Mutually exclusive with --personal-workspace.").conflicts("personalWorkspace")).option("--personal-workspace", "Only list deployments from the current user's Personal Workspace feed.");
   command.examples(SOLUTION_DEPLOY_LIST_EXAMPLES).trackedAction(processContext, async (options) => {
     const operationStatus = parseStatusFilter(options.operationStatus, OPERATION_STATUS_VALUES, "--operation-status");
@@ -1137,7 +1201,10 @@ var registerDeployListCommand = (program) => {
       OutputFormatter.error({
         Result: RESULTS.Failure,
         Message: result.message,
-        Instructions: result.instructions
+        Instructions: result.instructions,
+        ErrorCode: result.errorCode,
+        Retry: result.retry,
+        ...result.context ? { Context: result.context } : {}
       });
       processContext.exit(result.exitCode);
       return;
@@ -1237,35 +1304,49 @@ var SOLUTION_DEPLOY_RUN_EXAMPLES = [
     }
   },
   {
-    Description: "Deploy a solution package into the current user's Personal Workspace",
-    Command: "uip solution deploy run --name my-deployment --package-name my-package --package-version 1.0.0 --folder-name MySolution --personal-workspace",
+    Description: "A deploy that succeeded but is not live: a resource needs 'Setup activation' in Orchestrator before the deployment can be activated (Result: Success; do not deploy again)",
+    Command: 'uip solution deploy run --name my-deployment --package-name my-package --package-version 1.0.0 --folder-name MySolution --parent-folder-path "Shared"',
     Output: {
       Code: "SolutionDeployRun",
       Data: {
-        Status: "DeploymentStarted",
-        DeploymentName: "my-deployment",
-        PackageName: "my-package",
-        PackageVersion: "1.0.0",
+        Status: "DeploymentSucceeded",
+        DeploymentKey: "a1b2c3d4-0000-0000-0000-000000000003",
+        PipelineDeploymentId: "b2c3d4e5-0000-0000-0000-000000000003",
+        InstanceId: null,
         FolderName: "MySolution",
-        FolderPath: "alice@uipath.com/MySolution",
-        ActivationStatus: "Auto",
-        NextSteps: "Deployment created in your Personal Workspace and will auto-activate. Check status with: uip solution deploy list."
+        FolderPath: "Shared/MySolution",
+        ActivationStatus: "NeedsSetupToActivate",
+        PendingResources: [
+          {
+            Kind: "connection",
+            Name: "Outlook",
+            Type: "uipath-microsoft-outlook365",
+            Reason: "[CNS1072] You will need to authenticate this connection before proceeding further"
+          }
+        ],
+        NextSteps: [
+          "Deployment 'my-deployment' is installed at version 1.0.0 but not live: it needs 'Setup activation' before it can be activated.",
+          "Resources that need configuration: connection 'Outlook' (uipath-microsoft-outlook365): [CNS1072] You will need to authenticate this connection before proceeding further."
+        ]
       }
     }
   },
   {
-    Description: "Deploy into the Personal Workspace and wait for the install to finish before returning",
-    Command: "uip solution deploy run --name my-deployment --package-name my-package --package-version 1.0.0 --folder-name MySolution --personal-workspace --wait",
+    Description: "Deploy a solution package into the current user's Personal Workspace",
+    Command: "uip solution deploy run --name my-deployment --package-name my-package --package-version 1.0.0 --folder-name MySolution --personal-workspace",
     Output: {
       Code: "SolutionDeployRun",
       Data: {
         Status: "DeploymentSucceeded",
-        DeploymentName: "my-deployment",
-        PackageName: "my-package",
-        PackageVersion: "1.0.0",
+        DeploymentKey: "a1b2c3d4-0000-0000-0000-000000000001",
+        PipelineDeploymentId: "b2c3d4e5-0000-0000-0000-000000000001",
+        InstanceId: "c3d4e5f6-0000-0000-0000-000000000001",
         FolderName: "MySolution",
         FolderPath: "alice@uipath.com/MySolution",
-        ActivationStatus: "Auto"
+        ActivationStatus: "SuccessfulActivate",
+        DeploymentName: "my-deployment",
+        PackageName: "my-package",
+        PackageVersion: "1.0.0"
       }
     }
   },
@@ -1292,20 +1373,22 @@ var SOLUTION_DEPLOY_RUN_FEED_EXAMPLE = {
   Output: {
     Code: "SolutionDeployRun",
     Data: {
-      Status: "DeploymentStarted",
-      DeploymentName: "my-deployment",
-      PackageName: "my-package",
-      PackageVersion: "1.0.0",
+      Status: "DeploymentSucceeded",
+      DeploymentKey: "a1b2c3d4-0000-0000-0000-000000000001",
+      PipelineDeploymentId: "b2c3d4e5-0000-0000-0000-000000000001",
+      InstanceId: "c3d4e5f6-0000-0000-0000-000000000001",
       FolderName: "MySolution",
       FolderPath: "Finance/MySolution",
-      ActivationStatus: "Auto",
-      NextSteps: "Deployment created in feed 'Finance' and will auto-activate. Check status with: uip solution deploy list."
+      ActivationStatus: "SuccessfulActivate",
+      DeploymentName: "my-deployment",
+      PackageName: "my-package",
+      PackageVersion: "1.0.0"
     }
   }
 };
 var registerDeployRunCommand = (program) => {
-  const command = program.command("run").description("Deploy a solution package to Orchestrator. Creates a folder, provisions resources, and (by default) activates the solution. This always creates a NEW deployment in a NEW folder — it never updates an existing one — so if the package is already deployed the command stops and points you at the upgrade path; pass --yes to deploy a second, separate copy anyway. Pass --skip-activate to leave the deployment in 'Inactive (Ready to activate)' state and activate later with 'deploy activate'. To customize resource settings before deploying, use 'config get' to fetch the default config, 'config set' / 'config link' to edit it, then pass it here with --config-file.").requiredOption("-n, --name <deployment-name>", "Name for the deployment").addOption(withCompleter(new Option("--package-name <name>", "Solution package name to deploy. Use 'solution packages list' to find available names.").makeOptionMandatory(), packageNameCompleter)).addOption(withCompleter(new Option("--package-version <version>", "Solution package version to deploy. Use 'solution packages list' to find available versions.").makeOptionMandatory(), packageVersionCompleter)).requiredOption("--folder-name <name>", "Name for the new Orchestrator folder created for this deployment (created under --parent-folder-path if specified)").addOption(new Option("--parent-folder-path <path>", "Parent folder path (e.g., 'Shared'). Solution folder is created under this.").conflicts("parentFolderKey")).option("--parent-folder-key <key>", "Parent folder key (GUID). Alternative to --parent-folder-path.").addOption(new Option("--personal-workspace", "Deploy into the current user's Personal Workspace. Resolves the workspace name from Orchestrator automatically. Mutually exclusive with --parent-folder-path and --parent-folder-key.").conflicts(["parentFolderPath", "parentFolderKey"])).option("--config-file <path>", "JSON or YAML configuration file. Generate with: uip solution deploy config get <name> -d config.json, then customize with 'config set' or 'config link'.").addOption(createHiddenDeprecatedTenantOption("-t, --tenant <tenant-name>")).option("--timeout <seconds>", "Timeout in seconds applied per polling phase — deploy and (when not skipped) activate (default: 360 each)", (v) => parseInt(v, 10), 360).option("--poll-interval <ms>", "Milliseconds between status polls during the deploy and activate phases (default: 5000)", (v) => parseInt(v, 10), 5000).option("--login-validity <minutes>", "Minimum minutes before token expiration to trigger a refresh (default: 10)", parseInt, 10).option("--wait", "Wait for a --personal-workspace / --feed deploy to finish instead of returning as soon as it starts. Bounded by --timeout. The tenant path always waits, so this changes nothing there.").option("--skip-activate", "Skip auto-activation; leave the deployment in 'Inactive (Ready to activate)' state. Activate later with 'uip solution deploy activate <name>'.").option("-y, --yes", "Deploy even when this package already has a deployment. Without it, deploy run looks the package up and stops if it is already deployed. That check is best-effort, not a guarantee: it reads the Solutions search, which needs a user session, so an application (client-credentials) login deploys without it, and a lookup failure only warns.");
-  command.addOption(new Option("--feed <name-or-key>", "Deploy a package from a specific feed (name or folder key, from 'solution feeds list') instead of the tenant feed. Mutually exclusive with --personal-workspace.").conflicts("personalWorkspace"));
+  const command = program.command("run").description("Deploy a solution package to Orchestrator. Creates a folder, provisions resources, and (by default) activates the solution. The deployment is keyed on --name: a name that does not exist yet gets a NEW deployment in a NEW folder (the normal case), while re-using an existing deployment's name updates that deployment in place — use 'deploy upgrade' when that is what you want. If the package is already deployed the command stops and points you at the upgrade path; pass --yes with a different --name to deploy a second, separate copy anyway. Pass --skip-activate to leave the deployment in 'Inactive (Ready to activate)' state and activate later with 'deploy activate'. A deployment whose resources need 'Setup activation' in Orchestrator is installed but not activated: the command reports Result: Success with ActivationStatus: NeedsSetupToActivate, the resources and the steps left — do not deploy it again. To customize resource settings before deploying, use 'config get' to fetch the default config, 'config set' / 'config link' to edit it, then pass it here with --config-file.").requiredOption("-n, --name <deployment-name>", "Name for the deployment").addOption(withCompleter(new Option("--package-name <name>", "Solution package name to deploy. Use 'solution packages list' to find available names.").makeOptionMandatory(), packageNameCompleter)).addOption(withCompleter(new Option("--package-version <version>", "Solution package version to deploy. Use 'solution packages list' to find available versions.").makeOptionMandatory(), packageVersionCompleter)).requiredOption("--folder-name <name>", "Name for the new Orchestrator folder created for this deployment (created under --parent-folder-path if specified)").addOption(new Option("--parent-folder-path <path>", "Parent folder path (e.g., 'Shared'). Solution folder is created under this.").conflicts("parentFolderKey")).option("--parent-folder-key <key>", "Parent folder key (GUID). Alternative to --parent-folder-path.").addOption(new Option("--personal-workspace", "Deploy into the current user's Personal Workspace. Resolves the workspace name from Orchestrator automatically; needs a user session (an external app has no workspace, and the server ignores the feed header on client-credentials requests). Mutually exclusive with --parent-folder-path and --parent-folder-key.").conflicts(["parentFolderPath", "parentFolderKey"])).option("--config-file <path>", "JSON or YAML configuration file. Generate with: uip solution deploy config get <name> -d config.json, then customize with 'config set' or 'config link'.").addOption(createHiddenDeprecatedTenantOption("-t, --tenant <tenant-name>")).option("--timeout <seconds>", "Timeout in seconds applied per polling phase — deploy and (when not skipped) activate (default: 360 each)", (v) => parseInt(v, 10), 360).option("--poll-interval <ms>", "Milliseconds between status polls during the deploy and activate phases (default: 5000)", (v) => parseInt(v, 10), 5000).option("--login-validity <minutes>", "Minimum minutes before token expiration to trigger a refresh (default: 10)", parseInt, 10).addOption(new Option("--wait", "Deprecated and ignored: every deploy now waits for the install to finish (bounded by --timeout).").hideHelp()).option("--skip-activate", "Skip auto-activation; leave the deployment in 'Inactive (Ready to activate)' state. Activate later with 'uip solution deploy activate <name>'.").option("-y, --yes", "Deploy even when this package already has a deployment. Without it, deploy run looks the package up and stops if it is already deployed. That check is best-effort, not a guarantee: a lookup failure only warns, and under an application (client-credentials) login it never stops the deploy — an existing deployment is reported as a warning, or the check is skipped on servers without the Pipelines deployment search. --yes only skips that check: the install is keyed on --name, so re-using an existing deployment's name updates that deployment in place rather than creating a second copy — pass a different --name for a separate deployment.");
+  command.addOption(new Option("--feed <name-or-key>", "Deploy a package from a specific feed (name or folder key, from 'solution feeds list') instead of the tenant feed. Needs a user session: the server ignores the feed header on client-credentials requests, so an external app is refused rather than deploying to the tenant feed by accident. Mutually exclusive with --personal-workspace.").conflicts("personalWorkspace"));
   command.examples([
     ...SOLUTION_DEPLOY_RUN_EXAMPLES,
     SOLUTION_DEPLOY_RUN_FEED_EXAMPLE
@@ -1321,7 +1404,6 @@ var registerDeployRunCommand = (program) => {
       personalWorkspace: options.personalWorkspace,
       feed: options.feed,
       configFile: options.configFile,
-      wait: options.wait,
       timeout: options.timeout,
       pollInterval: options.pollInterval,
       loginValidity: options.loginValidity,
@@ -1353,21 +1435,29 @@ var registerDeployRunCommand = (program) => {
         RequestedFolderName: result.requestedFolderName,
         FolderNote: result.requestedFolderName === undefined ? undefined : `Requested folder '${result.requestedFolderName}' already existed, so Orchestrator created '${result.folderName}' instead. Deploying cannot target a pre-existing folder; provision resources into '${result.folderPath}', or re-run with a free --folder-name.`,
         ActivationStatus: result.activationStatus,
+        ...result.pendingResources ? {
+          PendingResources: result.pendingResources.map((resource) => ({
+            Kind: resource.kind,
+            Name: resource.name,
+            Type: resource.type ?? null,
+            Reason: resource.reason ?? null
+          }))
+        } : {},
+        ...result.nextSteps ? { NextSteps: result.nextSteps } : {},
         DeploymentName: result.deploymentName,
         PackageName: result.packageName,
-        PackageVersion: result.packageVersion,
-        NextSteps: result.nextSteps
+        PackageVersion: result.packageVersion
       }
     });
     trackShipSucceeded({
-      ship_kind: "deploy",
-      target: result.feedKind === "personal" ? "personal_workspace_orchestrator" : result.feedKind === "folder" ? "folder_orchestrator" : "orchestrator",
-      project_type: "solution",
-      command_name: "uip.solution.deploy.run",
-      artifact_correlation_key: result.deploymentKey ?? result.pipelineDeploymentId ?? result.deploymentName,
-      deployment_key: result.deploymentKey,
-      package_name: options.packageName,
-      package_version: options.packageVersion
+      [ShipDimensions.ShipKind]: "deploy",
+      [ShipDimensions.Target]: result.feedKind === "personal" ? "personal_workspace_orchestrator" : result.feedKind === "folder" ? "folder_orchestrator" : "orchestrator",
+      [ShipDimensions.ProjectType]: "solution",
+      [CommandDimensions.CommandName]: "uip solution deploy run",
+      [ShipDimensions.ArtifactCorrelationKey]: result.deploymentKey ?? result.pipelineDeploymentId ?? result.deploymentName,
+      [ShipDimensions.DeploymentKey]: result.deploymentKey,
+      [ShipDimensions.PackageName]: options.packageName,
+      [ShipDimensions.PackageVersion]: options.packageVersion
     });
   });
 };
@@ -1375,7 +1465,66 @@ var registerDeployRunCommand = (program) => {
 // src/commands/deploy-status.ts
 var SOLUTION_DEPLOY_STATUS_EXAMPLES = [
   {
-    Description: "Check the status of a pipeline deployment",
+    Description: "Check a deployment by name: here one that is upgraded but not live",
+    Command: 'uip solution deploy status "my-deployment"',
+    Output: {
+      Code: "SolutionDeployment",
+      Data: {
+        DeploymentKey: "a1b2c3d4-0000-0000-0000-000000000002",
+        Superseded: false,
+        CurrentDeploymentKey: "a1b2c3d4-0000-0000-0000-000000000002",
+        InstallDeploymentKey: "a1b2c3d4-0000-0000-0000-000000000001",
+        Name: "my-deployment",
+        PackageName: "my-package",
+        PackageVersion: "2.0.0",
+        NewPackageVersionAvailable: null,
+        Operation: "VersionChange",
+        OperationStatus: "Successful",
+        DeploymentStatus: "SuccessfulInstall",
+        ActivationStatus: "NeedsSetupToActivate",
+        Actions: ["SetupActivation", "Uninstall", "Upgrade"],
+        PendingResources: [
+          {
+            Kind: "connection",
+            Name: "Outlook",
+            Type: "uipath-microsoft-outlook365",
+            Reason: "[CNS1072] You will need to authenticate this connection before proceeding further"
+          }
+        ],
+        NextSteps: [
+          "Deployment 'my-deployment' is installed at version 2.0.0 but not live: it needs 'Setup activation' before it can be activated.",
+          "Resources that need configuration: connection 'Outlook' (uipath-microsoft-outlook365): [CNS1072] You will need to authenticate this connection before proceeding further."
+        ]
+      }
+    }
+  },
+  {
+    Description: "Check a deployment key from deploy run or deploy list: here one an upgrade has superseded",
+    Command: "uip solution deploy status a1b2c3d4-0000-0000-0000-000000000001",
+    Output: {
+      Code: "SolutionDeployment",
+      Data: {
+        DeploymentKey: "a1b2c3d4-0000-0000-0000-000000000001",
+        Superseded: true,
+        CurrentDeploymentKey: "a1b2c3d4-0000-0000-0000-000000000002",
+        InstallDeploymentKey: "a1b2c3d4-0000-0000-0000-000000000001",
+        Name: "my-deployment",
+        PackageName: "my-package",
+        PackageVersion: "2.0.0",
+        NewPackageVersionAvailable: null,
+        Operation: "ActivationSetup",
+        OperationStatus: "Successful",
+        DeploymentStatus: "SuccessfulActivate",
+        ActivationStatus: "Active",
+        Actions: ["Uninstall", "Upgrade"],
+        NextSteps: [
+          "Key 'a1b2c3d4-0000-0000-0000-000000000001' is superseded: 'my-deployment' is now record 'a1b2c3d4-0000-0000-0000-000000000002' (ActivationSetup/Successful, version 2.0.0). Every operation creates a new record; use the current key from now on."
+        ]
+      }
+    }
+  },
+  {
+    Description: "Check the pipeline deployment run that deploy run started",
     Command: "uip solution deploy status b2c3d4e5-0000-0000-0000-000000000001",
     Output: {
       Code: "SolutionDeployStatus",
@@ -1392,10 +1541,32 @@ var SOLUTION_DEPLOY_STATUS_EXAMPLES = [
         }
       }
     }
+  },
+  {
+    Description: "Check a deployment key that lives in your Personal Workspace feed",
+    Command: "uip solution deploy status a1b2c3d4-0000-0000-0000-000000000003 --personal-workspace",
+    Output: {
+      Code: "SolutionDeployment",
+      Data: {
+        DeploymentKey: "a1b2c3d4-0000-0000-0000-000000000003",
+        Superseded: false,
+        CurrentDeploymentKey: "a1b2c3d4-0000-0000-0000-000000000003",
+        InstallDeploymentKey: "a1b2c3d4-0000-0000-0000-000000000003",
+        Name: "my-deployment",
+        PackageName: "my-package",
+        PackageVersion: "1.0.0",
+        NewPackageVersionAvailable: null,
+        Operation: "Install",
+        OperationStatus: "Successful",
+        DeploymentStatus: "SuccessfulActivate",
+        ActivationStatus: "Active",
+        Actions: ["Uninstall", "Upgrade"]
+      }
+    }
   }
 ];
 var registerDeployStatusCommand = (program) => {
-  program.command("status").description("Check the current status of a pipeline deployment. Returns deployment state, progress, and any errors.").argument("<pipeline-deployment-id>", "Pipeline deployment ID (GUID) returned by 'solution deploy run'.").addOption(createHiddenDeprecatedTenantOption("-t, --tenant <tenant-name>")).option("--login-validity <minutes>", "Minimum minutes before token expiration to trigger a refresh (default: 10)", parseInt, 10).examples(SOLUTION_DEPLOY_STATUS_EXAMPLES).trackedAction(processContext, async (pipelineDeploymentId, options) => {
+  program.command("status").description("Check the state of a deployment by name, or by a deployment key from 'solution deploy list' / 'solution deploy upgrade': operation, activation status, and what is left to do before it runs. Also takes the pipeline deployment ID from 'solution deploy run' for that run's progress and errors.").argument("<deployment>", "Deployment name (preferred). A deployment key from 'solution deploy list' / 'solution deploy upgrade', or the pipeline deployment ID from 'solution deploy run', works as well. A key is resolved through the Pipelines deployment lookup, which spans every feed and answers a superseded key with the deployment's current record.").addOption(createHiddenDeprecatedTenantOption("-t, --tenant <tenant-name>")).option("--login-validity <minutes>", "Minimum minutes before token expiration to trigger a refresh (default: 10)", parseInt, 10).addOption(new Option("--feed <name-or-key>", "For a deployment name: the feed to look it up in (name or folder key, from 'solution feeds list'). For a key: read only on a server without the Pipelines by-key lookup, whose read is feed-scoped; the lookup itself spans every feed and answers the key wherever it lives. Mutually exclusive with --personal-workspace.").conflicts("personalWorkspace")).option("--personal-workspace", "For a deployment name: look it up in your Personal Workspace feed instead of the tenant. For a key: read only on a server without the Pipelines by-key lookup; the lookup itself spans every feed.").examples(SOLUTION_DEPLOY_STATUS_EXAMPLES).trackedAction(processContext, async (deployment, options) => {
     const [authError, auth] = await catchError(getSolutionAuthContext({
       tenant: options.tenant,
       loginValidity: options.loginValidity
@@ -1409,20 +1580,106 @@ var registerDeployStatusCommand = (program) => {
       processContext.exit(1);
       return;
     }
+    const { feedScopeInitOverride: feedScopeInitOverride2 } = await import("./feed-resolver-dmtnswcc.js");
+    const { FeedReadRefusedError, feedReadRefusalForApplication } = await import("./feed-session-sxga31vn.js");
+    const refuseFeed = (action) => {
+      const refusal = feedReadRefusalForApplication(auth, action);
+      if (!refusal) {
+        return false;
+      }
+      OutputFormatter.error({
+        Result: RESULTS.Failure,
+        Message: refusal.message,
+        Instructions: refusal.instructions,
+        ErrorCode: "permission_denied",
+        Retry: "RetryWillNotFix"
+      });
+      processContext.exit(1);
+      return true;
+    };
+    if (options.personalWorkspace === true && refuseFeed("Reading a Personal Workspace deployment")) {
+      return;
+    }
+    const { resolveFeedScopeOrFailureAsync: resolveFeedScopeOrFailureAsync2 } = await import("./feed-scope-failure-e2yaqfg2.js");
+    const [scopeFailure, feedScope] = await resolveFeedScopeOrFailureAsync2(options, auth);
+    if (scopeFailure) {
+      OutputFormatter.error(scopeFailure);
+      processContext.exit(1);
+      return;
+    }
+    const { describeDeploymentAsync, looksLikeDeploymentKey } = await import("./deploy-status-service-nmhnnjmy.js");
+    if (feedScope.kind !== "tenant" && !looksLikeDeploymentKey(deployment) && refuseFeed(`Reading a deployment in the feed '${feedScope.name ?? feedScope.folderKey}'`)) {
+      return;
+    }
+    const feedSelected = options.personalWorkspace === true || options.feed !== undefined;
+    const describe = () => describeDeploymentAsync(auth, deployment, {
+      selectedFeed: feedSelected ? feedScope : undefined,
+      locate: {
+        tenant: options.tenant,
+        loginValidity: options.loginValidity
+      }
+    });
+    if (!looksLikeDeploymentKey(deployment)) {
+      const [stateError, state] = await catchError(describe());
+      if (stateError) {
+        await reportStateError(deployment, stateError);
+        return;
+      }
+      if (!state) {
+        OutputFormatter.error({
+          Result: RESULTS.Failure,
+          Message: `Deployment '${deployment}' was not found.`,
+          Instructions: "No deployment of that name is visible in the feeds this session can reach. Run 'uip solution deploy list' to see the names; add --personal-workspace or --feed <name-or-key> for a feed outside the tenant."
+        });
+        processContext.exit(1);
+        return;
+      }
+      OutputFormatter.success({
+        Result: RESULTS.Success,
+        Code: "SolutionDeployment",
+        Data: deploymentStateData(state)
+      });
+      return;
+    }
     const configuration = new Configuration({
       basePath: auth.basePath,
       accessToken: auth.accessToken
     });
     const api = new PipelinesApi(configuration);
-    const [statusError, result] = await catchError(api.pipelinesGetPipelineDeploymentStatus({
-      pipelineDeploymentId
-    }));
+    const [statusError, result] = await catchError(api.pipelinesGetPipelineDeploymentStatus({ pipelineDeploymentId: deployment }, feedSelected ? feedScopeInitOverride2(feedScope) : undefined));
     if (statusError) {
+      const { isPipelineDeploymentNotFoundError } = await import("./deployment-search-eb337bjh.js");
+      if (await isPipelineDeploymentNotFoundError(statusError)) {
+        const [stateError, state] = await catchError(describe());
+        if (stateError instanceof FeedReadRefusedError) {
+          OutputFormatter.error({
+            Result: RESULTS.Failure,
+            Message: stateError.refusal.message,
+            Instructions: stateError.refusal.instructions,
+            ErrorCode: "permission_denied",
+            Retry: "RetryWillNotFix"
+          });
+          processContext.exit(1);
+          return;
+        }
+        if (stateError) {
+          await reportStateError(deployment, stateError);
+          return;
+        }
+        if (state) {
+          OutputFormatter.success({
+            Result: RESULTS.Success,
+            Code: "SolutionDeployment",
+            Data: deploymentStateData(state)
+          });
+          return;
+        }
+      }
       const { message, details } = await extractErrorDetails(statusError);
       OutputFormatter.error({
         Result: RESULTS.Failure,
         Message: message,
-        Instructions: `Check the pipeline deployment ID. Get it from deploy run output. Details: ${details}`
+        Instructions: `Check the pipeline deployment ID (from 'deploy run' output) or the deployment key (from 'deploy list' / 'deploy upgrade'); a deployment name works too. A deployment outside the tenant feed needs --personal-workspace or --feed. Details: ${details}`
       });
       processContext.exit(1);
       return;
@@ -1433,7 +1690,7 @@ var registerDeployStatusCommand = (program) => {
       Result: RESULTS.Success,
       Code: "SolutionDeployStatus",
       Data: {
-        PipelineDeploymentId: pipelineDeploymentId,
+        PipelineDeploymentId: deployment,
         Status: result.status,
         DeploymentKey: result.deploymentKey,
         ConfigurationKey: result.configurationKey,
@@ -1451,6 +1708,44 @@ var registerDeployStatusCommand = (program) => {
     });
   });
 };
+async function reportStateError(deployment, stateError) {
+  const { message, details } = await extractErrorDetails(stateError);
+  OutputFormatter.error({
+    Result: RESULTS.Failure,
+    Message: message,
+    Instructions: carriedInstructions(stateError) ?? `The deployments service could not read deployment '${deployment}'. Details: ${details}`,
+    ErrorCode: carriedErrorCode(stateError),
+    Retry: carriedRetry(stateError)
+  });
+  processContext.exit(1);
+}
+function deploymentStateData(state) {
+  const { current } = state;
+  return {
+    DeploymentKey: state.requestedKey,
+    Superseded: state.superseded,
+    CurrentDeploymentKey: current.key,
+    InstallDeploymentKey: current.installDeploymentKey,
+    Name: current.name,
+    PackageName: current.packageName,
+    PackageVersion: current.currentPackageVersion ?? current.packageVersion,
+    NewPackageVersionAvailable: current.newPackageVersionAvailable ?? null,
+    Operation: current.operation,
+    OperationStatus: current.operationStatus,
+    DeploymentStatus: current.deploymentStatus ?? null,
+    ActivationStatus: current.activationStatus ?? null,
+    Actions: current.actions ?? null,
+    ...state.pendingResources ? {
+      PendingResources: state.pendingResources.map((resource) => ({
+        Kind: resource.kind,
+        Name: resource.name,
+        Type: resource.type ?? null,
+        Reason: resource.reason ?? null
+      }))
+    } : {},
+    ...state.nextSteps ? { NextSteps: state.nextSteps } : {}
+  };
+}
 
 // src/commands/deploy-uninstall.ts
 var SOLUTION_DEPLOY_UNINSTALL_EXAMPLES = [
@@ -1528,50 +1823,147 @@ var registerDeployUninstallCommand = (program) => {
 // src/commands/deploy-upgrade.ts
 var SOLUTION_DEPLOY_UPGRADE_EXAMPLES = [
   {
-    Description: "Upgrade a deployment to the newest published version",
-    Command: "uip solution deploy upgrade a1b2c3d4-0000-0000-0000-000000000001",
+    Description: "Upgrade a deployment by its key to the newest published version (name, package and feed are read from the deployment)",
+    Command: "uip solution deploy upgrade c3d4e5f6-0000-0000-0000-000000000003",
     Output: {
       Code: "SolutionDeployUpgrade",
       Data: {
-        Status: "Successful",
-        DeploymentName: "billing-solution",
-        FromVersion: "1.0.0",
+        Status: "DeploymentSucceeded",
+        Operation: "VersionChange",
+        DeploymentStatus: "SuccessfulActivate",
+        Actions: ["Uninstall", "Upgrade"],
+        DeploymentName: "my-deployment",
+        FromVersion: "1.5.0",
+        ToVersion: "2.0.0",
+        PipelineDeploymentId: "b2c3d4e5-0000-0000-0000-000000000002",
+        DeploymentKey: "d4e5f6a7-0000-0000-0000-000000000004",
+        InstallDeploymentKey: "c3d4e5f6-0000-0000-0000-000000000003"
+      }
+    }
+  },
+  {
+    Description: "An upgrade that succeeded but is not live: a resource needs setup before activation",
+    Command: "uip solution deploy upgrade c3d4e5f6-0000-0000-0000-000000000003",
+    Output: {
+      Code: "SolutionDeployUpgrade",
+      Data: {
+        Status: "DeploymentSucceeded",
+        Operation: "VersionChange",
+        DeploymentStatus: "SuccessfulInstall",
+        Actions: ["SetupActivation", "Uninstall", "Upgrade"],
+        ActivationStatus: "NeedsSetupToActivate",
+        PendingResources: [
+          {
+            Kind: "connection",
+            Name: "Outlook",
+            Type: "uipath-microsoft-outlook365",
+            Reason: "[CNS1072] You will need to authenticate this connection before proceeding further"
+          }
+        ],
+        NextSteps: [
+          "Deployment 'my-deployment' is installed at version 2.0.0 but not live: it needs 'Setup activation' before it can be activated.",
+          "Resources that need configuration: connection 'Outlook' (uipath-microsoft-outlook365): [CNS1072] You will need to authenticate this connection before proceeding further."
+        ],
+        DeploymentName: "my-deployment",
+        FromVersion: "1.5.0",
+        ToVersion: "2.0.0",
+        PipelineDeploymentId: "b2c3d4e5-0000-0000-0000-000000000002",
+        DeploymentKey: "d4e5f6a7-0000-0000-0000-000000000004",
+        InstallDeploymentKey: "c3d4e5f6-0000-0000-0000-000000000003"
+      }
+    }
+  },
+  {
+    Description: "Upgrade a deployment by name to the newest published version",
+    Command: "uip solution deploy upgrade --name my-deployment --package-name my-package",
+    Output: {
+      Code: "SolutionDeployUpgrade",
+      Data: {
+        Status: "DeploymentSucceeded",
+        Operation: "VersionChange",
+        DeploymentStatus: "SuccessfulActivate",
+        Actions: ["Uninstall", "Upgrade"],
+        DeploymentName: "my-deployment",
         ToVersion: "2.0.0",
-        VersionChangeKey: "b2c3d4e5-0000-0000-0000-000000000002"
+        PipelineDeploymentId: "b2c3d4e5-0000-0000-0000-000000000002",
+        DeploymentKey: "c3d4e5f6-0000-0000-0000-000000000003"
+      }
+    }
+  },
+  {
+    Description: "Upgrade to a specific published version (the CI/CD form: no version lookup, one existence check and the install)",
+    Command: "uip solution deploy upgrade --name my-deployment --package-name my-package --version 1.5.0",
+    Output: {
+      Code: "SolutionDeployUpgrade",
+      Data: {
+        Status: "DeploymentSucceeded",
+        Operation: "VersionChange",
+        DeploymentStatus: "SuccessfulActivate",
+        Actions: ["Uninstall", "Upgrade"],
+        DeploymentName: "my-deployment",
+        ToVersion: "1.5.0",
+        PipelineDeploymentId: "b2c3d4e5-0000-0000-0000-000000000002",
+        DeploymentKey: "c3d4e5f6-0000-0000-0000-000000000003"
       }
     }
   },
   {
     Description: "Start the upgrade without waiting for it to finish",
-    Command: "uip solution deploy upgrade a1b2c3d4-0000-0000-0000-000000000001 --no-wait",
+    Command: "uip solution deploy upgrade --name my-deployment --package-name my-package --no-wait",
     Output: {
       Code: "SolutionDeployUpgrade",
       Data: {
-        Status: "Draft",
-        DeploymentName: "billing-solution",
-        FromVersion: "1.0.0",
+        Status: "Accepted",
+        DeploymentName: "my-deployment",
         ToVersion: "2.0.0",
-        VersionChangeKey: "b2c3d4e5-0000-0000-0000-000000000002"
+        PipelineDeploymentId: "b2c3d4e5-0000-0000-0000-000000000002"
+      }
+    }
+  },
+  {
+    Description: "Discard the pending draft an earlier, rejected attempt left behind, then upgrade the live version",
+    Command: "uip solution deploy upgrade c3d4e5f6-0000-0000-0000-000000000003 --version 2.0.0 --discard-draft",
+    Output: {
+      Code: "SolutionDeployUpgrade",
+      Data: {
+        Status: "DeploymentSucceeded",
+        Operation: "VersionChange",
+        DeploymentStatus: "SuccessfulActivate",
+        Actions: ["Uninstall", "Upgrade"],
+        DeploymentName: "my-deployment",
+        FromVersion: "1.5.0",
+        ToVersion: "2.0.0",
+        PipelineDeploymentId: "b2c3d4e5-0000-0000-0000-000000000005",
+        DeploymentKey: "d4e5f6a7-0000-0000-0000-000000000006",
+        InstallDeploymentKey: "c3d4e5f6-0000-0000-0000-000000000003",
+        DiscardedDraftKey: "e5f6a7b8-0000-0000-0000-000000000007"
       }
     }
   }
 ];
 var registerDeployUpgradeCommand = (program) => {
-  program.command("upgrade").description("Upgrade an existing deployment to a newer package version in place — the CLI equivalent of the Orchestrator UI 'Upgrade' button. Use this when 'deploy run' is blocked because a deployment already exists. The deployment's existing configuration is preserved, so values already set on it (for example a credential asset's secret) are not reset to the package defaults. Waits for the upgrade to finish unless --no-wait is passed.").argument("<deployment-key>", "Key of the deployment to upgrade. Use 'solution deploy list' to find it.").addOption(createHiddenDeprecatedTenantOption("-t, --tenant <tenant-name>")).option("--version <version>", "Target package version (default: the newest available). Only the latest published version is supported today.").option("--personal-workspace", "Upgrade a deployment in your Personal Workspace feed instead of the tenant.").option("--login-validity <minutes>", "Minimum minutes before token expiration to trigger a refresh (default: 10)", parseInt, 10).option("--no-wait", "Return as soon as the upgrade is accepted instead of waiting for it to finish.").option("--timeout <seconds>", "Seconds to wait for the upgrade to finish (default: 300)", (v) => parseInt(v, 10), 300).option("--poll-interval <ms>", "Milliseconds between status polls (default: 5000)", (v) => parseInt(v, 10), 5000).examples(SOLUTION_DEPLOY_UPGRADE_EXAMPLES).trackedAction(processContext, async (deploymentKey, options) => {
-    const result = await upgradeDeploymentAsync(deploymentKey, {
+  program.command("upgrade").description("Upgrade an existing deployment to another published version of its package in place — the CLI equivalent of the Orchestrator UI 'Upgrade' button. Use this when 'deploy run' is blocked because a deployment already exists. The deployment's existing configuration is preserved, so values already set on it (for example a credential asset's secret) are not reset to the package defaults. The package is validated against the target before anything is installed; a validation failure reports the errors and leaves the deployment on its current version. Address the deployment either by key (positional) or by --name with --package-name. Every call this command makes is an external-app (client-credentials) capable Pipelines endpoint, so both forms work from a CI/CD pipeline (on a server that predates the Pipelines deployment lookup, the key form falls back to the Solutions API for a user session); a deployment in a Personal Workspace or folder feed needs a user session, because the server ignores the feed header on client-credentials requests. Waits for the upgrade to finish unless --no-wait is passed; track a running upgrade with 'deploy status <pipeline-deployment-id>'.").argument("[deployment-key]", "Key of the deployment to upgrade, as 'solution deploy list' reports it (Key), or a stored InstallDeploymentKey. Resolved through the Pipelines deployment lookup: the deployment's name, package, current version and feed come from the server, so --package-name and --personal-workspace are not needed. On a server without that lookup, a user session reads the key through the Solutions API instead, where a Personal Workspace deployment needs --personal-workspace. Use either this or --name with --package-name.").option("-n, --name <deployment-name>", "Name of the deployment to upgrade, as reported by 'solution deploy list'. Goes with --package-name. The name is checked to exist first, because the install route would create a new deployment for a name it cannot find; this form never does.").option("--package-name <name>", "The deployment's package, for the --name form. Required there: it identifies the package version to install, and nothing name-keyed in Pipelines reports it.").addOption(createHiddenDeprecatedTenantOption("-t, --tenant <tenant-name>")).option("--version <version>", "Target package version (default: the newest published). Any published version of the same package is accepted, including an older one.").option("--personal-workspace", "With --name: upgrade a deployment in your Personal Workspace feed instead of the tenant. With a key the feed is read from the deployment itself and this flag is not needed, except on a server without the Pipelines deployment lookup, where a key is read on the tenant feed unless you pass it.").option("--discard-draft", "When the deployment has a pending draft (an earlier attempt that never completed, usually one rejected by validation), discard it first and upgrade the live version. Without it such a deployment is refused, because the server would re-run the draft, with the configuration it was rejected for, in place of this upgrade. With --name the draft is found through a user session only; under an external app, pass the deployment key.").option("--login-validity <minutes>", "Minimum minutes before token expiration to trigger a refresh (default: 10)", parseInt, 10).option("--no-wait", "Return as soon as the upgrade is accepted instead of waiting for it to finish.").option("--timeout <seconds>", "Seconds to wait for the upgrade to finish (default: 300)", (v) => parseInt(v, 10), 300).option("--poll-interval <ms>", "Milliseconds between status polls (default: 5000)", (v) => parseInt(v, 10), 5000).examples(SOLUTION_DEPLOY_UPGRADE_EXAMPLES).trackedAction(processContext, async (deploymentKey, options) => {
+    const result = await upgradeDeploymentAsync({
+      deploymentKey,
+      deploymentName: options.name,
+      packageName: options.packageName,
       tenant: options.tenant,
       version: options.version,
       personalWorkspace: options.personalWorkspace,
+      discardDraft: options.discardDraft,
       loginValidity: options.loginValidity,
       noWait: options.wait === false,
       timeout: options.timeout,
-      pollInterval: options.pollInterval
+      pollInterval: options.pollInterval,
+      signal: processContext.pollSignal
     });
     if (!result.ok) {
       OutputFormatter.error({
         Result: RESULTS.Failure,
         Message: result.message,
-        Instructions: result.instructions
+        Instructions: result.instructions,
+        ErrorCode: result.errorCode,
+        Retry: result.retry
       });
       processContext.exit(result.exitCode);
       return;
@@ -1581,10 +1973,26 @@ var registerDeployUpgradeCommand = (program) => {
       Code: "SolutionDeployUpgrade",
       Data: {
         Status: result.status,
+        Operation: result.operation,
+        DeploymentStatus: result.deploymentStatus,
+        Actions: result.actions,
+        ActivationStatus: result.activationStatus,
+        ...result.pendingResources ? {
+          PendingResources: result.pendingResources.map((resource) => ({
+            Kind: resource.kind,
+            Name: resource.name,
+            Type: resource.type ?? null,
+            Reason: resource.reason ?? null
+          }))
+        } : {},
+        ...result.nextSteps ? { NextSteps: result.nextSteps } : {},
         DeploymentName: result.deploymentName,
         FromVersion: result.fromVersion,
         ToVersion: result.toVersion,
-        VersionChangeKey: result.versionChangeKey
+        PipelineDeploymentId: result.pipelineDeploymentId,
+        DeploymentKey: result.deploymentKey,
+        InstallDeploymentKey: result.installDeploymentKey,
+        DiscardedDraftKey: result.discardedDraftKey
       }
     });
   });
@@ -1592,12 +2000,13 @@ var registerDeployUpgradeCommand = (program) => {
 
 // src/commands/deploy.ts
 var registerDeployCommand = (program) => {
-  const deploy = program.command("deploy").description("Deploy, activate, uninstall, and monitor solution deployments. Typical workflow: run -> check status -> (optionally) activate -> uninstall.");
+  const deploy = program.command("deploy").description("Deploy, activate, uninstall, and monitor solution deployments. Typical workflow: run -> check status -> (optionally) activate -> uninstall -> delete.");
   registerDeployRunCommand(deploy);
   registerDeployStatusCommand(deploy);
   registerDeployConfigCommand(deploy);
   registerDeployActivateCommand(deploy);
   registerDeployUninstallCommand(deploy);
+  registerDeployDeleteCommand(deploy);
   registerDeployListCommand(deploy);
   registerDeployUpgradeCommand(deploy);
 };
@@ -2043,7 +2452,7 @@ var SOLUTION_PACK_EXAMPLES = [
   }
 ];
 var registerPackCommand = (program) => {
-  const command = program.command("pack").description("Pack a UiPath solution into a deployable .zip package. Accepts a solution directory (containing .uipx) or a .uis file. Output is used with 'solution publish' to upload to UiPath. Pass --dry-run to check that the solution packs without producing a package.").argument("<solutionPath>", "Path to a solution directory (containing .uipx) or a .uis file").argument("[output-path]", "Output directory where the packed solution will be saved. Required unless --dry-run is set.").option("-n, --name <name>", "Package name (default: solution folder name or .uis file name)").option("-v, --version <version>", "Package version (default: 1.0.0)", "1.0.0").addOption(new Option("--solution-type <type>", "What kind of solution this is. Omitted by default, which means a standard solution.").choices(["standard", "vertical"]).hideHelp()).option("--nuget-sources-config-path <path>", "Path to NuGet sources configuration file").option("--exclude-configured-sources", "Resolve project dependencies only from the tenant feeds and any --nuget-sources-config-path. Drops the built-in UiPath and nuget.org feeds, so a dependency that is not on those feeds fails to restore.").option("--feed-folder <name>", "Resolve project dependencies from this Orchestrator folder's library feed instead of every tenant feed. Accepts a folder name or fully qualified path.").option("--signing-certificate-path <path>", "Path to .pfx certificate file used to sign each packed project .nupkg").option("--signing-certificate-password <password>", "Certificate password. Use env.ENV_NAME to read from an environment variable.").option("--signing-timestamp-server <url>", "Timestamp server URL").option("--skip-analyze", "Skip the workflow analyzer for every RPA project in the solution. Compilation and validation still run.").option("--governance-file-path <path>", "Analyze every RPA project against this local governance policy file, instead of the analyzer rules shipped with the WorkflowCompiler. When you are signed in the tenant is asked first — about StudioWeb unless --governance-product names another product — and this file is refused if the tenant publishes a policy of its own.").option("--governance-product <product>", "Analyze every RPA project against the governance policy published in AutomationOps for the signed-in tenant. The value is the product whose policy is downloaded, e.g. StudioWeb, Development, Business.").addOption(new Option("--automation-ops-profile <profile>").hideHelp());
+  const command = program.command("pack").description("Pack a UiPath solution into a deployable .zip package. Accepts a solution directory (containing .uipx) or a .uis file. Output is used with 'solution publish' to upload to UiPath. Pass --dry-run to check that the solution packs without producing a package.").argument("<solutionPath>", "Path to a solution directory (containing .uipx) or a .uis file").argument("[output-path]", "Output directory where the packed solution will be saved. Required unless --dry-run is set.").option("-n, --name <name>", "Package name (default: solution folder name or .uis file name)").option("-v, --version <version>", "Package version (default: 1.0.0)", "1.0.0").addOption(new Option("--solution-type <type>", "What kind of solution this is. Omitted by default, which means a standard solution.").choices(["standard", "vertical"]).hideHelp()).option("--nuget-sources-config-path <path>", "Path to NuGet sources configuration file").option("--exclude-configured-sources", "Resolve project dependencies only from the tenant feeds and any --nuget-sources-config-path. Drops the built-in UiPath and nuget.org feeds, so a dependency that is not on those feeds fails to restore.").option("--feed-folder <name>", "Resolve project dependencies from this Orchestrator folder's library feed instead of every tenant feed. Accepts a folder name or fully qualified path.").option("--signing-certificate-path <path>", "Path to .pfx certificate file used to sign each packed project .nupkg").option("--signing-certificate-password <password>", "Certificate password. Use env.ENV_NAME to read from an environment variable.").option("--signing-timestamp-server <url>", "Timestamp server URL").option("--skip-analyze", "Skip the workflow analyzer for every RPA project in the solution. Compilation and validation still run.").option("--governance-file-path <path>", "Analyze every RPA project against this local governance policy file, instead of the analyzer rules shipped with the WorkflowCompiler. When you are signed in the tenant is asked first — about StudioWeb unless --governance-product names another product — and when the tenant publishes a policy of its own, that policy is used instead and this file is ignored with a warning.").option("--governance-product <product>", "Analyze every RPA project against the governance policy published in AutomationOps for the signed-in tenant. The value is the product whose policy is downloaded, e.g. StudioWeb, Development, Business.").addOption(new Option("--automation-ops-profile <profile>").hideHelp());
   registerPackageMetadataOptions(command).option("--login-validity <minutes>", "Minimum minutes before token expiration to trigger a refresh (default: 10)", parseInt, 10).option("--dry-run", "Run the full pack pipeline against a temporary directory and discard the output. Catches pack-time failures; does not inspect the produced package contents.").examples(SOLUTION_PACK_EXAMPLES).trackedAction(processContext, async (solutionPath, outputPath, options) => {
     if (!options.dryRun && outputPath === undefined) {
       OutputFormatter.error({
@@ -2122,16 +2531,6 @@ var SOLUTION_PACKAGES_DELETE_EXAMPLES = [
     }
   }
 ];
-var SEARCH_PAGE_SIZE = 50;
-function scopeName(scope) {
-  if (scope.kind === "tenant") {
-    return "the tenant feed";
-  }
-  if (scope.name) {
-    return `'${scope.name}'`;
-  }
-  return scope.kind === "personal" ? "the Personal Workspace feed" : "the selected feed";
-}
 function packageDeleteFailureInstructions(scope, packageName) {
   const base = "Check that the package name and version are correct and that you have permission to delete it.";
   if (scope.kind === "personal") {
@@ -2142,70 +2541,12 @@ function packageDeleteFailureInstructions(scope, packageName) {
   }
   return `${base} If the package was published to a Personal Workspace or folder feed, add --personal-workspace or --feed.`;
 }
-async function resolvePackageVersionKey(auth, scope, packageName, packageVersion) {
-  const config = new Configuration2({
-    basePath: auth.basePath,
-    accessToken: auth.accessToken
-  });
-  const searchApi = new SearchApi(config);
-  const pkg = await findPackage(searchApi, scope, packageName);
-  if (pkg.latestVersion === packageVersion) {
-    return pkg.packageVersionKey;
-  }
-  for (let skip = 0;; ) {
-    const page = await searchPackageVersions({ basePath: auth.basePath, accessToken: auth.accessToken }, pkg.key, {
-      searchTerm: packageVersion,
-      take: SEARCH_PAGE_SIZE,
-      skip,
-      excludeInvalidPackages: true
-    }, scope.folderKey);
-    const match = page.values.find((version) => version.version === packageVersion);
-    if (match) {
-      return match.key;
-    }
-    if (page.values.length < SEARCH_PAGE_SIZE) {
-      throw new Error(`Package version '${packageName}@${packageVersion}' was not found in ${scopeName(scope)}.`);
-    }
-    skip += page.values.length;
-  }
-}
-async function findPackage(searchApi, scope, packageName) {
-  for (let skip = 0;; ) {
-    const packages = await searchApi.searchSearchPackages({
-      searchFilter: {
-        searchTerm: packageName,
-        take: SEARCH_PAGE_SIZE,
-        skip
-      }
-    }, feedScopeInitOverride(scope));
-    const values = packages.values ?? [];
-    const match = values.find((pkg) => pkg.name === packageName);
-    if (match) {
-      return match;
-    }
-    if (values.length < SEARCH_PAGE_SIZE) {
-      throw new Error(`Package '${packageName}' was not found in ${scopeName(scope)}.`);
-    }
-    skip += values.length;
-  }
-}
-async function deleteTenantPackageVersion(auth, packageName, packageVersion) {
+async function deletePackageVersion(auth, scope, packageName, packageVersion) {
   const api = new PipelinesApi(new Configuration({
     basePath: auth.basePath,
     accessToken: auth.accessToken
   }));
-  await api.pipelinesPackageDelete({
-    packageName,
-    packageVersion
-  });
-}
-async function deleteScopedPackageVersion(auth, scope, packageName, packageVersion) {
-  const packageVersionKey = await resolvePackageVersionKey(auth, scope, packageName, packageVersion);
-  const packagesApi = new PackagesApi(new Configuration2({
-    basePath: auth.basePath,
-    accessToken: auth.accessToken
-  }));
-  await packagesApi.packagesDeleteVersion({ packageVersionKey }, feedScopeInitOverride(scope));
+  await api.pipelinesPackageDelete({ packageName, packageVersion }, feedScopeInitOverride(scope));
 }
 var registerPackagesDeleteCommand = (program) => {
   const command = program.command("delete").description("Delete a specific version of a solution package. " + "Use 'solution packages list' to find available package names and versions.").argument("<package-name>", "The name of the package").argument("<package-version>", "The version to delete (e.g. 1.0.0)").addOption(createHiddenDeprecatedTenantOption("-t, --tenant <tenant-name>")).option("--login-validity <minutes>", "Minimum minutes before token expiration to trigger a refresh (default: 10)", parseInt, 10).option("-y, --yes", "Confirm this irreversible operation (required; the CLI never prompts)").option("--personal-workspace", "Delete the package version from the current user's Personal Workspace feed.");
@@ -2227,22 +2568,13 @@ var registerPackagesDeleteCommand = (program) => {
       processContext.exit(1);
       return;
     }
-    const [scopeError, scope] = await catchError(resolveFeedScope({
-      personalWorkspace: options.personalWorkspace,
-      feed: options.feed,
-      tenant: options.tenant,
-      loginValidity: options.loginValidity
-    }));
-    if (scopeError) {
-      OutputFormatter.error({
-        Result: RESULTS.Failure,
-        Message: scopeError.message,
-        Instructions: feedResolutionFailureInstructions(options)
-      });
+    const [scopeFailure, scope] = await resolveFeedScopeOrFailureAsync(options, auth);
+    if (scopeFailure) {
+      OutputFormatter.error(scopeFailure);
       processContext.exit(1);
       return;
     }
-    const [deleteError] = await catchError(scope.kind === "tenant" ? deleteTenantPackageVersion(auth, packageName, packageVersion) : deleteScopedPackageVersion(auth, scope, packageName, packageVersion));
+    const [deleteError] = await catchError(deletePackageVersion(auth, scope, packageName, packageVersion));
     if (deleteError) {
       const { message } = await extractErrorDetails(deleteError);
       OutputFormatter.error({
@@ -2461,9 +2793,9 @@ var SOLUTION_PACKAGES_LIST_EXAMPLES = [
       Code: "SolutionPackagesList",
       Data: [
         {
-          packageName: "MyPackage",
-          packageVersion: "1.0.0",
-          publishDate: "2025-04-15T10:30:00Z"
+          Name: "MyPackage",
+          LatestVersion: "1.0.0",
+          PublishDate: "2025-04-15T10:30:00Z"
         }
       ]
     }
@@ -2488,7 +2820,10 @@ var registerPackagesListCommand = (program) => {
       OutputFormatter.error({
         Result: RESULTS.Failure,
         Message: result.message,
-        Instructions: result.instructions
+        Instructions: result.instructions,
+        ErrorCode: result.errorCode,
+        Retry: result.retry,
+        ...result.context ? { Context: result.context } : {}
       });
       processContext.exit(result.exitCode);
       return;
@@ -3129,12 +3464,12 @@ var registerProjectPublishCommand = (project) => {
       return;
     }
     trackShipSucceeded({
-      ship_kind: "publish",
-      target: "solution_package_feed",
-      project_type: "solution_project",
-      command_name: "uip.solution.projects.publish",
-      package_name: options.packageName,
-      package_version: options.packageVersion
+      [ShipDimensions.ShipKind]: "publish",
+      [ShipDimensions.Target]: "solution_package_feed",
+      [ShipDimensions.ProjectType]: "solution_project",
+      [CommandDimensions.CommandName]: "uip solution projects publish",
+      [ShipDimensions.PackageName]: options.packageName,
+      [ShipDimensions.PackageVersion]: options.packageVersion
     });
     OutputFormatter.success({
       Result: RESULTS.Success,
@@ -3529,21 +3864,21 @@ async function inspectSolutionPackageProjectTypes(packagePath) {
   const fs = getFileSystem();
   const [statError, stats] = await catchError(fs.stat(packagePath));
   if (statError || !stats) {
-    logger.debug(`[uip.ship.succeeded] Could not stat solution package for project type telemetry: ${statError?.message ?? "no stats"}`);
+    logger.debug(`[Cli.ShipSucceeded] Could not stat solution package for project type telemetry: ${statError?.message ?? "no stats"}`);
     return { projectType: "unknown" };
   }
   if (stats.size > MAX_INSPECTABLE_PACKAGE_BYTES) {
-    logger.debug(`[uip.ship.succeeded] Solution package is ${stats.size} bytes, over the ${MAX_INSPECTABLE_PACKAGE_BYTES}-byte inspection cap; skipping project type telemetry.`);
+    logger.debug(`[Cli.ShipSucceeded] Solution package is ${stats.size} bytes, over the ${MAX_INSPECTABLE_PACKAGE_BYTES}-byte inspection cap; skipping project type telemetry.`);
     return { projectType: "unknown" };
   }
   const [readError, archive] = await catchError(fs.readFile(packagePath));
   if (readError || !archive) {
-    logger.debug(`[uip.ship.succeeded] Could not read solution package for project type telemetry: ${readError?.message ?? "empty archive"}`);
+    logger.debug(`[Cli.ShipSucceeded] Could not read solution package for project type telemetry: ${readError?.message ?? "empty archive"}`);
     return { projectType: "unknown" };
   }
   const [unzipError, entries] = await catchError(unzipProjectManifests(new Uint8Array(archive)));
   if (unzipError || !entries) {
-    logger.debug(`[uip.ship.succeeded] Could not inspect solution package zip: ${unzipError?.message ?? "no entries"}`);
+    logger.debug(`[Cli.ShipSucceeded] Could not inspect solution package zip: ${unzipError?.message ?? "no entries"}`);
     return { projectType: "unknown" };
   }
   const decoder = new TextDecoder;
@@ -3554,7 +3889,7 @@ async function inspectSolutionPackageProjectTypes(packagePath) {
     }
     const [parseError, parsedTypes] = await catchError(Promise.resolve().then(() => readProjectTypesFromUipx(decoder.decode(entryBytes))));
     if (parseError) {
-      logger.debug(`[uip.ship.succeeded] Could not parse ${entryName} for project type telemetry: ${parseError.message}`);
+      logger.debug(`[Cli.ShipSucceeded] Could not parse ${entryName} for project type telemetry: ${parseError.message}`);
       continue;
     }
     projectTypes.push(...parsedTypes);
@@ -3565,8 +3900,8 @@ function trackSolutionShipSucceeded(payload) {
   const { projectTypeSummary, ...rest } = payload;
   return trackShipSucceeded({
     ...rest,
-    project_type: projectTypeSummary.projectType,
-    project_types: projectTypeSummary.projectTypes
+    [ShipDimensions.ProjectType]: projectTypeSummary.projectType,
+    [ShipDimensions.ProjectTypes]: projectTypeSummary.projectTypes
   });
 }
 
@@ -3716,13 +4051,13 @@ var registerPublishCommand = (program) => {
     });
     const projectTypeSummary = await inspectSolutionPackageProjectTypes(packagePath);
     trackSolutionShipSucceeded({
-      ship_kind: "publish",
-      target: result.feedKind === "personal" ? "personal_workspace_solution_feed" : result.feedKind === "folder" ? "folder_solution_feed" : "tenant_solution_feed",
-      command_name: "uip.solution.publish",
-      artifact_correlation_key: result.packageVersionKey,
-      package_version_key: result.packageVersionKey,
-      package_name: result.packageName,
-      package_version: result.packageVersion,
+      [ShipDimensions.ShipKind]: "publish",
+      [ShipDimensions.Target]: result.feedKind === "personal" ? "personal_workspace_solution_feed" : result.feedKind === "folder" ? "folder_solution_feed" : "tenant_solution_feed",
+      [CommandDimensions.CommandName]: "uip solution publish",
+      [ShipDimensions.ArtifactCorrelationKey]: result.packageVersionKey,
+      [ShipDimensions.PackageVersionKey]: result.packageVersionKey,
+      [ShipDimensions.PackageName]: result.packageName,
+      [ShipDimensions.PackageVersion]: result.packageVersion,
       projectTypeSummary
     });
   });
@@ -3765,7 +4100,7 @@ var RESOURCE_ADD_EXAMPLES = [
   }
 ];
 var registerResourceAddCommand = (resource) => {
-  resource.command("add").description("Add a resource to the solution. Use --source local to create a virtual stub, " + "or --source remote to import an existing Orchestrator resource. Idempotent: " + "if a resource with the same (kind, name, folder) already exists, it is returned unchanged.").option("--source <source>", "Resource source: local (virtual stub) or remote (import from Orchestrator)").option("--kind <kind>", "Resource kind (e.g. Queue, Asset, Bucket, Process, Connection, App, Index, Trigger, Entity, ChoiceSet). Case-insensitive, matched against SDK metadata.").option("--name <name>", "Resource name").option("--type <type>", "Resource subtype (e.g. Text/Bool/Integer for Asset, connector type for Connection)").option("--folder-path <path>", "Orchestrator folder path for remote lookup. Required to disambiguate when more than one remote match exists. Not valid with --source local.").option("--cloud-key <guid>", "Skip remote search and import this exact resource key. Only valid with --source remote.").option("--solution-folder <path>", "Path to the solution root folder (defaults to current directory)").option("--login-validity <minutes>", "Minimum minutes before token expiration to trigger a refresh (default: 10)", parseInt, 10).examples(RESOURCE_ADD_EXAMPLES).trackedAction(processContext, async (options) => {
+  resource.command("add").description("Add a resource to the solution. Use --source local to create a virtual stub, " + "or --source remote to import an existing Orchestrator resource. Idempotent: " + "if a resource with the same (kind, name, folder) already exists, it is returned unchanged.").option("--source <source>", "Resource source: local (virtual stub) or remote (import from Orchestrator)").option("--kind <kind>", "Resource kind (e.g. Queue, Asset, Bucket, Process, Connection, App, Index, Trigger, Entity, ChoiceSet). Case-insensitive, matched against SDK metadata.").option("--name <name>", "Resource name").option("--type <type>", "Resource subtype, case-insensitive (e.g. Text/Integer/Bool/Credential/Secret or stringAsset/credentialAsset for Asset, connector type for Connection). Rejected when the kind does not declare it or has no subtypes (Queue); with --source remote it must match the resource's type and narrows same-name matches.").option("--folder-path <path>", "Orchestrator folder path for remote lookup. Required to disambiguate when more than one remote match exists. Not valid with --source local.").option("--cloud-key <guid>", "Skip remote search and import this exact resource key. Only valid with --source remote.").option("--solution-folder <path>", "Path to the solution root folder (defaults to current directory)").option("--login-validity <minutes>", "Minimum minutes before token expiration to trigger a refresh (default: 10)", parseInt, 10).examples(RESOURCE_ADD_EXAMPLES).trackedAction(processContext, async (options) => {
     const validation = validateOptions(options);
     if (!validation.ok) {
       OutputFormatter.error({
@@ -3856,6 +4191,10 @@ var registerResourceAddCommand = (resource) => {
         OutputFormatter.error({
           Result: RESULTS.Failure,
           Message: outcome.message,
+          ...outcome.invalidArgument ? {
+            ErrorCode: "invalid_argument",
+            Retry: "RetryWillNotFix"
+          } : {},
           Instructions: outcome.instructions
         });
         processContext.exit(1);
@@ -3889,15 +4228,6 @@ function canonicalizeKind(kind) {
     return trimmed;
   return trimmed.charAt(0).toLowerCase() + trimmed.slice(1);
 }
-var MAX_NAME_LENGTH = 256;
-var UNSAFE_NAME_CHARS = /[\\/:*?"<>|]/;
-function hasControlChar(s) {
-  for (let i = 0;i < s.length; i++) {
-    if (s.charCodeAt(i) < 32)
-      return true;
-  }
-  return false;
-}
 var GUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function validateOptions(options) {
   if (!options.source) {
@@ -3929,18 +4259,12 @@ function validateOptions(options) {
       instructions: "Pass --name <resource-name>"
     };
   }
-  if (options.name.length > MAX_NAME_LENGTH) {
-    return {
-      ok: false,
-      message: `--name exceeds the ${MAX_NAME_LENGTH}-character limit (got ${options.name.length})`,
-      instructions: "Shorten the resource name. Orchestrator name limits are kind-specific (queues cap at 50, assets at 256)."
-    };
-  }
-  if (UNSAFE_NAME_CHARS.test(options.name) || hasControlChar(options.name)) {
+  const nameCheck = validateResourceName(options.name);
+  if (!nameCheck.ok) {
     return {
       ok: false,
-      message: "--name contains unsafe characters",
-      instructions: 'Resource names cannot contain path separators (/, \\), control characters, or any of: : * ? " < > |'
+      message: nameCheck.message,
+      instructions: nameCheck.instructions
     };
   }
   if (options.cloudKey && source !== "remote") {
@@ -3976,10 +4300,53 @@ function validateOptions(options) {
     }
   };
 }
-async function runAdd(builder, services, input) {
+async function resolveTypeInput(services, kind, type) {
+  if (type === undefined)
+    return { ok: true, type };
+  const metadata = await resolveResourceKindMetadata(services, kind, type);
+  if (metadata?.typeMatched) {
+    return { ok: true, type: metadata.type ?? type };
+  }
+  const subtypes = metadata?.subtypes ?? [];
+  const useOneOf = `Use one of: ${formatResourceSubtypes(subtypes)}. Either name works, case-insensitive.`;
+  if (type.trim() === "") {
+    return refuseType("--type is empty", subtypes.length > 0 ? `${useOneOf} Or drop --type.` : "Drop --type.");
+  }
+  if (!metadata)
+    return { ok: true, type };
+  return subtypes.length > 0 ? refuseType(`Unknown --type "${type}" for kind ${kind}`, useOneOf) : refuseType(`--type does not apply to kind ${kind}`, `A ${kind} has no subtypes. Drop --type.`);
+}
+function refuseType(message, instructions) {
+  return {
+    ok: false,
+    outcome: {
+      kind: "error",
+      message,
+      instructions,
+      invalidArgument: true
+    }
+  };
+}
+function formatCandidates(matches) {
+  return matches.map((m) => `  - Folder=${m.folder?.fullyQualifiedName ?? "<none>"}  Type=${m.type ?? "<none>"}  Key=${m.key}`).join(`
+`);
+}
+async function runAdd(builder, services, rawInput) {
+  const typeResolution = await resolveTypeInput(services, rawInput.kind, rawInput.type);
+  if (!typeResolution.ok)
+    return typeResolution.outcome;
+  const input = { ...rawInput, type: typeResolution.type };
   const solution = await builder.context.loadAsync();
   if (input.source === "local") {
     const existing = findMatchingLocalResource(solution.resources, input.kind, input.name, input.folderPath);
+    if (existing && input.type !== undefined && !sameResourceSubtype(existing.type, input.type)) {
+      return {
+        kind: "error",
+        message: `A local ${input.kind} named ${existing.name} already exists with type ${existing.type ?? "<none>"}, not ${input.type}`,
+        instructions: existing.type ? `Drop --type to reuse it, pass --type ${existing.type}, or pick another --name.` : "Drop --type to reuse it, or pick another --name.",
+        invalidArgument: true
+      };
+    }
     if (existing) {
       return {
         kind: "success",
@@ -4026,27 +4393,36 @@ async function runAdd(builder, services, input) {
         instructions: searchError.message
       };
     }
-    const filtered = filterMatchesByFolder(matches, input.folderPath);
-    if (filtered.length === 0) {
+    const inFolder = filterMatchesByFolder(matches, input.folderPath);
+    if (inFolder.length === 0) {
       return {
         kind: "error",
         message: `No remote resource found matching kind=${input.kind} name=${input.name}`,
         instructions: `Use 'uip solution resources list --source remote --kind ${input.kind} --search ${input.name}' to discover candidates, or pass --source local to create a local stub.`
       };
     }
+    const wantedType = input.type;
+    const filtered = wantedType === undefined ? inFolder : inFolder.filter((m) => sameResourceSubtype(m.type, wantedType));
+    if (filtered.length === 0) {
+      return {
+        kind: "error",
+        message: `No remote ${input.kind} named ${input.name} has type ${wantedType}`,
+        instructions: `Drop --type, or pass the type of the one you want:
+${formatCandidates(inFolder)}`,
+        invalidArgument: true
+      };
+    }
     if (filtered.length > 1) {
-      const candidates = filtered.map((m) => `  - Folder=${m.folder?.fullyQualifiedName ?? "<none>"}  Type=${m.type ?? "<none>"}  Key=${m.key}`).join(`
-`);
       return {
         kind: "error",
         message: `Ambiguous match: ${filtered.length} remote resources matching kind=${input.kind} name=${input.name}`,
-        instructions: `Candidates (disambiguate with --cloud-key <key>; --folder-path only helps when they are in different folders):
-${candidates}`
+        instructions: `Candidates (disambiguate with --cloud-key <key>; --folder-path and --type only help when they differ in folder or type):
+${formatCandidates(filtered)}`
       };
     }
     cloudKey = filtered[0].key;
     matchFolder = filtered[0].folder;
-    resolvedType = resolvedType ?? filtered[0].type;
+    resolvedType = filtered[0].type ?? resolvedType;
   } else {
     const [lookupError, match] = await catchError(findResourceByKeyInRcs(builder, input.kind, cloudKey, input.folderPath, true));
     if (lookupError) {
@@ -4057,8 +4433,16 @@ ${candidates}`
       };
     }
     if (match) {
+      if (input.type !== undefined && !sameResourceSubtype(match.type, input.type)) {
+        return {
+          kind: "error",
+          message: `Remote ${input.kind} ${cloudKey} has type ${match.type ?? "<none>"}, not ${input.type}`,
+          instructions: match.type ? `Drop --type, or pass --type ${match.type}.` : "Drop --type.",
+          invalidArgument: true
+        };
+      }
       matchFolder = match.folder;
-      resolvedType = resolvedType ?? match.type;
+      resolvedType = match.type ?? resolvedType;
     }
   }
   const existingByKey = solution.resources.find((r) => r.key.toLowerCase() === cloudKey);
@@ -4622,7 +5006,7 @@ async function getRemoteConfiguration(services, resourceKey, includeDependencies
   if (!reference) {
     throw new Error(`Resource '${resourceKey}' was not found in the solution or in the resource catalog`);
   }
-  const importer = services.container.resolve(Tokens.IImportResourceHelper);
+  const { importer } = getRemoteResourceClients(services);
   const payload = await importer.exportResourceAsync(reference);
   const definitions = payload.resourceDefinitions ?? [];
   const primary = definitions.find((d) => d.key === resourceKey) ?? definitions[0];
@@ -4660,7 +5044,7 @@ async function attachLiveSpecOnMismatchAsync(services, resource, config) {
   if (overwriteData?.matchingOverwriteConfiguration !== false || !overwrite || !resource) {
     return;
   }
-  const importer = services.container.resolve(Tokens.IImportResourceHelper);
+  const { importer } = getRemoteResourceClients(services);
   const [exportError, exported] = await catchError(importer.exportResourceOverwriteAsync(resource, overwrite));
   if (exportError || !exported?.spec) {
     return;
@@ -4690,30 +5074,8 @@ async function refreshArtefactSpecAsync(builder, data, includeDeps) {
   return requestedResource;
 }
 async function findRemoteReferenceByKey(services, resourceKey) {
-  const rcs = services.container.resolve(Tokens.IResourceCatalogClientProxy);
-  let pageCursor;
-  do {
-    const result = await rcs.searchFolderEntities({
-      pageSize: 100,
-      pageCursor
-    });
-    for (const item of result.items ?? []) {
-      if (item.entityKey === resourceKey) {
-        return {
-          kind: item.entityType ?? "",
-          type: item.entitySubType ?? undefined,
-          key: item.entityKey ?? resourceKey,
-          name: item.entityName ?? undefined,
-          folder: item.fullyQualifiedName ? {
-            fullyQualifiedName: item.fullyQualifiedName,
-            folderKey: item.folderKey ?? undefined
-          } : undefined
-        };
-      }
-    }
-    pageCursor = result.nextPage ?? undefined;
-  } while (pageCursor);
-  return null;
+  const entity = await findCatalogEntityAsync(getRemoteResourceClients(services).catalog, {}, (item) => item.entityKey === resourceKey);
+  return entity ? toResourceReference(entity) : null;
 }
 
 // src/services/resource-version-lookup.ts
@@ -4735,7 +5097,7 @@ async function resolveResourceVersionsAsync(services, builder, targets) {
   if (versioned.length === 0) {
     return versions;
   }
-  const importer = services.container.resolve(Tokens.IImportResourceHelper);
+  const { importer } = getRemoteResourceClients(services);
   for (let i = 0;i < versioned.length; i += LOOKUP_CONCURRENCY) {
     const batch = versioned.slice(i, i + LOOKUP_CONCURRENCY);
     const resolved = await Promise.all(batch.map((target) => target.source === "Local" ? readLocalVersionAsync(builder, target) : readRemoteVersionAsync(importer, target)));
@@ -4766,13 +5128,11 @@ async function readRemoteVersionAsync(importer, target) {
       folderKey: target.folderKey
     } : undefined
   };
-  const [error, payload] = await catchError(importer.exportResourceAsync(reference));
-  if (error || !payload) {
+  const [error, primary] = await catchError(exportResourceDefinitionAsync(importer, reference));
+  if (error) {
     warnLookupFailed(target, error);
     return [target.id, undefined];
   }
-  const definitions = payload.resourceDefinitions ?? [];
-  const primary = definitions.find((d) => d.key === target.key);
   if (!primary) {
     logger.warn(`Export for ${target.kind} '${target.name ?? target.key}' returned no definition for that key; version omitted.`);
     return [target.id, undefined];
@@ -4780,18 +5140,7 @@ async function readRemoteVersionAsync(importer, target) {
   return [target.id, readVersion(primary.spec)];
 }
 function readVersion(spec) {
-  if (!spec) {
-    return;
-  }
-  let value = spec[VERSION_PROPERTY];
-  if (value === undefined) {
-    for (const [key, candidate] of Object.entries(spec)) {
-      if (key.toLowerCase() === VERSION_PROPERTY) {
-        value = candidate;
-        break;
-      }
-    }
-  }
+  const value = readSpecProperty(spec, VERSION_PROPERTY);
   if (value === undefined || value === null || value === "") {
     return;
   }
@@ -4839,7 +5188,7 @@ var RESOURCE_LIST_EXAMPLES = [
   }
 ];
 var registerResourceListCommand = (resource) => {
-  resource.command("list").description("List resources in the solution and/or available in Orchestrator. " + "Shows local solution resources, remote Orchestrator resources, or both.").option("--solution-folder <path>", "Path to the solution root folder (defaults to current directory)").option("--kind <kind>", "Filter by resource kind (e.g. Queue, Asset, Bucket, Process, Connection, App, Index, Trigger, Entity, ChoiceSet). Any kind RCS indexes is accepted.").option("--search <term>", "Filter resources by name").option("--source <source>", "Resource source: all, local, or remote (default: all)", "all").option("--include-version", "Also report each resource's version, for the kinds that carry one (app, appVersion, package, process). " + "Remote rows report the version live in the folder, local rows the version the solution pins. " + "Costs one extra call per resource, so it is off by default.").option("--login-validity <minutes>", "Minimum minutes before token expiration to trigger a refresh (default: 10)", parseInt, 10).examples(RESOURCE_LIST_EXAMPLES).trackedAction(processContext, async (options) => {
+  resource.command("list").description("List resources in the solution and/or available in Orchestrator. " + "Shows local solution resources, remote Orchestrator resources, or both.").option("--solution-folder <path>", "Path to the solution root folder (defaults to current directory)").option("--kind <kind>", "Filter by resource kind (e.g. Queue, Asset, Bucket, Process, Connection, App, Index, Trigger, Entity, ChoiceSet). Any kind RCS indexes is accepted.").option("--search <term>", "Filter resources by name").option("--source <source>", "Resource source: all, local, or remote (default: all)", "all").option("--include-version", "Also report each resource's version, for the kinds that carry one (app, appVersion, package, process). " + "Remote rows report the version live in the folder, local rows the version the solution pins. " + "Costs one extra call per resource, so it is off by default.").option("-l, --limit <number>", "Number of resources to return", parseLimit, DEFAULT_PAGE_SIZE).option("--offset <number>", "Only 0 is accepted: the resource catalog pages by cursor. Use --next-page instead", parseOffset).option("--next-page <cursor>", "Cursor from a previous response's Pagination.NextPage").option("--login-validity <minutes>", "Minimum minutes before token expiration to trigger a refresh (default: 10)", parseInt, 10).examples(RESOURCE_LIST_EXAMPLES).trackedAction(processContext, async (options) => {
     const solutionPath = options.solutionFolder ?? ".";
     const fs = getFileSystem();
     const resolvedPath = fs.path.resolve(fs.env.cwd(), solutionPath);
@@ -4863,6 +5212,10 @@ var registerResourceListCommand = (resource) => {
       processContext.exit(1);
       return;
     }
+    const start = resolveListStart(options);
+    if (start === undefined) {
+      return;
+    }
     const normalizedKind = options.kind;
     const [authError] = await catchError(getSolutionAuthContext({
       loginValidity: options.loginValidity
@@ -4896,7 +5249,7 @@ var registerResourceListCommand = (resource) => {
       processContext.exit(1);
       return;
     }
-    const [listError, data] = await catchError(listResources(builder, services, source, normalizedKind, options.search, options.includeVersion === true));
+    const [listError, data] = await catchError(listResources(builder, services, source, options.limit, start, normalizedKind, options.search, options.includeVersion === true));
     await builder.disposeAsync();
     if (listError) {
       OutputFormatter.error({
@@ -4907,37 +5260,106 @@ var registerResourceListCommand = (resource) => {
       processContext.exit(1);
       return;
     }
+    const { rows, next } = data;
     OutputFormatter.success({
       Result: RESULTS.Success,
       Code: "ResourceList",
-      Data: data
+      Data: rows,
+      Pagination: new Pagination({
+        returned: rows.length,
+        limit: options.limit,
+        hasMore: next !== undefined,
+        nextPage: next && encodeListPosition(next)
+      })
     });
   });
 };
-async function listResources(builder, services, source, kind, search, includeVersion = false) {
-  const entries = await collectResources(builder, services, source, kind, search);
-  if (includeVersion) {
-    await annotateVersions(services, builder, entries);
+function resolveListStart(options) {
+  if (options.offset !== undefined && options.offset !== 0) {
+    failListArgument("--offset is not supported when listing resources", "The resource catalog pages by cursor, not by offset. Drop --offset, " + "then pass the Pagination.NextPage value from the previous " + "response to --next-page.");
+    return;
+  }
+  if (options.nextPage === undefined) {
+    return { at: "local", index: 0 };
   }
-  return entries;
+  const position = decodeListPosition(options.nextPage);
+  if (position === undefined) {
+    failListArgument("Invalid --next-page value", "Pass the Pagination.NextPage value from the previous " + "`resources list` response unchanged, or drop --next-page to " + "start from the first page.");
+  }
+  return position;
 }
-async function collectResources(builder, services, source, kind, search) {
-  const includeLocal = source === "local" || source === "all";
-  const includeRemote = source === "remote" || source === "all";
-  if (kind) {
-    return querySingleKind(builder, kind, search, includeLocal, includeRemote);
+function failListArgument(message, instructions) {
+  OutputFormatter.error({
+    Result: RESULTS.Failure,
+    ErrorCode: "invalid_argument",
+    Retry: "RetryWillNotFix",
+    Message: message,
+    Instructions: instructions
+  });
+  processContext.exit(1);
+}
+function encodeListPosition(position) {
+  return Buffer.from(JSON.stringify(position), "utf8").toString("base64url");
+}
+function decodeListPosition(cursor) {
+  const [parseError, value] = catchError(() => JSON.parse(Buffer.from(cursor, "base64url").toString("utf8")));
+  if (parseError || typeof value !== "object" || value === null) {
+    return;
   }
-  const all = [];
-  if (includeLocal) {
-    all.push(...await listLocalResources(builder, undefined, search));
+  const { at, index, page, skip } = value;
+  if (at === "local" && isRowCount(index)) {
+    return { at, index };
   }
-  if (includeRemote) {
-    const remote = await listAllRemoteResources(services, search);
-    const localKeys = new Set(all.map((e) => `${e.Kind}:${e.Name}`.toLowerCase()));
-    const uniqueRemote = remote.filter((r) => !localKeys.has(`${r.Kind}:${r.Name}`.toLowerCase()));
-    all.push(...uniqueRemote);
+  if (at === "remote" && isRowCount(skip) && (page === undefined || typeof page === "string")) {
+    return { at, page, skip };
   }
-  return all;
+  return;
+}
+function isRowCount(value) {
+  return Number.isInteger(value) && value >= 0;
+}
+async function listResources(builder, services, source, limit, start, kind, search, includeVersion = false) {
+  const listed = await collectWindow(builder, services, source, limit, start, kind, search);
+  if (includeVersion) {
+    await annotateVersions(services, builder, listed.rows);
+  }
+  return listed;
+}
+function resourceIdentity(entry) {
+  return `${entry.Kind}:${entry.Name}`.toLowerCase();
+}
+async function collectWindow(builder, services, source, limit, start, kind, search) {
+  const local = source === "remote" ? [] : await listLocalResources(builder, kind, search);
+  const want = limit + 1;
+  const found = [];
+  if (start.at === "local") {
+    for (let i = start.index;i < local.length && found.length < want; i++) {
+      found.push({ entry: local[i], at: { at: "local", index: i } });
+    }
+  }
+  if (source !== "local" && found.length < want) {
+    const localKeys = new Set(local.map(resourceIdentity));
+    let page = start.at === "remote" ? start.page : undefined;
+    let skip = start.at === "remote" ? start.skip : 0;
+    for (;; ) {
+      const result = kind ? await remoteKindPage(builder, kind, search, page) : await allRemotePage(services, search, page);
+      for (let i = skip;i < result.entries.length && found.length < want; i++) {
+        const entry = result.entries[i];
+        if (!localKeys.has(resourceIdentity(entry))) {
+          found.push({ entry, at: { at: "remote", page, skip: i } });
+        }
+      }
+      if (found.length >= want || result.nextPage === undefined) {
+        break;
+      }
+      page = result.nextPage;
+      skip = 0;
+    }
+  }
+  return {
+    rows: found.slice(0, limit).map((row) => row.entry),
+    next: found[limit]?.at
+  };
 }
 function versionLookupId(entry) {
   return `${entry.Source}|${entry.Key}|${entry.Folder ?? ""}`;
@@ -4973,34 +5395,25 @@ async function annotateVersions(services, builder, entries) {
     }
   }
 }
-async function listAllRemoteResources(services, search) {
-  const rcs = services.container.resolve(Tokens.IResourceCatalogClientProxy);
-  const entries = [];
-  let pageCursor;
-  do {
-    const [err, result] = await catchError(rcs.searchFolderEntities({
-      name: search,
-      pageSize: 100,
-      pageCursor
-    }));
-    if (err) {
-      logger.warn(`Failed to search remote resources: ${err.message}`);
-      return entries;
-    }
-    for (const item of result.items ?? []) {
-      entries.push({
-        Source: "Remote",
-        Key: item.entityKey ?? "",
-        Name: item.entityName ?? "",
-        Kind: item.entityType ?? "",
-        Type: item.entitySubType ?? undefined,
-        Folder: item.fullyQualifiedName,
-        FolderKey: item.folderKey
-      });
-    }
-    pageCursor = result.nextPage ?? undefined;
-  } while (pageCursor);
-  return entries;
+async function allRemotePage(services, search, pageCursor) {
+  const rcs = getRemoteResourceClients(services).catalog;
+  const result = await rcs.searchFolderEntities({
+    name: search,
+    pageSize: 100,
+    pageCursor
+  });
+  return {
+    entries: (result.items ?? []).map((item) => ({
+      Source: "Remote",
+      Key: item.entityKey ?? "",
+      Name: item.entityName ?? "",
+      Kind: item.entityType ?? "",
+      Type: item.entitySubType ?? undefined,
+      Folder: item.fullyQualifiedName,
+      FolderKey: item.folderKey
+    })),
+    nextPage: result.nextPage || undefined
+  };
 }
 async function listLocalResources(builder, kind, search) {
   const solution = await builder.context.loadAsync();
@@ -5021,36 +5434,20 @@ async function listLocalResources(builder, kind, search) {
     Folder: r.folders?.[0]?.fullyQualifiedName
   }));
 }
-async function querySingleKind(builder, kind, search, includeLocal, includeRemote) {
-  const entries = [];
-  if (includeLocal) {
-    entries.push(...await listLocalResources(builder, kind, search));
-  }
-  if (includeRemote) {
-    let pageCursor;
-    do {
-      const result = await builder.searchResourcesAsync(kind, undefined, search, pageCursor, 100, undefined, false);
-      for (const folder of result.availableResources ?? []) {
-        for (const r of folder.resources ?? []) {
-          entries.push({
-            Source: "Remote",
-            Key: r.key,
-            Name: r.name,
-            Kind: r.kind,
-            Type: r.type,
-            Folder: folder.fullyQualifiedName,
-            FolderKey: folder.key
-          });
-        }
-      }
-      pageCursor = result.nextPage;
-    } while (pageCursor);
-  }
-  if (includeLocal && includeRemote) {
-    const localKeys = new Set(entries.filter((e) => e.Source === "Local").map((e) => `${e.Kind}:${e.Name}`.toLowerCase()));
-    return entries.filter((e) => e.Source === "Local" || !localKeys.has(`${e.Kind}:${e.Name}`.toLowerCase()));
-  }
-  return entries;
+async function remoteKindPage(builder, kind, search, pageCursor) {
+  const result = await builder.searchResourcesAsync(kind, undefined, search, pageCursor, 100, undefined, false);
+  return {
+    entries: (result.availableResources ?? []).flatMap((folder) => (folder.resources ?? []).map((r) => ({
+      Source: "Remote",
+      Key: r.key,
+      Name: r.name,
+      Kind: r.kind,
+      Type: r.type,
+      Folder: folder.fullyQualifiedName,
+      FolderKey: folder.key
+    }))),
+    nextPage: result.nextPage || undefined
+  };
 }
 
 // src/commands/resource-refresh.ts
@@ -5093,9 +5490,9 @@ var registerResourceRefreshSubcommand = (resource) => {
         contributionErrorMessages
       }
     ] = await Promise.all([
-      import("./packager-tool-resolver-fmjr60x8.js"),
-      import("./prepare-solution-resources-wds3r8bq.js"),
-      import("./project-contributions-cvttys34.js")
+      import("./packager-tool-resolver-2cbxyq6k.js"),
+      import("./prepare-solution-resources-p3gzdecy.js"),
+      import("./project-contributions-txe8v6sm.js")
     ]);
     const resolveProjectSubTypesAsync = async () => {
       await ensurePackagerTools2(solutionFolder, fs);
@@ -6293,11 +6690,11 @@ var registerUploadCommand = (program) => {
       });
       const projectTypeSummary = bundledProjectTypes.length > 0 ? summarizeShipProjectTypes(bundledProjectTypes) : await inspectSolutionPackageProjectTypes(uisPath);
       trackSolutionShipSucceeded({
-        ship_kind: "upload",
-        target: "studio_web",
-        command_name: "uip.solution.upload",
-        artifact_correlation_key: returnedSolutionId,
-        solution_id: returnedSolutionId,
+        [ShipDimensions.ShipKind]: "upload",
+        [ShipDimensions.Target]: "studio_web",
+        [CommandDimensions.CommandName]: "uip solution upload",
+        [ShipDimensions.ArtifactCorrelationKey]: returnedSolutionId,
+        [ShipDimensions.SolutionId]: returnedSolutionId,
         projectTypeSummary
       });
     } finally {
@@ -6387,7 +6784,7 @@ var registerCommands = async (program) => {
   registerResourceCommand(program);
   registerDeleteCommand(program);
   if (isPreviewBuild()) {
-    const { registerListCommand } = await import("./list-n0xd5rgn.js");
+    const { registerListCommand } = await import("./list-rbjqgz6s.js");
     registerListCommand(program);
   }
   registerFeedsCommand(program);
@@ -6395,4 +6792,4 @@ var registerCommands = async (program) => {
 
 export { metadata, registerCommands };
 
-//# debugId=46D58B6BDE35333364756E2164756E21
+//# debugId=D929C7F75D94828664756E2164756E21