@squadbase/vite-server 0.1.17-dev.24af54e → 0.1.17-dev.423ee34

package/dist/connectors/powerbi-oauth.js

@@ -190,7 +190,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
   /**
    * Create tools for connections that belong to this connector.
    * Filters connections by connectorKey internally.
-   * Returns tools keyed as `${connectorKey}_${toolName}`.
+   * Returns tools keyed as `connector_${connectorKey}_${toolName}`.
    */
   createTools(connections, config, opts) {
     const myConnections = connections.filter(
@@ -200,7 +200,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
     for (const t of Object.values(this.tools)) {
       const tool = t.createTool(myConnections, config);
       const originalToModelOutput = tool.toModelOutput;
-      result[`${this.connectorKey}_${t.name}`] = {
+      result[`connector_${this.connectorKey}_${t.name}`] = {
         ...tool,
         toModelOutput: async (options) => {
           if (!originalToModelOutput) {
@@ -256,19 +256,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) : [];
@@ -280,11 +295,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;
@@ -466,14 +491,14 @@ var powerbiOauthOnboarding = new ConnectorOnboarding({
 - Write only 1 sentence between tool calls, then immediately call the next tool`
   },
   dataOverviewInstructions: {
-    en: `1. Call powerbi-oauth_request with GET /groups to list accessible workspaces
-2. For a target workspace, call powerbi-oauth_request with GET /groups/{groupId}/datasets to list datasets
-3. Call powerbi-oauth_request with GET /groups/{groupId}/reports to list reports
-4. For each interesting dataset call powerbi-oauth_request with GET /groups/{groupId}/datasets/{datasetId}/tables to inspect tables`,
-    ja: `1. powerbi-oauth_request \u3067 GET /groups \u3092\u547C\u3073\u51FA\u3057\u3001\u30A2\u30AF\u30BB\u30B9\u53EF\u80FD\u306A\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u4E00\u89A7\u3092\u53D6\u5F97
-2. \u5BFE\u8C61\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306B\u5BFE\u3057\u3066 powerbi-oauth_request \u3067 GET /groups/{groupId}/datasets \u3092\u547C\u3073\u51FA\u3057\u3001\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u4E00\u89A7\u3092\u53D6\u5F97
-3. powerbi-oauth_request \u3067 GET /groups/{groupId}/reports \u3092\u547C\u3073\u51FA\u3057\u3001\u30EC\u30DD\u30FC\u30C8\u4E00\u89A7\u3092\u53D6\u5F97
-4. \u8208\u5473\u306E\u3042\u308B\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u306B\u3064\u3044\u3066 powerbi-oauth_request \u3067 GET /groups/{groupId}/datasets/{datasetId}/tables \u3092\u547C\u3073\u51FA\u3057\u3001\u30C6\u30FC\u30D6\u30EB\u69CB\u9020\u3092\u78BA\u8A8D`
+    en: `1. Call connector_powerbi-oauth_request with GET /groups to list accessible workspaces
+2. For a target workspace, call connector_powerbi-oauth_request with GET /groups/{groupId}/datasets to list datasets
+3. Call connector_powerbi-oauth_request with GET /groups/{groupId}/reports to list reports
+4. For each interesting dataset call connector_powerbi-oauth_request with GET /groups/{groupId}/datasets/{datasetId}/tables to inspect tables`,
+    ja: `1. connector_powerbi-oauth_request \u3067 GET /groups \u3092\u547C\u3073\u51FA\u3057\u3001\u30A2\u30AF\u30BB\u30B9\u53EF\u80FD\u306A\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u4E00\u89A7\u3092\u53D6\u5F97
+2. \u5BFE\u8C61\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306B\u5BFE\u3057\u3066 connector_powerbi-oauth_request \u3067 GET /groups/{groupId}/datasets \u3092\u547C\u3073\u51FA\u3057\u3001\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u4E00\u89A7\u3092\u53D6\u5F97
+3. connector_powerbi-oauth_request \u3067 GET /groups/{groupId}/reports \u3092\u547C\u3073\u51FA\u3057\u3001\u30EC\u30DD\u30FC\u30C8\u4E00\u89A7\u3092\u53D6\u5F97
+4. \u8208\u5473\u306E\u3042\u308B\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u306B\u3064\u3044\u3066 connector_powerbi-oauth_request \u3067 GET /groups/{groupId}/datasets/{datasetId}/tables \u3092\u547C\u3073\u51FA\u3057\u3001\u30C6\u30FC\u30D6\u30EB\u69CB\u9020\u3092\u78BA\u8A8D`
   }
 });
 
@@ -489,6 +514,10 @@ function apiFetch(proxyFetch, path2, 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";
@@ -504,14 +533,12 @@ async function listGroups(proxyFetch) {
   return data.value ?? [];
 }
 async function listResource(proxyFetch, groupId, resource) {
-  const res = await apiFetch(
-    proxyFetch,
-    `/groups/${encodeURIComponent(groupId)}/${resource}`
-  );
+  const path2 = groupId === MY_WORKSPACE ? `/${resource}` : `/groups/${encodeURIComponent(groupId)}/${resource}`;
+  const res = await apiFetch(proxyFetch, path2);
   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();
@@ -520,6 +547,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 apiFetch(
+    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: [
@@ -538,6 +658,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
         ];
       },
@@ -552,16 +676,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) {
@@ -570,37 +760,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`
           );
         }
       }
@@ -634,7 +906,7 @@ var powerbiOauthConnector = new ConnectorPlugin({
   systemPrompt: {
     en: `### Tools
 
-- \`powerbi-oauth_request\`: The only way to call the Power BI REST API v1.0. Use it to list workspaces (\`/groups\`), datasets, reports, and to run DAX via the \`executeQueries\` endpoint. Authentication is configured automatically via OAuth (Microsoft Entra ID).
+- \`connector_powerbi-oauth_request\`: The only way to call the Power BI REST API v1.0. Use it to list workspaces (\`/groups\`), datasets, reports, and to run DAX via the \`executeQueries\` endpoint. Authentication is configured automatically via OAuth (Microsoft Entra ID).
 
 ### Business Logic
 
@@ -690,7 +962,7 @@ export default async function handler(c: Context) {
 - Each \`executeQueries\` call accepts one query in the \`queries\` array (per current Power BI API limits)`,
     ja: `### \u30C4\u30FC\u30EB
 
-- \`powerbi-oauth_request\`: Power BI REST API v1.0 \u3092\u547C\u3073\u51FA\u3059\u552F\u4E00\u306E\u624B\u6BB5\u3067\u3059\u3002\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9 (\`/groups\`)\u3001\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u3001\u30EC\u30DD\u30FC\u30C8\u306E\u4E00\u89A7\u53D6\u5F97\u3084\u3001\`executeQueries\` \u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8\u306B\u3088\u308B DAX \u306E\u5B9F\u884C\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002OAuth (Microsoft Entra ID) \u7D4C\u7531\u3067\u8A8D\u8A3C\u306F\u81EA\u52D5\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002
+- \`connector_powerbi-oauth_request\`: Power BI REST API v1.0 \u3092\u547C\u3073\u51FA\u3059\u552F\u4E00\u306E\u624B\u6BB5\u3067\u3059\u3002\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9 (\`/groups\`)\u3001\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u3001\u30EC\u30DD\u30FC\u30C8\u306E\u4E00\u89A7\u53D6\u5F97\u3084\u3001\`executeQueries\` \u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8\u306B\u3088\u308B DAX \u306E\u5B9F\u884C\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002OAuth (Microsoft Entra ID) \u7D4C\u7531\u3067\u8A8D\u8A3C\u306F\u81EA\u52D5\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002
 
 ### Business Logic
 

package/dist/connectors/salesforce.js

@@ -16,6 +16,7 @@ var init_parameter_definition = __esm({
       type;
       secret;
       required;
+      isDeprecated;
       constructor(config) {
         this.slug = config.slug;
         this.name = config.name;
@@ -24,6 +25,7 @@ var init_parameter_definition = __esm({
         this.type = config.type;
         this.secret = config.secret;
         this.required = config.required;
+        this.isDeprecated = config.isDeprecated ?? false;
       }
       /**
        * Get the parameter value from a ConnectorConnectionObject.
@@ -331,7 +333,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
   /**
    * Create tools for connections that belong to this connector.
    * Filters connections by connectorKey internally.
-   * Returns tools keyed as `${connectorKey}_${toolName}`.
+   * Returns tools keyed as `connector_${connectorKey}_${toolName}`.
    */
   createTools(connections, config, opts) {
     const myConnections = connections.filter(
@@ -341,7 +343,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
     for (const t of Object.values(this.tools)) {
       const tool = t.createTool(myConnections, config);
       const originalToModelOutput = tool.toModelOutput;
-      result[`${this.connectorKey}_${t.name}`] = {
+      result[`connector_${this.connectorKey}_${t.name}`] = {
         ...tool,
         toModelOutput: async (options) => {
           if (!originalToModelOutput) {
@@ -397,19 +399,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) : [];
@@ -421,11 +438,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;
@@ -446,11 +473,11 @@ var AUTH_TYPES = {
 // ../connectors/src/connectors/salesforce/setup.ts
 var salesforceOnboarding = new ConnectorOnboarding({
   dataOverviewInstructions: {
-    en: `1. Call salesforce_request with GET /services/data/v60.0/sobjects/ to list available sObjects (standard + custom)
-2. Call salesforce_request with GET /services/data/v60.0/sobjects/Account/describe to inspect Account fields; repeat for Contact, Opportunity, Lead as needed
+    en: `1. Call connector_salesforce_request with GET /services/data/v60.0/sobjects/ to list available sObjects (standard + custom)
+2. Call connector_salesforce_request with GET /services/data/v60.0/sobjects/Account/describe to inspect Account fields; repeat for Contact, Opportunity, Lead as needed
 3. Run a sample SOQL query: GET /services/data/v60.0/query?q=SELECT+Id,Name,Industry+FROM+Account+LIMIT+5 to verify access and explore data`,
-    ja: `1. salesforce_request \u3067 GET /services/data/v60.0/sobjects/ \u3092\u547C\u3073\u51FA\u3057\u3001\u5229\u7528\u53EF\u80FD\u306A sObject\uFF08\u6A19\u6E96 + \u30AB\u30B9\u30BF\u30E0\uFF09\u3092\u4E00\u89A7\u53D6\u5F97
-2. salesforce_request \u3067 GET /services/data/v60.0/sobjects/Account/describe \u3092\u547C\u3073\u51FA\u3057 Account \u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u78BA\u8A8D\u3002Contact / Opportunity / Lead \u306A\u3069\u5FC5\u8981\u306A sObject \u306B\u5BFE\u3057\u3066\u540C\u69D8\u306B\u5B9F\u884C
+    ja: `1. connector_salesforce_request \u3067 GET /services/data/v60.0/sobjects/ \u3092\u547C\u3073\u51FA\u3057\u3001\u5229\u7528\u53EF\u80FD\u306A sObject\uFF08\u6A19\u6E96 + \u30AB\u30B9\u30BF\u30E0\uFF09\u3092\u4E00\u89A7\u53D6\u5F97
+2. connector_salesforce_request \u3067 GET /services/data/v60.0/sobjects/Account/describe \u3092\u547C\u3073\u51FA\u3057 Account \u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u78BA\u8A8D\u3002Contact / Opportunity / Lead \u306A\u3069\u5FC5\u8981\u306A sObject \u306B\u5BFE\u3057\u3066\u540C\u69D8\u306B\u5B9F\u884C
 3. \u30B5\u30F3\u30D7\u30EB SOQL \u3092\u5B9F\u884C: GET /services/data/v60.0/query?q=SELECT+Id,Name,Industry+FROM+Account+LIMIT+5 \u3067\u30A2\u30AF\u30BB\u30B9\u53EF\u5426\u3068\u30C7\u30FC\u30BF\u69CB\u9020\u3092\u78BA\u8A8D`
   }
 });
@@ -540,6 +567,20 @@ async function describeSObject(params, name) {
   const data = await res.json();
   return data.fields ?? [];
 }
+async function fetchSObjectCount(params, objectName) {
+  try {
+    const query = encodeURIComponent(`SELECT COUNT() FROM ${objectName}`);
+    const res = await apiFetch(
+      params,
+      `/services/data/${SALESFORCE_API_VERSION}/query?q=${query}`
+    );
+    if (!res.ok) return null;
+    const data = await res.json();
+    return typeof data.totalSize === "number" ? data.totalSize : null;
+  } catch {
+    return null;
+  }
+}
 var salesforceSetupFlow = {
   initialState: () => ({}),
   steps: [
@@ -574,8 +615,27 @@ var salesforceSetupFlow = {
       limit: SALESFORCE_SETUP_MAX_OBJECTS
     });
     const sections = ["## Salesforce", ""];
+    const countByObject = /* @__PURE__ */ new Map();
+    for (const objectName of targetObjects) {
+      countByObject.set(
+        objectName,
+        await fetchSObjectCount(rt.params, objectName)
+      );
+    }
+    sections.push("### Record counts", "");
+    sections.push("| sObject | Record count |");
+    sections.push("|---------|-------------|");
+    for (const objectName of targetObjects) {
+      const count = countByObject.get(objectName);
+      sections.push(
+        `| ${objectName} | ${count == null ? "-" : count.toLocaleString()} |`
+      );
+    }
+    sections.push("");
     for (const objectName of targetObjects) {
-      sections.push(`### sObject: ${objectName}`, "");
+      const count = countByObject.get(objectName);
+      const countLabel = count == null ? "" : ` (${count.toLocaleString()} records)`;
+      sections.push(`### sObject: ${objectName}${countLabel}`, "");
       const fields = await describeSObject(rt.params, objectName);
       const limited = fields.slice(0, SALESFORCE_SETUP_MAX_FIELDS);
       sections.push("| Field | Type | Label | Custom |");
@@ -745,7 +805,7 @@ var salesforceConnector = new ConnectorPlugin({
   systemPrompt: {
     en: `### Tools
 
-- \`salesforce_request\`: The only way to call the Salesforce REST API. Use it to run SOQL queries, describe sObjects, and read/create/update/delete standard (Account, Contact, Opportunity, Lead, Case) and custom objects. Authentication (OAuth 2.0 Client Credentials Flow against the External Client App / Connected App) is configured automatically \u2014 an access token is resolved on each request against the configured org instance URL. Prefer SOQL via \`GET /services/data/v60.0/query?q=...\` over paginating \`/sobjects/{Type}\` endpoints for filtered or joined reads.
+- \`connector_salesforce_request\`: The only way to call the Salesforce REST API. Use it to run SOQL queries, describe sObjects, and read/create/update/delete standard (Account, Contact, Opportunity, Lead, Case) and custom objects. Authentication (OAuth 2.0 Client Credentials Flow against the External Client App / Connected App) is configured automatically \u2014 an access token is resolved on each request against the configured org instance URL. Prefer SOQL via \`GET /services/data/v60.0/query?q=...\` over paginating \`/sobjects/{Type}\` endpoints for filtered or joined reads.
 
 ### Business Logic
 
@@ -816,7 +876,7 @@ export default async function handler(c: Context) {
 - Parent-to-child subquery: \`SELECT Id, Name, (SELECT Id, Email FROM Contacts) FROM Account\``,
     ja: `### \u30C4\u30FC\u30EB
 
-- \`salesforce_request\`: Salesforce REST API \u3092\u547C\u3073\u51FA\u3059\u552F\u4E00\u306E\u624B\u6BB5\u3067\u3059\u3002SOQL \u30AF\u30A8\u30EA\u306E\u5B9F\u884C\u3001sObject \u306E describe\u3001\u6A19\u6E96\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\uFF08Account, Contact, Opportunity, Lead, Case\uFF09\u3084\u30AB\u30B9\u30BF\u30E0\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u8AAD\u307F\u66F8\u304D\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002\u8A8D\u8A3C\uFF08External Client App / Connected App + OAuth 2.0 Client Credentials Flow\uFF09\u306F\u81EA\u52D5\u3067\u884C\u308F\u308C\u3001\u8A2D\u5B9A\u3055\u308C\u305F\u7D44\u7E54\u306E instance URL \u306B\u5BFE\u3057\u3066\u30EA\u30AF\u30A8\u30B9\u30C8\u3054\u3068\u306B\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3\u304C\u89E3\u6C7A\u3055\u308C\u307E\u3059\u3002\u30D5\u30A3\u30EB\u30BF\u3084\u7D50\u5408\u306E\u3042\u308B\u8AAD\u307F\u53D6\u308A\u3067\u306F \`/sobjects/{Type}\` \u3092\u30DA\u30FC\u30B8\u30F3\u30B0\u3059\u308B\u306E\u3067\u306F\u306A\u304F\u3001\`GET /services/data/v60.0/query?q=...\` \u306E SOQL \u3092\u512A\u5148\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+- \`connector_salesforce_request\`: Salesforce REST API \u3092\u547C\u3073\u51FA\u3059\u552F\u4E00\u306E\u624B\u6BB5\u3067\u3059\u3002SOQL \u30AF\u30A8\u30EA\u306E\u5B9F\u884C\u3001sObject \u306E describe\u3001\u6A19\u6E96\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\uFF08Account, Contact, Opportunity, Lead, Case\uFF09\u3084\u30AB\u30B9\u30BF\u30E0\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u8AAD\u307F\u66F8\u304D\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002\u8A8D\u8A3C\uFF08External Client App / Connected App + OAuth 2.0 Client Credentials Flow\uFF09\u306F\u81EA\u52D5\u3067\u884C\u308F\u308C\u3001\u8A2D\u5B9A\u3055\u308C\u305F\u7D44\u7E54\u306E instance URL \u306B\u5BFE\u3057\u3066\u30EA\u30AF\u30A8\u30B9\u30C8\u3054\u3068\u306B\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3\u304C\u89E3\u6C7A\u3055\u308C\u307E\u3059\u3002\u30D5\u30A3\u30EB\u30BF\u3084\u7D50\u5408\u306E\u3042\u308B\u8AAD\u307F\u53D6\u308A\u3067\u306F \`/sobjects/{Type}\` \u3092\u30DA\u30FC\u30B8\u30F3\u30B0\u3059\u308B\u306E\u3067\u306F\u306A\u304F\u3001\`GET /services/data/v60.0/query?q=...\` \u306E SOQL \u3092\u512A\u5148\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
 ### Business Logic