@thinkingai/ae-cli 6.0.28 → 6.0.29

package/skills/ae-analysis/references/list_events.md

@@ -8,7 +8,7 @@ Domain: **Metadata Query**
 
 **Fuzzy Search Fallback:** If `--query` returns no results, retry with broader keywords (max 3 attempts), then fall back to full list. See [SKILL.md § C. FUZZY_SEARCH_FALLBACK](../SKILL.md#c-fuzzy_search_fallback).
 
-**Not a builder pre-step:** Do not call `+list_events` before builder-supported ad-hoc analysis (`event`, `retention`, `funnel`, `prop_analysis`). The matching QP builder resolves event names internally. If the builder returns MCP failure, stop and ask for clarification instead of using this command as a fallback.
+**Not a builder pre-step:** Do not call `+list_events` before non-SQL ad-hoc analysis. The matching QP builder resolves event names internally. If the builder returns MCP failure, stop and ask for clarification instead of using this command as a fallback.
 
 ## Use Cases
 - Read-only query for SYSTEM METADATA already effective in the project. Use for super events in production metadata. Do NOT use for tracking-plan metadata (bury/track program); that belongs to BuryProgramTool.

package/skills/ae-analysis/references/list_metrics.md

@@ -8,7 +8,7 @@ Domain: **Metadata Query**
 
 **Fuzzy Search Fallback:** If `--query` returns no results, retry with broader keywords (max 3 attempts), then fall back to full list. See [SKILL.md § C. FUZZY_SEARCH_FALLBACK](../SKILL.md#c-fuzzy_search_fallback).
 
-**Not a builder pre-step:** Do not call `+list_metrics` before `+build_event_analysis_qp`, `+build_retention_analysis_qp`, `+build_funnel_analysis_qp`, or `+build_prop_analysis_qp` for normal ad-hoc analysis. Event builder resolves saved metric names internally when the metric name is passed in `metrics[].event`. If the builder fails, stop and ask for clarification instead of using this command as a fallback.
+**Not a builder pre-step:** Do not call `+list_metrics` before non-SQL ad-hoc analysis. The matching builder resolves referenced metrics internally; the event builder accepts a saved metric name in `metrics[].event`. If the builder fails, stop and ask for clarification instead of using this command as a fallback.
 
 ## Use Cases
 - List metric metadata in the project. Supports keyword filtering and returns metric IDs, names, display names, model types, remarks, and related metadata, but not metric calculation results.

package/skills/ae-analysis/references/list_properties.md

@@ -6,7 +6,7 @@ Domain: **Metadata Query**
 
 ## Constraints
 
-**Not a builder pre-step:** Do not call `+list_properties` before builder-supported ad-hoc analysis (`event`, `retention`, `funnel`, `prop_analysis`). The matching QP builder resolves property names internally. If the builder returns MCP failure, stop and ask for clarification instead of using this command as a fallback.
+**Not a builder pre-step:** Do not call `+list_properties` before non-SQL ad-hoc analysis. The matching QP builder resolves property names internally. If the builder returns MCP failure, stop and ask for clarification instead of using this command as a fallback.
 
 ## Use Cases
 - Read-only query for SYSTEM METADATA properties already effective in the project. Supports event/user scope. Do NOT use for tracking-plan metadata (bury/track program); that belongs to BuryProgramTool.

package/skills/ae-analysis/references/metric_create.md

@@ -1,4 +1,4 @@
-# analysis metric create
+# analysis-meta metric create
 
 Use when the user needs to create a metric from event or retention analysis configuration.
 
@@ -7,8 +7,8 @@ Do not use this command for unrelated analysis queries, ad-hoc query constructio
 Command:
 
 ```bash
-ae-cli analysis metric create --project-id <project_id> --payload '{}'
-ae-cli analysis metric create --dry-run
+ae-cli analysis-meta metric create --project-id <project_id> --payload '{}'
+ae-cli analysis-meta metric create --dry-run
 ```
 
 Capability id: `metadata.metric.create`.

package/skills/ae-analysis/references/metric_delete.md

@@ -1,4 +1,4 @@
-# analysis metric delete
+# analysis-meta metric delete
 
 Use when the user needs to delete a metric.
 
@@ -7,8 +7,8 @@ Do not use this command for unrelated analysis queries, ad-hoc query constructio
 Command:
 
 ```bash
-ae-cli analysis metric delete --project-id <project_id> --metric-id <metric_id>
-ae-cli analysis metric delete --dry-run
+ae-cli analysis-meta metric delete --project-id <project_id> --metric-id <metric_id>
+ae-cli analysis-meta metric delete --dry-run
 ```
 
 Capability id: `metadata.metric.delete`.

package/skills/ae-analysis/references/metric_get.md

@@ -1,4 +1,4 @@
-# analysis metric get
+# analysis-meta metric get
 
 Use when the user needs to get metric definition, events, and params.
 
@@ -7,8 +7,8 @@ Do not use this command for unrelated analysis queries, ad-hoc query constructio
 Command:
 
 ```bash
-ae-cli analysis metric get --project-id <project_id> --metric-id <metric_id>
-ae-cli analysis metric get --dry-run
+ae-cli analysis-meta metric get --project-id <project_id> --metric-id <metric_id>
+ae-cli analysis-meta metric get --dry-run
 ```
 
 Capability id: `metadata.metric.get`.

package/skills/ae-analysis/references/metric_list.md

@@ -1,4 +1,4 @@
-# analysis metric list
+# analysis-meta metric list
 
 Use when the user needs to list project metrics.
 
@@ -7,8 +7,8 @@ Do not use this command for unrelated analysis queries, ad-hoc query constructio
 Command:
 
 ```bash
-ae-cli analysis metric list --project-id <project_id> --ignore-authentication true
-ae-cli analysis metric list --dry-run
+ae-cli analysis-meta metric list --project-id <project_id> --ignore-authentication true
+ae-cli analysis-meta metric list --dry-run
 ```
 
 Capability id: `metadata.metric.list`.

package/skills/ae-analysis/references/metric_update.md

@@ -1,4 +1,4 @@
-# analysis metric update
+# analysis-meta metric update
 
 Use when the user needs to update metric definition, name, and remark.
 
@@ -7,8 +7,8 @@ Do not use this command for unrelated analysis queries, ad-hoc query constructio
 Command:
 
 ```bash
-ae-cli analysis metric update --project-id <project_id> --payload '{}'
-ae-cli analysis metric update --dry-run
+ae-cli analysis-meta metric update --project-id <project_id> --payload '{}'
+ae-cli analysis-meta metric update --dry-run
 ```
 
 Capability id: `metadata.metric.update`.

package/skills/ae-analysis/references/project_space_create.md

@@ -1,15 +1,29 @@
-# analysis project-space create
+# analysis project-space create (L3)
 
 Use when the user explicitly wants to create a project space.
 
-Do not use to create folders inside a space. Use `folder create`.
+Do not use to create folders inside a space. Use `analysis.folder.create` via capability run.
 
-Command:
+This capability has no curated `ae-cli analysis` command. Read [`ae-capability`](../../ae-capability/SKILL.md), then:
 
 ```bash
-ae-cli analysis project-space create --project-id <project_id> [--space-name <name>] [--space-desc <text>] [--avatar-type <type>] [--color-key <key>] [--avatar <value>] [--payload '{...}'] --yes
+ae-cli capability inspect analysis.project_space.create
+ae-cli capability dry-run analysis.project_space.create --input '{"project_id":1,"space_name":"lds-test-071301","avatar_type":1}'
+ae-cli capability run analysis.project_space.create --input '{"project_id":1,"space_name":"lds-test-071301","avatar_type":1}'
 ```
 
-Input sends `project_id` plus optional space metadata and `payload`. `avatar_type` defaults to `1` (word avatar) when omitted. When using `--payload`, put custom avatar fields in the payload or pass explicit top-level flags.
+`risk=write` — no chat confirmation required after dry-run succeeds.
+
+Input uses snake_case JSON. Common fields:
+
+| field | type | required | description |
+| --- | --- | --- | --- |
+| `project_id` | integer | yes | Project ID. |
+| `space_name` | string | no | Project space name. |
+| `space_desc` | string | no | Project space description. |
+| `avatar_type` | integer | no | Avatar type: 1=WORD, 2=ICON, 3=IMAGE. Default 1. |
+| `color_key` | string | no | Avatar color key. |
+| `avatar` | string | no | Avatar content. |
+| `payload` | object | no | Optional snake_case object for complex create payloads. |
 
 Output is the gateway envelope. `data` contains the created project-space result.

package/skills/ae-analysis/references/project_space_delete.md

@@ -1,15 +1,32 @@
-# analysis project-space delete
+# analysis project-space delete (L3)
 
-Use when the user explicitly wants to delete one or more project spaces.
+Use when the user wants to delete one or more project spaces.
 
-Do not use for removing dashboard or folder membership. Use the matching resource command.
+Do not use for removing dashboard or folder membership. Use the matching capability for that resource.
 
-Command:
+This capability has no curated `ae-cli analysis` command. Read [`ae-capability`](../../ae-capability/SKILL.md) High-Risk Confirmation Workflow, then:
+
+**Phase 1 — preview:**
 
 ```bash
-ae-cli analysis project-space delete --project-id <project_id> [--space-id <space_id>] [--space-ids '[1,2]'] --yes
+ae-cli capability inspect analysis.project_space.delete
+ae-cli capability dry-run analysis.project_space.delete --input '{"project_id":1,"space_ids":[10,11]}'
 ```
 
-Input sends `project_id` and either `space_id` or `space_ids`.
+Summarize capability ID, target space IDs, and `risk=high-risk-write` in chat. Ask the user to confirm.
+
+**Phase 2 — execute (only after explicit user confirmation):**
+
+```bash
+ae-cli capability run analysis.project_space.delete --input '{"project_id":1,"space_ids":[10,11]}' --yes
+```
+
+Input uses snake_case JSON. Common fields:
+
+| field | type | required | description |
+| --- | --- | --- | --- |
+| `project_id` | integer | yes | Project ID. |
+| `space_id` | integer | no | Single project space ID. |
+| `space_ids` | integer[] | no | Batch project space IDs. |
 
 Output is the gateway envelope. `data` contains the delete result.

package/skills/ae-analysis/references/project_space_share.md

@@ -1,15 +1,25 @@
-# analysis project-space share
+# analysis project-space share (L3)
 
-Use when the user wants to add, remove, or batch modify project-space sharing members.
+Use when the user wants to modify project-space sharing members.
 
-Do not use to inspect members only. Use `project-space members`.
+Do not use to inspect members only. Use `analysis.project_space.members` via `capability search/inspect/run`; see [`analysis_gateway_assets.md`](analysis_gateway_assets.md) L3 members section.
 
-Command:
+This capability has no curated `ae-cli analysis` command. Read [`ae-capability`](../../ae-capability/SKILL.md), then:
 
 ```bash
-ae-cli analysis project-space share --project-id <project_id> --space-id <space_id> [--payload '{...}'] --yes
+ae-cli capability inspect analysis.project_space.share
+ae-cli capability dry-run analysis.project_space.share --input '{"project_id":1,"space_id":10,"payload":{...}}'
+ae-cli capability run analysis.project_space.share --input '{"project_id":1,"space_id":10,"payload":{...}}'
 ```
 
-Input sends `project_id`, `space_id`, and backend-compatible snake_case `payload`.
+`risk=write` — no chat confirmation required after dry-run succeeds.
+
+Input uses snake_case JSON. Common fields:
+
+| field | type | required | description |
+| --- | --- | --- | --- |
+| `project_id` | integer | yes | Project ID. |
+| `space_id` | integer | yes | Project space ID. |
+| `payload` | object | no | Optional snake_case share/member update payload. Inspect the capability schema before composing it. |
 
 Output is the gateway envelope. `data` contains the share update result.

package/skills/ae-analysis/references/property_changelog_list.md

@@ -1,4 +1,4 @@
-# analysis property changelog-list
+# analysis-meta property changelog-list
 
 Use when the user needs to list property metadata change logs.
 
@@ -7,8 +7,8 @@ Do not use this command for unrelated analysis queries, ad-hoc query constructio
 Command:
 
 ```bash
-ae-cli analysis property changelog-list --project-id <project_id> --table-type <table_type> --prop-name <prop_name>
-ae-cli analysis property changelog-list --dry-run
+ae-cli analysis-meta property changelog-list --project-id <project_id> --table-type <table_type> --prop-name <prop_name>
+ae-cli analysis-meta property changelog-list --dry-run
 ```
 
 Capability id: `metadata.property.changelog_list`.

package/skills/ae-analysis/references/property_create.md

@@ -1,4 +1,4 @@
-# analysis property create
+# analysis-meta property create
 
 Use when the user needs to create event or user properties and optionally associate events.
 
@@ -7,8 +7,8 @@ Do not use this command for unrelated analysis queries, ad-hoc query constructio
 Command:
 
 ```bash
-ae-cli analysis property create --project-id <project_id> --table-type <table_type> --payload '{}'
-ae-cli analysis property create --dry-run
+ae-cli analysis-meta property create --project-id <project_id> --table-type <table_type> --payload '{}'
+ae-cli analysis-meta property create --dry-run
 ```
 
 Capability id: `metadata.property.create`.

package/skills/ae-analysis/references/property_delete.md

@@ -1,4 +1,4 @@
-# analysis property delete
+# analysis-meta property delete
 
 Use when the user needs to batch delete properties or virtual properties.
 
@@ -7,8 +7,8 @@ Do not use this command for unrelated analysis queries, ad-hoc query constructio
 Command:
 
 ```bash
-ae-cli analysis property delete --project-id <project_id> --table-type <table_type> --prop-names '{}'
-ae-cli analysis property delete --dry-run
+ae-cli analysis-meta property delete --project-id <project_id> --table-type <table_type> --prop-names '{}'
+ae-cli analysis-meta property delete --dry-run
 ```
 
 Capability id: `metadata.property.delete`.

package/skills/ae-analysis/references/property_get.md

@@ -1,4 +1,4 @@
-# analysis property get
+# analysis-meta property get
 
 Use when the user needs to get one event or user property metadata detail.
 
@@ -7,8 +7,8 @@ Do not use this command for unrelated analysis queries, ad-hoc query constructio
 Command:
 
 ```bash
-ae-cli analysis property get --project-id <project_id> --table-type <table_type> --prop-name <prop_name>
-ae-cli analysis property get --dry-run
+ae-cli analysis-meta property get --project-id <project_id> --table-type <table_type> --prop-name <prop_name>
+ae-cli analysis-meta property get --dry-run
 ```
 
 Capability id: `metadata.property.get`.

package/skills/ae-analysis/references/property_hide_update.md

@@ -1,4 +1,4 @@
-# analysis property hide-update
+# analysis-meta property hide-update
 
 Use when the user needs to batch hide or show properties.
 
@@ -7,8 +7,8 @@ Do not use this command for unrelated analysis queries, ad-hoc query constructio
 Command:
 
 ```bash
-ae-cli analysis property hide-update --project-id <project_id> --table-type <table_type> --prop-names '{}' --is-hide true
-ae-cli analysis property hide-update --dry-run
+ae-cli analysis-meta property hide-update --project-id <project_id> --table-type <table_type> --prop-names '{}' --is-hide true
+ae-cli analysis-meta property hide-update --dry-run
 ```
 
 Capability id: `metadata.property.hide_update`.

package/skills/ae-analysis/references/property_influence_list.md

@@ -1,4 +1,4 @@
-# analysis property influence-list
+# analysis-meta property influence-list
 
 Use when the user needs to list assets affected by property changes.
 
@@ -7,8 +7,8 @@ Do not use this command for unrelated analysis queries, ad-hoc query constructio
 Command:
 
 ```bash
-ae-cli analysis property influence-list --project-id <project_id> --table-type <table_type> --prop-name <prop_name>
-ae-cli analysis property influence-list --dry-run
+ae-cli analysis-meta property influence-list --project-id <project_id> --table-type <table_type> --prop-name <prop_name>
+ae-cli analysis-meta property influence-list --dry-run
 ```
 
 Capability id: `metadata.property.influence_list`.

package/skills/ae-analysis/references/property_list.md

@@ -1,4 +1,4 @@
-# analysis property list
+# analysis-meta property list
 
 Use when the user needs to list event or user properties.
 
@@ -7,8 +7,8 @@ Do not use this command for unrelated analysis queries, ad-hoc query constructio
 Command:
 
 ```bash
-ae-cli analysis property list --project-id <project_id> --table-type <table_type>
-ae-cli analysis property list --dry-run
+ae-cli analysis-meta property list --project-id <project_id> --table-type <table_type>
+ae-cli analysis-meta property list --dry-run
 ```
 
 Capability id: `metadata.property.list`.

package/skills/ae-analysis/references/property_related_events.md

@@ -1,4 +1,4 @@
-# analysis property related-events
+# analysis-meta property related-events
 
 Use when the user needs to list events related to one event property.
 
@@ -7,8 +7,8 @@ Do not use this command for unrelated analysis queries, ad-hoc query constructio
 Command:
 
 ```bash
-ae-cli analysis property related-events --project-id <project_id> --prop-name <prop_name>
-ae-cli analysis property related-events --dry-run
+ae-cli analysis-meta property related-events --project-id <project_id> --prop-name <prop_name>
+ae-cli analysis-meta property related-events --dry-run
 ```
 
 Capability id: `metadata.property.related_events`.

package/skills/ae-analysis/references/property_relation_update.md

@@ -1,4 +1,4 @@
-# analysis property relation-update
+# analysis-meta property relation-update
 
 Use when the user needs to update property type, connection relation, or event mapping.
 
@@ -7,8 +7,8 @@ Do not use this command for unrelated analysis queries, ad-hoc query constructio
 Command:
 
 ```bash
-ae-cli analysis property relation-update --project-id <project_id> --table-type <table_type> --payload '{}'
-ae-cli analysis property relation-update --dry-run
+ae-cli analysis-meta property relation-update --project-id <project_id> --table-type <table_type> --payload '{}'
+ae-cli analysis-meta property relation-update --dry-run
 ```
 
 Capability id: `metadata.property.relation_update`.

package/skills/ae-analysis/references/property_update.md

@@ -1,4 +1,4 @@
-# analysis property update
+# analysis-meta property update
 
 Use when the user needs to update property display names and remarks.
 
@@ -7,8 +7,8 @@ Do not use this command for unrelated analysis queries, ad-hoc query constructio
 Command:
 
 ```bash
-ae-cli analysis property update --project-id <project_id> --table-type <table_type> --prop-name <prop_name> --prop-desc <prop_desc> --prop-remark <prop_remark>
-ae-cli analysis property update --dry-run
+ae-cli analysis-meta property update --project-id <project_id> --table-type <table_type> --prop-name <prop_name> --prop-desc <prop_desc> --prop-remark <prop_remark>
+ae-cli analysis-meta property update --dry-run
 ```
 
 Capability id: `metadata.property.update`.

package/skills/ae-analysis/references/query_adhoc.md

@@ -6,35 +6,41 @@ Domain: **Model analysis**
 
 ## Constraints
 
-**⚠️ QUERY_EXISTING_FIRST:** Before using ad-hoc query, you MUST first check for existing reports/dashboards with `list_reports` and `list_dashboards`. Only use `query_adhoc` if no matching reports found. See [SKILL.md § D. QUERY_EXISTING_FIRST](../SKILL.md#d-query_existing_first).
+**⚠️ QUERY_EXISTING_FIRST:** Before using ad-hoc query, you MUST first check for existing reports with `+list_reports` and dashboards with `analysis dashboard list`. Only use `query_adhoc` if no matching asset is used. See [SKILL.md § D. QUERY_EXISTING_FIRST](../SKILL.md#d-query_existing_first).
 
-**⚠️ QP_BUILDER_SUPPORTED_MODELS_ONLY:** QP builder supports exactly four ad-hoc model types: `event`, `retention`, `funnel`, and `prop_analysis`.
+**⚠️ QP_BUILDER_SUPPORTED_MODELS_ONLY:** QP builder supports all ten non-SQL ad-hoc model types: `event`, `retention`, `funnel`, `prop_analysis`, `attribution`, `distribution`, `heat_map`, `interval`, `path`, and `rank_list`.
 
-For these four model types, call the matching builder before `query_adhoc`. Do not handcraft QP from `get_analysis_query_schema`, examples, or prior knowledge.
+For these ten model types, call the matching builder before `query_adhoc`. Do not handcraft QP from `get_analysis_query_schema`, examples, or prior knowledge.
 
-For all other model types (`distribution`, `attribution`, `heat_map`, `interval`, `path`, `rank_list`, `sql`), QP builder is not supported. Use the legacy schema/metadata path and construct QP manually according to the model schema.
+Only `sql` has no builder. Use the schema/verified SQL-definition path for SQL.
 
 For builder-supported models, schema/metadata tools are not builder pre-steps. After report/dashboard lookup misses, do not call `get_analysis_query_schema`, `list_events`, `list_properties`, `list_metrics`, `get_metric`, or `get_report_definition` before the builder. The builder resolves event/property/metric metadata internally.
 
-**Hard stop rule:** If builder status is not `generated`, stop and ask the user to clarify or report the builder error. Do not call `query_adhoc`, `get_analysis_query_schema`, or manually assemble QP for `event`, `retention`, `funnel`, or `prop_analysis`.
+**Hard stop rule:** If builder status is not `generated`, stop and ask the user to clarify or report the builder error. Do not call `query_adhoc`, `get_analysis_query_schema`, or manually assemble QP for any of the ten builder-supported models.
 
 Builder mapping:
 1. `event` -> `+build_event_analysis_qp`
 2. `retention` -> `+build_retention_analysis_qp`
 3. `funnel` -> `+build_funnel_analysis_qp`
 4. `prop_analysis` -> `+build_prop_analysis_qp`
+5. `attribution` -> `+build_attribution_analysis_qp`
+6. `distribution` -> `+build_distribution_analysis_qp`
+7. `heat_map` -> `+build_heat_map_analysis_qp`
+8. `interval` -> `+build_interval_analysis_qp`
+9. `path` -> `+build_path_analysis_qp`
+10. `rank_list` -> `+build_rank_list_analysis_qp`
 
 **Quick check workflow:**
 1. `list_reports --query <keyword>` - search matching reports
-2. `list_dashboards --query <keyword>` - search matching dashboards
-3. If found → use `query_report_data` or `query_dashboard_report_data`
-4. If not found and model is builder-supported (`event`/`retention`/`funnel`/`prop_analysis`) → read matching builder reference, call matching builder, then call `query_adhoc` with `model_type` + built `qp`; do not insert schema or metadata lookup before the builder
-5. If not found and model is not builder-supported (`distribution`/`attribution`/`heat_map`/`interval`/`path`/`rank_list`/`sql`) → use the legacy schema/metadata path, then call `query_adhoc`
+2. `ae-cli analysis dashboard list --project-id <project_id> --query <keyword>` - search matching dashboards
+3. If found → use `+query_report_data` or `analysis dashboard-report-data run/export`
+4. If not found and model is non-SQL → read the matching builder reference, call the builder, then call `query_adhoc` with `model_type` + built `qp`; do not insert schema or metadata lookup before the builder
+5. If not found and model is `sql` → use the schema/verified SQL-definition path, then call `query_adhoc`
 
 ## Use Cases
 - Execute a QP produced by the required chain for the target model.
-- Builder-supported models (`event`, `retention`, `funnel`, `prop_analysis`): execute the `qp` returned by builder tools.
-- Non-builder models (`distribution`, `attribution`, `heat_map`, `interval`, `path`, `rank_list`, `sql`): execute handcrafted QP from the legacy schema/metadata path when needed.
+- Builder-supported models (all ten non-SQL models): execute the `qp` returned by builder tools.
+- SQL: execute QP from the schema/verified SQL-definition path.
 - Event analysis: metrics such as event trigger counts, user counts, sums, averages, and more.
 - Retention analysis: metrics such as user churn and retention.
 - Funnel analysis: metrics such as multi-step conversion.
@@ -48,23 +54,29 @@ Builder mapping:
 - SQL: custom SQL analysis.
 - Process:
   - Builder-supported models: builder -> `query_adhoc`
-  - Non-builder models: metadata/schema lookup -> handcraft `qp` -> `query_adhoc`
+  - SQL: schema/verified definition -> `query_adhoc`
 
 ## Builder-Supported Model Chain
-Use this chain only for `event`, `retention`, `funnel`, and `prop_analysis`.
+Use this chain for all ten non-SQL models.
 
 1. Read the matching builder reference:
    - `event`: [`build_event_analysis_qp.md`](./build_event_analysis_qp.md)
    - `retention`: [`build_retention_analysis_qp.md`](./build_retention_analysis_qp.md)
    - `funnel`: [`build_funnel_analysis_qp.md`](./build_funnel_analysis_qp.md)
    - `prop_analysis`: [`build_prop_analysis_qp.md`](./build_prop_analysis_qp.md)
+   - `attribution`: [`build_attribution_analysis_qp.md`](./build_attribution_analysis_qp.md)
+   - `distribution`: [`build_distribution_analysis_qp.md`](./build_distribution_analysis_qp.md)
+   - `heat_map`: [`build_heat_map_analysis_qp.md`](./build_heat_map_analysis_qp.md)
+   - `interval`: [`build_interval_analysis_qp.md`](./build_interval_analysis_qp.md)
+   - `path`: [`build_path_analysis_qp.md`](./build_path_analysis_qp.md)
+   - `rank_list`: [`build_rank_list_analysis_qp.md`](./build_rank_list_analysis_qp.md)
 2. Compose the builder JSON using the documented DTO keys. Nested JSON keys are camelCase, not snake_case.
 3. Run the builder with all required flags. `--dry-run` is allowed only with complete required builder inputs, not by itself.
 4. If builder returns `status=generated`, copy `data.qp` from the builder response and pass it as `--qp`.
-5. If the builder returns `need_clarification`, `invalid_argument`, `unsupported_feature`, or `validation_error`, stop and ask for clarification. Do not use the legacy/manual path as a fallback for these four models.
+5. If the builder returns `need_clarification`, `invalid_argument`, `unsupported_feature`, or `validation_error`, stop and ask for clarification. Do not use the manual path as a fallback.
 
 ## Legacy Query Chain
-Use this chain only for `distribution`, `attribution`, `heat_map`, `interval`, `path`, `rank_list`, and `sql`.
+Use this chain only for `sql`.
 
 1. Read this reference and the required schema/metadata references.
 2. Call `+get_analysis_query_schema` for the target model when the QP shape is not already verified.
@@ -88,7 +100,7 @@ ae-cli analysis +query_adhoc --project_id <project_id> --model_type <model_type>
 |---|---|---|
 | `--project_id` / `-p` | Yes | Project ID used to identify the analysis project |
 | `--model_type` | Yes | Model type. Supported values: event, retention, funnel, distribution, attribution, heat_map, interval, path, rank_list, prop_analysis, sql. |
-| `--qp` | Yes | Query parameter JSON. For `event`/`retention`/`funnel`/`prop_analysis`, pass QP returned by the matching builder tool. For non-builder models, construct QP through the legacy schema/metadata path. |
+| `--qp` | Yes | Query parameter JSON. For every non-SQL model, pass QP returned by the matching builder tool. For SQL, use the schema/verified-definition path. |
 | `--request_id` | Yes | Required unique request ID used for tracking and cancellation. Generate it before starting the query. It must use `mcp_<32 lowercase hex UUID>`, for example `mcp_0123456789abcdef0123456789abcdef`. Provide this before starting the query so it can be cancelled later with `+cancel_query --request_id <same value>`, even if the caller stops waiting before the tool returns. If `fetch failed`, HTTP timeout, or caller timeout happens, the backend query may still be running. `requestId` is not auto-generated for MCP query tools because the caller must know it before the response for proactive cleanup. If omitted or blank, the backend returns `REQUEST_ID_REQUIRED`; invalid format returns `INVALID_REQUEST_ID`. The response `metadata.requestId` echoes the supplied requestId and can also be passed to `cancel_query(requestId)` when the query is no longer needed. |
 | `--use_cache` | No | Whether to use result cache. Default: true |
 | `--zone_offset` | No | Time zone offset in hours. For example, UTC+8 is 8 and UTC-5 is -5 |
@@ -101,20 +113,20 @@ ae-cli analysis +query_adhoc --project_id <project_id> --model_type <model_type>
 
 ## Decision Rules
 - On the first run, include all required parameters (`--project_id`,`--model_type`,`--qp`,`--request_id`). Generate `--request_id` before starting the query so cancellation can use the same value if the caller stops waiting.
-- Do not call this command with placeholder QP such as `{}`. For builder-supported models, wait for builder `status=generated`; for non-builder models, build QP from verified schema/metadata first.
+- Do not call this command with placeholder QP such as `{}`. For non-SQL models, wait for builder `status=generated`; for SQL, build QP from a verified schema/definition first.
 - For builder-supported models, do not run metadata/schema lookup to "help" the builder. The builder is the metadata resolver.
 - For pagination, use `--limit` and `--offset` together. Default limit is 1000, maximum 100000.
 - For `model_type=sql`, use exactly one row limit: either put `LIMIT` in the SQL, or use `--limit`. If both are present they must be equal — `query_adhoc` rejects mismatched values to avoid silently sampled or duplicated results. When the SQL already has a trailing `LIMIT`, you may omit `--limit` and the SQL governs.
 - Use `--fields` to select specific columns for lighter response payloads.
-- `event`, `retention`, `funnel`, and `prop_analysis` must not manually craft QP with schema-first flow; call the builder and use the returned `qp`.
-- For non-builder models, `qp` must satisfy both schema structure and project metadata constraints.
+- Non-SQL models must not manually craft QP with schema-first flow; call the matching builder and use its returned `qp`.
+- For SQL, `qp` must satisfy both schema structure and project metadata constraints.
 - Wrap JSON parameters in single quotes (for example `--qp '<real_qp_json>'`) to avoid shell escaping issues.
 - For cross-project troubleshooting, first confirm whether `--project_id` matches the current permissions and target environment.
 - If the user supplied a timezone such as UTC-11, pass `--zone_offset -11` here, not to the builder.
 
 ## Next Steps on Failure
 - If required parameters are missing, resolve `project_id`, `model_type`, and a real `qp` first. Do not run placeholder calls except explicit `--dry-run` validation.
-- If a builder returns non-`generated` status for `event`, `retention`, `funnel`, or `prop_analysis`, stop and ask user to clarify before calling `query_adhoc`.
+- If a builder returns non-`generated` status, stop and ask the user to clarify before calling `query_adhoc`.
 - If `Invalid JSON` appears on legacy manual QP paths, first check schema required fields, then verify whether event/property names come from metadata query results for the same `project_id`.
 - If the query returns `fetch failed`, hits an HTTP timeout, or the caller stops waiting after you preset `--request_id`, immediately call `+cancel_query --request_id <same value> --yes`; the backend query may still be running.
 - If the query times out inside the service and returns `QUERY_TIMEOUT`, use the returned `metadata.requestId` for cancellation if further cleanup is needed, then narrow the time range / grouping dimensions and split subqueries to locate the issue.
@@ -124,5 +136,6 @@ ae-cli analysis +query_adhoc --project_id <project_id> --model_type <model_type>
 - +build_retention_analysis_qp -> +query_adhoc
 - +build_funnel_analysis_qp -> +query_adhoc
 - +build_prop_analysis_qp -> +query_adhoc
-- +get_analysis_query_schema -> analysis_meta +list_events -> analysis_meta +list_properties -> +query_adhoc (non-builder models only)
+- +build_attribution_analysis_qp / +build_distribution_analysis_qp / +build_heat_map_analysis_qp / +build_interval_analysis_qp / +build_path_analysis_qp / +build_rank_list_analysis_qp -> +query_adhoc
+- +get_analysis_query_schema -> +query_adhoc (SQL only)
 - +list_events -> +list_properties -> +query_adhoc -> +drilldown_users -> +drilldown_user_events

package/skills/ae-analysis/references/super_metadata_export.md

@@ -1,4 +1,4 @@
-# analysis super-metadata export
+# analysis-meta super-metadata export
 
 Use when the user needs to export super event and super property configuration.
 
@@ -7,9 +7,9 @@ Do not use this command for unrelated analysis queries, ad-hoc query constructio
 Command:
 
 ```bash
-ae-cli analysis super-metadata export --project-id <project_id>
-ae-cli analysis super-metadata export --project-id <project_id> --request-id cli_0123456789abcdef0123456789abcdef --timeout-seconds 3600
-ae-cli analysis super-metadata export --dry-run
+ae-cli analysis-meta super-metadata export --project-id <project_id>
+ae-cli analysis-meta super-metadata export --project-id <project_id> --request-id cli_0123456789abcdef0123456789abcdef --timeout-seconds 3600
+ae-cli analysis-meta super-metadata export --dry-run
 ```
 
 Capability id: `metadata.super_metadata.export`.

package/skills/ae-analysis/references/super_metadata_import.md

@@ -1,4 +1,4 @@
-# analysis super-metadata import
+# analysis-meta super-metadata import
 
 Use when the user needs to pre-import and confirm-import super event and super property configuration.
 
@@ -7,8 +7,8 @@ Do not use this command for unrelated analysis queries, ad-hoc query constructio
 Command:
 
 ```bash
-ae-cli analysis super-metadata import --project-id <project_id> --payload '{}'
-ae-cli analysis super-metadata import --dry-run
+ae-cli analysis-meta super-metadata import --project-id <project_id> --payload '{}'
+ae-cli analysis-meta super-metadata import --dry-run
 ```
 
 Capability id: `metadata.super_metadata.import`.

package/skills/ae-analysis/references/update_report.md

@@ -11,8 +11,8 @@ Domain: **Report Management**
 
 ## Commands
 ```bash
-ae-cli analysis +update_report --project_id <project_id> --report_id <report_id> --version <version> --report_name "New Name"
-ae-cli analysis +update_report --project_id <project_id> --report_id <report_id> --version <version> --qp '<qp_json>' --report_model 1
+ae-cli analysis +update_report --project_id <project_id> --report_id <report_id> --report_version <version> --report_name "New Name"
+ae-cli analysis +update_report --project_id <project_id> --report_id <report_id> --report_version <version> --qp '<qp_json>' --report_model 1
 ae-cli analysis +update_report --dry-run
 ```
 
@@ -21,7 +21,7 @@ ae-cli analysis +update_report --dry-run
 |---|---|---|
 | `--project_id` / `-p` | Yes | Project ID |
 | `--report_id` | Yes | Report ID to update |
-| `--version` | Yes | Current report version number. Retrieve via `+get_report_definition`. |
+| `--report_version` | Yes | Current report version number. Retrieve via `+get_report_definition`. This name avoids Commander intercepting the global `--version` flag. |
 | `--report_name` | No | New report name. Omit to keep existing. |
 | `--report_desc` | No | New report description. Omit to keep existing. |
 | `--qp` | No | New QP JSON string. Omit to keep existing. When provided, also supply `--report_model`. |

package/skills/ae-analysis/references/virtual_event_create.md

@@ -1,4 +1,4 @@
-# analysis virtual-event create
+# analysis-meta virtual-event create
 
 Use when the user needs to create a virtual event from events and filters.
 
@@ -7,8 +7,8 @@ Do not use this command for unrelated analysis queries, ad-hoc query constructio
 Command:
 
 ```bash
-ae-cli analysis virtual-event create --project-id <project_id> --override true --payload '{}'
-ae-cli analysis virtual-event create --dry-run
+ae-cli analysis-meta virtual-event create --project-id <project_id> --override true --payload '{}'
+ae-cli analysis-meta virtual-event create --dry-run
 ```
 
 Capability id: `metadata.virtual_event.create`.