diff --git a/skills/uipath-test/SKILL.md b/skills/uipath-test/SKILL.md
index f963bff95..c81dacd2c 100644
--- a/skills/uipath-test/SKILL.md
+++ b/skills/uipath-test/SKILL.md
@@ -22,17 +22,21 @@ Manage UiPath Test Manager resources (projects, test cases, test sets, execution
 ## Concepts
 ### What is Testmanager?
 
-UiPath Testmanager is a web application that manages the testing lifecycle of projects, enabling requirements traceability, test planning, and reporting. Its key business objects are:
+UiPath Test Manager is a web application that manages the testing lifecycle of projects, enabling requirements traceability, test planning, and reporting. Its key business objects are:
 
 - **Requirements** — Defines what needs to be tested.
-- **Testcases** — Defines the scenarios to be tested
-- **Testsets** — Groups of test cases for execution
-- **Test executions** — Defining triggers and schedules for unattended execution
-- **Testcaselogs** — Logs of a tescase in a execution.
-- **Testcaselog assertions** — Assertion steps of a testcaselog in a execution.
+- **Test cases** — Defines the scenarios to be tested.
+- **Test sets** — Groups of test cases for execution.
+- **Test executions** — Defining triggers and schedules for unattended execution.
+- **Test case logs** — Logs of a test case in an execution.
+- **Test step logs** — Step-level logs within a test case log.
+- **Test case log assertions** — Assertion steps of a test case log in an execution.
 
-CLI tool for UiPath Test Manager (`uip tm`). Use `uip tm --help` and `uip tm <command> <option> --help` to discover all commands and options. **Always pass `--output json`** on every `uip` command (see Critical Rule #2).
-Common `uip tm` (Test Manager) commands organized by resource type:
+CLI tool for UiPath Test Manager (`uip tm`). Use `uip tm --help` and `uip tm <command> <subcommand> --help` to discover commands and options. **Always pass `--output json`** on every `uip` command (see Critical Rule #2).
+
+## Commands
+
+Common `uip tm` commands organized by resource type.
 
 ### Project Commands
 
@@ -47,12 +51,12 @@ Common `uip tm` (Test Manager) commands organized by resource type:
 
 > Get folder keys with `uip or folders list-current-user --output json` — returns all folders visible to the current user. Prefer it over `uip or folders list`, which is a narrower view and may miss folders the user can access.
 
-### TestCase Commands
+### Test Cases Commands
 
 | Command | Purpose |
 |---|---|
 | `uip tm testcases create --project-key <PROJECT_KEY> --name <TEST_CASE_NAME>` | Create a new test case in a Test Manager project. |
-| `uip tm testcases list --project-key <PROJECT_KEY>` | List all test cases in a Test Manager project. |
+| `uip tm testcases list --project-key <PROJECT_KEY>` | List all test cases in a Test Manager project. Optional `--filter <text>` to search by name/key. |
 | `uip tm testcases update --project-key <PROJECT_KEY> --test-case-key <TEST_CASE_KEY> --name <TEST_CASE_NAME>` | Update a test case name or description (at least one of `--name` or `--description` required). |
 | `uip tm testcases delete --project-key <PROJECT_KEY> --test-case-key <TEST_CASE_KEY>` | Delete a test case by its key. |
 | `uip tm testcases link-automation --project-key <PROJECT_KEY> --test-case-key <TEST_CASE_KEY> --folder-key <FOLDER_KEY> --package-name <PACKAGE_NAME> --test-name <TEST_NAME>` | Link an Orchestrator package automation to a test case. |
@@ -60,71 +64,92 @@ Common `uip tm` (Test Manager) commands organized by resource type:
 | `uip tm testcases list-automations --project-key <PROJECT_KEY> --folder-key <FOLDER_KEY>` | List test entry points available in an Orchestrator folder (optional: `--package-name <PACKAGE_NAME>` to filter). |
 | `uip tm testcases list-testsets --project-key <PROJECT_KEY> --test-case-key <TEST_CASE_KEY>` | List test sets that contain a given test case. |
 | `uip tm testcases list-steps --project-key <PROJECT_KEY> --test-case-id <TEST_CASE_ID>` | List test steps for a test case. **Uses `--test-case-id <UUID>`, not `--test-case-key`.** |
-| `uip tm testcases list-result-history --project-key <PROJECT_KEY> --test-case-id <TEST_CASE_ID>` | List testcase log result history for a specific test case. |
-| `uip tm testcases run --project-key <PROJECT_KEY> --test-case-id <TEST_CASE_ID> --execution-type <TYPE>` | Run a new execution for one or more test cases. **Uses `--test-case-id <UUID>` (space-separated for multiple), not `--test-case-key`.** |
-| `uip tm testcases add --test-set-key <TEST_SET_KEY> --test-case-keys <TEST_CASE_KEYS>` | Add test cases to a test set. |
-| `uip tm testcases remove --test-set-key <TEST_SET_KEY> --test-case-keys <TEST_CASE_KEYS>` | Remove test cases from a test set. |
+| `uip tm testcases list-result-history --project-key <PROJECT_KEY> --test-case-id <TEST_CASE_ID>` | List test case log result history for a specific test case. Optional `--only-failed`, `--filter`, `--top`, `--skip`. |
+| `uip tm testcases run --project-key <PROJECT_KEY> --test-case-id <TEST_CASE_ID>` | Start a new execution for one or more test cases. **Uses `--test-case-id <UUID>` (space-separated for multiple).** Optional `--async`, `--name`, `--folder-key`, `--robot-user-key`, `--machine-key`. |
+| `uip tm testcases add --test-set-key <TEST_SET_KEY> --test-case-keys <KEY1,KEY2,...>` | Add test cases to a test set (comma-separated keys). |
+| `uip tm testcases remove --test-set-key <TEST_SET_KEY> --test-case-keys <KEY1,KEY2,...>` | Remove test cases from a test set (comma-separated keys). |
 
-> Get a test case UUID with `uip tm testcases list --project-key <PROJECT_KEY> --output json` and read the `Id` field. The `--test-case-id` flag requires a UUID; the `--test-case-key` flag (used by `update`, `delete`, `link-automation`, `unlink-automation`, `list-testsets`) requires the `PROJECT_KEY:NUMBER` form (e.g., `DEMO:1`). Do not interchange them.
+> **Three flag shapes for test case identifiers — do not interchange:**
+> - `--test-case-id <UUID>` — used by `run`, `list-steps`, `list-result-history`. Get the UUID from `uip tm testcases list --output json` (`Id` field).
+> - `--test-case-key <PROJECT_KEY:NUMBER>` — singular, used by `update`, `delete`, `link-automation`, `unlink-automation`, `list-testsets`. Example: `DEMO:1`.
+> - `--test-case-keys <KEY1,KEY2,...>` — **plural**, comma-separated, used by `testcases add` and `testcases remove` for bulk membership changes on a test set.
 
-### TestSet Commands
+### Test Sets Commands
 
 | Command | Purpose |
 |---|---|
 | `uip tm testsets create --project-key <PROJECT_KEY> --name <TEST_SET_NAME>` | Create a new test set in a Test Manager project. |
-| `uip tm testsets list --project-key <PROJECT_KEY>` | List test sets in a Test Manager project. |
+| `uip tm testsets list --project-key <PROJECT_KEY>` | List test sets in a Test Manager project. Optional `--filter <text>`, `--folder-key`, `--include-last-execution`. |
 | `uip tm testsets update --test-set-key <TEST_SET_KEY> --name <TEST_SET_NAME>` | Update a test set name or description. |
 | `uip tm testsets delete --test-set-key <TEST_SET_KEY>` | Delete a test set by its key. |
 | `uip tm testsets list-testcases --project-key <PROJECT_KEY> --test-set-key <TEST_SET_KEY>` | List test cases assigned to a test set. |
-| `uip tm testsets run --test-set-key <TEST_SET_KEY>` | Run a test set and return the execution ID. |
+| `uip tm testsets run --test-set-key <TEST_SET_KEY>` | Run a test set and return the execution ID. Optional `--execution-type <automated\|manual\|mixed\|none>` (default `automated`), `--input-path <FILE>` for parameter overrides. |
+
+> Keys use the format `PROJECT_KEY:NUMBER` (e.g., `INV:42`). To add or remove test cases in a test set, use `uip tm testcases add` / `uip tm testcases remove` — those verbs live under the `testcases` group, not under `testsets`.
+
+### Executions Commands
+
+| Command | Purpose |
+|---|---|
+| `uip tm executions list --project-key <PROJECT_KEY>` | List top n executions for a project. Optional `--test-set-id <UUID>` to scope to a test set, `--filter <text>`, `--top`, `--skip`. **Use this for the common case** (one test set or a single project query). |
+| `uip tm executions list-filtered --project-key <PROJECT_KEY>` | Rich-filter variant: `--test-set-id`, `--updated-by`, `--search`, `--labels`, `--test-execution-ids`, `--order-by`, `--top`, `--skip`. **Use only when you need label filtering, multi-execution-id lookup, custom ordering, or `--updated-by` filtering** — features `list` does not expose. |
+| `uip tm executions get-stats --execution-id <EXECUTION_ID> --project-key <PROJECT_KEY>` | Get aggregated statistics for a single test execution. |
+| `uip tm executions run --execution-id <EXECUTION_ID> --project-key <PROJECT_KEY> --execution-type <TYPE>` | Re-run an existing test execution. Optional `--test-case-log-ids <UUID...>` to re-run only specific test case logs (space-separated), `--async`. |
+| `uip tm executions retry --execution-id <EXECUTION_ID>` | Retry only the failed test cases of a finished execution. Optional `--project-key`, `--test-set-key`, `--execution-type`. |
+| `uip tm executions testcaselogs list --execution-id <EXECUTION_ID> --project-key <PROJECT_KEY>` | List test case logs of an execution. Optional `--only-failed`, `--filter`, `--top`, `--skip`. **Note the nested subcommand path — this is not a top-level `executions` verb.** |
 
-> Adding/removing test cases to/from a test set lives under `testcases`, not `testsets`: `uip tm testcases add` / `uip tm testcases remove`.
-> Keys use the format `PROJECT_KEY:NUMBER` (e.g., `INV:42`).
+> **`run` lives under three groups, all distinct:**
+> - `uip tm testcases run` — start a new execution for one or more **test cases** (`--test-case-id` UUIDs, space-separated).
+> - `uip tm testsets run` — start a new execution for an entire **test set** (`--test-set-key`).
+> - `uip tm executions run` — **re-run an existing** execution by `--execution-id`, optionally narrowed to specific `--test-case-log-ids`.
 
-### Execution Commands
+### Test Case Log Commands
 
 | Command | Purpose |
 |---|---|
-| `uip tm executions get-stats --execution-id <EXECUTION_ID> --project-key <PROJECT_KEY>` | Get a test execution with aggregated pass/fail/none stats. |
-| `uip tm executions run --execution-id <EXECUTION_ID> --project-key <PROJECT_KEY> --execution-type <TYPE>` | Re-run an existing test execution (optionally a subset via `--test-case-log-ids`). |
-| `uip tm executions retry --execution-id <EXECUTION_ID>` | Retry only the failed test cases of a finished execution. |
-| `uip tm executions list --project-key <PROJECT_KEY> [--test-set-id <TEST_SET_ID>]` | List top n executions for a project or a specific test set. |
-| `uip tm executions list-filtered --project-key <PROJECT_KEY>` | List executions with full filter set (labels, status, interval, ids, order-by). |
-| `uip tm executions testcaselogs list --execution-id <EXECUTION_ID> --project-key <PROJECT_KEY>` | List test case logs of an execution. |
+| `uip tm testcaselog start --project-key <PROJECT_KEY> --execution-id <EXECUTION_ID> --test-case-id <TEST_CASE_ID>` | Start a test case execution within a running test execution. Optional `--run-id <NUMBER>`. |
+| `uip tm testcaselog finish --project-key <PROJECT_KEY> --execution-id <EXECUTION_ID> --test-case-id <TEST_CASE_ID> --has-error <true\|false> --executed-by <USER_ID>` | Finish a started test case execution. Optional `--detail-link <URL>`, `--run-id`, `--is-post-condition-met`. |
+| `uip tm testcaselog list-assertions --project-key <PROJECT_KEY> --test-case-log-id <TEST_CASE_LOG_ID>` | List assertions of a test case log. |
 
-### Testcaselog Commands
+### Test Step Log Commands
 
 | Command | Purpose |
 |---|---|
-| `uip tm testcaselog list-assertions --project-key <PROJECT_KEY> --test-case-log-id <TEST_CASE_LOG_ID>` | List assertions of a testcase log. |
+| `uip tm teststeplog list --project-key <PROJECT_KEY> --test-case-log-id <TEST_CASE_LOG_ID>` | List test step logs for a test case log. |
 
 ### Report Commands
 
 | Command | Purpose |
 |---|---|
-| `uip tm report get --execution-id <EXECUTION_ID>` | Get a summary report for a completed test execution. |
+| `uip tm report get --execution-id <EXECUTION_ID>` | Get a summary report for a completed test execution. Optional `--project-key`, `--test-set-key`, `--query`. |
 
 ### Attachment Commands
 
 | Command | Purpose |
 |---|---|
-| `uip tm attachment download --execution-id <EXECUTION_ID>` | Download attachments for test cases in an execution. |
+| `uip tm attachment download --execution-id <EXECUTION_ID>` | Download attachments for test cases in an execution. Optional `--project-key`, `--test-set-key`, `--test-case-name`, `--only-failed`, `--result-path <DIR>`. |
 
 ### Result Commands
 
 | Command | Purpose |
 |---|---|
-| `uip tm result download --execution-id <EXECUTION_ID>` | Download test execution results as JUnit XML. |
+| `uip tm result download --execution-id <EXECUTION_ID>` | Download test execution results as JUnit XML. Optional `--project-key`, `--test-set-key`, `--result-path <DIR>`. |
 
 ### Wait Commands
 
 | Command | Purpose |
 |---|---|
-| `uip tm wait --execution-id <EXECUTION_ID>` | Wait for a test execution to reach a terminal state. |
+| `uip tm wait --execution-id <EXECUTION_ID>` | Wait for a test execution to reach a terminal state. Optional `--project-key`, `--test-set-key`, `--timeout <SECONDS>`. |
+
+### User Commands
+
+| Command | Purpose |
+|---|---|
+| `uip tm user get` | Get profile data for the currently authenticated user. |
 
 ## Critical Rules
 
-1. **Always check login first** — run `uip login status --output json` before any Test Manager operation. Use `uip login`.
+1. **Always check login first** — run `uip login status --output json` before any Test Manager operation. If not authenticated, run `uip login` to sign in.
 2. **Probe the CLI surface once per session, before the first `uip tm` command.** Run `uip tm testcases --help --output json` (any flags accepted). Result `Success` → post-rename CLI; use the command tables above as-is. `unknown command` / non-zero exit → pre-rename CLI; translate via the [Pre-rename fallbacks](#pre-rename-fallbacks) table before each call. Re-probe on any later `unknown command` error.
 3. **Always pass `--output json`** to every `uip` command — no exceptions. Structured JSON output is what you need to reason about results reliably, even when you only plan to summarize them back to the user.
 4. **Cap retries at 3** for any failing API call. After 3 failures, stop and report the error to the user.
@@ -132,6 +157,7 @@ Common `uip tm` (Test Manager) commands organized by resource type:
 6. **Confirm before delete** — always confirm the target resource key with the user before running any `delete` command.
 7. **For operations requiring folder key** — use `uip or folders list-current-user --output json` (run `/uipath-platform` for folder management details).
 8. **Discover before assuming** — never guess automation names, folder keys, project IDs, or test case keys. Always run the matching `list` command first (e.g., `uip tm testcases list-automations`, `uip or folders list-current-user`).
+9. **Narrow `list` calls server-side when the user names an entity.** When the user provides a name, key, label, or tag, check `uip tm <resource> list --help` (or `uip or <resource> list --help`) for the narrowing flag the command exposes and pass it on the `list` call. Never list all results and filter client-side — it wastes tokens and misses paginated entries. Applies to every entity across `uip tm` and `uip or`.
 
 ### Pre-rename fallbacks
 
@@ -165,24 +191,26 @@ If the probe in Rule #2 shows singular subjects, the CLI predates the closed-ver
   For more authentication details, run `/uipath-platform`.
 
 ```bash
-
   # Get project
   uip tm project list --filter <PROJECT_NAME_OR_KEY> --output json
 
-  # Get testset
+  # List test sets in a project
   uip tm testsets list --project-key <PROJECT_KEY> --filter <TEST_SET_NAME_OR_KEY> --output json
 
-  # Get testcases in a testset
+  # List test cases assigned to a test set
   uip tm testsets list-testcases --project-key <PROJECT_KEY> --test-set-key <TEST_SET_KEY> --output json
 
-  # Get testexecution
+  # List recent executions for a test set
   uip tm executions list --project-key <PROJECT_KEY> --test-set-id <TEST_SET_ID> --top 100 --output json
 
-  # Get testcaselogs in a testexecution
+  # List test case logs for an execution (nested subcommand under `executions`)
   uip tm executions testcaselogs list --execution-id <EXECUTION_ID> --project-key <PROJECT_KEY> --output json
 
-  # Get testcaselog assertions of a testcaselogs
+  # List assertions of a test case log
   uip tm testcaselog list-assertions --project-key <PROJECT_KEY> --test-case-log-id <TEST_CASE_LOG_ID> --output json
+
+  # List step-level logs of a test case log
+  uip tm teststeplog list --project-key <PROJECT_KEY> --test-case-log-id <TEST_CASE_LOG_ID> --output json
 ```
 
 ## Troubleshooting
@@ -207,7 +235,4 @@ If the probe in Rule #2 shows singular subjects, the CLI predates the closed-ver
 
 - **Do NOT proceed if authentication fails** — all Test Manager API calls require a valid bearer token. Fail fast rather than surfacing confusing 401 errors later.
 - **Do NOT skip the surface probe** (Critical Rule #2). On a pre-rename CLI, post-rename commands fail with `unknown command`; on a post-rename CLI, pre-rename commands fail the same way. The skill targets the post-rename surface and falls back per the [Pre-rename fallbacks](#pre-rename-fallbacks) table. Picking the wrong shape without probing burns a retry on every call.
-- **Do NOT guess command names — verb-noun composites are required.** The CLI uses explicit verb-noun forms; bare verbs do not exist. Confirm with `uip tm <resource> --help --output json`. Common landmines:
-  - `uip tm testcases link` ❌ → `uip tm testcases link-automation` ✓
-  - `uip tm testcases unlink` ❌ → `uip tm testcases unlink-automation` ✓
-  - `uip tm executions wait` ❌ → `uip tm wait` ✓ (top-level under `tm`, not `executions`)
\ No newline at end of file
+- **Do NOT guess command names — verb-noun composites are required.** The CLI uses explicit verb-noun forms; bare verbs do not exist. Confirm with `uip tm <resource> --help --output json`.
\ No newline at end of file
diff --git a/skills/uipath-test/references/publish-and-link-guide.md b/skills/uipath-test/references/publish-and-link-guide.md
index 24913de4a..83cd40572 100644
--- a/skills/uipath-test/references/publish-and-link-guide.md
+++ b/skills/uipath-test/references/publish-and-link-guide.md
@@ -7,10 +7,10 @@ End-to-end pipeline: take a UiPath project's coded `[TestCase]` (or any test ent
 ```
 uip rpa pack            → .nupkg
 uip or packages upload  → package on Orchestrator feed
-uip or folders list-current-user  → folder UUID (the --folder-key value)
+uip or folders list-current-user   → folder UUID (the --folder-key value)
 uip tm testcases list-automations  → test entry point name (the --test-name value)
 uip tm testcases link-automation   → test case is bound
-uip tm testcases run  / testsets run   → run
+uip tm testcases run  / testsets run  → run
 uip tm wait              → block until terminal
 ```
 
@@ -73,9 +73,9 @@ uip tm testcases link-automation \
 
 The output should show `Result: "Linked"`. `link-automation` is idempotent on the `(test-case-key, package-name, test-name)` triple — re-running with the same triple replaces the previous link.
 
-## Step 6 — Execute
+## Step 6 — Run
 
-Two execution modes — pick one:
+Two run modes — pick one:
 
 **Single test case** — uses `--test-case-id <UUID>`, NOT `--test-case-key`. Get the UUID from `uip tm testcases list --output json` (`Id` field):
 
@@ -103,9 +103,9 @@ For result download, attachment download, and report generation: see [/uipath:ui
 
 ## Common pitfalls
 
-- **`--test-case-id` (UUID) vs `--test-case-key` (`PROJECT_KEY:NUMBER`).** `link-automation`, `unlink-automation`, `update`, `delete`, `list-testsets` use `--test-case-key`. `run`, `list-steps`, `list-result-history` use `--test-case-id`. They are NOT interchangeable.
+- **`--test-case-id` (UUID) vs `--test-case-key` (`PROJECT_KEY:NUMBER`) vs `--test-case-keys` (plural, comma-separated).** Use `--test-case-key` for `update`, `delete`, `link-automation`, `unlink-automation`, `list-testsets`. Use `--test-case-id` for `run`, `list-steps`, `list-result-history`. Use `--test-case-keys` (plural) for the bulk-association verbs `testcases add` / `testcases remove`. They are NOT interchangeable.
 - **Wrong folder identifier.** `link-automation` requires the UUID. A folder name or path passed in `--folder-key` fails silently with "folder not found" or links to the wrong folder.
 - **Re-uploading the same package version.** Orchestrator rejects duplicates. Bump `--package-version` (or `project.json` `projectVersion`) on every change.
-- **Linking before upload.** `link-automation` does not validate the package exists on Orchestrator at link time — it only validates at execute time. A stale `--package-name` value silently links to nothing and the next execute fails with `package not found`. Always discover via `list-automations` (Step 4) before linking.
+- **Linking before upload.** `link-automation` does not validate the package exists on Orchestrator at link time — it only validates at run time. A stale `--package-name` value silently links to nothing and the next run fails with `package not found`. Always discover via `list-automations` (Step 4) before linking.
 - **Trying `uip tm testcases link` (no suffix).** The command is `link-automation`. Same for `unlink-automation`. See [/uipath:uipath-test § Anti-patterns](../SKILL.md#anti-patterns).
 - **Using the old singular names (`testcase`, `testset`, `execution`).** They were renamed to plural. See [/uipath:uipath-test § Anti-patterns](../SKILL.md#anti-patterns).
diff --git a/skills/uipath-test/references/test-result-report-guide.md b/skills/uipath-test/references/test-result-report-guide.md
index dc528c19f..3f698e1c8 100644
--- a/skills/uipath-test/references/test-result-report-guide.md
+++ b/skills/uipath-test/references/test-result-report-guide.md
@@ -6,14 +6,14 @@ Detailed instructions for generating persona-tailored test reports from UiPath T
 
 - Authenticated session
 - CLI surface probed (see [/uipath:uipath-test § Critical Rules #2](../SKILL.md#critical-rules)). Commands below use the post-rename shape; translate via the [Pre-rename fallbacks](../SKILL.md#pre-rename-fallbacks) table on a pre-rename CLI.
-- A test manager project id
-- A test manager testset id
+- A Test Manager project key
+- A Test Manager test set key
 
 ---
 
 ## Workflow
 
-1. **Fetch test executions from the testset**
+1. **Fetch test executions from the test set**
    - Use options like `status`, `execution-type`, `execution-finished-interval` to filter results as needed
 
 2. **Determine the report persona**
diff --git a/tests/tasks/uipath-test/report_generation.yaml b/tests/tasks/uipath-test/report_generation.yaml
index 84d3ce0c6..e96e56179 100644
--- a/tests/tasks/uipath-test/report_generation.yaml
+++ b/tests/tasks/uipath-test/report_generation.yaml
@@ -48,9 +48,9 @@ success_criteria:
     pass_threshold: 1.0
 
   - type: command_executed
-    description: "Agent listed executions for a test set (`--test-set-id` + `--output json`)"
+    description: "Agent listed executions for a test set (`executions list --test-set-id` + `--output json`)"
     tool_name: "Bash"
-    command_pattern: 'uip\s+tm\s+execution\s+list\s+.*--test-set-id.*--output\s+json|uip\s+tm\s+execution\s+list\s+.*--output\s+json.*--test-set-id'
+    command_pattern: 'uip\s+tm\s+executions\s+list\s+.*--test-set-id.*--output\s+json|uip\s+tm\s+executions\s+list\s+.*--output\s+json.*--test-set-id'
     min_count: 1
     weight: 2.0
     pass_threshold: 1.0
diff --git a/tests/tasks/uipath-test/testset_hierarchy_discovery.yaml b/tests/tasks/uipath-test/testset_hierarchy_discovery.yaml
index f56fae564..33e5584de 100644
--- a/tests/tasks/uipath-test/testset_hierarchy_discovery.yaml
+++ b/tests/tasks/uipath-test/testset_hierarchy_discovery.yaml
@@ -40,17 +40,32 @@ success_criteria:
     pass_threshold: 1.0
 
   - type: command_executed
-    description: "Agent listed test sets scoped to a project (`--project-key` + `--output json`)"
+    description: "Agent listed test sets scoped to a project (`testsets list --project-key` + `--output json`)"
     tool_name: "Bash"
-    command_pattern: 'uip\s+tm\s+testset\s+list\s+.*--project-key.*--output\s+json|uip\s+tm\s+testset\s+list\s+.*--output\s+json.*--project-key'
+    command_pattern: 'uip\s+tm\s+testsets\s+list\s+.*--project-key.*--output\s+json|uip\s+tm\s+testsets\s+list\s+.*--output\s+json.*--project-key'
     min_count: 1
     weight: 2.0
     pass_threshold: 1.0
 
   - type: command_executed
-    description: "Agent listed test cases in a test set (`--test-set-key` + `--output json`)"
+    description: "Agent listed test cases in a test set (`testsets list-testcases --test-set-key` + `--output json`)"
     tool_name: "Bash"
-    command_pattern: 'uip\s+tm\s+testset\s+list-testcases\s+.*--test-set-key.*--output\s+json|uip\s+tm\s+testset\s+list-testcases\s+.*--output\s+json.*--test-set-key'
+    command_pattern: 'uip\s+tm\s+testsets\s+list-testcases\s+.*--test-set-key.*--output\s+json|uip\s+tm\s+testsets\s+list-testcases\s+.*--output\s+json.*--test-set-key'
     min_count: 1
     weight: 2.0
     pass_threshold: 1.0
+
+  - type: run_command
+    description: "Project list returns a non-empty Data array (validates the tenant actually has projects, not just that the agent ran the command)"
+    command: |
+      uip tm project list --output json | python3 -c "
+      import json, sys
+      d = json.load(sys.stdin)
+      assert d.get('Result') == 'Success', f'expected Success, got {d.get(\"Result\")}'
+      data = d.get('Data', [])
+      assert isinstance(data, list) and len(data) > 0, f'expected non-empty list, got {data!r}'
+      "
+    timeout: 30
+    expected_exit_code: 0
+    weight: 1.0
+    pass_threshold: 1.0