@squadbase/vite-server 0.1.17-dev.24af54e → 0.1.17-dev.3b633bb

package/dist/cli/index.js

@@ -856,19 +856,34 @@ async function runSetupFlow(flow, params, ctx, config) {
   };
   let state = flow.initialState();
   let answerIdx = 0;
+  const pendingParameterUpdates = [];
   for (const step of flow.steps) {
     const ans = ctx.answers[answerIdx];
     if (ans && ans.questionSlug === step.slug) {
       state = step.applyAnswer(state, ans.answer);
+      if (step.toParameterUpdates) {
+        pendingParameterUpdates.push(...step.toParameterUpdates(state));
+      }
       answerIdx += 1;
       continue;
     }
+    const resolvedAllowFreeText = step.allowFreeText !== void 0 ? step.allowFreeText : true;
     if (step.type === "text") {
+      if (step.fetchOptions) {
+        const options2 = await step.fetchOptions(state, runtime);
+        if (options2.length === 0) {
+          continue;
+        }
+      }
       return {
         type: "nextQuestion",
         questionSlug: step.slug,
         question: step.question[ctx.language],
-        questionType: "text"
+        questionType: "text",
+        allowFreeText: resolvedAllowFreeText,
+        ...pendingParameterUpdates.length > 0 && {
+          parameterUpdates: pendingParameterUpdates
+        }
       };
     }
     const options = step.fetchOptions ? await step.fetchOptions(state, runtime) : [];
@@ -880,11 +895,21 @@ async function runSetupFlow(flow, params, ctx, config) {
       questionSlug: step.slug,
       question: step.question[ctx.language],
       questionType: step.type,
-      options
+      options,
+      allowFreeText: resolvedAllowFreeText,
+      ...pendingParameterUpdates.length > 0 && {
+        parameterUpdates: pendingParameterUpdates
+      }
     };
   }
   const dataInvestigationResult = await flow.finalize(state, runtime);
-  return { type: "fulfilled", dataInvestigationResult };
+  return {
+    type: "fulfilled",
+    dataInvestigationResult,
+    ...pendingParameterUpdates.length > 0 && {
+      parameterUpdates: pendingParameterUpdates
+    }
+  };
 }
 async function resolveSetupSelection(params) {
   const { selected, allSentinel, fetchAll, limit } = params;
@@ -1063,7 +1088,46 @@ var INTERNAL_SCHEMAS = /* @__PURE__ */ new Set([
   "READER_ACCOUNT_USAGE",
   "DATA_SHARING_USAGE"
 ]);
+var OBJECT_TYPE_LABELS = {
+  table: { ja: "\u30C6\u30FC\u30D6\u30EB", en: "Table" },
+  view: { ja: "\u30D3\u30E5\u30FC", en: "View" },
+  stream: { ja: "\u30B9\u30C8\u30EA\u30FC\u30E0", en: "Stream" },
+  dynamic_table: { ja: "\u30C0\u30A4\u30CA\u30DF\u30C3\u30AF\u30C6\u30FC\u30D6\u30EB", en: "Dynamic Table" },
+  pipe: { ja: "\u30D1\u30A4\u30D7", en: "Pipe" },
+  task: { ja: "\u30BF\u30B9\u30AF", en: "Task" }
+};
+var HEADING_LABELS = {
+  table: "Table",
+  view: "View",
+  stream: "Stream",
+  dynamic_table: "Dynamic Table",
+  pipe: "Pipe",
+  task: "Task"
+};
 function createSnowflakeSetupFlow(runQuery11) {
+  const objectTypes = /* @__PURE__ */ new Map();
+  async function fetchAllObjects(params, db, schema) {
+    objectTypes.clear();
+    const typeQueries = [
+      ["table", `SHOW TABLES IN SCHEMA "${db}"."${schema}"`],
+      ["view", `SHOW VIEWS IN SCHEMA "${db}"."${schema}"`],
+      ["stream", `SHOW STREAMS IN SCHEMA "${db}"."${schema}"`],
+      ["dynamic_table", `SHOW DYNAMIC TABLES IN SCHEMA "${db}"."${schema}"`],
+      ["pipe", `SHOW PIPES IN SCHEMA "${db}"."${schema}"`],
+      ["task", `SHOW TASKS IN SCHEMA "${db}"."${schema}"`]
+    ];
+    const results = await Promise.all(
+      typeQueries.map(([, sql]) => runQuery11(params, sql).catch(() => []))
+    );
+    for (let i = 0; i < results.length; i++) {
+      const type = typeQueries[i][0];
+      for (const r of results[i]) {
+        const name = String(r["name"] ?? "");
+        if (name) objectTypes.set(name, type);
+      }
+    }
+    return Array.from(objectTypes.keys());
+  }
   return {
     initialState: () => ({}),
     steps: [
@@ -1103,22 +1167,27 @@ function createSnowflakeSetupFlow(runQuery11) {
         slug: "tables",
         type: "multiSelect",
         question: {
-          ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
-          en: "Select target tables (multi-select allowed)"
+          ja: "\u5BFE\u8C61\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u7B49\u3001\u8907\u6570\u9078\u629E\u53EF\uFF09",
+          en: "Select target objects (tables, views, streams, etc. \u2014 multi-select allowed)"
         },
         async fetchOptions(state, rt) {
           if (!state.database || !state.schema) return [];
-          const rows = await runQuery11(
+          const allNames = await fetchAllObjects(
             rt.params,
-            `SHOW TABLES IN SCHEMA "${state.database}"."${state.schema}"`
+            state.database,
+            state.schema
           );
-          const tableOptions = rows.map((r) => String(r["name"] ?? "")).filter((name) => name).map((value) => ({ value }));
+          const options = allNames.map((name) => {
+            const type = objectTypes.get(name) ?? "table";
+            const typeLabel = OBJECT_TYPE_LABELS[type][rt.language];
+            return { value: name, label: `${name} (${typeLabel})` };
+          });
           return [
             {
               value: ALL_TABLES,
-              label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB" : "All tables"
+              label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8" : "All objects"
             },
-            ...tableOptions
+            ...options
           ];
         },
         applyAnswer: (state, answer) => ({ ...state, tables: answer })
@@ -1130,16 +1199,10 @@ function createSnowflakeSetupFlow(runQuery11) {
       }
       const db = state.database;
       const schema = state.schema;
-      const targetTables = await resolveSetupSelection({
+      const targetObjects = await resolveSetupSelection({
         selected: state.tables,
         allSentinel: ALL_TABLES,
-        fetchAll: async () => {
-          const rows = await runQuery11(
-            rt.params,
-            `SHOW TABLES IN SCHEMA "${db}"."${schema}"`
-          );
-          return rows.map((r) => String(r["name"] ?? "")).filter((name) => name);
-        },
+        fetchAll: () => fetchAllObjects(rt.params, db, schema),
         limit: SNOWFLAKE_SETUP_MAX_TABLES
       });
       const sections = [
@@ -1150,24 +1213,66 @@ function createSnowflakeSetupFlow(runQuery11) {
         `#### Schema: ${schema}`,
         ""
       ];
-      for (const table of targetTables) {
-        const cols = await runQuery11(
-          rt.params,
-          `DESCRIBE TABLE "${db}"."${schema}"."${table}"`
-        );
-        sections.push(`##### Table: ${table}`, "");
-        sections.push("| Column | Type | Nullable | Default |");
-        sections.push("|--------|------|----------|---------|");
-        for (const c of cols) {
-          const name = String(c["name"] ?? "");
-          const type = String(c["type"] ?? "");
-          const nullable = String(c["null?"] ?? "");
-          const defaultValue = c["default"] == null ? "-" : String(c["default"]);
-          sections.push(
-            `| ${name} | ${type} | ${nullable} | ${defaultValue} |`
-          );
+      for (const name of targetObjects) {
+        const type = objectTypes.get(name) ?? "table";
+        const heading = HEADING_LABELS[type];
+        switch (type) {
+          case "table":
+          case "view":
+          case "dynamic_table":
+          case "stream": {
+            const cols = await runQuery11(
+              rt.params,
+              `DESCRIBE TABLE "${db}"."${schema}"."${name}"`
+            ).catch(() => []);
+            sections.push(`##### ${heading}: ${name}`, "");
+            if (cols.length > 0) {
+              sections.push("| Column | Type | Nullable | Default |");
+              sections.push("|--------|------|----------|---------|");
+              for (const c of cols) {
+                const colName = String(c["name"] ?? "");
+                const colType = String(c["type"] ?? "");
+                const nullable = String(c["null?"] ?? "");
+                const defaultValue = c["default"] == null ? "-" : String(c["default"]);
+                sections.push(
+                  `| ${colName} | ${colType} | ${nullable} | ${defaultValue} |`
+                );
+              }
+            }
+            sections.push("");
+            break;
+          }
+          case "pipe": {
+            const rows = await runQuery11(
+              rt.params,
+              `SHOW PIPES LIKE '${name.replace(/'/g, "''")}' IN SCHEMA "${db}"."${schema}"`
+            ).catch(() => []);
+            sections.push(`##### Pipe: ${name}`, "");
+            if (rows.length > 0) {
+              const definition = String(rows[0]["definition"] ?? "-");
+              sections.push(`Definition: \`${definition}\``, "");
+            }
+            sections.push("");
+            break;
+          }
+          case "task": {
+            const rows = await runQuery11(
+              rt.params,
+              `SHOW TASKS LIKE '${name.replace(/'/g, "''")}' IN SCHEMA "${db}"."${schema}"`
+            ).catch(() => []);
+            sections.push(`##### Task: ${name}`, "");
+            if (rows.length > 0) {
+              const schedule = String(rows[0]["schedule"] ?? "-");
+              const taskState = String(rows[0]["state"] ?? "-");
+              const definition = String(rows[0]["definition"] ?? "-");
+              sections.push(`Schedule: ${schedule}`, "");
+              sections.push(`State: ${taskState}`, "");
+              sections.push(`Definition: \`${definition}\``, "");
+            }
+            sections.push("");
+            break;
+          }
         }
-        sections.push("");
       }
       return sections.join("\n");
     }
@@ -1980,8 +2085,8 @@ var postgresqlSetupFlow = {
       slug: "tables",
       type: "multiSelect",
       question: {
-        ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
-        en: "Select target tables (multi-select allowed)"
+        ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
+        en: "Select target tables and views (multi-select allowed)"
       },
       async fetchOptions(state, rt) {
         if (!state.schema) return [];
@@ -1990,7 +2095,7 @@ var postgresqlSetupFlow = {
         return [
           {
             value: ALL_TABLES2,
-            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB" : "All tables"
+            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC" : "All tables and views"
           },
           ...tableOptions
         ];
@@ -2327,8 +2432,8 @@ var mysqlSetupFlow = {
       slug: "tables",
       type: "multiSelect",
       question: {
-        ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
-        en: "Select target tables (multi-select allowed)"
+        ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
+        en: "Select target tables and views (multi-select allowed)"
       },
       async fetchOptions(state, rt) {
         if (!state.database) return [];
@@ -2337,7 +2442,7 @@ var mysqlSetupFlow = {
         return [
           {
             value: ALL_TABLES3,
-            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB" : "All tables"
+            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC" : "All tables and views"
           },
           ...tableOptions
         ];
@@ -2788,6 +2893,72 @@ var bigqueryOnboarding = new ConnectorOnboarding({
   }
 });
 
+// ../connectors/src/table-grouping.ts
+var SHARD_GROUP_PREFIX = "__SHARD__";
+var DEFAULT_MIN_SHARD_GROUP_SIZE = 3;
+function extractDateShardSuffix(name) {
+  const m = name.match(/^(.+)_(\d{8})$/);
+  if (!m) return null;
+  const [, prefix, suffix] = m;
+  const y = +suffix.slice(0, 4);
+  const mo = +suffix.slice(4, 6);
+  const d = +suffix.slice(6, 8);
+  if (y < 2e3 || y > 2099 || mo < 1 || mo > 12 || d < 1 || d > 31) {
+    return null;
+  }
+  return { prefix, suffix };
+}
+function detectDateShardCandidates(tableNames, minCount = DEFAULT_MIN_SHARD_GROUP_SIZE) {
+  const prefixMap = /* @__PURE__ */ new Map();
+  const nonSharded = [];
+  for (const name of tableNames) {
+    const parsed = extractDateShardSuffix(name);
+    if (parsed) {
+      const existing = prefixMap.get(parsed.prefix);
+      if (existing) {
+        existing.push(name);
+      } else {
+        prefixMap.set(parsed.prefix, [name]);
+      }
+    } else {
+      nonSharded.push(name);
+    }
+  }
+  const candidates = [];
+  const singles = [...nonSharded];
+  for (const [prefix, members] of prefixMap) {
+    if (members.length >= minCount) {
+      candidates.push({ prefix, count: members.length, members });
+    } else {
+      singles.push(...members);
+    }
+  }
+  return { singles, candidates };
+}
+function schemasMatch(columnsA, columnsB) {
+  if (columnsA.length !== columnsB.length) return false;
+  return columnsA.every(
+    (a, i) => String(a["column_name"] ?? "") === String(columnsB[i]["column_name"] ?? "") && String(a["data_type"] ?? "") === String(columnsB[i]["data_type"] ?? "")
+  );
+}
+function isShardGroupValue(value) {
+  return value.startsWith(SHARD_GROUP_PREFIX);
+}
+function getShardGroupPrefix(value) {
+  return value.slice(SHARD_GROUP_PREFIX.length);
+}
+function shardGroupValue(prefix) {
+  return `${SHARD_GROUP_PREFIX}${prefix}`;
+}
+function buildGroupedTableOptions(singles, confirmedGroups, language) {
+  const groupOptions = confirmedGroups.sort((a, b) => a.prefix.localeCompare(b.prefix)).map((g) => ({
+    value: shardGroupValue(g.prefix),
+    label: language === "ja" ? `${g.prefix}_* (\u65E5\u4ED8\u30B7\u30E3\u30FC\u30C9: ${g.count} \u30C6\u30FC\u30D6\u30EB)` : `${g.prefix}_* (date-sharded: ${g.count} tables)`
+  }));
+  const singleOptions = singles.sort().map((name) => ({ value: name }));
+  return [...groupOptions, ...singleOptions];
+}
+
 // ../connectors/src/connectors/bigquery/utils.ts
 async function runQuery5(params, sql) {
   const { BigQuery } = await import("@google-cloud/bigquery");
@@ -2818,13 +2989,23 @@ async function listProjects(params) {
     scopes: ["https://www.googleapis.com/auth/bigquery"]
   });
   const client = await auth.getClient();
-  const res = await client.request({
-    url: "https://bigquery.googleapis.com/bigquery/v2/projects"
-  });
-  return (res.data.projects ?? []).map((p) => ({
-    projectId: p.projectReference?.projectId ?? "",
-    friendlyName: p.friendlyName ?? p.projectReference?.projectId ?? ""
-  })).filter((p) => p.projectId !== "");
+  const projects = [];
+  let pageToken;
+  do {
+    const url = pageToken ? `https://bigquery.googleapis.com/bigquery/v2/projects?pageToken=${encodeURIComponent(pageToken)}` : "https://bigquery.googleapis.com/bigquery/v2/projects";
+    const res = await client.request({ url });
+    for (const p of res.data.projects ?? []) {
+      const id = p.projectReference?.projectId ?? "";
+      if (id) {
+        projects.push({
+          projectId: id,
+          friendlyName: p.friendlyName ?? id
+        });
+      }
+    }
+    pageToken = res.data.nextPageToken;
+  } while (pageToken);
+  return projects;
 }
 async function listDatasets(params, projectId2) {
   const { BigQuery } = await import("@google-cloud/bigquery");
@@ -2862,23 +3043,25 @@ var PUBLIC_DATASETS = [
     labelEn: "bigquery-public-data.austin_311 (public dataset / customer service requests)"
   }
 ];
+var SAME_AS_BILLING = "__SAME_AS_BILLING__";
 function resolveDatasetRef(state) {
   const dataset = state.dataset ?? "";
   if (dataset.includes(".")) {
     const [datasetProject, ...rest] = dataset.split(".");
     return { datasetProject, datasetId: rest.join(".") };
   }
-  return { datasetProject: state.project ?? "", datasetId: dataset };
+  return { datasetProject: state.databaseProject ?? "", datasetId: dataset };
 }
 var bigquerySetupFlow = {
   initialState: () => ({}),
   steps: [
     {
-      slug: "project",
+      slug: "billingProject",
       type: "select",
+      allowFreeText: false,
       question: {
-        ja: "\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u306B\u4F7F\u3046 GCP \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u30D1\u30D6\u30EA\u30C3\u30AF\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u3092\u4F7F\u3046\u5834\u5408\u3082\u8AB2\u91D1\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3068\u3057\u3066\u5FC5\u8981\u3067\u3059\uFF09",
-        en: "Select the GCP project to use for setup (also required as the billing project when querying public datasets)"
+        ja: "BigQuery \u3092\u5B9F\u884C\u3059\u308B Google Cloud \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08BigQuery \u306E\u8AB2\u91D1\u306B\u7D10\u3065\u304F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3067\u3059\uFF09",
+        en: "Select the Google Cloud project to run BigQuery queries (this project will be billed for BigQuery usage)"
       },
       async fetchOptions(_state, rt) {
         const projects = await listProjects(rt.params);
@@ -2887,7 +3070,40 @@ var bigquerySetupFlow = {
           label: p.friendlyName && p.friendlyName !== p.projectId ? `${p.friendlyName} (${p.projectId})` : p.projectId
         }));
       },
-      applyAnswer: (state, answer) => ({ ...state, project: answer[0] })
+      applyAnswer: (state, answer) => ({
+        ...state,
+        billingProject: answer[0]
+      }),
+      toParameterUpdates: (state) => state.billingProject ? [{ slug: "project-id", value: state.billingProject }] : []
+    },
+    {
+      slug: "databaseProject",
+      type: "select",
+      question: {
+        ja: "\u30C7\u30FC\u30BF\u304C\u683C\u7D0D\u3055\u308C\u3066\u3044\u308B GCP \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044",
+        en: "Select the GCP project where your data resides"
+      },
+      async fetchOptions(state, rt) {
+        if (!state.billingProject) return [];
+        const sameAsBillingOption = {
+          value: SAME_AS_BILLING,
+          label: rt.language === "ja" ? `\u8AB2\u91D1\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3068\u540C\u3058 (${state.billingProject})` : `Same as billing project (${state.billingProject})`
+        };
+        const projects = await listProjects(rt.params);
+        const projectOptions = projects.filter((p) => p.projectId !== state.billingProject).map((p) => ({
+          value: p.projectId,
+          label: p.friendlyName && p.friendlyName !== p.projectId ? `${p.friendlyName} (${p.projectId})` : p.projectId
+        }));
+        const publicProjectOption = {
+          value: "bigquery-public-data",
+          label: rt.language === "ja" ? "bigquery-public-data (Google \u30D1\u30D6\u30EA\u30C3\u30AF\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8)" : "bigquery-public-data (Google public datasets)"
+        };
+        return [sameAsBillingOption, ...projectOptions, publicProjectOption];
+      },
+      applyAnswer: (state, answer) => ({
+        ...state,
+        databaseProject: answer[0] === SAME_AS_BILLING ? state.billingProject : answer[0]
+      })
     },
     {
       slug: "dataset",
@@ -2897,8 +3113,8 @@ var bigquerySetupFlow = {
         en: "Select the dataset to use for setup"
       },
       async fetchOptions(state, rt) {
-        if (!state.project) return [];
-        const datasets = await listDatasets(rt.params, state.project);
+        if (!state.databaseProject) return [];
+        const datasets = await listDatasets(rt.params, state.databaseProject);
         const projectDatasetOptions = datasets.map((d) => ({
           value: d.datasetId,
           label: d.location ? `${d.datasetId} (${d.location})` : d.datasetId
@@ -2915,66 +3131,140 @@ var bigquerySetupFlow = {
       slug: "tables",
       type: "multiSelect",
       question: {
-        ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
-        en: "Select target tables (multi-select allowed)"
+        ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
+        en: "Select target tables and views (multi-select allowed)"
       },
       async fetchOptions(state, rt) {
-        if (!state.project || !state.dataset) return [];
+        if (!state.billingProject || !state.dataset) return [];
         const { datasetProject, datasetId } = resolveDatasetRef(state);
         const rows = await runQuery5(
           rt.params,
           `SELECT table_name FROM \`${datasetProject}.${datasetId}\`.INFORMATION_SCHEMA.TABLES`
         );
-        const tableOptions = rows.map((r) => String(r["table_name"] ?? "")).filter((name) => name).map((value) => ({ value }));
+        const tableNames = rows.map((r) => String(r["table_name"] ?? "")).filter((name) => name);
+        const { singles, candidates } = detectDateShardCandidates(tableNames);
+        const confirmedGroups = [];
+        const rejectedSingles = [];
+        for (const candidate of candidates) {
+          const [first, second] = candidate.members;
+          const colRows = await runQuery5(
+            rt.params,
+            `SELECT table_name, column_name, data_type FROM \`${datasetProject}.${datasetId}\`.INFORMATION_SCHEMA.COLUMNS WHERE table_name IN ('${first.replaceAll("'", "''")}', '${second.replaceAll("'", "''")}') ORDER BY table_name, ordinal_position`
+          );
+          const colsA = colRows.filter(
+            (r) => String(r["table_name"]) === first
+          );
+          const colsB = colRows.filter(
+            (r) => String(r["table_name"]) === second
+          );
+          if (schemasMatch(colsA, colsB)) {
+            confirmedGroups.push(candidate);
+          } else {
+            rejectedSingles.push(...candidate.members);
+          }
+        }
+        const allSingles = [...singles, ...rejectedSingles];
         return [
           {
             value: ALL_TABLES4,
-            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB" : "All tables"
+            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC" : "All tables and views"
           },
-          ...tableOptions
+          ...buildGroupedTableOptions(allSingles, confirmedGroups, rt.language)
         ];
       },
       applyAnswer: (state, answer) => ({ ...state, tables: answer })
     }
   ],
   async finalize(state, rt) {
-    if (!state.project || !state.dataset || !state.tables) {
+    if (!state.billingProject || !state.databaseProject || !state.dataset || !state.tables) {
       throw new Error("BigQuery setup: incomplete state on finalize");
     }
     const { datasetProject, datasetId } = resolveDatasetRef(state);
-    const targetTables = await resolveSetupSelection({
-      selected: state.tables,
-      allSentinel: ALL_TABLES4,
-      fetchAll: async () => {
-        const rows = await runQuery5(
-          rt.params,
-          `SELECT table_name FROM \`${datasetProject}.${datasetId}\`.INFORMATION_SCHEMA.TABLES`
-        );
-        return rows.map((r) => String(r["table_name"] ?? "")).filter((name) => name);
-      },
-      limit: BIGQUERY_SETUP_MAX_TABLES
-    });
+    const fetchAllTableNames = async () => {
+      const rows = await runQuery5(
+        rt.params,
+        `SELECT table_name FROM \`${datasetProject}.${datasetId}\`.INFORMATION_SCHEMA.TABLES`
+      );
+      return rows.map((r) => String(r["table_name"] ?? "")).filter((name) => name);
+    };
+    let entries;
+    if (state.tables.includes(ALL_TABLES4)) {
+      const allNames = await fetchAllTableNames();
+      const { singles, candidates } = detectDateShardCandidates(allNames);
+      entries = [
+        ...candidates.map(
+          (g) => ({
+            type: "shardGroup",
+            prefix: g.prefix,
+            count: g.count,
+            representative: g.members[0]
+          })
+        ),
+        ...singles.map((name) => ({ type: "table", name }))
+      ];
+    } else {
+      const shardSelections = state.tables.filter(isShardGroupValue);
+      const tableSelections = state.tables.filter(
+        (v) => !isShardGroupValue(v)
+      );
+      entries = tableSelections.map(
+        (name) => ({ type: "table", name })
+      );
+      if (shardSelections.length > 0) {
+        const allNames = await fetchAllTableNames();
+        for (const value of shardSelections) {
+          const prefix = getShardGroupPrefix(value);
+          const members = allNames.filter((n) => {
+            const parsed = extractDateShardSuffix(n);
+            return parsed != null && parsed.prefix === prefix;
+          });
+          if (members.length > 0) {
+            entries.push({
+              type: "shardGroup",
+              prefix,
+              count: members.length,
+              representative: members[0]
+            });
+          }
+        }
+      }
+    }
+    entries = entries.slice(0, BIGQUERY_SETUP_MAX_TABLES);
+    const queryColumns = async (tableName) => runQuery5(
+      rt.params,
+      `SELECT column_name, data_type, is_nullable FROM \`${datasetProject}.${datasetId}\`.INFORMATION_SCHEMA.COLUMNS WHERE table_name = '${tableName.replaceAll("'", "''")}' ORDER BY ordinal_position`
+    );
     const sections = [
       "## BigQuery",
       "",
-      `### Billing project: ${state.project}`,
+      `### Billing project: ${state.billingProject}`,
+      "",
+      `### Database project: ${state.databaseProject}`,
       "",
       `#### Dataset: ${datasetProject}.${datasetId}`,
       ""
     ];
-    for (const table of targetTables) {
-      const cols = await runQuery5(
-        rt.params,
-        `SELECT column_name, data_type, is_nullable FROM \`${datasetProject}.${datasetId}\`.INFORMATION_SCHEMA.COLUMNS WHERE table_name = '${table.replaceAll("'", "''")}' ORDER BY ordinal_position`
-      );
-      sections.push(`##### Table: ${table}`, "");
+    for (const entry of entries) {
+      const tableName = entry.type === "shardGroup" ? entry.representative : entry.name;
+      const cols = await queryColumns(tableName);
+      if (entry.type === "shardGroup") {
+        sections.push(
+          `##### Table: ${entry.prefix}_* (date-sharded, ${entry.count} tables)`,
+          ""
+        );
+        sections.push(
+          `_Query all shards: \`SELECT * FROM \`${datasetProject}.${datasetId}.${entry.prefix}_*\` WHERE _TABLE_SUFFIX BETWEEN 'YYYYMMDD' AND 'YYYYMMDD'\`_`,
+          ""
+        );
+      } else {
+        sections.push(`##### Table: ${entry.name}`, "");
+      }
       sections.push("| Column | Type | Nullable |");
       sections.push("|--------|------|----------|");
       for (const c of cols) {
-        const name = String(c["column_name"] ?? "");
-        const type = String(c["data_type"] ?? "");
-        const nullable = String(c["is_nullable"] ?? "");
-        sections.push(`| ${name} | ${type} | ${nullable} |`);
+        sections.push(
+          `| ${String(c["column_name"] ?? "")} | ${String(c["data_type"] ?? "")} | ${String(c["is_nullable"] ?? "")} |`
+        );
       }
       sections.push("");
     }
@@ -3472,21 +3762,30 @@ async function runQuery6(proxyFetch, projectId2, sql) {
   return parseQueryResponse(data);
 }
 async function listProjects2(proxyFetch) {
-  const res = await proxyFetch(
-    "https://bigquery.googleapis.com/bigquery/v2/projects",
-    { method: "GET" }
-  );
-  if (!res.ok) {
-    const errorText = await res.text().catch(() => res.statusText);
-    throw new Error(
-      `BigQuery listProjects failed: HTTP ${res.status} ${errorText}`
-    );
-  }
-  const data = await res.json();
-  return (data.projects ?? []).map((p) => ({
-    projectId: p.projectReference?.projectId ?? "",
-    friendlyName: p.friendlyName ?? p.projectReference?.projectId ?? ""
-  })).filter((p) => p.projectId !== "");
+  const projects = [];
+  let pageToken;
+  do {
+    const url = pageToken ? `https://bigquery.googleapis.com/bigquery/v2/projects?pageToken=${encodeURIComponent(pageToken)}` : "https://bigquery.googleapis.com/bigquery/v2/projects";
+    const res = await proxyFetch(url, { method: "GET" });
+    if (!res.ok) {
+      const errorText = await res.text().catch(() => res.statusText);
+      throw new Error(
+        `BigQuery listProjects failed: HTTP ${res.status} ${errorText}`
+      );
+    }
+    const data = await res.json();
+    for (const p of data.projects ?? []) {
+      const id = p.projectReference?.projectId ?? "";
+      if (id) {
+        projects.push({
+          projectId: id,
+          friendlyName: p.friendlyName ?? id
+        });
+      }
+    }
+    pageToken = data.nextPageToken;
+  } while (pageToken);
+  return projects;
 }
 async function listDatasets2(proxyFetch, projectId2) {
   const res = await proxyFetch(
@@ -3526,23 +3825,25 @@ var PUBLIC_DATASETS2 = [
     labelEn: "bigquery-public-data.austin_311 (public dataset / customer service requests)"
   }
 ];
+var SAME_AS_BILLING2 = "__SAME_AS_BILLING__";
 function resolveDatasetRef2(state) {
   const dataset = state.dataset ?? "";
   if (dataset.includes(".")) {
     const [datasetProject, ...rest] = dataset.split(".");
     return { datasetProject, datasetId: rest.join(".") };
   }
-  return { datasetProject: state.project ?? "", datasetId: dataset };
+  return { datasetProject: state.databaseProject ?? "", datasetId: dataset };
 }
 var bigqueryOauthSetupFlow = {
   initialState: () => ({}),
   steps: [
     {
-      slug: "project",
+      slug: "billingProject",
       type: "select",
+      allowFreeText: false,
       question: {
-        ja: "\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u306B\u4F7F\u3046 GCP \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u30D1\u30D6\u30EA\u30C3\u30AF\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u3092\u4F7F\u3046\u5834\u5408\u3082\u8AB2\u91D1\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3068\u3057\u3066\u5FC5\u8981\u3067\u3059\uFF09",
-        en: "Select the GCP project to use for setup (also required as the billing project when querying public datasets)"
+        ja: "BigQuery \u3092\u5B9F\u884C\u3059\u308B Google Cloud \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08BigQuery \u306E\u8AB2\u91D1\u306B\u7D10\u3065\u304F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3067\u3059\uFF09",
+        en: "Select the Google Cloud project to run BigQuery queries (this project will be billed for BigQuery usage)"
       },
       async fetchOptions(_state, rt) {
         const projects = await listProjects2(rt.config.proxyFetch);
@@ -3551,7 +3852,40 @@ var bigqueryOauthSetupFlow = {
           label: p.friendlyName && p.friendlyName !== p.projectId ? `${p.friendlyName} (${p.projectId})` : p.projectId
         }));
       },
-      applyAnswer: (state, answer) => ({ ...state, project: answer[0] })
+      applyAnswer: (state, answer) => ({
+        ...state,
+        billingProject: answer[0]
+      }),
+      toParameterUpdates: (state) => state.billingProject ? [{ slug: "project-id", value: state.billingProject }] : []
+    },
+    {
+      slug: "databaseProject",
+      type: "select",
+      question: {
+        ja: "\u30C7\u30FC\u30BF\u304C\u683C\u7D0D\u3055\u308C\u3066\u3044\u308B GCP \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044",
+        en: "Select the GCP project where your data resides"
+      },
+      async fetchOptions(state, rt) {
+        if (!state.billingProject) return [];
+        const sameAsBillingOption = {
+          value: SAME_AS_BILLING2,
+          label: rt.language === "ja" ? `\u8AB2\u91D1\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3068\u540C\u3058 (${state.billingProject})` : `Same as billing project (${state.billingProject})`
+        };
+        const projects = await listProjects2(rt.config.proxyFetch);
+        const projectOptions = projects.filter((p) => p.projectId !== state.billingProject).map((p) => ({
+          value: p.projectId,
+          label: p.friendlyName && p.friendlyName !== p.projectId ? `${p.friendlyName} (${p.projectId})` : p.projectId
+        }));
+        const publicProjectOption = {
+          value: "bigquery-public-data",
+          label: rt.language === "ja" ? "bigquery-public-data (Google \u30D1\u30D6\u30EA\u30C3\u30AF\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8)" : "bigquery-public-data (Google public datasets)"
+        };
+        return [sameAsBillingOption, ...projectOptions, publicProjectOption];
+      },
+      applyAnswer: (state, answer) => ({
+        ...state,
+        databaseProject: answer[0] === SAME_AS_BILLING2 ? state.billingProject : answer[0]
+      })
     },
     {
       slug: "dataset",
@@ -3561,8 +3895,11 @@ var bigqueryOauthSetupFlow = {
         en: "Select the dataset to use for setup"
       },
       async fetchOptions(state, rt) {
-        if (!state.project) return [];
-        const datasets = await listDatasets2(rt.config.proxyFetch, state.project);
+        if (!state.databaseProject) return [];
+        const datasets = await listDatasets2(
+          rt.config.proxyFetch,
+          state.databaseProject
+        );
         const projectDatasetOptions = datasets.map((d) => ({
           value: d.datasetId,
           label: d.location ? `${d.datasetId} (${d.location})` : d.datasetId
@@ -3579,70 +3916,145 @@ var bigqueryOauthSetupFlow = {
       slug: "tables",
       type: "multiSelect",
       question: {
-        ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
-        en: "Select target tables (multi-select allowed)"
+        ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
+        en: "Select target tables and views (multi-select allowed)"
       },
       async fetchOptions(state, rt) {
-        if (!state.project || !state.dataset) return [];
+        if (!state.billingProject || !state.dataset) return [];
         const { datasetProject, datasetId } = resolveDatasetRef2(state);
         const rows = await runQuery6(
           rt.config.proxyFetch,
-          state.project,
+          state.billingProject,
           `SELECT table_name FROM \`${datasetProject}.${datasetId}\`.INFORMATION_SCHEMA.TABLES`
         );
-        const tableOptions = rows.map((r) => String(r["table_name"] ?? "")).filter((name) => name).map((value) => ({ value }));
+        const tableNames = rows.map((r) => String(r["table_name"] ?? "")).filter((name) => name);
+        const { singles, candidates } = detectDateShardCandidates(tableNames);
+        const confirmedGroups = [];
+        const rejectedSingles = [];
+        for (const candidate of candidates) {
+          const [first, second] = candidate.members;
+          const colRows = await runQuery6(
+            rt.config.proxyFetch,
+            state.billingProject,
+            `SELECT table_name, column_name, data_type FROM \`${datasetProject}.${datasetId}\`.INFORMATION_SCHEMA.COLUMNS WHERE table_name IN ('${first.replaceAll("'", "''")}', '${second.replaceAll("'", "''")}') ORDER BY table_name, ordinal_position`
+          );
+          const colsA = colRows.filter(
+            (r) => String(r["table_name"]) === first
+          );
+          const colsB = colRows.filter(
+            (r) => String(r["table_name"]) === second
+          );
+          if (schemasMatch(colsA, colsB)) {
+            confirmedGroups.push(candidate);
+          } else {
+            rejectedSingles.push(...candidate.members);
+          }
+        }
+        const allSingles = [...singles, ...rejectedSingles];
         return [
           {
             value: ALL_TABLES5,
-            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB" : "All tables"
+            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC" : "All tables and views"
           },
-          ...tableOptions
+          ...buildGroupedTableOptions(allSingles, confirmedGroups, rt.language)
         ];
       },
       applyAnswer: (state, answer) => ({ ...state, tables: answer })
     }
   ],
   async finalize(state, rt) {
-    if (!state.project || !state.dataset || !state.tables) {
+    if (!state.billingProject || !state.databaseProject || !state.dataset || !state.tables) {
       throw new Error("BigQuery OAuth setup: incomplete state on finalize");
     }
-    const billingProject = state.project;
+    const billingProject = state.billingProject;
     const { datasetProject, datasetId } = resolveDatasetRef2(state);
-    const targetTables = await resolveSetupSelection({
-      selected: state.tables,
-      allSentinel: ALL_TABLES5,
-      fetchAll: async () => {
-        const rows = await runQuery6(
-          rt.config.proxyFetch,
-          billingProject,
-          `SELECT table_name FROM \`${datasetProject}.${datasetId}\`.INFORMATION_SCHEMA.TABLES`
-        );
-        return rows.map((r) => String(r["table_name"] ?? "")).filter((name) => name);
-      },
-      limit: BIGQUERY_OAUTH_SETUP_MAX_TABLES
-    });
+    const fetchAllTableNames = async () => {
+      const rows = await runQuery6(
+        rt.config.proxyFetch,
+        billingProject,
+        `SELECT table_name FROM \`${datasetProject}.${datasetId}\`.INFORMATION_SCHEMA.TABLES`
+      );
+      return rows.map((r) => String(r["table_name"] ?? "")).filter((name) => name);
+    };
+    let entries;
+    if (state.tables.includes(ALL_TABLES5)) {
+      const allNames = await fetchAllTableNames();
+      const { singles, candidates } = detectDateShardCandidates(allNames);
+      entries = [
+        ...candidates.map(
+          (g) => ({
+            type: "shardGroup",
+            prefix: g.prefix,
+            count: g.count,
+            representative: g.members[0]
+          })
+        ),
+        ...singles.map((name) => ({ type: "table", name }))
+      ];
+    } else {
+      const shardSelections = state.tables.filter(isShardGroupValue);
+      const tableSelections = state.tables.filter(
+        (v) => !isShardGroupValue(v)
+      );
+      entries = tableSelections.map(
+        (name) => ({ type: "table", name })
+      );
+      if (shardSelections.length > 0) {
+        const allNames = await fetchAllTableNames();
+        for (const value of shardSelections) {
+          const prefix = getShardGroupPrefix(value);
+          const members = allNames.filter((n) => {
+            const parsed = extractDateShardSuffix(n);
+            return parsed != null && parsed.prefix === prefix;
+          });
+          if (members.length > 0) {
+            entries.push({
+              type: "shardGroup",
+              prefix,
+              count: members.length,
+              representative: members[0]
+            });
+          }
+        }
+      }
+    }
+    entries = entries.slice(0, BIGQUERY_OAUTH_SETUP_MAX_TABLES);
+    const queryColumns = async (tableName) => runQuery6(
+      rt.config.proxyFetch,
+      billingProject,
+      `SELECT column_name, data_type, is_nullable FROM \`${datasetProject}.${datasetId}\`.INFORMATION_SCHEMA.COLUMNS WHERE table_name = '${tableName.replaceAll("'", "''")}' ORDER BY ordinal_position`
+    );
     const sections = [
       "## BigQuery (OAuth)",
       "",
       `### Billing project: ${billingProject}`,
       "",
+      `### Database project: ${state.databaseProject}`,
+      "",
       `#### Dataset: ${datasetProject}.${datasetId}`,
       ""
     ];
-    for (const table of targetTables) {
-      const cols = await runQuery6(
-        rt.config.proxyFetch,
-        billingProject,
-        `SELECT column_name, data_type, is_nullable FROM \`${datasetProject}.${datasetId}\`.INFORMATION_SCHEMA.COLUMNS WHERE table_name = '${table.replaceAll("'", "''")}' ORDER BY ordinal_position`
-      );
-      sections.push(`##### Table: ${table}`, "");
+    for (const entry of entries) {
+      const tableName = entry.type === "shardGroup" ? entry.representative : entry.name;
+      const cols = await queryColumns(tableName);
+      if (entry.type === "shardGroup") {
+        sections.push(
+          `##### Table: ${entry.prefix}_* (date-sharded, ${entry.count} tables)`,
+          ""
+        );
+        sections.push(
+          `_Query all shards: \`SELECT * FROM \`${datasetProject}.${datasetId}.${entry.prefix}_*\` WHERE _TABLE_SUFFIX BETWEEN 'YYYYMMDD' AND 'YYYYMMDD'\`_`,
+          ""
+        );
+      } else {
+        sections.push(`##### Table: ${entry.name}`, "");
+      }
       sections.push("| Column | Type | Nullable |");
       sections.push("|--------|------|----------|");
       for (const c of cols) {
-        const name = String(c["column_name"] ?? "");
-        const type = String(c["data_type"] ?? "");
-        const nullable = String(c["is_nullable"] ?? "");
-        sections.push(`| ${name} | ${type} | ${nullable} |`);
+        sections.push(
+          `| ${String(c["column_name"] ?? "")} | ${String(c["data_type"] ?? "")} | ${String(c["is_nullable"] ?? "")} |`
+        );
       }
       sections.push("");
     }
@@ -5351,14 +5763,15 @@ function isInternalSchema2(name) {
 function quoteLiteral(value) {
   return "'" + value.replace(/'/g, "''") + "'";
 }
-async function fetchTableNames3(params, schema) {
+async function fetchTableAndViewNames(params, schema) {
   const rows = await runQuery7(
     params,
-    `SELECT tablename FROM pg_tables
-     WHERE schemaname = ${quoteLiteral(schema)}
-     ORDER BY tablename`
+    `SELECT table_name FROM information_schema.tables
+     WHERE table_schema = ${quoteLiteral(schema)}
+       AND table_type IN ('BASE TABLE', 'VIEW')
+     ORDER BY table_name`
   );
-  return rows.map((r) => String(r["tablename"] ?? "")).filter((name) => name);
+  return rows.map((r) => String(r["table_name"] ?? "")).filter((name) => name);
 }
 var redshiftSetupFlow = {
   initialState: () => ({}),
@@ -5373,9 +5786,11 @@ var redshiftSetupFlow = {
       async fetchOptions(_state, rt) {
         const rows = await runQuery7(
           rt.params,
-          `SELECT DISTINCT schemaname FROM pg_tables ORDER BY schemaname`
+          `SELECT DISTINCT table_schema FROM information_schema.tables
+           WHERE table_type IN ('BASE TABLE', 'VIEW')
+           ORDER BY table_schema`
         );
-        return rows.map((r) => String(r["schemaname"] ?? "")).filter((name) => name && !isInternalSchema2(name)).map((value) => ({ value }));
+        return rows.map((r) => String(r["table_schema"] ?? "")).filter((name) => name && !isInternalSchema2(name)).map((value) => ({ value }));
       },
       applyAnswer: (state, answer) => ({ ...state, schema: answer[0] })
     },
@@ -5383,17 +5798,17 @@ var redshiftSetupFlow = {
       slug: "tables",
       type: "multiSelect",
       question: {
-        ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
-        en: "Select target tables (multi-select allowed)"
+        ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
+        en: "Select target tables and views (multi-select allowed)"
       },
       async fetchOptions(state, rt) {
         if (!state.schema) return [];
-        const names = await fetchTableNames3(rt.params, state.schema);
+        const names = await fetchTableAndViewNames(rt.params, state.schema);
         const tableOptions = names.map((value) => ({ value }));
         return [
           {
             value: ALL_TABLES7,
-            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB" : "All tables"
+            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC" : "All tables and views"
           },
           ...tableOptions
         ];
@@ -5409,9 +5824,21 @@ var redshiftSetupFlow = {
     const targetTables = await resolveSetupSelection({
       selected: state.tables,
       allSentinel: ALL_TABLES7,
-      fetchAll: () => fetchTableNames3(rt.params, schema),
+      fetchAll: () => fetchTableAndViewNames(rt.params, schema),
       limit: REDSHIFT_SETUP_MAX_TABLES
     });
+    const typeRows = targetTables.length > 0 ? await runQuery7(
+      rt.params,
+      `SELECT table_name, table_type FROM information_schema.tables
+           WHERE table_schema = ${quoteLiteral(schema)}
+             AND table_name IN (${targetTables.map(quoteLiteral).join(", ")})`
+    ) : [];
+    const typeMap = new Map(
+      typeRows.map((r) => [
+        String(r["table_name"] ?? ""),
+        String(r["table_type"] ?? "BASE TABLE")
+      ])
+    );
     const sections = [
       "## Redshift",
       "",
@@ -5419,6 +5846,7 @@ var redshiftSetupFlow = {
       ""
     ];
     for (const table of targetTables) {
+      const heading = typeMap.get(table) === "VIEW" ? "View" : "Table";
       const cols = await runQuery7(
         rt.params,
         `SELECT column_name, data_type, is_nullable, column_default
@@ -5427,7 +5855,7 @@ var redshiftSetupFlow = {
            AND table_name = ${quoteLiteral(table)}
          ORDER BY ordinal_position`
       );
-      sections.push(`#### Table: ${table}`, "");
+      sections.push(`#### ${heading}: ${table}`, "");
       sections.push("| Column | Type | Nullable | Default |");
       sections.push("|--------|------|----------|---------|");
       for (const c of cols) {
@@ -5855,8 +6283,8 @@ var databricksSetupFlow = {
       slug: "tables",
       type: "multiSelect",
       question: {
-        ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
-        en: "Select target tables (multi-select allowed)"
+        ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
+        en: "Select target tables and views (multi-select allowed)"
       },
       async fetchOptions(state, rt) {
         if (!state.catalog || !state.schema) return [];
@@ -5868,7 +6296,7 @@ var databricksSetupFlow = {
         return [
           {
             value: ALL_TABLES8,
-            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB" : "All tables"
+            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC" : "All tables and views"
           },
           ...tableOptions
         ];
@@ -7244,15 +7672,6 @@ var parameters13 = {
     type: "base64EncodedJson",
     secret: true,
     required: true
-  }),
-  propertyId: new ParameterDefinition({
-    slug: "property-id",
-    name: "Google Analytics Property ID",
-    description: "The Google Analytics 4 property ID (e.g., 123456789).",
-    envVarBaseKey: "GA_PROPERTY_ID",
-    type: "text",
-    secret: false,
-    required: true
   })
 };
 
@@ -7260,6 +7679,7 @@ var parameters13 = {
 import * as crypto2 from "crypto";
 var TOKEN_URL = "https://oauth2.googleapis.com/token";
 var ADMIN_BASE_URL = "https://analyticsadmin.googleapis.com/v1beta";
+var DATA_BASE_URL = "https://analyticsdata.googleapis.com/v1beta";
 var SCOPE = "https://www.googleapis.com/auth/analytics.readonly";
 function base64url(input) {
   const buf = typeof input === "string" ? Buffer.from(input) : input;
@@ -7341,10 +7761,25 @@ async function adminFetch(params, path5, init) {
   headers.set("Authorization", `Bearer ${accessToken}`);
   return fetch(url, { ...init, headers });
 }
+async function dataFetch(params, path5, init) {
+  const keyJsonBase64 = params[parameters13.serviceAccountKeyJsonBase64.slug];
+  if (!keyJsonBase64) {
+    throw new Error(
+      "google-analytics: missing required parameter: service-account-key-json-base64"
+    );
+  }
+  const serviceAccountKey = decodeServiceAccount(keyJsonBase64);
+  const accessToken = await getAccessToken(serviceAccountKey);
+  const url = `${DATA_BASE_URL}${path5.startsWith("/") ? "" : "/"}${path5}`;
+  const headers = new Headers(init?.headers);
+  headers.set("Authorization", `Bearer ${accessToken}`);
+  return fetch(url, { ...init, headers });
+}
 
 // ../connectors/src/connectors/google-analytics/setup-flow.ts
 var ALL_PROPERTIES = "__ALL_PROPERTIES__";
 var GOOGLE_ANALYTICS_SETUP_MAX_PROPERTIES = 20;
+var METADATA_DISPLAY_LIMIT = 30;
 async function listAccountSummaries(params) {
   const summaries = [];
   let pageToken;
@@ -7371,6 +7806,48 @@ async function getProperty(params, propertyId) {
   if (!res.ok) return null;
   return await res.json();
 }
+async function getMetadata(params, propertyId) {
+  try {
+    const res = await dataFetch(
+      params,
+      `/properties/${propertyId}/metadata`
+    );
+    if (!res.ok) return { dimensions: [], metrics: [] };
+    const data = await res.json();
+    return {
+      dimensions: data.dimensions ?? [],
+      metrics: data.metrics ?? []
+    };
+  } catch {
+    return { dimensions: [], metrics: [] };
+  }
+}
+function appendMetadataSection(sections, dimensions, metrics) {
+  if (dimensions.length > 0) {
+    sections.push(`#### Dimensions (${dimensions.length})`, "");
+    for (const d of dimensions.slice(0, METADATA_DISPLAY_LIMIT)) {
+      sections.push(`- ${d.apiName ?? d.uiName ?? "(unknown)"}`);
+    }
+    if (dimensions.length > METADATA_DISPLAY_LIMIT) {
+      sections.push(
+        `- \u2026and ${dimensions.length - METADATA_DISPLAY_LIMIT} more`
+      );
+    }
+    sections.push("");
+  }
+  if (metrics.length > 0) {
+    sections.push(`#### Metrics (${metrics.length})`, "");
+    for (const m of metrics.slice(0, METADATA_DISPLAY_LIMIT)) {
+      sections.push(`- ${m.apiName ?? m.uiName ?? "(unknown)"}`);
+    }
+    if (metrics.length > METADATA_DISPLAY_LIMIT) {
+      sections.push(
+        `- \u2026and ${metrics.length - METADATA_DISPLAY_LIMIT} more`
+      );
+    }
+    sections.push("");
+  }
+}
 var googleAnalyticsSetupFlow = {
   initialState: () => ({}),
   steps: [
@@ -7382,15 +7859,19 @@ var googleAnalyticsSetupFlow = {
         en: "Select a Google Analytics account"
       },
       async fetchOptions(_state, rt) {
-        const summaries = await listAccountSummaries(rt.params);
-        return summaries.map((s) => {
-          const accountResource = s.account ?? s.name ?? "";
-          if (!accountResource) return null;
-          return {
-            value: accountResource,
-            label: s.displayName ?? accountResource
-          };
-        }).filter((v) => v != null);
+        try {
+          const summaries = await listAccountSummaries(rt.params);
+          return summaries.map((s) => {
+            const accountResource = s.account ?? s.name ?? "";
+            if (!accountResource) return null;
+            return {
+              value: accountResource,
+              label: s.displayName ?? accountResource
+            };
+          }).filter((v) => v != null);
+        } catch {
+          return [];
+        }
       },
       applyAnswer: (state, answer) => ({ ...state, account: answer[0] })
     },
@@ -7403,68 +7884,117 @@ var googleAnalyticsSetupFlow = {
       },
       async fetchOptions(state, rt) {
         if (!state.account) return [];
-        const summaries = await listAccountSummaries(rt.params);
-        const account = summaries.find(
-          (s) => (s.account ?? s.name) === state.account
-        );
-        const props = (account?.propertySummaries ?? []).map((p) => {
-          const id = propertyIdFromResource(p.property);
-          if (!id) return null;
-          return {
-            value: id,
-            label: p.displayName ? `${p.displayName} (${id})` : id
-          };
-        }).filter((v) => v != null);
-        if (props.length === 0) return [];
-        return [
-          {
-            value: ALL_PROPERTIES,
-            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3" : "All properties"
-          },
-          ...props
-        ];
+        try {
+          const summaries = await listAccountSummaries(rt.params);
+          const account = summaries.find(
+            (s) => (s.account ?? s.name) === state.account
+          );
+          const props = (account?.propertySummaries ?? []).map((p) => {
+            const id = propertyIdFromResource(p.property);
+            if (!id) return null;
+            return {
+              value: id,
+              label: p.displayName ? `${p.displayName} (${id})` : id
+            };
+          }).filter((v) => v != null);
+          if (props.length === 0) return [];
+          return [
+            {
+              value: ALL_PROPERTIES,
+              label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3" : "All properties"
+            },
+            ...props
+          ];
+        } catch {
+          return [];
+        }
       },
       applyAnswer: (state, answer) => ({ ...state, properties: answer })
+    },
+    {
+      slug: "manualPropertyId",
+      type: "text",
+      question: {
+        ja: "GA4 \u30D7\u30ED\u30D1\u30C6\u30A3 ID \u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\uFF08\u4F8B: 123456789\uFF09\u3002GA4 \u7BA1\u7406\u753B\u9762 > \u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3067\u78BA\u8A8D\u3067\u304D\u307E\u3059\u3002",
+        en: "Enter your GA4 Property ID (e.g., 123456789). Found in GA4 Admin > Property Settings."
+      },
+      async fetchOptions(state) {
+        if (state.properties?.length) return [];
+        return [{ value: "_show", label: "" }];
+      },
+      applyAnswer: (state, answer) => ({
+        ...state,
+        manualPropertyId: answer[0]
+      })
     }
   ],
   async finalize(state, rt) {
-    if (!state.account || !state.properties) {
-      throw new Error("Google Analytics setup: incomplete state on finalize");
-    }
-    const summaries = await listAccountSummaries(rt.params);
-    const account = summaries.find(
-      (s) => (s.account ?? s.name) === state.account
-    );
-    const accountLabel2 = account?.displayName ?? state.account.replace(/^accounts\//, "");
-    const targetPropertyIds = await resolveSetupSelection({
-      selected: state.properties,
-      allSentinel: ALL_PROPERTIES,
-      fetchAll: async () => (account?.propertySummaries ?? []).map((p) => propertyIdFromResource(p.property)).filter((v) => v),
-      limit: GOOGLE_ANALYTICS_SETUP_MAX_PROPERTIES
-    });
-    const sections = [
-      "## Google Analytics",
-      "",
-      `### Account: ${accountLabel2}`,
-      ""
-    ];
-    if (targetPropertyIds.length === 0) {
-      sections.push("_No properties selected._", "");
+    const sections = ["## Google Analytics", ""];
+    if (state.account && state.properties) {
+      let summaries = [];
+      try {
+        summaries = await listAccountSummaries(rt.params);
+      } catch {
+      }
+      const account = summaries.find(
+        (s) => (s.account ?? s.name) === state.account
+      );
+      const accountLabel2 = account?.displayName ?? state.account.replace(/^accounts\//, "");
+      const targetPropertyIds = await resolveSetupSelection({
+        selected: state.properties,
+        allSentinel: ALL_PROPERTIES,
+        fetchAll: async () => (account?.propertySummaries ?? []).map((p) => propertyIdFromResource(p.property)).filter((v) => v),
+        limit: GOOGLE_ANALYTICS_SETUP_MAX_PROPERTIES
+      });
+      sections.push(`### Account: ${accountLabel2}`, "");
+      if (targetPropertyIds.length === 0) {
+        sections.push("_No properties selected._", "");
+        return sections.join("\n");
+      }
+      sections.push(
+        "| Property ID | Display Name | Time Zone | Currency | Industry |"
+      );
+      sections.push(
+        "|-------------|--------------|-----------|----------|----------|"
+      );
+      for (const pid of targetPropertyIds) {
+        const prop = await getProperty(rt.params, pid).catch(() => null);
+        const displayName3 = (prop?.displayName ?? "-").replace(/\|/g, "\\|");
+        const timeZone = prop?.timeZone ?? "-";
+        const currency = prop?.currencyCode ?? "-";
+        const industry = (prop?.industryCategory ?? "-").replace(
+          /\|/g,
+          "\\|"
+        );
+        sections.push(
+          `| ${pid} | ${displayName3} | ${timeZone} | ${currency} | ${industry} |`
+        );
+      }
+      sections.push("");
+      const firstPropertyId = targetPropertyIds[0];
+      if (firstPropertyId) {
+        const { dimensions, metrics } = await getMetadata(
+          rt.params,
+          firstPropertyId
+        );
+        appendMetadataSection(sections, dimensions, metrics);
+      }
       return sections.join("\n");
     }
-    sections.push("| Property ID | Display Name | Time Zone | Currency | Industry |");
-    sections.push("|-------------|--------------|-----------|----------|----------|");
-    for (const propertyId of targetPropertyIds) {
-      const prop = await getProperty(rt.params, propertyId);
-      const displayName3 = (prop?.displayName ?? "-").replace(/\|/g, "\\|");
-      const timeZone = prop?.timeZone ?? "-";
-      const currency = prop?.currencyCode ?? "-";
-      const industry = (prop?.industryCategory ?? "-").replace(/\|/g, "\\|");
-      sections.push(
-        `| ${propertyId} | ${displayName3} | ${timeZone} | ${currency} | ${industry} |`
+    const propertyId = state.manualPropertyId;
+    if (propertyId) {
+      sections.push(`### Property: ${propertyId}`, "");
+      const { dimensions, metrics } = await getMetadata(
+        rt.params,
+        propertyId
       );
+      appendMetadataSection(sections, dimensions, metrics);
+      return sections.join("\n");
     }
-    sections.push("");
+    sections.push(
+      "_Could not list GA4 accounts. Please enable the Google Analytics Admin API in your GCP project. Property ID can be specified per request at runtime._",
+      ""
+    );
     return sections.join("\n");
   }
 };
@@ -7476,8 +8006,9 @@ var REQUEST_TIMEOUT_MS10 = 6e4;
 var inputSchema20 = z20.object({
   toolUseIntent: z20.string().optional().describe("Brief description of what you intend to accomplish with this tool call"),
   connectionId: z20.string().describe("ID of the Google Analytics connection to use"),
+  propertyId: z20.string().describe("GA4 property ID (e.g., '123456789')"),
   method: z20.enum(["GET", "POST"]).describe("HTTP method"),
-  path: z20.string().describe("API path (e.g., 'properties/{propertyId}:runReport'). {propertyId} is automatically replaced."),
+  path: z20.string().describe("API path (e.g., 'properties/{propertyId}:runReport'). {propertyId} is replaced with the propertyId parameter."),
   body: z20.record(z20.string(), z20.unknown()).optional().describe("POST request body (JSON)")
 });
 var outputSchema20 = z20.discriminatedUnion("success", [
@@ -7495,10 +8026,10 @@ var requestTool3 = new ConnectorTool({
   name: "request",
   description: `Send authenticated requests to the Google Analytics Data API.
 Authentication is handled automatically using a service account.
-{propertyId} in the path is automatically replaced with the connection's property-id.`,
+{propertyId} in the path is automatically replaced with the propertyId parameter.`,
   inputSchema: inputSchema20,
   outputSchema: outputSchema20,
-  async execute({ connectionId, method, path: path5, body }, connections) {
+  async execute({ connectionId, propertyId, method, path: path5, body }, connections) {
     const connection = connections.find((c) => c.id === connectionId);
     if (!connection) {
       return { success: false, error: `Connection ${connectionId} not found` };
@@ -7507,7 +8038,6 @@ Authentication is handled automatically using a service account.
     try {
       const { GoogleAuth } = await import("google-auth-library");
       const keyJsonBase64 = parameters13.serviceAccountKeyJsonBase64.getValue(connection);
-      const propertyId = parameters13.propertyId.getValue(connection);
       const credentials = JSON.parse(
         Buffer.from(keyJsonBase64, "base64").toString("utf-8")
       );
@@ -7567,16 +8097,16 @@ var googleAnalyticsConnector = new ConnectorPlugin({
   systemPrompt: {
     en: `### Tools
 
-- \`google-analytics-service-account_request\`: The only way to call the GA4 Data API. Use it to fetch metadata, run reports, or run realtime reports. See the GA4 Data API Reference below for available endpoints and request bodies.
+- \`google-analytics-service-account_request\`: The only way to call the GA4 Data API. Use it to fetch metadata, run reports, or run realtime reports. Requires a \`propertyId\` parameter. See the GA4 Data API Reference below for available endpoints and request bodies.
 
 ### Business Logic
 
 The business logic type for this connector is "typescript". Use the connector SDK in your handler. Do NOT read credentials from environment variables.
 
 SDK methods (client created via \`connection(connectionId)\`):
-- \`client.runReport(request)\` \u2014 run a GA4 report
-- \`client.runRealtimeReport(request)\` \u2014 run a realtime report
-- \`client.getMetadata()\` \u2014 fetch available dimensions/metrics
+- \`client.runReport(propertyId, request)\` \u2014 run a GA4 report
+- \`client.runRealtimeReport(propertyId, request)\` \u2014 run a realtime report
+- \`client.getMetadata(propertyId)\` \u2014 fetch available dimensions/metrics
 - \`client.request(path, init?)\` \u2014 low-level authenticated fetch
 
 \`\`\`ts
@@ -7586,12 +8116,13 @@ import { connection } from "@squadbase/vite-server/connectors/google-analytics";
 const ga = connection("<connectionId>");
 
 export default async function handler(c: Context) {
-  const { startDate = "7daysAgo", endDate = "today" } = await c.req.json<{
+  const { propertyId, startDate = "7daysAgo", endDate = "today" } = await c.req.json<{
+    propertyId: string;
     startDate?: string;
     endDate?: string;
   }>();
 
-  const { rows } = await ga.runReport({
+  const { rows } = await ga.runReport(propertyId, {
     dateRanges: [{ startDate, endDate }],
     dimensions: [{ name: "date" }],
     metrics: [{ name: "activeUsers" }, { name: "sessions" }],
@@ -7635,16 +8166,16 @@ activeUsers, sessions, screenPageViews, bounceRate, averageSessionDuration, conv
 - Relative: \`"today"\`, \`"yesterday"\`, \`"7daysAgo"\`, \`"30daysAgo"\``,
     ja: `### \u30C4\u30FC\u30EB
 
-- \`google-analytics-service-account_request\`: GA4 Data API\u3092\u547C\u3073\u51FA\u3059\u552F\u4E00\u306E\u624B\u6BB5\u3067\u3059\u3002\u30E1\u30BF\u30C7\u30FC\u30BF\u306E\u53D6\u5F97\u3001\u30EC\u30DD\u30FC\u30C8\u306E\u5B9F\u884C\u3001\u30EA\u30A2\u30EB\u30BF\u30A4\u30E0\u30EC\u30DD\u30FC\u30C8\u306E\u5B9F\u884C\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002\u5229\u7528\u53EF\u80FD\u306A\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8\u3068\u30EA\u30AF\u30A8\u30B9\u30C8\u30DC\u30C7\u30A3\u306F\u4E0B\u90E8\u306E\u300CGA4 Data API \u30EA\u30D5\u30A1\u30EC\u30F3\u30B9\u300D\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+- \`google-analytics-service-account_request\`: GA4 Data API\u3092\u547C\u3073\u51FA\u3059\u552F\u4E00\u306E\u624B\u6BB5\u3067\u3059\u3002\u30E1\u30BF\u30C7\u30FC\u30BF\u306E\u53D6\u5F97\u3001\u30EC\u30DD\u30FC\u30C8\u306E\u5B9F\u884C\u3001\u30EA\u30A2\u30EB\u30BF\u30A4\u30E0\u30EC\u30DD\u30FC\u30C8\u306E\u5B9F\u884C\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002\`propertyId\` \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u304C\u5FC5\u8981\u3067\u3059\u3002\u5229\u7528\u53EF\u80FD\u306A\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8\u3068\u30EA\u30AF\u30A8\u30B9\u30C8\u30DC\u30C7\u30A3\u306F\u4E0B\u90E8\u306E\u300CGA4 Data API \u30EA\u30D5\u30A1\u30EC\u30F3\u30B9\u300D\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
 ### Business Logic
 
 \u3053\u306E\u30B3\u30CD\u30AF\u30BF\u306E\u30D3\u30B8\u30CD\u30B9\u30ED\u30B8\u30C3\u30AF\u30BF\u30A4\u30D7\u306F "typescript" \u3067\u3059\u3002\u30CF\u30F3\u30C9\u30E9\u5185\u3067\u306F\u30B3\u30CD\u30AF\u30BFSDK\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u74B0\u5883\u5909\u6570\u304B\u3089\u8A8D\u8A3C\u60C5\u5831\u3092\u8AAD\u307F\u53D6\u3089\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
 
 SDK\u30E1\u30BD\u30C3\u30C9 (\`connection(connectionId)\` \u3067\u4F5C\u6210\u3057\u305F\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8):
-- \`client.runReport(request)\` \u2014 GA4\u30EC\u30DD\u30FC\u30C8\u3092\u5B9F\u884C
-- \`client.runRealtimeReport(request)\` \u2014 \u30EA\u30A2\u30EB\u30BF\u30A4\u30E0\u30EC\u30DD\u30FC\u30C8\u3092\u5B9F\u884C
-- \`client.getMetadata()\` \u2014 \u5229\u7528\u53EF\u80FD\u306A\u30C7\u30A3\u30E1\u30F3\u30B7\u30E7\u30F3/\u30E1\u30C8\u30EA\u30AF\u30B9\u3092\u53D6\u5F97
+- \`client.runReport(propertyId, request)\` \u2014 GA4\u30EC\u30DD\u30FC\u30C8\u3092\u5B9F\u884C
+- \`client.runRealtimeReport(propertyId, request)\` \u2014 \u30EA\u30A2\u30EB\u30BF\u30A4\u30E0\u30EC\u30DD\u30FC\u30C8\u3092\u5B9F\u884C
+- \`client.getMetadata(propertyId)\` \u2014 \u5229\u7528\u53EF\u80FD\u306A\u30C7\u30A3\u30E1\u30F3\u30B7\u30E7\u30F3/\u30E1\u30C8\u30EA\u30AF\u30B9\u3092\u53D6\u5F97
 - \`client.request(path, init?)\` \u2014 \u4F4E\u30EC\u30D9\u30EB\u306E\u8A8D\u8A3C\u4ED8\u304Dfetch
 
 \`\`\`ts
@@ -7654,12 +8185,13 @@ import { connection } from "@squadbase/vite-server/connectors/google-analytics";
 const ga = connection("<connectionId>");
 
 export default async function handler(c: Context) {
-  const { startDate = "7daysAgo", endDate = "today" } = await c.req.json<{
+  const { propertyId, startDate = "7daysAgo", endDate = "today" } = await c.req.json<{
+    propertyId: string;
     startDate?: string;
     endDate?: string;
   }>();
 
-  const { rows } = await ga.runReport({
+  const { rows } = await ga.runReport(propertyId, {
     dateRanges: [{ startDate, endDate }],
     dimensions: [{ name: "date" }],
     metrics: [{ name: "activeUsers" }, { name: "sessions" }],
@@ -7713,12 +8245,12 @@ activeUsers, sessions, screenPageViews, bounceRate, averageSessionDuration, conv
       };
     }
     try {
-      const res = await adminFetch(params, "/accountSummaries?pageSize=1");
+      const res = await dataFetch(params, `/metadata`);
       if (!res.ok) {
         const body = await res.text().catch(() => res.statusText);
         return {
           success: false,
-          error: `google-analytics: accountSummaries failed (${res.status}): ${body}`
+          error: `Google Analytics API failed: HTTP ${res.status} ${body}`
         };
       }
       return { success: true };
@@ -19358,7 +19890,7 @@ function escapeIdentifier(name) {
 function quoteLiteral2(value) {
   return "'" + value.replace(/'/g, "''") + "'";
 }
-async function fetchTableNames4(params, database) {
+async function fetchTableNames3(params, database) {
   const rows = await runQuery9(
     params,
     `SELECT name FROM system.tables
@@ -19387,17 +19919,17 @@ var clickhouseSetupFlow = {
       slug: "tables",
       type: "multiSelect",
       question: {
-        ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
-        en: "Select target tables (multi-select allowed)"
+        ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
+        en: "Select target tables and views (multi-select allowed)"
       },
       async fetchOptions(state, rt) {
         if (!state.database) return [];
-        const names = await fetchTableNames4(rt.params, state.database);
+        const names = await fetchTableNames3(rt.params, state.database);
         const tableOptions = names.map((value) => ({ value }));
         return [
           {
             value: ALL_TABLES11,
-            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB" : "All tables"
+            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC" : "All tables and views"
           },
           ...tableOptions
         ];
@@ -19413,7 +19945,7 @@ var clickhouseSetupFlow = {
     const targetTables = await resolveSetupSelection({
       selected: state.tables,
       allSentinel: ALL_TABLES11,
-      fetchAll: () => fetchTableNames4(rt.params, database),
+      fetchAll: () => fetchTableNames3(rt.params, database),
       limit: CLICKHOUSE_SETUP_MAX_TABLES
     });
     const sections = [
@@ -24012,7 +24544,7 @@ export default async function handler(c: Context) {
     const region = params[parameters50.region.slug];
     const baseUrl = region === "eu" ? "https://api-eu.customer.io" : "https://api.customer.io";
     try {
-      const res = await fetch(`${baseUrl}/v1/accounts/region`, {
+      const res = await fetch(`${baseUrl}/v1/segments`, {
         method: "GET",
         headers: {
           Authorization: `Bearer ${appApiKey}`,
@@ -29568,7 +30100,7 @@ function apiFetch27(params, path5, init) {
 // ../connectors/src/connectors/gamma/setup-flow.ts
 var ALL_FOLDERS = "__ALL_FOLDERS__";
 var GAMMA_SETUP_MAX_FOLDERS = 20;
-var FOLDERS_PAGE_LIMIT = 100;
+var FOLDERS_PAGE_LIMIT = 50;
 async function listAllFolders(params) {
   const results = [];
   let after;
@@ -29589,7 +30121,7 @@ async function listAllFolders(params) {
   return results;
 }
 async function listThemes(params) {
-  const res = await apiFetch27(params, "/themes?limit=100");
+  const res = await apiFetch27(params, "/themes?limit=50");
   if (!res.ok) {
     return [];
   }
@@ -33426,7 +33958,8 @@ var semrushOnboarding = new ConnectorOnboarding({
 });
 
 // ../connectors/src/connectors/semrush/utils.ts
-var PROJECTS_BASE_URL = "https://api.semrush.com/management/v1";
+var BASE_URL59 = "https://api.semrush.com";
+var PROJECTS_BASE_URL = `${BASE_URL59}/management/v1`;
 function projectsApiFetch(params, path5, init) {
   const apiKey = params[parameters68.apiKey.slug];
   if (!apiKey) {
@@ -33443,10 +33976,103 @@ function projectsApiFetch(params, path5, init) {
   if (!headers.has("Accept")) headers.set("Accept", "application/json");
   return fetch(url.toString(), { ...init, headers });
 }
+async function reportFetch(params, query) {
+  const apiKey = params[parameters68.apiKey.slug];
+  if (!apiKey) {
+    throw new Error(
+      `semrush: missing required parameter: ${parameters68.apiKey.slug}`
+    );
+  }
+  const url = new URL(`${BASE_URL59}/`);
+  for (const [k, v] of Object.entries(query)) {
+    url.searchParams.set(k, v);
+  }
+  url.searchParams.set("key", apiKey);
+  const res = await fetch(url.toString());
+  const text = await res.text();
+  if (text.startsWith("ERROR ")) throw new Error(text.trim());
+  return parseSemicolonCsv(text);
+}
+async function backlinksFetch(params, query) {
+  const apiKey = params[parameters68.apiKey.slug];
+  if (!apiKey) {
+    throw new Error(
+      `semrush: missing required parameter: ${parameters68.apiKey.slug}`
+    );
+  }
+  const url = new URL(`${BASE_URL59}/analytics/v1/`);
+  for (const [k, v] of Object.entries(query)) {
+    url.searchParams.set(k, v);
+  }
+  url.searchParams.set("key", apiKey);
+  const res = await fetch(url.toString());
+  const text = await res.text();
+  if (text.startsWith("ERROR ")) throw new Error(text.trim());
+  return parseSemicolonCsv(text);
+}
+function parseSemicolonCsv(raw) {
+  const lines = raw.trim().split("\n").filter(Boolean);
+  if (lines.length === 0) return { columns: [], rows: [] };
+  const columns = lines[0].split(";");
+  const rows = lines.slice(1).map((line) => {
+    const values = line.split(";");
+    const row = {};
+    for (let i = 0; i < columns.length; i++) {
+      row[columns[i]] = values[i] ?? "";
+    }
+    return row;
+  });
+  return { columns, rows };
+}
 
 // ../connectors/src/connectors/semrush/setup-flow.ts
 var ALL_PROJECTS6 = "__ALL_PROJECTS__";
 var SEMRUSH_SETUP_MAX_PROJECTS = 10;
+var SEMRUSH_DATABASES = [
+  { value: "us", label: "United States" },
+  { value: "uk", label: "United Kingdom" },
+  { value: "ca", label: "Canada" },
+  { value: "au", label: "Australia" },
+  { value: "de", label: "Germany" },
+  { value: "fr", label: "France" },
+  { value: "es", label: "Spain" },
+  { value: "it", label: "Italy" },
+  { value: "br", label: "Brazil" },
+  { value: "jp", label: "Japan" },
+  { value: "in", label: "India" },
+  { value: "ru", label: "Russia" },
+  { value: "nl", label: "Netherlands" },
+  { value: "se", label: "Sweden" },
+  { value: "mx", label: "Mexico" },
+  { value: "kr", label: "South Korea" },
+  { value: "sg", label: "Singapore" },
+  { value: "hk", label: "Hong Kong" },
+  { value: "tw", label: "Taiwan" }
+];
+var REPORT_TYPE_LABELS = {
+  domain_overview: {
+    en: "Domain Overview (rank, traffic, keyword count)",
+    ja: "Domain Overview (\u30E9\u30F3\u30AF\u30FB\u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u30FB\u30AD\u30FC\u30EF\u30FC\u30C9\u6570)"
+  },
+  organic_search: {
+    en: "Organic Search (top organic keywords)",
+    ja: "Organic Search (\u4E0A\u4F4D\u30AA\u30FC\u30AC\u30CB\u30C3\u30AF\u30AD\u30FC\u30EF\u30FC\u30C9)"
+  },
+  paid_search: {
+    en: "Paid Search (top paid keywords)",
+    ja: "Paid Search (\u4E0A\u4F4D\u6709\u6599\u30AD\u30FC\u30EF\u30FC\u30C9)"
+  },
+  backlinks: {
+    en: "Backlinks (referring domains, backlink count)",
+    ja: "Backlinks (\u53C2\u7167\u30C9\u30E1\u30A4\u30F3\u30FB\u88AB\u30EA\u30F3\u30AF\u6570)"
+  }
+};
+var REPORT_TYPE_VALUES = [
+  "domain_overview",
+  "organic_search",
+  "paid_search",
+  "backlinks"
+];
 function projectId(p) {
   const raw = p.project_id ?? p.id;
   return raw == null ? "" : String(raw);
@@ -33455,7 +34081,7 @@ function projectName(p) {
   return p.project_name ?? p.name ?? p.domain ?? p.url ?? projectId(p);
 }
 function projectDomain(p) {
-  return p.domain ?? p.url ?? "";
+  return p.domain ?? p.domain_unicode ?? p.url ?? "";
 }
 function projectCreatedAt(p) {
   return p.created_at ?? p.date_created ?? "";
@@ -33463,13 +34089,19 @@ function projectCreatedAt(p) {
 async function fetchProjects(params) {
   let res;
   try {
-    res = await projectsApiFetch(params, "/projects/");
+    res = await projectsApiFetch(params, "/projects");
   } catch (err) {
-    return { ok: false, error: err instanceof Error ? err.message : String(err) };
+    return {
+      ok: false,
+      error: err instanceof Error ? err.message : String(err)
+    };
   }
   if (!res.ok) {
     const body2 = await res.text().catch(() => res.statusText);
-    return { ok: false, error: `HTTP ${res.status} ${body2 || res.statusText}` };
+    return {
+      ok: false,
+      error: `HTTP ${res.status} ${body2 || res.statusText}`
+    };
   }
   let body;
   try {
@@ -33483,9 +34115,171 @@ async function fetchProjects(params) {
   const projects = Array.isArray(body) ? body : Array.isArray(body?.projects) ? body.projects : Array.isArray(body?.data) ? body.data : [];
   return { ok: true, projects };
 }
+function formatNumber(n) {
+  return n.toLocaleString("en-US");
+}
+async function fetchDomainOverview(params, domain, database) {
+  const sections = [];
+  try {
+    const report = await reportFetch(params, {
+      type: "domain_ranks",
+      domain,
+      database
+    });
+    if (report.rows.length === 0) {
+      sections.push("_No data found for this domain._", "");
+      return sections;
+    }
+    const row = report.rows[0];
+    sections.push("| Metric | Value |");
+    sections.push("|--------|-------|");
+    sections.push(
+      `| Rank | ${row["Rank"] ?? "-"} |`,
+      `| Organic Keywords | ${formatNumber(Number(row["Organic Keywords"]) || 0)} |`,
+      `| Organic Traffic | ${formatNumber(Number(row["Organic Traffic"]) || 0)} |`,
+      `| Organic Cost | $${formatNumber(Number(row["Organic Cost"]) || 0)} |`,
+      `| Adwords Keywords | ${formatNumber(Number(row["Adwords Keywords"]) || 0)} |`,
+      `| Adwords Traffic | ${formatNumber(Number(row["Adwords Traffic"]) || 0)} |`,
+      `| Adwords Cost | $${formatNumber(Number(row["Adwords Cost"]) || 0)} |`
+    );
+    sections.push("");
+  } catch (err) {
+    sections.push(
+      `_Error: ${err instanceof Error ? err.message : String(err)}_`,
+      ""
+    );
+  }
+  return sections;
+}
+async function fetchOrganicSearch(params, domain, database) {
+  return fetchKeywordReport(params, "domain_organic", domain, database);
+}
+async function fetchPaidSearch(params, domain, database) {
+  return fetchKeywordReport(params, "domain_adwords", domain, database);
+}
+async function fetchKeywordReport(params, type, domain, database) {
+  const sections = [];
+  try {
+    const report = await reportFetch(params, {
+      type,
+      domain,
+      database,
+      display_limit: "5"
+    });
+    if (report.rows.length === 0) {
+      sections.push("_No data found._", "");
+      return sections;
+    }
+    sections.push(...renderCsvTable(report, 5));
+    sections.push("");
+  } catch (err) {
+    sections.push(
+      `_Error: ${err instanceof Error ? err.message : String(err)}_`,
+      ""
+    );
+  }
+  return sections;
+}
+async function fetchBacklinks(params, domain) {
+  const sections = [];
+  try {
+    const report = await backlinksFetch(params, {
+      type: "backlinks_overview",
+      target: domain,
+      target_type: "root_domain"
+    });
+    if (report.rows.length === 0) {
+      sections.push("_No backlink data found._", "");
+      return sections;
+    }
+    const row = report.rows[0];
+    sections.push("| Metric | Value |");
+    sections.push("|--------|-------|");
+    for (const col of report.columns) {
+      sections.push(`| ${col} | ${formatNumber(Number(row[col]) || 0)} |`);
+    }
+    sections.push("");
+  } catch (err) {
+    sections.push(
+      `_Error: ${err instanceof Error ? err.message : String(err)}_`,
+      ""
+    );
+  }
+  return sections;
+}
+function renderCsvTable(report, maxRows) {
+  const cols = report.columns;
+  const rows = report.rows.slice(0, maxRows);
+  const lines = [];
+  lines.push(`| ${cols.join(" | ")} |`);
+  lines.push(`|${cols.map(() => "---").join("|")}|`);
+  for (const row of rows) {
+    const cells = cols.map((c) => (row[c] ?? "").replace(/\|/g, "\\|"));
+    lines.push(`| ${cells.join(" | ")} |`);
+  }
+  return lines;
+}
 var semrushSetupFlow = {
   initialState: () => ({}),
   steps: [
+    {
+      slug: "domain",
+      type: "select",
+      allowFreeText: true,
+      question: {
+        ja: "\u5206\u6790\u5BFE\u8C61\u306E\u30C9\u30E1\u30A4\u30F3\u3092\u9078\u629E\u307E\u305F\u306F\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044",
+        en: "Select or enter the domain to analyze"
+      },
+      async fetchOptions(_state, rt) {
+        const result = await fetchProjects(rt.params);
+        if (!result.ok || result.projects.length === 0) return [];
+        const seen = /* @__PURE__ */ new Set();
+        const options = [];
+        for (const p of result.projects) {
+          const d = projectDomain(p);
+          if (d && !seen.has(d)) {
+            seen.add(d);
+            options.push({
+              value: d,
+              label: `${d} (${projectName(p)})`
+            });
+          }
+        }
+        return options;
+      },
+      applyAnswer: (state, answer) => ({ ...state, domain: answer[0] })
+    },
+    {
+      slug: "database",
+      type: "select",
+      allowFreeText: false,
+      question: {
+        ja: "\u30EA\u30FC\u30B8\u30E7\u30F3\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\uFF08\u5BFE\u8C61\u30C9\u30E1\u30A4\u30F3\u306E\u4E3B\u8981\u5E02\u5834\uFF09",
+        en: "Select the region (primary market for the target domain)"
+      },
+      async fetchOptions() {
+        return SEMRUSH_DATABASES.map((db) => ({
+          value: db.value,
+          label: `${db.label} (${db.value})`
+        }));
+      },
+      applyAnswer: (state, answer) => ({ ...state, database: answer[0] })
+    },
+    {
+      slug: "reportTypes",
+      type: "multiSelect",
+      question: {
+        ja: "\u63A2\u7D22\u3059\u308B\u30EC\u30DD\u30FC\u30C8\u7A2E\u5225\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
+        en: "Select report types to explore (multi-select allowed)"
+      },
+      async fetchOptions(_state, rt) {
+        return REPORT_TYPE_VALUES.map((value) => ({
+          value,
+          label: REPORT_TYPE_LABELS[value][rt.language]
+        }));
+      },
+      applyAnswer: (state, answer) => ({ ...state, reportTypes: answer })
+    },
     {
       slug: "projects",
       type: "multiSelect",
@@ -33502,7 +34296,9 @@ var semrushSetupFlow = {
           const id = projectId(p);
           if (!id) return null;
           return { value: id, label: projectName(p) };
-        }).filter((opt) => opt !== null);
+        }).filter(
+          (opt) => opt !== null
+        );
         if (options.length === 0) return [];
         return [
           {
@@ -33516,49 +34312,80 @@ var semrushSetupFlow = {
     }
   ],
   async finalize(state, rt) {
-    const sections = ["## Semrush", ""];
-    if (!state.projects?.length) {
+    if (!state.domain || !state.database || !state.reportTypes) {
+      throw new Error("Semrush setup: incomplete state on finalize");
+    }
+    const domain = state.domain;
+    const database = state.database;
+    const selected = state.reportTypes.filter(
+      (r) => REPORT_TYPE_VALUES.includes(r)
+    );
+    const sections = [
+      "## Semrush",
+      "",
+      `**Domain:** ${domain}`,
+      `**Region:** ${database}`,
+      ""
+    ];
+    for (const reportType of selected) {
       sections.push(
-        "_No Semrush Projects API access detected; Standard Analytics reports run by domain/keyword and don't require pre-selection._",
+        `### ${REPORT_TYPE_LABELS[reportType].en}`,
         ""
       );
-      return sections.join("\n");
-    }
-    const result = await fetchProjects(rt.params);
-    if (!result.ok) {
-      throw new Error(
-        `semrush: listProjects failed on finalize: ${result.error}`
-      );
-    }
-    const projectByIdMap = /* @__PURE__ */ new Map();
-    for (const p of result.projects) {
-      const id = projectId(p);
-      if (id) projectByIdMap.set(id, p);
-    }
-    const targetIds = await resolveSetupSelection({
-      selected: state.projects,
-      allSentinel: ALL_PROJECTS6,
-      fetchAll: async () => result.projects.map((p) => projectId(p)).filter((id) => id),
-      limit: SEMRUSH_SETUP_MAX_PROJECTS
-    });
-    if (!targetIds.length) {
-      sections.push("_No projects selected._", "");
-      return sections.join("\n");
+      switch (reportType) {
+        case "domain_overview":
+          sections.push(
+            ...await fetchDomainOverview(rt.params, domain, database)
+          );
+          break;
+        case "organic_search":
+          sections.push(
+            ...await fetchOrganicSearch(rt.params, domain, database)
+          );
+          break;
+        case "paid_search":
+          sections.push(
+            ...await fetchPaidSearch(rt.params, domain, database)
+          );
+          break;
+        case "backlinks":
+          sections.push(...await fetchBacklinks(rt.params, domain));
+          break;
+      }
     }
-    sections.push("| Project | Domain | Created |");
-    sections.push("|---------|--------|---------|");
-    for (const id of targetIds) {
-      const p = projectByIdMap.get(id);
-      if (!p) {
-        sections.push(`| ${id} | - | - |`);
-        continue;
+    if (state.projects?.length) {
+      const result = await fetchProjects(rt.params);
+      if (result.ok) {
+        const projectByIdMap = /* @__PURE__ */ new Map();
+        for (const p of result.projects) {
+          const id = projectId(p);
+          if (id) projectByIdMap.set(id, p);
+        }
+        const targetIds = await resolveSetupSelection({
+          selected: state.projects,
+          allSentinel: ALL_PROJECTS6,
+          fetchAll: async () => result.projects.map((p) => projectId(p)).filter((id) => id),
+          limit: SEMRUSH_SETUP_MAX_PROJECTS
+        });
+        if (targetIds.length > 0) {
+          sections.push("### Projects", "");
+          sections.push("| Project | Domain | Created |");
+          sections.push("|---------|--------|---------|");
+          for (const id of targetIds) {
+            const p = projectByIdMap.get(id);
+            if (!p) {
+              sections.push(`| ${id} | - | - |`);
+              continue;
+            }
+            const name = projectName(p).replace(/\|/g, "\\|");
+            const dom = projectDomain(p).replace(/\|/g, "\\|") || "-";
+            const created = projectCreatedAt(p) || "-";
+            sections.push(`| ${name} | ${dom} | ${created} |`);
+          }
+          sections.push("");
+        }
       }
-      const name = projectName(p).replace(/\|/g, "\\|");
-      const domain = projectDomain(p).replace(/\|/g, "\\|") || "-";
-      const created = projectCreatedAt(p) || "-";
-      sections.push(`| ${name} | ${domain} | ${created} |`);
     }
-    sections.push("");
     return sections.join("\n");
   }
 };
@@ -33819,7 +34646,7 @@ API \u30E6\u30CB\u30C3\u30C8\u6B8B\u91CF\u306E\u78BA\u8A8D\uFF08\u7121\u6599\u30
 
 // ../connectors/src/connectors/google-search-console-oauth/tools/list-sites.ts
 import { z as z84 } from "zod";
-var BASE_URL59 = "https://searchconsole.googleapis.com/webmasters/v3";
+var BASE_URL60 = "https://searchconsole.googleapis.com/webmasters/v3";
 var REQUEST_TIMEOUT_MS67 = 6e4;
 var cachedToken30 = null;
 async function getProxyToken30(config) {
@@ -33890,7 +34717,7 @@ var listSitesTool = new ConnectorTool({
       `[connector-request] google-search-console-oauth/${connection.name}: listSites`
     );
     try {
-      const url = `${BASE_URL59}/sites`;
+      const url = `${BASE_URL60}/sites`;
       const token = await getProxyToken30(config.oauthProxy);
       const proxyUrl = `https://${config.oauthProxy.sandboxId}.${config.oauthProxy.previewBaseDomain}/_sqcore/connections/${connectionId}/request`;
       const controller = new AbortController();
@@ -34072,7 +34899,7 @@ var googleSearchConsoleOauthSetupFlow = {
 import { z as z85 } from "zod";
 var BASE_HOST10 = "https://searchconsole.googleapis.com";
 var BASE_PATH_SEGMENT10 = "/webmasters/v3";
-var BASE_URL60 = `${BASE_HOST10}${BASE_PATH_SEGMENT10}`;
+var BASE_URL61 = `${BASE_HOST10}${BASE_PATH_SEGMENT10}`;
 var REQUEST_TIMEOUT_MS68 = 6e4;
 var cachedToken31 = null;
 async function getProxyToken31(config) {
@@ -34157,7 +34984,7 @@ For URL Inspection API requests, use the absolute path '/v1/urlInspection/index:
         resolvedPath,
         BASE_PATH_SEGMENT10
       );
-      let url = `${BASE_URL60}${normalizedPath}`;
+      let url = `${BASE_URL61}${normalizedPath}`;
       if (queryParams) {
         const searchParams = new URLSearchParams(queryParams);
         url += `?${searchParams.toString()}`;
@@ -34483,7 +35310,7 @@ function isInternalSchema3(name) {
   if (lower.startsWith("pg_toast_")) return true;
   return false;
 }
-async function fetchTableNames5(params, schema) {
+async function fetchTableNames4(params, schema) {
   const rows = await runQuery10(
     params,
     `SELECT table_name FROM information_schema.tables
@@ -34516,17 +35343,17 @@ var supabaseSetupFlow = {
       slug: "tables",
       type: "multiSelect",
       question: {
-        ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
-        en: "Select target tables (multi-select allowed)"
+        ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
+        en: "Select target tables and views (multi-select allowed)"
       },
       async fetchOptions(state, rt) {
         if (!state.schema) return [];
-        const names = await fetchTableNames5(rt.params, state.schema);
+        const names = await fetchTableNames4(rt.params, state.schema);
         const tableOptions = names.map((value) => ({ value }));
         return [
           {
             value: ALL_TABLES13,
-            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB" : "All tables"
+            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC" : "All tables and views"
           },
           ...tableOptions
         ];
@@ -34542,7 +35369,7 @@ var supabaseSetupFlow = {
     const targetTables = await resolveSetupSelection({
       selected: state.tables,
       allSentinel: ALL_TABLES13,
-      fetchAll: () => fetchTableNames5(rt.params, schema),
+      fetchAll: () => fetchTableNames4(rt.params, schema),
       limit: SUPABASE_SETUP_MAX_TABLES
     });
     const sections = [
@@ -34777,13 +35604,13 @@ var parameters71 = {
 };
 
 // ../connectors/src/connectors/clickup/utils.ts
-var BASE_URL61 = "https://api.clickup.com/api/v2";
+var BASE_URL62 = "https://api.clickup.com/api/v2";
 async function apiFetch30(params, path5, init) {
   const token = params[parameters71.apiToken.slug];
   if (!token) {
     throw new Error("clickup: missing required parameter: api-token");
   }
-  const url = `${BASE_URL61}${path5.startsWith("/") ? "" : "/"}${path5}`;
+  const url = `${BASE_URL62}${path5.startsWith("/") ? "" : "/"}${path5}`;
   const headers = new Headers(init?.headers);
   headers.set("Authorization", token);
   if (!headers.has("Accept")) headers.set("Accept", "application/json");
@@ -34911,7 +35738,7 @@ var clickupSetupFlow = {
 import { z as z87 } from "zod";
 var BASE_HOST11 = "https://api.clickup.com";
 var BASE_PATH_SEGMENT11 = "/api/v2";
-var BASE_URL62 = `${BASE_HOST11}${BASE_PATH_SEGMENT11}`;
+var BASE_URL63 = `${BASE_HOST11}${BASE_PATH_SEGMENT11}`;
 var REQUEST_TIMEOUT_MS69 = 6e4;
 var inputSchema87 = z87.object({
   toolUseIntent: z87.string().optional().describe(
@@ -34984,7 +35811,7 @@ Pagination: ClickUp uses zero-indexed \`page\` query parameter on list endpoints
     try {
       const token = parameters71.apiToken.getValue(connection);
       const normalizedPath = normalizeRequestPath(path5, BASE_PATH_SEGMENT11);
-      const url = `${BASE_URL62}${normalizedPath}`;
+      const url = `${BASE_URL63}${normalizedPath}`;
       const controller = new AbortController();
       const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS69);
       try {
@@ -35314,7 +36141,7 @@ function quoteLiteral4(value) {
 }
 function buildFlow(options) {
   const { connectorName, forceEncrypt } = options;
-  async function fetchTableNames7(params, schema) {
+  async function fetchTableNames5(params, schema) {
     const rows = await runSqlServerSetupQuery(
       params,
       `SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES
@@ -35349,17 +36176,17 @@ function buildFlow(options) {
         slug: "tables",
         type: "multiSelect",
         question: {
-          ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
-          en: "Select target tables (multi-select allowed)"
+          ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
+          en: "Select target tables and views (multi-select allowed)"
         },
         async fetchOptions(state, rt) {
           if (!state.schema) return [];
-          const names = await fetchTableNames7(rt.params, state.schema);
+          const names = await fetchTableNames5(rt.params, state.schema);
           const tableOptions = names.map((value) => ({ value }));
           return [
             {
               value: ALL_TABLES14,
-              label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB" : "All tables"
+              label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC" : "All tables and views"
             },
             ...tableOptions
           ];
@@ -35375,7 +36202,7 @@ function buildFlow(options) {
       const targetTables = await resolveSetupSelection({
         selected: state.tables,
         allSentinel: ALL_TABLES14,
-        fetchAll: () => fetchTableNames7(rt.params, schema),
+        fetchAll: () => fetchTableNames5(rt.params, schema),
         limit: SQLSERVER_SETUP_MAX_TABLES
       });
       const sections = [
@@ -36370,14 +37197,15 @@ function isInternalOwner(name) {
 function quoteLiteral5(value) {
   return "'" + value.replace(/'/g, "''") + "'";
 }
-async function fetchTableNames6(params, owner) {
+async function fetchTableAndViewNames2(params, owner) {
   const rows = await runOracleSetupQuery(
     params,
-    `SELECT TABLE_NAME FROM ALL_TABLES
-     WHERE OWNER = ${quoteLiteral5(owner)}
-     ORDER BY TABLE_NAME`
+    `SELECT TABLE_NAME FROM ALL_TABLES WHERE OWNER = ${quoteLiteral5(owner)}
+     UNION
+     SELECT VIEW_NAME FROM ALL_VIEWS WHERE OWNER = ${quoteLiteral5(owner)}
+     ORDER BY 1`
   );
-  return rows.map((r) => String(r["TABLE_NAME"] ?? "")).filter((name) => name);
+  return rows.map((r) => String(r["TABLE_NAME"] ?? r["VIEW_NAME"] ?? "")).filter((name) => name);
 }
 var oracleSetupFlow = {
   initialState: () => ({}),
@@ -36402,17 +37230,17 @@ var oracleSetupFlow = {
       slug: "tables",
       type: "multiSelect",
       question: {
-        ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
-        en: "Select target tables (multi-select allowed)"
+        ja: "\u5BFE\u8C61\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
+        en: "Select target tables and views (multi-select allowed)"
       },
       async fetchOptions(state, rt) {
         if (!state.owner) return [];
-        const names = await fetchTableNames6(rt.params, state.owner);
+        const names = await fetchTableAndViewNames2(rt.params, state.owner);
         const tableOptions = names.map((value) => ({ value }));
         return [
           {
             value: ALL_TABLES15,
-            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB" : "All tables"
+            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB\u30FB\u30D3\u30E5\u30FC" : "All tables and views"
           },
           ...tableOptions
         ];
@@ -36428,9 +37256,22 @@ var oracleSetupFlow = {
     const targetTables = await resolveSetupSelection({
       selected: state.tables,
       allSentinel: ALL_TABLES15,
-      fetchAll: () => fetchTableNames6(rt.params, owner),
+      fetchAll: () => fetchTableAndViewNames2(rt.params, owner),
       limit: ORACLE_SETUP_MAX_TABLES
     });
+    const typeRows = targetTables.length > 0 ? await runOracleSetupQuery(
+      rt.params,
+      `SELECT OBJECT_NAME, OBJECT_TYPE FROM ALL_OBJECTS
+           WHERE OWNER = ${quoteLiteral5(owner)}
+             AND OBJECT_NAME IN (${targetTables.map(quoteLiteral5).join(", ")})
+             AND OBJECT_TYPE IN ('TABLE', 'VIEW')`
+    ) : [];
+    const typeMap = new Map(
+      typeRows.map((r) => [
+        String(r["OBJECT_NAME"] ?? ""),
+        String(r["OBJECT_TYPE"] ?? "TABLE")
+      ])
+    );
     const sections = [
       "## Oracle Database",
       "",
@@ -36438,6 +37279,7 @@ var oracleSetupFlow = {
       ""
     ];
     for (const table of targetTables) {
+      const heading = typeMap.get(table) === "VIEW" ? "View" : "Table";
       const cols = await runOracleSetupQuery(
         rt.params,
         `SELECT COLUMN_NAME, DATA_TYPE, NULLABLE, DATA_DEFAULT
@@ -36446,7 +37288,7 @@ var oracleSetupFlow = {
            AND TABLE_NAME = ${quoteLiteral5(table)}
          ORDER BY COLUMN_ID`
       );
-      sections.push(`#### Table: ${table}`, "");
+      sections.push(`#### ${heading}: ${table}`, "");
       sections.push("| Column | Type | Nullable | Default |");
       sections.push("|--------|------|----------|---------|");
       for (const c of cols) {
@@ -38751,7 +39593,7 @@ export default async function handler(c: Context) {
 import { z as z97 } from "zod";
 var BASE_HOST12 = "https://api.powerbi.com";
 var BASE_PATH_SEGMENT18 = "/v1.0/myorg";
-var BASE_URL63 = `${BASE_HOST12}${BASE_PATH_SEGMENT18}`;
+var BASE_URL64 = `${BASE_HOST12}${BASE_PATH_SEGMENT18}`;
 var REQUEST_TIMEOUT_MS74 = 6e4;
 var cachedToken32 = null;
 async function getProxyToken32(config) {
@@ -38833,7 +39675,7 @@ The signed-in user must have access to the workspace; unlike Service Principals,
     );
     try {
       const normalizedPath = normalizeRequestPath(path5, BASE_PATH_SEGMENT18);
-      let url = `${BASE_URL63}${normalizedPath}`;
+      let url = `${BASE_URL64}${normalizedPath}`;
       if (queryParams) {
         const searchParams = new URLSearchParams(queryParams);
         url += `?${searchParams.toString()}`;
@@ -38916,14 +39758,18 @@ var powerbiOauthOnboarding = new ConnectorOnboarding({
 var parameters80 = {};
 
 // ../connectors/src/connectors/powerbi-oauth/utils.ts
-var BASE_URL64 = "https://api.powerbi.com/v1.0/myorg";
+var BASE_URL65 = "https://api.powerbi.com/v1.0/myorg";
 function apiFetch35(proxyFetch, path5, init) {
-  const url = `${BASE_URL64}${path5.startsWith("/") ? "" : "/"}${path5}`;
+  const url = `${BASE_URL65}${path5.startsWith("/") ? "" : "/"}${path5}`;
   return proxyFetch(url, init);
 }
 
 // ../connectors/src/connectors/powerbi-oauth/setup-flow.ts
 var ALL_WORKSPACES = "__ALL_WORKSPACES__";
+var MY_WORKSPACE = "__MY_WORKSPACE__";
+var ALL_DATASETS = "__ALL_DATASETS__";
+var ALL_REPORTS = "__ALL_REPORTS__";
+var ALL_DASHBOARDS = "__ALL_DASHBOARDS__";
 var POWERBI_SETUP_MAX_WORKSPACES = 10;
 var RESOURCE_DISPLAY_LIMIT = 25;
 var RESOURCE_DATASETS = "datasets";
@@ -38939,14 +39785,12 @@ async function listGroups(proxyFetch) {
   return data.value ?? [];
 }
 async function listResource(proxyFetch, groupId, resource) {
-  const res = await apiFetch35(
-    proxyFetch,
-    `/groups/${encodeURIComponent(groupId)}/${resource}`
-  );
+  const path5 = groupId === MY_WORKSPACE ? `/${resource}` : `/groups/${encodeURIComponent(groupId)}/${resource}`;
+  const res = await apiFetch35(proxyFetch, path5);
   if (!res.ok) {
     const body = await res.text().catch(() => res.statusText);
     throw new Error(
-      `powerbi: list ${resource} for group ${groupId} failed (${res.status}): ${body}`
+      `powerbi: list ${resource} for ${groupId === MY_WORKSPACE ? "My workspace" : `group ${groupId}`} failed (${res.status}): ${body}`
     );
   }
   const data = await res.json();
@@ -38955,6 +39799,99 @@ async function listResource(proxyFetch, groupId, resource) {
 function resourceLabel(r) {
   return r.name ?? r.displayName ?? r.id ?? "(unknown)";
 }
+var INTERNAL_TABLE_PREFIXES = [
+  "DateTableTemplate_",
+  "LocalDateTable_"
+];
+function isInternalColumn(name) {
+  return /^RowNumber-[0-9A-Fa-f-]+$/.test(name);
+}
+async function fetchDatasetSchema(proxyFetch, wsId, datasetId) {
+  const pathPrefix = wsId === MY_WORKSPACE ? "" : `/groups/${encodeURIComponent(wsId)}`;
+  const daxQuery = 'EVALUATE SELECTCOLUMNS(COLUMNSTATISTICS(), "T", [Table Name], "C", [Column Name])';
+  const res = await apiFetch35(
+    proxyFetch,
+    `${pathPrefix}/datasets/${encodeURIComponent(datasetId)}/executeQueries`,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        queries: [{ query: daxQuery }],
+        serializerSettings: { includeNulls: true }
+      })
+    }
+  );
+  if (!res.ok) return /* @__PURE__ */ new Map();
+  const data = await res.json();
+  const rows = data.results?.[0]?.tables?.[0]?.rows ?? [];
+  const schema = /* @__PURE__ */ new Map();
+  for (const row of rows) {
+    const table = row["[T]"] ?? "";
+    const column = row["[C]"] ?? "";
+    if (!table || !column) continue;
+    if (INTERNAL_TABLE_PREFIXES.some((p) => table.startsWith(p))) continue;
+    if (isInternalColumn(column)) continue;
+    if (!schema.has(table)) schema.set(table, []);
+    schema.get(table).push(column);
+  }
+  return schema;
+}
+function workspaceName(wsId, groupById, language) {
+  if (wsId === MY_WORKSPACE) {
+    return language === "ja" ? "\u30DE\u30A4 \u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9" : "My workspace";
+  }
+  return groupById.get(wsId)?.name ?? wsId;
+}
+async function resolveWorkspaceIds(selected, proxyFetch) {
+  return resolveSetupSelection({
+    selected,
+    allSentinel: ALL_WORKSPACES,
+    fetchAll: async () => {
+      const groups = await listGroups(proxyFetch);
+      return [MY_WORKSPACE, ...groups.map((g) => g.id).filter(Boolean)];
+    },
+    limit: POWERBI_SETUP_MAX_WORKSPACES
+  });
+}
+function compoundKey(wsId, objectId) {
+  return `${wsId}:${objectId}`;
+}
+function parseCompoundKey(key) {
+  const idx = key.indexOf(":");
+  if (idx < 0) return { wsId: "", objectId: key };
+  return { wsId: key.slice(0, idx), objectId: key.slice(idx + 1) };
+}
+async function fetchObjectOptions(state, resource, allSentinel, allLabelJa, allLabelEn, rt) {
+  if (!state.workspaces?.length || !state.resources?.includes(resource))
+    return [];
+  const wsIds = await resolveWorkspaceIds(
+    state.workspaces,
+    rt.config.proxyFetch
+  );
+  const allGroups = await listGroups(rt.config.proxyFetch);
+  const groupById = new Map(allGroups.map((g) => [g.id, g]));
+  const multiWorkspace = wsIds.length > 1;
+  const options = [];
+  for (const wsId of wsIds) {
+    const wsLabel = workspaceName(wsId, groupById, rt.language);
+    const items = await listResource(rt.config.proxyFetch, wsId, resource);
+    for (const item of items) {
+      if (!item.id) continue;
+      options.push({
+        value: compoundKey(wsId, item.id),
+        label: multiWorkspace ? `${wsLabel} / ${resourceLabel(item)}` : resourceLabel(item)
+      });
+    }
+  }
+  if (options.length === 0) return [];
+  return [
+    {
+      value: allSentinel,
+      label: rt.language === "ja" ? allLabelJa : allLabelEn
+    },
+    ...options
+  ];
+}
 var powerbiOauthSetupFlow = {
   initialState: () => ({}),
   steps: [
@@ -38973,6 +39910,10 @@ var powerbiOauthSetupFlow = {
             value: ALL_WORKSPACES,
             label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9" : "All workspaces"
           },
+          {
+            value: MY_WORKSPACE,
+            label: rt.language === "ja" ? "\u30DE\u30A4 \u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9" : "My workspace"
+          },
           ...options
         ];
       },
@@ -38987,16 +39928,82 @@ var powerbiOauthSetupFlow = {
       },
       async fetchOptions(state, rt) {
         if (!state.workspaces?.length) return [];
-        const datasetsLabel = rt.language === "ja" ? "\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8" : "Datasets";
-        const reportsLabel = rt.language === "ja" ? "\u30EC\u30DD\u30FC\u30C8" : "Reports";
-        const dashboardsLabel = rt.language === "ja" ? "\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9" : "Dashboards";
         return [
-          { value: RESOURCE_DATASETS, label: datasetsLabel },
-          { value: RESOURCE_REPORTS, label: reportsLabel },
-          { value: RESOURCE_DASHBOARDS, label: dashboardsLabel }
+          {
+            value: RESOURCE_DATASETS,
+            label: rt.language === "ja" ? "\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8" : "Datasets"
+          },
+          {
+            value: RESOURCE_REPORTS,
+            label: rt.language === "ja" ? "\u30EC\u30DD\u30FC\u30C8" : "Reports"
+          },
+          {
+            value: RESOURCE_DASHBOARDS,
+            label: rt.language === "ja" ? "\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9" : "Dashboards"
+          }
         ];
       },
       applyAnswer: (state, answer) => ({ ...state, resources: answer })
+    },
+    {
+      slug: "datasets",
+      type: "multiSelect",
+      question: {
+        ja: "\u4F7F\u7528\u3059\u308B\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
+        en: "Select the datasets you want to use (multi-select allowed)"
+      },
+      async fetchOptions(state, rt) {
+        return fetchObjectOptions(
+          state,
+          RESOURCE_DATASETS,
+          ALL_DATASETS,
+          "\u3059\u3079\u3066\u306E\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8",
+          "All datasets",
+          rt
+        );
+      },
+      applyAnswer: (state, answer) => ({ ...state, selectedDatasets: answer })
+    },
+    {
+      slug: "reports",
+      type: "multiSelect",
+      question: {
+        ja: "\u4F7F\u7528\u3059\u308B\u30EC\u30DD\u30FC\u30C8\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
+        en: "Select the reports you want to use (multi-select allowed)"
+      },
+      async fetchOptions(state, rt) {
+        return fetchObjectOptions(
+          state,
+          RESOURCE_REPORTS,
+          ALL_REPORTS,
+          "\u3059\u3079\u3066\u306E\u30EC\u30DD\u30FC\u30C8",
+          "All reports",
+          rt
+        );
+      },
+      applyAnswer: (state, answer) => ({ ...state, selectedReports: answer })
+    },
+    {
+      slug: "dashboards",
+      type: "multiSelect",
+      question: {
+        ja: "\u4F7F\u7528\u3059\u308B\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
+        en: "Select the dashboards you want to use (multi-select allowed)"
+      },
+      async fetchOptions(state, rt) {
+        return fetchObjectOptions(
+          state,
+          RESOURCE_DASHBOARDS,
+          ALL_DASHBOARDS,
+          "\u3059\u3079\u3066\u306E\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9",
+          "All dashboards",
+          rt
+        );
+      },
+      applyAnswer: (state, answer) => ({
+        ...state,
+        selectedDashboards: answer
+      })
     }
   ],
   async finalize(state, rt) {
@@ -39005,37 +40012,119 @@ var powerbiOauthSetupFlow = {
     }
     const allGroups = await listGroups(rt.config.proxyFetch);
     const groupById = new Map(allGroups.map((g) => [g.id, g]));
-    const targetIds = await resolveSetupSelection({
-      selected: state.workspaces,
-      allSentinel: ALL_WORKSPACES,
-      fetchAll: async () => allGroups.map((g) => g.id).filter((id) => id),
-      limit: POWERBI_SETUP_MAX_WORKSPACES
-    });
+    const wsIds = await resolveWorkspaceIds(
+      state.workspaces,
+      rt.config.proxyFetch
+    );
     const selectedResources = new Set(state.resources);
+    async function resolveObjects(selected, allSentinel, resource) {
+      const byWorkspace = /* @__PURE__ */ new Map();
+      if (!selected || !selectedResources.has(resource)) return byWorkspace;
+      if (selected.includes(allSentinel)) {
+        for (const wsId of wsIds) {
+          const items = await listResource(
+            rt.config.proxyFetch,
+            wsId,
+            resource
+          );
+          const ids = items.map((i) => i.id).filter((id) => !!id);
+          if (ids.length > 0) byWorkspace.set(wsId, new Set(ids));
+        }
+      } else {
+        for (const key of selected) {
+          if (key === allSentinel) continue;
+          const { wsId, objectId } = parseCompoundKey(key);
+          if (!byWorkspace.has(wsId)) byWorkspace.set(wsId, /* @__PURE__ */ new Set());
+          byWorkspace.get(wsId).add(objectId);
+        }
+      }
+      return byWorkspace;
+    }
+    const datasetsByWs = await resolveObjects(
+      state.selectedDatasets,
+      ALL_DATASETS,
+      RESOURCE_DATASETS
+    );
+    const reportsByWs = await resolveObjects(
+      state.selectedReports,
+      ALL_REPORTS,
+      RESOURCE_REPORTS
+    );
+    const dashboardsByWs = await resolveObjects(
+      state.selectedDashboards,
+      ALL_DASHBOARDS,
+      RESOURCE_DASHBOARDS
+    );
+    const allWsIds = /* @__PURE__ */ new Set([
+      ...datasetsByWs.keys(),
+      ...reportsByWs.keys(),
+      ...dashboardsByWs.keys()
+    ]);
     const sections = ["## Power BI", ""];
-    if (!targetIds.length) {
-      sections.push("_No workspaces selected._", "");
+    if (allWsIds.size === 0) {
+      sections.push("_No resources selected._", "");
       return sections.join("\n");
     }
-    for (const id of targetIds) {
-      const group = groupById.get(id);
-      const name = group?.name ?? id;
-      sections.push(`### Workspace: ${name}`, "", `- id: \`${id}\``);
-      for (const resource of [
-        RESOURCE_DATASETS,
-        RESOURCE_REPORTS,
-        RESOURCE_DASHBOARDS
+    for (const wsId of wsIds) {
+      if (!allWsIds.has(wsId)) continue;
+      const name = workspaceName(wsId, groupById, rt.language);
+      sections.push(`### Workspace: ${name}`, "");
+      if (wsId !== MY_WORKSPACE) {
+        sections.push(`- id: \`${wsId}\``);
+      }
+      const datasetIds = datasetsByWs.get(wsId);
+      if (datasetIds?.size) {
+        const items = await listResource(
+          rt.config.proxyFetch,
+          wsId,
+          RESOURCE_DATASETS
+        );
+        const filtered = items.filter(
+          (item) => item.id && datasetIds.has(item.id)
+        );
+        for (const item of filtered.slice(0, RESOURCE_DISPLAY_LIMIT)) {
+          sections.push(`#### Dataset: ${resourceLabel(item)}`, "");
+          const schema = await fetchDatasetSchema(
+            rt.config.proxyFetch,
+            wsId,
+            item.id
+          );
+          if (schema.size > 0) {
+            for (const [table, columns] of schema) {
+              sections.push(`##### Table: ${table}`, "");
+              sections.push("| Column |");
+              sections.push("|--------|");
+              for (const col of columns) {
+                sections.push(`| ${col} |`);
+              }
+              sections.push("");
+            }
+          } else {
+            sections.push("_Schema not available._", "");
+          }
+        }
+      }
+      for (const [resource, selectedByWs, heading] of [
+        [RESOURCE_REPORTS, reportsByWs, "Reports"],
+        [RESOURCE_DASHBOARDS, dashboardsByWs, "Dashboards"]
       ]) {
-        if (!selectedResources.has(resource)) continue;
-        const items = await listResource(rt.config.proxyFetch, id, resource);
-        const heading = resource === RESOURCE_DATASETS ? "Datasets" : resource === RESOURCE_REPORTS ? "Reports" : "Dashboards";
-        sections.push(`- ${heading} (${items.length}):`);
-        for (const item of items.slice(0, RESOURCE_DISPLAY_LIMIT)) {
+        const selectedIds = selectedByWs.get(wsId);
+        if (!selectedIds?.size) continue;
+        const items = await listResource(
+          rt.config.proxyFetch,
+          wsId,
+          resource
+        );
+        const filtered = items.filter(
+          (item) => item.id && selectedIds.has(item.id)
+        );
+        sections.push(`- ${heading} (${filtered.length}):`);
+        for (const item of filtered.slice(0, RESOURCE_DISPLAY_LIMIT)) {
           sections.push(`  - ${resourceLabel(item)}`);
         }
-        if (items.length > RESOURCE_DISPLAY_LIMIT) {
+        if (filtered.length > RESOURCE_DISPLAY_LIMIT) {
           sections.push(
-            `  - \u2026and ${items.length - RESOURCE_DISPLAY_LIMIT} more`
+            `  - \u2026and ${filtered.length - RESOURCE_DISPLAY_LIMIT} more`
           );
         }
       }
@@ -39306,7 +40395,11 @@ async function tableauProxyApiFetch(proxyFetch, params, path5, init) {
 
 // ../connectors/src/connectors/tableau/setup-flow.ts
 var ALL_PROJECTS7 = "__ALL_PROJECTS__";
+var ALL_WORKBOOKS = "__ALL_WORKBOOKS__";
 var TABLEAU_SETUP_MAX_PROJECTS = 10;
+var MAX_WORKBOOKS_DETAIL = 10;
+var MAX_VIEWS_PER_WORKBOOK = 5;
+var MAX_SAMPLE_ROWS = 5;
 var PAGE_SIZE2 = 100;
 async function listAllProjects3(rt) {
   const all = [];
@@ -39355,6 +40448,57 @@ async function listProjectResources(rt, resource) {
   }
   return all;
 }
+async function listViewsForWorkbook(rt, workbookId) {
+  const res = await tableauProxyApiFetch(
+    rt.config.proxyFetch,
+    rt.params,
+    `/sites/{siteId}/workbooks/${encodeURIComponent(workbookId)}/views`
+  );
+  if (!res.ok) return [];
+  const data = await res.json();
+  return data.views?.view ?? [];
+}
+async function fetchViewDataSample(rt, viewId) {
+  try {
+    const res = await tableauProxyApiFetch(
+      rt.config.proxyFetch,
+      rt.params,
+      `/sites/{siteId}/views/${encodeURIComponent(viewId)}/data`
+    );
+    if (!res.ok) return null;
+    const csv = await res.text();
+    const lines = csv.trim().split("\n").filter(Boolean);
+    if (lines.length === 0) return null;
+    const columns = parseCsvLine(lines[0]);
+    const rows = lines.slice(1, 1 + MAX_SAMPLE_ROWS).map(parseCsvLine);
+    return { columns, rows };
+  } catch {
+    return null;
+  }
+}
+function parseCsvLine(line) {
+  const result = [];
+  let current = "";
+  let inQuotes = false;
+  for (let i = 0; i < line.length; i++) {
+    const ch = line[i];
+    if (ch === '"') {
+      if (inQuotes && line[i + 1] === '"') {
+        current += '"';
+        i++;
+      } else {
+        inQuotes = !inQuotes;
+      }
+    } else if (ch === "," && !inQuotes) {
+      result.push(current.trim());
+      current = "";
+    } else {
+      current += ch;
+    }
+  }
+  result.push(current.trim());
+  return result;
+}
 var tableauSetupFlow = {
   initialState: () => ({}),
   steps: [
@@ -39377,6 +40521,39 @@ var tableauSetupFlow = {
         ];
       },
       applyAnswer: (state, answer) => ({ ...state, projects: answer })
+    },
+    {
+      slug: "workbooks",
+      type: "multiSelect",
+      question: {
+        ja: "\u5206\u6790\u5BFE\u8C61\u306E\u30EF\u30FC\u30AF\u30D6\u30C3\u30AF\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
+        en: "Select the workbooks to analyze (multi-select allowed)"
+      },
+      async fetchOptions(state, rt) {
+        if (!state.projects?.length) return [];
+        const allProjects = await listAllProjects3(rt);
+        const targetIds = await resolveSetupSelection({
+          selected: state.projects,
+          allSentinel: ALL_PROJECTS7,
+          fetchAll: async () => allProjects.map((p) => p.id).filter((id) => id),
+          limit: TABLEAU_SETUP_MAX_PROJECTS
+        });
+        const targetSet = new Set(targetIds);
+        const workbooks = await listProjectResources(rt, "workbooks");
+        const options = workbooks.filter((wb) => wb.id && wb.project?.id && targetSet.has(wb.project.id)).map((wb) => ({
+          value: wb.id,
+          label: wb.name ?? wb.id ?? "(unknown)"
+        }));
+        if (options.length === 0) return [];
+        return [
+          {
+            value: ALL_WORKBOOKS,
+            label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30EF\u30FC\u30AF\u30D6\u30C3\u30AF" : "All workbooks"
+          },
+          ...options
+        ];
+      },
+      applyAnswer: (state, answer) => ({ ...state, workbooks: answer })
     }
   ],
   async finalize(state, rt) {
@@ -39385,25 +40562,33 @@ var tableauSetupFlow = {
     }
     const allProjects = await listAllProjects3(rt);
     const projectById = new Map(allProjects.map((p) => [p.id, p]));
-    const targetIds = await resolveSetupSelection({
+    const targetProjectIds = await resolveSetupSelection({
       selected: state.projects,
       allSentinel: ALL_PROJECTS7,
       fetchAll: async () => allProjects.map((p) => p.id).filter((id) => id),
       limit: TABLEAU_SETUP_MAX_PROJECTS
     });
     const sections = ["## Tableau", ""];
-    if (!targetIds.length) {
+    if (!targetProjectIds.length) {
       sections.push("_No projects selected._", "");
       return sections.join("\n");
     }
-    const [workbooks, datasources] = await Promise.all([
+    const [allWorkbooks, datasources] = await Promise.all([
       listProjectResources(rt, "workbooks"),
       listProjectResources(rt, "datasources")
     ]);
+    const projectIdSet = new Set(targetProjectIds);
+    const targetWorkbooks = await resolveSetupSelection({
+      selected: state.workbooks ?? [],
+      allSentinel: ALL_WORKBOOKS,
+      fetchAll: async () => allWorkbooks.filter((wb) => wb.id && wb.project?.id && projectIdSet.has(wb.project.id)).map((wb) => wb.id).filter(Boolean),
+      limit: MAX_WORKBOOKS_DETAIL
+    });
+    const targetWorkbookSet = new Set(targetWorkbooks);
     const workbooksByProject = /* @__PURE__ */ new Map();
-    for (const wb of workbooks) {
+    for (const wb of allWorkbooks) {
       const pid = wb.project?.id;
-      if (!pid) continue;
+      if (!pid || !projectIdSet.has(pid)) continue;
       const bucket = workbooksByProject.get(pid) ?? [];
       bucket.push(wb);
       workbooksByProject.set(pid, bucket);
@@ -39411,32 +40596,78 @@ var tableauSetupFlow = {
     const datasourcesByProject = /* @__PURE__ */ new Map();
     for (const ds of datasources) {
       const pid = ds.project?.id;
-      if (!pid) continue;
+      if (!pid || !projectIdSet.has(pid)) continue;
       const bucket = datasourcesByProject.get(pid) ?? [];
       bucket.push(ds);
       datasourcesByProject.set(pid, bucket);
     }
-    for (const id of targetIds) {
-      const project = projectById.get(id);
-      const name = project?.name ?? id;
-      sections.push(`### Project: ${name}`, "", `- id: \`${id}\``);
-      const projectWorkbooks = workbooksByProject.get(id) ?? [];
-      sections.push(`- Workbooks (${projectWorkbooks.length}):`);
-      for (const wb of projectWorkbooks.slice(0, 25)) {
-        sections.push(`  - ${wb.name ?? wb.id ?? "(unknown)"}`);
-      }
-      if (projectWorkbooks.length > 25) {
-        sections.push(`  - \u2026and ${projectWorkbooks.length - 25} more`);
+    const allDiscoveredColumns = [];
+    for (const pid of targetProjectIds) {
+      const project = projectById.get(pid);
+      sections.push(`### Project: ${project?.name ?? pid}`, "");
+      const projectWorkbooks = workbooksByProject.get(pid) ?? [];
+      for (const wb of projectWorkbooks) {
+        if (!wb.id) continue;
+        const isDetailed = targetWorkbookSet.has(wb.id);
+        sections.push(`#### Workbook: ${wb.name ?? wb.id}`, "");
+        if (!isDetailed) continue;
+        const views = await listViewsForWorkbook(rt, wb.id);
+        if (views.length === 0) {
+          sections.push("_No views found._", "");
+          continue;
+        }
+        for (const view of views.slice(0, MAX_VIEWS_PER_WORKBOOK)) {
+          if (!view.id) continue;
+          sections.push(`##### View: ${view.name ?? view.id}`, "");
+          const sample = await fetchViewDataSample(rt, view.id);
+          if (!sample || sample.columns.length === 0) {
+            sections.push("_Data not available._", "");
+            continue;
+          }
+          allDiscoveredColumns.push(...sample.columns);
+          sections.push(`| ${sample.columns.join(" | ")} |`);
+          sections.push(`|${sample.columns.map(() => "---").join("|")}|`);
+          for (const row of sample.rows) {
+            const cells = row.map((c) => c.replace(/\|/g, "\\|"));
+            sections.push(`| ${cells.join(" | ")} |`);
+          }
+          sections.push("");
+        }
       }
-      const projectDatasources = datasourcesByProject.get(id) ?? [];
-      sections.push(`- Datasources (${projectDatasources.length}):`);
-      for (const ds of projectDatasources.slice(0, 25)) {
-        sections.push(`  - ${ds.name ?? ds.id ?? "(unknown)"}`);
+      const projectDatasources = datasourcesByProject.get(pid) ?? [];
+      if (projectDatasources.length > 0) {
+        sections.push(`#### Datasources (${projectDatasources.length})`, "");
+        for (const ds of projectDatasources.slice(0, 25)) {
+          sections.push(`- ${ds.name ?? ds.id ?? "(unknown)"}`);
+        }
+        sections.push("");
       }
-      if (projectDatasources.length > 25) {
-        sections.push(`  - \u2026and ${projectDatasources.length - 25} more`);
+    }
+    if (allDiscoveredColumns.length > 0) {
+      const unique = [...new Set(allDiscoveredColumns.map((c) => c.toLowerCase()))];
+      const themes = [];
+      const hasPattern = (keywords) => unique.some((c) => keywords.some((k) => c.includes(k)));
+      if (hasPattern(["revenue", "sales", "amount", "price", "cost", "profit", "\u58F2\u4E0A", "\u91D1\u984D", "\u5229\u76CA"]))
+        themes.push("Revenue & profitability analysis (trends, breakdown by segment)");
+      if (hasPattern(["date", "month", "year", "quarter", "day", "\u65E5\u4ED8", "\u6708", "\u5E74", "\u671F"]))
+        themes.push("Time-series trend analysis (YoY, MoM comparisons)");
+      if (hasPattern(["region", "country", "city", "state", "\u5730\u57DF", "\u56FD", "\u90FD\u5E02", "\u5E02"]))
+        themes.push("Geographic/regional performance comparison");
+      if (hasPattern(["product", "category", "item", "sku", "\u5546\u54C1", "\u30AB\u30C6\u30B4\u30EA"]))
+        themes.push("Product/category mix analysis");
+      if (hasPattern(["customer", "user", "account", "\u9867\u5BA2", "\u30E6\u30FC\u30B6\u30FC"]))
+        themes.push("Customer segmentation and behavior analysis");
+      if (hasPattern(["quantity", "count", "volume", "\u6570\u91CF", "\u4EF6\u6570"]))
+        themes.push("Volume and demand pattern analysis");
+      if (hasPattern(["rate", "ratio", "percentage", "%", "\u7387"]))
+        themes.push("KPI ratio tracking and benchmarking");
+      if (themes.length > 0) {
+        sections.push("### Suggested Analysis Themes", "");
+        for (const theme of themes) {
+          sections.push(`- ${theme}`);
+        }
+        sections.push("");
       }
-      sections.push("");
     }
     return sections.join("\n");
   }
@@ -39446,27 +40677,36 @@ var tableauSetupFlow = {
 import { z as z98 } from "zod";
 var DEFAULT_API_VERSION2 = "3.28";
 var REQUEST_TIMEOUT_MS75 = 6e4;
-async function fetchTableauSession(connectionId) {
-  const token = process.env.INTERNAL_SQUADBASE_OAUTH_MACHINE_CREDENTIAL;
-  const sandboxId = process.env.INTERNAL_SQUADBASE_SANDBOX_ID;
-  if (!token || !sandboxId) {
-    throw new Error(
-      "Tableau session manager is not configured. Missing INTERNAL_SQUADBASE_OAUTH_MACHINE_CREDENTIAL or INTERNAL_SQUADBASE_SANDBOX_ID."
-    );
+var cachedToken33 = null;
+async function getProxyToken33(config) {
+  if (cachedToken33 && cachedToken33.expiresAt > Date.now() + 6e4) {
+    return cachedToken33.token;
   }
-  const baseDomain = process.env["SQUADBASE_PREVIEW_BASE_DOMAIN"] ?? "preview.app.squadbase.dev";
-  const url = `https://${sandboxId}.${baseDomain}/_sqcore/connections/${connectionId}/tableau-session`;
+  const url = `${config.appApiBaseUrl}/v0/database/${config.projectId}/environment/${config.environmentId}/oauth-request-proxy-token`;
   const res = await fetch(url, {
     method: "POST",
-    headers: { Authorization: `Bearer ${token}` }
+    headers: {
+      "Content-Type": "application/json",
+      "x-api-key": config.appApiKey,
+      "project-id": config.projectId
+    },
+    body: JSON.stringify({
+      sandboxId: config.sandboxId,
+      issuedBy: "coding-agent"
+    })
   });
   if (!res.ok) {
-    const errBody = await res.text().catch(() => res.statusText);
+    const errorText = await res.text().catch(() => res.statusText);
     throw new Error(
-      `Failed to fetch Tableau session from backend-api (HTTP ${res.status}): ${errBody}`
+      `Failed to get proxy token: HTTP ${res.status} ${errorText}`
     );
   }
-  return await res.json();
+  const data = await res.json();
+  cachedToken33 = {
+    token: data.token,
+    expiresAt: new Date(data.expiresAt).getTime()
+  };
+  return data.token;
 }
 function buildBaseUrl7(serverUrl, apiVersion) {
   return `${serverUrl.replace(/\/$/, "")}/api/${apiVersion}`;
@@ -39508,7 +40748,7 @@ All paths are relative to {serverUrl}/api/{apiVersion}. Use the literal placehol
 Accept and Content-Type headers default to application/json so list responses come back as JSON instead of Tableau's default XML.`,
   inputSchema: inputSchema98,
   outputSchema: outputSchema98,
-  async execute({ connectionId, method, path: path5, queryParams, body }, connections) {
+  async execute({ connectionId, method, path: path5, queryParams, body }, connections, config) {
     const connection = connections.find((c) => c.id === connectionId);
     if (!connection) {
       return {
@@ -39523,50 +40763,42 @@ Accept and Content-Type headers default to application/json so list responses co
       const serverUrl = parameters81.serverUrl.getValue(connection);
       const apiVersion = parameters81.apiVersion.tryGetValue(connection) || DEFAULT_API_VERSION2;
       const trimmedPath = path5.trim().replace(/^([^/])/, "/$1");
-      const queryString = queryParams ? `?${new URLSearchParams(queryParams).toString()}` : "";
       const baseUrl = buildBaseUrl7(serverUrl, apiVersion);
+      let url = `${baseUrl}${trimmedPath}`;
+      if (queryParams) {
+        url += `?${new URLSearchParams(queryParams).toString()}`;
+      }
+      const token = await getProxyToken33(config.oauthProxy);
+      const proxyUrl = `https://${config.oauthProxy.sandboxId}.${config.oauthProxy.previewBaseDomain}/_sqcore/connections/${connectionId}/request`;
       const controller = new AbortController();
       const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS75);
       try {
-        let attempt = 0;
-        while (true) {
-          const session = await fetchTableauSession(connectionId);
-          const resolvedPath = trimmedPath.replace(
-            /\{siteId\}/g,
-            session.siteId
-          );
-          const url = `${baseUrl}${resolvedPath}${queryString}`;
-          const init = {
+        const response = await fetch(proxyUrl, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${token}`
+          },
+          body: JSON.stringify({
+            url,
             method,
-            headers: {
-              "X-Tableau-Auth": session.authToken,
-              Accept: "application/json",
-              "Content-Type": "application/json"
-            },
-            signal: controller.signal
-          };
-          if (body !== void 0) {
-            init.body = JSON.stringify(body);
-          }
-          const response = await fetch(url, init);
-          const text = await response.text();
-          const data = text ? (() => {
-            try {
-              return JSON.parse(text);
-            } catch {
-              return text;
-            }
-          })() : null;
-          if (response.status === 401 && attempt === 0) {
-            attempt++;
-            continue;
-          }
-          if (!response.ok) {
-            const errorMessage = data && typeof data === "object" && "error" in data ? JSON.stringify(data.error) : typeof data === "string" && data ? data : `HTTP ${response.status} ${response.statusText}`;
-            return { success: false, error: errorMessage };
+            ...body !== void 0 ? { body } : {}
+          }),
+          signal: controller.signal
+        });
+        const text = await response.text();
+        const data = text ? (() => {
+          try {
+            return JSON.parse(text);
+          } catch {
+            return text;
           }
-          return { success: true, status: response.status, data };
+        })() : null;
+        if (!response.ok) {
+          const errorMessage = data && typeof data === "object" && "error" in data ? JSON.stringify(data.error) : typeof data === "string" && data ? data : `HTTP ${response.status} ${response.statusText}`;
+          return { success: false, error: errorMessage };
         }
+        return { success: true, status: response.status, data };
       } finally {
         clearTimeout(timeout);
       }
@@ -39758,12 +40990,12 @@ export default async function handler(c: Context) {
 import { z as z99 } from "zod";
 var BASE_HOST13 = "https://graph.microsoft.com";
 var BASE_PATH_SEGMENT19 = "/v1.0";
-var BASE_URL65 = `${BASE_HOST13}${BASE_PATH_SEGMENT19}`;
+var BASE_URL66 = `${BASE_HOST13}${BASE_PATH_SEGMENT19}`;
 var REQUEST_TIMEOUT_MS76 = 6e4;
-var cachedToken33 = null;
-async function getProxyToken33(config) {
-  if (cachedToken33 && cachedToken33.expiresAt > Date.now() + 6e4) {
-    return cachedToken33.token;
+var cachedToken34 = null;
+async function getProxyToken34(config) {
+  if (cachedToken34 && cachedToken34.expiresAt > Date.now() + 6e4) {
+    return cachedToken34.token;
   }
   const url = `${config.appApiBaseUrl}/v0/database/${config.projectId}/environment/${config.environmentId}/oauth-request-proxy-token`;
   const res = await fetch(url, {
@@ -39785,7 +41017,7 @@ async function getProxyToken33(config) {
     );
   }
   const data = await res.json();
-  cachedToken33 = {
+  cachedToken34 = {
     token: data.token,
     expiresAt: new Date(data.expiresAt).getTime()
   };
@@ -39837,12 +41069,12 @@ For full-text search use the \`$search\` query parameter (must be wrapped in dou
     );
     try {
       const normalizedPath = normalizeRequestPath(path5, BASE_PATH_SEGMENT19);
-      let url = `${BASE_URL65}${normalizedPath}`;
+      let url = `${BASE_URL66}${normalizedPath}`;
       if (queryParams) {
         const searchParams = new URLSearchParams(queryParams);
         url += `?${searchParams.toString()}`;
       }
-      const token = await getProxyToken33(config.oauthProxy);
+      const token = await getProxyToken34(config.oauthProxy);
       const proxyUrl = `https://${config.oauthProxy.sandboxId}.${config.oauthProxy.previewBaseDomain}/_sqcore/connections/${connectionId}/request`;
       const controller = new AbortController();
       const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS76);