@squadbase/vite-server 0.1.3-dev.8 → 0.1.3

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

@@ -217,21 +217,58 @@ var ConnectorPlugin = class _ConnectorPlugin {
    * Filters connections by connectorKey internally.
    * Returns tools keyed as `${connectorKey}_${toolName}`.
    */
-  createTools(connections, config) {
+  createTools(connections, config, opts) {
     const myConnections = connections.filter(
       (c) => _ConnectorPlugin.deriveKey(c.connector.slug, c.connector.authType) === this.connectorKey
     );
     const result = {};
     for (const t of Object.values(this.tools)) {
-      result[`${this.connectorKey}_${t.name}`] = t.createTool(
-        myConnections,
-        config
-      );
+      const tool = t.createTool(myConnections, config);
+      const originalToModelOutput = tool.toModelOutput;
+      result[`${this.connectorKey}_${t.name}`] = {
+        ...tool,
+        toModelOutput: async (options) => {
+          if (!originalToModelOutput) {
+            return opts.truncateOutput(options.output);
+          }
+          const modelOutput = await originalToModelOutput(options);
+          if (modelOutput.type === "text" || modelOutput.type === "json") {
+            return opts.truncateOutput(modelOutput.value);
+          }
+          return modelOutput;
+        }
+      };
     }
     return result;
   }
   static deriveKey(slug, authType) {
-    return authType ? `${slug}-${authType}` : slug;
+    if (authType) return `${slug}-${authType}`;
+    const LEGACY_NULL_AUTH_TYPE_MAP = {
+      // user-password
+      "postgresql": "user-password",
+      "mysql": "user-password",
+      "clickhouse": "user-password",
+      "kintone": "user-password",
+      "squadbase-db": "user-password",
+      // service-account
+      "snowflake": "service-account",
+      "bigquery": "service-account",
+      "google-analytics": "service-account",
+      "google-calendar": "service-account",
+      "aws-athena": "service-account",
+      "redshift": "service-account",
+      // api-key
+      "databricks": "api-key",
+      "dbt": "api-key",
+      "airtable": "api-key",
+      "openai": "api-key",
+      "gemini": "api-key",
+      "anthropic": "api-key",
+      "wix-store": "api-key"
+    };
+    const fallbackAuthType = LEGACY_NULL_AUTH_TYPE_MAP[slug];
+    if (fallbackAuthType) return `${slug}-${fallbackAuthType}`;
+    return slug;
   }
 };
 
@@ -712,7 +749,15 @@ averageSessionDuration, conversions, totalRevenue
 
 ### Business Logic
 
-The business logic type for this connector is "typescript". Write handler code using the connector SDK shown below. Do NOT access credentials directly from environment variables.
+The business logic type for this connector is "typescript". Write handler code using the connector SDK shown below. Do NOT access credentials directly from environment variables and do NOT read \`INTERNAL_SQUADBASE_*\` env vars \u2014 the SDK takes care of OAuth.
+
+SDK surface (client created via \`connection(connectionId)\`):
+- \`client.request(path, init?)\` \u2014 low-level authenticated fetch (\`path\` is appended to \`https://analyticsdata.googleapis.com/v1beta/\`).
+- \`client.runReport(request)\` \u2014 run a GA4 report.
+- \`client.runRealtimeReport(request)\` \u2014 run a realtime report.
+- \`client.getMetadata()\` \u2014 fetch available dimensions and metrics.
+
+If a handler test fails with \`Connection proxy is not configured\`, retry \u2014 the sandbox is still initializing. Do NOT abandon the SDK and construct OAuth proxy URLs manually.
 
 #### Example
 
@@ -776,7 +821,15 @@ averageSessionDuration, conversions, totalRevenue
 
 ### 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\u4EE5\u4E0B\u306B\u793A\u3059\u30B3\u30CD\u30AF\u30BFSDK\u3092\u4F7F\u7528\u3057\u3066\u30CF\u30F3\u30C9\u30E9\u30B3\u30FC\u30C9\u3092\u8A18\u8FF0\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u74B0\u5883\u5909\u6570\u304B\u3089\u76F4\u63A5\u8A8D\u8A3C\u60C5\u5831\u306B\u30A2\u30AF\u30BB\u30B9\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
+\u3053\u306E\u30B3\u30CD\u30AF\u30BF\u306E\u30D3\u30B8\u30CD\u30B9\u30ED\u30B8\u30C3\u30AF\u30BF\u30A4\u30D7\u306F "typescript" \u3067\u3059\u3002\u4EE5\u4E0B\u306B\u793A\u3059\u30B3\u30CD\u30AF\u30BF SDK \u3092\u4F7F\u7528\u3057\u3066\u30CF\u30F3\u30C9\u30E9\u30B3\u30FC\u30C9\u3092\u8A18\u8FF0\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u74B0\u5883\u5909\u6570\u304B\u3089\u76F4\u63A5\u8A8D\u8A3C\u60C5\u5831\u306B\u30A2\u30AF\u30BB\u30B9\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\`INTERNAL_SQUADBASE_*\` \u306E\u74B0\u5883\u5909\u6570\u3092\u4F7F\u3063\u3066\u624B\u52D5\u3067 OAuth \u30D7\u30ED\u30AD\u30B7\u3092\u53E9\u304F\u3053\u3068\u3082\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044 \u2014 SDK \u304C OAuth \u3092\u51E6\u7406\u3057\u307E\u3059\u3002
+
+SDK\uFF08\`connection(connectionId)\` \u3067\u4F5C\u6210\u3057\u305F\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\uFF09:
+- \`client.request(path, init?)\` \u2014 \u4F4E\u30EC\u30D9\u30EB\u306E\u8A8D\u8A3C\u4ED8\u304D fetch\uFF08\`path\` \u306F \`https://analyticsdata.googleapis.com/v1beta/\` \u306B\u8FFD\u52A0\u3055\u308C\u307E\u3059\uFF09\u3002
+- \`client.runReport(request)\` \u2014 GA4 \u30EC\u30DD\u30FC\u30C8\u3092\u5B9F\u884C\u3002
+- \`client.runRealtimeReport(request)\` \u2014 \u30EA\u30A2\u30EB\u30BF\u30A4\u30E0\u30EC\u30DD\u30FC\u30C8\u3092\u5B9F\u884C\u3002
+- \`client.getMetadata()\` \u2014 \u5229\u7528\u53EF\u80FD\u306A\u30C7\u30A3\u30E1\u30F3\u30B7\u30E7\u30F3\u3068\u30E1\u30C8\u30EA\u30AF\u30B9\u3092\u53D6\u5F97\u3002
+
+\u30CF\u30F3\u30C9\u30E9\u306E\u30C6\u30B9\u30C8\u304C \`Connection proxy is not configured\` \u3067\u5931\u6557\u3059\u308B\u5834\u5408\u306F\u518D\u8A66\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u901A\u5E38\u306F\u30B5\u30F3\u30C9\u30DC\u30C3\u30AF\u30B9\u306E\u521D\u671F\u5316\u4E2D\u306B\u8D77\u304D\u307E\u3059\u3002SDK \u3092\u8AE6\u3081\u3066 OAuth \u30D7\u30ED\u30AD\u30B7\u306E URL \u3092\u81EA\u5206\u3067\u7D44\u307F\u7ACB\u3066\u308B\u3053\u3068\u306F **\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044**\u3002
 
 #### Example
 

package/dist/connectors/google-analytics.js

@@ -55,6 +55,15 @@ 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
   })
 };
 
@@ -86,9 +95,15 @@ function buildJwt(clientEmail, privateKey, nowSec) {
 }
 function createClient(params) {
   const serviceAccountKeyJsonBase64 = params[parameters.serviceAccountKeyJsonBase64.slug];
-  if (!serviceAccountKeyJsonBase64) {
+  const propertyId = params[parameters.propertyId.slug];
+  if (!serviceAccountKeyJsonBase64 || !propertyId) {
+    const required = [
+      parameters.serviceAccountKeyJsonBase64.slug,
+      parameters.propertyId.slug
+    ];
+    const missing = required.filter((s) => !params[s]);
     throw new Error(
-      `google-analytics: missing required parameter: ${parameters.serviceAccountKeyJsonBase64.slug}`
+      `google-analytics: missing required parameters: ${missing.join(", ")}`
     );
   }
   let serviceAccountKey;
@@ -110,7 +125,7 @@ function createClient(params) {
   }
   let cachedToken = null;
   let tokenExpiresAt = 0;
-  async function getAccessToken2() {
+  async function getAccessToken() {
     const nowSec = Math.floor(Date.now() / 1e3);
     if (cachedToken && nowSec < tokenExpiresAt - 60) {
       return cachedToken;
@@ -141,13 +156,14 @@ function createClient(params) {
   }
   return {
     async request(path2, init) {
-      const accessToken = await getAccessToken2();
-      const url = `${BASE_URL.replace(/\/+$/, "")}/${path2.replace(/^\/+/, "")}`;
+      const accessToken = await getAccessToken();
+      const resolvedPath = path2.replace(/\{propertyId\}/g, propertyId);
+      const url = `${BASE_URL.replace(/\/+$/, "")}/${resolvedPath.replace(/^\/+/, "")}`;
       const headers = new Headers(init?.headers);
       headers.set("Authorization", `Bearer ${accessToken}`);
       return fetch(url, { ...init, headers });
     },
-    async runReport(propertyId, request) {
+    async runReport(request) {
       const response = await this.request(
         `properties/${propertyId}:runReport`,
         {
@@ -168,7 +184,7 @@ function createClient(params) {
         rowCount: data.rowCount ?? 0
       };
     },
-    async getMetadata(propertyId) {
+    async getMetadata() {
       const response = await this.request(
         `properties/${propertyId}/metadata`,
         { method: "GET" }
@@ -181,7 +197,7 @@ function createClient(params) {
       }
       return await response.json();
     },
-    async runRealtimeReport(propertyId, request) {
+    async runRealtimeReport(request) {
       const response = await this.request(
         `properties/${propertyId}:runRealtimeReport`,
         {
@@ -287,21 +303,58 @@ var ConnectorPlugin = class _ConnectorPlugin {
    * Filters connections by connectorKey internally.
    * Returns tools keyed as `${connectorKey}_${toolName}`.
    */
-  createTools(connections, config) {
+  createTools(connections, config, opts) {
     const myConnections = connections.filter(
       (c) => _ConnectorPlugin.deriveKey(c.connector.slug, c.connector.authType) === this.connectorKey
     );
     const result = {};
     for (const t of Object.values(this.tools)) {
-      result[`${this.connectorKey}_${t.name}`] = t.createTool(
-        myConnections,
-        config
-      );
+      const tool = t.createTool(myConnections, config);
+      const originalToModelOutput = tool.toModelOutput;
+      result[`${this.connectorKey}_${t.name}`] = {
+        ...tool,
+        toModelOutput: async (options) => {
+          if (!originalToModelOutput) {
+            return opts.truncateOutput(options.output);
+          }
+          const modelOutput = await originalToModelOutput(options);
+          if (modelOutput.type === "text" || modelOutput.type === "json") {
+            return opts.truncateOutput(modelOutput.value);
+          }
+          return modelOutput;
+        }
+      };
     }
     return result;
   }
   static deriveKey(slug, authType) {
-    return authType ? `${slug}-${authType}` : slug;
+    if (authType) return `${slug}-${authType}`;
+    const LEGACY_NULL_AUTH_TYPE_MAP = {
+      // user-password
+      "postgresql": "user-password",
+      "mysql": "user-password",
+      "clickhouse": "user-password",
+      "kintone": "user-password",
+      "squadbase-db": "user-password",
+      // service-account
+      "snowflake": "service-account",
+      "bigquery": "service-account",
+      "google-analytics": "service-account",
+      "google-calendar": "service-account",
+      "aws-athena": "service-account",
+      "redshift": "service-account",
+      // api-key
+      "databricks": "api-key",
+      "dbt": "api-key",
+      "airtable": "api-key",
+      "openai": "api-key",
+      "gemini": "api-key",
+      "anthropic": "api-key",
+      "wix-store": "api-key"
+    };
+    const fallbackAuthType = LEGACY_NULL_AUTH_TYPE_MAP[slug];
+    if (fallbackAuthType) return `${slug}-${fallbackAuthType}`;
+    return slug;
   }
 };
 
@@ -315,275 +368,45 @@ var AUTH_TYPES = {
   USER_PASSWORD: "user-password"
 };
 
-// ../connectors/src/connectors/google-analytics/tools/list-accounts.ts
-import { z } from "zod";
-
-// ../connectors/src/connectors/google-analytics/tools/auth.ts
-var SCOPES = [
-  "https://www.googleapis.com/auth/analytics.readonly"
-];
-async function getAccessToken(connection2) {
-  const { GoogleAuth } = await import("google-auth-library");
-  const keyJsonBase64 = parameters.serviceAccountKeyJsonBase64.getValue(connection2);
-  const credentials = JSON.parse(
-    Buffer.from(keyJsonBase64, "base64").toString("utf-8")
-  );
-  const auth = new GoogleAuth({
-    credentials,
-    scopes: SCOPES
-  });
-  const token = await auth.getAccessToken();
-  if (!token) {
-    throw new Error("Failed to obtain access token");
+// ../connectors/src/connectors/google-analytics/setup.ts
+var googleAnalyticsOnboarding = new ConnectorOnboarding({
+  dataOverviewInstructions: {
+    en: `1. Call google-analytics-service-account_request with GET properties/{propertyId}/metadata to list available dimensions and metrics
+2. Call google-analytics-service-account_request with POST properties/{propertyId}:runReport using a small date range and basic metrics to verify data availability`,
+    ja: `1. google-analytics-service-account_request \u3067 GET properties/{propertyId}/metadata \u3092\u547C\u3073\u51FA\u3057\u3001\u5229\u7528\u53EF\u80FD\u306A\u30C7\u30A3\u30E1\u30F3\u30B7\u30E7\u30F3\u3068\u30E1\u30C8\u30EA\u30AF\u30B9\u306E\u4E00\u89A7\u3092\u53D6\u5F97
+2. google-analytics-service-account_request \u3067 POST properties/{propertyId}:runReport \u3092\u77ED\u3044\u671F\u9593\u3068\u57FA\u672C\u30E1\u30C8\u30EA\u30AF\u30B9\u3067\u547C\u3073\u51FA\u3057\u3001\u30C7\u30FC\u30BF\u306E\u53EF\u7528\u6027\u3092\u78BA\u8A8D`
   }
-  return token;
-}
+});
 
-// ../connectors/src/connectors/google-analytics/tools/list-accounts.ts
-var ADMIN_BASE_URL = "https://analyticsadmin.googleapis.com/v1beta/";
+// ../connectors/src/connectors/google-analytics/tools/request.ts
+import { z } from "zod";
+var BASE_URL2 = "https://analyticsdata.googleapis.com/v1beta/";
 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")
+  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"),
+  method: z.enum(["GET", "POST"]).describe("HTTP method"),
+  path: z.string().describe("API path (e.g., 'properties/{propertyId}:runReport'). {propertyId} is automatically replaced."),
+  body: z.record(z.string(), z.unknown()).optional().describe("POST request body (JSON)")
 });
 var outputSchema = z.discriminatedUnion("success", [
   z.object({
     success: z.literal(true),
-    accounts: z.array(
-      z.object({
-        name: z.string(),
-        displayName: z.string()
-      })
-    )
+    status: z.number(),
+    data: z.record(z.string(), z.unknown())
   }),
   z.object({
     success: z.literal(false),
     error: z.string()
   })
 ]);
-var listAccountsTool = new ConnectorTool({
-  name: "listAccounts",
-  description: "List Google Analytics accounts accessible with the service account credentials. Returns account names and display names.",
-  inputSchema,
-  outputSchema,
-  async execute({ connectionId }, connections) {
-    const connection2 = connections.find((c) => c.id === connectionId);
-    if (!connection2) {
-      return {
-        success: false,
-        error: `Connection ${connectionId} not found`
-      };
-    }
-    console.log(
-      `[connector-request] google-analytics/${connection2.name}: listAccounts`
-    );
-    try {
-      const token = await getAccessToken(connection2);
-      const controller = new AbortController();
-      const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
-      try {
-        const response = await fetch(`${ADMIN_BASE_URL}accounts`, {
-          method: "GET",
-          headers: {
-            Authorization: `Bearer ${token}`
-          },
-          signal: controller.signal
-        });
-        const data = await response.json();
-        if (!response.ok) {
-          const errorMessage = data?.error?.message ?? `HTTP ${response.status} ${response.statusText}`;
-          return { success: false, error: errorMessage };
-        }
-        const accounts = (data.accounts ?? []).map((a) => ({
-          name: a.name ?? "",
-          displayName: a.displayName ?? ""
-        }));
-        return { success: true, accounts };
-      } finally {
-        clearTimeout(timeout);
-      }
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      return { success: false, error: msg };
-    }
-  }
-});
-
-// ../connectors/src/connectors/google-analytics/tools/list-properties.ts
-import { z as z2 } from "zod";
-var ADMIN_BASE_URL2 = "https://analyticsadmin.googleapis.com/v1beta/";
-var REQUEST_TIMEOUT_MS2 = 6e4;
-var inputSchema2 = z2.object({
-  toolUseIntent: z2.string().optional().describe(
-    "Brief description of what you intend to accomplish with this tool call"
-  ),
-  connectionId: z2.string().describe("ID of the Google Analytics connection to use"),
-  accountName: z2.string().describe(
-    "The account resource name (e.g., 'accounts/123456'). Obtained from the listAccounts tool."
-  )
-});
-var outputSchema2 = z2.discriminatedUnion("success", [
-  z2.object({
-    success: z2.literal(true),
-    properties: z2.array(
-      z2.object({
-        name: z2.string(),
-        displayName: z2.string(),
-        propertyId: z2.string()
-      })
-    )
-  }),
-  z2.object({
-    success: z2.literal(false),
-    error: z2.string()
-  })
-]);
-var listPropertiesTool = new ConnectorTool({
-  name: "listProperties",
-  description: "List GA4 properties for a given Google Analytics account. Returns property names, display names, and property IDs.",
-  inputSchema: inputSchema2,
-  outputSchema: outputSchema2,
-  async execute({ connectionId, accountName }, connections) {
-    const connection2 = connections.find((c) => c.id === connectionId);
-    if (!connection2) {
-      return {
-        success: false,
-        error: `Connection ${connectionId} not found`
-      };
-    }
-    console.log(
-      `[connector-request] google-analytics/${connection2.name}: listProperties for ${accountName}`
-    );
-    try {
-      const token = await getAccessToken(connection2);
-      const controller = new AbortController();
-      const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS2);
-      try {
-        const filter = encodeURIComponent(`parent:${accountName}`);
-        const response = await fetch(
-          `${ADMIN_BASE_URL2}properties?filter=${filter}`,
-          {
-            method: "GET",
-            headers: {
-              Authorization: `Bearer ${token}`
-            },
-            signal: controller.signal
-          }
-        );
-        const data = await response.json();
-        if (!response.ok) {
-          const errorMessage = data?.error?.message ?? `HTTP ${response.status} ${response.statusText}`;
-          return { success: false, error: errorMessage };
-        }
-        const properties = (data.properties ?? []).map((p) => {
-          const name = p.name ?? "";
-          const propertyId = name.replace(/^properties\//, "");
-          return {
-            name,
-            displayName: p.displayName ?? "",
-            propertyId
-          };
-        });
-        return { success: true, properties };
-      } finally {
-        clearTimeout(timeout);
-      }
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      return { success: false, error: msg };
-    }
-  }
-});
-
-// ../connectors/src/connectors/google-analytics/setup.ts
-var listAccountsToolName = `google-analytics_${listAccountsTool.name}`;
-var listPropertiesToolName = `google-analytics_${listPropertiesTool.name}`;
-var googleAnalyticsOnboarding = new ConnectorOnboarding({
-  connectionSetupInstructions: {
-    ja: `\u4EE5\u4E0B\u306E\u624B\u9806\u3067Google Analytics (Service Account) \u30B3\u30CD\u30AF\u30B7\u30E7\u30F3\u306E\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u3092\u884C\u3063\u3066\u304F\u3060\u3055\u3044\u3002
-
-1. \`${listAccountsToolName}\` \u3092\u547C\u3073\u51FA\u3057\u3066\u3001Service Account\u3067\u30A2\u30AF\u30BB\u30B9\u53EF\u80FD\u306AGoogle Analytics\u30A2\u30AB\u30A6\u30F3\u30C8\u4E00\u89A7\u3092\u53D6\u5F97\u3059\u308B
-2. \u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u9078\u629E:
-   - \u30A2\u30AB\u30A6\u30F3\u30C8\u304C **2\u4EF6\u4EE5\u4E0A**: \u300C\u4F7F\u7528\u3059\u308B\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u300D\u3068\u30E6\u30FC\u30B6\u30FC\u306B\u4F1D\u3048\u305F\u4E0A\u3067\u3001\`askUserQuestion\` \u3092\u547C\u3073\u51FA\u3059\uFF08\`options\`: \u5404 option \u306E \`label\` \u306F \`\u8868\u793A\u540D (name)\` \u306E\u5F62\u5F0F\uFF09
-   - \u30A2\u30AB\u30A6\u30F3\u30C8\u304C **1\u4EF6\u306E\u307F**: \`askUserQuestion\` \u306F\u30B9\u30AD\u30C3\u30D7\u3057\u3001\u305D\u306E\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u9078\u629E\u6E08\u307F\u3068\u3057\u3066\u6B21\u3078\u9032\u3080
-   - \u30A2\u30AB\u30A6\u30F3\u30C8\u304C **0\u4EF6**: \u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u3092\u4E2D\u65AD\u3057\u3001\u30E6\u30FC\u30B6\u30FC\u306B\u30A2\u30AF\u30BB\u30B9\u53EF\u80FD\u306A\u30A2\u30AB\u30A6\u30F3\u30C8\u304C\u306A\u3044\u65E8\u3092\u4F1D\u3048\u308B
-3. \`${listPropertiesToolName}\` \u3092\u547C\u3073\u51FA\u3057\u3066\u3001\u9078\u629E\u3055\u308C\u305F\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u4E00\u89A7\u3092\u53D6\u5F97\u3059\u308B
-4. \u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u9078\u629E:
-   - \u30D7\u30ED\u30D1\u30C6\u30A3\u304C **2\u4EF6\u4EE5\u4E0A**: \u300C\u4F7F\u7528\u3059\u308B\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u300D\u3068\u30E6\u30FC\u30B6\u30FC\u306B\u4F1D\u3048\u305F\u4E0A\u3067\u3001\`askUserQuestion\` \u3092\u547C\u3073\u51FA\u3059\uFF08\`options\`: \u5404 option \u306E \`label\` \u306F \`\u8868\u793A\u540D (id: \u30D7\u30ED\u30D1\u30C6\u30A3ID)\` \u306E\u5F62\u5F0F\uFF09
-   - \u30D7\u30ED\u30D1\u30C6\u30A3\u304C **1\u4EF6\u306E\u307F**: \`askUserQuestion\` \u306F\u30B9\u30AD\u30C3\u30D7\u3057\u3001\u305D\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u9078\u629E\u6E08\u307F\u3068\u3057\u3066\u6B21\u3078\u9032\u3080
-   - \u30D7\u30ED\u30D1\u30C6\u30A3\u304C **0\u4EF6**: \u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u3092\u4E2D\u65AD\u3057\u3001\u30E6\u30FC\u30B6\u30FC\u306B\u30A2\u30AF\u30BB\u30B9\u53EF\u80FD\u306A\u30D7\u30ED\u30D1\u30C6\u30A3\u304C\u306A\u3044\u65E8\u3092\u4F1D\u3048\u308B
-5. \u30E6\u30FC\u30B6\u30FC\u304C\u9078\u629E\u3057\u305F\uFF08\u3082\u3057\u304F\u306F\u81EA\u52D5\u9078\u629E\u3055\u308C\u305F\uFF09\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u60C5\u5831\u3092\u57FA\u306B\u6B21\u306E\u30B9\u30C6\u30C3\u30D7\u306B\u9032\u3080
-6. \`updateConnectionContext\` \u3092\u547C\u3073\u51FA\u3059:
-   - \`property\`: \u9078\u629E\u3055\u308C\u305F\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u8868\u793A\u540D
-   - \`propertyId\`: \u9078\u629E\u3055\u308C\u305F\u30D7\u30ED\u30D1\u30C6\u30A3ID
-   - \`note\`: \u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u5185\u5BB9\u306E\u7C21\u5358\u306A\u8AAC\u660E
-
-#### \u5236\u7D04
-- **\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u4E2D\u306B\u30EC\u30DD\u30FC\u30C8\u30C7\u30FC\u30BF\u3092\u53D6\u5F97\u3057\u306A\u3044\u3053\u3068**\u3002\u5B9F\u884C\u3057\u3066\u3088\u3044\u306E\u306F\u4E0A\u8A18\u624B\u9806\u3067\u6307\u5B9A\u3055\u308C\u305F\u30E1\u30BF\u30C7\u30FC\u30BF\u53D6\u5F97\u306E\u307F
-- \`askUserQuestion\` \u306E \`options\` \u306F\u6700\u4F4E2\u4EF6\u5FC5\u8981\u3002\u5019\u88DC\u304C1\u4EF6\u4EE5\u4E0B\u306E\u5834\u5408\u306F\u5FC5\u305A\u30B9\u30AD\u30C3\u30D7\u3059\u308B\u3053\u3068
-- \u30C4\u30FC\u30EB\u9593\u306F1\u6587\u3060\u3051\u66F8\u3044\u3066\u5373\u6B21\u306E\u30C4\u30FC\u30EB\u547C\u3073\u51FA\u3057\u3002\u4E0D\u8981\u306A\u8AAC\u660E\u306F\u7701\u7565\u3057\u3001\u52B9\u7387\u7684\u306B\u9032\u3081\u308B`,
-    en: `Follow these steps to set up the Google Analytics (Service Account) connection.
-
-1. Call \`${listAccountsToolName}\` to get the list of Google Analytics accounts accessible with the service account credentials
-2. Select an account:
-   - **2 or more accounts**: Tell the user "Please select an account.", then call \`askUserQuestion\` (\`options\`: each option's \`label\` should be \`Display Name (name)\`)
-   - **Only 1 account**: Skip \`askUserQuestion\` and proceed using that account as the selection
-   - **0 accounts**: Abort setup and inform the user that no accessible accounts are available
-3. Call \`${listPropertiesToolName}\` to get the list of properties for the selected account
-4. Select a property:
-   - **2 or more properties**: Tell the user "Please select a property.", then call \`askUserQuestion\` (\`options\`: each option's \`label\` should be \`Display Name (id: propertyId)\`)
-   - **Only 1 property**: Skip \`askUserQuestion\` and proceed using that property as the selection
-   - **0 properties**: Abort setup and inform the user that no accessible properties are available
-5. Proceed to the next step using the user-selected (or auto-selected) property's information
-6. Call \`updateConnectionContext\`:
-   - \`property\`: The selected property's display name
-   - \`propertyId\`: The selected property ID
-   - \`note\`: Brief description of the setup
-
-#### Constraints
-- **Do NOT fetch report data during setup**. Only the metadata requests specified in the steps above are allowed
-- \`askUserQuestion\` requires at least 2 \`options\`. Always skip it when there is 1 or fewer candidates
-- Write only 1 sentence between tool calls, then immediately call the next tool. Skip unnecessary explanations and proceed efficiently`
-  },
-  dataOverviewInstructions: {
-    en: `1. Call google-analytics_request with GET properties/{propertyId}/metadata to list available dimensions and metrics
-2. Call google-analytics_request with POST properties/{propertyId}:runReport using a small date range and basic metrics to verify data availability`,
-    ja: `1. google-analytics_request \u3067 GET properties/{propertyId}/metadata \u3092\u547C\u3073\u51FA\u3057\u3001\u5229\u7528\u53EF\u80FD\u306A\u30C7\u30A3\u30E1\u30F3\u30B7\u30E7\u30F3\u3068\u30E1\u30C8\u30EA\u30AF\u30B9\u306E\u4E00\u89A7\u3092\u53D6\u5F97
-2. google-analytics_request \u3067 POST properties/{propertyId}:runReport \u3092\u77ED\u3044\u671F\u9593\u3068\u57FA\u672C\u30E1\u30C8\u30EA\u30AF\u30B9\u3067\u547C\u3073\u51FA\u3057\u3001\u30C7\u30FC\u30BF\u306E\u53EF\u7528\u6027\u3092\u78BA\u8A8D`
-  }
-});
-
-// ../connectors/src/connectors/google-analytics/tools/request.ts
-import { z as z3 } from "zod";
-var BASE_URL2 = "https://analyticsdata.googleapis.com/v1beta/";
-var REQUEST_TIMEOUT_MS3 = 6e4;
-var inputSchema3 = z3.object({
-  toolUseIntent: z3.string().optional().describe("Brief description of what you intend to accomplish with this tool call"),
-  connectionId: z3.string().describe("ID of the Google Analytics connection to use"),
-  method: z3.enum(["GET", "POST"]).describe("HTTP method"),
-  path: z3.string().describe("API path including the property ID (e.g., 'properties/123456789:runReport')."),
-  body: z3.record(z3.string(), z3.unknown()).optional().describe("POST request body (JSON)")
-});
-var outputSchema3 = z3.discriminatedUnion("success", [
-  z3.object({
-    success: z3.literal(true),
-    status: z3.number(),
-    data: z3.record(z3.string(), z3.unknown())
-  }),
-  z3.object({
-    success: z3.literal(false),
-    error: z3.string()
-  })
-]);
 var requestTool = new ConnectorTool({
   name: "request",
   description: `Send authenticated requests to the Google Analytics Data API.
 Authentication is handled automatically using a service account.
-Include the full property ID in the path (e.g., 'properties/123456789:runReport').`,
-  inputSchema: inputSchema3,
-  outputSchema: outputSchema3,
+{propertyId} in the path is automatically replaced with the connection's property-id.`,
+  inputSchema,
+  outputSchema,
   async execute({ connectionId, method, path: path2, body }, connections) {
     const connection2 = connections.find((c) => c.id === connectionId);
     if (!connection2) {
@@ -593,6 +416,7 @@ Include the full property ID in the path (e.g., 'properties/123456789:runReport'
     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")
       );
@@ -604,9 +428,10 @@ Include the full property ID in the path (e.g., 'properties/123456789:runReport'
       if (!token) {
         return { success: false, error: "Failed to obtain access token" };
       }
-      const url = `${BASE_URL2}${path2}`;
+      const resolvedPath = path2.replace(/\{propertyId\}/g, propertyId);
+      const url = `${BASE_URL2}${resolvedPath}`;
       const controller = new AbortController();
-      const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS3);
+      const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
       try {
         const response = await fetch(url, {
           method,
@@ -637,11 +462,7 @@ Include the full property ID in the path (e.g., 'properties/123456789:runReport'
 });
 
 // ../connectors/src/connectors/google-analytics/index.ts
-var tools = {
-  request: requestTool,
-  listAccounts: listAccountsTool,
-  listProperties: listPropertiesTool
-};
+var tools = { request: requestTool };
 var googleAnalyticsConnector = new ConnectorPlugin({
   slug: "google-analytics",
   authType: AUTH_TYPES.SERVICE_ACCOUNT,
@@ -654,26 +475,23 @@ var googleAnalyticsConnector = new ConnectorPlugin({
   systemPrompt: {
     en: `### Tools
 
-- \`google-analytics_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_listAccounts\`: List accessible Google Analytics accounts. Use during setup to discover available accounts.
-- \`google-analytics_listProperties\`: List GA4 properties for a given account. Use during setup to select the target property.
+- \`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)\`). The GA4 property ID is NOT stored as a connection parameter \u2014 pass it explicitly to each call. Use the \`propertyId\` recorded in the connection context during setup:
-- \`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 (path must include the property ID)
+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.request(path, init?)\` \u2014 low-level authenticated fetch
 
 \`\`\`ts
 import type { Context } from "hono";
 import { connection } from "@squadbase/vite-server/connectors/google-analytics";
 
 const ga = connection("<connectionId>");
-const PROPERTY_ID = "<propertyId from connection context>";
 
 export default async function handler(c: Context) {
   const { startDate = "7daysAgo", endDate = "today" } = await c.req.json<{
@@ -681,7 +499,7 @@ export default async function handler(c: Context) {
     endDate?: string;
   }>();
 
-  const { rows } = await ga.runReport(PROPERTY_ID, {
+  const { rows } = await ga.runReport({
     dateRanges: [{ startDate, endDate }],
     dimensions: [{ name: "date" }],
     metrics: [{ name: "activeUsers" }, { name: "sessions" }],
@@ -725,26 +543,23 @@ activeUsers, sessions, screenPageViews, bounceRate, averageSessionDuration, conv
 - Relative: \`"today"\`, \`"yesterday"\`, \`"7daysAgo"\`, \`"30daysAgo"\``,
     ja: `### \u30C4\u30FC\u30EB
 
-- \`google-analytics_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_listAccounts\`: \u30A2\u30AF\u30BB\u30B9\u53EF\u80FD\u306AGoogle Analytics\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u4E00\u89A7\u3092\u53D6\u5F97\u3057\u307E\u3059\u3002\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u6642\u306B\u5229\u7528\u53EF\u80FD\u306A\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u78BA\u8A8D\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002
-- \`google-analytics_listProperties\`: \u6307\u5B9A\u30A2\u30AB\u30A6\u30F3\u30C8\u306EGA4\u30D7\u30ED\u30D1\u30C6\u30A3\u4E00\u89A7\u3092\u53D6\u5F97\u3057\u307E\u3059\u3002\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u6642\u306B\u30BF\u30FC\u30B2\u30C3\u30C8\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u9078\u629E\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3057\u307E\u3059\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)\u3002GA4 \u30D7\u30ED\u30D1\u30C6\u30A3ID\u306F\u30B3\u30CD\u30AF\u30B7\u30E7\u30F3\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u4FDD\u5B58\u3055\u308C\u307E\u305B\u3093\u3002\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u6642\u306B connection context \u306B\u8A18\u9332\u3055\u308C\u305F \`propertyId\` \u3092\u5404\u547C\u3073\u51FA\u3057\u306B\u660E\u793A\u7684\u306B\u6E21\u3057\u3066\u304F\u3060\u3055\u3044:
-- \`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\uFF08path \u306B\u30D7\u30ED\u30D1\u30C6\u30A3ID\u3092\u542B\u3081\u308B\uFF09
+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.request(path, init?)\` \u2014 \u4F4E\u30EC\u30D9\u30EB\u306E\u8A8D\u8A3C\u4ED8\u304Dfetch
 
 \`\`\`ts
 import type { Context } from "hono";
 import { connection } from "@squadbase/vite-server/connectors/google-analytics";
 
 const ga = connection("<connectionId>");
-const PROPERTY_ID = "<connection context \u306E propertyId>";
 
 export default async function handler(c: Context) {
   const { startDate = "7daysAgo", endDate = "today" } = await c.req.json<{
@@ -752,7 +567,7 @@ export default async function handler(c: Context) {
     endDate?: string;
   }>();
 
-  const { rows } = await ga.runReport(PROPERTY_ID, {
+  const { rows } = await ga.runReport({
     dateRanges: [{ startDate, endDate }],
     dimensions: [{ name: "date" }],
     metrics: [{ name: "activeUsers" }, { name: "sessions" }],