@uipath/test-manager-tool 0.1.8 → 0.1.10

package/dist/tool.js

@@ -1,7 +1,7 @@
 // package.json
 var package_default = {
   name: "@uipath/test-manager-tool",
-  version: "0.1.8",
+  version: "0.1.10",
   description: "Manage test cases, test sets, executions, and results.",
   private: false,
   maintainers: [
@@ -11,14 +11,14 @@ var package_default = {
   ],
   repository: {
     type: "git",
-    url: "https://github.com/UiPath/uipcli.git",
+    url: "https://github.com/UiPath/cli.git",
     directory: "packages/test-manager-tool"
   },
   publishConfig: {
-    registry: "https://registry.npmjs.org/"
+    registry: "https://npm.pkg.github.com/@uipath"
   },
   keywords: [
-    "uipcli-tool"
+    "cli-tool"
   ],
   type: "module",
   main: "./dist/tool.js",
@@ -32,27 +32,29 @@ var package_default = {
     "dist"
   ],
   scripts: {
-    build: "bun build ./src/tool.ts --outdir dist --format esm --target node --external commander --external @uipath/common --external @uipath/auth --external @uipath/filesystem && bun build ./src/index.ts --outdir dist --format esm --target node --external '*/tool.js' --external commander --external @uipath/common --external @uipath/auth --external @uipath/filesystem",
+    build: "bun ../../tools/build-tool.ts",
     package: "bun run build && bun pm pack",
     lint: "biome check .",
     "lint:fix": "biome check --write ."
   },
   peerDependencies: {
     commander: "^14.0.3",
-    "@uipath/common": "^0.1.7",
-    "@uipath/auth": "^0.1.6",
+    "@uipath/common": "^0.1.13",
+    "@uipath/auth": "^0.1.9",
     "@uipath/filesystem": "^0.1.6"
   },
   devDependencies: {
     "@uipath/orchestrator-sdk": "workspace:*",
     "@uipath/test-manager-sdk": "workspace:*",
-    "@types/node": "^25.2.3",
+    "@types/node": "^25.5.0",
     typescript: "^5"
   }
 };
 
 // src/commands/attachment.ts
 import {
+  catchError as catchError2,
+  extractErrorDetails,
   logger as logger2,
   OutputFormatter as OutputFormatter2,
   processContext,
@@ -2093,6 +2095,7 @@ if (false) {}
 // src/utils/context.ts
 import { getLoginStatusAsync } from "@uipath/auth";
 import {
+  catchError,
   configureLogger,
   LogLevel,
   logger,
@@ -2171,12 +2174,10 @@ async function resolveCommandContext(options) {
     accessToken
   });
   const projectsApi = new ProjectsApi(tmConfig);
-  let project;
-  try {
-    project = await projectsApi.projectsGetProjectByProjectPrefix({
-      projectPrefix: projectKey
-    });
-  } catch {
+  const [projectError, project] = await catchError(projectsApi.projectsGetProjectByProjectPrefix({
+    projectPrefix: projectKey
+  }));
+  if (projectError) {
     OutputFormatter.error({
       Result: "Failure",
       Message: `Project '${projectKey}' not found.`
@@ -2206,65 +2207,19 @@ async function resolveCommandContext(options) {
   };
 }
 
-// src/utils/error-handler.ts
-async function extractErrorDetails(error) {
-  const status = error.status || error.response?.status;
-  let rawBody;
-  let extractedMessage;
-  if (error.response) {
-    try {
-      rawBody = await error.response.text();
-      if (rawBody) {
-        try {
-          const parsed = JSON.parse(rawBody);
-          if (parsed?.errors && typeof parsed.errors === "object") {
-            for (const field of Object.values(parsed.errors)) {
-              if (Array.isArray(field) && field.length > 0 && field[0]?.message) {
-                extractedMessage = field[0].message;
-                break;
-              }
-            }
-          }
-          if (!extractedMessage) {
-            extractedMessage = parsed?.message || parsed?.errorMessage || parsed?.title;
-          }
-        } catch {
-          extractedMessage = rawBody;
-        }
-      }
-    } catch {}
-  }
-  let message;
-  if (status === 401) {
-    message = "Unauthorized (401). Run `uip login` to authenticate.";
-  } else if (status === 403) {
-    message = "Forbidden (403). Ensure the account has the required Test Manager permissions (TestExecution.Read, TestSet.Read, etc.).";
-  } else if (status === 405) {
-    message = "Method Not Allowed (405). The endpoint may not exist or the base URL may be incorrect.";
-  } else {
-    const baseMessage = extractedMessage || error.message || "Unknown error";
-    message = status ? `HTTP ${status}: ${baseMessage}` : baseMessage;
-  }
-  let details = error.message || String(error);
-  if (rawBody) {
-    try {
-      const parsed = JSON.parse(rawBody);
-      const extra = {};
-      if (parsed.errorCode)
-        extra.errorCode = parsed.errorCode;
-      if (parsed.details)
-        extra.details = parsed.details;
-      if (parsed.errors != null)
-        extra.errors = parsed.errors;
-      if (parsed.data && Object.keys(parsed.data).length > 0)
-        extra.data = parsed.data;
-      details = Object.keys(extra).length > 0 ? JSON.stringify(extra) : rawBody;
-    } catch {
-      details = rawBody;
-    }
-  }
-  return { message, details };
+// src/utils/shared.ts
+var TERMINAL_STATUSES = new Set(["finished", "cancelled"]);
+function msToDuration(ms) {
+  const totalSec = Math.floor(ms / 1000);
+  const h = Math.floor(totalSec / 3600);
+  const m = Math.floor(totalSec % 3600 / 60);
+  const s = totalSec % 60;
+  return [h, m, s].map((v) => String(v).padStart(2, "0")).join(":");
+}
+function calcPassRate(passed, total) {
+  return total > 0 ? Math.round(passed / total * 1000) / 10 : 0;
 }
+var TM_FORBIDDEN_MESSAGE = "Forbidden (403). Ensure the account has the required Test Manager permissions (TestExecution.Read, TestSet.Read, etc.).";
 
 // src/commands/attachment.ts
 var OBJECT_TYPE_TEST_CASE_LOG = "testCaseLog";
@@ -2278,7 +2233,7 @@ var registerAttachmentCommand = (program) => {
     if (!ctx)
       return;
     const { tmConfig, tmBaseUrl, projectId, accessToken } = ctx;
-    try {
+    const [error] = await catchError2((async () => {
       const fs = getFileSystem();
       const executionId = options.executionId;
       const nameFilters = options.testCaseName;
@@ -2313,11 +2268,9 @@ var registerAttachmentCommand = (program) => {
         const tc = log.testCase;
         const testCaseName = tc?.packageEntryPointName ?? tc?.name ?? log.automationTestCaseName ?? logId;
         logger2.info(`Processing test case: ${testCaseName} (log ${logId})`);
-        let attachments;
-        try {
-          attachments = await listAttachments(tmBaseUrl, accessToken, projectId, logId);
-        } catch (err) {
-          const msg = err instanceof Error ? err.message : String(err);
+        const [listErr, attachments] = await catchError2(listAttachments(tmBaseUrl, accessToken, projectId, logId));
+        if (listErr) {
+          const msg = listErr instanceof Error ? listErr.message : String(listErr);
           logger2.warn(`Failed to list attachments for '${testCaseName}': ${msg}`);
           skipped.push(`${testCaseName}: ${msg}`);
           continue;
@@ -2332,15 +2285,15 @@ var registerAttachmentCommand = (program) => {
           if (!attachmentId)
             continue;
           const fileName = attachment.fileName ?? `${attachmentId}${attachment.fileExtension ? `.${attachment.fileExtension}` : ""}`;
-          try {
-            const data = await downloadAttachment(tmBaseUrl, accessToken, projectId, attachmentId);
+          const [dlErr, data] = await catchError2(downloadAttachment(tmBaseUrl, accessToken, projectId, attachmentId));
+          if (dlErr) {
+            const msg = dlErr instanceof Error ? dlErr.message : String(dlErr);
+            logger2.warn(`  Failed to download '${fileName}': ${msg}`);
+          } else {
             const outPath = fs.path.join(testCaseDir, sanitizeName(fileName));
             await fs.writeFile(outPath, new Uint8Array(data));
             logger2.info(`  Downloaded: ${fileName} → ${outPath}`);
             totalDownloaded++;
-          } catch (err) {
-            const msg = err instanceof Error ? err.message : String(err);
-            logger2.warn(`  Failed to download '${fileName}': ${msg}`);
           }
         }
       }
@@ -2351,14 +2304,18 @@ var registerAttachmentCommand = (program) => {
         MatchedTestCases: logs.length,
         ...skipped.length > 0 && { Skipped: skipped }
       }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+    })());
+    if (error) {
+      const { message, details } = await extractErrorDetails(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
+      });
       OutputFormatter2.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext.exit(1);
+      return;
     }
   });
 };
@@ -2410,26 +2367,13 @@ function sanitizeName(name) {
 
 // src/commands/execution.ts
 import {
+  catchError as catchError3,
+  extractErrorDetails as extractErrorDetails2,
   logger as logger3,
   OutputFormatter as OutputFormatter3,
   processContext as processContext2,
   SuccessOutput as SuccessOutput2
 } from "@uipath/common";
-
-// src/utils/shared.ts
-var TERMINAL_STATUSES = new Set(["finished", "cancelled"]);
-function msToDuration(ms) {
-  const totalSec = Math.floor(ms / 1000);
-  const h = Math.floor(totalSec / 3600);
-  const m = Math.floor(totalSec % 3600 / 60);
-  const s = totalSec % 60;
-  return [h, m, s].map((v) => String(v).padStart(2, "0")).join(":");
-}
-function calcPassRate(passed, total) {
-  return total > 0 ? Math.round(passed / total * 1000) / 10 : 0;
-}
-
-// src/commands/execution.ts
 var registerExecutionCommand = (program) => {
   const executionCmd = program.command("execution").description("Manage Test Manager test executions");
   executionCmd.command("retry").description("Retry only the failed test cases of a finished execution.").requiredOption("--execution-id <uuid>", "Test execution UUID to retry").option("--project-key <key>", "Test Manager project key (e.g. DEMO)").option("--test-set-key <key>", "Test set key to derive project key from (e.g. DEMO:42 → DEMO)").option("--execution-type <type>", "Execution type for the retry: automated, manual, mixed, none", "automated").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext2, async (options) => {
@@ -2437,66 +2381,86 @@ var registerExecutionCommand = (program) => {
     if (!ctx)
       return;
     const { tmConfig, projectId } = ctx;
-    try {
-      const executionId = options.executionId;
-      logger3.info(`Fetching execution stats for ${executionId}`);
-      const executionsApi = new TestExecutionsApi(tmConfig);
-      const currentStats = await executionsApi.testExecutionsGetByIdWithStats({
-        id: executionId,
-        projectId
+    const executionId = options.executionId;
+    logger3.info(`Fetching execution stats for ${executionId}`);
+    const executionsApi = new TestExecutionsApi(tmConfig);
+    const [statsErr, currentStats] = await catchError3(executionsApi.testExecutionsGetByIdWithStats({
+      id: executionId,
+      projectId
+    }));
+    if (statsErr) {
+      const { message, details } = await extractErrorDetails2(statsErr, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
+      OutputFormatter3.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
       });
-      const currentStatus = currentStats.status ?? "";
-      if (!TERMINAL_STATUSES.has(currentStatus.toLowerCase())) {
-        OutputFormatter3.error({
-          Result: "Failure",
-          Message: `Execution '${executionId}' is not in a terminal state (current: ${currentStatus}). Wait for it to finish before retrying.`
-        });
-        processContext2.exit(1);
-        return;
-      }
-      const failedCount = currentStats.failed ?? 0;
-      if (failedCount === 0) {
-        OutputFormatter3.success(new SuccessOutput2("ExecutionRetry", {
-          Message: `Execution '${executionId}' has no failed test cases to retry.`
-        }));
-        return;
-      }
-      logger3.info(`Collecting failed test case log IDs for execution ${executionId}`);
-      const testCaseLogsApi = new TestCaseLogsApi(tmConfig);
-      const failedLogIds = await fetchAllFailedLogIds(testCaseLogsApi, projectId, executionId);
-      if (failedLogIds.length === 0) {
-        OutputFormatter3.error({
-          Result: "Failure",
-          Message: `No failed test case logs found for execution '${executionId}'.`
-        });
-        processContext2.exit(1);
-        return;
-      }
-      logger3.info(`Found ${failedLogIds.length} failed test case log(s) to retry`);
-      logger3.info(`Starting retry for execution ${executionId}`);
-      await executionsApi.testExecutionsExecute({
-        id: executionId,
-        projectId,
-        uiPathTestManagementHubTestManagementAbstractionsDTOsStartExecutionRequest: {
-          executionType: options.executionType,
-          testCaseLogIds: failedLogIds
-        }
+      processContext2.exit(1);
+      return;
+    }
+    const currentStatus = currentStats.status ?? "";
+    if (!TERMINAL_STATUSES.has(currentStatus.toLowerCase())) {
+      OutputFormatter3.error({
+        Result: "Failure",
+        Message: `Execution '${executionId}' is not in a terminal state (current: ${currentStatus}). Wait for it to finish before retrying.`
       });
+      processContext2.exit(1);
+      return;
+    }
+    const failedCount = currentStats.failed ?? 0;
+    if (failedCount === 0) {
       OutputFormatter3.success(new SuccessOutput2("ExecutionRetry", {
-        ExecutionId: executionId,
-        Status: "Running",
-        StartTime: new Date().toISOString(),
-        RetriedCount: failedLogIds.length
+        Message: `Execution '${executionId}' has no failed test cases to retry.`
       }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+      return;
+    }
+    logger3.info(`Collecting failed test case log IDs for execution ${executionId}`);
+    const testCaseLogsApi = new TestCaseLogsApi(tmConfig);
+    const [logsErr, failedLogIds] = await catchError3(fetchAllFailedLogIds(testCaseLogsApi, projectId, executionId));
+    if (logsErr) {
+      const { message, details } = await extractErrorDetails2(logsErr, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
+      OutputFormatter3.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
+      });
+      processContext2.exit(1);
+      return;
+    }
+    if (failedLogIds.length === 0) {
+      OutputFormatter3.error({
+        Result: "Failure",
+        Message: `No failed test case logs found for execution '${executionId}'.`
+      });
+      processContext2.exit(1);
+      return;
+    }
+    logger3.info(`Found ${failedLogIds.length} failed test case log(s) to retry`);
+    logger3.info(`Starting retry for execution ${executionId}`);
+    const [retryErr] = await catchError3(executionsApi.testExecutionsExecute({
+      id: executionId,
+      projectId,
+      uiPathTestManagementHubTestManagementAbstractionsDTOsStartExecutionRequest: {
+        executionType: options.executionType,
+        testCaseLogIds: failedLogIds
+      }
+    }));
+    if (retryErr) {
+      const { message, details } = await extractErrorDetails2(retryErr, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
       OutputFormatter3.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext2.exit(1);
+      return;
     }
+    OutputFormatter3.success(new SuccessOutput2("ExecutionRetry", {
+      ExecutionId: executionId,
+      Status: "Running",
+      StartTime: new Date().toISOString(),
+      RetriedCount: failedLogIds.length
+    }));
   });
 };
 async function fetchAllFailedLogIds(api, projectId, testExecutionId) {
@@ -2525,7 +2489,13 @@ async function fetchAllFailedLogIds(api, projectId, testExecutionId) {
 }
 
 // src/commands/project.ts
-import { OutputFormatter as OutputFormatter4, processContext as processContext3, SuccessOutput as SuccessOutput3 } from "@uipath/common";
+import {
+  catchError as catchError4,
+  extractErrorDetails as extractErrorDetails3,
+  OutputFormatter as OutputFormatter4,
+  processContext as processContext3,
+  SuccessOutput as SuccessOutput3
+} from "@uipath/common";
 var registerProjectCommand = (program) => {
   const projectCmd = program.command("project").description("Manage Test Manager projects");
   projectCmd.command("list").description("List all Test Manager projects.").option("--filter <text>", "Filter projects by name").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext3, async (options) => {
@@ -2533,7 +2503,7 @@ var registerProjectCommand = (program) => {
     if (!ctx)
       return;
     const { tmConfig } = ctx;
-    try {
+    const [error, rows] = await catchError4((async () => {
       const projectsApi = new ProjectsApi(tmConfig);
       const all = [];
       const top = 50;
@@ -2549,123 +2519,139 @@ var registerProjectCommand = (program) => {
         if (skip >= (page.total ?? 0) || (page.data ?? []).length < top)
           break;
       }
-      const rows = all.map((p) => ({
+      return all.map((p) => ({
         ProjectKey: p.projectPrefix ?? "",
         Name: p.name ?? "",
         Description: p.description ?? "",
         Active: p.isActive ?? true
       }));
-      OutputFormatter4.success(new SuccessOutput3("ProjectsList", rows));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+    })());
+    if (error) {
+      const { message, details } = await extractErrorDetails3(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
+      });
       OutputFormatter4.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext3.exit(1);
+      return;
     }
+    OutputFormatter4.success(new SuccessOutput3("ProjectsList", rows));
   });
   projectCmd.command("create").description("Create a new Test Manager project.").requiredOption("--name <name>", "Project name").requiredOption("--project-key <key>", "Project key / prefix (e.g. MYPROJ)").option("--description <text>", "Project description").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext3, async (options) => {
     const ctx = await resolveBaseContext(options);
     if (!ctx)
       return;
     const { tmConfig } = ctx;
-    try {
-      const projectsApi = new ProjectsApi(tmConfig);
-      const project = await projectsApi.projectsCreate({
-        uiPathTestManagementHubTestManagementAbstractionsDTOsCreateProjectRequest: {
-          name: options.name,
-          description: options.description ?? "",
-          projectPrefix: options.projectKey,
-          isActive: true
-        }
+    const projectsApi = new ProjectsApi(tmConfig);
+    const [error, project] = await catchError4(projectsApi.projectsCreate({
+      uiPathTestManagementHubTestManagementAbstractionsDTOsCreateProjectRequest: {
+        name: options.name,
+        description: options.description ?? "",
+        projectPrefix: options.projectKey,
+        isActive: true
+      }
+    }));
+    if (error) {
+      const { message, details } = await extractErrorDetails3(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
       });
-      OutputFormatter4.success(new SuccessOutput3("ProjectCreate", {
-        ProjectKey: project.projectPrefix ?? "",
-        Id: project.id ?? "",
-        Name: project.name ?? "",
-        Description: project.description ?? ""
-      }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
       OutputFormatter4.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext3.exit(1);
+      return;
     }
+    OutputFormatter4.success(new SuccessOutput3("ProjectCreate", {
+      ProjectKey: project.projectPrefix ?? "",
+      Id: project.id ?? "",
+      Name: project.name ?? "",
+      Description: project.description ?? ""
+    }));
   });
   projectCmd.command("update").description("Update a Test Manager project name or description.").requiredOption("--project-key <key>", "Project key / prefix (e.g. MYPROJ)").option("--name <name>", "New project name").option("--description <text>", "New project description").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext3, async (options) => {
     const ctx = await resolveBaseContext(options);
     if (!ctx)
       return;
     const { tmConfig } = ctx;
-    try {
+    const [error, existing] = await catchError4((async () => {
       const projectsApi = new ProjectsApi(tmConfig);
-      const existing = await projectsApi.projectsGetProjectByProjectPrefix({
+      const proj = await projectsApi.projectsGetProjectByProjectPrefix({
         projectPrefix: options.projectKey
       });
-      if (!existing.id)
+      if (!proj.id)
         throw new Error(`Project '${options.projectKey}' not found.`);
       await projectsApi.projectsUpdate({
-        id: existing.id,
+        id: proj.id,
         uiPathTestManagementHubTestManagementAbstractionsDTOsUpdateProjectRequest: {
-          name: options.name ?? existing.name,
-          description: options.description ?? existing.description
+          name: options.name ?? proj.name,
+          description: options.description ?? proj.description
         }
       });
-      OutputFormatter4.success(new SuccessOutput3("ProjectUpdate", {
-        ProjectKey: options.projectKey,
-        Id: existing.id,
-        Name: options.name ?? existing.name ?? "",
-        Description: options.description ?? existing.description ?? ""
-      }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+      return proj;
+    })());
+    if (error) {
+      const { message, details } = await extractErrorDetails3(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
+      });
       OutputFormatter4.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext3.exit(1);
+      return;
     }
+    OutputFormatter4.success(new SuccessOutput3("ProjectUpdate", {
+      ProjectKey: options.projectKey,
+      Id: existing.id,
+      Name: options.name ?? existing.name ?? "",
+      Description: options.description ?? existing.description ?? ""
+    }));
   });
   projectCmd.command("delete").description("Delete a Test Manager project by its key.").requiredOption("--project-key <key>", "Project key / prefix (e.g. MYPROJ)").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext3, async (options) => {
     const ctx = await resolveBaseContext(options);
     if (!ctx)
       return;
     const { tmConfig } = ctx;
-    try {
+    const [error, project] = await catchError4((async () => {
       const projectsApi = new ProjectsApi(tmConfig);
-      const project = await projectsApi.projectsGetProjectByProjectPrefix({
+      const proj = await projectsApi.projectsGetProjectByProjectPrefix({
         projectPrefix: options.projectKey
       });
-      if (!project.id)
+      if (!proj.id)
         throw new Error(`Project '${options.projectKey}' not found.`);
-      await projectsApi.projectsDelete({ id: project.id });
-      OutputFormatter4.success(new SuccessOutput3("ProjectDelete", {
-        ProjectKey: options.projectKey,
-        Id: project.id,
-        Result: "Deleted"
-      }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+      await projectsApi.projectsDelete({ id: proj.id });
+      return proj;
+    })());
+    if (error) {
+      const { message, details } = await extractErrorDetails3(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
+      });
       OutputFormatter4.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext3.exit(1);
+      return;
     }
+    OutputFormatter4.success(new SuccessOutput3("ProjectDelete", {
+      ProjectKey: options.projectKey,
+      Id: project.id,
+      Result: "Deleted"
+    }));
   });
-  projectCmd.command("set-default-folder").description("Set the default Orchestrator folder for a project.").requiredOption("--project-key <key>", "Test Manager project key (e.g. LEO)").requiredOption("--folder-key <uuid>", "Orchestrator folder key UUID (from 'orch folders list')").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext3, async (options) => {
+  projectCmd.command("set-default-folder").description("Set the default Orchestrator folder for a project.").requiredOption("--project-key <key>", "Test Manager project key (e.g. LEO)").requiredOption("--folder-key <uuid>", "Orchestrator folder key UUID (from 'uip or folders list')").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext3, async (options) => {
     const ctx = await resolveCommandContext(options);
     if (!ctx)
       return;
     const { tmBaseUrl, accessToken, projectId } = ctx;
-    try {
+    const [error] = await catchError4((async () => {
       const res = await fetch(`${tmBaseUrl}/api/v2/${projectId}/projectsettings/folder`, {
         method: "PUT",
         headers: {
@@ -2680,27 +2666,31 @@ var registerProjectCommand = (program) => {
         const body = await res.text().catch(() => "");
         throw new Error(`HTTP ${res.status} ${res.statusText}${body ? `: ${body}` : ""}`);
       }
-      OutputFormatter4.success(new SuccessOutput3("ProjectSetDefaultFolder", {
-        ProjectKey: options.projectKey,
-        FolderKey: options.folderKey,
-        Result: "Updated"
-      }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+    })());
+    if (error) {
+      const { message, details } = await extractErrorDetails3(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
+      });
       OutputFormatter4.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext3.exit(1);
+      return;
     }
+    OutputFormatter4.success(new SuccessOutput3("ProjectSetDefaultFolder", {
+      ProjectKey: options.projectKey,
+      FolderKey: options.folderKey,
+      Result: "Updated"
+    }));
   });
   projectCmd.command("clear-default-folder").description("Clear the default Orchestrator folder from a project.").requiredOption("--project-key <key>", "Test Manager project key (e.g. LEO)").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext3, async (options) => {
     const ctx = await resolveCommandContext(options);
     if (!ctx)
       return;
     const { tmBaseUrl, accessToken, projectId } = ctx;
-    try {
+    const [error] = await catchError4((async () => {
       const res = await fetch(`${tmBaseUrl}/api/v2/${projectId}/projectsettings/folder`, {
         method: "PUT",
         headers: {
@@ -2713,24 +2703,30 @@ var registerProjectCommand = (program) => {
         const body = await res.text().catch(() => "");
         throw new Error(`HTTP ${res.status} ${res.statusText}${body ? `: ${body}` : ""}`);
       }
-      OutputFormatter4.success(new SuccessOutput3("ProjectClearDefaultFolder", {
-        ProjectKey: options.projectKey,
-        Result: "Cleared"
-      }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+    })());
+    if (error) {
+      const { message, details } = await extractErrorDetails3(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
+      });
       OutputFormatter4.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext3.exit(1);
+      return;
     }
+    OutputFormatter4.success(new SuccessOutput3("ProjectClearDefaultFolder", {
+      ProjectKey: options.projectKey,
+      Result: "Cleared"
+    }));
   });
 };
 
 // src/commands/report.ts
 import {
+  catchError as catchError5,
+  extractErrorDetails as extractErrorDetails4,
   logger as logger4,
   OutputFormatter as OutputFormatter5,
   processContext as processContext4,
@@ -2813,7 +2809,7 @@ var registerReportCommand = (program) => {
     if (!ctx)
       return;
     const { tmConfig, projectId } = ctx;
-    try {
+    const [error, data] = await catchError5((async () => {
       const executionId = options.executionId;
       logger4.info(`Fetching execution stats for ${executionId}`);
       const executionsApi = new TestExecutionsApi(tmConfig);
@@ -2833,18 +2829,21 @@ var registerReportCommand = (program) => {
       const failedLogs = await fetchAllFailedLogs(testCaseLogsApi, projectId, executionId);
       const failedTests = await Promise.all(failedLogs.map(async (log) => {
         const name = log.testCase?.name ?? log.automationTestCaseName ?? log.id ?? "unknown";
-        let error = log.info ?? "";
-        if (!error && log.id) {
-          try {
-            const assertions = await testCaseLogArtifactsApi.testCaseLogArtifactsGetAssertions({ id: log.id, projectId });
+        let assertionError = log.info ?? "";
+        if (!assertionError && log.id) {
+          const [assertErr, assertions] = await catchError5(testCaseLogArtifactsApi.testCaseLogArtifactsGetAssertions({ id: log.id, projectId }));
+          if (!assertErr) {
             const failedMessages = assertions.filter((a) => a.succeeded === false).map((a) => a.message).filter(Boolean).join("; ");
             if (failedMessages)
-              error = failedMessages;
-          } catch {}
+              assertionError = failedMessages;
+          }
         }
-        return { TestCaseName: name, Error: error };
+        return {
+          TestCaseName: name,
+          Error: assertionError
+        };
       }));
-      const data = {
+      return {
         ExecutionId: executionId,
         TestSetName: stats.name ?? "",
         TotalTests: total,
@@ -2857,21 +2856,24 @@ var registerReportCommand = (program) => {
         Duration: msToDuration(stats.duration ?? 0),
         FailedTests: failedTests
       };
-      if (options.query) {
-        const filtered = applyQuery(data, options.query);
-        process.stdout.write(`${JSON.stringify(filtered)}
-`);
-      } else {
-        OutputFormatter5.success(new SuccessOutput4("ReportGet", data));
-      }
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+    })());
+    if (error) {
+      const { message, details } = await extractErrorDetails4(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
+      });
       OutputFormatter5.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext4.exit(1);
+      return;
+    }
+    if (options.query) {
+      const filtered = applyQuery(data, options.query);
+      OutputFormatter5.success(new SuccessOutput4("ReportGet", filtered));
+    } else {
+      OutputFormatter5.success(new SuccessOutput4("ReportGet", data));
     }
   });
 };
@@ -2900,6 +2902,8 @@ async function fetchAllFailedLogs(api, projectId, testExecutionId) {
 
 // src/commands/result.ts
 import {
+  catchError as catchError6,
+  extractErrorDetails as extractErrorDetails5,
   logger as logger5,
   OutputFormatter as OutputFormatter6,
   processContext as processContext5,
@@ -3022,7 +3026,7 @@ var registerResultCommand = (program) => {
       baseUrl,
       tenantName
     } = ctx;
-    try {
+    const [error] = await catchError6((async () => {
       const orgSlug = organizationName ?? organizationId;
       const tmWebUrl = `${baseUrl}/${orgSlug}/${tenantName}/testmanager_`;
       const executionId = options.executionId;
@@ -3050,13 +3054,16 @@ var registerResultCommand = (program) => {
           durationMs = log.executionEnd.getTime() - log.executionStart.getTime();
         }
         let assertions = [];
-        try {
-          const raw = await artifactsApi.testCaseLogArtifactsGetAssertions({ id: logId, projectId });
+        const [assertErr, raw] = await catchError6(artifactsApi.testCaseLogArtifactsGetAssertions({
+          id: logId,
+          projectId
+        }));
+        if (!assertErr) {
           assertions = raw.map((a) => ({
             Message: a.message ?? "",
             Succeeded: a.succeeded ?? true
           }));
-        } catch {}
+        }
         return {
           Id: logId,
           TestCaseId: testCaseId,
@@ -3110,14 +3117,18 @@ var registerResultCommand = (program) => {
         Failed: failuresCount,
         Cancelled: canceledCount
       }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+    })());
+    if (error) {
+      const { message, details } = await extractErrorDetails5(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
+      });
       OutputFormatter6.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext5.exit(1);
+      return;
     }
   });
 };
@@ -3145,7 +3156,7 @@ async function fetchAllTestCaseLogs2(api, projectId, testExecutionId) {
 async function fetchTestSetPackages(tmBaseUrl, accessToken, projectId, testSetId) {
   if (!testSetId)
     return [];
-  try {
+  const [err, result] = await catchError6((async () => {
     const url = `${tmBaseUrl}/api/v2/${encodeURIComponent(projectId)}/testsets/${encodeURIComponent(testSetId)}/packages`;
     const response = await fetch(url, {
       headers: { Authorization: `Bearer ${accessToken}` }
@@ -3158,13 +3169,20 @@ async function fetchTestSetPackages(tmBaseUrl, accessToken, projectId, testSetId
       Name: p.packageName ?? p.name ?? "",
       Version: p.version ?? ""
     }));
-  } catch {
+  })());
+  if (err)
     return [];
-  }
+  return result;
 }
 
 // src/commands/testcase.ts
-import { OutputFormatter as OutputFormatter7, processContext as processContext6, SuccessOutput as SuccessOutput6 } from "@uipath/common";
+import {
+  catchError as catchError7,
+  extractErrorDetails as extractErrorDetails6,
+  OutputFormatter as OutputFormatter7,
+  processContext as processContext6,
+  SuccessOutput as SuccessOutput6
+} from "@uipath/common";
 
 // ../orchestrator-sdk/generated/src/runtime.ts
 var BASE_PATH2 = "https://alpha.uipath.com/uipattycyrhx/abizon_1/orchestrator_".replace(/\/+$/, "");
@@ -3553,6 +3571,20 @@ function EntitySummaryDtoFromJSONTyped(json, ignoreDiscriminator) {
   };
 }
 
+// ../orchestrator-sdk/generated/src/models/UpdatePolicyDto.ts
+function UpdatePolicyDtoFromJSON(json) {
+  return UpdatePolicyDtoFromJSONTyped(json, false);
+}
+function UpdatePolicyDtoFromJSONTyped(json, ignoreDiscriminator) {
+  if (json == null) {
+    return json;
+  }
+  return {
+    type: json["Type"] == null ? undefined : json["Type"],
+    specificVersion: json["SpecificVersion"] == null ? undefined : json["SpecificVersion"]
+  };
+}
+
 // ../orchestrator-sdk/generated/src/models/ExtendedFolderDto.ts
 function ExtendedFolderDtoFromJSON(json) {
   return ExtendedFolderDtoFromJSONTyped(json, false);
@@ -3580,145 +3612,102 @@ function ExtendedFolderDtoFromJSONTyped(json, ignoreDiscriminator) {
   };
 }
 
-// ../orchestrator-sdk/generated/src/models/Folder.ts
-function FolderFromJSON(json) {
-  return FolderFromJSONTyped(json, false);
+// ../orchestrator-sdk/generated/src/models/MachineVpnSettingsDto.ts
+function MachineVpnSettingsDtoFromJSON(json) {
+  return MachineVpnSettingsDtoFromJSONTyped(json, false);
 }
-function FolderFromJSONTyped(json, ignoreDiscriminator) {
+function MachineVpnSettingsDtoFromJSONTyped(json, ignoreDiscriminator) {
   if (json == null) {
     return json;
   }
   return {
-    id: json["id"] == null ? undefined : json["id"],
-    key: json["key"] == null ? undefined : json["key"],
-    path: json["path"] == null ? undefined : json["path"],
-    timestamp: json["timestamp"] == null ? undefined : new Date(json["timestamp"]),
-    type: json["type"] == null ? undefined : json["type"],
-    fullyQualifiedName: json["fullyQualifiedName"] == null ? undefined : json["fullyQualifiedName"],
-    displayName: json["displayName"] == null ? undefined : json["displayName"],
-    description: json["description"] == null ? undefined : json["description"],
-    isDeleted: json["isDeleted"] == null ? undefined : json["isDeleted"]
+    cidr: json["cidr"] == null ? undefined : json["cidr"]
   };
 }
 
-// ../orchestrator-sdk/generated/src/models/FolderAssignDomainUserRequest.ts
-function FolderAssignDomainUserRequestToJSON(json) {
-  return FolderAssignDomainUserRequestToJSONTyped(json, false);
+// ../orchestrator-sdk/generated/src/models/MaintenanceWindowDto.ts
+function MaintenanceWindowDtoFromJSON(json) {
+  return MaintenanceWindowDtoFromJSONTyped(json, false);
 }
-function FolderAssignDomainUserRequestToJSONTyped(value, ignoreDiscriminator = false) {
-  if (value == null) {
-    return value;
+function MaintenanceWindowDtoFromJSONTyped(json, ignoreDiscriminator) {
+  if (json == null) {
+    return json;
   }
   return {
-    assignment: DomainUserAssignmentDtoToJSON(value["assignment"])
+    enabled: json["enabled"] == null ? undefined : json["enabled"],
+    jobStopStrategy: json["jobStopStrategy"] == null ? undefined : json["jobStopStrategy"],
+    cronExpression: json["cronExpression"] == null ? undefined : json["cronExpression"],
+    timezoneId: json["timezoneId"] == null ? undefined : json["timezoneId"],
+    duration: json["duration"] == null ? undefined : json["duration"],
+    nextExecutionTime: json["nextExecutionTime"] == null ? undefined : new Date(json["nextExecutionTime"])
   };
 }
 
-// ../orchestrator-sdk/generated/src/models/MachineAssignmentsDto.ts
-function MachineAssignmentsDtoToJSON(json) {
-  return MachineAssignmentsDtoToJSONTyped(json, false);
+// ../orchestrator-sdk/generated/src/models/UpdateInfoDto.ts
+function UpdateInfoDtoFromJSON(json) {
+  return UpdateInfoDtoFromJSONTyped(json, false);
 }
-function MachineAssignmentsDtoToJSONTyped(value, ignoreDiscriminator = false) {
-  if (value == null) {
-    return value;
+function UpdateInfoDtoFromJSONTyped(json, ignoreDiscriminator) {
+  if (json == null) {
+    return json;
   }
   return {
-    MachineIds: value["machineIds"],
-    FolderIds: value["folderIds"]
+    updateStatus: json["updateStatus"] == null ? undefined : json["updateStatus"],
+    reason: json["reason"] == null ? undefined : json["reason"],
+    targetUpdateVersion: json["targetUpdateVersion"] == null ? undefined : json["targetUpdateVersion"],
+    isCommunity: json["isCommunity"] == null ? undefined : json["isCommunity"],
+    statusInfo: json["statusInfo"] == null ? undefined : json["statusInfo"]
   };
 }
 
-// ../orchestrator-sdk/generated/src/models/FolderAssignMachinesRequest.ts
-function FolderAssignMachinesRequestToJSON(json) {
-  return FolderAssignMachinesRequestToJSONTyped(json, false);
+// ../orchestrator-sdk/generated/src/models/MachinesRobotVersionDto.ts
+function MachinesRobotVersionDtoFromJSON(json) {
+  return MachinesRobotVersionDtoFromJSONTyped(json, false);
 }
-function FolderAssignMachinesRequestToJSONTyped(value, ignoreDiscriminator = false) {
-  if (value == null) {
-    return value;
+function MachinesRobotVersionDtoFromJSONTyped(json, ignoreDiscriminator) {
+  if (json == null) {
+    return json;
   }
   return {
-    assignments: MachineAssignmentsDtoToJSON(value["assignments"])
+    count: json["Count"] == null ? undefined : json["Count"],
+    version: json["Version"] == null ? undefined : json["Version"],
+    machineId: json["MachineId"] == null ? undefined : json["MachineId"]
   };
 }
 
-// ../orchestrator-sdk/generated/src/models/UserAssignmentsDto.ts
-function UserAssignmentsDtoToJSON(json) {
-  return UserAssignmentsDtoToJSONTyped(json, false);
+// ../orchestrator-sdk/generated/src/models/RobotUserDto.ts
+function RobotUserDtoFromJSON(json) {
+  return RobotUserDtoFromJSONTyped(json, false);
 }
-function UserAssignmentsDtoToJSONTyped(value, ignoreDiscriminator = false) {
-  if (value == null) {
-    return value;
+function RobotUserDtoFromJSONTyped(json, ignoreDiscriminator) {
+  if (json == null) {
+    return json;
   }
   return {
-    UserIds: value["userIds"],
-    RolesPerFolder: value["rolesPerFolder"] == null ? undefined : value["rolesPerFolder"].map(FolderRolesDtoToJSON)
-  };
-}
-
-// ../orchestrator-sdk/generated/src/models/FolderAssignUsersRequest.ts
-function FolderAssignUsersRequestToJSON(json) {
-  return FolderAssignUsersRequestToJSONTyped(json, false);
-}
-function FolderAssignUsersRequestToJSONTyped(value, ignoreDiscriminator = false) {
-  if (value == null) {
-    return value;
-  }
-  return {
-    assignments: UserAssignmentsDtoToJSON(value["assignments"])
-  };
-}
-
-// ../orchestrator-sdk/generated/src/models/SimpleUserEntityDto.ts
-function SimpleUserEntityDtoFromJSON(json) {
-  return SimpleUserEntityDtoFromJSONTyped(json, false);
-}
-function SimpleUserEntityDtoFromJSONTyped(json, ignoreDiscriminator) {
-  if (json == null) {
-    return json;
-  }
-  return {
-    key: json["Key"] == null ? undefined : json["Key"],
     userName: json["UserName"] == null ? undefined : json["UserName"],
-    isInherited: json["IsInherited"] == null ? undefined : json["IsInherited"],
-    assignedToFolderIds: json["AssignedToFolderIds"] == null ? undefined : json["AssignedToFolderIds"],
-    mayHaveAttended: json["MayHaveAttended"] == null ? undefined : json["MayHaveAttended"],
-    mayHaveUnattended: json["MayHaveUnattended"] == null ? undefined : json["MayHaveUnattended"],
-    type: json["Type"] == null ? undefined : json["Type"],
-    source: json["Source"] == null ? undefined : json["Source"],
-    isActive: json["IsActive"] == null ? undefined : json["IsActive"],
-    id: json["Id"] == null ? undefined : json["Id"]
+    robotId: json["RobotId"],
+    hasTriggers: json["HasTriggers"] == null ? undefined : json["HasTriggers"]
   };
 }
 
-// ../orchestrator-sdk/generated/src/models/RoleUsersDto.ts
-function RoleUsersDtoFromJSON(json) {
-  return RoleUsersDtoFromJSONTyped(json, false);
+// ../orchestrator-sdk/generated/src/models/UserRoleDto.ts
+function UserRoleDtoFromJSON(json) {
+  return UserRoleDtoFromJSONTyped(json, false);
 }
-function RoleUsersDtoFromJSONTyped(json, ignoreDiscriminator) {
+function UserRoleDtoFromJSONTyped(json, ignoreDiscriminator) {
   if (json == null) {
     return json;
   }
   return {
-    name: json["Name"] == null ? undefined : json["Name"],
-    users: json["Users"] == null ? undefined : json["Users"].map(SimpleUserEntityDtoFromJSON),
+    userId: json["UserId"] == null ? undefined : json["UserId"],
+    roleId: json["RoleId"] == null ? undefined : json["RoleId"],
+    userName: json["UserName"] == null ? undefined : json["UserName"],
+    roleName: json["RoleName"] == null ? undefined : json["RoleName"],
+    roleType: json["RoleType"] == null ? undefined : json["RoleType"],
     id: json["Id"] == null ? undefined : json["Id"]
   };
 }
 
-// ../orchestrator-sdk/generated/src/models/FolderAssignmentsDto.ts
-function FolderAssignmentsDtoFromJSON(json) {
-  return FolderAssignmentsDtoFromJSONTyped(json, false);
-}
-function FolderAssignmentsDtoFromJSONTyped(json, ignoreDiscriminator) {
-  if (json == null) {
-    return json;
-  }
-  return {
-    folder: json["Folder"] == null ? undefined : SimpleFolderDtoFromJSON(json["Folder"]),
-    roles: json["Roles"] == null ? undefined : json["Roles"].map(RoleUsersDtoFromJSON)
-  };
-}
-
 // ../orchestrator-sdk/generated/src/models/FolderDto.ts
 function FolderDtoFromJSON(json) {
   return FolderDtoFromJSONTyped(json, false);
@@ -3764,155 +3753,202 @@ function FolderDtoToJSONTyped(value, ignoreDiscriminator = false) {
   };
 }
 
-// ../orchestrator-sdk/generated/src/models/FolderIdentifier.ts
-function FolderIdentifierFromJSON(json) {
-  return FolderIdentifierFromJSONTyped(json, false);
+// ../orchestrator-sdk/generated/src/models/Folder.ts
+function FolderFromJSON(json) {
+  return FolderFromJSONTyped(json, false);
 }
-function FolderIdentifierFromJSONTyped(json, ignoreDiscriminator) {
+function FolderFromJSONTyped(json, ignoreDiscriminator) {
   if (json == null) {
     return json;
   }
   return {
     id: json["id"] == null ? undefined : json["id"],
     key: json["key"] == null ? undefined : json["key"],
-    path: json["path"] == null ? undefined : json["path"]
+    path: json["path"] == null ? undefined : json["path"],
+    timestamp: json["timestamp"] == null ? undefined : new Date(json["timestamp"]),
+    type: json["type"] == null ? undefined : json["type"],
+    fullyQualifiedName: json["fullyQualifiedName"] == null ? undefined : json["fullyQualifiedName"],
+    displayName: json["displayName"] == null ? undefined : json["displayName"],
+    description: json["description"] == null ? undefined : json["description"],
+    isDeleted: json["isDeleted"] == null ? undefined : json["isDeleted"]
   };
 }
 
-// ../orchestrator-sdk/generated/src/models/FolderMachineInheritDto.ts
-function FolderMachineInheritDtoToJSON(json) {
-  return FolderMachineInheritDtoToJSONTyped(json, false);
+// ../orchestrator-sdk/generated/src/models/FolderAssignDomainUserRequest.ts
+function FolderAssignDomainUserRequestToJSON(json) {
+  return FolderAssignDomainUserRequestToJSONTyped(json, false);
 }
-function FolderMachineInheritDtoToJSONTyped(value, ignoreDiscriminator = false) {
+function FolderAssignDomainUserRequestToJSONTyped(value, ignoreDiscriminator = false) {
   if (value == null) {
     return value;
   }
   return {
-    MachineId: value["machineId"],
-    FolderId: value["folderId"],
-    InheritEnabled: value["inheritEnabled"]
+    assignment: DomainUserAssignmentDtoToJSON(value["assignment"])
   };
 }
 
-// ../orchestrator-sdk/generated/src/models/FolderMachineRobotsDto.ts
-function FolderMachineRobotsDtoToJSON(json) {
-  return FolderMachineRobotsDtoToJSONTyped(json, false);
+// ../orchestrator-sdk/generated/src/models/MachineAssignmentsDto.ts
+function MachineAssignmentsDtoToJSON(json) {
+  return MachineAssignmentsDtoToJSONTyped(json, false);
 }
-function FolderMachineRobotsDtoToJSONTyped(value, ignoreDiscriminator = false) {
+function MachineAssignmentsDtoToJSONTyped(value, ignoreDiscriminator = false) {
   if (value == null) {
     return value;
   }
   return {
-    MachineId: value["machineId"],
-    FolderId: value["folderId"],
-    AddedRobotIds: value["addedRobotIds"],
-    RemovedRobotIds: value["removedRobotIds"]
+    MachineIds: value["machineIds"],
+    FolderIds: value["folderIds"]
   };
 }
 
-// ../orchestrator-sdk/generated/src/models/FolderUpdateNameDescriptionRequest.ts
-function FolderUpdateNameDescriptionRequestToJSON(json) {
-  return FolderUpdateNameDescriptionRequestToJSONTyped(json, false);
+// ../orchestrator-sdk/generated/src/models/FolderAssignMachinesRequest.ts
+function FolderAssignMachinesRequestToJSON(json) {
+  return FolderAssignMachinesRequestToJSONTyped(json, false);
 }
-function FolderUpdateNameDescriptionRequestToJSONTyped(value, ignoreDiscriminator = false) {
+function FolderAssignMachinesRequestToJSONTyped(value, ignoreDiscriminator = false) {
   if (value == null) {
     return value;
   }
   return {
-    name: value["name"],
-    description: value["description"]
+    assignments: MachineAssignmentsDtoToJSON(value["assignments"])
   };
 }
 
-// ../orchestrator-sdk/generated/src/models/MachineVpnSettingsDto.ts
-function MachineVpnSettingsDtoFromJSON(json) {
-  return MachineVpnSettingsDtoFromJSONTyped(json, false);
+// ../orchestrator-sdk/generated/src/models/UserAssignmentsDto.ts
+function UserAssignmentsDtoToJSON(json) {
+  return UserAssignmentsDtoToJSONTyped(json, false);
 }
-function MachineVpnSettingsDtoFromJSONTyped(json, ignoreDiscriminator) {
-  if (json == null) {
-    return json;
+function UserAssignmentsDtoToJSONTyped(value, ignoreDiscriminator = false) {
+  if (value == null) {
+    return value;
   }
   return {
-    cidr: json["cidr"] == null ? undefined : json["cidr"]
+    UserIds: value["userIds"],
+    RolesPerFolder: value["rolesPerFolder"] == null ? undefined : value["rolesPerFolder"].map(FolderRolesDtoToJSON)
   };
 }
 
-// ../orchestrator-sdk/generated/src/models/MaintenanceWindowDto.ts
-function MaintenanceWindowDtoFromJSON(json) {
-  return MaintenanceWindowDtoFromJSONTyped(json, false);
+// ../orchestrator-sdk/generated/src/models/FolderAssignUsersRequest.ts
+function FolderAssignUsersRequestToJSON(json) {
+  return FolderAssignUsersRequestToJSONTyped(json, false);
 }
-function MaintenanceWindowDtoFromJSONTyped(json, ignoreDiscriminator) {
-  if (json == null) {
-    return json;
+function FolderAssignUsersRequestToJSONTyped(value, ignoreDiscriminator = false) {
+  if (value == null) {
+    return value;
   }
   return {
-    enabled: json["enabled"] == null ? undefined : json["enabled"],
-    jobStopStrategy: json["jobStopStrategy"] == null ? undefined : json["jobStopStrategy"],
-    cronExpression: json["cronExpression"] == null ? undefined : json["cronExpression"],
-    timezoneId: json["timezoneId"] == null ? undefined : json["timezoneId"],
-    duration: json["duration"] == null ? undefined : json["duration"],
-    nextExecutionTime: json["nextExecutionTime"] == null ? undefined : new Date(json["nextExecutionTime"])
+    assignments: UserAssignmentsDtoToJSON(value["assignments"])
   };
 }
 
-// ../orchestrator-sdk/generated/src/models/MachinesRobotVersionDto.ts
-function MachinesRobotVersionDtoFromJSON(json) {
-  return MachinesRobotVersionDtoFromJSONTyped(json, false);
+// ../orchestrator-sdk/generated/src/models/SimpleUserEntityDto.ts
+function SimpleUserEntityDtoFromJSON(json) {
+  return SimpleUserEntityDtoFromJSONTyped(json, false);
 }
-function MachinesRobotVersionDtoFromJSONTyped(json, ignoreDiscriminator) {
+function SimpleUserEntityDtoFromJSONTyped(json, ignoreDiscriminator) {
   if (json == null) {
     return json;
   }
   return {
-    count: json["Count"] == null ? undefined : json["Count"],
-    version: json["Version"] == null ? undefined : json["Version"],
-    machineId: json["MachineId"] == null ? undefined : json["MachineId"]
+    key: json["Key"] == null ? undefined : json["Key"],
+    userName: json["UserName"] == null ? undefined : json["UserName"],
+    isInherited: json["IsInherited"] == null ? undefined : json["IsInherited"],
+    assignedToFolderIds: json["AssignedToFolderIds"] == null ? undefined : json["AssignedToFolderIds"],
+    mayHaveAttended: json["MayHaveAttended"] == null ? undefined : json["MayHaveAttended"],
+    mayHaveUnattended: json["MayHaveUnattended"] == null ? undefined : json["MayHaveUnattended"],
+    type: json["Type"] == null ? undefined : json["Type"],
+    source: json["Source"] == null ? undefined : json["Source"],
+    isActive: json["IsActive"] == null ? undefined : json["IsActive"],
+    id: json["Id"] == null ? undefined : json["Id"]
   };
 }
 
-// ../orchestrator-sdk/generated/src/models/UpdatePolicyDto.ts
-function UpdatePolicyDtoFromJSON(json) {
-  return UpdatePolicyDtoFromJSONTyped(json, false);
+// ../orchestrator-sdk/generated/src/models/RoleUsersDto.ts
+function RoleUsersDtoFromJSON(json) {
+  return RoleUsersDtoFromJSONTyped(json, false);
 }
-function UpdatePolicyDtoFromJSONTyped(json, ignoreDiscriminator) {
+function RoleUsersDtoFromJSONTyped(json, ignoreDiscriminator) {
   if (json == null) {
     return json;
   }
   return {
-    type: json["Type"] == null ? undefined : json["Type"],
-    specificVersion: json["SpecificVersion"] == null ? undefined : json["SpecificVersion"]
+    name: json["Name"] == null ? undefined : json["Name"],
+    users: json["Users"] == null ? undefined : json["Users"].map(SimpleUserEntityDtoFromJSON),
+    id: json["Id"] == null ? undefined : json["Id"]
   };
 }
 
-// ../orchestrator-sdk/generated/src/models/RobotUserDto.ts
-function RobotUserDtoFromJSON(json) {
-  return RobotUserDtoFromJSONTyped(json, false);
+// ../orchestrator-sdk/generated/src/models/FolderAssignmentsDto.ts
+function FolderAssignmentsDtoFromJSON(json) {
+  return FolderAssignmentsDtoFromJSONTyped(json, false);
 }
-function RobotUserDtoFromJSONTyped(json, ignoreDiscriminator) {
+function FolderAssignmentsDtoFromJSONTyped(json, ignoreDiscriminator) {
   if (json == null) {
     return json;
   }
   return {
-    userName: json["UserName"] == null ? undefined : json["UserName"],
-    robotId: json["RobotId"],
-    hasTriggers: json["HasTriggers"] == null ? undefined : json["HasTriggers"]
+    folder: json["Folder"] == null ? undefined : SimpleFolderDtoFromJSON(json["Folder"]),
+    roles: json["Roles"] == null ? undefined : json["Roles"].map(RoleUsersDtoFromJSON)
   };
 }
 
-// ../orchestrator-sdk/generated/src/models/UpdateInfoDto.ts
-function UpdateInfoDtoFromJSON(json) {
-  return UpdateInfoDtoFromJSONTyped(json, false);
+// ../orchestrator-sdk/generated/src/models/FolderIdentifier.ts
+function FolderIdentifierFromJSON(json) {
+  return FolderIdentifierFromJSONTyped(json, false);
 }
-function UpdateInfoDtoFromJSONTyped(json, ignoreDiscriminator) {
+function FolderIdentifierFromJSONTyped(json, ignoreDiscriminator) {
   if (json == null) {
     return json;
   }
   return {
-    updateStatus: json["updateStatus"] == null ? undefined : json["updateStatus"],
-    reason: json["reason"] == null ? undefined : json["reason"],
-    targetUpdateVersion: json["targetUpdateVersion"] == null ? undefined : json["targetUpdateVersion"],
-    isCommunity: json["isCommunity"] == null ? undefined : json["isCommunity"],
-    statusInfo: json["statusInfo"] == null ? undefined : json["statusInfo"]
+    id: json["id"] == null ? undefined : json["id"],
+    key: json["key"] == null ? undefined : json["key"],
+    path: json["path"] == null ? undefined : json["path"]
+  };
+}
+
+// ../orchestrator-sdk/generated/src/models/FolderMachineInheritDto.ts
+function FolderMachineInheritDtoToJSON(json) {
+  return FolderMachineInheritDtoToJSONTyped(json, false);
+}
+function FolderMachineInheritDtoToJSONTyped(value, ignoreDiscriminator = false) {
+  if (value == null) {
+    return value;
+  }
+  return {
+    MachineId: value["machineId"],
+    FolderId: value["folderId"],
+    InheritEnabled: value["inheritEnabled"]
+  };
+}
+
+// ../orchestrator-sdk/generated/src/models/FolderMachineRobotsDto.ts
+function FolderMachineRobotsDtoToJSON(json) {
+  return FolderMachineRobotsDtoToJSONTyped(json, false);
+}
+function FolderMachineRobotsDtoToJSONTyped(value, ignoreDiscriminator = false) {
+  if (value == null) {
+    return value;
+  }
+  return {
+    MachineId: value["machineId"],
+    FolderId: value["folderId"],
+    AddedRobotIds: value["addedRobotIds"],
+    RemovedRobotIds: value["removedRobotIds"]
+  };
+}
+
+// ../orchestrator-sdk/generated/src/models/FolderUpdateNameDescriptionRequest.ts
+function FolderUpdateNameDescriptionRequestToJSON(json) {
+  return FolderUpdateNameDescriptionRequestToJSONTyped(json, false);
+}
+function FolderUpdateNameDescriptionRequestToJSONTyped(value, ignoreDiscriminator = false) {
+  if (value == null) {
+    return value;
+  }
+  return {
+    name: value["name"],
+    description: value["description"]
   };
 }
 
@@ -4036,30 +4072,12 @@ function ODataValueOfIEnumerableOfMachineFolderDtoFromJSONTyped(json, ignoreDisc
 function ODataValueOfIEnumerableOfMoveFolderMachineChangeFromJSON(json) {
   return ODataValueOfIEnumerableOfMoveFolderMachineChangeFromJSONTyped(json, false);
 }
-function ODataValueOfIEnumerableOfMoveFolderMachineChangeFromJSONTyped(json, ignoreDiscriminator) {
-  if (json == null) {
-    return json;
-  }
-  return {
-    value: json["value"] == null ? undefined : json["value"].map(MoveFolderMachineChangeFromJSON)
-  };
-}
-
-// ../orchestrator-sdk/generated/src/models/UserRoleDto.ts
-function UserRoleDtoFromJSON(json) {
-  return UserRoleDtoFromJSONTyped(json, false);
-}
-function UserRoleDtoFromJSONTyped(json, ignoreDiscriminator) {
+function ODataValueOfIEnumerableOfMoveFolderMachineChangeFromJSONTyped(json, ignoreDiscriminator) {
   if (json == null) {
     return json;
   }
   return {
-    userId: json["UserId"] == null ? undefined : json["UserId"],
-    roleId: json["RoleId"] == null ? undefined : json["RoleId"],
-    userName: json["UserName"] == null ? undefined : json["UserName"],
-    roleName: json["RoleName"] == null ? undefined : json["RoleName"],
-    roleType: json["RoleType"] == null ? undefined : json["RoleType"],
-    id: json["Id"] == null ? undefined : json["Id"]
+    value: json["value"] == null ? undefined : json["value"].map(MoveFolderMachineChangeFromJSON)
   };
 }
 
@@ -5440,6 +5458,12 @@ async function createOrchestratorConfig(options) {
   };
   if (options?.folderId) {
     headers["X-UIPATH-OrganizationUnitId"] = options.folderId;
+  } else if (options?.folderKey && options?.folderPath) {
+    throw new Error("Provide either folderKey or folderPath, not both.");
+  } else if (options?.folderKey) {
+    headers["X-UIPATH-FolderKey"] = options.folderKey;
+  } else if (options?.folderPath) {
+    headers["X-UIPATH-FolderPath"] = options.folderPath;
   }
   return new Configuration2({
     basePath: orchestratorBasePath,
@@ -5464,40 +5488,42 @@ var registerTestcaseCommand = (program) => {
     if (!ctx)
       return;
     const { tmConfig, projectId } = ctx;
-    try {
-      const testCasesApi = new TestCasesApi(tmConfig);
-      const testCase = await testCasesApi.testCasesCreate({
+    const testCasesApi = new TestCasesApi(tmConfig);
+    const [error, testCase] = await catchError7(testCasesApi.testCasesCreate({
+      projectId,
+      uiPathTestManagementHubTestManagementAbstractionsDTOsCreateTestCaseRequest: {
+        name: options.name,
+        description: options.description ?? "",
         projectId,
-        uiPathTestManagementHubTestManagementAbstractionsDTOsCreateTestCaseRequest: {
-          name: options.name,
-          description: options.description ?? "",
-          projectId,
-          version: options.version
-        }
+        version: options.version
+      }
+    }));
+    if (error) {
+      const { message, details } = await extractErrorDetails6(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
       });
-      OutputFormatter7.success(new SuccessOutput6("TestCaseCreate", {
-        TestCaseKey: testCase.objKey ?? "",
-        Id: testCase.id ?? "",
-        Name: testCase.name ?? "",
-        Description: testCase.description ?? "",
-        Version: testCase.version ?? ""
-      }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
       OutputFormatter7.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext6.exit(1);
+      return;
     }
+    OutputFormatter7.success(new SuccessOutput6("TestCaseCreate", {
+      TestCaseKey: testCase.objKey ?? "",
+      Id: testCase.id ?? "",
+      Name: testCase.name ?? "",
+      Description: testCase.description ?? "",
+      Version: testCase.version ?? ""
+    }));
   });
   testcaseCmd.command("list").description("List all test cases in a Test Manager project.").requiredOption("--project-key <key>", "Test Manager project key (e.g. LEO)").option("--filter <text>", "Filter test cases by name or key").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext6, async (options) => {
     const ctx = await resolveCommandContext(options);
     if (!ctx)
       return;
     const { tmConfig, projectId } = ctx;
-    try {
+    const [error, rows] = await catchError7((async () => {
       const testCasesApi = new TestCasesApi(tmConfig);
       const all = [];
       const top = 50;
@@ -5508,250 +5534,364 @@ var registerTestcaseCommand = (program) => {
           top,
           skip,
           orderby: "name asc",
-          ...options.filter && { search: options.filter }
+          ...options.filter && {
+            search: options.filter
+          }
         });
-        const items = page.data ?? [];
+        const pageRecord = page;
+        const items = pageRecord.data ?? [];
         all.push(...items);
-        const total = page.paging?.total ?? items.length;
+        const paging = pageRecord.paging;
+        const total = paging?.total ?? items.length;
         skip += top;
         if (skip >= total || items.length < top)
           break;
       }
-      const rows = all.map((tc) => ({
+      return all.map((tc) => ({
         TestCaseKey: tc.objKey ?? "",
         Name: tc.name ?? "",
         Version: tc.version ?? "",
         Description: tc.description ?? ""
       }));
-      OutputFormatter7.success(new SuccessOutput6("TestCasesList", rows));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+    })());
+    if (error) {
+      const { message, details } = await extractErrorDetails6(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
+      });
       OutputFormatter7.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext6.exit(1);
+      return;
     }
+    OutputFormatter7.success(new SuccessOutput6("TestCasesList", rows));
   });
   testcaseCmd.command("delete").description("Delete a test case by its key.").requiredOption("--project-key <key>", "Test Manager project key (e.g. LEO)").requiredOption("--test-case-key <key>", "Test case object key (e.g. LEO-42)").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext6, async (options) => {
     const ctx = await resolveCommandContext(options);
     if (!ctx)
       return;
     const { tmConfig, projectId } = ctx;
-    try {
-      const testCasesApi = new TestCasesApi(tmConfig);
-      const testCaseKey = options.testCaseKey;
-      const page = await testCasesApi.testCasesGetTestCases({
-        projectId,
-        search: testCaseKey,
-        top: 50
+    const testCasesApi = new TestCasesApi(tmConfig);
+    const testCaseKey = options.testCaseKey;
+    const [resolveError, page] = await catchError7(testCasesApi.testCasesGetTestCases({
+      projectId,
+      search: testCaseKey,
+      top: 50
+    }));
+    if (resolveError) {
+      const { message, details } = await extractErrorDetails6(resolveError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
       });
-      const items = page.data ?? [];
-      const testCase = items.find((tc) => tc.objKey?.toLowerCase() === testCaseKey.toLowerCase());
-      if (!testCase?.id) {
-        OutputFormatter7.error({
-          Result: "Failure",
-          Message: `Test case '${testCaseKey}' not found.`
-        });
-        processContext6.exit(1);
-        return;
-      }
-      await testCasesApi.testCasesDelete({
-        projectId,
-        id: testCase.id
+      processContext6.exit(1);
+      return;
+    }
+    const pageRecord = page;
+    const items = pageRecord.data ?? [];
+    const testCase = items.find((tc) => tc.objKey?.toLowerCase() === testCaseKey.toLowerCase());
+    if (!testCase?.id) {
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: `Test case '${testCaseKey}' not found.`
       });
-      OutputFormatter7.success(new SuccessOutput6("TestCaseDelete", {
-        TestCaseKey: testCaseKey,
-        Id: testCase.id,
-        Result: "Deleted"
-      }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+      processContext6.exit(1);
+      return;
+    }
+    const [deleteError] = await catchError7(testCasesApi.testCasesDelete({
+      projectId,
+      id: testCase.id
+    }));
+    if (deleteError) {
+      const { message, details } = await extractErrorDetails6(deleteError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
       OutputFormatter7.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext6.exit(1);
+      return;
     }
+    OutputFormatter7.success(new SuccessOutput6("TestCaseDelete", {
+      TestCaseKey: testCaseKey,
+      Id: testCase.id,
+      Result: "Deleted"
+    }));
   });
-  testcaseCmd.command("link-automation").description("Link an Orchestrator package automation to a test case.").requiredOption("--project-key <key>", "Test Manager project key (e.g. LEO)").requiredOption("--test-case-key <key>", "Test case object key (e.g. LEO:2)").requiredOption("--folder-key <uuid>", "Orchestrator folder key UUID (from 'bun run start orch folders list')").requiredOption("--package-name <name>", "Orchestrator package identifier (e.g. ProjCSCrossTestCases)").requiredOption("--test-name <name>", "Test case name inside the package (e.g. MyLeoTest2)").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext6, async (options) => {
+  testcaseCmd.command("link-automation").description("Link an Orchestrator package automation to a test case.").requiredOption("--project-key <key>", "Test Manager project key (e.g. LEO)").requiredOption("--test-case-key <key>", "Test case object key (e.g. LEO:2)").requiredOption("--folder-key <uuid>", "Orchestrator folder key UUID (from 'uip or folders list')").requiredOption("--package-name <name>", "Orchestrator package identifier (e.g. ProjCSCrossTestCases)").requiredOption("--test-name <name>", "Test case name inside the package (e.g. MyLeoTest2)").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext6, async (options) => {
     const ctx = await resolveCommandContext(options);
     if (!ctx)
       return;
     const { tmConfig, tmBaseUrl, projectId, accessToken } = ctx;
     const authHeader = { Authorization: `Bearer ${accessToken}` };
-    try {
-      const testCasesApi = new TestCasesApi(tmConfig);
-      const testCaseKey = options.testCaseKey;
-      const page = await testCasesApi.testCasesGetTestCases({
-        projectId,
-        search: testCaseKey,
-        top: 50
+    const testCasesApi = new TestCasesApi(tmConfig);
+    const testCaseKey = options.testCaseKey;
+    const [resolveError, page] = await catchError7(testCasesApi.testCasesGetTestCases({
+      projectId,
+      search: testCaseKey,
+      top: 50
+    }));
+    if (resolveError) {
+      const { message, details } = await extractErrorDetails6(resolveError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
       });
-      const items = page.data ?? [];
-      const testCase = items.find((tc) => tc.objKey?.toLowerCase() === testCaseKey.toLowerCase());
-      if (!testCase?.id) {
-        OutputFormatter7.error({
-          Result: "Failure",
-          Message: `Test case '${testCaseKey}' not found.`
-        });
-        processContext6.exit(1);
-        return;
-      }
-      const foldersApi = await createApiClient(FoldersApi, {
-        tenant: options.tenant
+      processContext6.exit(1);
+      return;
+    }
+    const pageRecord = page;
+    const items = pageRecord.data ?? [];
+    const testCase = items.find((tc) => tc.objKey?.toLowerCase() === testCaseKey.toLowerCase());
+    if (!testCase?.id) {
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: `Test case '${testCaseKey}' not found.`
       });
-      const foldersResult = await foldersApi.foldersGet({
-        $filter: `Key eq ${options.folderKey}`,
-        $top: 1
+      processContext6.exit(1);
+      return;
+    }
+    const [folderApiError, foldersApi] = await catchError7(createApiClient(FoldersApi, {
+      tenant: options.tenant
+    }));
+    if (folderApiError) {
+      const { message, details } = await extractErrorDetails6(folderApiError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
       });
-      const folderMatch = foldersResult.value?.[0];
-      if (!folderMatch?.displayName) {
-        OutputFormatter7.error({
-          Result: "Failure",
-          Message: `Folder with key '${options.folderKey}' not found.`
-        });
-        processContext6.exit(1);
-        return;
-      }
-      const folderDisplayName = folderMatch.displayName;
-      const search = encodeURIComponent(options.testName);
-      const entryPointsRes = await fetch(`${tmBaseUrl}/api/v2/${projectId}/orchestrator/packageentrypoints?Top=100&Skip=0&Search=${search}&folderKey=${options.folderKey}&DistinctByPackageEntryPointIdAndPackageName=true`, { headers: authHeader });
-      if (!entryPointsRes.ok)
-        throw new Error(`Failed to look up package entry points: ${entryPointsRes.status} ${entryPointsRes.statusText}`);
-      const entryPointsData = await entryPointsRes.json();
-      const entryPoints = entryPointsData.data ?? entryPointsData ?? [];
-      const entryPoint = entryPoints.find((ep) => (ep.packageName ?? ep.packageIdentifier)?.toLowerCase() === options.packageName.toLowerCase() && ep.name?.toLowerCase() === options.testName.toLowerCase());
-      if (!entryPoint) {
-        OutputFormatter7.error({
-          Result: "Failure",
-          Message: `Test '${options.testName}' not found in package '${options.packageName}' for folder '${options.folderKey}'.`
-        });
-        processContext6.exit(1);
-        return;
-      }
-      const packageEntryPointUniqueId = entryPoint.packageEntryPointId;
-      const updateRes = await fetch(`${tmBaseUrl}/api/v2/${projectId}/testcases/${testCase.id}/updatepackageautomation`, {
-        method: "POST",
-        headers: {
-          ...authHeader,
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({
-          testCaseId: testCase.id,
-          packageEntryPointUniqueId,
-          packageIdentifier: options.packageName,
-          packageEntryPointName: options.testName,
-          folderKey: options.folderKey,
-          packageSourceName: folderDisplayName
-        })
+      processContext6.exit(1);
+      return;
+    }
+    const [foldersError, foldersResult] = await catchError7(foldersApi.foldersGet({
+      $filter: `Key eq ${options.folderKey}`,
+      $top: 1
+    }));
+    if (foldersError) {
+      const { message, details } = await extractErrorDetails6(foldersError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
       });
-      if (!updateRes.ok) {
-        const body = await updateRes.text().catch(() => "");
-        throw new Error(`HTTP ${updateRes.status} ${updateRes.statusText}${body ? `: ${body}` : ""}`);
-      }
-      OutputFormatter7.success(new SuccessOutput6("TestCaseLinkAutomation", {
-        TestCaseKey: testCaseKey,
-        PackageName: options.packageName,
-        PackageSource: folderDisplayName,
-        TestName: options.testName,
-        Result: "Linked"
-      }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+      processContext6.exit(1);
+      return;
+    }
+    const folderMatch = foldersResult.value?.[0];
+    if (!folderMatch?.displayName) {
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: `Folder with key '${options.folderKey}' not found.`
+      });
+      processContext6.exit(1);
+      return;
+    }
+    const folderDisplayName = folderMatch.displayName;
+    const search = encodeURIComponent(options.testName);
+    const [epFetchError, entryPointsRes] = await catchError7(fetch(`${tmBaseUrl}/api/v2/${projectId}/orchestrator/packageentrypoints?Top=100&Skip=0&Search=${search}&folderKey=${options.folderKey}&DistinctByPackageEntryPointIdAndPackageName=true`, { headers: authHeader }));
+    if (epFetchError) {
+      const { message, details } = await extractErrorDetails6(epFetchError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
+      });
+      processContext6.exit(1);
+      return;
+    }
+    if (!entryPointsRes.ok) {
+      const { message, details } = await extractErrorDetails6(new Error(`Failed to look up package entry points: ${entryPointsRes.status} ${entryPointsRes.statusText}`), { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
+      });
+      processContext6.exit(1);
+      return;
+    }
+    const entryPointsData = await entryPointsRes.json();
+    const entryPoints = entryPointsData.data ?? entryPointsData ?? [];
+    const entryPoint = entryPoints.find((ep) => (ep.packageName ?? ep.packageIdentifier)?.toLowerCase() === options.packageName.toLowerCase() && ep.name?.toLowerCase() === options.testName.toLowerCase());
+    if (!entryPoint) {
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: `Test '${options.testName}' not found in package '${options.packageName}' for folder '${options.folderKey}'.`
+      });
+      processContext6.exit(1);
+      return;
+    }
+    const packageEntryPointUniqueId = entryPoint.packageEntryPointId;
+    const [updateError, updateRes] = await catchError7(fetch(`${tmBaseUrl}/api/v2/${projectId}/testcases/${testCase.id}/updatepackageautomation`, {
+      method: "POST",
+      headers: {
+        ...authHeader,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({
+        testCaseId: testCase.id,
+        packageEntryPointUniqueId,
+        packageIdentifier: options.packageName,
+        packageEntryPointName: options.testName,
+        folderKey: options.folderKey,
+        packageSourceName: folderDisplayName
+      })
+    }));
+    if (updateError) {
+      const { message, details } = await extractErrorDetails6(updateError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
+      });
+      processContext6.exit(1);
+      return;
+    }
+    if (!updateRes.ok) {
+      const body = await updateRes.text().catch(() => "");
+      const { message, details } = await extractErrorDetails6(new Error(`HTTP ${updateRes.status} ${updateRes.statusText}${body ? `: ${body}` : ""}`), { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
       OutputFormatter7.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext6.exit(1);
+      return;
     }
+    OutputFormatter7.success(new SuccessOutput6("TestCaseLinkAutomation", {
+      TestCaseKey: testCaseKey,
+      PackageName: options.packageName,
+      PackageSource: folderDisplayName,
+      TestName: options.testName,
+      Result: "Linked"
+    }));
   });
   testcaseCmd.command("update").description("Update a test case name or description.").requiredOption("--project-key <key>", "Test Manager project key (e.g. LEO)").requiredOption("--test-case-key <key>", "Test case key (e.g. LEO:1)").option("--name <name>", "New test case name").option("--description <text>", "New test case description").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext6, async (options) => {
     const ctx = await resolveCommandContext(options);
     if (!ctx)
       return;
     const { tmConfig, projectId } = ctx;
-    try {
-      const testCasesApi = new TestCasesApi(tmConfig);
-      const all = await testCasesApi.testCasesGetTestCases({
-        projectId
+    const testCasesApi = new TestCasesApi(tmConfig);
+    const [resolveError, all] = await catchError7(testCasesApi.testCasesGetTestCases({ projectId }));
+    if (resolveError) {
+      const { message, details } = await extractErrorDetails6(resolveError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
       });
-      const items = all.data ?? [];
-      const testCase = items.find((tc) => tc.objKey?.toLowerCase() === options.testCaseKey.toLowerCase());
-      if (!testCase)
-        throw new Error(`Test case '${options.testCaseKey}' not found.`);
-      const operations = [];
-      if (options.name)
-        operations.push({
-          op: "replace",
-          path: "/name",
-          value: options.name
-        });
-      if (options.description !== undefined)
-        operations.push({
-          op: "replace",
-          path: "/description",
-          value: options.description
-        });
-      if (operations.length === 0)
-        throw new Error("Provide at least --name or --description to update.");
-      await testCasesApi.testCasesPatch({
-        id: testCase.id,
-        projectId,
-        operations
+      processContext6.exit(1);
+      return;
+    }
+    const allRecord = all;
+    const items = allRecord.data ?? [];
+    const testCase = items.find((tc) => tc.objKey?.toLowerCase() === options.testCaseKey.toLowerCase());
+    if (!testCase) {
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: `Test case '${options.testCaseKey}' not found.`,
+        Instructions: `Test case '${options.testCaseKey}' not found.`
       });
-      OutputFormatter7.success(new SuccessOutput6("TestCaseUpdate", {
-        TestCaseKey: options.testCaseKey,
-        Name: options.name ?? testCase.name ?? "",
-        Description: options.description ?? testCase.description ?? "",
-        Result: "Updated"
-      }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+      processContext6.exit(1);
+      return;
+    }
+    const operations = [];
+    if (options.name)
+      operations.push({
+        op: "replace",
+        path: "/name",
+        value: options.name
+      });
+    if (options.description !== undefined)
+      operations.push({
+        op: "replace",
+        path: "/description",
+        value: options.description
+      });
+    if (operations.length === 0) {
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: "Provide at least --name or --description to update.",
+        Instructions: "Provide at least --name or --description to update."
+      });
+      processContext6.exit(1);
+      return;
+    }
+    const [patchError] = await catchError7(testCasesApi.testCasesPatch({
+      id: testCase.id,
+      projectId,
+      operations
+    }));
+    if (patchError) {
+      const { message, details } = await extractErrorDetails6(patchError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
       OutputFormatter7.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext6.exit(1);
+      return;
     }
+    OutputFormatter7.success(new SuccessOutput6("TestCaseUpdate", {
+      TestCaseKey: options.testCaseKey,
+      Name: options.name ?? testCase.name ?? "",
+      Description: options.description ?? testCase.description ?? "",
+      Result: "Updated"
+    }));
   });
   testcaseCmd.command("list-testsets").description("List test sets that contain a given test case.").requiredOption("--project-key <key>", "Test Manager project key (e.g. LEO)").requiredOption("--test-case-key <key>", "Test case key (e.g. LEO:1)").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext6, async (options) => {
     const ctx = await resolveCommandContext(options);
     if (!ctx)
       return;
     const { tmConfig, projectId } = ctx;
-    try {
-      const testCasesApi = new TestCasesApi(tmConfig);
-      const all = await testCasesApi.testCasesGetTestCases({
-        projectId
+    const testCasesApi = new TestCasesApi(tmConfig);
+    const [resolveError, all] = await catchError7(testCasesApi.testCasesGetTestCases({ projectId }));
+    if (resolveError) {
+      const { message, details } = await extractErrorDetails6(resolveError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
       });
-      const items = all.data ?? [];
-      const testCase = items.find((tc) => tc.objKey?.toLowerCase() === options.testCaseKey.toLowerCase());
-      if (!testCase)
-        throw new Error(`Test case '${options.testCaseKey}' not found.`);
-      const testSets = await testCasesApi.testCasesGetAssignedTestSets({
-        id: testCase.id,
-        projectId
+      processContext6.exit(1);
+      return;
+    }
+    const allRecord = all;
+    const items = allRecord.data ?? [];
+    const testCase = items.find((tc) => tc.objKey?.toLowerCase() === options.testCaseKey.toLowerCase());
+    if (!testCase) {
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: `Test case '${options.testCaseKey}' not found.`,
+        Instructions: `Test case '${options.testCaseKey}' not found.`
       });
-      const rows = testSets.map((ts) => ({
-        TestSetKey: ts.objKey ?? "",
-        Name: ts.name ?? "",
-        FolderKey: ts.folderKey ?? ""
-      }));
-      OutputFormatter7.success(new SuccessOutput6("TestCaseTestSetsList", rows));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+      processContext6.exit(1);
+      return;
+    }
+    const [testSetsError, testSets] = await catchError7(testCasesApi.testCasesGetAssignedTestSets({
+      id: testCase.id,
+      projectId
+    }));
+    if (testSetsError) {
+      const { message, details } = await extractErrorDetails6(testSetsError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
       OutputFormatter7.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext6.exit(1);
+      return;
     }
+    const rows = testSets.map((ts) => ({
+      TestSetKey: ts.objKey ?? "",
+      Name: ts.name ?? "",
+      FolderKey: ts.folderKey ?? ""
+    }));
+    OutputFormatter7.success(new SuccessOutput6("TestCaseTestSetsList", rows));
   });
   testcaseCmd.command("unlink-automation").description("Unlink the automation from a test case.").requiredOption("--project-key <key>", "Test Manager project key (e.g. LEO)").requiredOption("--test-case-key <key>", "Test case object key (e.g. LEO:2)").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext6, async (options) => {
     const ctx = await resolveCommandContext(options);
@@ -5759,70 +5899,90 @@ var registerTestcaseCommand = (program) => {
       return;
     const { tmConfig, tmBaseUrl, projectId, accessToken } = ctx;
     const authHeader = { Authorization: `Bearer ${accessToken}` };
-    try {
-      const testCasesApi = new TestCasesApi(tmConfig);
-      const testCaseKey = options.testCaseKey;
-      const page = await testCasesApi.testCasesGetTestCases({
-        projectId,
-        search: testCaseKey,
-        top: 50
+    const testCasesApi = new TestCasesApi(tmConfig);
+    const testCaseKey = options.testCaseKey;
+    const [resolveError, page] = await catchError7(testCasesApi.testCasesGetTestCases({
+      projectId,
+      search: testCaseKey,
+      top: 50
+    }));
+    if (resolveError) {
+      const { message, details } = await extractErrorDetails6(resolveError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
       });
-      const items = page.data ?? [];
-      const testCase = items.find((tc) => tc.objKey?.toLowerCase() === testCaseKey.toLowerCase());
-      if (!testCase?.id) {
-        OutputFormatter7.error({
-          Result: "Failure",
-          Message: `Test case '${testCaseKey}' not found.`
-        });
-        processContext6.exit(1);
-        return;
-      }
-      const updateRes = await fetch(`${tmBaseUrl}/api/v2/${projectId}/testcases/${testCase.id}/updatepackageautomation`, {
-        method: "POST",
-        headers: {
-          ...authHeader,
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({
-          testCaseId: testCase.id,
-          packageEntryPointUniqueId: null,
-          packageIdentifier: null,
-          packageEntryPointName: null,
-          folderKey: null,
-          packageSourceName: null
-        })
+      processContext6.exit(1);
+      return;
+    }
+    const pageRecord = page;
+    const items = pageRecord.data ?? [];
+    const testCase = items.find((tc) => tc.objKey?.toLowerCase() === testCaseKey.toLowerCase());
+    if (!testCase?.id) {
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: `Test case '${testCaseKey}' not found.`
       });
-      if (!updateRes.ok) {
-        const body = await updateRes.text().catch(() => "");
-        throw new Error(`HTTP ${updateRes.status} ${updateRes.statusText}${body ? `: ${body}` : ""}`);
-      }
-      OutputFormatter7.success(new SuccessOutput6("TestCaseUnlinkAutomation", {
-        TestCaseKey: testCaseKey,
-        Result: "Unlinked"
-      }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+      processContext6.exit(1);
+      return;
+    }
+    const [updateError, updateRes] = await catchError7(fetch(`${tmBaseUrl}/api/v2/${projectId}/testcases/${testCase.id}/updatepackageautomation`, {
+      method: "POST",
+      headers: {
+        ...authHeader,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({
+        testCaseId: testCase.id,
+        packageEntryPointUniqueId: null,
+        packageIdentifier: null,
+        packageEntryPointName: null,
+        folderKey: null,
+        packageSourceName: null
+      })
+    }));
+    if (updateError) {
+      const { message, details } = await extractErrorDetails6(updateError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
+      OutputFormatter7.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
+      });
+      processContext6.exit(1);
+      return;
+    }
+    if (!updateRes.ok) {
+      const body = await updateRes.text().catch(() => "");
+      const { message, details } = await extractErrorDetails6(new Error(`HTTP ${updateRes.status} ${updateRes.statusText}${body ? `: ${body}` : ""}`), { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
       OutputFormatter7.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext6.exit(1);
+      return;
     }
+    OutputFormatter7.success(new SuccessOutput6("TestCaseUnlinkAutomation", {
+      TestCaseKey: testCaseKey,
+      Result: "Unlinked"
+    }));
   });
-  testcaseCmd.command("list-automations").description("List test entry points available in an Orchestrator folder (use with link-automation).").requiredOption("--project-key <key>", "Test Manager project key (e.g. LEO)").requiredOption("--folder-key <uuid>", "Orchestrator folder key UUID (from 'uip orch folders list')").option("--package-name <name>", "Filter by package name (case-insensitive substring)").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext6, async (options) => {
+  testcaseCmd.command("list-automations").description("List test entry points available in an Orchestrator folder (use with link-automation).").requiredOption("--project-key <key>", "Test Manager project key (e.g. LEO)").requiredOption("--folder-key <uuid>", "Orchestrator folder key UUID (from 'uip or folders list')").option("--package-name <name>", "Filter by package name (case-insensitive substring)").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext6, async (options) => {
     const ctx = await resolveCommandContext(options);
     if (!ctx)
       return;
     const { tmBaseUrl, accessToken, projectId } = ctx;
-    try {
+    const [error, rows] = await catchError7((async () => {
       const all = [];
       const top = 100;
       let skip = 0;
       while (true) {
         const url = `${tmBaseUrl}/api/v2/${projectId}/orchestrator/packageentrypoints` + `?Top=${top}&Skip=${skip}&folderKey=${options.folderKey}` + `&DistinctByPackageEntryPointIdAndPackageName=true`;
         const res = await fetch(url, {
-          headers: { Authorization: `Bearer ${accessToken}` }
+          headers: {
+            Authorization: `Bearer ${accessToken}`
+          }
         });
         if (!res.ok) {
           const body = await res.text().catch(() => "");
@@ -5831,32 +5991,39 @@ var registerTestcaseCommand = (program) => {
         const data = await res.json();
         const items = data.data ?? data ?? [];
         all.push(...items);
-        const total = data.paging?.total ?? data.total ?? items.length;
+        const paging = data.paging;
+        const total = paging?.total ?? data.total ?? items.length;
         skip += top;
         if (skip >= total || items.length < top)
           break;
       }
       const filtered = options.packageName ? all.filter((ep) => ep.packageName?.toLowerCase() === options.packageName.toLowerCase()) : all;
-      const rows = filtered.map((ep) => ({
+      return filtered.map((ep) => ({
         PackageName: ep.packageName ?? "",
         TestName: ep.name ?? "",
         PackageVersion: ep.packageAppVersion ?? ""
       }));
-      OutputFormatter7.success(new SuccessOutput6("TestAutomationsList", rows));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+    })());
+    if (error) {
+      const { message, details } = await extractErrorDetails6(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
+      });
       OutputFormatter7.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext6.exit(1);
+      return;
     }
+    OutputFormatter7.success(new SuccessOutput6("TestAutomationsList", rows));
   });
 };
 
 // src/commands/testset.ts
 import {
+  catchError as catchError8,
+  extractErrorDetails as extractErrorDetails7,
   logger as logger6,
   OutputFormatter as OutputFormatter8,
   processContext as processContext7,
@@ -5869,263 +6036,397 @@ var registerTestsetCommand = (program) => {
     const ctx = await resolveCommandContext(options);
     if (!ctx)
       return;
-    const { tmConfig, projectId } = ctx;
-    try {
-      const testSetsApi = new TestSetsApi(tmConfig);
-      const apiResponse = await testSetsApi.testSetsCreateRaw({
-        projectId,
-        uiPathTestManagementHubTestManagementAbstractionsDTOsCreateTestSetRequest: {
-          name: options.name,
-          description: options.description ?? "",
-          projectId
-        }
+    const { tmConfig, projectId } = ctx;
+    const testSetsApi = new TestSetsApi(tmConfig);
+    const [error, apiResponse] = await catchError8(testSetsApi.testSetsCreateRaw({
+      projectId,
+      uiPathTestManagementHubTestManagementAbstractionsDTOsCreateTestSetRequest: {
+        name: options.name,
+        description: options.description ?? "",
+        projectId
+      }
+    }));
+    if (error) {
+      const { message, details } = await extractErrorDetails7(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
+      });
+      OutputFormatter8.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
+      });
+      processContext7.exit(1);
+      return;
+    }
+    const [jsonError, testSet] = await catchError8(apiResponse.raw.json());
+    if (jsonError) {
+      const { message, details } = await extractErrorDetails7(jsonError, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
       });
-      const testSet = await apiResponse.raw.json();
-      OutputFormatter8.success(new SuccessOutput7("TestSetCreate", {
-        TestSetKey: testSet.objKey ?? "",
-        Name: testSet.name ?? options.name,
-        Description: testSet.description ?? ""
-      }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
       OutputFormatter8.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext7.exit(1);
+      return;
     }
+    OutputFormatter8.success(new SuccessOutput7("TestSetCreate", {
+      TestSetKey: testSet.objKey ?? "",
+      Name: testSet.name ?? options.name,
+      Description: testSet.description ?? ""
+    }));
   });
   testsetCmd.command("delete").description("Delete a test set by its key.").requiredOption("--test-set-key <key>", "Test set object key (e.g. DEMO:42)").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext7, async (options) => {
     const ctx = await resolveCommandContext(options);
     if (!ctx)
       return;
     const { tmConfig, projectId } = ctx;
-    try {
-      const testSetsApi = new TestSetsApi(tmConfig);
-      const testSetKey = options.testSetKey;
-      const testSet = await testSetsApi.testSetsGetTestSetByObjKeyAndProjectId({
-        objKey: testSetKey,
-        projectId
+    const testSetsApi = new TestSetsApi(tmConfig);
+    const testSetKey = options.testSetKey;
+    const [error, testSet] = await catchError8(testSetsApi.testSetsGetTestSetByObjKeyAndProjectId({
+      objKey: testSetKey,
+      projectId
+    }));
+    if (error) {
+      const { message, details } = await extractErrorDetails7(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
       });
-      if (!testSet.id) {
-        OutputFormatter8.error({
-          Result: "Failure",
-          Message: `Test set '${testSetKey}' not found.`
-        });
-        processContext7.exit(1);
-        return;
-      }
-      await testSetsApi.testSetsDelete({
-        id: testSet.id,
-        projectId
+      OutputFormatter8.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
       });
-      OutputFormatter8.success(new SuccessOutput7("TestSetDelete", {
-        TestSetKey: testSetKey,
-        Id: testSet.id,
-        Result: "Deleted"
-      }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+      processContext7.exit(1);
+      return;
+    }
+    if (!testSet.id) {
+      OutputFormatter8.error({
+        Result: "Failure",
+        Message: `Test set '${testSetKey}' not found.`
+      });
+      processContext7.exit(1);
+      return;
+    }
+    const [deleteError] = await catchError8(testSetsApi.testSetsDelete({
+      id: testSet.id,
+      projectId
+    }));
+    if (deleteError) {
+      const { message, details } = await extractErrorDetails7(deleteError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
       OutputFormatter8.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext7.exit(1);
+      return;
     }
+    OutputFormatter8.success(new SuccessOutput7("TestSetDelete", {
+      TestSetKey: testSetKey,
+      Id: testSet.id,
+      Result: "Deleted"
+    }));
   });
   testsetCmd.command("add-testcases").description("Add test cases to a test set.").requiredOption("--test-set-key <key>", "Test set object key (e.g. DEMO:42)").requiredOption("--test-case-keys <keys>", "Comma-separated test case keys to add (e.g. DEMO:1,DEMO:2)").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext7, async (options) => {
     const ctx = await resolveCommandContext(options);
     if (!ctx)
       return;
     const { tmConfig, projectId } = ctx;
-    try {
-      const testSetsApi = new TestSetsApi(tmConfig);
-      const testCasesApi = new TestCasesApi(tmConfig);
-      const testSetKey = options.testSetKey;
-      const testCaseKeys = options.testCaseKeys.split(",").map((k) => k.trim()).filter(Boolean);
-      const testSet = await testSetsApi.testSetsGetTestSetByObjKeyAndProjectId({
-        objKey: testSetKey,
-        projectId
+    const testSetsApi = new TestSetsApi(tmConfig);
+    const testCasesApi = new TestCasesApi(tmConfig);
+    const testSetKey = options.testSetKey;
+    const testCaseKeys = options.testCaseKeys.split(",").map((k) => k.trim()).filter(Boolean);
+    const [error, testSet] = await catchError8(testSetsApi.testSetsGetTestSetByObjKeyAndProjectId({
+      objKey: testSetKey,
+      projectId
+    }));
+    if (error) {
+      const { message, details } = await extractErrorDetails7(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
+      });
+      OutputFormatter8.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
+      });
+      processContext7.exit(1);
+      return;
+    }
+    if (!testSet.id) {
+      OutputFormatter8.error({
+        Result: "Failure",
+        Message: `Test set '${testSetKey}' not found.`
       });
-      if (!testSet.id) {
+      processContext7.exit(1);
+      return;
+    }
+    const testCaseIds = [];
+    for (const tcKey of testCaseKeys) {
+      const [tcError, page] = await catchError8(testCasesApi.testCasesGetTestCases({
+        projectId,
+        search: tcKey,
+        top: 50
+      }));
+      if (tcError) {
+        const { message, details } = await extractErrorDetails7(tcError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
         OutputFormatter8.error({
           Result: "Failure",
-          Message: `Test set '${testSetKey}' not found.`
+          Message: message,
+          Instructions: details
         });
         processContext7.exit(1);
         return;
       }
-      const testCaseIds = [];
-      for (const tcKey of testCaseKeys) {
-        const page = await testCasesApi.testCasesGetTestCases({
-          projectId,
-          search: tcKey,
-          top: 50
+      const items = page.data ?? [];
+      const tc = items.find((t) => t.objKey?.toLowerCase() === tcKey.toLowerCase());
+      if (!tc?.id) {
+        OutputFormatter8.error({
+          Result: "Failure",
+          Message: `Test case '${tcKey}' not found.`
         });
-        const items = page.data ?? [];
-        const tc = items.find((t) => t.objKey?.toLowerCase() === tcKey.toLowerCase());
-        if (!tc?.id) {
-          OutputFormatter8.error({
-            Result: "Failure",
-            Message: `Test case '${tcKey}' not found.`
-          });
-          processContext7.exit(1);
-          return;
-        }
-        testCaseIds.push(tc.id);
+        processContext7.exit(1);
+        return;
       }
-      await testSetsApi.testSetsAssignTestCases({
-        id: testSet.id,
-        projectId,
-        requestBody: testCaseIds
-      });
-      OutputFormatter8.success(new SuccessOutput7("TestSetAddTestCases", {
-        TestSetKey: testSetKey,
-        Added: testCaseKeys.join(", "),
-        Result: "Added"
-      }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+      testCaseIds.push(tc.id);
+    }
+    const [assignError] = await catchError8(testSetsApi.testSetsAssignTestCases({
+      id: testSet.id,
+      projectId,
+      requestBody: testCaseIds
+    }));
+    if (assignError) {
+      const { message, details } = await extractErrorDetails7(assignError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
       OutputFormatter8.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext7.exit(1);
+      return;
     }
+    OutputFormatter8.success(new SuccessOutput7("TestSetAddTestCases", {
+      TestSetKey: testSetKey,
+      Added: testCaseKeys.join(", "),
+      Result: "Added"
+    }));
   });
   testsetCmd.command("update").description("Update a test set name or description.").requiredOption("--test-set-key <key>", "Test set object key (e.g. DEMO:42)").option("--name <name>", "New test set name").option("--description <text>", "New test set description").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext7, async (options) => {
     const ctx = await resolveCommandContext(options);
     if (!ctx)
       return;
     const { tmConfig, projectId } = ctx;
-    try {
-      const testSetsApi = new TestSetsApi(tmConfig);
-      const testSet = await testSetsApi.testSetsGetTestSetByObjKeyAndProjectId({
-        objKey: options.testSetKey,
-        projectId
+    const testSetsApi = new TestSetsApi(tmConfig);
+    const [error, testSet] = await catchError8(testSetsApi.testSetsGetTestSetByObjKeyAndProjectId({
+      objKey: options.testSetKey,
+      projectId
+    }));
+    if (error) {
+      const { message, details } = await extractErrorDetails7(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
       });
-      if (!testSet.id)
-        throw new Error(`Test set '${options.testSetKey}' not found.`);
-      if (!options.name && options.description === undefined)
-        throw new Error("Provide at least --name or --description to update.");
-      await testSetsApi.testSetsUpdate({
-        id: testSet.id,
-        projectId,
-        uiPathTestManagementHubTestManagementAbstractionsDTOsUpdateTestSetRequest: {
-          name: options.name ?? testSet.name,
-          description: options.description ?? testSet.description
-        }
+      OutputFormatter8.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
       });
-      OutputFormatter8.success(new SuccessOutput7("TestSetUpdate", {
-        TestSetKey: options.testSetKey,
-        Name: options.name ?? testSet.name ?? "",
-        Description: options.description ?? testSet.description ?? "",
-        Result: "Updated"
-      }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+      processContext7.exit(1);
+      return;
+    }
+    if (!testSet.id) {
+      OutputFormatter8.error({
+        Result: "Failure",
+        Message: `Test set '${options.testSetKey}' not found.`
+      });
+      processContext7.exit(1);
+      return;
+    }
+    if (!options.name && options.description === undefined) {
+      OutputFormatter8.error({
+        Result: "Failure",
+        Message: "Provide at least --name or --description to update."
+      });
+      processContext7.exit(1);
+      return;
+    }
+    const [updateError] = await catchError8(testSetsApi.testSetsUpdate({
+      id: testSet.id,
+      projectId,
+      uiPathTestManagementHubTestManagementAbstractionsDTOsUpdateTestSetRequest: {
+        name: options.name ?? testSet.name,
+        description: options.description ?? testSet.description
+      }
+    }));
+    if (updateError) {
+      const { message, details } = await extractErrorDetails7(updateError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
       OutputFormatter8.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext7.exit(1);
+      return;
     }
+    OutputFormatter8.success(new SuccessOutput7("TestSetUpdate", {
+      TestSetKey: options.testSetKey,
+      Name: options.name ?? testSet.name ?? "",
+      Description: options.description ?? testSet.description ?? "",
+      Result: "Updated"
+    }));
   });
   testsetCmd.command("remove-testcases").description("Remove test cases from a test set.").requiredOption("--test-set-key <key>", "Test set object key (e.g. DEMO:42)").requiredOption("--test-case-keys <keys>", "Comma-separated test case keys to remove (e.g. DEMO:1,DEMO:2)").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext7, async (options) => {
     const ctx = await resolveCommandContext(options);
     if (!ctx)
       return;
     const { tmConfig, projectId } = ctx;
-    try {
-      const testSetsApi = new TestSetsApi(tmConfig);
-      const testCasesApi = new TestCasesApi(tmConfig);
-      const testSetKey = options.testSetKey;
-      const testCaseKeys = options.testCaseKeys.split(",").map((k) => k.trim()).filter(Boolean);
-      const testSet = await testSetsApi.testSetsGetTestSetByObjKeyAndProjectId({
-        objKey: testSetKey,
-        projectId
+    const testSetsApi = new TestSetsApi(tmConfig);
+    const testCasesApi = new TestCasesApi(tmConfig);
+    const testSetKey = options.testSetKey;
+    const testCaseKeys = options.testCaseKeys.split(",").map((k) => k.trim()).filter(Boolean);
+    const [error, testSet] = await catchError8(testSetsApi.testSetsGetTestSetByObjKeyAndProjectId({
+      objKey: testSetKey,
+      projectId
+    }));
+    if (error) {
+      const { message, details } = await extractErrorDetails7(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
       });
-      if (!testSet.id)
-        throw new Error(`Test set '${testSetKey}' not found.`);
-      const testCaseIds = [];
-      for (const tcKey of testCaseKeys) {
-        const page = await testCasesApi.testCasesGetTestCases({
-          projectId,
-          search: tcKey,
-          top: 50
-        });
-        const items = page.data ?? [];
-        const tc = items.find((t) => t.objKey?.toLowerCase() === tcKey.toLowerCase());
-        if (!tc?.id)
-          throw new Error(`Test case '${tcKey}' not found.`);
-        testCaseIds.push(tc.id);
-      }
-      await testSetsApi.testSetsUnassignTestCases({
-        id: testSet.id,
-        projectId,
-        testCaseIds
+      OutputFormatter8.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
       });
-      OutputFormatter8.success(new SuccessOutput7("TestSetRemoveTestCases", {
-        TestSetKey: testSetKey,
-        Removed: testCaseKeys.join(", "),
-        Result: "Removed"
+      processContext7.exit(1);
+      return;
+    }
+    if (!testSet.id) {
+      OutputFormatter8.error({
+        Result: "Failure",
+        Message: `Test set '${testSetKey}' not found.`
+      });
+      processContext7.exit(1);
+      return;
+    }
+    const testCaseIds = [];
+    for (const tcKey of testCaseKeys) {
+      const [tcError, page] = await catchError8(testCasesApi.testCasesGetTestCases({
+        projectId,
+        search: tcKey,
+        top: 50
       }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+      if (tcError) {
+        const { message, details } = await extractErrorDetails7(tcError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
+        OutputFormatter8.error({
+          Result: "Failure",
+          Message: message,
+          Instructions: details
+        });
+        processContext7.exit(1);
+        return;
+      }
+      const items = page.data ?? [];
+      const tc = items.find((t) => t.objKey?.toLowerCase() === tcKey.toLowerCase());
+      if (!tc?.id) {
+        OutputFormatter8.error({
+          Result: "Failure",
+          Message: `Test case '${tcKey}' not found.`
+        });
+        processContext7.exit(1);
+        return;
+      }
+      testCaseIds.push(tc.id);
+    }
+    const [unassignError] = await catchError8(testSetsApi.testSetsUnassignTestCases({
+      id: testSet.id,
+      projectId,
+      testCaseIds
+    }));
+    if (unassignError) {
+      const { message, details } = await extractErrorDetails7(unassignError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
       OutputFormatter8.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext7.exit(1);
+      return;
     }
+    OutputFormatter8.success(new SuccessOutput7("TestSetRemoveTestCases", {
+      TestSetKey: testSetKey,
+      Removed: testCaseKeys.join(", "),
+      Result: "Removed"
+    }));
   });
   testsetCmd.command("list-testcases").description("List test cases assigned to a test set.").requiredOption("--test-set-key <key>", "Test set object key (e.g. DEMO:42)").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext7, async (options) => {
     const ctx = await resolveCommandContext(options);
     if (!ctx)
       return;
     const { tmConfig, projectId } = ctx;
-    try {
-      const testSetsApi = new TestSetsApi(tmConfig);
-      const testCasesApi = new TestCasesApi(tmConfig);
-      const testSet = await testSetsApi.testSetsGetTestSetByObjKeyAndProjectId({
-        objKey: options.testSetKey,
-        projectId
+    const testSetsApi = new TestSetsApi(tmConfig);
+    const testCasesApi = new TestCasesApi(tmConfig);
+    const [error, testSet] = await catchError8(testSetsApi.testSetsGetTestSetByObjKeyAndProjectId({
+      objKey: options.testSetKey,
+      projectId
+    }));
+    if (error) {
+      const { message, details } = await extractErrorDetails7(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
       });
-      if (!testSet.id)
-        throw new Error(`Test set '${options.testSetKey}' not found.`);
-      const ids = await testSetsApi.testSetsGetAssignedTestCaseIds({
-        id: testSet.id,
-        projectId
+      OutputFormatter8.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
       });
-      if (ids.length === 0) {
-        OutputFormatter8.success(new SuccessOutput7("TestSetTestCasesList", []));
-        return;
-      }
-      const testCases = await testCasesApi.testCasesBatch({
-        projectId,
-        ids
+      processContext7.exit(1);
+      return;
+    }
+    if (!testSet.id) {
+      OutputFormatter8.error({
+        Result: "Failure",
+        Message: `Test set '${options.testSetKey}' not found.`
       });
-      const rows = testCases.map((tc) => ({
-        TestCaseKey: tc.objKey ?? "",
-        Name: tc.name ?? "",
-        Version: tc.version ?? "",
-        Description: tc.description ?? ""
-      }));
-      OutputFormatter8.success(new SuccessOutput7("TestSetTestCasesList", rows));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+      processContext7.exit(1);
+      return;
+    }
+    const [idsError, ids] = await catchError8(testSetsApi.testSetsGetAssignedTestCaseIds({
+      id: testSet.id,
+      projectId
+    }));
+    if (idsError) {
+      const { message, details } = await extractErrorDetails7(idsError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
+      OutputFormatter8.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
+      });
+      processContext7.exit(1);
+      return;
+    }
+    if (ids.length === 0) {
+      OutputFormatter8.success(new SuccessOutput7("TestSetTestCasesList", []));
+      return;
+    }
+    const [batchError, testCases] = await catchError8(testCasesApi.testCasesBatch({
+      projectId,
+      ids
+    }));
+    if (batchError) {
+      const { message, details } = await extractErrorDetails7(batchError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
       OutputFormatter8.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext7.exit(1);
+      return;
     }
+    const rows = testCases.map((tc) => ({
+      TestCaseKey: tc.objKey ?? "",
+      Name: tc.name ?? "",
+      Version: tc.version ?? "",
+      Description: tc.description ?? ""
+    }));
+    OutputFormatter8.success(new SuccessOutput7("TestSetTestCasesList", rows));
   });
   testsetCmd.command("execute").description("Execute a test set and return the execution ID.").requiredOption("--test-set-key <key>", "Test set object key (e.g. DEMO:42). The project key is derived from the prefix (e.g. DEMO).").option("--execution-type <type>", [
     "Type of test cases to execute.",
@@ -6139,73 +6440,97 @@ var registerTestsetCommand = (program) => {
     if (!ctx)
       return;
     const { tmConfig, projectId } = ctx;
-    try {
-      const testSetKey = options.testSetKey;
-      const testSetsApi = new TestSetsApi(tmConfig);
-      logger6.info(`Resolving test set '${testSetKey}'`);
-      const testSet = await testSetsApi.testSetsGetTestSetByObjKeyAndProjectId({
-        objKey: testSetKey,
-        projectId
+    const testSetKey = options.testSetKey;
+    const testSetsApi = new TestSetsApi(tmConfig);
+    logger6.info(`Resolving test set '${testSetKey}'`);
+    const [error, testSet] = await catchError8(testSetsApi.testSetsGetTestSetByObjKeyAndProjectId({
+      objKey: testSetKey,
+      projectId
+    }));
+    if (error) {
+      const { message, details } = await extractErrorDetails7(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
+      });
+      OutputFormatter8.error({
+        Result: "Failure",
+        Message: message,
+        Instructions: details
+      });
+      processContext7.exit(1);
+      return;
+    }
+    if (!testSet.id) {
+      OutputFormatter8.error({
+        Result: "Failure",
+        Message: `Test set '${testSetKey}' not found.`
       });
-      if (!testSet.id) {
+      processContext7.exit(1);
+      return;
+    }
+    if (options.inputPath) {
+      const [overrideError] = await catchError8(overrideTestSetParameters(tmConfig, projectId, testSet.id, options.inputPath));
+      if (overrideError) {
+        const { message, details } = await extractErrorDetails7(overrideError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
         OutputFormatter8.error({
           Result: "Failure",
-          Message: `Test set '${testSetKey}' not found.`
+          Message: message,
+          Instructions: details
         });
         processContext7.exit(1);
         return;
       }
-      if (options.inputPath) {
-        await overrideTestSetParameters(tmConfig, projectId, testSet.id, options.inputPath);
-      }
-      logger6.info(`Starting execution for test set '${testSetKey}' (${testSet.id})`);
-      const execution = await testSetsApi.testSetsStartExecute({
-        id: testSet.id,
-        projectId,
-        executionType: options.executionType
-      });
-      OutputFormatter8.success(new SuccessOutput7("TestSetExecute", {
-        ExecutionId: execution.id ?? "",
-        TestSetKey: testSetKey,
-        Status: execution.status ?? "Running",
-        StartTime: execution.created?.toISOString() ?? ""
-      }));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+    }
+    logger6.info(`Starting execution for test set '${testSetKey}' (${testSet.id})`);
+    const [execError, execution] = await catchError8(testSetsApi.testSetsStartExecute({
+      id: testSet.id,
+      projectId,
+      executionType: options.executionType
+    }));
+    if (execError) {
+      const { message, details } = await extractErrorDetails7(execError, { forbiddenMessage: TM_FORBIDDEN_MESSAGE });
       OutputFormatter8.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext7.exit(1);
+      return;
     }
+    OutputFormatter8.success(new SuccessOutput7("TestSetExecute", {
+      ExecutionId: execution.id ?? "",
+      TestSetKey: testSetKey,
+      Status: execution.status ?? "Running",
+      StartTime: execution.created?.toISOString() ?? ""
+    }));
   });
   testsetCmd.command("list").description("List test sets in a Test Manager project.").requiredOption("--project-key <key>", "Test Manager project key (e.g. DEMO)").option("--folder-key <uuid>", "Filter by Orchestrator folder key (UUID, from 'or folders list')").option("--filter <text>", "Filter test sets by name").option("-t, --tenant <name>", "Tenant name (defaults to authenticated tenant)").option("--log-level <level>", "Log verbosity: debug, info, warn, error", "Information").trackedAction(processContext7, async (options) => {
     const ctx = await resolveCommandContext(options);
     if (!ctx)
       return;
     const { tmConfig, projectId } = ctx;
-    try {
-      const folderKey = options.folderKey;
-      const testSetsApi = new TestSetsApi(tmConfig);
-      logger6.info("Fetching test sets");
-      const allTestSets = await fetchAllTestSets(testSetsApi, projectId, options.filter);
-      const filtered = folderKey ? allTestSets.filter((ts) => ts.folderKey === folderKey) : allTestSets;
-      const rows = filtered.map((ts) => ({
-        TestSetKey: ts.objKey ?? "",
-        Name: ts.name ?? "",
-        FolderKey: ts.folderKey ?? ""
-      }));
-      OutputFormatter8.success(new SuccessOutput7("TestSetsList", rows));
-    } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+    const folderKey = options.folderKey;
+    const testSetsApi = new TestSetsApi(tmConfig);
+    logger6.info("Fetching test sets");
+    const [error, allTestSets] = await catchError8(fetchAllTestSets(testSetsApi, projectId, options.filter));
+    if (error) {
+      const { message, details } = await extractErrorDetails7(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
+      });
       OutputFormatter8.error({
         Result: "Failure",
         Message: message,
         Instructions: details
       });
       processContext7.exit(1);
+      return;
     }
+    const filtered = folderKey ? allTestSets.filter((ts) => ts.folderKey === folderKey) : allTestSets;
+    const rows = filtered.map((ts) => ({
+      TestSetKey: ts.objKey ?? "",
+      Name: ts.name ?? "",
+      FolderKey: ts.folderKey ?? ""
+    }));
+    OutputFormatter8.success(new SuccessOutput7("TestSetsList", rows));
   });
 };
 async function fetchAllTestSets(api, projectId, filter) {
@@ -6222,7 +6547,8 @@ async function fetchAllTestSets(api, projectId, filter) {
     });
     const items = page.data ?? [];
     all.push(...items);
-    const total = page.paging?.total ?? items.length;
+    const paging = page.paging;
+    const total = paging?.total ?? items.length;
     skip += top;
     if (skip >= total || items.length < top)
       break;
@@ -6262,8 +6588,10 @@ async function overrideTestSetParameters(tmConfig, projectId, testSetId, inputPa
 
 // src/commands/wait.ts
 import {
-  logger as logger7,
+  extractErrorDetails as extractErrorDetails8,
   OutputFormatter as OutputFormatter9,
+  PollOutcome,
+  pollUntil,
   processContext as processContext8,
   SuccessOutput as SuccessOutput8
 } from "@uipath/common";
@@ -6278,57 +6606,56 @@ var registerWaitCommand = (program) => {
       const executionsApi = new TestExecutionsApi(tmConfig);
       const executionId = options.executionId;
       const timeoutMs = Number(options.timeout) * 1000;
-      const deadline = timeoutMs > 0 ? Date.now() + timeoutMs : null;
-      const startedAt = Date.now();
-      let lastLogAt = 0;
-      let consecutiveErrors = 0;
-      const MAX_CONSECUTIVE_ERRORS = 3;
-      while (true) {
-        let stats;
-        try {
-          stats = await executionsApi.testExecutionsGetByIdWithStats({
-            id: executionId,
-            projectId
-          });
-          consecutiveErrors = 0;
-        } catch (pollError) {
-          consecutiveErrors++;
-          const msg = pollError instanceof Error ? pollError.message : String(pollError);
-          logger7.warn(`[wait] poll error (${consecutiveErrors}/${MAX_CONSECUTIVE_ERRORS}): ${msg}`);
-          if (consecutiveErrors >= MAX_CONSECUTIVE_ERRORS)
-            throw pollError;
-          await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
-          continue;
-        }
+      const result = await pollUntil({
+        fn: () => executionsApi.testExecutionsGetByIdWithStats({
+          id: executionId,
+          projectId
+        }),
+        until: (stats) => TERMINAL_STATUSES.has((stats.status ?? "pending").toLowerCase()),
+        getStatus: (stats) => stats.status ?? "pending",
+        label: `execution ${executionId}`,
+        logPrefix: "wait",
+        intervalMs: POLL_INTERVAL_MS,
+        timeoutMs,
+        logIntervalMs: POLL_INTERVAL_MS,
+        maxConsecutiveErrors: 3,
+        signal: processContext8.pollSignal
+      });
+      if (result.outcome === PollOutcome.Completed && result.data) {
+        const stats = result.data;
         const status = stats.status ?? "pending";
-        const elapsedMs = Date.now() - startedAt;
-        if (elapsedMs - lastLogAt >= 60000) {
-          logger7.info(`[wait] execution ${executionId} — status: ${status}, elapsed: ${msToDuration(elapsedMs)}`);
-          lastLogAt = elapsedMs;
-        }
-        if (TERMINAL_STATUSES.has(status.toLowerCase())) {
-          const endTime = stats.executionFinished?.toISOString() ?? new Date().toISOString();
-          const durationMs = stats.duration ?? 0;
-          OutputFormatter9.success(new SuccessOutput8("WaitComplete", {
-            ExecutionId: executionId,
-            Status: status,
-            EndTime: endTime,
-            Duration: msToDuration(durationMs)
-          }));
-          return;
-        }
-        if (deadline !== null && Date.now() + POLL_INTERVAL_MS > deadline) {
-          OutputFormatter9.error({
-            Result: "Failure",
-            Message: `Timed out after ${options.timeout}s waiting for execution '${executionId}'. Last status: ${status}.`
-          });
-          processContext8.exit(1);
-          return;
-        }
-        await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
+        const endTime = stats.executionFinished?.toISOString() ?? new Date().toISOString();
+        const durationMs = stats.duration ?? 0;
+        OutputFormatter9.success(new SuccessOutput8("WaitComplete", {
+          ExecutionId: executionId,
+          Status: status,
+          EndTime: endTime,
+          Duration: msToDuration(durationMs)
+        }));
+        return;
       }
+      const lastStatus = result.data?.status ?? "unknown";
+      const EXIT_CODES = {
+        [PollOutcome.Timeout]: 2,
+        [PollOutcome.Failed]: 1,
+        [PollOutcome.Interrupted]: 1,
+        [PollOutcome.Aborted]: 1
+      };
+      const messages = {
+        [PollOutcome.Timeout]: `Timed out after ${options.timeout}s waiting for execution '${executionId}'. Last status: ${lastStatus}.`,
+        [PollOutcome.Failed]: `Polling failed for execution '${executionId}': ${result.error?.message ?? "too many consecutive errors"}`,
+        [PollOutcome.Interrupted]: `Polling interrupted for execution '${executionId}'.`,
+        [PollOutcome.Aborted]: `Polling aborted for execution '${executionId}'.`
+      };
+      OutputFormatter9.error({
+        Result: "Failure",
+        Message: messages[result.outcome] ?? `Polling failed for execution '${executionId}'.`
+      });
+      processContext8.exit(EXIT_CODES[result.outcome] ?? 1);
     } catch (error) {
-      const { message, details } = await extractErrorDetails(error);
+      const { message, details } = await extractErrorDetails8(error, {
+        forbiddenMessage: TM_FORBIDDEN_MESSAGE
+      });
       OutputFormatter9.error({
         Result: "Failure",
         Message: message,
@@ -6346,7 +6673,7 @@ var metadata = {
   description: "Manage test cases, test sets, executions, and results.",
   commandPrefix: "tm"
 };
-var registerCommands = (program) => {
+var registerCommands = async (program) => {
   registerAttachmentCommand(program);
   registerProjectCommand(program);
   registerExecutionCommand(program);