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

package/dist/connectors/google-analytics.js

@@ -67,15 +67,6 @@ var parameters = {
     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
   })
 };
 
@@ -107,15 +98,9 @@ function buildJwt(clientEmail, privateKey, nowSec) {
 }
 function createClient(params) {
   const serviceAccountKeyJsonBase64 = params[parameters.serviceAccountKeyJsonBase64.slug];
-  const propertyId = params[parameters.propertyId.slug];
-  if (!serviceAccountKeyJsonBase64 || !propertyId) {
-    const required = [
-      parameters.serviceAccountKeyJsonBase64.slug,
-      parameters.propertyId.slug
-    ];
-    const missing = required.filter((s) => !params[s]);
+  if (!serviceAccountKeyJsonBase64) {
     throw new Error(
-      `google-analytics: missing required parameters: ${missing.join(", ")}`
+      `google-analytics: missing required parameters: ${parameters.serviceAccountKeyJsonBase64.slug}`
     );
   }
   let serviceAccountKey;
@@ -169,13 +154,12 @@ function createClient(params) {
   return {
     async request(path2, init) {
       const accessToken = await getAccessToken2();
-      const resolvedPath = path2.replace(/\{propertyId\}/g, propertyId);
-      const url = `${BASE_URL.replace(/\/+$/, "")}/${resolvedPath.replace(/^\/+/, "")}`;
+      const url = `${BASE_URL.replace(/\/+$/, "")}/${path2.replace(/^\/+/, "")}`;
       const headers = new Headers(init?.headers);
       headers.set("Authorization", `Bearer ${accessToken}`);
       return fetch(url, { ...init, headers });
     },
-    async runReport(request) {
+    async runReport(propertyId, request) {
       const response = await this.request(
         `properties/${propertyId}:runReport`,
         {
@@ -196,7 +180,7 @@ function createClient(params) {
         rowCount: data.rowCount ?? 0
       };
     },
-    async getMetadata() {
+    async getMetadata(propertyId) {
       const response = await this.request(
         `properties/${propertyId}/metadata`,
         { method: "GET" }
@@ -209,7 +193,7 @@ function createClient(params) {
       }
       return await response.json();
     },
-    async runRealtimeReport(request) {
+    async runRealtimeReport(propertyId, request) {
       const response = await this.request(
         `properties/${propertyId}:runRealtimeReport`,
         {
@@ -405,19 +389,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) : [];
@@ -429,11 +428,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;
@@ -465,6 +474,7 @@ var googleAnalyticsOnboarding = new ConnectorOnboarding({
 import * as crypto2 from "crypto";
 var TOKEN_URL2 = "https://oauth2.googleapis.com/token";
 var ADMIN_BASE_URL = "https://analyticsadmin.googleapis.com/v1beta";
+var DATA_BASE_URL = "https://analyticsdata.googleapis.com/v1beta";
 var SCOPE2 = "https://www.googleapis.com/auth/analytics.readonly";
 function base64url2(input) {
   const buf = typeof input === "string" ? Buffer.from(input) : input;
@@ -546,10 +556,25 @@ async function adminFetch(params, path2, init) {
   headers.set("Authorization", `Bearer ${accessToken}`);
   return fetch(url, { ...init, headers });
 }
+async function dataFetch(params, path2, init) {
+  const keyJsonBase64 = params[parameters.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}${path2.startsWith("/") ? "" : "/"}${path2}`;
+  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;
@@ -576,6 +601,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: [
@@ -587,15 +654,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] })
     },
@@ -608,68 +679,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 accountLabel = 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: ${accountLabel}`,
-      ""
-    ];
-    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 accountLabel = 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: ${accountLabel}`, "");
+      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 displayName = (prop?.displayName ?? "-").replace(/\|/g, "\\|");
+        const timeZone = prop?.timeZone ?? "-";
+        const currency = prop?.currencyCode ?? "-";
+        const industry = (prop?.industryCategory ?? "-").replace(
+          /\|/g,
+          "\\|"
+        );
+        sections.push(
+          `| ${pid} | ${displayName} | ${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 displayName = (prop?.displayName ?? "-").replace(/\|/g, "\\|");
-      const timeZone = prop?.timeZone ?? "-";
-      const currency = prop?.currencyCode ?? "-";
-      const industry = (prop?.industryCategory ?? "-").replace(/\|/g, "\\|");
-      sections.push(
-        `| ${propertyId} | ${displayName} | ${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");
   }
 };
@@ -681,8 +801,9 @@ var REQUEST_TIMEOUT_MS = 6e4;
 var inputSchema = z.object({
   toolUseIntent: z.string().optional().describe("Brief description of what you intend to accomplish with this tool call"),
   connectionId: z.string().describe("ID of the Google Analytics connection to use"),
+  propertyId: z.string().describe("GA4 property ID (e.g., '123456789')"),
   method: z.enum(["GET", "POST"]).describe("HTTP method"),
-  path: z.string().describe("API path (e.g., 'properties/{propertyId}:runReport'). {propertyId} is automatically replaced."),
+  path: z.string().describe("API path (e.g., 'properties/{propertyId}:runReport'). {propertyId} is replaced with the propertyId parameter."),
   body: z.record(z.string(), z.unknown()).optional().describe("POST request body (JSON)")
 });
 var outputSchema = z.discriminatedUnion("success", [
@@ -700,10 +821,10 @@ var requestTool = 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,
   outputSchema,
-  async execute({ connectionId, method, path: path2, body }, connections) {
+  async execute({ connectionId, propertyId, method, path: path2, body }, connections) {
     const connection2 = connections.find((c) => c.id === connectionId);
     if (!connection2) {
       return { success: false, error: `Connection ${connectionId} not found` };
@@ -712,7 +833,6 @@ Authentication is handled automatically using a service account.
     try {
       const { GoogleAuth } = await import("google-auth-library");
       const keyJsonBase64 = parameters.serviceAccountKeyJsonBase64.getValue(connection2);
-      const propertyId = parameters.propertyId.getValue(connection2);
       const credentials = JSON.parse(
         Buffer.from(keyJsonBase64, "base64").toString("utf-8")
       );
@@ -772,16 +892,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
@@ -791,12 +911,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" }],
@@ -840,16 +961,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
@@ -859,12 +980,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" }],
@@ -918,12 +1040,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 };

package/dist/connectors/google-audit-log.js

@@ -290,19 +290,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) : [];
@@ -314,11 +329,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;

package/dist/connectors/google-calendar-oauth.js

@@ -306,19 +306,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) : [];
@@ -330,11 +345,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;