@squadbase/vite-server 0.1.17-dev.3b633bb → 0.1.17-dev.7408ec4

package/dist/connectors/notion.js

@@ -361,12 +361,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,

package/dist/connectors/oracle.js

@@ -624,12 +624,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,

package/dist/connectors/outlook-oauth.js

@@ -311,12 +311,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,

package/dist/connectors/powerbi-oauth.js

@@ -269,12 +269,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,

package/dist/connectors/salesforce.js

@@ -410,12 +410,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,

package/dist/connectors/semrush.js

@@ -374,12 +374,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,

package/dist/connectors/sentry.js

@@ -365,12 +365,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,

package/dist/connectors/shopify-oauth.js

@@ -191,12 +191,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,

package/dist/connectors/shopify.js

@@ -478,12 +478,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,

package/dist/connectors/sqlserver.js

@@ -589,12 +589,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,

package/dist/connectors/stripe-api-key.js

@@ -271,12 +271,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,

package/dist/connectors/stripe-oauth.js

@@ -193,12 +193,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,

package/dist/connectors/supabase.js

@@ -285,12 +285,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,

package/dist/connectors/tableau.js

@@ -382,12 +382,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,

package/dist/connectors/tiktok-ads.js

@@ -248,12 +248,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,

package/dist/connectors/wix-store.js

@@ -396,12 +396,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,

package/dist/connectors/zendesk-oauth.js

@@ -191,12 +191,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,

package/dist/connectors/zendesk.js

@@ -378,12 +378,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,

package/dist/index.js

@@ -804,12 +804,6 @@ async function runSetupFlow(flow, params, ctx, config) {
     }
     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,
@@ -7607,6 +7601,15 @@ 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). Automatically set during the setup flow.",
+    envVarBaseKey: "GA_PROPERTY_ID",
+    type: "text",
+    secret: false,
+    required: false
   })
 };
 
@@ -7844,23 +7847,40 @@ var googleAnalyticsSetupFlow = {
           return [];
         }
       },
-      applyAnswer: (state, answer) => ({ ...state, properties: answer })
+      applyAnswer: (state, answer) => ({ ...state, properties: answer }),
+      toParameterUpdates: (state) => {
+        const first = state.properties?.find((v) => v !== ALL_PROPERTIES);
+        return first ? [{ slug: parameters13.propertyId.slug, value: first }] : [];
+      }
     },
     {
       slug: "manualPropertyId",
-      type: "text",
+      type: "select",
+      allowFreeText: true,
       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) {
+      async fetchOptions(state, rt) {
         if (state.properties?.length) return [];
-        return [{ value: "_show", label: "" }];
+        const existing = rt.params[parameters13.propertyId.slug];
+        return existing ? [{ value: existing, label: existing }] : [
+          {
+            value: "example",
+            label: rt.language === "ja" ? "\u4F8B: 123456789" : "Example: 123456789"
+          }
+        ];
       },
       applyAnswer: (state, answer) => ({
         ...state,
         manualPropertyId: answer[0]
-      })
+      }),
+      toParameterUpdates: (state) => state.manualPropertyId ? [
+        {
+          slug: parameters13.propertyId.slug,
+          value: state.manualPropertyId
+        }
+      ] : []
     }
   ],
   async finalize(state, rt) {
@@ -7916,7 +7936,7 @@ var googleAnalyticsSetupFlow = {
       }
       return sections.join("\n");
     }
-    const propertyId = state.manualPropertyId;
+    const propertyId = state.manualPropertyId ?? rt.params[parameters13.propertyId.slug];
     if (propertyId) {
       sections.push(`### Property: ${propertyId}`, "");
       const { dimensions, metrics } = await getMetadata(
@@ -7927,7 +7947,7 @@ var googleAnalyticsSetupFlow = {
       return sections.join("\n");
     }
     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._",
+      "_Could not list GA4 accounts. Please enable the Google Analytics Admin API in your GCP project, or set the Property ID parameter manually._",
       ""
     );
     return sections.join("\n");
@@ -7941,9 +7961,8 @@ 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 replaced with the propertyId parameter."),
+  path: z20.string().describe("API path (e.g., 'properties/{propertyId}:runReport'). {propertyId} is automatically replaced."),
   body: z20.record(z20.string(), z20.unknown()).optional().describe("POST request body (JSON)")
 });
 var outputSchema20 = z20.discriminatedUnion("success", [
@@ -7961,10 +7980,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 propertyId parameter.`,
+{propertyId} in the path is automatically replaced with the connection's property-id.`,
   inputSchema: inputSchema20,
   outputSchema: outputSchema20,
-  async execute({ connectionId, propertyId, method, path: path5, body }, connections) {
+  async execute({ connectionId, method, path: path5, body }, connections) {
     const connection2 = connections.find((c) => c.id === connectionId);
     if (!connection2) {
       return { success: false, error: `Connection ${connectionId} not found` };
@@ -7973,6 +7992,7 @@ Authentication is handled automatically using a service account.
     try {
       const { GoogleAuth } = await import("google-auth-library");
       const keyJsonBase64 = parameters13.serviceAccountKeyJsonBase64.getValue(connection2);
+      const propertyId = parameters13.propertyId.getValue(connection2);
       const credentials = JSON.parse(
         Buffer.from(keyJsonBase64, "base64").toString("utf-8")
       );
@@ -8032,16 +8052,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. Requires a \`propertyId\` parameter. 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. 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(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.runReport(request)\` \u2014 run a GA4 report
+- \`client.runRealtimeReport(request)\` \u2014 run a realtime report
+- \`client.getMetadata()\` \u2014 fetch available dimensions/metrics
 - \`client.request(path, init?)\` \u2014 low-level authenticated fetch
 
 \`\`\`ts
@@ -8051,13 +8071,12 @@ import { connection } from "@squadbase/vite-server/connectors/google-analytics";
 const ga = connection("<connectionId>");
 
 export default async function handler(c: Context) {
-  const { propertyId, startDate = "7daysAgo", endDate = "today" } = await c.req.json<{
-    propertyId: string;
+  const { startDate = "7daysAgo", endDate = "today" } = await c.req.json<{
     startDate?: string;
     endDate?: string;
   }>();
 
-  const { rows } = await ga.runReport(propertyId, {
+  const { rows } = await ga.runReport({
     dateRanges: [{ startDate, endDate }],
     dimensions: [{ name: "date" }],
     metrics: [{ name: "activeUsers" }, { name: "sessions" }],
@@ -8101,16 +8120,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\`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
+- \`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
 
 ### 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(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.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.request(path, init?)\` \u2014 \u4F4E\u30EC\u30D9\u30EB\u306E\u8A8D\u8A3C\u4ED8\u304Dfetch
 
 \`\`\`ts
@@ -8120,13 +8139,12 @@ import { connection } from "@squadbase/vite-server/connectors/google-analytics";
 const ga = connection("<connectionId>");
 
 export default async function handler(c: Context) {
-  const { propertyId, startDate = "7daysAgo", endDate = "today" } = await c.req.json<{
-    propertyId: string;
+  const { startDate = "7daysAgo", endDate = "today" } = await c.req.json<{
     startDate?: string;
     endDate?: string;
   }>();
 
-  const { rows } = await ga.runReport(propertyId, {
+  const { rows } = await ga.runReport({
     dateRanges: [{ startDate, endDate }],
     dimensions: [{ name: "date" }],
     metrics: [{ name: "activeUsers" }, { name: "sessions" }],
@@ -8179,8 +8197,15 @@ activeUsers, sessions, screenPageViews, bounceRate, averageSessionDuration, conv
         error: "google-analytics: missing service account key"
       };
     }
+    const propertyId = params[parameters13.propertyId.slug];
+    if (!propertyId) {
+      return { success: true };
+    }
     try {
-      const res = await dataFetch(params, `/metadata`);
+      const res = await dataFetch(
+        params,
+        `/properties/${propertyId}/metadata`
+      );
       if (!res.ok) {
         const body = await res.text().catch(() => res.statusText);
         return {