@squadbase/vite-server 0.1.10-dev.5aa0720 → 0.1.10-dev.5b0c0a8

package/dist/connectors/cosmosdb.js

@@ -109,7 +109,7 @@ function createClient(params) {
         queryOptions.partitionKey = options.partitionKey;
       }
       const iterator = cont.items.query(sql, queryOptions);
-      const { resources } = await iterator.fetchNext();
+      const { resources } = await iterator.fetchAll();
       return resources ?? [];
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
@@ -445,7 +445,7 @@ Use \`TOP n\` (not \`LIMIT n\`) to bound the result. Cross-partition queries are
         }
       }
       const iterator = cont.items.query(sql, queryOptions);
-      const { resources, requestCharge } = await iterator.fetchNext();
+      const { resources, requestCharge } = await iterator.fetchAll();
       const documents = resources ?? [];
       const truncated = documents.length > MAX_DOCUMENTS;
       return {
@@ -486,7 +486,7 @@ var cosmosdbConnector = new ConnectorPlugin({
 
 ### 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 \`import { CosmosClient } from "@azure/cosmos"\` in handler code \u2014 the \`@azure/cosmos\` driver is not part of the user dashboard's runtime, only of the connector SDK.
 
 \u26A0\uFE0F **The client returned by \`connection(connectionId)\` is NOT the raw \`@azure/cosmos\` \`CosmosClient\`.** It is a thin wrapper exposing only two methods:
 - \`client.query<T>(container, sql, options?) => Promise<T[]>\` \u2014 runs a Cosmos SQL query against the named container and returns the **already-unwrapped** items array (no \`{ resources }\` wrapper). \`options\` accepts \`{ maxItemCount?: number; partitionKey?: unknown }\`.
@@ -522,7 +522,7 @@ export default async function handler(_c: Context) {
 - Queries always target a single container and reference items via the alias \`c\` (e.g. \`SELECT c.id, c.name FROM c WHERE c.status = 'active'\`).
 - Row limiting: use \`TOP n\` (e.g. \`SELECT TOP 100 * FROM c\`). \`LIMIT\` is **not** supported. \`OFFSET m LIMIT n\` is supported on newer accounts but \`TOP\` is the safe default.
 - System fields are prefixed with an underscore (\`c.id\`, \`c._ts\` for the modification timestamp, \`c._etag\`).
-- Aggregates: \`COUNT(1)\`, \`SUM\`, \`AVG\`, \`MIN\`, \`MAX\`, with \`GROUP BY\` (e.g. \`SELECT c.country, COUNT(1) AS n FROM c GROUP BY c.country\`).
+- Aggregates: \`COUNT(1)\`, \`SUM\`, \`AVG\`, \`MIN\`, \`MAX\`, with \`GROUP BY\` (e.g. \`SELECT c.country, COUNT(1) AS n FROM c GROUP BY c.country\`). Cross-partition \`GROUP BY\` is fully supported \u2014 the connector drains all result pages internally, so trust the returned rows even for queries that span many partitions. Do **not** work around perceived missing rows by re-fetching all items and aggregating in TypeScript.
 - Joins: only **intra-document** joins via \`JOIN\` over arrays inside the same item; there is no cross-container/cross-document join.
 - Always bound results with \`TOP n\` and prefer scoped queries with a \`partitionKey\` value when possible \u2014 cross-partition queries cost more RUs.`,
     ja: `### \u30C4\u30FC\u30EB
@@ -532,7 +532,7 @@ export default async function handler(_c: Context) {
 
 ### 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\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\u305F\u308A\u3001\u30CF\u30F3\u30C9\u30E9\u30B3\u30FC\u30C9\u3067 \`import { CosmosClient } from "@azure/cosmos"\` \u3092\u884C\u3063\u305F\u308A\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044 \u2014 \`@azure/cosmos\` \u30C9\u30E9\u30A4\u30D0\u306F\u30E6\u30FC\u30B6\u30FC\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u306E\u30E9\u30F3\u30BF\u30A4\u30E0\u306B\u306F\u542B\u307E\u308C\u305A\u3001\u30B3\u30CD\u30AF\u30BFSDK\u5185\u90E8\u306B\u306E\u307F\u5B58\u5728\u3057\u307E\u3059\u3002
 
 \u26A0\uFE0F **\`connection(connectionId)\` \u304C\u8FD4\u3059\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u306F \`@azure/cosmos\` \u306E \`CosmosClient\` \u305D\u306E\u3082\u306E\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002** \u4EE5\u4E0B\u306E2\u30E1\u30BD\u30C3\u30C9\u306E\u307F\u3092\u516C\u958B\u3059\u308B\u8584\u3044\u30E9\u30C3\u30D1\u30FC\u3067\u3059\uFF1A
 - \`client.query<T>(container, sql, options?) => Promise<T[]>\` \u2014 \u6307\u5B9A\u30B3\u30F3\u30C6\u30CA\u306B\u5BFE\u3057\u3066 Cosmos SQL \u3092\u5B9F\u884C\u3057\u3001**\u3059\u3067\u306B\u5C55\u958B\u6E08\u307F\u306E\u30A2\u30A4\u30C6\u30E0\u914D\u5217**\u3092\u8FD4\u3059\uFF08\`{ resources }\` \u3067\u30E9\u30C3\u30D7\u3055\u308C\u3066\u3044\u306A\u3044\uFF09\u3002\`options\` \u306F \`{ maxItemCount?: number; partitionKey?: unknown }\`\u3002
@@ -568,7 +568,7 @@ export default async function handler(_c: Context) {
 - \u30AF\u30A8\u30EA\u306F\u5E38\u306B\u5358\u4E00\u30B3\u30F3\u30C6\u30CA\u3092\u5BFE\u8C61\u3068\u3057\u3001\u30A2\u30A4\u30C6\u30E0\u306F\u5225\u540D \`c\` \u3067\u53C2\u7167\u3057\u307E\u3059\uFF08\u4F8B: \`SELECT c.id, c.name FROM c WHERE c.status = 'active'\`\uFF09\u3002
 - \u884C\u6570\u5236\u9650: \`TOP n\` \u3092\u4F7F\u7528\u3057\u307E\u3059\uFF08\u4F8B: \`SELECT TOP 100 * FROM c\`\uFF09\u3002\`LIMIT\` \u306F **\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093**\u3002\u65B0\u3057\u3044\u30A2\u30AB\u30A6\u30F3\u30C8\u3067\u306F \`OFFSET m LIMIT n\` \u304C\u4F7F\u3048\u307E\u3059\u304C\u3001\u5B89\u5168\u5074\u306E\u65E2\u5B9A\u306F \`TOP\` \u3067\u3059\u3002
 - \u30B7\u30B9\u30C6\u30E0\u30D5\u30A3\u30FC\u30EB\u30C9\u306F\u30A2\u30F3\u30C0\u30FC\u30B9\u30B3\u30A2\u59CB\u307E\u308A\uFF08\`c.id\`\u3001\u5909\u66F4\u6642\u523B\u306E \`c._ts\`\u3001\`c._etag\`\uFF09\u3002
-- \u96C6\u7D04: \`COUNT(1)\`\u3001\`SUM\`\u3001\`AVG\`\u3001\`MIN\`\u3001\`MAX\` \u3092 \`GROUP BY\` \u3068\u7D44\u307F\u5408\u308F\u305B\u307E\u3059\uFF08\u4F8B: \`SELECT c.country, COUNT(1) AS n FROM c GROUP BY c.country\`\uFF09\u3002
+- \u96C6\u7D04: \`COUNT(1)\`\u3001\`SUM\`\u3001\`AVG\`\u3001\`MIN\`\u3001\`MAX\` \u3092 \`GROUP BY\` \u3068\u7D44\u307F\u5408\u308F\u305B\u307E\u3059\uFF08\u4F8B: \`SELECT c.country, COUNT(1) AS n FROM c GROUP BY c.country\`\uFF09\u3002\u30AF\u30ED\u30B9\u30D1\u30FC\u30C6\u30A3\u30B7\u30E7\u30F3\u306E \`GROUP BY\` \u3082\u5B8C\u5168\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u304A\u308A\u3001\u30B3\u30CD\u30AF\u30BF\u304C\u5185\u90E8\u3067\u5168\u7D50\u679C\u30DA\u30FC\u30B8\u3092\u30C9\u30EC\u30A4\u30F3\u3059\u308B\u305F\u3081\u3001\u591A\u30D1\u30FC\u30C6\u30A3\u30B7\u30E7\u30F3\u306B\u307E\u305F\u304C\u308B\u30AF\u30A8\u30EA\u3067\u3082\u8FD4\u3063\u3066\u304D\u305F\u884C\u6570\u3092\u305D\u306E\u307E\u307E\u4FE1\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002**\u300C\u7D50\u679C\u304C\u6B20\u3051\u3066\u3044\u308B\u3088\u3046\u306B\u898B\u3048\u308B\u300D\u304B\u3089\u3068\u3044\u3063\u3066\u5168\u4EF6\u53D6\u5F97\u2192TS \u5074\u3067\u96C6\u8A08\u3059\u308B\u8FC2\u56DE\u306F\u3057\u306A\u3044\u3053\u3068\u3002**
 - \u7D50\u5408: \u540C\u4E00\u30A2\u30A4\u30C6\u30E0\u5185\u306E\u914D\u5217\u306B\u5BFE\u3059\u308B **\u30A4\u30F3\u30C8\u30E9\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8** \`JOIN\` \u306E\u307F\u3067\u3001\u30B3\u30F3\u30C6\u30CA\u9593\uFF0F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u9593\u306E\u7D50\u5408\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093\u3002
 - \u7D50\u679C\u4EF6\u6570\u306F\u5FC5\u305A \`TOP n\` \u3067\u5236\u9650\u3057\u3001\u53EF\u80FD\u3067\u3042\u308C\u3070 \`partitionKey\` \u3067\u5358\u4E00\u30D1\u30FC\u30C6\u30A3\u30B7\u30E7\u30F3\u306B\u30B9\u30B3\u30FC\u30D7\u3057\u3066\u304F\u3060\u3055\u3044\uFF08\u30AF\u30ED\u30B9\u30D1\u30FC\u30C6\u30A3\u30B7\u30E7\u30F3\u30AF\u30A8\u30EA\u306F RU \u3092\u591A\u304F\u6D88\u8CBB\u3057\u307E\u3059\uFF09\u3002`
   },

package/dist/connectors/google-ads.js

@@ -42,6 +42,39 @@ var ParameterDefinition = class {
   }
 };
 
+// ../connectors/src/connectors/google-ads/constants.ts
+var VERSION_FALLBACK_ORDER = ["v22", "v23", "v24"];
+var cachedWorkingVersion = VERSION_FALLBACK_ORDER[0];
+var looksSunset = (contentType) => {
+  return contentType != null && contentType.toLowerCase().includes("text/html");
+};
+async function fetchGoogleAdsWithVersionFallback(attempt) {
+  const order = [
+    cachedWorkingVersion,
+    ...VERSION_FALLBACK_ORDER.filter((v) => v !== cachedWorkingVersion)
+  ];
+  let lastResponse = null;
+  for (let i = 0; i < order.length; i++) {
+    const version = order[i];
+    const baseUrl = `https://googleads.googleapis.com/${version}/`;
+    const response = await attempt(baseUrl);
+    const contentType = response.headers.get("content-type");
+    if (looksSunset(contentType) && i < order.length - 1) {
+      console.warn(
+        `[google-ads] version ${version} returned a sunset/HTML response (status ${response.status}); retrying with newer version`
+      );
+      lastResponse = response;
+      continue;
+    }
+    cachedWorkingVersion = version;
+    return response;
+  }
+  return lastResponse ?? new Response(null, {
+    status: 502,
+    statusText: "All Google Ads API versions returned sunset responses"
+  });
+}
+
 // ../connectors/src/connectors/google-ads/parameters.ts
 var parameters = {
   customerId: new ParameterDefinition({
@@ -52,29 +85,13 @@ var parameters = {
     type: "text",
     secret: false,
     required: false
-  }),
-  developerToken: new ParameterDefinition({
-    slug: "developer-token",
-    name: "Google Ads Developer Token",
-    description: "The developer token for accessing the Google Ads API. Required for all API requests.",
-    envVarBaseKey: "GOOGLE_ADS_DEVELOPER_TOKEN",
-    type: "text",
-    secret: true,
-    required: true
   })
 };
 
 // ../connectors/src/connectors/google-ads/sdk/index.ts
-var BASE_URL = "https://googleads.googleapis.com/v18/";
 function createClient(params, fetchFn = fetch) {
   const rawCustomerId = params[parameters.customerId.slug];
   const defaultCustomerId = rawCustomerId?.replace(/-/g, "") ?? "";
-  const developerToken = params[parameters.developerToken.slug];
-  if (!developerToken) {
-    throw new Error(
-      `google-ads: missing required parameter: ${parameters.developerToken.slug}`
-    );
-  }
   function resolveCustomerId(override) {
     const id = override?.replace(/-/g, "") ?? defaultCustomerId;
     if (!id) {
@@ -86,26 +103,26 @@ function createClient(params, fetchFn = fetch) {
   }
   function request(path2, init) {
     const resolvedPath = defaultCustomerId ? path2.replace(/\{customerId\}/g, defaultCustomerId) : path2;
-    const url = `${BASE_URL}${resolvedPath}`;
     const headers = new Headers(init?.headers);
-    headers.set("developer-token", developerToken);
     if (defaultCustomerId) {
       headers.set("login-customer-id", defaultCustomerId);
     }
-    return fetchFn(url, { ...init, headers });
+    return fetchGoogleAdsWithVersionFallback(
+      (baseUrl) => fetchFn(`${baseUrl}${resolvedPath}`, { ...init, headers })
+    );
   }
   async function search(query, customerId) {
     const cid = resolveCustomerId(customerId);
-    const url = `${BASE_URL}customers/${cid}/googleAds:searchStream`;
     const headers = new Headers();
     headers.set("Content-Type", "application/json");
-    headers.set("developer-token", developerToken);
     headers.set("login-customer-id", cid);
-    const response = await fetchFn(url, {
-      method: "POST",
-      headers,
-      body: JSON.stringify({ query })
-    });
+    const response = await fetchGoogleAdsWithVersionFallback(
+      (baseUrl) => fetchFn(`${baseUrl}customers/${cid}/googleAds:searchStream`, {
+        method: "POST",
+        headers,
+        body: JSON.stringify({ query })
+      })
+    );
     if (!response.ok) {
       const body = await response.text();
       throw new Error(
@@ -116,10 +133,9 @@ function createClient(params, fetchFn = fetch) {
     return data.flatMap((chunk) => chunk.results ?? []);
   }
   async function listAccessibleCustomers() {
-    const url = `${BASE_URL}customers:listAccessibleCustomers`;
-    const headers = new Headers();
-    headers.set("developer-token", developerToken);
-    const response = await fetchFn(url, { method: "GET", headers });
+    const response = await fetchGoogleAdsWithVersionFallback(
+      (baseUrl) => fetchFn(`${baseUrl}customers:listAccessibleCustomers`, { method: "GET" })
+    );
     if (!response.ok) {
       const body = await response.text();
       throw new Error(
@@ -289,7 +305,65 @@ var AUTH_TYPES = {
 
 // ../connectors/src/connectors/google-ads/tools/list-customers.ts
 import { z } from "zod";
-var BASE_URL2 = "https://googleads.googleapis.com/v18/";
+
+// ../connectors/src/connectors/google-ads/error.ts
+var parseJsonOrNull = (text) => {
+  if (text.length === 0) return null;
+  try {
+    return JSON.parse(text);
+  } catch {
+    return null;
+  }
+};
+var isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+var collectGoogleAdsErrorCodes = (details) => {
+  if (!Array.isArray(details)) return [];
+  const codes = [];
+  for (const detail of details) {
+    if (!isRecord(detail)) continue;
+    const errors = detail.errors;
+    if (!Array.isArray(errors)) continue;
+    for (const e of errors) {
+      if (!isRecord(e)) continue;
+      const errorCode = e.errorCode;
+      if (!isRecord(errorCode)) continue;
+      for (const [k, v] of Object.entries(errorCode)) {
+        if (typeof v === "string") codes.push(`${k}=${v}`);
+      }
+    }
+  }
+  return codes;
+};
+var extractGoogleAdsErrorMessage = (status, statusText, parsedBody, rawText) => {
+  const fallback = `HTTP ${status} ${statusText}`;
+  if (isRecord(parsedBody)) {
+    const errorField = parsedBody.error;
+    if (typeof errorField === "string") return errorField;
+    if (isRecord(errorField)) {
+      const message = typeof errorField.message === "string" ? errorField.message : null;
+      const errorStatus = typeof errorField.status === "string" ? errorField.status : null;
+      const codes = collectGoogleAdsErrorCodes(errorField.details);
+      const parts = [
+        fallback,
+        errorStatus,
+        message,
+        codes.length > 0 ? `[${codes.join(", ")}]` : null
+      ].filter((p) => p != null && p.length > 0);
+      if (parts.length > 1) return parts.join(": ");
+    }
+    if (typeof parsedBody.message === "string") {
+      return `${fallback}: ${parsedBody.message}`;
+    }
+  }
+  if (rawText.length > 0) {
+    const trimmed = rawText.trim();
+    const preview = trimmed.length > 500 ? `${trimmed.slice(0, 500)}\u2026` : trimmed;
+    return `${fallback}: ${preview}`;
+  }
+  return fallback;
+};
+
+// ../connectors/src/connectors/google-ads/tools/list-customers.ts
 var REQUEST_TIMEOUT_MS = 6e4;
 var cachedToken = null;
 async function getProxyToken(config) {
@@ -360,58 +434,65 @@ var listCustomersTool = new ConnectorTool({
       `[connector-request] google-ads/${connection2.name}: listCustomers`
     );
     try {
-      const developerToken = parameters.developerToken.getValue(connection2);
       const token = await getProxyToken(config.oauthProxy);
       const proxyUrl = `https://${config.oauthProxy.sandboxId}.${config.oauthProxy.previewBaseDomain}/_sqcore/connections/${connectionId}/request`;
       const controller = new AbortController();
       const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
       try {
-        const response = await fetch(proxyUrl, {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json",
-            Authorization: `Bearer ${token}`
-          },
-          body: JSON.stringify({
-            url: `${BASE_URL2}customers:listAccessibleCustomers`,
-            method: "GET",
+        const response = await fetchGoogleAdsWithVersionFallback(
+          (baseUrl) => fetch(proxyUrl, {
+            method: "POST",
             headers: {
-              "developer-token": developerToken
-            }
-          }),
-          signal: controller.signal
-        });
-        const data = await response.json();
+              "Content-Type": "application/json",
+              Authorization: `Bearer ${token}`
+            },
+            body: JSON.stringify({
+              url: `${baseUrl}customers:listAccessibleCustomers`,
+              method: "GET"
+            }),
+            signal: controller.signal
+          })
+        );
+        const rawText = await response.text();
+        const data = parseJsonOrNull(rawText);
         if (!response.ok) {
-          const errorMessage = typeof data?.error === "string" ? data.error : typeof data?.message === "string" ? data.message : `HTTP ${response.status} ${response.statusText}`;
-          return { success: false, error: errorMessage };
+          return {
+            success: false,
+            error: extractGoogleAdsErrorMessage(
+              response.status,
+              response.statusText,
+              data,
+              rawText
+            )
+          };
         }
-        const customerIds = (data.resourceNames ?? []).map(
+        const customerIds = (data?.resourceNames ?? []).map(
           (rn) => rn.replace(/^customers\//, "")
         );
         const customers = [];
         for (const cid of customerIds) {
           try {
-            const detailResponse = await fetch(proxyUrl, {
-              method: "POST",
-              headers: {
-                "Content-Type": "application/json",
-                Authorization: `Bearer ${token}`
-              },
-              body: JSON.stringify({
-                url: `${BASE_URL2}customers/${cid}/googleAds:searchStream`,
+            const detailResponse = await fetchGoogleAdsWithVersionFallback(
+              (baseUrl) => fetch(proxyUrl, {
                 method: "POST",
                 headers: {
                   "Content-Type": "application/json",
-                  "developer-token": developerToken,
-                  "login-customer-id": cid
+                  Authorization: `Bearer ${token}`
                 },
                 body: JSON.stringify({
-                  query: "SELECT customer.id, customer.descriptive_name FROM customer LIMIT 1"
-                })
-              }),
-              signal: controller.signal
-            });
+                  url: `${baseUrl}customers/${cid}/googleAds:searchStream`,
+                  method: "POST",
+                  headers: {
+                    "Content-Type": "application/json",
+                    "login-customer-id": cid
+                  },
+                  body: JSON.stringify({
+                    query: "SELECT customer.id, customer.descriptive_name FROM customer LIMIT 1"
+                  })
+                }),
+                signal: controller.signal
+              })
+            );
             if (detailResponse.ok) {
               const detailData = await detailResponse.json();
               const customer = detailData?.[0]?.results?.[0]?.customer;
@@ -449,30 +530,24 @@ var googleAdsOnboarding = new ConnectorOnboarding({
   connectionSetupInstructions: {
     ja: `\u4EE5\u4E0B\u306E\u624B\u9806\u3067Google Ads (OAuth) \u30B3\u30CD\u30AF\u30B7\u30E7\u30F3\u306E\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u3092\u884C\u3063\u3066\u304F\u3060\u3055\u3044\u3002
 
-1. \u30E6\u30FC\u30B6\u30FC\u306B\u300CGoogle Ads API \u306E Developer Token \u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\uFF08Google Ads \u7BA1\u7406\u753B\u9762 > \u30C4\u30FC\u30EB\u3068\u8A2D\u5B9A > API \u30BB\u30F3\u30BF\u30FC\u3067\u53D6\u5F97\u3067\u304D\u307E\u3059\uFF09\u300D\u3068\u4F1D\u3048\u308B
+1. \`${listCustomersToolName}\` \u3092\u547C\u3073\u51FA\u3057\u3066\u3001OAuth\u3067\u30A2\u30AF\u30BB\u30B9\u53EF\u80FD\u306AGoogle Ads\u30AB\u30B9\u30BF\u30DE\u30FC\u30A2\u30AB\u30A6\u30F3\u30C8\u4E00\u89A7\u3092\u53D6\u5F97\u3059\u308B
 2. \`updateConnectionParameters\` \u3092\u547C\u3073\u51FA\u3059:
-   - \`parameterSlug\`: \`"developer-token"\`
-   - \`value\`: \u30E6\u30FC\u30B6\u30FC\u304C\u63D0\u4F9B\u3057\u305F Developer Token
-3. \`${listCustomersToolName}\` \u3092\u547C\u3073\u51FA\u3057\u3066\u3001OAuth\u3067\u30A2\u30AF\u30BB\u30B9\u53EF\u80FD\u306AGoogle Ads\u30AB\u30B9\u30BF\u30DE\u30FC\u30A2\u30AB\u30A6\u30F3\u30C8\u4E00\u89A7\u3092\u53D6\u5F97\u3059\u308B
-4. \`updateConnectionParameters\` \u3092\u547C\u3073\u51FA\u3059:
    - \`parameterSlug\`: \`"customer-id"\`
    - \`options\`: \u30AB\u30B9\u30BF\u30DE\u30FC\u4E00\u89A7\u3002\u5404 option \u306E \`label\` \u306F \`\u30A2\u30AB\u30A6\u30F3\u30C8\u540D (id: \u30AB\u30B9\u30BF\u30DE\u30FCID)\` \u306E\u5F62\u5F0F\u3001\`value\` \u306F\u30AB\u30B9\u30BF\u30DE\u30FCID
-5. \u30E6\u30FC\u30B6\u30FC\u304C\u9078\u629E\u3057\u305F\u30AB\u30B9\u30BF\u30DE\u30FC\u306E \`label\` \u304C\u30E1\u30C3\u30BB\u30FC\u30B8\u3068\u3057\u3066\u5C4A\u304F\u306E\u3067\u3001\u6B21\u306E\u30B9\u30C6\u30C3\u30D7\u306B\u9032\u3080
+   - \u30AB\u30B9\u30BF\u30DE\u30FC\u304C **0\u4EF6** \u306E\u5834\u5408\u306F\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. \u30E6\u30FC\u30B6\u30FC\u304C\u9078\u629E\u3057\u305F\u30AB\u30B9\u30BF\u30DE\u30FC\u306E \`label\` \u304C\u30E1\u30C3\u30BB\u30FC\u30B8\u3068\u3057\u3066\u5C4A\u304F\u306E\u3067\u3001\u6B21\u306E\u30B9\u30C6\u30C3\u30D7\u306B\u9032\u3080
 
 #### \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
 - \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 Ads (OAuth) connection.
 
-1. Ask the user to provide their Google Ads API Developer Token (available in Google Ads UI > Tools & Settings > API Center)
+1. Call \`${listCustomersToolName}\` to get the list of Google Ads customer accounts accessible with the OAuth credentials
 2. Call \`updateConnectionParameters\`:
-   - \`parameterSlug\`: \`"developer-token"\`
-   - \`value\`: The Developer Token provided by the user
-3. Call \`${listCustomersToolName}\` to get the list of Google Ads customer accounts accessible with the OAuth credentials
-4. Call \`updateConnectionParameters\`:
    - \`parameterSlug\`: \`"customer-id"\`
    - \`options\`: The customer list. Each option's \`label\` should be \`Account Name (id: customerId)\`, \`value\` should be the customer ID
-5. The \`label\` of the user's selected customer will arrive as a message. Proceed to the next step
+   - If **0 customers** are returned, abort setup and inform the user that no accessible accounts are available
+3. The \`label\` of the user's selected customer will arrive as a message. Proceed to the next step
 
 #### Constraints
 - **Do NOT fetch report data during setup**. Only the metadata requests specified in the steps above are allowed
@@ -488,7 +563,6 @@ var googleAdsOnboarding = new ConnectorOnboarding({
 
 // ../connectors/src/connectors/google-ads/tools/request.ts
 import { z as z2 } from "zod";
-var BASE_URL3 = "https://googleads.googleapis.com/v18/";
 var REQUEST_TIMEOUT_MS2 = 6e4;
 var cachedToken2 = null;
 async function getProxyToken2(config) {
@@ -528,7 +602,7 @@ var inputSchema2 = z2.object({
   connectionId: z2.string().describe("ID of the Google Ads OAuth connection to use"),
   method: z2.enum(["GET", "POST"]).describe("HTTP method"),
   path: z2.string().describe(
-    "API path appended to https://googleads.googleapis.com/v18/ (e.g., 'customers/{customerId}/googleAds:searchStream'). {customerId} is automatically replaced."
+    "API path appended to https://googleads.googleapis.com/<version>/ (e.g., 'customers/{customerId}/googleAds:searchStream'). The API version is auto-managed and {customerId} is automatically replaced."
   ),
   body: z2.record(z2.string(), z2.unknown()).optional().describe("POST request body (JSON)")
 });
@@ -545,7 +619,7 @@ var outputSchema2 = z2.discriminatedUnion("success", [
 ]);
 var requestTool = new ConnectorTool({
   name: "request",
-  description: `Send authenticated requests to the Google Ads API v18.
+  description: `Send authenticated requests to the Google Ads API.
 Authentication is handled automatically via OAuth proxy.
 {customerId} in the path is automatically replaced with the connection's customer ID (hyphens removed).`,
   inputSchema: inputSchema2,
@@ -565,36 +639,42 @@ Authentication is handled automatically via OAuth proxy.
       const rawCustomerId = parameters.customerId.tryGetValue(connection2);
       const customerId = rawCustomerId?.replace(/-/g, "") ?? "";
       const resolvedPath = customerId ? path2.replace(/\{customerId\}/g, customerId) : path2;
-      const url = `${BASE_URL3}${resolvedPath}`;
       const token = await getProxyToken2(config.oauthProxy);
       const proxyUrl = `https://${config.oauthProxy.sandboxId}.${config.oauthProxy.previewBaseDomain}/_sqcore/connections/${connectionId}/request`;
       const controller = new AbortController();
       const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS2);
       try {
-        const developerToken = parameters.developerToken.getValue(connection2);
-        const response = await fetch(proxyUrl, {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json",
-            Authorization: `Bearer ${token}`
-          },
-          body: JSON.stringify({
-            url,
-            method,
+        const response = await fetchGoogleAdsWithVersionFallback(
+          (baseUrl) => fetch(proxyUrl, {
+            method: "POST",
             headers: {
               "Content-Type": "application/json",
-              "developer-token": developerToken,
-              ...customerId ? { "login-customer-id": customerId } : {}
+              Authorization: `Bearer ${token}`
             },
-            ...method === "POST" && body ? { body: JSON.stringify(body) } : {}
-          }),
-          signal: controller.signal
-        });
-        const data = await response.json();
+            body: JSON.stringify({
+              url: `${baseUrl}${resolvedPath}`,
+              method,
+              headers: {
+                "Content-Type": "application/json",
+                ...customerId ? { "login-customer-id": customerId } : {}
+              },
+              ...method === "POST" && body ? { body: JSON.stringify(body) } : {}
+            }),
+            signal: controller.signal
+          })
+        );
+        const rawText = await response.text();
+        const data = parseJsonOrNull(rawText);
         if (!response.ok) {
-          const dataObj = data;
-          const errorMessage = typeof dataObj?.error === "string" ? dataObj.error : typeof dataObj?.message === "string" ? dataObj.message : `HTTP ${response.status} ${response.statusText}`;
-          return { success: false, error: errorMessage };
+          return {
+            success: false,
+            error: extractGoogleAdsErrorMessage(
+              response.status,
+              response.statusText,
+              data,
+              rawText
+            )
+          };
         }
         return { success: true, status: response.status, data };
       } finally {
@@ -764,26 +844,22 @@ const customerIds = await ads.listAccessibleCustomers();
     if (!customerId) {
       return { success: true };
     }
-    const developerToken = params[parameters.developerToken.slug];
-    if (!developerToken) {
-      return {
-        success: false,
-        error: "Developer token is required"
-      };
-    }
-    const url = `https://googleads.googleapis.com/v18/customers/${customerId}/googleAds:searchStream`;
     try {
-      const res = await proxyFetch(url, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          "developer-token": developerToken,
-          "login-customer-id": customerId
-        },
-        body: JSON.stringify({
-          query: "SELECT customer.id FROM customer LIMIT 1"
-        })
-      });
+      const res = await fetchGoogleAdsWithVersionFallback(
+        (baseUrl) => proxyFetch(
+          `${baseUrl}customers/${customerId}/googleAds:searchStream`,
+          {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json",
+              "login-customer-id": customerId
+            },
+            body: JSON.stringify({
+              query: "SELECT customer.id FROM customer LIMIT 1"
+            })
+          }
+        )
+      );
       if (!res.ok) {
         const errorText = await res.text().catch(() => res.statusText);
         return {