@databrainhq/mcp-server 0.2.14 → 0.2.16

package/dist/index.js

@@ -326,7 +326,7 @@ var DatabrainClient = class {
         }
         const text = await response.text();
         let data = text ? JSON.parse(text) : {};
-        if (data && typeof data === "object" && !Array.isArray(data) && "data" in data) {
+        if (!options.skipDataUnwrap && data && typeof data === "object" && !Array.isArray(data) && "data" in data) {
           const inner = data.data;
           if (inner !== null && inner !== void 0) {
             data = inner;
@@ -550,14 +550,20 @@ var EmbedsApi = class {
       invalidateCache: ["list_embeds"]
     });
   }
-  async listEmbeds(dataAppName) {
-    const query = dataAppName && dataAppName.trim().length > 0 ? { dataAppName } : void 0;
+  async listEmbeds(dataAppName, clientId) {
+    const query = {};
+    if (dataAppName && dataAppName.trim().length > 0) {
+      query.dataAppName = dataAppName.trim();
+    }
+    if (clientId && clientId.trim().length > 0) {
+      query.clientId = clientId.trim();
+    }
     return this.client.request({
       method: "GET",
       path: "/api/v2/data-app/embeds",
       auth: "api",
-      query,
-      cacheKey: "list_embeds",
+      query: Object.keys(query).length > 0 ? query : void 0,
+      cacheKey: `list_embeds:${query.dataAppName || "*"}:${query.clientId || "*"}`,
       cacheTtlMs: 5 * 60 * 1e3
     });
   }
@@ -708,6 +714,37 @@ var ScheduledReportsApi = class {
   }
 };
 
+// src/api/tenants-api.ts
+var TenantsApi = class {
+  constructor(client) {
+    this.client = client;
+  }
+  async listTenants(params) {
+    const input = {
+      workspaceId: params.workspaceId
+    };
+    if (params.limit !== void 0) input.limit = String(params.limit);
+    if (params.searchValue && params.searchValue.trim().length > 0) {
+      input.searchValue = params.searchValue.trim();
+    }
+    if (params.datasourceId && params.datasourceId.trim().length > 0) {
+      input.datasourceId = params.datasourceId.trim();
+    }
+    if (params.datamartId && params.datamartId.trim().length > 0) {
+      input.datamartId = params.datamartId.trim();
+    }
+    return this.client.request({
+      method: "POST",
+      path: "/api/mcp/getClientData",
+      auth: "service",
+      body: { input: { input } },
+      skipDataUnwrap: true,
+      cacheKey: `list_tenants:${JSON.stringify(input)}`,
+      cacheTtlMs: 5 * 60 * 1e3
+    });
+  }
+};
+
 // src/api/widgets-api.ts
 var WidgetsApi = class {
   constructor(client) {
@@ -899,8 +936,8 @@ var EmbedService = class {
     this.embedsApi = embedsApi;
     this.datamartsApi = datamartsApi;
   }
-  async listEmbeds(dataAppName) {
-    return this.embedsApi.listEmbeds(dataAppName);
+  async listEmbeds(dataAppName, clientId) {
+    return this.embedsApi.listEmbeds(dataAppName, clientId);
   }
   async createEmbedStrict(body) {
     const accessSettings = asRecord2(body.accessSettings);
@@ -1213,6 +1250,66 @@ var WidgetService = class {
       error: `Multiple data apps exist (${normalized.map((a) => `"${a.name}"`).join(", ")}). Pass \`dataAppName\` explicitly, or pass \`embedId\` to auto-resolve.`
     };
   }
+  async ensureTenantDashboardScope(params) {
+    const clientId = params.clientId.trim();
+    if (!clientId) {
+      return {
+        ok: false,
+        error: "`clientId` cannot be empty. Pick a tenant/client first."
+      };
+    }
+    const ctx = await this.resolveEmbedContext(params.embedId);
+    if (ctx.externalDashboardCreatedBy === clientId) {
+      return {
+        ok: true,
+        value: {
+          embedId: params.embedId,
+          clientId,
+          dataAppName: ctx.dataAppName
+        }
+      };
+    }
+    let tenantEmbeds;
+    try {
+      tenantEmbeds = await this.embedsApi.listEmbeds(params.dataAppName, clientId);
+    } catch (err) {
+      return {
+        ok: false,
+        error: `Could not verify tenant dashboard ownership for client "${clientId}": ${err.message}`
+      };
+    }
+    const target = params.embedId.trim();
+    const matches = tenantEmbeds.map((embed) => ({
+      raw: embed,
+      normalized: this.discoveryService.normalizeEmbed(embed)
+    })).filter(({ raw, normalized }) => {
+      const ids = [
+        raw.embedId,
+        raw.id,
+        raw._id,
+        raw.dashboardId,
+        normalized.embedId,
+        normalized.internalId,
+        normalized.dashboardId
+      ].filter(isNonEmptyString3);
+      return ids.includes(target);
+    });
+    if (matches.length === 0) {
+      const dashboardLabel = params.dashboardName || params.embedId;
+      return {
+        ok: false,
+        error: `Refusing to touch dashboard "${dashboardLabel}" for client "${clientId}". The tenant-scoped embed lookup did not return this dashboard, which means the resolved target is likely the production/data-app dashboard rather than this client's dashboard copy. Create or select a multi-tenant dashboard embed for this client first (\`create_embed\` with \`clientId\`), then retry.`
+      };
+    }
+    return {
+      ok: true,
+      value: {
+        embedId: params.embedId,
+        clientId,
+        dataAppName: matches[0].normalized.dataAppName
+      }
+    };
+  }
   /**
    * Resolve a datasource for a widget. Priority:
    *   1. Explicit integrationId + integrationName (fast path).
@@ -1397,7 +1494,8 @@ Do not guess between the two \u2014 wait for the user to choose.`
       dataAppId,
       dataAppName,
       externalDashboardId,
-      dashboardId
+      dashboardId,
+      externalDashboardCreatedBy: (externalDashboard && isNonEmptyString3(externalDashboard.createdBy) ? externalDashboard.createdBy : null) || (isNonEmptyString3(exact.createdBy) ? exact.createdBy : null) || (metadata && isNonEmptyString3(metadata.createdBy) ? metadata.createdBy : null) || (isNonEmptyString3(exact.clientId) ? exact.clientId : null)
     };
   }
   async mintGuestToken(clientId, dataAppName, allowedEmbeds) {
@@ -1482,6 +1580,7 @@ function createServiceBundle(client) {
   const guestTokenApi = new GuestTokenApi(client);
   const queryApi = new QueryApi(client);
   const scheduledReportsApi = new ScheduledReportsApi(client);
+  const tenantsApi = new TenantsApi(client);
   const widgetsApi = new WidgetsApi(client);
   const workspacesApi = new WorkspacesApi(client);
   const discoveryService = new DiscoveryService();
@@ -1495,6 +1594,7 @@ function createServiceBundle(client) {
     workspacesApi,
     queryApi,
     scheduledReportsApi,
+    tenantsApi,
     widgetsApi,
     embedService: new EmbedService(embedsApi, datamartsApi),
     discoveryService,
@@ -1572,16 +1672,153 @@ function registerListDataApps(server, client) {
   );
 }
 
-// src/tools/data-app/create-data-app.ts
+// src/tools/data-app/list-tenants.ts
 import { z as z3 } from "zod";
+var isNonEmptyString4 = (value) => typeof value === "string" && value.trim().length > 0;
+function workspaceIdFrom(workspace) {
+  return isNonEmptyString4(workspace.id) && workspace.id || isNonEmptyString4(workspace._id) && workspace._id || isNonEmptyString4(workspace.workspaceId) && workspace.workspaceId || null;
+}
+function tenantErrorMessage(result) {
+  const message = result.message;
+  if (isNonEmptyString4(message)) return message;
+  const error = result.error;
+  if (isNonEmptyString4(error)) return error;
+  if (error !== null && error !== void 0) {
+    try {
+      return JSON.stringify(error);
+    } catch {
+      return String(error);
+    }
+  }
+  return null;
+}
+function normalizeTenantList(result) {
+  if (Array.isArray(result)) {
+    return { tenants: result };
+  }
+  const errorMessage = tenantErrorMessage(result);
+  if (errorMessage) {
+    return { tenants: [], errorMessage };
+  }
+  return {
+    tenants: Array.isArray(result.data) ? result.data : [],
+    clientColumnType: isNonEmptyString4(result.clientColumnType) ? result.clientColumnType : void 0
+  };
+}
+function registerListTenants(server, client) {
+  const services = createServiceBundle(client);
+  server.tool(
+    "list_tenants",
+    "List available tenants/clients from the workspace tenancy database. Use this to pick a valid clientId before creating guest tokens or editing customer dashboards.",
+    {
+      workspaceName: z3.string().optional().describe("Workspace name. Preferred for non-technical callers; the tool resolves it to a workspaceId."),
+      workspaceId: z3.string().optional().describe("Technical workspace UUID. Provide this instead of workspaceName if already known."),
+      searchValue: z3.string().optional().describe("Optional case-insensitive search string for tenant/client labels."),
+      limit: z3.number().int().positive().max(500).optional().describe("Maximum number of tenants to return. Backend may apply connector-specific limits."),
+      datasourceId: z3.string().optional().describe("Optional datasource UUID override when the workspace has multiple datasource contexts."),
+      datamartId: z3.string().optional().describe("Optional datamart UUID override when tenant lookup should use a specific datamart.")
+    },
+    READ_ONLY,
+    async (params) => {
+      try {
+        let workspaceId = params.workspaceId?.trim() || "";
+        let workspaceName = params.workspaceName?.trim() || "";
+        if (!workspaceId && !workspaceName) {
+          return toolError(
+            "Provide `workspaceName` or `workspaceId` so the tenancy lookup can resolve the client table."
+          );
+        }
+        if (!workspaceId) {
+          const workspaces = await services.workspacesApi.listWorkspaces();
+          const matches = workspaces.filter(
+            (workspace) => isNonEmptyString4(workspace.name) && workspace.name.trim().toLowerCase() === workspaceName.toLowerCase()
+          );
+          if (matches.length === 0) {
+            const available = workspaces.map((workspace) => workspace.name).filter(isNonEmptyString4).map((name) => `"${name}"`).join(", ");
+            return toolError(
+              `No workspace named "${workspaceName}". ` + (available ? `Available workspaces: ${available}.` : "No workspaces were returned by list_workspaces.")
+            );
+          }
+          if (matches.length > 1) {
+            return toolError(
+              `Workspace name "${workspaceName}" is ambiguous. Retry with \`workspaceId\`.`
+            );
+          }
+          workspaceId = workspaceIdFrom(matches[0]) || "";
+          if (!workspaceId) {
+            return toolError(
+              `Workspace "${workspaceName}" did not include an id in the backend response. Retry with \`workspaceId\`.`
+            );
+          }
+          workspaceName = matches[0].name || workspaceName;
+        }
+        if (!workspaceName) {
+          try {
+            const workspaces = await services.workspacesApi.listWorkspaces();
+            const match = workspaces.find(
+              (workspace) => workspaceIdFrom(workspace) === workspaceId
+            );
+            if (match?.name) workspaceName = match.name;
+          } catch {
+          }
+        }
+        const result = await services.tenantsApi.listTenants({
+          workspaceId,
+          limit: params.limit,
+          searchValue: params.searchValue,
+          datasourceId: params.datasourceId,
+          datamartId: params.datamartId
+        });
+        const { tenants, clientColumnType, errorMessage } = normalizeTenantList(result);
+        if (errorMessage) {
+          return toolError(`Failed to list tenants: ${errorMessage}`);
+        }
+        if (tenants.length === 0) {
+          return toolSuccess(
+            `No tenants found for workspace "${workspaceName || workspaceId}".`
+          );
+        }
+        return toolSuccess(
+          JSON.stringify(
+            {
+              count: tenants.length,
+              source: "tenancy_database",
+              workspace: {
+                id: workspaceId,
+                name: workspaceName || null
+              },
+              clientColumnType: clientColumnType || "STRING",
+              tenants: tenants.map((tenant) => {
+                const clientId = isNonEmptyString4(tenant.value) ? tenant.value : null;
+                const label = isNonEmptyString4(tenant.label) ? tenant.label : clientId;
+                return {
+                  clientId,
+                  label
+                };
+              })
+            },
+            null,
+            2
+          )
+        );
+      } catch (err) {
+        if (err instanceof DatabrainApiError) return err.toToolResponse();
+        return toolError(`Unexpected error: ${err.message}`);
+      }
+    }
+  );
+}
+
+// src/tools/data-app/create-data-app.ts
+import { z as z4 } from "zod";
 function registerCreateDataApp(server, client) {
   server.tool(
     "create_data_app",
     "Create a new data app.",
     {
-      name: z3.string().describe("Data app name"),
-      workspaceName: z3.string().optional().describe("Optional workspace name if required by backend"),
-      body: z3.record(z3.unknown()).optional().describe("Raw API body passthrough for POST /api/v2/data-app/")
+      name: z4.string().describe("Data app name"),
+      workspaceName: z4.string().optional().describe("Optional workspace name if required by backend"),
+      body: z4.record(z4.unknown()).optional().describe("Raw API body passthrough for POST /api/v2/data-app/")
     },
     WRITE_CREATE,
     async (params) => {
@@ -1615,7 +1852,7 @@ function registerCreateDataApp(server, client) {
 }
 
 // src/tools/data-app/list-api-tokens.ts
-import { z as z4 } from "zod";
+import { z as z5 } from "zod";
 
 // src/utils/resolve-resource.ts
 function resolveResource(options) {
@@ -1684,7 +1921,7 @@ function registerListApiTokens(server, client) {
     "list_api_tokens",
     "List API tokens for a data app. Omit dataAppName to auto-resolve.",
     {
-      dataAppName: z4.string().optional().describe("Data app name. Omit to list available data apps.")
+      dataAppName: z5.string().optional().describe("Data app name. Omit to list available data apps.")
     },
     READ_ONLY,
     async (params) => {
@@ -1729,16 +1966,16 @@ function registerListApiTokens(server, client) {
 }
 
 // src/tools/data-app/create-api-token.ts
-import { z as z5 } from "zod";
+import { z as z6 } from "zod";
 function registerCreateApiToken(server, client) {
   const services = createServiceBundle(client);
   server.tool(
     "create_api_token",
     "Create an API token for a data app and activate it for this session. Omit dataAppName to auto-resolve.",
     {
-      dataAppName: z5.string().optional().describe("Data app name. Omit to list available data apps."),
-      name: z5.string().optional().describe("Optional token name"),
-      body: z5.record(z5.unknown()).optional().describe("Raw API body passthrough for POST /api/v2/data-app/api-tokens")
+      dataAppName: z6.string().optional().describe("Data app name. Omit to list available data apps."),
+      name: z6.string().optional().describe("Optional token name"),
+      body: z6.record(z6.unknown()).optional().describe("Raw API body passthrough for POST /api/v2/data-app/api-tokens")
     },
     WRITE_CREATE,
     async (params) => {
@@ -1790,16 +2027,16 @@ Save this in backend secrets immediately. This value may not be returned again.`
 }
 
 // src/tools/data-app/rotate-api-token.ts
-import { z as z6 } from "zod";
+import { z as z7 } from "zod";
 function registerRotateApiToken(server, client) {
   const services = createServiceBundle(client);
   server.tool(
     "rotate_api_token",
     "Rotate (invalidate and replace) an API token. Previous token becomes stale.",
     {
-      dataAppName: z6.string().optional().describe("Data app name. Omit to list available data apps."),
-      tokenId: z6.string().optional().describe("Optional token ID to rotate"),
-      body: z6.record(z6.unknown()).optional().describe("Raw API body passthrough for rotate endpoint")
+      dataAppName: z7.string().optional().describe("Data app name. Omit to list available data apps."),
+      tokenId: z7.string().optional().describe("Optional token ID to rotate"),
+      body: z7.record(z7.unknown()).optional().describe("Raw API body passthrough for rotate endpoint")
     },
     DESTRUCTIVE,
     async (params) => {
@@ -1918,14 +2155,14 @@ function registerListDatasources(server, client) {
 }
 
 // src/tools/infrastructure/discover-datasource-schema.ts
-import { z as z7 } from "zod";
+import { z as z8 } from "zod";
 function registerDiscoverDatasourceSchema(server, client) {
   const services = createServiceBundle(client);
   server.tool(
     "discover_datasource_schema",
     "Inspect tables and columns in a datasource. Omit datasourceName to list available datasources.",
     {
-      datasourceName: z7.string().optional().describe(
+      datasourceName: z8.string().optional().describe(
         "Name of the datasource to inspect. Omit to list available datasources."
       )
     },
@@ -2008,13 +2245,13 @@ Fix the connection or add a new database in the **Databrain UI**.`
 }
 
 // src/tools/infrastructure/list-datamarts.ts
-import { z as z8 } from "zod";
+import { z as z9 } from "zod";
 function registerListDatamarts(server, client) {
   server.tool(
     "list_datamarts",
     "List datamarts with table counts and semantic layer scores.",
     {
-      dataAppName: z8.string().optional().describe("Filter by data app name")
+      dataAppName: z9.string().optional().describe("Filter by data app name")
     },
     READ_ONLY,
     async (params) => {
@@ -2103,7 +2340,7 @@ function registerListWorkspaces(server, client) {
 }
 
 // src/tools/infrastructure/create-datamart.ts
-import { z as z9 } from "zod";
+import { z as z10 } from "zod";
 
 // src/tools/widgets/production-guards.ts
 var APPLY_TO_PRODUCTION_CONFIRMATION = "APPLY_TO_PRODUCTION";
@@ -2121,29 +2358,29 @@ function genericProductionSafetyNote() {
 }
 
 // src/tools/infrastructure/create-datamart.ts
-var columnSchema = z9.object({
-  name: z9.string(),
-  alias: z9.string().optional(),
-  label: z9.string().optional(),
-  isHide: z9.boolean().optional(),
-  isCustomColumn: z9.boolean().optional(),
-  sql: z9.string().optional()
+var columnSchema = z10.object({
+  name: z10.string(),
+  alias: z10.string().optional(),
+  label: z10.string().optional(),
+  isHide: z10.boolean().optional(),
+  isCustomColumn: z10.boolean().optional(),
+  sql: z10.string().optional()
 });
-var tableSchema = z9.object({
-  name: z9.string(),
-  schemaName: z9.string().optional(),
-  clientColumn: z9.string().optional(),
-  label: z9.string().optional(),
-  columns: z9.array(columnSchema)
+var tableSchema = z10.object({
+  name: z10.string(),
+  schemaName: z10.string().optional(),
+  clientColumn: z10.string().optional(),
+  label: z10.string().optional(),
+  columns: z10.array(columnSchema)
 });
-var relationshipSchema = z9.object({
-  parentTableName: z9.string(),
-  parentColumnName: z9.string(),
-  childTableName: z9.string(),
-  childColumnName: z9.string(),
-  cardinality: z9.enum(["OneToOne", "OneToMany", "ManyToOne", "ManyToMany"]),
-  join: z9.enum(["INNER JOIN", "LEFT JOIN", "RIGHT JOIN", "FULL JOIN"]),
-  relationshipName: z9.string()
+var relationshipSchema = z10.object({
+  parentTableName: z10.string(),
+  parentColumnName: z10.string(),
+  childTableName: z10.string(),
+  childColumnName: z10.string(),
+  cardinality: z10.enum(["OneToOne", "OneToMany", "ManyToOne", "ManyToMany"]),
+  join: z10.enum(["INNER JOIN", "LEFT JOIN", "RIGHT JOIN", "FULL JOIN"]),
+  relationshipName: z10.string()
 });
 function datamartSuccessMessage(name, result) {
   return `Datamart "${name}" created successfully (ID: ${result.id || result._id || "UNKNOWN"}).
@@ -2164,21 +2401,21 @@ function registerCreateDatamart(server, client) {
     "create_datamart",
     "Create a production datamart from selected tables and relationships. Defaults to dry-run; apply requires explicit confirmation.",
     {
-      mode: z9.enum(["dry_run", "apply"]).default("dry_run").describe("dry_run returns the plan only; apply creates the datamart"),
-      confirm: z9.string().optional().describe(`Required for apply: ${APPLY_TO_PRODUCTION_CONFIRMATION}`),
-      name: z9.string().describe("Unique datamart name"),
-      datasourceName: z9.string().optional().describe("Name of the datasource to use. Omit to list available datasources."),
-      tableList: z9.array(tableSchema).optional().describe("Array of tables with their columns"),
-      relationships: z9.array(relationshipSchema).optional().describe("Join definitions between tables"),
-      tenancySettings: z9.object({
-        tenancyLevel: z9.enum(["TABLE", "DATABASE"]).optional(),
-        clientColumnType: z9.string().optional(),
-        schemaName: z9.string().optional(),
-        tableName: z9.string().optional(),
-        tableClientNameColumn: z9.string().optional(),
-        tablePrimaryKeyColumn: z9.string().optional()
+      mode: z10.enum(["dry_run", "apply"]).default("dry_run").describe("dry_run returns the plan only; apply creates the datamart"),
+      confirm: z10.string().optional().describe(`Required for apply: ${APPLY_TO_PRODUCTION_CONFIRMATION}`),
+      name: z10.string().describe("Unique datamart name"),
+      datasourceName: z10.string().optional().describe("Name of the datasource to use. Omit to list available datasources."),
+      tableList: z10.array(tableSchema).optional().describe("Array of tables with their columns"),
+      relationships: z10.array(relationshipSchema).optional().describe("Join definitions between tables"),
+      tenancySettings: z10.object({
+        tenancyLevel: z10.enum(["TABLE", "DATABASE"]).optional(),
+        clientColumnType: z10.string().optional(),
+        schemaName: z10.string().optional(),
+        tableName: z10.string().optional(),
+        tableClientNameColumn: z10.string().optional(),
+        tablePrimaryKeyColumn: z10.string().optional()
       }).optional().describe("Multi-tenant configuration"),
-      body: z9.record(z9.unknown()).optional().describe("Raw API body passthrough for POST /api/v2/data-app/datamarts")
+      body: z10.record(z10.unknown()).optional().describe("Raw API body passthrough for POST /api/v2/data-app/datamarts")
     },
     WRITE_CREATE,
     async (params) => {
@@ -2273,14 +2510,14 @@ function registerCreateDatamart(server, client) {
 }
 
 // src/tools/infrastructure/sync-datasource.ts
-import { z as z10 } from "zod";
+import { z as z11 } from "zod";
 function registerSyncDatasource(server, client) {
   const datasourcesApi = new DatasourcesApi(client);
   server.tool(
     "sync_datasource",
     "Trigger a datasource schema sync to refresh table and column metadata. If datasourceName is omitted and there are multiple datasources, returns the list so the user can choose.",
     {
-      datasourceName: z10.string().optional().describe("Name of the datasource to sync. Omit to list available datasources.")
+      datasourceName: z11.string().optional().describe("Name of the datasource to sync. Omit to list available datasources.")
     },
     WRITE_IDEMPOTENT,
     async (params) => {
@@ -2329,7 +2566,7 @@ The schema metadata will be refreshed. You can now use \`discover_datasource_sch
 }
 
 // src/tools/embed/create-embed.ts
-import { z as z11 } from "zod";
+import { z as z12 } from "zod";
 var DEFAULT_ACCESS_SETTINGS2 = {
   isAllowMetricCreation: false,
   isAllowMetricDeletion: false,
@@ -2342,18 +2579,18 @@ var DEFAULT_ACCESS_SETTINGS2 = {
   isAllowCreateDashboardView: false,
   metricCreationMode: "DRAG_DROP"
 };
-var accessSettingsSchema = z11.object({
-  datamartName: z11.string().describe("Name of the datamart (required)"),
-  isAllowMetricCreation: z11.boolean().optional().describe("Allow end-users to create metrics"),
-  metricCreationMode: z11.enum(["DRAG_DROP", "CHAT"]).optional().describe("Metric creation mode"),
-  isAllowMetricDeletion: z11.boolean().optional().describe("Allow metric deletion"),
-  isAllowMetricUpdate: z11.boolean().optional().describe("Allow metric editing"),
-  isAllowMetricLayoutChange: z11.boolean().optional().describe("Allow layout changes"),
-  isAllowManageMetrics: z11.boolean().optional().describe("Show manage metrics UI"),
-  isAllowUnderlyingData: z11.boolean().optional().describe("Allow viewing underlying data"),
-  isAllowAiPilot: z11.boolean().optional().describe("Enable AI pilot features"),
-  isAllowEmailReports: z11.boolean().optional().describe("Allow email report scheduling"),
-  isAllowCreateDashboardView: z11.boolean().optional().describe("Allow creating dashboard views")
+var accessSettingsSchema = z12.object({
+  datamartName: z12.string().describe("Name of the datamart (required)"),
+  isAllowMetricCreation: z12.boolean().optional().describe("Allow end-users to create metrics"),
+  metricCreationMode: z12.enum(["DRAG_DROP", "CHAT"]).optional().describe("Metric creation mode"),
+  isAllowMetricDeletion: z12.boolean().optional().describe("Allow metric deletion"),
+  isAllowMetricUpdate: z12.boolean().optional().describe("Allow metric editing"),
+  isAllowMetricLayoutChange: z12.boolean().optional().describe("Allow layout changes"),
+  isAllowManageMetrics: z12.boolean().optional().describe("Show manage metrics UI"),
+  isAllowUnderlyingData: z12.boolean().optional().describe("Allow viewing underlying data"),
+  isAllowAiPilot: z12.boolean().optional().describe("Enable AI pilot features"),
+  isAllowEmailReports: z12.boolean().optional().describe("Allow email report scheduling"),
+  isAllowCreateDashboardView: z12.boolean().optional().describe("Allow creating dashboard views")
 }).describe("Embed access settings. Only datamartName is required \u2014 all flags default to false.");
 function registerCreateEmbed(server, client) {
   const services = createServiceBundle(client);
@@ -2361,23 +2598,23 @@ function registerCreateEmbed(server, client) {
     "create_embed",
     "Create an embed. Provide dashboardId, workspaceName, accessSettings.datamartName. Add clientId for multi-tenant per-client dashboards. All isAllow* flags default to false.",
     {
-      body: z11.record(z11.unknown()).optional().describe(
+      body: z12.record(z12.unknown()).optional().describe(
         "Raw API body passthrough. If provided, all other fields are ignored."
       ),
-      dashboardId: z11.string().optional().describe("Dashboard identifier for embed creation"),
-      workspaceName: z11.string().optional().describe("Workspace name. Omit to auto-resolve if only one exists."),
-      embedType: z11.enum(["dashboard", "metric"]).optional().describe("Embed type"),
-      metricId: z11.string().optional().describe("Required for metric embed type"),
-      name: z11.string().optional().describe("Human-readable embed config name"),
+      dashboardId: z12.string().optional().describe("Dashboard identifier for embed creation"),
+      workspaceName: z12.string().optional().describe("Workspace name. Omit to auto-resolve if only one exists."),
+      embedType: z12.enum(["dashboard", "metric"]).optional().describe("Embed type"),
+      metricId: z12.string().optional().describe("Required for metric embed type"),
+      name: z12.string().optional().describe("Human-readable embed config name"),
       accessSettings: accessSettingsSchema.optional(),
       // Multi-tenant (dashboard embed) params
-      clientId: z11.string().optional().describe(
+      clientId: z12.string().optional().describe(
         "Client identifier for multi-tenant isolation. When provided, creates a dashboard embed (each client gets their own dashboard copy)."
       ),
-      templateDashboardId: z11.string().optional().describe("Template dashboard ID to clone metrics from"),
-      isImportMetrics: z11.boolean().optional().describe("Import metrics from template dashboard"),
-      metricImportMode: z11.enum(["COPY", "LINK"]).optional().describe("COPY duplicates metrics, LINK shares them"),
-      isRenameDashboard: z11.boolean().optional().describe("Rename the dashboard for this client")
+      templateDashboardId: z12.string().optional().describe("Template dashboard ID to clone metrics from"),
+      isImportMetrics: z12.boolean().optional().describe("Import metrics from template dashboard"),
+      metricImportMode: z12.enum(["COPY", "LINK"]).optional().describe("COPY duplicates metrics, LINK shares them"),
+      isRenameDashboard: z12.boolean().optional().describe("Rename the dashboard for this client")
     },
     WRITE_CREATE,
     async (params) => {
@@ -2479,14 +2716,14 @@ Next: run \`get_embed_details\` to verify the embed configuration.`
 }
 
 // src/tools/embed/list-embeds.ts
-import { z as z12 } from "zod";
+import { z as z13 } from "zod";
 function registerListEmbeds(server, client) {
   const services = createServiceBundle(client);
   server.tool(
     "list_embeds",
-    "List embed configurations. Requires an API token (use create_api_token first). Response includes `distinctClientIds` \u2014 a deduped list of end-customer client IDs that have multi-tenant dashboard embeds, useful for discovering which customers exist when only the workspace operator persona knows them.",
+    "List embed configurations. Requires an API token (use create_api_token first). Use `list_tenants` for authoritative client discovery from the tenancy database.",
     {
-      dataAppName: z12.string().optional().describe("Filter by data app name")
+      dataAppName: z13.string().optional().describe("Filter by data app name")
     },
     READ_ONLY,
     async (params) => {
@@ -2499,7 +2736,15 @@ function registerListEmbeds(server, client) {
         }
         const embeds = result.map((e) => {
           const n = services.discoveryService.normalizeEmbed(e);
-          const clientId = typeof e.clientId === "string" && e.clientId.trim().length > 0 ? e.clientId : null;
+          const externalDashboard = e.externalDashboard && typeof e.externalDashboard === "object" ? e.externalDashboard : {};
+          let clientId = null;
+          if (typeof e.clientId === "string" && e.clientId.trim().length > 0) {
+            clientId = e.clientId;
+          } else if (typeof e.createdBy === "string" && e.createdBy.trim().length > 0) {
+            clientId = e.createdBy;
+          } else if (typeof externalDashboard.createdBy === "string" && externalDashboard.createdBy.trim().length > 0) {
+            clientId = externalDashboard.createdBy;
+          }
           return {
             embedId: n.embedId || null,
             internalId: !n.embedId && n.internalId ? n.internalId : void 0,
@@ -2529,14 +2774,14 @@ function registerListEmbeds(server, client) {
 }
 
 // src/tools/embed/get-embed-details.ts
-import { z as z13 } from "zod";
+import { z as z14 } from "zod";
 function registerGetEmbedDetails(server, client) {
   const services = createServiceBundle(client);
   server.tool(
     "get_embed_details",
     "Get full embed configuration including access settings and theme.",
     {
-      embedId: z13.string().describe("ID of the embed")
+      embedId: z14.string().describe("ID of the embed")
     },
     READ_ONLY,
     async (params) => {
@@ -2552,7 +2797,7 @@ function registerGetEmbedDetails(server, client) {
 }
 
 // src/tools/embed/update-embed.ts
-import { z as z14 } from "zod";
+import { z as z15 } from "zod";
 
 // src/tools/embed/helpers.ts
 var GUEST_TOKEN_REMINDER = "\n\n\u26A0\uFE0F **Guest tokens must be regenerated** for these changes to take effect. Existing guest tokens still carry the old settings. Call `generate_guest_token` to create a new token with the updated configuration.";
@@ -2590,15 +2835,15 @@ function registerUpdateEmbed(server, client) {
     "update_embed",
     "Update embed access settings, permissions, theme, or name.",
     {
-      embedId: z14.string().describe("ID of the embed to update"),
-      body: z14.record(z14.unknown()).optional().describe(
+      embedId: z15.string().describe("ID of the embed to update"),
+      body: z15.record(z15.unknown()).optional().describe(
         "Raw API body for PUT /api/v2/data-app/embeds. If provided, it is sent directly (passthrough mode)."
       ),
-      name: z14.string().optional().describe("New name for the embed"),
-      accessSettings: z14.record(z14.unknown()).optional().describe(
+      name: z15.string().optional().describe("New name for the embed"),
+      accessSettings: z15.record(z15.unknown()).optional().describe(
         "Partial update of access settings. See `get_embed_details` for current settings."
       ),
-      theme: z14.record(z14.unknown()).optional().describe(
+      theme: z15.record(z15.unknown()).optional().describe(
         "Theme configuration object. See databrain://theme-reference for the full schema."
       )
     },
@@ -2644,7 +2889,7 @@ function registerUpdateEmbed(server, client) {
 }
 
 // src/tools/embed/customize-theme.ts
-import { z as z15 } from "zod";
+import { z as z16 } from "zod";
 var THEME_PRESETS = {
   light: {
     general: {
@@ -2778,7 +3023,7 @@ var ACCESS_PRESETS = {
     metricCreationMode: "CHAT"
   }
 };
-var fontFamilyEnum = z15.enum([
+var fontFamilyEnum = z16.enum([
   "Inter",
   "Roboto",
   "Open Sans",
@@ -2790,17 +3035,17 @@ var fontFamilyEnum = z15.enum([
   "Nunito",
   "system-ui"
 ]).describe("Font family");
-var tooltipFontSchema = z15.object({
-  fontFamily: z15.string().optional(),
-  fontSize: z15.number().optional(),
-  fontWeight: z15.number().optional(),
-  fontColor: z15.string().optional()
+var tooltipFontSchema = z16.object({
+  fontFamily: z16.string().optional(),
+  fontSize: z16.number().optional(),
+  fontWeight: z16.number().optional(),
+  fontColor: z16.string().optional()
 }).optional();
-var fontConfigInputSchema = z15.object({
-  fontSize: z15.number().optional(),
-  fontFamily: z15.string().optional(),
-  fontWeight: z15.number().optional(),
-  color: z15.string().optional()
+var fontConfigInputSchema = z16.object({
+  fontSize: z16.number().optional(),
+  fontFamily: z16.string().optional(),
+  fontWeight: z16.number().optional(),
+  color: z16.string().optional()
 }).optional();
 function mapToFrontendFontConfig(input) {
   if (!input) return void 0;
@@ -2811,23 +3056,23 @@ function mapToFrontendFontConfig(input) {
     ...input.color && { color: input.color }
   };
 }
-var axisSchema = z15.object({
-  hideAxisLines: z15.boolean().optional().describe("Hide axis lines"),
-  hideSplitLines: z15.boolean().optional().describe("Hide grid/split lines"),
-  hideAxisLabels: z15.boolean().optional().describe("Hide axis labels"),
-  hideAxisTicks: z15.boolean().optional().describe("Hide axis tick marks"),
-  axisName: z15.string().optional().describe("Axis title text"),
-  axisNameOffset: z15.number().optional().describe("Axis title offset from axis"),
-  axisLabelMargin: z15.number().optional().describe("Margin between axis labels and chart area in pixels"),
-  fontSize: z15.number().optional().describe("Axis label font size"),
-  fontFamily: z15.string().optional().describe("Axis label font family"),
-  fontWeight: z15.number().optional().describe("Axis label font weight"),
-  color: z15.string().optional().describe("Axis label color (hex)"),
-  axisColor: z15.string().optional().describe("Axis line color (hex)"),
-  axisNameFontConfig: z15.object({
-    fontFamily: z15.string().optional(),
-    fontSize: z15.number().optional(),
-    fontWeight: z15.number().optional()
+var axisSchema = z16.object({
+  hideAxisLines: z16.boolean().optional().describe("Hide axis lines"),
+  hideSplitLines: z16.boolean().optional().describe("Hide grid/split lines"),
+  hideAxisLabels: z16.boolean().optional().describe("Hide axis labels"),
+  hideAxisTicks: z16.boolean().optional().describe("Hide axis tick marks"),
+  axisName: z16.string().optional().describe("Axis title text"),
+  axisNameOffset: z16.number().optional().describe("Axis title offset from axis"),
+  axisLabelMargin: z16.number().optional().describe("Margin between axis labels and chart area in pixels"),
+  fontSize: z16.number().optional().describe("Axis label font size"),
+  fontFamily: z16.string().optional().describe("Axis label font family"),
+  fontWeight: z16.number().optional().describe("Axis label font weight"),
+  color: z16.string().optional().describe("Axis label color (hex)"),
+  axisColor: z16.string().optional().describe("Axis line color (hex)"),
+  axisNameFontConfig: z16.object({
+    fontFamily: z16.string().optional(),
+    fontSize: z16.number().optional(),
+    fontWeight: z16.number().optional()
   }).optional().describe("Axis title font configuration")
 }).optional();
 function buildAdminTheme(p, presetBase) {
@@ -2983,94 +3228,94 @@ function registerCustomizeTheme(server, client) {
     "customize_embed_theme",
     `Theme an embed: presets (${Object.keys(THEME_PRESETS).join("/")}), colors, fonts, cards, chart appearance, responsive layout, or access presets (${Object.keys(ACCESS_PRESETS).join("/")}).`,
     {
-      embedId: z15.string().describe("ID of the embed to theme"),
-      body: z15.record(z15.unknown()).optional().describe(
+      embedId: z16.string().describe("ID of the embed to theme"),
+      body: z16.record(z16.unknown()).optional().describe(
         "Raw API body for PUT /api/v2/data-app/embeds. If provided, sent directly and all convenience fields are ignored."
       ),
       // --- Presets ---
-      themePreset: z15.enum(["light", "dark", "corporate", "minimal"]).optional().describe("Apply a theme preset as the base. Granular params below override preset values."),
-      accessPreset: z15.enum(["view-only", "power-user", "export-only", "ai-enabled"]).optional().describe("Apply an access settings preset"),
+      themePreset: z16.enum(["light", "dark", "corporate", "minimal"]).optional().describe("Apply a theme preset as the base. Granular params below override preset values."),
+      accessPreset: z16.enum(["view-only", "power-user", "export-only", "ai-enabled"]).optional().describe("Apply an access settings preset"),
       // --- General ---
       fontFamily: fontFamilyEnum.optional().describe("Global font family"),
-      datePickerFormat: z15.string().optional().describe("Date picker display format"),
+      datePickerFormat: z16.string().optional().describe("Date picker display format"),
       // --- Colors ---
-      primaryColor: z15.string().optional().describe("Primary accent color (hex)"),
-      backgroundColor: z15.string().optional().describe("Overall background color (hex)"),
-      textColor: z15.string().optional().describe("Default text color (hex)"),
-      ctaColor: z15.string().optional().describe("Call-to-action button color (hex)"),
-      ctaTextColor: z15.string().optional().describe("CTA button text color (hex)"),
+      primaryColor: z16.string().optional().describe("Primary accent color (hex)"),
+      backgroundColor: z16.string().optional().describe("Overall background color (hex)"),
+      textColor: z16.string().optional().describe("Default text color (hex)"),
+      ctaColor: z16.string().optional().describe("Call-to-action button color (hex)"),
+      ctaTextColor: z16.string().optional().describe("CTA button text color (hex)"),
       // --- Dashboard ---
-      dashboardBackgroundColor: z15.string().optional().describe("Dashboard container background (hex)"),
-      selectBoxSize: z15.enum(["small", "medium", "large"]).optional().describe("Filter select box size"),
-      selectBoxVariant: z15.enum(["floating", "outlined", "standard"]).optional().describe("Filter select box style"),
-      selectBoxBorderRadius: z15.string().optional().describe('Select box border radius (e.g. "20px")'),
-      selectBoxTextColor: z15.string().optional().describe("Select box text color (hex)"),
-      metricCardColor: z15.string().optional().describe("Metric card background color (hex)"),
+      dashboardBackgroundColor: z16.string().optional().describe("Dashboard container background (hex)"),
+      selectBoxSize: z16.enum(["small", "medium", "large"]).optional().describe("Filter select box size"),
+      selectBoxVariant: z16.enum(["floating", "outlined", "standard"]).optional().describe("Filter select box style"),
+      selectBoxBorderRadius: z16.string().optional().describe('Select box border radius (e.g. "20px")'),
+      selectBoxTextColor: z16.string().optional().describe("Select box text color (hex)"),
+      metricCardColor: z16.string().optional().describe("Metric card background color (hex)"),
       // --- Card Title ---
-      cardTitleFontSize: z15.string().optional().describe('Card title font size (e.g. "16px")'),
-      cardTitleFontWeight: z15.string().optional().describe('Card title font weight (e.g. "600")'),
-      cardTitleColor: z15.string().optional().describe("Card title text color (hex)"),
+      cardTitleFontSize: z16.string().optional().describe('Card title font size (e.g. "16px")'),
+      cardTitleFontWeight: z16.string().optional().describe('Card title font weight (e.g. "600")'),
+      cardTitleColor: z16.string().optional().describe("Card title text color (hex)"),
       // --- Card Description ---
-      cardDescriptionFontSize: z15.string().optional().describe("Card description font size"),
-      cardDescriptionFontWeight: z15.string().optional().describe("Card description font weight"),
-      cardDescriptionColor: z15.string().optional().describe("Card description text color (hex)"),
+      cardDescriptionFontSize: z16.string().optional().describe("Card description font size"),
+      cardDescriptionFontWeight: z16.string().optional().describe("Card description font weight"),
+      cardDescriptionColor: z16.string().optional().describe("Card description text color (hex)"),
       // --- Card Customization ---
-      cardPadding: z15.string().optional().describe("Card internal padding"),
-      cardBorderRadius: z15.string().optional().describe("Card border radius"),
-      cardShadow: z15.string().optional().describe("Card box-shadow CSS value"),
-      disableShadowOnHover: z15.boolean().optional().describe("Disable shadow on card hover"),
-      disableCardStroke: z15.boolean().optional().describe("Remove card border stroke"),
-      cardStrokeColor: z15.string().optional().describe("Card border stroke color (hex)"),
+      cardPadding: z16.string().optional().describe("Card internal padding"),
+      cardBorderRadius: z16.string().optional().describe("Card border radius"),
+      cardShadow: z16.string().optional().describe("Card box-shadow CSS value"),
+      disableShadowOnHover: z16.boolean().optional().describe("Disable shadow on card hover"),
+      disableCardStroke: z16.boolean().optional().describe("Remove card border stroke"),
+      cardStrokeColor: z16.string().optional().describe("Card border stroke color (hex)"),
       // --- Chart Colors (admin theme level) ---
-      chartFontFamily: z15.string().optional().describe("Font family for chart text"),
-      chartFontColor: z15.string().optional().describe("Font color for chart text (hex)"),
-      chartColors: z15.array(z15.string()).optional().describe("Array of chart series colors (hex)"),
-      chartPaletteName: z15.string().optional().describe("Name for a custom palette"),
-      chartPaletteColors: z15.array(z15.string()).optional().describe("9 colors for a custom palette"),
+      chartFontFamily: z16.string().optional().describe("Font family for chart text"),
+      chartFontColor: z16.string().optional().describe("Font color for chart text (hex)"),
+      chartColors: z16.array(z16.string()).optional().describe("Array of chart series colors (hex)"),
+      chartPaletteName: z16.string().optional().describe("Name for a custom palette"),
+      chartPaletteColors: z16.array(z16.string()).optional().describe("9 colors for a custom palette"),
       // --- Chart Tooltip (admin theme level) ---
       tooltipHeader: tooltipFontSchema.describe("Tooltip header font config"),
       tooltipLabel: tooltipFontSchema.describe("Tooltip label font config"),
       tooltipValue: tooltipFontSchema.describe("Tooltip value font config"),
       // --- Component Theme ---
-      buttonPrimaryColor: z15.string().optional().describe("Primary button background (hex)"),
-      buttonPrimaryTextColor: z15.string().optional().describe("Primary button text (hex)"),
-      buttonSecondaryColor: z15.string().optional().describe("Secondary button background (hex)"),
-      buttonSecondaryTextColor: z15.string().optional().describe("Secondary button text (hex)"),
-      checkboxCheckedColor: z15.string().optional().describe("Checked checkbox color (hex)"),
-      checkboxUncheckedColor: z15.string().optional().describe("Unchecked checkbox color (hex)"),
-      switchEnabledColor: z15.string().optional().describe("Enabled switch color (hex)"),
-      switchDisabledColor: z15.string().optional().describe("Disabled switch color (hex)"),
-      breadcrumbFontFamily: z15.string().optional().describe("Drill breadcrumb font family"),
-      breadcrumbFontColor: z15.string().optional().describe("Drill breadcrumb font color (hex)"),
-      breadcrumbActiveColor: z15.string().optional().describe("Active breadcrumb color (hex)"),
-      filterBadgeColor: z15.string().optional().describe("Multi-select filter badge color (hex)"),
-      filterBadgeTextColor: z15.string().optional().describe("Filter badge text color (hex)"),
-      datePickerColor: z15.string().optional().describe("Date picker accent color (hex)"),
+      buttonPrimaryColor: z16.string().optional().describe("Primary button background (hex)"),
+      buttonPrimaryTextColor: z16.string().optional().describe("Primary button text (hex)"),
+      buttonSecondaryColor: z16.string().optional().describe("Secondary button background (hex)"),
+      buttonSecondaryTextColor: z16.string().optional().describe("Secondary button text (hex)"),
+      checkboxCheckedColor: z16.string().optional().describe("Checked checkbox color (hex)"),
+      checkboxUncheckedColor: z16.string().optional().describe("Unchecked checkbox color (hex)"),
+      switchEnabledColor: z16.string().optional().describe("Enabled switch color (hex)"),
+      switchDisabledColor: z16.string().optional().describe("Disabled switch color (hex)"),
+      breadcrumbFontFamily: z16.string().optional().describe("Drill breadcrumb font family"),
+      breadcrumbFontColor: z16.string().optional().describe("Drill breadcrumb font color (hex)"),
+      breadcrumbActiveColor: z16.string().optional().describe("Active breadcrumb color (hex)"),
+      filterBadgeColor: z16.string().optional().describe("Multi-select filter badge color (hex)"),
+      filterBadgeTextColor: z16.string().optional().describe("Filter badge text color (hex)"),
+      datePickerColor: z16.string().optional().describe("Date picker accent color (hex)"),
       // --- Responsive Breakpoints ---
-      breakpointXl: z15.number().optional().describe("XL breakpoint width in px"),
-      breakpointLg: z15.number().optional().describe("LG breakpoint width in px"),
-      breakpointMd: z15.number().optional().describe("MD breakpoint width in px"),
-      breakpointSm: z15.number().optional().describe("SM breakpoint width in px"),
-      breakpointXs: z15.number().optional().describe("XS breakpoint width in px"),
+      breakpointXl: z16.number().optional().describe("XL breakpoint width in px"),
+      breakpointLg: z16.number().optional().describe("LG breakpoint width in px"),
+      breakpointMd: z16.number().optional().describe("MD breakpoint width in px"),
+      breakpointSm: z16.number().optional().describe("SM breakpoint width in px"),
+      breakpointXs: z16.number().optional().describe("XS breakpoint width in px"),
       // --- Metric Layout Columns ---
-      layoutColsXl: z15.number().optional().describe("Grid columns at XL breakpoint"),
-      layoutColsLg: z15.number().optional().describe("Grid columns at LG breakpoint"),
-      layoutColsMd: z15.number().optional().describe("Grid columns at MD breakpoint"),
-      layoutColsSm: z15.number().optional().describe("Grid columns at SM breakpoint"),
-      layoutColsXs: z15.number().optional().describe("Grid columns at XS breakpoint"),
-      layoutColsXxs: z15.number().optional().describe("Grid columns at XXS breakpoint"),
+      layoutColsXl: z16.number().optional().describe("Grid columns at XL breakpoint"),
+      layoutColsLg: z16.number().optional().describe("Grid columns at LG breakpoint"),
+      layoutColsMd: z16.number().optional().describe("Grid columns at MD breakpoint"),
+      layoutColsSm: z16.number().optional().describe("Grid columns at SM breakpoint"),
+      layoutColsXs: z16.number().optional().describe("Grid columns at XS breakpoint"),
+      layoutColsXxs: z16.number().optional().describe("Grid columns at XXS breakpoint"),
       // --- Chart Appearance (detailed) ---
       tooltipHeaderStyle: fontConfigInputSchema.describe("Tooltip header: fontSize, fontFamily, fontWeight, color"),
       tooltipLabelStyle: fontConfigInputSchema.describe("Tooltip label: fontSize, fontFamily, fontWeight, color"),
       tooltipValueStyle: fontConfigInputSchema.describe("Tooltip value: fontSize, fontFamily, fontWeight, color"),
-      labelPosition: z15.enum(["hidden", "top", "left", "right", "bottom", "inside"]).optional().describe("Data label position on charts"),
-      radialLabelPosition: z15.enum(["outside", "inside"]).optional().describe("Label position for radial/pie charts"),
-      marginTop: z15.number().optional().describe("Chart top margin in pixels"),
-      marginLeft: z15.number().optional().describe("Chart left margin in pixels"),
-      marginRight: z15.number().optional().describe("Chart right margin in pixels"),
-      marginBottom: z15.number().optional().describe("Chart bottom margin in pixels"),
-      legendShow: z15.boolean().optional().describe("Show or hide chart legend"),
-      legendPosition: z15.enum([
+      labelPosition: z16.enum(["hidden", "top", "left", "right", "bottom", "inside"]).optional().describe("Data label position on charts"),
+      radialLabelPosition: z16.enum(["outside", "inside"]).optional().describe("Label position for radial/pie charts"),
+      marginTop: z16.number().optional().describe("Chart top margin in pixels"),
+      marginLeft: z16.number().optional().describe("Chart left margin in pixels"),
+      marginRight: z16.number().optional().describe("Chart right margin in pixels"),
+      marginBottom: z16.number().optional().describe("Chart bottom margin in pixels"),
+      legendShow: z16.boolean().optional().describe("Show or hide chart legend"),
+      legendPosition: z16.enum([
         "top-left",
         "top-center",
         "top-right",
@@ -3080,17 +3325,17 @@ function registerCustomizeTheme(server, client) {
         "bottom-center",
         "bottom-right"
       ]).optional().describe("Legend position"),
-      legendLayout: z15.enum(["horizontal", "vertical"]).optional().describe("Legend layout direction"),
-      legendShape: z15.enum(["circle", "rect", "roundRect", "triangle", "diamond", "arrow", "none"]).optional().describe("Legend icon shape"),
-      legendFontSize: z15.number().optional().describe("Legend font size"),
-      legendFontWeight: z15.number().optional().describe("Legend font weight"),
-      legendFontFamily: z15.string().optional().describe("Legend font family"),
-      legendColor: z15.string().optional().describe("Legend text color (hex)"),
-      legendTruncateLength: z15.number().optional().describe("Max characters before truncating legend"),
-      disableLegendScrolling: z15.boolean().optional().describe("Disable scrolling in legend"),
-      enableVariableLegendPosition: z15.boolean().optional().describe("Allow user to drag legend"),
-      legendTop: z15.number().optional().describe("Custom legend top offset"),
-      legendLeft: z15.number().optional().describe("Custom legend left offset"),
+      legendLayout: z16.enum(["horizontal", "vertical"]).optional().describe("Legend layout direction"),
+      legendShape: z16.enum(["circle", "rect", "roundRect", "triangle", "diamond", "arrow", "none"]).optional().describe("Legend icon shape"),
+      legendFontSize: z16.number().optional().describe("Legend font size"),
+      legendFontWeight: z16.number().optional().describe("Legend font weight"),
+      legendFontFamily: z16.string().optional().describe("Legend font family"),
+      legendColor: z16.string().optional().describe("Legend text color (hex)"),
+      legendTruncateLength: z16.number().optional().describe("Max characters before truncating legend"),
+      disableLegendScrolling: z16.boolean().optional().describe("Disable scrolling in legend"),
+      enableVariableLegendPosition: z16.boolean().optional().describe("Allow user to drag legend"),
+      legendTop: z16.number().optional().describe("Custom legend top offset"),
+      legendLeft: z16.number().optional().describe("Custom legend left offset"),
       verticalAxis: axisSchema.describe("Vertical (Y) axis configuration"),
       horizontalAxis: axisSchema.describe("Horizontal (X) axis configuration")
     },
@@ -3165,7 +3410,7 @@ Use \`get_embed_details\` to view the full current theme configuration.` + GUEST
 }
 
 // src/tools/embed/get-demo-link.ts
-import { z as z16 } from "zod";
+import { z as z17 } from "zod";
 var HOUR_MS = 60 * 60 * 1e3;
 var DEFAULT_EXPIRY_HOURS = 24;
 var MAX_EXPIRY_HOURS = 24 * 30;
@@ -3175,11 +3420,11 @@ function registerGetDemoLink(server, client) {
     "get_demo_link",
     `Get a shareable demo URL for a dashboard embed scoped to a specific clientId \u2014 same link the UI's "Share Demo Link" generates. Loads the dashboard as that end-customer sees it. Use to verify ops-built widgets without a test app.`,
     {
-      clientId: z16.string().describe("End-customer identifier to scope the preview to."),
-      dashboardName: z16.string().optional().describe("Dashboard name (non-technical). Preferred \u2014 pass with optional `workspaceName`."),
-      workspaceName: z16.string().optional().describe("Workspace name. Only needed if `dashboardName` is ambiguous."),
-      embedId: z16.string().optional().describe("Technical alternative to `dashboardName`."),
-      expiryHours: z16.number().min(1).max(MAX_EXPIRY_HOURS).optional().describe(`Token TTL in hours. Defaults to ${DEFAULT_EXPIRY_HOURS}. Max ${MAX_EXPIRY_HOURS} (30 days).`)
+      clientId: z17.string().describe("End-customer identifier to scope the preview to."),
+      dashboardName: z17.string().optional().describe("Dashboard name (non-technical). Preferred \u2014 pass with optional `workspaceName`."),
+      workspaceName: z17.string().optional().describe("Workspace name. Only needed if `dashboardName` is ambiguous."),
+      embedId: z17.string().optional().describe("Technical alternative to `dashboardName`."),
+      expiryHours: z17.number().min(1).max(MAX_EXPIRY_HOURS).optional().describe(`Token TTL in hours. Defaults to ${DEFAULT_EXPIRY_HOURS}. Max ${MAX_EXPIRY_HOURS} (30 days).`)
     },
     WRITE_CREATE,
     async (params) => {
@@ -3235,70 +3480,70 @@ function registerGetDemoLink(server, client) {
 }
 
 // src/tools/frontend/generate-guest-token.ts
-import { z as z17 } from "zod";
+import { z as z18 } from "zod";
 function registerGenerateGuestToken(server, client) {
   const services = createServiceBundle(client);
   server.tool(
     "generate_guest_token",
     "Generate a guest token for frontend embedding. Requires clientId. Omit dataAppName to auto-resolve.",
     {
-      clientId: z17.string().describe('Unique end-user identifier for multi-tenant filtering. Use "None" if no tenancy.'),
-      dataAppName: z17.string().optional().describe("Name of the data app. Omit to list available data apps."),
-      body: z17.record(z17.unknown()).optional().describe(
+      clientId: z18.string().describe('Unique end-user identifier for multi-tenant filtering. Use "None" if no tenancy.'),
+      dataAppName: z18.string().optional().describe("Name of the data app. Omit to list available data apps."),
+      body: z18.record(z18.unknown()).optional().describe(
         "Raw API body for POST /api/v2/guest-token/create. If provided, sent directly and convenience fields are ignored."
       ),
-      params: z17.object({
-        allowedEmbeds: z17.array(z17.string()).optional().describe("Restrict token to specific embed IDs"),
-        rlsSettings: z17.array(z17.object({
-          metricId: z17.string().describe("Metric ID"),
-          values: z17.record(z17.unknown()).describe("RLS values by column name")
+      params: z18.object({
+        allowedEmbeds: z18.array(z18.string()).optional().describe("Restrict token to specific embed IDs"),
+        rlsSettings: z18.array(z18.object({
+          metricId: z18.string().describe("Metric ID"),
+          values: z18.record(z18.unknown()).describe("RLS values by column name")
         })).optional().describe("Legacy alias used in docs/examples; forwarded as params.rlsSettings"),
-        appFilters: z17.array(z17.object({
-          metricId: z17.string().describe("Metric ID"),
-          values: z17.record(z17.unknown()).describe("Filter values by column name")
+        appFilters: z18.array(z18.object({
+          metricId: z18.string().describe("Metric ID"),
+          values: z18.record(z18.unknown()).describe("Filter values by column name")
         })).optional().describe("Metric-level app filters"),
-        dashboardAppFilters: z17.array(z17.object({
-          dashboardId: z17.string().describe("Dashboard ID"),
-          values: z17.record(z17.unknown()).describe("Filter values by dashboard filter name"),
-          isShowOnUrl: z17.boolean().optional().describe("Whether filters are shown in URL params")
+        dashboardAppFilters: z18.array(z18.object({
+          dashboardId: z18.string().describe("Dashboard ID"),
+          values: z18.record(z18.unknown()).describe("Filter values by dashboard filter name"),
+          isShowOnUrl: z18.boolean().optional().describe("Whether filters are shown in URL params")
         })).optional().describe("Dashboard-level app filters"),
-        hideDashboardFilters: z17.array(z17.string()).optional().describe("Dashboard filter names to hide"),
-        userIdentifier: z17.string().optional().describe("End-user identifier for private metrics support"),
-        timezone: z17.string().optional().describe('IANA timezone, e.g. "America/New_York"')
+        hideDashboardFilters: z18.array(z18.string()).optional().describe("Dashboard filter names to hide"),
+        userIdentifier: z18.string().optional().describe("End-user identifier for private metrics support"),
+        timezone: z18.string().optional().describe('IANA timezone, e.g. "America/New_York"')
       }).optional().describe("Advanced token params"),
       // Legacy convenience fields (auto-mapped into params for backward compatibility)
-      timezone: z17.string().optional().describe("Legacy: moved under params.timezone"),
-      allowedEmbeds: z17.array(z17.string()).optional().describe("Legacy: moved under params.allowedEmbeds"),
-      rlsSettings: z17.array(z17.object({
-        metricId: z17.string().describe("Metric ID"),
-        values: z17.record(z17.unknown()).describe("RLS values by column name")
+      timezone: z18.string().optional().describe("Legacy: moved under params.timezone"),
+      allowedEmbeds: z18.array(z18.string()).optional().describe("Legacy: moved under params.allowedEmbeds"),
+      rlsSettings: z18.array(z18.object({
+        metricId: z18.string().describe("Metric ID"),
+        values: z18.record(z18.unknown()).describe("RLS values by column name")
       })).optional().describe("Legacy: moved under params.rlsSettings"),
-      appFilters: z17.array(z17.object({
-        metricId: z17.string().describe("Metric ID"),
-        values: z17.record(z17.unknown()).describe("Filter values by column name")
+      appFilters: z18.array(z18.object({
+        metricId: z18.string().describe("Metric ID"),
+        values: z18.record(z18.unknown()).describe("Filter values by column name")
       })).optional().describe("Legacy: moved under params.appFilters"),
-      dashboardAppFilters: z17.array(z17.object({
-        dashboardId: z17.string().describe("Dashboard ID to apply filters to"),
-        values: z17.record(z17.unknown()).describe("Filter values for this dashboard"),
-        isShowOnUrl: z17.boolean().optional().describe("Whether filters are shown in URL params")
+      dashboardAppFilters: z18.array(z18.object({
+        dashboardId: z18.string().describe("Dashboard ID to apply filters to"),
+        values: z18.record(z18.unknown()).describe("Filter values for this dashboard"),
+        isShowOnUrl: z18.boolean().optional().describe("Whether filters are shown in URL params")
       })).optional().describe("Legacy: moved under params.dashboardAppFilters"),
-      permissions: z17.object({
-        isEnableArchiveMetrics: z17.boolean().optional(),
-        isEnableManageMetrics: z17.boolean().optional(),
-        isEnableCreateDashboardView: z17.boolean().optional(),
-        isEnableMetricUpdation: z17.boolean().optional(),
-        isEnableCustomizeLayout: z17.boolean().optional(),
-        isEnableUnderlyingData: z17.boolean().optional(),
-        isEnableDownloadMetrics: z17.boolean().optional(),
-        isShowSideBar: z17.boolean().optional(),
-        isShowDashboardName: z17.boolean().optional(),
-        isDisableMetricCreation: z17.boolean().optional()
+      permissions: z18.object({
+        isEnableArchiveMetrics: z18.boolean().optional(),
+        isEnableManageMetrics: z18.boolean().optional(),
+        isEnableCreateDashboardView: z18.boolean().optional(),
+        isEnableMetricUpdation: z18.boolean().optional(),
+        isEnableCustomizeLayout: z18.boolean().optional(),
+        isEnableUnderlyingData: z18.boolean().optional(),
+        isEnableDownloadMetrics: z18.boolean().optional(),
+        isShowSideBar: z18.boolean().optional(),
+        isShowDashboardName: z18.boolean().optional(),
+        isDisableMetricCreation: z18.boolean().optional()
       }).optional().describe("Runtime permission overrides (merge with and override embed-level settings)"),
-      theme: z17.record(z17.unknown()).optional().describe("Runtime theme overrides (overrides embed-level theme)"),
-      hideDashboardFilters: z17.array(z17.string()).optional().describe("Legacy: moved under params.hideDashboardFilters"),
-      userIdentifier: z17.string().optional().describe("Legacy: moved under params.userIdentifier"),
-      expiryTime: z17.number().optional().describe("Token TTL in milliseconds"),
-      datasourceName: z17.string().optional().describe("Datasource name for multi-datasource routing")
+      theme: z18.record(z18.unknown()).optional().describe("Runtime theme overrides (overrides embed-level theme)"),
+      hideDashboardFilters: z18.array(z18.string()).optional().describe("Legacy: moved under params.hideDashboardFilters"),
+      userIdentifier: z18.string().optional().describe("Legacy: moved under params.userIdentifier"),
+      expiryTime: z18.number().optional().describe("Token TTL in milliseconds"),
+      datasourceName: z18.string().optional().describe("Datasource name for multi-datasource routing")
     },
     WRITE_CREATE,
     async (params) => {
@@ -3351,7 +3596,7 @@ Next step: Use \`generate_embed_code\` to get copy-paste-ready frontend code.`
 }
 
 // src/tools/frontend/generate-embed-code.ts
-import { z as z18 } from "zod";
+import { z as z19 } from "zod";
 
 // src/templates/react.ts
 function kebabCase(str) {
@@ -4347,22 +4592,22 @@ function registerGenerateEmbedCode(server, _client) {
     "generate_embed_code",
     "Generate framework-specific embed code (React, Next.js, Vue, Angular, Svelte, SolidJS, vanilla HTML).",
     {
-      embedId: z18.string().describe("The embed ID to generate code for"),
-      framework: z18.enum(FRAMEWORKS).describe("Frontend framework"),
-      embedType: z18.enum(["dashboard", "metric"]).optional().default("dashboard"),
-      options: z18.object({
-        enableDownloadCsv: z18.boolean().optional(),
-        enableEmailCsv: z18.boolean().optional(),
-        enableDownloadAllMetrics: z18.boolean().optional(),
-        enableDownloadAllPdf: z18.boolean().optional(),
-        disableFullscreen: z18.boolean().optional(),
-        isHideTablePreview: z18.boolean().optional(),
-        isHideChartSettings: z18.boolean().optional(),
-        isStickyDashboardFilters: z18.boolean().optional(),
-        enableMultiMetricFilters: z18.boolean().optional(),
-        themeName: z18.string().optional(),
-        customTheme: z18.record(z18.unknown()).optional(),
-        optionsIcon: z18.enum(["kebab-menu-vertical", "download"]).optional()
+      embedId: z19.string().describe("The embed ID to generate code for"),
+      framework: z19.enum(FRAMEWORKS).describe("Frontend framework"),
+      embedType: z19.enum(["dashboard", "metric"]).optional().default("dashboard"),
+      options: z19.object({
+        enableDownloadCsv: z19.boolean().optional(),
+        enableEmailCsv: z19.boolean().optional(),
+        enableDownloadAllMetrics: z19.boolean().optional(),
+        enableDownloadAllPdf: z19.boolean().optional(),
+        disableFullscreen: z19.boolean().optional(),
+        isHideTablePreview: z19.boolean().optional(),
+        isHideChartSettings: z19.boolean().optional(),
+        isStickyDashboardFilters: z19.boolean().optional(),
+        enableMultiMetricFilters: z19.boolean().optional(),
+        themeName: z19.string().optional(),
+        customTheme: z19.record(z19.unknown()).optional(),
+        optionsIcon: z19.enum(["kebab-menu-vertical", "download"]).optional()
       }).optional()
     },
     READ_ONLY,
@@ -4402,17 +4647,17 @@ ${generated.instructions}`;
 }
 
 // src/tools/analytics/list-dashboards.ts
-import { z as z19 } from "zod";
+import { z as z20 } from "zod";
 function registerListDashboards(server, client) {
   const services = createServiceBundle(client);
   server.tool(
     "list_dashboards",
     "List dashboards globally or for a specific data app.",
     {
-      scope: z19.enum(["auto", "global", "data_app"]).optional().describe(
+      scope: z20.enum(["auto", "global", "data_app"]).optional().describe(
         "Dashboard listing scope. auto: use data_app when dataAppName + API token are available, otherwise global."
       ),
-      dataAppName: z19.string().optional().describe("Data app name for data_app scope. Ignored for global scope.")
+      dataAppName: z20.string().optional().describe("Data app name for data_app scope. Ignored for global scope.")
     },
     READ_ONLY,
     async (params) => {
@@ -4447,7 +4692,7 @@ function registerListDashboards(server, client) {
 }
 
 // src/tools/query/ask-question.ts
-import { z as z20 } from "zod";
+import { z as z21 } from "zod";
 var MAX_DISPLAY_ROWS = 50;
 function formatDataTable(data, columns) {
   if (!Array.isArray(data) || data.length === 0) return "_No data returned._";
@@ -4477,16 +4722,16 @@ function registerAskQuestion(server, client) {
     "ask_question",
     "Ask a natural language question \u2014 converts to SQL, returns data + chart suggestion. Requires datamartName with a populated semantic layer.",
     {
-      question: z20.string().describe(
+      question: z21.string().describe(
         'The natural language question to ask (e.g. "What was total revenue last month?")'
       ),
-      datamartName: z20.string().optional().describe(
+      datamartName: z21.string().optional().describe(
         "Name of the datamart to query. Use `list_datamarts` to find available names. REQUIRED unless exactly one datamart exists (auto-resolved). Do NOT pass a workspace name here."
       ),
-      sessionId: z20.string().optional().describe(
+      sessionId: z21.string().optional().describe(
         "Session ID from a previous ask_question response, for follow-up questions."
       ),
-      timezone: z20.string().optional().describe('IANA timezone (e.g. "America/New_York"). Defaults to UTC.')
+      timezone: z21.string().optional().describe('IANA timezone (e.g. "America/New_York"). Defaults to UTC.')
     },
     WRITE_CREATE,
     async (params) => {
@@ -4662,14 +4907,14 @@ To fix this:
 }
 
 // src/tools/query/get-semantic-layer.ts
-import { z as z21 } from "zod";
+import { z as z22 } from "zod";
 function registerGetSemanticLayer(server, client) {
   const services = createServiceBundle(client);
   server.tool(
     "get_semantic_layer",
     "Get semantic layer metadata for a datamart: table/column descriptions, synonyms, completion score. Omit datamartName to auto-resolve.",
     {
-      datamartName: z21.string().optional().describe(
+      datamartName: z22.string().optional().describe(
         "Name of the datamart to inspect. Omit to list available datamarts."
       )
     },
@@ -4779,15 +5024,15 @@ ${result.feedback}`);
 }
 
 // src/tools/query/update-semantic-layer.ts
-import { z as z22 } from "zod";
-var columnSchema2 = z22.object({
-  name: z22.string().describe("Column name (must exist in the datamart)"),
-  description: z22.string().optional().describe("Business-friendly description of what this column represents"),
-  synonyms: z22.array(z22.string()).optional().describe(
+import { z as z23 } from "zod";
+var columnSchema2 = z23.object({
+  name: z23.string().describe("Column name (must exist in the datamart)"),
+  description: z23.string().optional().describe("Business-friendly description of what this column represents"),
+  synonyms: z23.array(z23.string()).optional().describe(
     'Alternative names users might use for this column (e.g. ["revenue", "sales amount"])'
   ),
-  miscellaneousInfo: z22.string().optional().describe("Additional context such as valid values, units, or caveats"),
-  columnType: z22.enum([
+  miscellaneousInfo: z23.string().optional().describe("Additional context such as valid values, units, or caveats"),
+  columnType: z23.enum([
     "String",
     "Long String",
     "String (Custom)",
@@ -4800,16 +5045,16 @@ var columnSchema2 = z22.object({
     "JSON"
   ]).nullable().optional().describe('Semantic column type. Use "Identifier" for IDs/foreign keys, "Number" for numeric values, "String" for text. Omit for date and boolean columns.')
 });
-var tableSchema2 = z22.object({
-  name: z22.string().describe("Table name (must exist in the datamart)"),
-  description: z22.string().optional().describe(
+var tableSchema2 = z23.object({
+  name: z23.string().describe("Table name (must exist in the datamart)"),
+  description: z23.string().optional().describe(
     "Business-friendly description of what this table represents"
   ),
-  synonyms: z22.array(z22.string()).optional().describe("Alternative names for this table"),
-  miscellaneousInfo: z22.string().optional().describe(
+  synonyms: z23.array(z23.string()).optional().describe("Alternative names for this table"),
+  miscellaneousInfo: z23.string().optional().describe(
     "Additional context such as how the table relates to other tables"
   ),
-  columns: z22.array(columnSchema2).optional().describe("Column-level semantic definitions to update")
+  columns: z23.array(columnSchema2).optional().describe("Column-level semantic definitions to update")
 });
 function columnKey(tableName, columnName) {
   return `${tableName.toLowerCase()}\0${columnName.toLowerCase()}`;
@@ -4876,13 +5121,13 @@ function registerUpdateSemanticLayer(server, client) {
     "update_semantic_layer",
     "Populate or update the semantic layer for a datamart. Add table/column descriptions, synonyms, context. Required before ask_question works. Auto-generate descriptions from column names when empty.",
     {
-      datamartName: z22.string().optional().describe(
+      datamartName: z23.string().optional().describe(
         "Name of the datamart to update. Omit to list available datamarts."
       ),
-      tables: z22.array(tableSchema2).optional().describe(
+      tables: z23.array(tableSchema2).optional().describe(
         "Table and column definitions to update. Only include tables/columns you want to change."
       ),
-      feedback: z22.string().optional().describe(
+      feedback: z23.string().optional().describe(
         'General feedback or context about the datamart (e.g. "This datamart contains e-commerce data for the US market").'
       )
     },
@@ -4944,7 +5189,7 @@ You can now:
 }
 
 // src/tools/query/semantic-generation.ts
-import { z as z23 } from "zod";
+import { z as z24 } from "zod";
 function nonEmptyString(value) {
   return typeof value === "string" && value.trim().length > 0 ? value : null;
 }
@@ -5099,9 +5344,9 @@ function registerStartSemanticLayerGeneration(server, client) {
     "start_semantic_layer_generation",
     "Start backend semantic-layer auto-generation for a datamart. Returns an async job id to poll.",
     {
-      datamartName: z23.string().optional().describe("Datamart name. Omit to list available datamarts"),
-      workspaceName: z23.string().optional().describe("Workspace linked to the datamart. Use when datamartName resolution needs a dataMartId bridge."),
-      datamartId: z23.string().optional().describe("Datamart UUID. Use only when already known.")
+      datamartName: z24.string().optional().describe("Datamart name. Omit to list available datamarts"),
+      workspaceName: z24.string().optional().describe("Workspace linked to the datamart. Use when datamartName resolution needs a dataMartId bridge."),
+      datamartId: z24.string().optional().describe("Datamart UUID. Use only when already known.")
     },
     WRITE_CREATE,
     async (params) => {
@@ -5143,9 +5388,9 @@ function registerGetSemanticLayerGenerationStatus(server, client) {
     "get_semantic_layer_generation_status",
     "Get semantic-layer auto-generation job status for a datamart.",
     {
-      datamartName: z23.string().optional().describe("Datamart name. Omit to list available datamarts"),
-      workspaceName: z23.string().optional().describe("Workspace linked to the datamart. Use when datamartName resolution needs a dataMartId bridge."),
-      datamartId: z23.string().optional().describe("Datamart UUID. Use only when already known.")
+      datamartName: z24.string().optional().describe("Datamart name. Omit to list available datamarts"),
+      workspaceName: z24.string().optional().describe("Workspace linked to the datamart. Use when datamartName resolution needs a dataMartId bridge."),
+      datamartId: z24.string().optional().describe("Datamart UUID. Use only when already known.")
     },
     READ_ONLY,
     async (params) => {
@@ -5182,17 +5427,17 @@ function registerGetSemanticLayerGenerationStatus(server, client) {
 }
 
 // src/tools/widgets/list-widgets.ts
-import { z as z24 } from "zod";
+import { z as z25 } from "zod";
 function registerListWidgets(server, client) {
   const services = createServiceBundle(client);
   server.tool(
     "list_widgets",
     "List widgets on a customer dashboard. Non-technical flow: pass `clientId` + `dashboardName` (+ optional `workspaceName` if ambiguous). Returns each widget's externalMetricId (uuid, used for update/remove), metricId (slug), name, published state, and creator identifier.",
     {
-      clientId: z24.string().describe("Client/tenant identifier for this dashboard"),
-      dashboardName: z24.string().optional().describe("Dashboard name (non-technical). Preferred input \u2014 pass this with optional `workspaceName` instead of `embedId`."),
-      workspaceName: z24.string().optional().describe("Workspace name (non-technical). Only needed if `dashboardName` is ambiguous across workspaces."),
-      embedId: z24.string().optional().describe("Technical alternative to `dashboardName`. Pass only if you already have the embed identifier.")
+      clientId: z25.string().describe("Client/tenant identifier for this dashboard"),
+      dashboardName: z25.string().optional().describe("Dashboard name (non-technical). Preferred input \u2014 pass this with optional `workspaceName` instead of `embedId`."),
+      workspaceName: z25.string().optional().describe("Workspace name (non-technical). Only needed if `dashboardName` is ambiguous across workspaces."),
+      embedId: z25.string().optional().describe("Technical alternative to `dashboardName`. Pass only if you already have the embed identifier.")
     },
     READ_ONLY,
     async (params) => {
@@ -5238,28 +5483,28 @@ function registerListWidgets(server, client) {
 }
 
 // src/tools/widgets/add-widget.ts
-import { z as z25 } from "zod";
+import { z as z26 } from "zod";
 function registerAddWidget(server, client) {
   const services = createServiceBundle(client);
   server.tool(
     "add_widget",
     "Add a widget to a customer dashboard. Non-technical flow: pass `clientId` + `dashboardName` (+ optional `workspaceName` if ambiguous). Cloning via `templateMetricId` is the recommended path \u2014 query, chart config, and datasource are all inherited. Data app and datasource auto-resolve; never ask the user for them.",
     {
-      clientId: z25.string().describe("Client/tenant identifier (widget is created in their scope)"),
-      dashboardName: z25.string().optional().describe("Dashboard name (non-technical). Preferred input \u2014 pass this with optional `workspaceName` instead of `embedId`."),
-      workspaceName: z25.string().optional().describe("Workspace name (non-technical). Only needed if `dashboardName` is ambiguous across workspaces."),
-      embedId: z25.string().optional().describe("Technical alternative to `dashboardName`. Pass only if you already have the embed identifier."),
-      dataAppName: z25.string().optional().describe("Technical override. Auto-resolved from the embed; non-technical callers should leave this blank."),
-      templateMetricId: z25.string().optional().describe("Source widget metricId to clone from. Copies query, chartOptions, and datasource fields; caller can override via other params."),
-      name: z25.string().optional().describe("Widget name (overrides template)"),
-      metricId: z25.string().optional().describe("Unique slug for the new widget (auto-generated if omitted)"),
-      query: z25.string().optional().describe("SQL query body (overrides template)"),
-      chartOptions: z25.record(z25.unknown()).optional().describe("Chart config JSON (chart type, colors, legend, axes). Overrides template."),
-      description: z25.string().optional(),
-      companyIntegrationId: z25.string().optional().describe("Datasource UUID override. Auto-resolved from `embedId` or sole active datasource; leave blank unless the user explicitly picked one by ID."),
-      integrationName: z25.string().optional().describe('Datasource display name (e.g. "Snowflake"). Use this when the user picks a datasource by name \u2014 the id is looked up automatically.'),
-      isPublished: z25.boolean().optional().describe("Publish immediately (default true)"),
-      body: z25.record(z25.unknown()).optional().describe("Raw createMetric body passthrough. If provided, used as-is (after defaults). Overrides all other params.")
+      clientId: z26.string().describe("Client/tenant identifier (widget is created in their scope)"),
+      dashboardName: z26.string().optional().describe("Dashboard name (non-technical). Preferred input \u2014 pass this with optional `workspaceName` instead of `embedId`."),
+      workspaceName: z26.string().optional().describe("Workspace name (non-technical). Only needed if `dashboardName` is ambiguous across workspaces."),
+      embedId: z26.string().optional().describe("Technical alternative to `dashboardName`. Pass only if you already have the embed identifier."),
+      dataAppName: z26.string().optional().describe("Technical override. Auto-resolved from the embed; non-technical callers should leave this blank."),
+      templateMetricId: z26.string().optional().describe("Source widget metricId to clone from. Copies query, chartOptions, and datasource fields; caller can override via other params."),
+      name: z26.string().optional().describe("Widget name (overrides template)"),
+      metricId: z26.string().optional().describe("Unique slug for the new widget (auto-generated if omitted)"),
+      query: z26.string().optional().describe("SQL query body (overrides template)"),
+      chartOptions: z26.record(z26.unknown()).optional().describe("Chart config JSON (chart type, colors, legend, axes). Overrides template."),
+      description: z26.string().optional(),
+      companyIntegrationId: z26.string().optional().describe("Datasource UUID override. Auto-resolved from `embedId` or sole active datasource; leave blank unless the user explicitly picked one by ID."),
+      integrationName: z26.string().optional().describe('Datasource display name (e.g. "Snowflake"). Use this when the user picks a datasource by name \u2014 the id is looked up automatically.'),
+      isPublished: z26.boolean().optional().describe("Publish immediately (default true)"),
+      body: z26.record(z26.unknown()).optional().describe("Raw createMetric body passthrough. If provided, used as-is (after defaults). Overrides all other params.")
     },
     WRITE_CREATE,
     async (params) => {
@@ -5283,6 +5528,13 @@ function registerAddWidget(server, client) {
           embedId
         );
         if (!dataAppName.ok) return toolError(dataAppName.error);
+        const tenantScope = await services.widgetService.ensureTenantDashboardScope({
+          embedId,
+          clientId: params.clientId,
+          dataAppName: dataAppName.value,
+          dashboardName: embed.value.resolvedFrom?.dashboardName || params.dashboardName || null
+        });
+        if (!tenantScope.ok) return toolError(tenantScope.error);
         const guestToken = await services.widgetService.mintGuestToken(
           params.clientId,
           dataAppName.value,
@@ -5369,20 +5621,20 @@ Use \`list_widgets\` to verify, or \`update_widget\`/\`remove_widget\` to adjust
 }
 
 // src/tools/widgets/update-widget.ts
-import { z as z26 } from "zod";
+import { z as z27 } from "zod";
 function registerUpdateWidget(server, client) {
   const services = createServiceBundle(client);
   server.tool(
     "update_widget",
     "Update a widget on a customer dashboard. Non-technical flow: pass `clientId` + `dashboardName` (+ optional `workspaceName` if ambiguous) + `externalMetricId` + `set`. Data app auto-resolves from the dashboard.",
     {
-      externalMetricId: z26.string().describe("Internal uuid of the widget (externalMetrics.id). Not the user-facing metricId slug."),
-      clientId: z26.string().describe("Client/tenant identifier"),
-      dashboardName: z26.string().optional().describe("Dashboard name (non-technical). Preferred input \u2014 pass this with optional `workspaceName` instead of `embedId`."),
-      workspaceName: z26.string().optional().describe("Workspace name (non-technical). Only needed if `dashboardName` is ambiguous across workspaces."),
-      embedId: z26.string().optional().describe("Technical alternative to `dashboardName`. Pass only if you already have the embed identifier."),
-      dataAppName: z26.string().optional().describe("Technical override. Auto-resolved from the dashboard; non-technical callers should leave this blank."),
-      set: z26.record(z26.unknown()).describe("Partial patch. Keys can include: name, query, chartOptions, description, isPublished, isLive, selectedGroupBy, drillDownSettings, limit, etc.")
+      externalMetricId: z27.string().describe("Internal uuid of the widget (externalMetrics.id). Not the user-facing metricId slug."),
+      clientId: z27.string().describe("Client/tenant identifier"),
+      dashboardName: z27.string().optional().describe("Dashboard name (non-technical). Preferred input \u2014 pass this with optional `workspaceName` instead of `embedId`."),
+      workspaceName: z27.string().optional().describe("Workspace name (non-technical). Only needed if `dashboardName` is ambiguous across workspaces."),
+      embedId: z27.string().optional().describe("Technical alternative to `dashboardName`. Pass only if you already have the embed identifier."),
+      dataAppName: z27.string().optional().describe("Technical override. Auto-resolved from the dashboard; non-technical callers should leave this blank."),
+      set: z27.record(z27.unknown()).describe("Partial patch. Keys can include: name, query, chartOptions, description, isPublished, isLive, selectedGroupBy, drillDownSettings, limit, etc.")
     },
     WRITE_IDEMPOTENT,
     async (params) => {
@@ -5393,19 +5645,27 @@ function registerUpdateWidget(server, client) {
         const embed = await services.widgetService.resolveEmbedId({
           embedId: params.embedId,
           dashboardName: params.dashboardName,
-          workspaceName: params.workspaceName
+          workspaceName: params.workspaceName,
+          required: true
         });
         if (!embed.ok) return toolError(embed.error);
         const embedId = embed.value.embedId;
         const dataAppName = await services.widgetService.resolveDataAppName(
           params.dataAppName,
-          embedId || void 0
+          embedId
         );
         if (!dataAppName.ok) return toolError(dataAppName.error);
+        const tenantScope = await services.widgetService.ensureTenantDashboardScope({
+          embedId,
+          clientId: params.clientId,
+          dataAppName: dataAppName.value,
+          dashboardName: embed.value.resolvedFrom?.dashboardName || params.dashboardName || null
+        });
+        if (!tenantScope.ok) return toolError(tenantScope.error);
         const guestToken = await services.widgetService.mintGuestToken(
           params.clientId,
           dataAppName.value,
-          embedId ? [embedId] : void 0
+          [embedId]
         );
         const result = await services.widgetsApi.updateMetric(guestToken, {
           externalMetricId: params.externalMetricId,
@@ -5437,19 +5697,19 @@ Use \`list_widgets\` to verify.`
 }
 
 // src/tools/widgets/remove-widget.ts
-import { z as z27 } from "zod";
+import { z as z28 } from "zod";
 function registerRemoveWidget(server, client) {
   const services = createServiceBundle(client);
   server.tool(
     "remove_widget",
     "Remove a widget from a customer dashboard. Non-technical flow: pass `clientId` + `dashboardName` (+ optional `workspaceName` if ambiguous) + `externalMetricId`. Per-client soft delete \u2014 the widget stays on the template dashboard and on other customers' dashboards.",
     {
-      externalMetricId: z27.string().describe("Internal uuid of the widget (externalMetrics.id)"),
-      clientId: z27.string().describe("Client/tenant identifier \u2014 the widget will be hidden for this client only"),
-      dashboardName: z27.string().optional().describe("Dashboard name (non-technical). Preferred input \u2014 pass this with optional `workspaceName` instead of `embedId`."),
-      workspaceName: z27.string().optional().describe("Workspace name (non-technical). Only needed if `dashboardName` is ambiguous across workspaces."),
-      embedId: z27.string().optional().describe("Technical alternative to `dashboardName`. Pass only if you already have the embed identifier."),
-      dataAppName: z27.string().optional().describe("Technical override. Auto-resolved from the dashboard; non-technical callers should leave this blank.")
+      externalMetricId: z28.string().describe("Internal uuid of the widget (externalMetrics.id)"),
+      clientId: z28.string().describe("Client/tenant identifier \u2014 the widget will be hidden for this client only"),
+      dashboardName: z28.string().optional().describe("Dashboard name (non-technical). Preferred input \u2014 pass this with optional `workspaceName` instead of `embedId`."),
+      workspaceName: z28.string().optional().describe("Workspace name (non-technical). Only needed if `dashboardName` is ambiguous across workspaces."),
+      embedId: z28.string().optional().describe("Technical alternative to `dashboardName`. Pass only if you already have the embed identifier."),
+      dataAppName: z28.string().optional().describe("Technical override. Auto-resolved from the dashboard; non-technical callers should leave this blank.")
     },
     DESTRUCTIVE,
     async (params) => {
@@ -5457,19 +5717,27 @@ function registerRemoveWidget(server, client) {
         const embed = await services.widgetService.resolveEmbedId({
           embedId: params.embedId,
           dashboardName: params.dashboardName,
-          workspaceName: params.workspaceName
+          workspaceName: params.workspaceName,
+          required: true
         });
         if (!embed.ok) return toolError(embed.error);
         const embedId = embed.value.embedId;
         const dataAppName = await services.widgetService.resolveDataAppName(
           params.dataAppName,
-          embedId || void 0
+          embedId
         );
         if (!dataAppName.ok) return toolError(dataAppName.error);
+        const tenantScope = await services.widgetService.ensureTenantDashboardScope({
+          embedId,
+          clientId: params.clientId,
+          dataAppName: dataAppName.value,
+          dashboardName: embed.value.resolvedFrom?.dashboardName || params.dashboardName || null
+        });
+        if (!tenantScope.ok) return toolError(tenantScope.error);
         const guestToken = await services.widgetService.mintGuestToken(
           params.clientId,
           dataAppName.value,
-          embedId ? [embedId] : void 0
+          [embedId]
         );
         const result = await services.widgetsApi.markArchived(guestToken, {
           id: params.externalMetricId,
@@ -5497,21 +5765,21 @@ Note: this is a per-client soft delete. The widget remains available for other c
 }
 
 // src/tools/widgets/generate-widget.ts
-import { z as z28 } from "zod";
+import { z as z29 } from "zod";
 function registerGenerateWidget(server, client) {
   const services = createServiceBundle(client);
   server.tool(
     "generate_widget",
     "AI-generate a widget draft from a natural-language prompt. Does NOT persist \u2014 returns a draft to pass to `add_widget`. Non-technical flow: `clientId` + `dashboardName` (+ `workspaceName` if ambiguous); data app and datasource auto-resolve. Never ask the user for data app, datasource, or integration.",
     {
-      clientId: z28.string().describe("Client/tenant identifier"),
-      userInputs: z28.record(z28.unknown()).describe('Prompt + context object. Typical shape: { prompt: "calls per day over last 30 days", schema: {...}, examples: [...] }. Backend decides which keys it honors.'),
-      dashboardName: z28.string().optional().describe("Dashboard name (non-technical). Preferred input for CS/CX flows \u2014 pass this with optional `workspaceName` instead of `embedId`."),
-      workspaceName: z28.string().optional().describe("Workspace name (non-technical). Only needed if `dashboardName` is ambiguous across workspaces."),
-      embedId: z28.string().optional().describe("Technical alternative to `dashboardName`. Pass only if you already have the embed identifier."),
-      dataAppName: z28.string().optional().describe("Technical override. Auto-resolved from the embed; non-technical callers should leave this blank."),
-      integrationId: z28.string().optional().describe("Technical override \u2014 the datasource UUID. Non-technical callers must leave this blank; the datasource is inherited from the dashboard's existing widgets."),
-      integrationName: z28.string().optional().describe("Technical override \u2014 datasource display name. Non-technical callers must leave this blank; the datasource is inherited from the dashboard's existing widgets.")
+      clientId: z29.string().describe("Client/tenant identifier"),
+      userInputs: z29.record(z29.unknown()).describe('Prompt + context object. Typical shape: { prompt: "calls per day over last 30 days", schema: {...}, examples: [...] }. Backend decides which keys it honors.'),
+      dashboardName: z29.string().optional().describe("Dashboard name (non-technical). Preferred input for CS/CX flows \u2014 pass this with optional `workspaceName` instead of `embedId`."),
+      workspaceName: z29.string().optional().describe("Workspace name (non-technical). Only needed if `dashboardName` is ambiguous across workspaces."),
+      embedId: z29.string().optional().describe("Technical alternative to `dashboardName`. Pass only if you already have the embed identifier."),
+      dataAppName: z29.string().optional().describe("Technical override. Auto-resolved from the embed; non-technical callers should leave this blank."),
+      integrationId: z29.string().optional().describe("Technical override \u2014 the datasource UUID. Non-technical callers must leave this blank; the datasource is inherited from the dashboard's existing widgets."),
+      integrationName: z29.string().optional().describe("Technical override \u2014 datasource display name. Non-technical callers must leave this blank; the datasource is inherited from the dashboard's existing widgets.")
     },
     READ_ONLY,
     async (params) => {
@@ -5529,6 +5797,13 @@ function registerGenerateWidget(server, client) {
           embedId
         );
         if (!dataAppName.ok) return toolError(dataAppName.error);
+        const tenantScope = await services.widgetService.ensureTenantDashboardScope({
+          embedId,
+          clientId: params.clientId,
+          dataAppName: dataAppName.value,
+          dashboardName: embed.value.resolvedFrom?.dashboardName || params.dashboardName || null
+        });
+        if (!tenantScope.ok) return toolError(tenantScope.error);
         const guestToken = await services.widgetService.mintGuestToken(
           params.clientId,
           dataAppName.value,
@@ -5577,9 +5852,9 @@ function registerGenerateWidget(server, client) {
 }
 
 // src/tools/widgets/create-or-update-metric-from-query.ts
-import { z as z29 } from "zod";
-var modeSchema = z29.enum(["dry_run", "apply"]).default("dry_run");
-var conflictStrategySchema = z29.enum(["fail", "update", "create_new"]).default("fail");
+import { z as z30 } from "zod";
+var modeSchema = z30.enum(["dry_run", "apply"]).default("dry_run");
+var conflictStrategySchema = z30.enum(["fail", "update", "create_new"]).default("fail");
 function makePlanText(plan) {
   return JSON.stringify(plan, null, 2);
 }
@@ -5596,22 +5871,22 @@ function registerCreateOrUpdateMetricFromQuery(server, client) {
     "Create or update a production metric/widget from validated SQL. Defaults to dry-run; apply requires explicit confirmation.",
     {
       mode: modeSchema.describe("dry_run returns the plan only; apply executes after confirmation"),
-      confirm: z29.string().optional().describe(`Required for apply: ${APPLY_TO_PRODUCTION_CONFIRMATION}`),
+      confirm: z30.string().optional().describe(`Required for apply: ${APPLY_TO_PRODUCTION_CONFIRMATION}`),
       conflictStrategy: conflictStrategySchema.describe("What to do if metricId already exists on the target dashboard"),
-      clientId: z29.string().describe("Client/tenant identifier for the dashboard widget scope"),
-      workspaceName: z29.string().describe("Target workspace name"),
-      dashboardName: z29.string().optional().describe("Dashboard name to attach to"),
-      embedId: z29.string().optional().describe("Technical embed id alternative to dashboardName"),
-      dataAppName: z29.string().optional().describe("Optional data app override"),
-      name: z29.string().describe("Metric/widget display name"),
-      metricId: z29.string().describe("Stable metric slug to create or update"),
-      query: z29.string().describe("SQL query already validated against the warehouse"),
-      description: z29.string().optional().describe("Metric description"),
-      chartOptions: z29.record(z29.unknown()).optional().describe("Chart configuration JSON"),
-      companyIntegrationId: z29.string().optional().describe("Datasource UUID override"),
-      integrationName: z29.string().optional().describe("Datasource display name override"),
-      isPublished: z29.boolean().optional().describe("Publish after apply. Defaults to false for production safety"),
-      requestedBy: z29.string().optional().describe("Human operator/request context to store on the metric when supported")
+      clientId: z30.string().describe("Client/tenant identifier for the dashboard widget scope"),
+      workspaceName: z30.string().describe("Target workspace name"),
+      dashboardName: z30.string().optional().describe("Dashboard name to attach to"),
+      embedId: z30.string().optional().describe("Technical embed id alternative to dashboardName"),
+      dataAppName: z30.string().optional().describe("Optional data app override"),
+      name: z30.string().describe("Metric/widget display name"),
+      metricId: z30.string().describe("Stable metric slug to create or update"),
+      query: z30.string().describe("SQL query already validated against the warehouse"),
+      description: z30.string().optional().describe("Metric description"),
+      chartOptions: z30.record(z30.unknown()).optional().describe("Chart configuration JSON"),
+      companyIntegrationId: z30.string().optional().describe("Datasource UUID override"),
+      integrationName: z30.string().optional().describe("Datasource display name override"),
+      isPublished: z30.boolean().optional().describe("Publish after apply. Defaults to false for production safety"),
+      requestedBy: z30.string().optional().describe("Human operator/request context to store on the metric when supported")
     },
     WRITE_IDEMPOTENT,
     async (params) => {
@@ -5640,6 +5915,13 @@ function registerCreateOrUpdateMetricFromQuery(server, client) {
           embedId
         );
         if (!dataAppName.ok) return toolError(dataAppName.error);
+        const tenantScope = await services.widgetService.ensureTenantDashboardScope({
+          embedId,
+          clientId: params.clientId,
+          dataAppName: dataAppName.value,
+          dashboardName: embed.value.resolvedFrom?.dashboardName || params.dashboardName || null
+        });
+        if (!tenantScope.ok) return toolError(tenantScope.error);
         const guestToken = await services.widgetService.mintGuestToken(
           params.clientId,
           dataAppName.value,
@@ -5702,6 +5984,7 @@ function registerCreateOrUpdateMetricFromQuery(server, client) {
             dataAppName: dataAppName.value,
             externalDashboardId: ctx.externalDashboardId,
             clientId: params.clientId,
+            tenantScoped: true,
             datasource: datasource.value
           },
           conflict: existing ? {
@@ -5762,26 +6045,97 @@ function registerCreateOrUpdateMetricFromQuery(server, client) {
   );
 }
 
+// src/tools/widgets/create-workspace-metric.ts
+import { z as z31 } from "zod";
+var modeSchema2 = z31.enum(["dry_run", "apply"]).default("dry_run");
+function registerCreateWorkspaceMetric(server, client) {
+  server.tool(
+    "create_workspace_metric",
+    "Create a workspace-level metric from validated SQL using the org service token. Scoped to the workspace, unpublished, and NOT attached to any dashboard. Defaults to dry-run; apply requires explicit confirmation.",
+    {
+      mode: modeSchema2.describe(
+        "dry_run validates the SQL only (no write); apply creates the metric after confirmation"
+      ),
+      confirm: z31.string().optional().describe(`Required for apply: ${APPLY_TO_PRODUCTION_CONFIRMATION}`),
+      workspaceName: z31.string().describe("Target workspace name"),
+      name: z31.string().describe("Metric display name"),
+      query: z31.string().describe("SQL query to validate and store"),
+      metricId: z31.string().optional().describe("Stable metric slug; generated from the name if omitted"),
+      description: z31.string().optional().describe("Metric description"),
+      datasourceId: z31.string().optional().describe("Datasource UUID override; defaults to the workspace datasource"),
+      isPublished: z31.boolean().optional().describe("Publish after apply. Defaults to false for safety")
+    },
+    WRITE_CREATE,
+    async (params) => {
+      try {
+        const mode = params.mode || "dry_run";
+        if (!params.name.trim()) return toolError("`name` cannot be empty.");
+        if (!params.query.trim()) return toolError("`query` cannot be empty.");
+        const isApply = mode === "apply";
+        if (isApply) {
+          const guardError = validateProductionApply({
+            workspaceName: params.workspaceName,
+            confirm: params.confirm
+          });
+          if (guardError) return toolError(guardError);
+        }
+        const body = {
+          workspaceName: params.workspaceName,
+          name: params.name,
+          query: params.query,
+          metricId: params.metricId,
+          description: params.description,
+          datasourceId: params.datasourceId,
+          isPublished: params.isPublished ?? false,
+          validateOnly: !isApply
+        };
+        const result = await client.request({
+          method: "POST",
+          // MCP-only control-plane route (not the public /api/v2 surface).
+          path: "/api/mcp/metrics/create",
+          auth: "service",
+          body
+        });
+        return toolSuccess(
+          JSON.stringify(
+            {
+              mode,
+              safety: productionSafetyNote(params.workspaceName),
+              result,
+              nextStep: isApply ? "Metric created unpublished and unattached. Publish/attach it to a dashboard as a separate step when ready." : 'Dry-run only \u2014 no metric written. Re-run with mode "apply" and confirm to create it.'
+            },
+            null,
+            2
+          )
+        );
+      } catch (err) {
+        if (err instanceof DatabrainApiError) return err.toToolResponse();
+        return toolError(`Unexpected error: ${err.message}`);
+      }
+    }
+  );
+}
+
 // src/tools/widgets/validate-metric-spec.ts
-import { z as z30 } from "zod";
+import { z as z32 } from "zod";
 function registerValidateMetricSpec(server, client) {
   const services = createServiceBundle(client);
   server.tool(
     "validate_metric_spec",
     "Validate a production metric spec from SQL without saving it. Resolves dashboard, data app, datasource, conflicts, and required fields.",
     {
-      clientId: z30.string().describe("Client/tenant identifier used to validate dashboard widget scope"),
-      workspaceName: z30.string().describe("Target production-backed workspace name"),
-      dashboardName: z30.string().optional().describe("Dashboard name to attach to"),
-      embedId: z30.string().optional().describe("Technical embed id alternative to dashboardName"),
-      dataAppName: z30.string().optional().describe("Optional data app override"),
-      name: z30.string().describe("Metric/widget display name"),
-      metricId: z30.string().describe("Stable metric slug to create or update"),
-      query: z30.string().describe("SQL query already validated against the warehouse"),
-      description: z30.string().optional().describe("Metric description"),
-      chartOptions: z30.record(z30.unknown()).optional().describe("Chart configuration JSON"),
-      companyIntegrationId: z30.string().optional().describe("Datasource UUID override"),
-      integrationName: z30.string().optional().describe("Datasource display name override")
+      clientId: z32.string().describe("Client/tenant identifier used to validate dashboard widget scope"),
+      workspaceName: z32.string().describe("Target production-backed workspace name"),
+      dashboardName: z32.string().optional().describe("Dashboard name to attach to"),
+      embedId: z32.string().optional().describe("Technical embed id alternative to dashboardName"),
+      dataAppName: z32.string().optional().describe("Optional data app override"),
+      name: z32.string().describe("Metric/widget display name"),
+      metricId: z32.string().describe("Stable metric slug to create or update"),
+      query: z32.string().describe("SQL query already validated against the warehouse"),
+      description: z32.string().optional().describe("Metric description"),
+      chartOptions: z32.record(z32.unknown()).optional().describe("Chart configuration JSON"),
+      companyIntegrationId: z32.string().optional().describe("Datasource UUID override"),
+      integrationName: z32.string().optional().describe("Datasource display name override")
     },
     READ_ONLY,
     async (params) => {
@@ -5808,6 +6162,13 @@ function registerValidateMetricSpec(server, client) {
           embedId
         );
         if (!dataAppName.ok) return toolError(dataAppName.error);
+        const tenantScope = await services.widgetService.ensureTenantDashboardScope({
+          embedId,
+          clientId: params.clientId,
+          dataAppName: dataAppName.value,
+          dashboardName: embed.value.resolvedFrom?.dashboardName || params.dashboardName || null
+        });
+        if (!tenantScope.ok) return toolError(tenantScope.error);
         const guestToken = await services.widgetService.mintGuestToken(
           params.clientId,
           dataAppName.value,
@@ -5833,6 +6194,7 @@ function registerValidateMetricSpec(server, client) {
                 embedId,
                 dataAppName: dataAppName.value,
                 externalDashboardId: ctx.externalDashboardId,
+                tenantScoped: true,
                 datasource
               },
               conflict: existing ? {
@@ -5864,20 +6226,20 @@ function registerValidateMetricSpec(server, client) {
 }
 
 // src/tools/reports/list-scheduled-reports.ts
-import { z as z31 } from "zod";
+import { z as z33 } from "zod";
 function registerListScheduledReports(server, client) {
   const services = createServiceBundle(client);
   server.tool(
     "list_scheduled_reports",
     "List configured scheduled reports for a specific client/dashboard embed. Shows schedule metadata, not delivery success history.",
     {
-      clientId: z31.string().describe("Client/tenant identifier. Required by the current backend API for non-empty results"),
-      dashboardName: z31.string().optional().describe("Dashboard name to inspect"),
-      workspaceName: z31.string().optional().describe("Workspace name if dashboardName is ambiguous"),
-      embedId: z31.string().optional().describe("Technical embed id alternative to dashboardName"),
-      userIdentifier: z31.string().optional().describe("Optional creator/user filter"),
-      pageNumber: z31.number().int().positive().optional().describe("Page number when pagination is enabled"),
-      isPagination: z31.boolean().optional().describe("Enable backend pagination")
+      clientId: z33.string().describe("Client/tenant identifier. Required by the current backend API for non-empty results"),
+      dashboardName: z33.string().optional().describe("Dashboard name to inspect"),
+      workspaceName: z33.string().optional().describe("Workspace name if dashboardName is ambiguous"),
+      embedId: z33.string().optional().describe("Technical embed id alternative to dashboardName"),
+      userIdentifier: z33.string().optional().describe("Optional creator/user filter"),
+      pageNumber: z33.number().int().positive().optional().describe("Page number when pagination is enabled"),
+      isPagination: z33.boolean().optional().describe("Enable backend pagination")
     },
     READ_ONLY,
     async (params) => {
@@ -5988,6 +6350,7 @@ function registerAllTools(server, client) {
   registerSyncDatasource(server, client);
   registerCreateDatamart(server, client);
   registerListDataApps(server, client);
+  registerListTenants(server, client);
   registerCreateDataApp(server, client);
   registerListApiTokens(server, client);
   registerCreateApiToken(server, client);
@@ -6009,6 +6372,7 @@ function registerAllTools(server, client) {
   registerListWidgets(server, client);
   registerValidateMetricSpec(server, client);
   registerCreateOrUpdateMetricFromQuery(server, client);
+  registerCreateWorkspaceMetric(server, client);
   registerAddWidget(server, client);
   registerUpdateWidget(server, client);
   registerRemoveWidget(server, client);
@@ -9277,7 +9641,7 @@ function createServer(config) {
     },
     {
       instructions: operatorBlurb + `Databrain uses two token types \u2014 never confuse them:
-\u2022 SERVICE TOKEN (DATABRAIN_SERVICE_TOKEN): org-level, pre-configured in MCP server config. Used for: list_datasources, discover_datasource_schema, sync_datasource, list_datamarts, create_datamart, list_workspaces, list_data_apps, create_data_app, list_api_tokens, create_api_token, rotate_api_token, list_dashboards (workspace scope), ask_question, get_semantic_layer, update_semantic_layer, start_semantic_layer_generation, get_semantic_layer_generation_status. ${serviceTokenStatus}
+\u2022 SERVICE TOKEN (DATABRAIN_SERVICE_TOKEN): org-level, pre-configured in MCP server config. Used for: list_datasources, discover_datasource_schema, sync_datasource, list_datamarts, create_datamart, list_workspaces, list_data_apps, list_tenants, create_data_app, list_api_tokens, create_api_token, rotate_api_token, list_dashboards (workspace scope), ask_question, get_semantic_layer, update_semantic_layer, start_semantic_layer_generation, get_semantic_layer_generation_status. ${serviceTokenStatus}
 \u2022 API TOKEN (per data app): scoped to one data app, used for embedding operations (list_embeds, get_embed_details, create_embed, update_embed, generate_guest_token), data-app scoped dashboard listing, widget CRUD/metric creation through guest-token APIs, and list_scheduled_reports. ${apiTokenStatus}
 
 4 core use cases \u2014 match the user's scenario to the right prompt:
@@ -9286,7 +9650,7 @@ function createServer(config) {
 3. Explore & query data \u2192 prompt: query-data (list_datamarts \u2192 get_semantic_layer \u2192 if empty, auto-generate descriptions with update_semantic_layer or use populate-semantic-layer prompt \u2192 ask_question)
 4. SQL-to-metric migration \u2192 prompt: sql-to-metric-migration (validate_metric_spec \u2192 create_or_update_metric_from_query dry_run \u2192 apply only with explicit production confirmation)
 
-Production safety: OAuth may not be available yet. In service-token mode, writes are actor=system. For create_datamart and create_or_update_metric_from_query, dry_run is the default. Apply requires confirm="APPLY_TO_PRODUCTION" after the user reviews the plan. Do not apply from a vague request.
+Production safety: OAuth may not be available yet. In service-token mode, writes are actor=system. For create_datamart and create_or_update_metric_from_query, dry_run is the default. Apply requires confirm="APPLY_TO_PRODUCTION" after the user reviews the plan. Widget validation and mutation tools must verify the resolved embed is tenant-scoped for the requested clientId; if not, they must refuse to touch it as a likely production/data-app dashboard. Do not apply from a vague request.
 
 Infrastructure creation is intentionally narrow in MCP: datasource and workspace creation still happen outside this workflow; sync_datasource and dry-run/apply create_datamart are available. The semantic layer is populated and maintained via MCP tools (get_semantic_layer, update_semantic_layer, start_semantic_layer_generation, get_semantic_layer_generation_status). When the semantic layer is empty, use these tools \u2014 do NOT send the user to the UI for semantic metadata.