@thinkingai/ae-cli 6.0.34 → 6.0.35

package/dist/{te-analysis-Q7AZCDU4.js → te-analysis-HZIP6SYW.js}

@@ -19,158 +19,12 @@ import {
 import {
   withOutputMetadata
 } from "./chunk-IMMGMU54.js";
-import {
-  callMcpTool,
-  parseMcpResult,
-  resolveMcpUrl
-} from "./chunk-3P3562ZX.js";
-import {
-  isGlobalQueryModeEnabled
-} from "./chunk-LCXU3AAT.js";
 import "./chunk-E7UXXHO3.js";
 import "./chunk-IR4ZLVPW.js";
 import "./chunk-V6FR6WTW.js";
 import "./chunk-24BAVOX3.js";
 import "./chunk-LYVNONC4.js";
 
-// src/commands/te-analysis/shared.ts
-function createMcpCommand(config) {
-  const toolName = config.command.slice(1);
-  const mcpService = config.mcpService || "analysis";
-  return {
-    service: "analysis",
-    command: config.command,
-    description: config.description,
-    flags: config.flags,
-    risk: config.risk,
-    validate: config.validate,
-    dryRun: (ctx) => ({
-      method: "tools/call",
-      url: resolveMcpUrl(ctx.mcpUrl(), ctx.host(), mcpService),
-      body: {
-        name: toolName,
-        arguments: config.buildArgs(ctx)
-      }
-    }),
-    execute: async (ctx) => {
-      const url = resolveMcpUrl(ctx.mcpUrl(), ctx.host(), mcpService);
-      const result = await callMcpTool(url, toolName, config.buildArgs(ctx), ctx.host());
-      return parseMcpResult(result);
-    }
-  };
-}
-function optionalString(ctx, name) {
-  const value = ctx.str(name);
-  return value === "" ? void 0 : value;
-}
-function optionalNumber(ctx, name) {
-  const value = ctx.str(name);
-  return value === "" ? void 0 : Number(value);
-}
-function optionalBoolean(ctx, name) {
-  const value = ctx.str(name);
-  return value === "" ? void 0 : ctx.bool(name);
-}
-function requiredJsonString(ctx, name) {
-  return JSON.stringify(ctx.json(name));
-}
-
-// src/commands/te-analysis/meta/get-alert-definition-schema.ts
-var getAlertDefinitionSchema = createMcpCommand({
-  command: "+get_alert_definition_schema",
-  description: "Get the alert definition schema. Returns field definitions, enum descriptions, and examples for creating or updating alerts.",
-  flags: [],
-  risk: "read",
-  mcpService: "te_analysis_extend",
-  buildArgs: () => ({})
-});
-
-// src/commands/te-analysis/meta/list-alerts.ts
-var listAlerts = createMcpCommand({
-  command: "+list_alerts",
-  description: "List all alerts in the project. Supports keyword filtering by alert name and returns a paginated alert list with total count.",
-  flags: [
-    { name: "project_id", type: "number", required: true, alias: "p", desc: "Project ID" },
-    { name: "query", type: "string", required: false, alias: "q", desc: "Optional keyword filter. Performs fuzzy matching against alert names; if omitted, all alerts are returned." },
-    { name: "limit", type: "number", required: false, alias: "l", desc: "Optional page size. Default: 50, maximum: 200.", min: 1, max: 200 },
-    { name: "offset", type: "number", required: false, alias: "o", desc: "Optional page offset. Default: 0." }
-  ],
-  risk: "read",
-  mcpService: "te_analysis_extend",
-  buildArgs: (ctx) => ({
-    projectId: ctx.num("project_id"),
-    query: optionalString(ctx, "query"),
-    limit: optionalNumber(ctx, "limit"),
-    offset: optionalNumber(ctx, "offset")
-  })
-});
-
-// src/commands/te-analysis/meta/get-alert.ts
-var getAlert = createMcpCommand({
-  command: "+get_alert",
-  description: "Get detailed information about a specific alert by alertId.",
-  flags: [
-    { name: "project_id", type: "number", required: true, alias: "p", desc: "Project ID" },
-    { name: "alert_id", type: "number", required: true, alias: "a", desc: "Alert ID" }
-  ],
-  risk: "read",
-  mcpService: "te_analysis_extend",
-  buildArgs: (ctx) => ({
-    projectId: ctx.num("project_id"),
-    alertId: ctx.num("alert_id")
-  })
-});
-
-// src/commands/te-analysis/meta/create-alert.ts
-var createAlert = createMcpCommand({
-  command: "+create_alert",
-  description: "Create a new alert. After creation, use list_alerts or get_alert to retrieve the created alert.",
-  flags: [
-    { name: "project_id", type: "number", required: true, alias: "p", desc: "Project ID" },
-    { name: "definition", type: "json", required: true, desc: "Alert definition JSON. See +get_alert_definition_schema for the complete structure." }
-  ],
-  risk: "write",
-  mcpService: "te_analysis_extend",
-  buildArgs: (ctx) => ({
-    projectId: ctx.num("project_id"),
-    definition: requiredJsonString(ctx, "definition")
-  })
-});
-
-// src/commands/te-analysis/meta/update-alert.ts
-var updateAlert = createMcpCommand({
-  command: "+update_alert",
-  description: "Update an existing alert. All fields in the definition will replace existing values.",
-  flags: [
-    { name: "project_id", type: "number", required: true, alias: "p", desc: "Project ID" },
-    { name: "alert_id", type: "number", required: true, alias: "a", desc: "Alert ID" },
-    { name: "definition", type: "json", required: true, desc: "Alert definition JSON with updated fields. See +get_alert_definition_schema for the complete structure." }
-  ],
-  risk: "write",
-  mcpService: "te_analysis_extend",
-  buildArgs: (ctx) => ({
-    projectId: ctx.num("project_id"),
-    alertId: ctx.num("alert_id"),
-    definition: requiredJsonString(ctx, "definition")
-  })
-});
-
-// src/commands/te-analysis/meta/delete-alert.ts
-var deleteAlert = createMcpCommand({
-  command: "+delete_alert",
-  description: "Delete an alert by alertId",
-  flags: [
-    { name: "project_id", type: "number", required: true, desc: "Project ID", alias: "p" },
-    { name: "alert_id", type: "number", required: true, desc: "Alert ID to delete" }
-  ],
-  risk: "high-risk-write",
-  mcpService: "te_analysis_extend",
-  buildArgs: (ctx) => ({
-    projectId: ctx.num("project_id"),
-    alertId: ctx.num("alert_id")
-  })
-});
-
 // src/commands/te-analysis/capability-shared.ts
 var analysisDataRunRoutingHelp = "Routing: use run only for analysis data that fits <=1000 inline rows and <=180s; use export for full, unknown-size, >1000-row, or long-running data.";
 var analysisDataExportRoutingHelp = "Routing: use export for full, unknown-size, >1000-row, or long-running analysis data; inspect/download by run_id/artifact_id; use run only for <=1000-row inline previews.";
@@ -329,6 +183,31 @@ var asyncTimeoutSecondsFlag = {
   min: 1,
   max: 21600
 };
+var clusterQueryScopeFlag = {
+  name: "cluster-query-scope",
+  type: "string",
+  required: false,
+  desc: "Optional physical query routing: GLOBAL aggregates accessible query clusters; SLAVE targets one --slave-cluster-id. Omit for the surface default."
+};
+var slaveClusterIdFlag = {
+  name: "slave-cluster-id",
+  type: "string",
+  required: false,
+  desc: "Physical slave query-cluster ID from analysis query-cluster list. Required only with --cluster-query-scope SLAVE."
+};
+function validateClusterQueryRouting(ctx) {
+  const scope = optionalString(ctx, "cluster-query-scope");
+  const slaveClusterId = optionalString(ctx, "slave-cluster-id");
+  if (scope !== void 0 && scope !== "GLOBAL" && scope !== "SLAVE") {
+    throw new Error("--cluster-query-scope must be GLOBAL or SLAVE.");
+  }
+  if (scope === "SLAVE" && slaveClusterId === void 0) {
+    throw new Error("--slave-cluster-id is required with --cluster-query-scope SLAVE.");
+  }
+  if (scope !== "SLAVE" && slaveClusterId !== void 0) {
+    throw new Error("--slave-cluster-id is allowed only with --cluster-query-scope SLAVE.");
+  }
+}
 var artifactFormatFlag = {
   name: "artifact-format",
   type: "string",
@@ -341,10 +220,10 @@ function projectInput(ctx) {
 function listInput(ctx) {
   return compactInput({
     ...projectInput(ctx),
-    query: optionalString2(ctx, "query"),
+    query: optionalString(ctx, "query"),
     fields: optionalJson(ctx, "fields"),
-    limit: optionalNumber2(ctx, "limit"),
-    offset: optionalNumber2(ctx, "offset")
+    limit: optionalNumber(ctx, "limit"),
+    offset: optionalNumber(ctx, "offset")
   });
 }
 function reportListInput(ctx) {
@@ -359,21 +238,23 @@ function dashboardReportDataInput(ctx) {
     dashboard_id: ctx.num("dashboard-id"),
     report_ids: optionalJsonArray(ctx, "report-ids"),
     filters: optionalJson(ctx, "filters"),
-    start_time: optionalString2(ctx, "start-time"),
-    end_time: optionalString2(ctx, "end-time"),
-    zone_offset: optionalNumber2(ctx, "zone-offset"),
-    use_cache: optionalBoolean2(ctx, "use-cache"),
-    request_id: optionalString2(ctx, "request-id"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds"),
-    limit: optionalNumber2(ctx, "limit"),
-    format: optionalString2(ctx, "artifact-format")
+    start_time: optionalString(ctx, "start-time"),
+    end_time: optionalString(ctx, "end-time"),
+    cluster_query_scope: optionalString(ctx, "cluster-query-scope"),
+    slave_cluster_id: optionalString(ctx, "slave-cluster-id"),
+    zone_offset: optionalNumber(ctx, "zone-offset"),
+    use_cache: optionalBoolean(ctx, "use-cache"),
+    request_id: optionalString(ctx, "request-id"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds"),
+    limit: optionalNumber(ctx, "limit"),
+    format: optionalString(ctx, "artifact-format")
   });
 }
 function exportLifecycleInput(ctx) {
   return compactInput({
-    request_id: optionalString2(ctx, "request-id"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds"),
-    format: optionalString2(ctx, "artifact-format")
+    request_id: optionalString(ctx, "request-id"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds"),
+    format: optionalString(ctx, "artifact-format")
   });
 }
 function biPanelPageDataInput(ctx) {
@@ -387,26 +268,26 @@ function biPanelPageDataInput(ctx) {
     permission_controls: optionalJson(ctx, "permission-controls"),
     chart_filter_controls: optionalJson(ctx, "chart-filter-controls"),
     columns: optionalJson(ctx, "columns"),
-    row_limit: optionalNumber2(ctx, "row-limit"),
-    row_offset: optionalNumber2(ctx, "row-offset"),
-    block_limit: optionalNumber2(ctx, "block-limit"),
-    block_offset: optionalNumber2(ctx, "block-offset"),
-    use_cache: optionalBoolean2(ctx, "use-cache"),
-    request_id: optionalString2(ctx, "request-id"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds"),
-    limit: optionalNumber2(ctx, "limit"),
-    format: optionalString2(ctx, "artifact-format")
+    row_limit: optionalNumber(ctx, "row-limit"),
+    row_offset: optionalNumber(ctx, "row-offset"),
+    block_limit: optionalNumber(ctx, "block-limit"),
+    block_offset: optionalNumber(ctx, "block-offset"),
+    use_cache: optionalBoolean(ctx, "use-cache"),
+    request_id: optionalString(ctx, "request-id"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds"),
+    limit: optionalNumber(ctx, "limit"),
+    format: optionalString(ctx, "artifact-format")
   });
 }
-function optionalString2(ctx, name) {
+function optionalString(ctx, name) {
   const value = ctx.str(name);
   return value === "" ? void 0 : value;
 }
-function optionalNumber2(ctx, name) {
+function optionalNumber(ctx, name) {
   const value = ctx.str(name);
   return value === "" ? void 0 : Number(value);
 }
-function optionalBoolean2(ctx, name) {
+function optionalBoolean(ctx, name) {
   const value = ctx.str(name);
   return value === "" ? void 0 : ctx.bool(name);
 }
@@ -518,11 +399,11 @@ var metadataEventList = createAnalysisMetaCapabilityCommand({
   risk: "read",
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
-    query: optionalString2(ctx, "query"),
+    query: optionalString(ctx, "query"),
     fields: optionalJson(ctx, "fields"),
-    limit: optionalNumber2(ctx, "limit"),
-    offset: optionalNumber2(ctx, "offset"),
-    authenticated_only: optionalBoolean2(ctx, "authenticated-only")
+    limit: optionalNumber(ctx, "limit"),
+    offset: optionalNumber(ctx, "offset"),
+    authenticated_only: optionalBoolean(ctx, "authenticated-only")
   })
 });
 
@@ -567,7 +448,7 @@ var metadataEventUpdate = createAnalysisMetaCapabilityCommand({
     { name: "remark", type: "string", required: false, desc: "Event remark." }
   ],
   risk: "write",
-  buildInput: (ctx) => compactInput({ ...projectInput(ctx), event_name: ctx.str("event-name"), event_desc: optionalString2(ctx, "event-desc"), remark: optionalString2(ctx, "remark") })
+  buildInput: (ctx) => compactInput({ ...projectInput(ctx), event_name: ctx.str("event-name"), event_desc: optionalString(ctx, "event-desc"), remark: optionalString(ctx, "remark") })
 });
 
 // src/commands/te-analysis/meta/event/relation-update.ts
@@ -675,14 +556,14 @@ var metadataPropertyList = createAnalysisMetaCapabilityCommand({
   risk: "read",
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
-    table_type: optionalString2(ctx, "table-type"),
-    scope: optionalString2(ctx, "scope"),
-    event_name: optionalString2(ctx, "event-name"),
-    query: optionalString2(ctx, "query"),
+    table_type: optionalString(ctx, "table-type"),
+    scope: optionalString(ctx, "scope"),
+    event_name: optionalString(ctx, "event-name"),
+    query: optionalString(ctx, "query"),
     fields: optionalJson(ctx, "fields"),
-    limit: optionalNumber2(ctx, "limit"),
-    offset: optionalNumber2(ctx, "offset"),
-    authenticated_only: optionalBoolean2(ctx, "authenticated-only")
+    limit: optionalNumber(ctx, "limit"),
+    offset: optionalNumber(ctx, "offset"),
+    authenticated_only: optionalBoolean(ctx, "authenticated-only")
   })
 });
 
@@ -730,7 +611,7 @@ var metadataPropertyUpdate = createAnalysisMetaCapabilityCommand({
     { name: "prop-remark", type: "string", required: false, desc: "Property remark." }
   ],
   risk: "write",
-  buildInput: (ctx) => compactInput({ ...projectInput(ctx), table_type: ctx.str("table-type"), prop_name: ctx.str("prop-name"), prop_desc: optionalString2(ctx, "prop-desc"), prop_remark: optionalString2(ctx, "prop-remark") })
+  buildInput: (ctx) => compactInput({ ...projectInput(ctx), table_type: ctx.str("table-type"), prop_name: ctx.str("prop-name"), prop_desc: optionalString(ctx, "prop-desc"), prop_remark: optionalString(ctx, "prop-remark") })
 });
 
 // src/commands/te-analysis/meta/property/relation-update.ts
@@ -850,15 +731,15 @@ var metadataVirtualEventCreate = createAnalysisMetaCapabilityCommand({
     { name: "event-name", type: "string", required: false, desc: "Virtual event name. Must start with 'ta@'." },
     { name: "event-desc", type: "string", required: false, desc: "Virtual event display name." },
     { name: "remark", type: "string", required: false, desc: "Optional virtual event remark." },
-    { name: "events", type: "json", required: false, desc: "JSON array of events to combine." },
-    { name: "filter", type: "json", required: false, desc: "Optional global filter JSON." },
+    { name: "events", type: "json", required: false, desc: "Event array using snake_case event_name and optional AI-facing filter {relation,items:[{field:{name,type?},operator,values?}]}." },
+    { name: "filter", type: "json", required: false, desc: "Optional AI-facing global filter {relation,items:[{field:{name,type?},operator,values?}]}; raw taFilters/junctionKind are rejected." },
     { name: "override", type: "boolean", required: false, desc: "Whether to override an existing virtual event rule." }
   ],
   risk: "write",
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
     payload: virtualEventPayload(ctx),
-    override: optionalBoolean2(ctx, "override")
+    override: optionalBoolean(ctx, "override")
   })
 });
 function virtualEventPayload(ctx) {
@@ -866,8 +747,8 @@ function virtualEventPayload(ctx) {
   if (payload !== void 0) {
     return payload;
   }
-  const eventName = optionalString2(ctx, "event-name");
-  const eventDesc = optionalString2(ctx, "event-desc");
+  const eventName = optionalString(ctx, "event-name");
+  const eventDesc = optionalString(ctx, "event-desc");
   const events = optionalJson(ctx, "events");
   if (eventName === void 0 || eventDesc === void 0 || events === void 0) {
     throw new Error("Pass --payload, or pass --event-name, --event-desc, and --events");
@@ -875,7 +756,7 @@ function virtualEventPayload(ctx) {
   return compactInput({
     event_name: eventName,
     event_desc: eventDesc,
-    remark: optionalString2(ctx, "remark"),
+    remark: optionalString(ctx, "remark"),
     rule: compactInput({
       events,
       filter: optionalJson(ctx, "filter")
@@ -947,11 +828,11 @@ var metadataVirtualPropertyCreate = createAnalysisMetaCapabilityCommand({
     sql_expression: ctx.str("sql-expression"),
     v_prop: virtualProperty(ctx),
     properties: optionalJson(ctx, "properties"),
-    sql_event_relation_type: optionalString2(ctx, "sql-event-relation-type"),
+    sql_event_relation_type: optionalString(ctx, "sql-event-relation-type"),
     related_events: optionalJson(ctx, "related-events"),
     tag_date_policies: optionalJson(ctx, "tag-date-policies"),
-    replace_remark: optionalString2(ctx, "replace-remark"),
-    replace_suggestion: optionalString2(ctx, "replace-suggestion")
+    replace_remark: optionalString(ctx, "replace-remark"),
+    replace_suggestion: optionalString(ctx, "replace-suggestion")
   })
 });
 function virtualProperty(ctx) {
@@ -959,17 +840,17 @@ function virtualProperty(ctx) {
   if (vProp !== void 0) {
     return vProp;
   }
-  const propertyName = optionalString2(ctx, "property-name");
-  const tableType = optionalString2(ctx, "table-type");
-  const selectType = optionalString2(ctx, "select-type");
+  const propertyName = optionalString(ctx, "property-name");
+  const tableType = optionalString(ctx, "table-type");
+  const selectType = optionalString(ctx, "select-type");
   if (propertyName === void 0 || tableType === void 0 || selectType === void 0) {
     throw new Error("Pass --v-prop, or pass --property-name, --table-type, and --select-type");
   }
   return {
     property: compactInput({
       column_name: propertyName,
-      column_desc: optionalString2(ctx, "property-desc"),
-      column_remark: optionalString2(ctx, "property-remark"),
+      column_desc: optionalString(ctx, "property-desc"),
+      column_remark: optionalString(ctx, "property-remark"),
       table_type: tableType,
       select_type: selectType
     })
@@ -999,11 +880,11 @@ var metadataVirtualPropertySqlRuleUpdate = createAnalysisMetaCapabilityCommand({
     sql_expression: ctx.str("sql-expression"),
     v_prop: ctx.json("v-prop"),
     properties: optionalJson(ctx, "properties"),
-    sql_event_relation_type: optionalString2(ctx, "sql-event-relation-type"),
+    sql_event_relation_type: optionalString(ctx, "sql-event-relation-type"),
     related_events: optionalJson(ctx, "related-events"),
     tag_date_policies: optionalJson(ctx, "tag-date-policies"),
-    replace_remark: optionalString2(ctx, "replace-remark"),
-    replace_suggestion: optionalString2(ctx, "replace-suggestion")
+    replace_remark: optionalString(ctx, "replace-remark"),
+    replace_suggestion: optionalString(ctx, "replace-suggestion")
   })
 });
 
@@ -1019,7 +900,7 @@ var metadataVirtualPropertySqlRuleDelete = createAnalysisMetaCapabilityCommand({
     { name: "operation", type: "string", required: false, desc: "Delete operation. Use revoke to revoke instead of delete." }
   ],
   risk: "high-risk-write",
-  buildInput: (ctx) => compactInput({ ...projectInput(ctx), v_prop_id: ctx.num("v-prop-id"), operation: optionalString2(ctx, "operation") })
+  buildInput: (ctx) => compactInput({ ...projectInput(ctx), v_prop_id: ctx.num("v-prop-id"), operation: optionalString(ctx, "operation") })
 });
 
 // src/commands/te-analysis/meta/virtual-property/index.ts
@@ -1048,12 +929,12 @@ var metadataMetricList = createAnalysisMetaCapabilityCommand({
   risk: "read",
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
-    ignore_authentication: optionalBoolean2(ctx, "ignore-authentication"),
-    query: optionalString2(ctx, "query"),
+    ignore_authentication: optionalBoolean(ctx, "ignore-authentication"),
+    query: optionalString(ctx, "query"),
     fields: optionalJson(ctx, "fields"),
-    limit: optionalNumber2(ctx, "limit"),
-    offset: optionalNumber2(ctx, "offset"),
-    authenticated_only: optionalBoolean2(ctx, "authenticated-only")
+    limit: optionalNumber(ctx, "limit"),
+    offset: optionalNumber(ctx, "offset"),
+    authenticated_only: optionalBoolean(ctx, "authenticated-only")
   })
 });
 
@@ -1073,8 +954,8 @@ var metadataMetricGet = createAnalysisMetaCapabilityCommand({
 
 // src/commands/te-analysis/meta/metric/shared.ts
 function metricMode(ctx) {
-  const mode = optionalNumber2(ctx, "metric-mode");
-  const modelType = optionalString2(ctx, "model-type");
+  const mode = optionalNumber(ctx, "metric-mode");
+  const modelType = optionalString(ctx, "model-type");
   const mapped = modelType === void 0 ? void 0 : modelTypeToMetricMode(modelType);
   if (mode === void 0 && mapped === void 0) {
     throw new Error("Pass one of --model-type or --metric-mode");
@@ -1085,8 +966,8 @@ function metricMode(ctx) {
   return mode ?? mapped;
 }
 function optionalMetricMode(ctx) {
-  const mode = optionalNumber2(ctx, "metric-mode");
-  const modelType = optionalString2(ctx, "model-type");
+  const mode = optionalNumber(ctx, "metric-mode");
+  const modelType = optionalString(ctx, "model-type");
   const mapped = modelType === void 0 ? void 0 : modelTypeToMetricMode(modelType);
   if (mode !== void 0 && mapped !== void 0 && mode !== mapped) {
     throw new Error("--metric-mode must match --model-type when both are provided");
@@ -1125,7 +1006,7 @@ var metadataMetricCreate = createAnalysisMetaCapabilityCommand({
     ...projectInput(ctx),
     metric_name: ctx.str("metric-name"),
     metric_desc: ctx.str("metric-desc"),
-    metric_remark: optionalString2(ctx, "metric-remark"),
+    metric_remark: optionalString(ctx, "metric-remark"),
     metric_mode: metricMode(ctx),
     metric_events: ctx.json("metric-events"),
     metric_params: optionalJson(ctx, "metric-params")
@@ -1153,9 +1034,9 @@ var metadataMetricUpdate = createAnalysisMetaCapabilityCommand({
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
     metric_id: ctx.num("metric-id"),
-    metric_name: optionalString2(ctx, "metric-name"),
-    metric_desc: optionalString2(ctx, "metric-desc"),
-    metric_remark: optionalString2(ctx, "metric-remark"),
+    metric_name: optionalString(ctx, "metric-name"),
+    metric_desc: optionalString(ctx, "metric-desc"),
+    metric_remark: optionalString(ctx, "metric-remark"),
     metric_mode: optionalMetricMode(ctx),
     metric_events: optionalJson(ctx, "metric-events"),
     metric_params: optionalJson(ctx, "metric-params")
@@ -1269,7 +1150,7 @@ var metadataAssetAbnormalGet = createAnalysisMetaCapabilityCommand({
     { name: "table-type", type: "number", required: false, desc: "Property table type when the resource is a property." }
   ],
   risk: "read",
-  buildInput: (ctx) => compactInput({ ...projectInput(ctx), resource_type: ctx.str("resource-type"), resource_id: optionalString2(ctx, "resource-id"), resource_name: optionalString2(ctx, "resource-name"), table_type: optionalNumber2(ctx, "table-type") })
+  buildInput: (ctx) => compactInput({ ...projectInput(ctx), resource_type: ctx.str("resource-type"), resource_id: optionalString(ctx, "resource-id"), resource_name: optionalString(ctx, "resource-name"), table_type: optionalNumber(ctx, "table-type") })
 });
 
 // src/commands/te-analysis/meta/asset/shared.ts
@@ -1298,33 +1179,33 @@ var sortFieldFlag = { name: "sort-field", type: "string", required: false, desc:
 var sortOrderFlag = { name: "sort-order", type: "string", required: false, desc: "Sort order: asc or desc." };
 var recordIdFlag = { name: "record-id", type: "number", required: false, desc: "Operation record ID." };
 var readers = {
-  node_id: (ctx) => optionalString2(ctx, "node-id"),
-  resource_id: (ctx) => optionalString2(ctx, "resource-id"),
-  resource_type: (ctx) => optionalString2(ctx, "resource-type"),
+  node_id: (ctx) => optionalString(ctx, "node-id"),
+  resource_id: (ctx) => optionalString(ctx, "resource-id"),
+  resource_type: (ctx) => optionalString(ctx, "resource-type"),
   link_info: (ctx) => optionalJson(ctx, "link-info"),
-  query: (ctx) => optionalString2(ctx, "query"),
+  query: (ctx) => optionalString(ctx, "query"),
   searchs: (ctx) => optionalJson(ctx, "searchs"),
   rule: (ctx) => optionalJson(ctx, "rule"),
-  operation_type: (ctx) => optionalString2(ctx, "operation-type"),
-  rule_id: (ctx) => optionalNumber2(ctx, "rule-id"),
-  rule_name: (ctx) => optionalString2(ctx, "rule-name"),
-  comment: (ctx) => optionalString2(ctx, "comment"),
+  operation_type: (ctx) => optionalString(ctx, "operation-type"),
+  rule_id: (ctx) => optionalNumber(ctx, "rule-id"),
+  rule_name: (ctx) => optionalString(ctx, "rule-name"),
+  comment: (ctx) => optionalString(ctx, "comment"),
   node_ids: (ctx) => optionalJsonArray(ctx, "node-ids"),
-  reports_version: (ctx) => optionalNumber2(ctx, "reports-version"),
-  zone_offset: (ctx) => optionalNumber2(ctx, "zone-offset"),
+  reports_version: (ctx) => optionalNumber(ctx, "reports-version"),
+  zone_offset: (ctx) => optionalNumber(ctx, "zone-offset"),
   schedule_ui_config: (ctx) => optionalJson(ctx, "schedule-ui-config"),
-  dashboard_status: (ctx) => optionalString2(ctx, "dashboard-status"),
-  refresh_type: (ctx) => optionalNumber2(ctx, "refresh-type"),
+  dashboard_status: (ctx) => optionalString(ctx, "dashboard-status"),
+  refresh_type: (ctx) => optionalNumber(ctx, "refresh-type"),
   cache_config: (ctx) => optionalJson(ctx, "cache-config"),
-  to_user_id: (ctx) => optionalNumber2(ctx, "to-user-id"),
-  clear_history_tag: (ctx) => optionalNumber2(ctx, "clear-history-tag"),
-  type: (ctx) => optionalString2(ctx, "type"),
+  to_user_id: (ctx) => optionalNumber(ctx, "to-user-id"),
+  clear_history_tag: (ctx) => optionalNumber(ctx, "clear-history-tag"),
+  type: (ctx) => optionalString(ctx, "type"),
   status: (ctx) => optionalJson(ctx, "status"),
-  sort_field: (ctx) => optionalString2(ctx, "sort-field"),
-  sort_order: (ctx) => optionalString2(ctx, "sort-order"),
-  record_id: (ctx) => optionalNumber2(ctx, "record-id"),
-  limit: (ctx) => optionalNumber2(ctx, "limit"),
-  offset: (ctx) => optionalNumber2(ctx, "offset")
+  sort_field: (ctx) => optionalString(ctx, "sort-field"),
+  sort_order: (ctx) => optionalString(ctx, "sort-order"),
+  record_id: (ctx) => optionalNumber(ctx, "record-id"),
+  limit: (ctx) => optionalNumber(ctx, "limit"),
+  offset: (ctx) => optionalNumber(ctx, "offset")
 };
 function assetGovernanceInput(ctx, fields) {
   const input = {
@@ -1477,8 +1358,8 @@ var metadataSuperMetadataExport = createAnalysisMetaCapabilityCommand({
   risk: "read",
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
-    request_id: optionalString2(ctx, "request-id"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds")
+    request_id: optionalString(ctx, "request-id"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds")
   })
 });
 
@@ -1498,8 +1379,8 @@ var metadataSuperMetadataImport = createAnalysisMetaCapabilityCommand({
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
     operation: ctx.str("operation"),
-    input_file_id: optionalString2(ctx, "input-file-id"),
-    pre_import_meta_uuid: optionalString2(ctx, "pre-import-meta-uuid")
+    input_file_id: optionalString(ctx, "input-file-id"),
+    pre_import_meta_uuid: optionalString(ctx, "pre-import-meta-uuid")
   })
 });
 
@@ -1577,12 +1458,6 @@ var datatable_default = commands9;
 
 // src/commands/te-analysis/meta/index.ts
 var commands10 = [
-  getAlertDefinitionSchema,
-  listAlerts,
-  getAlert,
-  createAlert,
-  updateAlert,
-  deleteAlert,
   ...event_default,
   ...property_default,
   ...virtual_event_default,
@@ -1869,7 +1744,7 @@ var reportListExport = createAnalysisCapabilityCommand({
   risk: "read",
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
-    query: optionalString2(ctx, "query"),
+    query: optionalString(ctx, "query"),
     fields: optionalJson(ctx, "fields"),
     model_types: optionalJson(ctx, "model-types"),
     ...exportLifecycleInput(ctx)
@@ -1911,7 +1786,7 @@ var REPORT_WRITE_MODEL_TYPE_VALUES = [
   "tag"
 ];
 var REPORT_WRITE_MODEL_DESCRIPTION = `${AI_MODEL_DESCRIPTION} Report create/update also supports tag for saved tag report data; use tag as the AI-facing spelling.`;
-var AI_DEFINITION_DESCRIPTION = 'AI-facing model definition JSON. Do not pass raw QP, events, event_view, visual_view, or analysis_query. For path definitions, global filters support user_property, cluster, and tag only; event_property is not supported. session_unit accepts second (1..999), minute (1..999), or hour (1..24). Do not use day; express one day as session_interval=24 and session_unit=hour. For SQL, a simple query is {"sql":"select ..."}; raw variables use ${name}, while typed params use ${Text:name}, ${Selector:name}, or ${PartDate:name}. PartDate expands to a complete predicate, so write WHERE ${PartDate:d}, not a column followed by the placeholder. Selector value must match one options[].value. Trino identifiers containing #, $, @, spaces, or punctuation must be delimited with double quotes, for example SELECT "#user_id", "$part_event" FROM ...; single quotes are string literals. Queries against an event table must include a date-partition predicate on the quoted "$part_date" column, for example WHERE "$part_date" BETWEEN \'2026-07-01\' AND \'2026-07-07\'; the backend rejects event-table SQL without it. The CLI preserves SQL text and never auto-quotes identifiers.';
+var AI_DEFINITION_DESCRIPTION = 'AI-facing model definition JSON. Do not pass raw QP, events, event_view, visual_view, or analysis_query. For path definitions, global filters support user_property, cluster, and tag only; event_property is not supported. session_unit accepts second (1..999), minute (1..999), or hour (1..24). Do not use day; express one day as session_interval=24 and session_unit=hour. For SQL, a simple query is {"sql":"select ..."}; raw variables use ${name}, while typed params use ${Text:name}, ${Selector:name}, or ${PartDate:name}. PartDate expands to a complete predicate, so write WHERE ${PartDate:d}, not a column followed by the placeholder. A part_date parameter may set boolean use_timezone; it defaults to false and controls whether that parameter uses the query effective timezone. Selector value must match one options[].value. Trino identifiers containing #, $, @, spaces, or punctuation must be delimited with double quotes, for example SELECT "#user_id", "$part_event" FROM ...; single quotes are string literals. Queries against an event table must include a date-partition predicate on the quoted "$part_date" column, for example WHERE "$part_date" BETWEEN \'2026-07-01\' AND \'2026-07-07\'; the backend rejects event-table SQL without it. The CLI preserves SQL text and never auto-quotes identifiers.';
 var REPORT_WRITE_DEFINITION_DESCRIPTION = `${AI_DEFINITION_DESCRIPTION} For model_type=tag, pass a tag report intent such as {"tag":{"tag_name":"vip_users","time_range":{"mode":"recent","unit":"day","value":7}}}. Tags are supported for report create/update and report data, not ad-hoc analysis.`;
 function aiModelTypeFlag(required) {
   return {
@@ -1968,9 +1843,9 @@ var reportCreate = createAnalysisCapabilityCommand({
     report_name: ctx.str("report-name"),
     model_type: ctx.str("model-type"),
     definition: ctx.json("definition"),
-    report_desc: optionalString2(ctx, "report-desc"),
-    cache_seconds: optionalNumber2(ctx, "cache-seconds"),
-    query_duration_ms: optionalNumber2(ctx, "query-duration-ms"),
+    report_desc: optionalString(ctx, "report-desc"),
+    cache_seconds: optionalNumber(ctx, "cache-seconds"),
+    query_duration_ms: optionalNumber(ctx, "query-duration-ms"),
     dashboard_ids: optionalJsonArray(ctx, "dashboard-ids")
   })
 });
@@ -2008,12 +1883,12 @@ var reportUpdate = createAnalysisCapabilityCommand({
     ...projectInput(ctx),
     report_id: ctx.num("report-id"),
     version: ctx.num("report-version"),
-    report_name: optionalString2(ctx, "report-name"),
-    report_desc: optionalString2(ctx, "report-desc"),
-    model_type: optionalString2(ctx, "model-type"),
+    report_name: optionalString(ctx, "report-name"),
+    report_desc: optionalString(ctx, "report-desc"),
+    model_type: optionalString(ctx, "model-type"),
     definition: optionalJson(ctx, "definition"),
-    cache_seconds: optionalNumber2(ctx, "cache-seconds"),
-    query_duration_ms: optionalNumber2(ctx, "query-duration-ms")
+    cache_seconds: optionalNumber(ctx, "cache-seconds"),
+    query_duration_ms: optionalNumber(ctx, "query-duration-ms")
   })
 });
 
@@ -2048,17 +1923,19 @@ function reportDataInput(ctx) {
   return compactInput({
     ...projectInput(ctx),
     report_ids: jsonArray(ctx, "report-ids"),
-    request_id: optionalString2(ctx, "request-id"),
+    request_id: optionalString(ctx, "request-id"),
     filters: optionalJson(ctx, "filters"),
     group_by: optionalJson(ctx, "group-by"),
     sql_params: optionalJson(ctx, "sql-params"),
-    start_time: optionalString2(ctx, "start-time"),
-    end_time: optionalString2(ctx, "end-time"),
-    time_granularity: optionalString2(ctx, "time-granularity"),
-    zone_offset: optionalNumber2(ctx, "zone-offset"),
-    use_cache: optionalBoolean2(ctx, "use-cache"),
-    limit: optionalNumber2(ctx, "limit"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds")
+    start_time: optionalString(ctx, "start-time"),
+    end_time: optionalString(ctx, "end-time"),
+    time_granularity: optionalString(ctx, "time-granularity"),
+    cluster_query_scope: optionalString(ctx, "cluster-query-scope"),
+    slave_cluster_id: optionalString(ctx, "slave-cluster-id"),
+    zone_offset: optionalNumber(ctx, "zone-offset"),
+    use_cache: optionalBoolean(ctx, "use-cache"),
+    limit: optionalNumber(ctx, "limit"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds")
   });
 }
 function reportDataExportInput(ctx) {
@@ -2081,16 +1958,19 @@ var reportDataRun = createAnalysisCapabilityCommand({
     requestIdFlag,
     { name: "filters", type: "json", required: false, desc: 'Non-SQL analysis models only. SQL-only requests reject this field; mixed batches warn for SQL report_ids that ignore it. AI-facing shape: {"relation":"and","items":[{"field":{"name":"country","type":"user_property"},"operator":"eq","values":["US"]}]}. Never pass QP taFilters.' },
     { name: "group-by", type: "json", required: false, desc: 'Non-SQL analysis models only. SQL-only requests reject this field; mixed batches warn. AI-facing shape: [{"field":{"name":"country","type":"user_property"}}]. Time granularity uses --time-granularity.' },
-    { name: "sql-params", type: "json", required: false, desc: 'SQL reports only. First run analysis report get for every target SQL report; each name must exist in every definition.params. Send value overrides only, for example [{"name":"platform","value":"ios"}] or saved part_date/time parameters with start_time/end_time. Do not send definition fields such as paramType or selectorItems.' },
+    { name: "sql-params", type: "json", required: false, desc: 'SQL reports only. First run analysis report get for every target SQL report; each name must exist in every definition.params. Send value overrides only, for example [{"name":"platform","value":"ios"}] or saved part_date/time parameters with start_time/end_time. Do not send definition fields such as paramType, selectorItems, or use_timezone.' },
     { name: "start-time", type: "string", required: false, desc: "Non-SQL analysis-model date override start, yyyy-MM-dd. SQL dates must be saved parameters overridden through --sql-params." },
     { name: "end-time", type: "string", required: false, desc: "Non-SQL analysis-model date override end, yyyy-MM-dd. SQL dates must be saved parameters overridden through --sql-params." },
     { name: "time-granularity", type: "string", required: false, desc: "Non-SQL analysis-model time granularity override. SQL accepts only --sql-params." },
+    clusterQueryScopeFlag,
+    slaveClusterIdFlag,
     { name: "zone-offset", type: "number", required: false, desc: reportDataZoneOffsetDescription },
     { name: "use-cache", type: "boolean", required: false, desc: "Whether to use cache. Default: true." },
     syncLimitFlag,
     syncTimeoutSecondsFlag
   ],
   risk: "read",
+  validate: validateClusterQueryRouting,
   buildInput: reportDataInput,
   postProcess: applyAnalysisInlineLimit
 });
@@ -2107,16 +1987,19 @@ var reportDataExport = createAnalysisCapabilityCommand({
     requestIdFlag,
     { name: "filters", type: "json", required: false, desc: "Non-SQL analysis models only. SQL-only requests reject this field; mixed batches are best-effort. Use AI-facing field intent, never QP taFilters." },
     { name: "group-by", type: "json", required: false, desc: 'Non-SQL analysis models only. SQL-only requests reject this field. Shape: [{"field":{"name":"country","type":"user_property"}}].' },
-    { name: "sql-params", type: "json", required: false, desc: "SQL reports only. First run analysis report get for every target SQL report; each name must exist in every definition.params. Send value overrides only, including saved part_date/time parameters for date changes. Do not send definition fields such as paramType or selectorItems." },
+    { name: "sql-params", type: "json", required: false, desc: "SQL reports only. First run analysis report get for every target SQL report; each name must exist in every definition.params. Send value overrides only, including saved part_date/time parameters for date changes. Do not send definition fields such as paramType, selectorItems, or use_timezone." },
     { name: "start-time", type: "string", required: false, desc: "Non-SQL analysis-model date override start, yyyy-MM-dd. SQL dates use --sql-params." },
     { name: "end-time", type: "string", required: false, desc: "Non-SQL analysis-model date override end, yyyy-MM-dd. SQL dates use --sql-params." },
     { name: "time-granularity", type: "string", required: false, desc: "Non-SQL analysis-model time granularity override. SQL accepts only --sql-params." },
+    clusterQueryScopeFlag,
+    slaveClusterIdFlag,
     { name: "zone-offset", type: "number", required: false, desc: reportDataZoneOffsetDescription },
     { name: "use-cache", type: "boolean", required: false, desc: "Whether to use cache. Default: true." },
     artifactFormatFlag,
     asyncTimeoutSecondsFlag
   ],
   risk: "read",
+  validate: validateClusterQueryRouting,
   buildInput: reportDataExportInput
 });
 
@@ -2156,7 +2039,7 @@ var reportChangeLogGet = createAnalysisCapabilityCommand({
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
     report_id: ctx.num("report-id"),
-    version: optionalNumber2(ctx, "history-version")
+    version: optionalNumber(ctx, "history-version")
   })
 });
 
@@ -2253,9 +2136,9 @@ var dashboardCreate = createAnalysisCapabilityCommand({
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
     dashboard_name: ctx.str("dashboard-name"),
-    space_id: optionalNumber2(ctx, "space-id"),
-    folder_id: optionalNumber2(ctx, "folder-id"),
-    initial_report_id: optionalNumber2(ctx, "initial-report-id"),
+    space_id: optionalNumber(ctx, "space-id"),
+    folder_id: optionalNumber(ctx, "folder-id"),
+    initial_report_id: optionalNumber(ctx, "initial-report-id"),
     payload: optionalJson(ctx, "payload")
   })
 });
@@ -2275,7 +2158,7 @@ var dashboardGet = createAnalysisCapabilityCommand({
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
     dashboard_id: ctx.num("dashboard-id"),
-    use_cache: optionalBoolean2(ctx, "use-cache")
+    use_cache: optionalBoolean(ctx, "use-cache")
   })
 });
 
@@ -2304,16 +2187,16 @@ var dashboardUpdate = createAnalysisCapabilityCommand({
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
     operation: ctx.str("operation"),
-    dashboard_id: optionalNumber2(ctx, "dashboard-id"),
+    dashboard_id: optionalNumber(ctx, "dashboard-id"),
     dashboard_ids: optionalJsonArray(ctx, "dashboard-ids"),
-    dashboard_name: optionalString2(ctx, "dashboard-name"),
-    zone_offset: optionalNumber2(ctx, "zone-offset"),
-    refresh_type: optionalNumber2(ctx, "refresh-type"),
-    dashboard_status: optionalString2(ctx, "dashboard-status"),
-    note_id: optionalNumber2(ctx, "note-id"),
-    note_title: optionalString2(ctx, "note-title"),
-    description: optionalString2(ctx, "description"),
-    ui_config: optionalString2(ctx, "ui-config"),
+    dashboard_name: optionalString(ctx, "dashboard-name"),
+    zone_offset: optionalNumber(ctx, "zone-offset"),
+    refresh_type: optionalNumber(ctx, "refresh-type"),
+    dashboard_status: optionalString(ctx, "dashboard-status"),
+    note_id: optionalNumber(ctx, "note-id"),
+    note_title: optionalString(ctx, "note-title"),
+    description: optionalString(ctx, "description"),
+    ui_config: optionalString(ctx, "ui-config"),
     payload: optionalJson(ctx, "payload")
   })
 });
@@ -2406,8 +2289,8 @@ var dashboardCopy = createAnalysisCapabilityCommand({
     dashboard_id: ctx.num("dashboard-id"),
     dashboard_name: ctx.str("dashboard-name"),
     report_copy: booleanWithDefault(ctx, "report-copy", false),
-    to_space_id: optionalNumber2(ctx, "to-space-id"),
-    to_folder_id: optionalNumber2(ctx, "to-folder-id")
+    to_space_id: optionalNumber(ctx, "to-space-id"),
+    to_folder_id: optionalNumber(ctx, "to-folder-id")
   })
 });
 
@@ -2426,7 +2309,7 @@ var dashboardFreeze = createAnalysisCapabilityCommand({
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
     dashboard_ids: jsonArray(ctx, "dashboard-ids"),
-    freeze: optionalBoolean2(ctx, "freeze")
+    freeze: optionalBoolean(ctx, "freeze")
   })
 });
 
@@ -2513,6 +2396,8 @@ var dashboardReportDataRun = createAnalysisCapabilityCommand({
     { name: "filters", type: "json", required: false, desc: "Optional AI-facing filter {relation,items:[{field:{name,type?},operator,values?}]}. SQL reports ignore it and produce data.warnings; raw taFilters/junctionKind/filts are rejected." },
     { name: "start-time", type: "string", required: false, desc: "Optional start date/time. SQL reports ignore it and produce data.warnings." },
     { name: "end-time", type: "string", required: false, desc: "Optional end date/time. SQL reports ignore it and produce data.warnings." },
+    clusterQueryScopeFlag,
+    slaveClusterIdFlag,
     { name: "zone-offset", type: "number", required: false, desc: reportDataZoneOffsetDescription },
     { name: "use-cache", type: "boolean", required: false, desc: "Whether to use cache. Default: true." },
     { name: "request-id", type: "string", required: false, desc: "Optional cli_<32 lowercase hex> request ID. Generated when omitted." },
@@ -2520,6 +2405,7 @@ var dashboardReportDataRun = createAnalysisCapabilityCommand({
     syncLimitFlag
   ],
   risk: "read",
+  validate: validateClusterQueryRouting,
   buildInput: dashboardReportDataInput,
   postProcess: applyAnalysisInlineLimit
 });
@@ -2537,6 +2423,8 @@ var dashboardReportDataExport = createAnalysisCapabilityCommand({
     { name: "filters", type: "json", required: false, desc: "Optional AI-facing filter {relation,items:[{field:{name,type?},operator,values?}]}. SQL reports ignore it and the artifact includes warnings; raw taFilters/junctionKind/filts are rejected." },
     { name: "start-time", type: "string", required: false, desc: "Optional start date/time. SQL reports ignore it and the artifact includes warnings." },
     { name: "end-time", type: "string", required: false, desc: "Optional end date/time. SQL reports ignore it and the artifact includes warnings." },
+    clusterQueryScopeFlag,
+    slaveClusterIdFlag,
     { name: "zone-offset", type: "number", required: false, desc: reportDataZoneOffsetDescription },
     { name: "use-cache", type: "boolean", required: false, desc: "Whether to use cache. Default: true." },
     { name: "request-id", type: "string", required: false, desc: "Optional cli_<32 lowercase hex> request ID. Generated when omitted." },
@@ -2544,6 +2432,7 @@ var dashboardReportDataExport = createAnalysisCapabilityCommand({
     { name: "artifact-format", type: "string", required: false, desc: "Artifact format. Only jsonl is supported." }
   ],
   risk: "read",
+  validate: validateClusterQueryRouting,
   buildInput: dashboardReportDataInput
 });
 
@@ -2567,7 +2456,7 @@ var queryCancel = createAnalysisCapabilityCommand({
   risk: "write",
   buildInput: (ctx) => compactInput({
     run_id: ctx.str("run-id"),
-    reason: optionalString2(ctx, "reason")
+    reason: optionalString(ctx, "reason")
   })
 });
 
@@ -2598,14 +2487,15 @@ var useCacheFlag = {
 };
 function createResultClusterInput(ctx) {
   return compactInput({
+    project_id: ctx.num("project-id"),
     query_context_id: ctx.str("query-context-id"),
     source: optionalJson(ctx, "source"),
     coordinate: ctx.json("coordinate"),
     cluster_name: ctx.str("cluster-name"),
-    display_name: optionalString2(ctx, "display-name"),
-    zone_offset: optionalNumber2(ctx, "zone-offset"),
-    request_id: optionalString2(ctx, "request-id"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds")
+    display_name: optionalString(ctx, "display-name"),
+    zone_offset: optionalNumber(ctx, "zone-offset"),
+    request_id: optionalString(ctx, "request-id"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds")
   });
 }
 
@@ -2616,6 +2506,7 @@ var queryCreateResultCluster = createAnalysisCapabilityCommand({
   capabilityId: "analysis.query.create_result_cluster",
   description: "Create a reusable user or custom-entity result cluster from one cell returned by a synchronous analysis preview. The selected metric must advertise create_result_cluster. Exports never create query contexts.",
   flags: [
+    projectIdFlag,
     { name: "query-context-id", type: "string", required: true, desc: "query_context_id returned by a synchronous analysis preview. Never use an export response." },
     sourceFlag,
     coordinateFlag,
@@ -2794,12 +2685,14 @@ function adhocRunInput(ctx) {
     project_id: ctx.num("project-id"),
     model_type: ctx.str("model-type"),
     definition: ctx.json("definition"),
-    request_id: optionalString2(ctx, "request-id"),
-    use_cache: optionalBoolean2(ctx, "use-cache"),
-    zone_offset: optionalNumber2(ctx, "zone-offset"),
+    request_id: optionalString(ctx, "request-id"),
+    use_cache: optionalBoolean(ctx, "use-cache"),
+    zone_offset: optionalNumber(ctx, "zone-offset"),
     fields: optionalJsonArray(ctx, "fields"),
-    limit: optionalNumber2(ctx, "limit"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds")
+    cluster_query_scope: optionalString(ctx, "cluster-query-scope"),
+    slave_cluster_id: optionalString(ctx, "slave-cluster-id"),
+    limit: optionalNumber(ctx, "limit"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds")
   });
 }
 function adhocExportInput(ctx) {
@@ -2807,12 +2700,14 @@ function adhocExportInput(ctx) {
     project_id: ctx.num("project-id"),
     model_type: ctx.str("model-type"),
     definition: ctx.json("definition"),
-    request_id: optionalString2(ctx, "request-id"),
-    use_cache: optionalBoolean2(ctx, "use-cache"),
-    zone_offset: optionalNumber2(ctx, "zone-offset"),
+    request_id: optionalString(ctx, "request-id"),
+    use_cache: optionalBoolean(ctx, "use-cache"),
+    zone_offset: optionalNumber(ctx, "zone-offset"),
     fields: optionalJsonArray(ctx, "fields"),
-    format: optionalString2(ctx, "artifact-format"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds")
+    cluster_query_scope: optionalString(ctx, "cluster-query-scope"),
+    slave_cluster_id: optionalString(ctx, "slave-cluster-id"),
+    format: optionalString(ctx, "artifact-format"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds")
   });
 }
 var adhocBaseFlags = [
@@ -2822,7 +2717,9 @@ var adhocBaseFlags = [
   requestIdFlag,
   useCacheFlag2,
   zoneOffsetFlag2,
-  fieldsFlag
+  fieldsFlag,
+  clusterQueryScopeFlag,
+  slaveClusterIdFlag
 ];
 var adhocExportFlags = [
   ...adhocBaseFlags,
@@ -2842,6 +2739,7 @@ var adhocRun = createAnalysisCapabilityCommand({
     syncTimeoutSecondsFlag
   ],
   risk: "read",
+  validate: validateClusterQueryRouting,
   buildInput: adhocRunInput,
   postProcess: applyAnalysisInlineLimit
 });
@@ -2856,6 +2754,7 @@ var adhocExport = createAnalysisCapabilityCommand({
     ...adhocExportFlags
   ],
   risk: "read",
+  validate: validateClusterQueryRouting,
   buildInput: adhocExportInput
 });
 
@@ -2884,11 +2783,11 @@ var dashboardDefinitionExport = createAnalysisCapabilityCommand({
   risk: "read",
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
-    dashboard_id: optionalNumber2(ctx, "dashboard-id"),
+    dashboard_id: optionalNumber(ctx, "dashboard-id"),
     dashboard_ids: optionalJsonArray(ctx, "dashboard-ids"),
     dashboard_folder_ids: optionalJsonArray(ctx, "dashboard-folder-ids"),
     shared_spaces: optionalJson(ctx, "shared-spaces"),
-    export_file_name: optionalString2(ctx, "export-file-name"),
+    export_file_name: optionalString(ctx, "export-file-name"),
     payload: optionalJson(ctx, "payload")
   })
 });
@@ -2911,9 +2810,9 @@ var dashboardDefinitionImport = createAnalysisCapabilityCommand({
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
     definition: ctx.json("definition"),
-    validate_only: optionalBoolean2(ctx, "validate-only"),
-    dashboard_name_conflict_policy: optionalString2(ctx, "dashboard-name-conflict-policy"),
-    space_dashboard_policy: optionalString2(ctx, "space-dashboard-policy"),
+    validate_only: optionalBoolean(ctx, "validate-only"),
+    dashboard_name_conflict_policy: optionalString(ctx, "dashboard-name-conflict-policy"),
+    space_dashboard_policy: optionalString(ctx, "space-dashboard-policy"),
     payload: optionalJson(ctx, "payload")
   })
 });
@@ -2974,30 +2873,30 @@ function dailyReportInput(ctx, update) {
   return compactInput({
     ...projectInput(ctx),
     dashboard_id: ctx.num("dashboard-id"),
-    need_csv: useDefaults ? booleanWithDefault(ctx, "need-csv", false) : optionalBoolean2(ctx, "need-csv"),
-    host_url: useDefaults ? stringWithDefault(ctx, "host-url", "") : optionalString2(ctx, "host-url"),
-    enable_smtp: useDefaults ? booleanWithDefault(ctx, "enable-smtp", false) : optionalBoolean2(ctx, "enable-smtp"),
-    enable_email: useDefaults ? booleanWithDefault(ctx, "enable-email", false) : optionalBoolean2(ctx, "enable-email"),
-    enable_dd: useDefaults ? booleanWithDefault(ctx, "enable-dd", false) : optionalBoolean2(ctx, "enable-dd"),
+    need_csv: useDefaults ? booleanWithDefault(ctx, "need-csv", false) : optionalBoolean(ctx, "need-csv"),
+    host_url: useDefaults ? stringWithDefault(ctx, "host-url", "") : optionalString(ctx, "host-url"),
+    enable_smtp: useDefaults ? booleanWithDefault(ctx, "enable-smtp", false) : optionalBoolean(ctx, "enable-smtp"),
+    enable_email: useDefaults ? booleanWithDefault(ctx, "enable-email", false) : optionalBoolean(ctx, "enable-email"),
+    enable_dd: useDefaults ? booleanWithDefault(ctx, "enable-dd", false) : optionalBoolean(ctx, "enable-dd"),
     dd_url: optionalJson(ctx, "dd-url"),
-    enable_wx: useDefaults ? booleanWithDefault(ctx, "enable-wx", false) : optionalBoolean2(ctx, "enable-wx"),
+    enable_wx: useDefaults ? booleanWithDefault(ctx, "enable-wx", false) : optionalBoolean(ctx, "enable-wx"),
     wx_url: optionalJson(ctx, "wx-url"),
-    enable_feishu: useDefaults ? booleanWithDefault(ctx, "enable-feishu", false) : optionalBoolean2(ctx, "enable-feishu"),
+    enable_feishu: useDefaults ? booleanWithDefault(ctx, "enable-feishu", false) : optionalBoolean(ctx, "enable-feishu"),
     feishu_info: optionalJson(ctx, "feishu-info"),
-    enable_kim: useDefaults ? booleanWithDefault(ctx, "enable-kim", false) : optionalBoolean2(ctx, "enable-kim"),
+    enable_kim: useDefaults ? booleanWithDefault(ctx, "enable-kim", false) : optionalBoolean(ctx, "enable-kim"),
     kim_url: optionalJson(ctx, "kim-url"),
-    enable_slack: useDefaults ? booleanWithDefault(ctx, "enable-slack", false) : optionalBoolean2(ctx, "enable-slack"),
+    enable_slack: useDefaults ? booleanWithDefault(ctx, "enable-slack", false) : optionalBoolean(ctx, "enable-slack"),
     slack_url: optionalJson(ctx, "slack-url"),
-    email_login_users: optionalString2(ctx, "email-login-users"),
-    email_new: optionalString2(ctx, "email-new"),
-    send_title: optionalString2(ctx, "send-title"),
-    send_content: optionalString2(ctx, "send-content"),
-    send_date: useDefaults ? stringWithDefault(ctx, "send-date", "1,2,3,4,5,6,7") : optionalString2(ctx, "send-date"),
-    send_time: useDefaults ? stringWithDefault(ctx, "send-time", "09:00") : optionalString2(ctx, "send-time"),
-    lang: useDefaults ? stringWithDefault(ctx, "lang", "zh-CN") : optionalString2(ctx, "lang"),
-    screen_type: useDefaults ? stringWithDefault(ctx, "screen-type", "normal") : optionalString2(ctx, "screen-type"),
-    zone_offset: useDefaults ? numberWithDefault(ctx, "zone-offset", 0) : optionalNumber2(ctx, "zone-offset"),
-    enable_send: update ? useDefaults ? booleanWithDefault(ctx, "enable-send", false) : optionalBoolean2(ctx, "enable-send") : void 0,
+    email_login_users: optionalString(ctx, "email-login-users"),
+    email_new: optionalString(ctx, "email-new"),
+    send_title: optionalString(ctx, "send-title"),
+    send_content: optionalString(ctx, "send-content"),
+    send_date: useDefaults ? stringWithDefault(ctx, "send-date", "1,2,3,4,5,6,7") : optionalString(ctx, "send-date"),
+    send_time: useDefaults ? stringWithDefault(ctx, "send-time", "09:00") : optionalString(ctx, "send-time"),
+    lang: useDefaults ? stringWithDefault(ctx, "lang", "zh-CN") : optionalString(ctx, "lang"),
+    screen_type: useDefaults ? stringWithDefault(ctx, "screen-type", "normal") : optionalString(ctx, "screen-type"),
+    zone_offset: useDefaults ? numberWithDefault(ctx, "zone-offset", 0) : optionalNumber(ctx, "zone-offset"),
+    enable_send: update ? useDefaults ? booleanWithDefault(ctx, "enable-send", false) : optionalBoolean(ctx, "enable-send") : void 0,
     payload
   });
 }
@@ -3088,10 +2987,10 @@ var biPanelCreate = createAnalysisCapabilityCommand({
   risk: "write",
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
-    panel_name: optionalString2(ctx, "panel-name"),
-    panel_uuid: optionalString2(ctx, "panel-uuid"),
-    space_id: optionalNumber2(ctx, "space-id"),
-    folder_id: optionalNumber2(ctx, "folder-id"),
+    panel_name: optionalString(ctx, "panel-name"),
+    panel_uuid: optionalString(ctx, "panel-uuid"),
+    space_id: optionalNumber(ctx, "space-id"),
+    folder_id: optionalNumber(ctx, "folder-id"),
     payload: optionalJson(ctx, "payload")
   })
 });
@@ -3111,8 +3010,8 @@ var biPanelUpdate = createAnalysisCapabilityCommand({
   risk: "write",
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
-    panel_name: optionalString2(ctx, "panel-name"),
-    panel_uuid: optionalString2(ctx, "panel-uuid"),
+    panel_name: optionalString(ctx, "panel-name"),
+    panel_uuid: optionalString(ctx, "panel-uuid"),
     payload: optionalJson(ctx, "payload")
   })
 });
@@ -3163,10 +3062,10 @@ var biPanelCopy = createAnalysisCapabilityCommand({
   risk: "write",
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
-    panel_name: optionalString2(ctx, "panel-name"),
-    panel_uuid: optionalString2(ctx, "panel-uuid"),
-    space_id: optionalNumber2(ctx, "space-id"),
-    folder_id: optionalNumber2(ctx, "folder-id"),
+    panel_name: optionalString(ctx, "panel-name"),
+    panel_uuid: optionalString(ctx, "panel-uuid"),
+    space_id: optionalNumber(ctx, "space-id"),
+    folder_id: optionalNumber(ctx, "folder-id"),
     payload: optionalJson(ctx, "payload")
   })
 });
@@ -3200,8 +3099,8 @@ var biPanelVersionGet = createAnalysisCapabilityCommand({
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
     panel_id: ctx.str("panel-id") === "" ? void 0 : ctx.num("panel-id"),
-    panel_uuid: optionalString2(ctx, "panel-uuid"),
-    version_type: optionalString2(ctx, "version-type"),
+    panel_uuid: optionalString(ctx, "panel-uuid"),
+    version_type: optionalString(ctx, "version-type"),
     fields: optionalJson(ctx, "fields")
   })
 });
@@ -3222,7 +3121,7 @@ var biPanelVersionPublish = createAnalysisCapabilityCommand({
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
     panel_id: ctx.str("panel-id") === "" ? void 0 : ctx.num("panel-id"),
-    panel_uuid: optionalString2(ctx, "panel-uuid"),
+    panel_uuid: optionalString(ctx, "panel-uuid"),
     source_version: ctx.str("source-version")
   })
 });
@@ -3350,10 +3249,10 @@ var favoriteAdd = createAnalysisCapabilityCommand({
   risk: "write",
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
-    asset_id: optionalNumber2(ctx, "asset-id"),
-    asset_type: optionalString2(ctx, "asset-type"),
-    space_id: optionalNumber2(ctx, "space-id"),
-    id: optionalNumber2(ctx, "id"),
+    asset_id: optionalNumber(ctx, "asset-id"),
+    asset_type: optionalString(ctx, "asset-type"),
+    space_id: optionalNumber(ctx, "space-id"),
+    id: optionalNumber(ctx, "id"),
     payload: optionalJson(ctx, "payload")
   })
 });
@@ -3375,10 +3274,10 @@ var favoriteRemove = createAnalysisCapabilityCommand({
   risk: "write",
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
-    asset_id: optionalNumber2(ctx, "asset-id"),
-    asset_type: optionalString2(ctx, "asset-type"),
-    space_id: optionalNumber2(ctx, "space-id"),
-    id: optionalNumber2(ctx, "id"),
+    asset_id: optionalNumber(ctx, "asset-id"),
+    asset_type: optionalString(ctx, "asset-type"),
+    space_id: optionalNumber(ctx, "space-id"),
+    id: optionalNumber(ctx, "id"),
     payload: optionalJson(ctx, "payload")
   })
 });
@@ -3410,11 +3309,11 @@ var publicLinkCreate = createAnalysisCapabilityCommand({
   risk: "write",
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
-    company_id: optionalNumber2(ctx, "company-id"),
+    company_id: optionalNumber(ctx, "company-id"),
     resource_type: ctx.str("resource-type"),
     resource_id: ctx.num("resource-id"),
     access_controls: optionalJson(ctx, "access-controls"),
-    remark: optionalString2(ctx, "remark"),
+    remark: optionalString(ctx, "remark"),
     effective_at: ctx.str("effective-at"),
     expires_at: ctx.str("expires-at"),
     payload: optionalJson(ctx, "payload")
@@ -3451,10 +3350,10 @@ var publicLinkUpdate = createAnalysisCapabilityCommand({
   risk: "write",
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
-    company_id: optionalNumber2(ctx, "company-id"),
+    company_id: optionalNumber(ctx, "company-id"),
     link_id: ctx.num("link-id"),
     access_controls: optionalJson(ctx, "access-controls"),
-    remark: optionalString2(ctx, "remark"),
+    remark: optionalString(ctx, "remark"),
     effective_at: ctx.str("effective-at"),
     expires_at: ctx.str("expires-at"),
     payload: optionalJson(ctx, "payload")
@@ -3476,8 +3375,8 @@ var publicLinkOffline = createAnalysisCapabilityCommand({
   risk: "write",
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
-    company_id: optionalNumber2(ctx, "company-id"),
-    link_id: optionalNumber2(ctx, "link-id"),
+    company_id: optionalNumber(ctx, "company-id"),
+    link_id: optionalNumber(ctx, "link-id"),
     link_ids: optionalJsonArray(ctx, "link-ids")
   })
 });
@@ -3497,8 +3396,8 @@ var publicLinkDelete = createAnalysisCapabilityCommand({
   risk: "high-risk-write",
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
-    company_id: optionalNumber2(ctx, "company-id"),
-    link_id: optionalNumber2(ctx, "link-id"),
+    company_id: optionalNumber(ctx, "company-id"),
+    link_id: optionalNumber(ctx, "link-id"),
     link_ids: optionalJsonArray(ctx, "link-ids")
   })
 });
@@ -3513,57 +3412,40 @@ var commands31 = [
 ];
 var public_link_default = commands31;
 
-// src/commands/te-analysis/model/cancel-query.ts
-var cancelQuery = createMcpCommand({
-  command: "+cancel_query",
-  description: "Cancel a running MCP query by request ID. Use this when a previous query is no longer needed, the caller or agent timed out before the query returned, the request returns fetch failed, hits an HTTP timeout, or the user asks to stop waiting. If fetch failed, HTTP timeout, or caller timeout happens, the backend query may still be running; call +cancel_query --request_id <same value> with the requestId supplied before starting the query. For proactive cancellation, generate and pass requestId to the query tool before starting it, then call cancel_query with the same value if you stop waiting.",
-  flags: [
-    { name: "request_id", type: "string", required: true, desc: "Request ID returned by a query tool in metadata.requestId, or the requestId supplied before starting the query. It must use mcp_<32 lowercase hex UUID>, for example mcp_0123456789abcdef0123456789abcdef." },
-    { name: "reason", type: "string", required: false, desc: "Optional cancellation reason. Default: MCP_CANCEL_QUERY_TOOL." }
-  ],
-  risk: "write",
-  buildArgs: (ctx) => ({
-    requestId: ctx.str("request_id"),
-    reason: optionalString(ctx, "reason")
-  })
-});
-
-// src/commands/te-analysis/model/load-filters.ts
-var loadFilters = createMcpCommand({
-  command: "+load_filters",
-  description: "Load candidate values for a property from event or user tables. Use quot to specify the property field whose enum values should be loaded.",
+// src/commands/te-analysis/filter-value/list.ts
+var filterValueList = createAnalysisCapabilityCommand({
+  resource: "filter-value",
+  command: "list",
+  capabilityId: "analysis.filter_value.list",
+  description: "List stored candidate values for one known event property, user property, user tag, or user cluster before building an exact analysis filter.",
   flags: [
-    { name: "project_id", type: "number", required: true, alias: "p", desc: "Project ID" },
-    { name: "quot", type: "string", required: true, desc: "Property identifier (field name). This is the property whose candidate values will be loaded." },
-    { name: "table_type", type: "string", required: true, desc: "Table type. Supported values: event and user." },
-    { name: "event_name", type: "string", required: false, desc: "Optional event name. Effective when table_type=event." },
-    { name: "inputdata", type: "string", required: false, desc: "Optional input prefix used for fuzzy filtering of candidate values." },
-    { name: "zone_offset", type: "number", required: false, desc: "Time zone offset in hours. For example, UTC+8 is 8" },
-    { name: "cluster_date_policy", type: "string", required: false, desc: "Cluster date policy. Supported values: LATEST, AUTO, SPECIFIED." },
-    { name: "specified_cluster_date", type: "string", required: false, desc: "Specified cluster date in yyyy-MM-dd format. Effective only when cluster_date_policy=SPECIFIED." },
-    { name: "is_report", type: "boolean", required: false, desc: "Whether this is report mode. Default: false" }
+    projectIdFlag,
+    { name: "property-name", type: "string", required: true, desc: "Exact property identifier. Resolve the property first; this command discovers values, not fields." },
+    { name: "table-type", type: "string", required: true, desc: "Property table: event or user." },
+    { name: "event-name", type: "string", required: false, desc: "Optional exact event name for an event-property lookup." },
+    { name: "search-prefix", type: "string", required: false, desc: "Optional prefix or fuzzy input to narrow candidate values." },
+    { name: "zone-offset", type: "number", required: false, desc: "Optional fixed timezone offset from -12 through 14." },
+    { name: "cluster-date-policy", type: "string", required: false, desc: "Optional user tag/cluster data-snapshot policy: LATEST means the latest available computed result snapshot, not a tag definition or configuration release; AUTO and SPECIFIED select other snapshot modes." },
+    { name: "specified-cluster-date", type: "string", required: false, desc: "Required only with --cluster-date-policy SPECIFIED to select a historical computed result snapshot; yyyy-MM-dd." },
+    { name: "report-mode", type: "boolean", required: false, desc: "Use report-compatible property semantics. Default: false." }
   ],
   risk: "read",
-  mcpService: "te_analysis_extend",
-  buildArgs: (ctx) => ({
-    projectId: ctx.num("project_id"),
-    quot: ctx.str("quot"),
-    tableType: ctx.str("table_type"),
-    eventName: optionalString(ctx, "event_name"),
-    inputdata: optionalString(ctx, "inputdata"),
-    zoneOffset: optionalNumber(ctx, "zone_offset"),
-    clusterDatePolicy: optionalString(ctx, "cluster_date_policy"),
-    specifiedClusterDate: optionalString(ctx, "specified_cluster_date"),
-    isReport: optionalBoolean(ctx, "is_report")
+  buildInput: (ctx) => compactInput({
+    project_id: ctx.num("project-id"),
+    property_name: ctx.str("property-name"),
+    table_type: ctx.str("table-type"),
+    event_name: optionalString(ctx, "event-name"),
+    search_prefix: optionalString(ctx, "search-prefix"),
+    zone_offset: optionalNumber(ctx, "zone-offset"),
+    cluster_date_policy: optionalString(ctx, "cluster-date-policy"),
+    specified_cluster_date: optionalString(ctx, "specified-cluster-date"),
+    report_mode: optionalBoolean(ctx, "report-mode")
   })
 });
 
-// src/commands/te-analysis/model/index.ts
-var commands32 = [
-  cancelQuery,
-  loadFilters
-];
-var model_default = commands32;
+// src/commands/te-analysis/filter-value/index.ts
+var commands32 = [filterValueList];
+var filter_value_default = commands32;
 
 // src/commands/te-analysis/event-detail/shared.ts
 var eventDetailDefinitionFlag = {
@@ -3576,22 +3458,22 @@ function eventDetailRunInput(ctx) {
   return compactInput({
     project_id: ctx.num("project-id"),
     definition: ctx.json("definition"),
-    request_id: optionalString2(ctx, "request-id"),
-    use_cache: optionalBoolean2(ctx, "use-cache"),
-    zone_offset: optionalNumber2(ctx, "zone-offset"),
-    limit: optionalNumber2(ctx, "limit"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds")
+    request_id: optionalString(ctx, "request-id"),
+    use_cache: optionalBoolean(ctx, "use-cache"),
+    zone_offset: optionalNumber(ctx, "zone-offset"),
+    limit: optionalNumber(ctx, "limit"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds")
   });
 }
 function eventDetailExportInput(ctx) {
   return compactInput({
     project_id: ctx.num("project-id"),
     definition: ctx.json("definition"),
-    request_id: optionalString2(ctx, "request-id"),
-    use_cache: optionalBoolean2(ctx, "use-cache"),
-    zone_offset: optionalNumber2(ctx, "zone-offset"),
-    format: optionalString2(ctx, "artifact-format"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds")
+    request_id: optionalString(ctx, "request-id"),
+    use_cache: optionalBoolean(ctx, "use-cache"),
+    zone_offset: optionalNumber(ctx, "zone-offset"),
+    format: optionalString(ctx, "artifact-format"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds")
   });
 }
 var eventDetailBaseFlags = [
@@ -3654,22 +3536,22 @@ function entityDetailRunInput(ctx) {
   return compactInput({
     project_id: ctx.num("project-id"),
     definition: ctx.json("definition"),
-    request_id: optionalString2(ctx, "request-id"),
-    use_cache: optionalBoolean2(ctx, "use-cache"),
-    zone_offset: optionalNumber2(ctx, "zone-offset"),
-    limit: optionalNumber2(ctx, "limit"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds")
+    request_id: optionalString(ctx, "request-id"),
+    use_cache: optionalBoolean(ctx, "use-cache"),
+    zone_offset: optionalNumber(ctx, "zone-offset"),
+    limit: optionalNumber(ctx, "limit"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds")
   });
 }
 function entityDetailExportInput(ctx) {
   return compactInput({
     project_id: ctx.num("project-id"),
     definition: ctx.json("definition"),
-    request_id: optionalString2(ctx, "request-id"),
-    use_cache: optionalBoolean2(ctx, "use-cache"),
-    zone_offset: optionalNumber2(ctx, "zone-offset"),
-    format: optionalString2(ctx, "artifact-format"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds")
+    request_id: optionalString(ctx, "request-id"),
+    use_cache: optionalBoolean(ctx, "use-cache"),
+    zone_offset: optionalNumber(ctx, "zone-offset"),
+    format: optionalString(ctx, "artifact-format"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds")
   });
 }
 var entityDetailBaseFlags = [
@@ -3729,6 +3611,7 @@ var queryContextIdFlag = {
   desc: "query_context_id returned by a synchronous event-analysis preview. Analysis exports never create one."
 };
 var drilldownEventsRunFlags = [
+  projectIdFlag,
   queryContextIdFlag,
   sourceFlag,
   coordinateFlag,
@@ -3745,6 +3628,7 @@ var csvArtifactFormatFlag = {
   desc: "Artifact format. Only csv is supported; the downloaded artifact is csv.gz."
 };
 var drilldownEventsExportFlags = [
+  projectIdFlag,
   queryContextIdFlag,
   sourceFlag,
   coordinateFlag,
@@ -3756,26 +3640,28 @@ var drilldownEventsExportFlags = [
 ];
 function drilldownEventsRunInput(ctx) {
   return compactInput({
+    project_id: ctx.num("project-id"),
     query_context_id: ctx.str("query-context-id"),
     source: optionalJson(ctx, "source"),
     coordinate: ctx.json("coordinate"),
     properties: optionalJson(ctx, "properties"),
-    request_id: optionalString2(ctx, "request-id"),
-    use_cache: optionalBoolean2(ctx, "use-cache"),
-    limit: optionalNumber2(ctx, "limit"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds")
+    request_id: optionalString(ctx, "request-id"),
+    use_cache: optionalBoolean(ctx, "use-cache"),
+    limit: optionalNumber(ctx, "limit"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds")
   });
 }
 function drilldownEventsExportInput(ctx) {
   return compactInput({
+    project_id: ctx.num("project-id"),
     query_context_id: ctx.str("query-context-id"),
     source: optionalJson(ctx, "source"),
     coordinate: ctx.json("coordinate"),
     properties: optionalJson(ctx, "properties"),
-    request_id: optionalString2(ctx, "request-id"),
-    use_cache: optionalBoolean2(ctx, "use-cache"),
-    format: optionalString2(ctx, "artifact-format"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds")
+    request_id: optionalString(ctx, "request-id"),
+    use_cache: optionalBoolean(ctx, "use-cache"),
+    format: optionalString(ctx, "artifact-format"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds")
   });
 }
 
@@ -3820,6 +3706,7 @@ var csvArtifactFormatFlag2 = {
   desc: "Artifact format. Only csv is supported; the downloaded artifact is csv.gz."
 };
 var drilldownEntitiesBaseFlags = [
+  projectIdFlag,
   queryContextIdFlag2,
   sourceFlag,
   coordinateFlag,
@@ -3840,25 +3727,26 @@ var drilldownEntitiesExportFlags = [
 function drilldownEntitiesRunInput(ctx) {
   return compactInput({
     ...baseInput(ctx),
-    limit: optionalNumber2(ctx, "limit"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds")
+    limit: optionalNumber(ctx, "limit"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds")
   });
 }
 function drilldownEntitiesExportInput(ctx) {
   return compactInput({
     ...baseInput(ctx),
-    format: optionalString2(ctx, "artifact-format"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds")
+    format: optionalString(ctx, "artifact-format"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds")
   });
 }
 function baseInput(ctx) {
   return {
+    project_id: ctx.num("project-id"),
     query_context_id: ctx.str("query-context-id"),
     source: optionalJson(ctx, "source"),
     coordinate: ctx.json("coordinate"),
     properties: optionalJson(ctx, "properties"),
-    request_id: optionalString2(ctx, "request-id"),
-    use_cache: optionalBoolean2(ctx, "use-cache")
+    request_id: optionalString(ctx, "request-id"),
+    use_cache: optionalBoolean(ctx, "use-cache")
   };
 }
 
@@ -3917,6 +3805,7 @@ var csvArtifactFormatFlag3 = {
   desc: "Artifact format. Only csv is supported; the downloaded artifact is csv.gz."
 };
 var drilldownUserEventsBaseFlags = [
+  projectIdFlag,
   drilldownContextIdFlag,
   userIdFlag,
   ...sequenceFlags,
@@ -3936,29 +3825,30 @@ var drilldownUserEventsExportFlags = [
 function drilldownUserEventsRunInput(ctx) {
   return compactInput({
     ...baseInput2(ctx),
-    limit: optionalNumber2(ctx, "limit"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds")
+    limit: optionalNumber(ctx, "limit"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds")
   });
 }
 function drilldownUserEventsExportInput(ctx) {
   return compactInput({
     ...baseInput2(ctx),
-    format: optionalString2(ctx, "artifact-format"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds")
+    format: optionalString(ctx, "artifact-format"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds")
   });
 }
 function baseInput2(ctx) {
   return {
+    project_id: ctx.num("project-id"),
     drilldown_context_id: ctx.str("drilldown-context-id"),
     user_id: ctx.str("user-id"),
     properties: optionalJson(ctx, "properties"),
-    sort_order: optionalString2(ctx, "sort-order"),
-    event_name_filter: optionalString2(ctx, "event-name-filter"),
-    time_filter: optionalString2(ctx, "time-filter"),
-    time_filter_before_nums: optionalNumber2(ctx, "time-filter-before-nums"),
-    time_filter_after_nums: optionalNumber2(ctx, "time-filter-after-nums"),
-    request_id: optionalString2(ctx, "request-id"),
-    use_cache: optionalBoolean2(ctx, "use-cache")
+    sort_order: optionalString(ctx, "sort-order"),
+    event_name_filter: optionalString(ctx, "event-name-filter"),
+    time_filter: optionalString(ctx, "time-filter"),
+    time_filter_before_nums: optionalNumber(ctx, "time-filter-before-nums"),
+    time_filter_after_nums: optionalNumber(ctx, "time-filter-after-nums"),
+    request_id: optionalString(ctx, "request-id"),
+    use_cache: optionalBoolean(ctx, "use-cache")
   };
 }
 
@@ -4270,11 +4160,11 @@ function uploadedInputFileId(value) {
 function assetListInput(ctx) {
   return compactInput({
     project_id: ctx.num("project-id"),
-    query: optionalString2(ctx, "query"),
+    query: optionalString(ctx, "query"),
     fields: optionalJsonArray(ctx, "fields"),
-    limit: optionalNumber2(ctx, "limit"),
-    offset: optionalNumber2(ctx, "offset"),
-    authenticated_only: optionalBoolean2(ctx, "authenticated-only")
+    limit: optionalNumber(ctx, "limit"),
+    offset: optionalNumber(ctx, "offset"),
+    authenticated_only: optionalBoolean(ctx, "authenticated-only")
   });
 }
 function memberInput(ctx, kind, inline) {
@@ -4282,14 +4172,14 @@ function memberInput(ctx, kind, inline) {
     project_id: ctx.num("project-id"),
     cluster_name: kind === "cluster" ? ctx.str("cluster-name") : void 0,
     tag_name: kind === "tag" ? ctx.str("tag-name") : void 0,
-    snapshot_date: kind === "tag" ? optionalString2(ctx, "snapshot-date") : void 0,
+    snapshot_date: kind === "tag" ? optionalString(ctx, "snapshot-date") : void 0,
     property_names: optionalJsonArray(ctx, "property-names"),
     fields: optionalJsonArray(ctx, "fields"),
-    query: optionalString2(ctx, "query"),
-    use_cache: optionalBoolean2(ctx, "use-cache"),
-    request_id: optionalString2(ctx, "request-id"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds"),
-    limit: inline ? optionalNumber2(ctx, "limit") : void 0,
+    query: optionalString(ctx, "query"),
+    use_cache: optionalBoolean(ctx, "use-cache"),
+    request_id: optionalString(ctx, "request-id"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds"),
+    limit: inline ? optionalNumber(ctx, "limit") : void 0,
     format: inline ? void 0 : optionalJsonlFormat(ctx)
   });
 }
@@ -4299,12 +4189,12 @@ function clusterWriteInput(ctx, create) {
   return compactInput({
     project_id: ctx.num("project-id"),
     cluster_name: ctx.str("cluster-name"),
-    display_name: create ? ctx.str("display-name") : optionalString2(ctx, "display-name"),
+    display_name: create ? ctx.str("display-name") : optionalString(ctx, "display-name"),
     definition_request: definitionRequest,
-    authenticated_only: optionalBoolean2(ctx, "authenticated-only"),
-    remark: create ? void 0 : optionalString2(ctx, "remark"),
-    zone_offset: optionalNumber2(ctx, "zone-offset"),
-    entity_id: create ? optionalNumber2(ctx, "entity-id") : void 0
+    authenticated_only: optionalBoolean(ctx, "authenticated-only"),
+    remark: create ? void 0 : optionalString(ctx, "remark"),
+    zone_offset: optionalNumber(ctx, "zone-offset"),
+    entity_id: create ? optionalNumber(ctx, "entity-id") : void 0
   });
 }
 function tagWriteInput(ctx, create) {
@@ -4313,12 +4203,12 @@ function tagWriteInput(ctx, create) {
   return compactInput({
     project_id: ctx.num("project-id"),
     tag_name: ctx.str("tag-name"),
-    display_name: create ? ctx.str("display-name") : optionalString2(ctx, "display-name"),
+    display_name: create ? ctx.str("display-name") : optionalString(ctx, "display-name"),
     definition_request: definitionRequest,
-    authenticated_only: optionalBoolean2(ctx, "authenticated-only"),
-    remark: create ? void 0 : optionalString2(ctx, "remark"),
-    zone_offset: optionalNumber2(ctx, "zone-offset"),
-    entity_id: create ? optionalNumber2(ctx, "entity-id") : void 0
+    authenticated_only: optionalBoolean(ctx, "authenticated-only"),
+    remark: create ? void 0 : optionalString(ctx, "remark"),
+    zone_offset: optionalNumber(ctx, "zone-offset"),
+    entity_id: create ? optionalNumber(ctx, "entity-id") : void 0
   });
 }
 function validateDefinitionRequest(create, definitionRequest) {
@@ -4329,25 +4219,25 @@ function validateDefinitionRequest(create, definitionRequest) {
 function idClusterInput(ctx, create) {
   return compactInput({
     project_id: ctx.num("project-id"),
-    cluster_name: create ? optionalString2(ctx, "cluster-name") : ctx.str("cluster-name"),
-    display_name: create ? ctx.str("display-name") : optionalString2(ctx, "display-name"),
-    input_file_id: optionalString2(ctx, "input-file-id"),
-    file_content: optionalString2(ctx, "file-content"),
+    cluster_name: create ? optionalString(ctx, "cluster-name") : ctx.str("cluster-name"),
+    display_name: create ? ctx.str("display-name") : optionalString(ctx, "display-name"),
+    input_file_id: optionalString(ctx, "input-file-id"),
+    file_content: optionalString(ctx, "file-content"),
     entity_id: create ? ctx.num("entity-id") : void 0,
-    remarks: optionalString2(ctx, "remarks"),
-    main_column_name: optionalString2(ctx, "association-property")
+    remarks: optionalString(ctx, "remarks"),
+    main_column_name: optionalString(ctx, "association-property")
   });
 }
 function idTagInput(ctx, create) {
   return compactInput({
     project_id: ctx.num("project-id"),
-    tag_name: create ? optionalString2(ctx, "tag-name") : ctx.str("tag-name"),
-    display_name: create ? ctx.str("display-name") : optionalString2(ctx, "display-name"),
-    input_file_id: optionalString2(ctx, "input-file-id"),
-    file_content: optionalString2(ctx, "file-content"),
-    entity_id: create ? ctx.num("entity-id") : optionalNumber2(ctx, "entity-id"),
-    remarks: optionalString2(ctx, "remarks"),
-    main_column_name: optionalString2(ctx, "association-property")
+    tag_name: create ? optionalString(ctx, "tag-name") : ctx.str("tag-name"),
+    display_name: create ? ctx.str("display-name") : optionalString(ctx, "display-name"),
+    input_file_id: optionalString(ctx, "input-file-id"),
+    file_content: optionalString(ctx, "file-content"),
+    entity_id: create ? ctx.num("entity-id") : optionalNumber(ctx, "entity-id"),
+    remarks: optionalString(ctx, "remarks"),
+    main_column_name: optionalString(ctx, "association-property")
   });
 }
 function historyTagDataInput(ctx, inline) {
@@ -4355,9 +4245,9 @@ function historyTagDataInput(ctx, inline) {
     project_id: ctx.num("project-id"),
     tag_name: ctx.str("tag-name"),
     view: ctx.json("view"),
-    request_id: optionalString2(ctx, "request-id"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds"),
-    limit: inline ? optionalNumber2(ctx, "limit") : void 0,
+    request_id: optionalString(ctx, "request-id"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds"),
+    limit: inline ? optionalNumber(ctx, "limit") : void 0,
     format: inline ? void 0 : optionalJsonlFormat(ctx)
   });
 }
@@ -4370,16 +4260,16 @@ function historyTagDataDrilldownInput(ctx, inline) {
     view: ctx.json("view"),
     property_names: optionalJsonArray(ctx, "property-names"),
     fields: optionalJsonArray(ctx, "fields"),
-    query: optionalString2(ctx, "query"),
-    use_cache: optionalBoolean2(ctx, "use-cache"),
-    request_id: optionalString2(ctx, "request-id"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds"),
-    limit: inline ? optionalNumber2(ctx, "limit") : void 0,
+    query: optionalString(ctx, "query"),
+    use_cache: optionalBoolean(ctx, "use-cache"),
+    request_id: optionalString(ctx, "request-id"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds"),
+    limit: inline ? optionalNumber(ctx, "limit") : void 0,
     format: inline ? void 0 : optionalJsonlFormat(ctx)
   });
 }
 function optionalJsonlFormat(ctx) {
-  const format = optionalString2(ctx, "artifact-format");
+  const format = optionalString(ctx, "artifact-format");
   if (format !== void 0 && format !== "jsonl") {
     throw new Error("--artifact-format only supports jsonl for user member/history-tag exports");
   }
@@ -4472,7 +4362,7 @@ var commands38 = [
   ], "high-risk-write", (ctx) => compactInput({
     project_id: ctx.num("project-id"),
     cluster_name: ctx.str("cluster-name"),
-    confirmed: optionalBoolean2(ctx, "confirmed")
+    confirmed: optionalBoolean(ctx, "confirmed")
   })),
   capability("user-tag", "list", "analysis.user_tag.list", "List user tags for discovery. Returned identifiers use canonical tag_name. Use offset only for stable asset browsing.", tagListFlags, "read", assetListInput),
   capability("user-tag", "get", "analysis.user_tag.get", "Get user tag details by exact tag_name values.", [
@@ -4541,7 +4431,7 @@ var commands38 = [
   ], "high-risk-write", (ctx) => compactInput({
     project_id: ctx.num("project-id"),
     tag_name: ctx.str("tag-name"),
-    confirmed: optionalBoolean2(ctx, "confirmed")
+    confirmed: optionalBoolean(ctx, "confirmed")
   })),
   capability("history-tag", "list", "analysis.history_tag.list", "List history tag snapshots for a tag.", [
     projectIdFlag,
@@ -4556,7 +4446,7 @@ var commands38 = [
     project_id: ctx.num("project-id"),
     tag_name: ctx.str("tag-name"),
     refresh_date: ctx.str("refresh-date"),
-    use_user_table_type: optionalString2(ctx, "use-user-table-type")
+    use_user_table_type: optionalString(ctx, "use-user-table-type")
   })),
   capability("history-tag", "batch-refresh", "analysis.history_tag.batch_refresh", "Batch refresh history tag snapshots using the product refresh request object.", [
     projectIdFlag,
@@ -4578,7 +4468,7 @@ var commands38 = [
     tag_name: ctx.str("tag-name"),
     start_time: ctx.str("start-time"),
     end_time: ctx.str("end-time"),
-    confirmed: optionalBoolean2(ctx, "confirmed")
+    confirmed: optionalBoolean(ctx, "confirmed")
   })),
   capability("history-tag-data", "run", "analysis.history_tag_data.run", `Run a bounded history tag statistics query. ${analysisDataRunRoutingHelp}`, [
     projectIdFlag,
@@ -4613,24 +4503,20 @@ var commands38 = [
 ];
 var user_default = commands38;
 
-// src/commands/te-analysis/global/list-query-clusters.ts
-var listQueryClusters = createMcpCommand({
-  command: "+list_query_clusters",
-  description: "List query cluster options accessible to the current account in the project. Use this to decide whether to query the current self cluster, global aggregated data, or one specific slave cluster.",
-  flags: [
-    { name: "project_id", type: "number", required: true, desc: "Project ID used to resolve cluster query permissions", alias: "p" }
-  ],
+// src/commands/te-analysis/query-cluster/list.ts
+var queryClusterList = createAnalysisCapabilityCommand({
+  resource: "query-cluster",
+  command: "list",
+  capabilityId: "analysis.query_cluster.list",
+  description: "List accessible physical query-routing clusters and GLOBAL/SLAVE options. This is not the saved user cohort/cluster catalog.",
+  flags: [projectIdFlag],
   risk: "read",
-  buildArgs: (ctx) => ({
-    projectId: ctx.num("project_id")
-  })
+  buildInput: projectInput
 });
 
-// src/commands/te-analysis/global/index.ts
-var commands39 = [
-  listQueryClusters
-];
-var global_default = commands39;
+// src/commands/te-analysis/query-cluster/index.ts
+var commands39 = [queryClusterList];
+var query_cluster_default = commands39;
 
 // src/commands/te-analysis/sql-table/columns.ts
 var sqlTableColumns = createAnalysisCapabilityCommand({
@@ -4652,7 +4538,7 @@ var sqlTableColumns = createAnalysisCapabilityCommand({
   buildInput: (ctx) => compactInput({
     ...projectInput(ctx),
     table_ref: ctx.str("table-ref"),
-    usage: optionalString2(ctx, "usage")
+    usage: optionalString(ctx, "usage")
   })
 });
 
@@ -4666,10 +4552,10 @@ var sqlTableList = createAnalysisCapabilityCommand({
   risk: "read",
   buildInput: (ctx) => compactInput({
     project_id: ctx.num("project-id"),
-    query: optionalString2(ctx, "query"),
-    limit: optionalNumber2(ctx, "limit"),
-    offset: optionalNumber2(ctx, "offset"),
-    usage: optionalString2(ctx, "usage")
+    query: optionalString(ctx, "query"),
+    limit: optionalNumber(ctx, "limit"),
+    offset: optionalNumber(ctx, "offset"),
+    usage: optionalString(ctx, "usage")
   })
 });
 
@@ -4823,7 +4709,7 @@ var projectDataPowerDelete = createAnalysisCapabilityCommand({
   buildInput: (ctx) => compactInput({
     project_id: ctx.num("project-id"),
     data_power_id: ctx.num("data-power-id"),
-    new_data_power_id: optionalNumber2(ctx, "new-data-power-id"),
+    new_data_power_id: optionalNumber(ctx, "new-data-power-id"),
     yes: true
   })
 });
@@ -4905,7 +4791,7 @@ var projectEntityCreate = createAnalysisCapabilityCommand({
     entity_name: ctx.str("entity-name"),
     column_name: ctx.str("column-name"),
     table_type: ctx.num("table-type"),
-    order: optionalNumber2(ctx, "order")
+    order: optionalNumber(ctx, "order")
   })
 });
 
@@ -4961,11 +4847,11 @@ var projectEntityList = createAnalysisCapabilityCommand({
   risk: "read",
   buildInput: (ctx) => compactInput({
     project_id: ctx.num("project-id"),
-    query: optionalString2(ctx, "query"),
+    query: optionalString(ctx, "query"),
     fields: optionalJson(ctx, "fields"),
-    limit: optionalNumber2(ctx, "limit"),
-    offset: optionalNumber2(ctx, "offset"),
-    event_name: optionalString2(ctx, "event-name")
+    limit: optionalNumber(ctx, "limit"),
+    offset: optionalNumber(ctx, "offset"),
+    event_name: optionalString(ctx, "event-name")
   })
 });
 
@@ -4990,7 +4876,7 @@ var projectEntityUpdate = createAnalysisCapabilityCommand({
     entity_name: ctx.str("entity-name"),
     column_name: ctx.str("column-name"),
     table_type: ctx.num("table-type"),
-    order: optionalNumber2(ctx, "order")
+    order: optionalNumber(ctx, "order")
   })
 });
 
@@ -5039,7 +4925,7 @@ var projectFunctionList = createAnalysisCapabilityCommand({
   ],
   risk: "read",
   buildInput: (ctx) => compactInput({
-    company_id: optionalNumber2(ctx, "company-id"),
+    company_id: optionalNumber(ctx, "company-id"),
     project_id: ctx.num("project-id")
   })
 });
@@ -5079,10 +4965,10 @@ var projectInfoList = createAnalysisCapabilityCommand({
   ],
   risk: "read",
   buildInput: (ctx) => compactInput({
-    query: optionalString2(ctx, "query"),
+    query: optionalString(ctx, "query"),
     fields: optionalJson(ctx, "fields"),
-    limit: optionalNumber2(ctx, "limit"),
-    offset: optionalNumber2(ctx, "offset")
+    limit: optionalNumber(ctx, "limit"),
+    offset: optionalNumber(ctx, "offset")
   })
 });
 
@@ -5101,7 +4987,7 @@ var projectInfoUpdate = createAnalysisCapabilityCommand({
   buildInput: (ctx) => compactInput({
     project_id: ctx.num("project-id"),
     project_name: ctx.str("project-name"),
-    project_remark: optionalString2(ctx, "project-remark")
+    project_remark: optionalString(ctx, "project-remark")
   })
 });
 
@@ -5130,9 +5016,9 @@ var projectMarkTimeCreate = createAnalysisCapabilityCommand({
   buildInput: (ctx) => compactInput({
     project_id: ctx.num("project-id"),
     marked_at: ctx.str("marked-at"),
-    zone_offset: optionalNumber2(ctx, "zone-offset"),
+    zone_offset: optionalNumber(ctx, "zone-offset"),
     content: ctx.str("content"),
-    is_visible: optionalNumber2(ctx, "is-visible")
+    is_visible: optionalNumber(ctx, "is-visible")
   })
 });
 
@@ -5171,11 +5057,11 @@ var projectMarkTimeList = createAnalysisCapabilityCommand({
   risk: "read",
   buildInput: (ctx) => compactInput({
     project_id: ctx.num("project-id"),
-    query: optionalString2(ctx, "query"),
+    query: optionalString(ctx, "query"),
     fields: optionalJson(ctx, "fields"),
-    limit: optionalNumber2(ctx, "limit"),
-    offset: optionalNumber2(ctx, "offset"),
-    zone_offset: optionalNumber2(ctx, "zone-offset")
+    limit: optionalNumber(ctx, "limit"),
+    offset: optionalNumber(ctx, "offset"),
+    zone_offset: optionalNumber(ctx, "zone-offset")
   })
 });
 
@@ -5198,9 +5084,9 @@ var projectMarkTimeUpdate = createAnalysisCapabilityCommand({
     project_id: ctx.num("project-id"),
     mark_time_id: ctx.num("mark-time-id"),
     marked_at: ctx.str("marked-at"),
-    zone_offset: optionalNumber2(ctx, "zone-offset"),
+    zone_offset: optionalNumber(ctx, "zone-offset"),
     content: ctx.str("content"),
-    is_visible: optionalNumber2(ctx, "is-visible")
+    is_visible: optionalNumber(ctx, "is-visible")
   })
 });
 
@@ -5347,7 +5233,7 @@ var projectMemberCandidateList = createAnalysisCapabilityCommand({
   buildInput: (ctx) => compactInput({
     project_id: ctx.num("project-id"),
     type: ctx.str("type"),
-    login_names: optionalString2(ctx, "login-names")
+    login_names: optionalString(ctx, "login-names")
   })
 });
 
@@ -5372,7 +5258,7 @@ var projectMemberHandoverExport = createAnalysisCapabilityCommand({
   buildInput: (ctx) => compactInput({
     project_id: ctx.num("project-id"),
     payload: ctx.json("payload"),
-    request_id: optionalString2(ctx, "request-id"),
+    request_id: optionalString(ctx, "request-id"),
     yes: true
   })
 });
@@ -5439,9 +5325,9 @@ var projectOwnerUpdate = createAnalysisCapabilityCommand({
   buildInput: (ctx) => compactInput({
     project_id: ctx.num("project-id"),
     company_id: ctx.num("company-id"),
-    owner_user_id: optionalNumber2(ctx, "owner-user-id"),
-    project_name: optionalString2(ctx, "project-name"),
-    project_remark: optionalString2(ctx, "project-remark")
+    owner_user_id: optionalNumber(ctx, "owner-user-id"),
+    project_name: optionalString(ctx, "project-name"),
+    project_remark: optionalString(ctx, "project-remark")
   })
 });
 
@@ -5515,7 +5401,7 @@ var projectRoleDelete = createAnalysisCapabilityCommand({
   buildInput: (ctx) => compactInput({
     project_id: ctx.num("project-id"),
     role_name: ctx.str("role-name"),
-    new_role_name: optionalString2(ctx, "new-role-name"),
+    new_role_name: optionalString(ctx, "new-role-name"),
     yes: true
   })
 });
@@ -5550,9 +5436,9 @@ var projectRoleList = createAnalysisCapabilityCommand({
   ],
   risk: "read",
   buildInput: (ctx) => compactInput({
-    company_id: optionalNumber2(ctx, "company-id"),
+    company_id: optionalNumber(ctx, "company-id"),
     project_id: ctx.num("project-id"),
-    visible_only: optionalBoolean2(ctx, "visible-only")
+    visible_only: optionalBoolean(ctx, "visible-only")
   })
 });
 
@@ -5597,11 +5483,11 @@ var projectRoleFunctionList = createAnalysisCapabilityCommand({
   ],
   risk: "read",
   buildInput: (ctx) => compactInput({
-    company_id: optionalNumber2(ctx, "company-id"),
+    company_id: optionalNumber(ctx, "company-id"),
     project_id: ctx.num("project-id"),
-    role_name: optionalString2(ctx, "role-name"),
+    role_name: optionalString(ctx, "role-name"),
     role_names: optionalJson(ctx, "role-names"),
-    show_system_func: optionalBoolean2(ctx, "show-system-func")
+    show_system_func: optionalBoolean(ctx, "show-system-func")
   })
 });
 
@@ -5896,8 +5782,8 @@ function projectInput2(ctx) {
 function projectLifecycleInput(ctx) {
   return compactInput({
     ...projectInput2(ctx),
-    request_id: optionalString2(ctx, "request-id"),
-    timeout_seconds: optionalNumber2(ctx, "timeout-seconds")
+    request_id: optionalString(ctx, "request-id"),
+    timeout_seconds: optionalNumber(ctx, "timeout-seconds")
   });
 }
 
@@ -6004,7 +5890,7 @@ var trackingPlanImportExcel = {
   risk: "write",
   validate: validateSource,
   validateInput: async (ctx) => {
-    const inputFile = optionalString2(ctx, "input-file");
+    const inputFile = optionalString(ctx, "input-file");
     if (inputFile) {
       return {
         valid: true,
@@ -6021,7 +5907,7 @@ var trackingPlanImportExcel = {
     );
   },
   dryRun: async (ctx) => {
-    const inputFile = optionalString2(ctx, "input-file");
+    const inputFile = optionalString(ctx, "input-file");
     if (inputFile) {
       return {
         steps: [
@@ -6045,8 +5931,8 @@ var trackingPlanImportExcel = {
     );
   },
   execute: async (ctx) => {
-    const inputFile = optionalString2(ctx, "input-file");
-    let inputFileId = optionalString2(ctx, "input-file-id");
+    const inputFile = optionalString(ctx, "input-file");
+    let inputFileId = optionalString(ctx, "input-file-id");
     if (inputFile) {
       const upload = await uploadInputFile(
         ctx.host(),
@@ -6070,8 +5956,8 @@ var trackingPlanImportExcel = {
   }
 };
 function validateSource(ctx) {
-  const inputFile = optionalString2(ctx, "input-file");
-  const inputFileId = optionalString2(ctx, "input-file-id");
+  const inputFile = optionalString(ctx, "input-file");
+  const inputFileId = optionalString(ctx, "input-file-id");
   if (Boolean(inputFile) === Boolean(inputFileId)) {
     throw new Error("Pass exactly one of --input-file or --input-file-id");
   }
@@ -6083,7 +5969,7 @@ function buildInput(ctx, inputFileId) {
   return compactInput({
     ...projectInput2(ctx),
     input_file_id: inputFileId,
-    lang: optionalString2(ctx, "lang")
+    lang: optionalString(ctx, "lang")
   });
 }
 
@@ -6146,7 +6032,7 @@ var trackingPlanChangeLogExport = createTrackingCapabilityCommand({
   description: "Export one tracking plan change log.",
   flags: [projectIdFlag, logIdFlag, requestIdFlag, asyncTimeoutSecondsFlag],
   risk: "read",
-  buildInput: (ctx) => compactInput({ ...projectInput2(ctx), log_id: ctx.num("log-id"), request_id: optionalString2(ctx, "request-id"), timeout_seconds: optionalNumber2(ctx, "timeout-seconds") })
+  buildInput: (ctx) => compactInput({ ...projectInput2(ctx), log_id: ctx.num("log-id"), request_id: optionalString(ctx, "request-id"), timeout_seconds: optionalNumber(ctx, "timeout-seconds") })
 });
 
 // src/commands/te-analysis/tracking/plan-change-log/index.ts
@@ -6190,7 +6076,7 @@ var trackingCheckGet = createTrackingCapabilityCommand({
   description: "Get one tracking validation result.",
   flags: [projectIdFlag, uuidFlag, requestIdFlag, timeoutSecondsFlag],
   risk: "read",
-  buildInput: (ctx) => compactInput({ ...projectInput2(ctx), uuid: ctx.str("uuid"), request_id: optionalString2(ctx, "request-id"), timeout_seconds: optionalNumber2(ctx, "timeout-seconds") })
+  buildInput: (ctx) => compactInput({ ...projectInput2(ctx), uuid: ctx.str("uuid"), request_id: optionalString(ctx, "request-id"), timeout_seconds: optionalNumber(ctx, "timeout-seconds") })
 });
 
 // src/commands/te-analysis/tracking/check/retry.ts
@@ -6201,7 +6087,7 @@ var trackingCheckRetry = createTrackingCapabilityCommand({
   description: "Retry one tracking validation run.",
   flags: [projectIdFlag, uuidFlag, requestIdFlag, timeoutSecondsFlag],
   risk: "write",
-  buildInput: (ctx) => compactInput({ ...projectInput2(ctx), uuid: ctx.str("uuid"), request_id: optionalString2(ctx, "request-id"), timeout_seconds: optionalNumber2(ctx, "timeout-seconds") })
+  buildInput: (ctx) => compactInput({ ...projectInput2(ctx), uuid: ctx.str("uuid"), request_id: optionalString(ctx, "request-id"), timeout_seconds: optionalNumber(ctx, "timeout-seconds") })
 });
 
 // src/commands/te-analysis/tracking/check/delete.ts
@@ -6223,7 +6109,7 @@ var trackingCheckExport = createTrackingCapabilityCommand({
   description: "Export one tracking validation result.",
   flags: [projectIdFlag, uuidFlag, requestIdFlag, asyncTimeoutSecondsFlag],
   risk: "read",
-  buildInput: (ctx) => compactInput({ ...projectInput2(ctx), uuid: ctx.str("uuid"), request_id: optionalString2(ctx, "request-id"), timeout_seconds: optionalNumber2(ctx, "timeout-seconds") })
+  buildInput: (ctx) => compactInput({ ...projectInput2(ctx), uuid: ctx.str("uuid"), request_id: optionalString(ctx, "request-id"), timeout_seconds: optionalNumber(ctx, "timeout-seconds") })
 });
 
 // src/commands/te-analysis/tracking/check/index.ts
@@ -6279,7 +6165,7 @@ var trackingLiveDataList = createTrackingCapabilityCommand({
   description: "List recent tracking live data.",
   flags: [projectIdFlag, dataTypeFlag, requestIdFlag, timeoutSecondsFlag],
   risk: "read",
-  buildInput: (ctx) => compactInput({ ...projectInput2(ctx), data_type: optionalString2(ctx, "data-type"), request_id: optionalString2(ctx, "request-id"), timeout_seconds: optionalNumber2(ctx, "timeout-seconds") })
+  buildInput: (ctx) => compactInput({ ...projectInput2(ctx), data_type: optionalString(ctx, "data-type"), request_id: optionalString(ctx, "request-id"), timeout_seconds: optionalNumber(ctx, "timeout-seconds") })
 });
 
 // src/commands/te-analysis/tracking/live-data/export.ts
@@ -6290,7 +6176,7 @@ var trackingLiveDataExport = createTrackingCapabilityCommand({
   description: "Export recent tracking live data.",
   flags: [projectIdFlag, dataTypeFlag, requestIdFlag, asyncTimeoutSecondsFlag],
   risk: "read",
-  buildInput: (ctx) => compactInput({ ...projectInput2(ctx), data_type: optionalString2(ctx, "data-type"), request_id: optionalString2(ctx, "request-id"), timeout_seconds: optionalNumber2(ctx, "timeout-seconds") })
+  buildInput: (ctx) => compactInput({ ...projectInput2(ctx), data_type: optionalString(ctx, "data-type"), request_id: optionalString(ctx, "request-id"), timeout_seconds: optionalNumber(ctx, "timeout-seconds") })
 });
 
 // src/commands/te-analysis/tracking/live-data/index.ts
@@ -6402,7 +6288,7 @@ var analysisAlertList = createAnalysisCapabilityCommand({
   description: "List project alerts.",
   flags: [projectIdFlag, queryFlag, limitFlag2, offsetFlag],
   risk: "read",
-  buildInput: (ctx) => compactInput({ ...projectInput3(ctx), query: optionalString2(ctx, "query"), limit: optionalNumber2(ctx, "limit"), offset: optionalNumber2(ctx, "offset") })
+  buildInput: (ctx) => compactInput({ ...projectInput3(ctx), query: optionalString(ctx, "query"), limit: optionalNumber(ctx, "limit"), offset: optionalNumber(ctx, "offset") })
 });
 
 // src/commands/te-analysis/alert/get.ts
@@ -6508,7 +6394,7 @@ var analysisAlertDetailList = createAnalysisCapabilityCommand({
   description: "List alert delivery details.",
   flags: [projectIdFlag, alertIdFlag, startTimeFlag2, endTimeFlag2],
   risk: "read",
-  buildInput: (ctx) => compactInput({ ...alertIdInput(ctx), start_time: optionalString2(ctx, "start-time"), end_time: optionalString2(ctx, "end-time") })
+  buildInput: (ctx) => compactInput({ ...alertIdInput(ctx), start_time: optionalString(ctx, "start-time"), end_time: optionalString(ctx, "end-time") })
 });
 
 // src/commands/te-analysis/alert-detail/index.ts
@@ -6577,7 +6463,7 @@ var baseCommands = [
   ...project_space_default,
   ...favorite_default,
   ...public_link_default,
-  ...model_default,
+  ...filter_value_default,
   ...event_detail_default,
   ...entity_detail_default,
   ...drilldown_events_default,
@@ -6585,6 +6471,7 @@ var baseCommands = [
   ...drilldown_user_events_default,
   ...user_default,
   ...sql_table_default,
+  ...query_cluster_default,
   ...entity_default,
   ...input_file_default,
   ...project_default,
@@ -6595,10 +6482,7 @@ var baseCommands = [
   ...alert_job_default,
   ...alert_notice_config_default
 ];
-var commands77 = [
-  ...baseCommands,
-  ...isGlobalQueryModeEnabled() ? global_default : []
-];
+var commands77 = [...baseCommands];
 var te_analysis_default = commands77;
 export {
   baseCommands,