@squadbase/vite-server 0.1.8 → 0.1.9-dev.3841401

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

@@ -175,6 +175,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
   releaseFlag;
   proxyPolicy;
   experimentalAttributes;
+  categories;
   onboarding;
   systemPrompt;
   tools;
@@ -190,6 +191,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
     this.releaseFlag = config.releaseFlag;
     this.proxyPolicy = config.proxyPolicy;
     this.experimentalAttributes = config.experimentalAttributes;
+    this.categories = config.categories ?? [];
     this.onboarding = config.onboarding;
     this.systemPrompt = config.systemPrompt;
     this.tools = config.tools;
@@ -269,6 +271,16 @@ var AUTH_TYPES = {
   USER_PASSWORD: "user-password"
 };
 
+// ../connectors/src/lib/normalize-path.ts
+function normalizeRequestPath(path2, basePathSegment) {
+  let p = path2.trim();
+  if (!p.startsWith("/")) p = "/" + p;
+  if (p === basePathSegment || p.startsWith(basePathSegment + "/")) {
+    p = p.slice(basePathSegment.length) || "/";
+  }
+  return p;
+}
+
 // ../connectors/src/connectors/google-calendar-oauth/tools/list-calendars.ts
 import { z } from "zod";
 var BASE_URL2 = "https://www.googleapis.com/calendar/v3";
@@ -426,7 +438,9 @@ var googleCalendarOauthOnboarding = new ConnectorOnboarding({
 
 // ../connectors/src/connectors/google-calendar-oauth/tools/request.ts
 import { z as z2 } from "zod";
-var BASE_URL3 = "https://www.googleapis.com/calendar/v3";
+var BASE_HOST = "https://www.googleapis.com";
+var BASE_PATH_SEGMENT = "/calendar/v3";
+var BASE_URL3 = `${BASE_HOST}${BASE_PATH_SEGMENT}`;
 var REQUEST_TIMEOUT_MS2 = 6e4;
 var cachedToken2 = null;
 async function getProxyToken2(config) {
@@ -503,7 +517,11 @@ Authentication is handled automatically via OAuth proxy.
     try {
       const calendarId = parameters.calendarId.tryGetValue(connection2) ?? "primary";
       const resolvedPath = path2.replace(/\{calendarId\}/g, calendarId);
-      let url = `${BASE_URL3}${resolvedPath.startsWith("/") ? "" : "/"}${resolvedPath}`;
+      const normalizedPath = normalizeRequestPath(
+        resolvedPath,
+        BASE_PATH_SEGMENT
+      );
+      let url = `${BASE_URL3}${normalizedPath}`;
       if (queryParams) {
         const searchParams = new URLSearchParams(queryParams);
         url += `?${searchParams.toString()}`;
@@ -558,6 +576,7 @@ var googleCalendarOauthConnector = new ConnectorPlugin({
   iconUrl: "https://images.ctfassets.net/9ncizv60xc5y/2YsqoBEpdELmfDeFcyGHyE/4494c633b5ae15e562cb739cd85442c1/google-calendar.png",
   parameters,
   releaseFlag: { dev1: true, dev2: false, prod: false },
+  categories: ["productivity"],
   onboarding: googleCalendarOauthOnboarding,
   proxyPolicy: {
     allowlist: [

package/dist/connectors/google-calendar.js

@@ -180,6 +180,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
   releaseFlag;
   proxyPolicy;
   experimentalAttributes;
+  categories;
   onboarding;
   systemPrompt;
   tools;
@@ -195,6 +196,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
     this.releaseFlag = config.releaseFlag;
     this.proxyPolicy = config.proxyPolicy;
     this.experimentalAttributes = config.experimentalAttributes;
+    this.categories = config.categories ?? [];
     this.onboarding = config.onboarding;
     this.systemPrompt = config.systemPrompt;
     this.tools = config.tools;
@@ -276,7 +278,21 @@ var AUTH_TYPES = {
 
 // ../connectors/src/connectors/google-calendar/tools/request.ts
 import { z } from "zod";
-var BASE_URL2 = "https://www.googleapis.com/calendar/v3";
+
+// ../connectors/src/lib/normalize-path.ts
+function normalizeRequestPath(path2, basePathSegment) {
+  let p = path2.trim();
+  if (!p.startsWith("/")) p = "/" + p;
+  if (p === basePathSegment || p.startsWith(basePathSegment + "/")) {
+    p = p.slice(basePathSegment.length) || "/";
+  }
+  return p;
+}
+
+// ../connectors/src/connectors/google-calendar/tools/request.ts
+var BASE_HOST = "https://www.googleapis.com";
+var BASE_PATH_SEGMENT = "/calendar/v3";
+var BASE_URL2 = `${BASE_HOST}${BASE_PATH_SEGMENT}`;
 var REQUEST_TIMEOUT_MS = 6e4;
 function decodeServiceAccount(keyJsonBase64) {
   const decoded = Buffer.from(keyJsonBase64, "base64").toString("utf-8");
@@ -301,7 +317,8 @@ var outputSchema = z.discriminatedUnion("success", [
   z.object({
     success: z.literal(true),
     status: z.number(),
-    data: z.record(z.string(), z.unknown())
+    data: z.record(z.string(), z.unknown()),
+    serviceAccountEmail: z.string()
   }),
   z.object({
     success: z.literal(false),
@@ -354,7 +371,8 @@ var requestTool = new ConnectorTool({
           serviceAccountEmail
         };
       }
-      let url = `${BASE_URL2}${path2.startsWith("/") ? "" : "/"}${path2}`;
+      const normalizedPath = normalizeRequestPath(path2, BASE_PATH_SEGMENT);
+      let url = `${BASE_URL2}${normalizedPath}`;
       if (queryParams) {
         const searchParams = new URLSearchParams(queryParams);
         url += `?${searchParams.toString()}`;
@@ -382,7 +400,12 @@ var requestTool = new ConnectorTool({
             serviceAccountEmail
           };
         }
-        return { success: true, status: response.status, data };
+        return {
+          success: true,
+          status: response.status,
+          data,
+          serviceAccountEmail
+        };
       } finally {
         clearTimeout(timeout);
       }
@@ -399,7 +422,9 @@ var requestTool = new ConnectorTool({
 
 // ../connectors/src/connectors/google-calendar/tools/request-with-delegation.ts
 import { z as z2 } from "zod";
-var BASE_URL3 = "https://www.googleapis.com/calendar/v3";
+var BASE_HOST2 = "https://www.googleapis.com";
+var BASE_PATH_SEGMENT2 = "/calendar/v3";
+var BASE_URL3 = `${BASE_HOST2}${BASE_PATH_SEGMENT2}`;
 var REQUEST_TIMEOUT_MS2 = 6e4;
 function decodeServiceAccount2(keyJsonBase64) {
   const decoded = Buffer.from(keyJsonBase64, "base64").toString("utf-8");
@@ -429,7 +454,8 @@ var outputSchema2 = z2.discriminatedUnion("success", [
   z2.object({
     success: z2.literal(true),
     status: z2.number(),
-    data: z2.record(z2.string(), z2.unknown())
+    data: z2.record(z2.string(), z2.unknown()),
+    serviceAccountEmail: z2.string()
   }),
   z2.object({
     success: z2.literal(false),
@@ -483,7 +509,8 @@ var requestWithDelegationTool = new ConnectorTool({
           serviceAccountEmail
         };
       }
-      let url = `${BASE_URL3}${path2.startsWith("/") ? "" : "/"}${path2}`;
+      const normalizedPath = normalizeRequestPath(path2, BASE_PATH_SEGMENT2);
+      let url = `${BASE_URL3}${normalizedPath}`;
       if (queryParams) {
         const searchParams = new URLSearchParams(queryParams);
         url += `?${searchParams.toString()}`;
@@ -511,7 +538,12 @@ var requestWithDelegationTool = new ConnectorTool({
             serviceAccountEmail
           };
         }
-        return { success: true, status: response.status, data };
+        return {
+          success: true,
+          status: response.status,
+          data,
+          serviceAccountEmail
+        };
       } finally {
         clearTimeout(timeout);
       }
@@ -533,7 +565,18 @@ var READONLY_SCOPES = '["https://www.googleapis.com/auth/calendar.readonly"]';
 var SERVICE_ACCOUNT_KEY_PARAM_SLUG = parameters.serviceAccountKeyJsonBase64.slug;
 var googleCalendarOnboarding = new ConnectorOnboarding({
   connectionSetupInstructions: {
-    ja: `Google Calendar \u30B3\u30CD\u30AF\u30B7\u30E7\u30F3\u3092\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u3057\u307E\u3059\u3002\u30A2\u30AF\u30BB\u30B9\u65B9\u6CD5\u3092\u9078\u3093\u3067\u3082\u3089\u3044\u3001\u5BFE\u8C61\u30AB\u30EC\u30F3\u30C0\u30FC\u3092\u767A\u898B\u30FB\u9078\u629E\u3057\u3066 Project Knowledge \u306B\u8A18\u9332\u3057\u307E\u3059\u3002
+    ja: `Google Calendar \u30B3\u30CD\u30AF\u30B7\u30E7\u30F3\u3092\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u3057\u307E\u3059\u3002\u30A2\u30AF\u30BB\u30B9\u65B9\u6CD5\u3092\u9078\u3093\u3067\u3082\u3089\u3044\u3001\u5BFE\u8C61\u30AB\u30EC\u30F3\u30C0\u30FC\u3092 Project Knowledge \u306B\u8A18\u9332\u3057\u307E\u3059\u3002
+
+## \u30B9\u30C6\u30C3\u30D7 0: \u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u3092\u53D6\u5F97
+
+\u4EE5\u964D\u306E\u30B9\u30C6\u30C3\u30D7\u3067\u30E6\u30FC\u30B6\u30FC\u306B\u6848\u5185\u3059\u308B\u305F\u3081\u306B\u3001\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u3092\u53D6\u5F97\u3057\u307E\u3059\u3002
+
+\`${requestToolName}\` \u3092\u4EE5\u4E0B\u306E\u5F15\u6570\u3067 1 \u56DE\u547C\u3073\u3001\u30EC\u30B9\u30DD\u30F3\u30B9\u306E \`serviceAccountEmail\` \u3092\u4FDD\u6301\u3059\u308B:
+- \`method\`: \`"GET"\`
+- \`path\`: \`"/users/me/calendarList"\`
+- \`scopes\`: \`${READONLY_SCOPES}\`
+
+\u6210\u529F\u30FB\u5931\u6557\u3069\u3061\u3089\u3067\u3082 \`serviceAccountEmail\` \u306F\u8FD4\u3063\u3066\u304F\u308B\u306E\u3067\u3001\u7D50\u679C\u306E\u30EA\u30B9\u30C8\u306F\u3053\u306E\u30B9\u30C6\u30C3\u30D7\u3067\u306F\u7121\u8996\u3057\u3066\u3088\u3044\u3002\u4EE5\u964D\u3053\u306E\u5024\u3092 \`<serviceAccountEmail>\` \u3068\u3057\u3066\u53C2\u7167\u3059\u308B\u3002
 
 ## \u30B9\u30C6\u30C3\u30D7 1: \u30A2\u30AF\u30BB\u30B9\u65B9\u6CD5\u3092\u9078\u629E
 
@@ -545,52 +588,58 @@ var googleCalendarOnboarding = new ConnectorOnboarding({
   - \`{ label: "\u30C9\u30E1\u30A4\u30F3\u5168\u4F53\u306E\u59D4\u4EFB\u3067\u7D44\u7E54\u306E\u30E6\u30FC\u30B6\u30FC\u306E\u30AB\u30EC\u30F3\u30C0\u30FC\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B", value: "delegation" }\`
   - \`{ label: "\u4E21\u65B9\u3092\u7D44\u307F\u5408\u308F\u305B\u308B", value: "both" }\`
 
-## \u30B9\u30C6\u30C3\u30D7 2: \u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8\u7D4C\u8DEF\u306E\u767A\u898B\u3068\u9078\u629E (\`"service-account"\` \u307E\u305F\u306F \`"both"\` \u306E\u5834\u5408)
+## \u30B9\u30C6\u30C3\u30D7 2: \u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8\u7D4C\u8DEF (\`"service-account"\` \u307E\u305F\u306F \`"both"\` \u306E\u5834\u5408)
+
+\u30E6\u30FC\u30B6\u30FC\u304C\u3042\u3089\u304B\u3058\u3081\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8 \`<serviceAccountEmail>\` \u306B\u5171\u6709\u8A2D\u5B9A\u3057\u305F\u30AB\u30EC\u30F3\u30C0\u30FC\u306E ID \u3092\u76F4\u63A5\u53D7\u3051\u53D6\u308A\u3001\u758E\u901A\u78BA\u8A8D\u3057\u307E\u3059\u3002multiSelect \u306F\u51FA\u3055\u306A\u3044 (\u30E6\u30FC\u30B6\u30FC\u304C\u5165\u529B\u3057\u305F\u6642\u70B9\u3067\u5BFE\u8C61\u304C\u78BA\u5B9A\u3057\u3066\u3044\u308B\u305F\u3081)\u3002
+
+1. \`askUserQuestion\` \u3067\u30AB\u30EC\u30F3\u30C0\u30FC ID \u3092\u805E\u304F:
+   - \`type\`: \`"freeText"\`
+   - \`question\`: \u300C\u30A2\u30AF\u30BB\u30B9\u3057\u305F\u3044\u30AB\u30EC\u30F3\u30C0\u30FC\u306E ID \u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u53EF\u3001\u30AB\u30F3\u30DE\u533A\u5207\u308A\uFF09\u3002\u3042\u3089\u304B\u3058\u3081 \`<serviceAccountEmail>\` \u306B\u5171\u6709\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u30E1\u30A4\u30F3\u30AB\u30EC\u30F3\u30C0\u30FC\u306F\u6240\u6709\u8005\u306E\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u3092\u305D\u306E\u307E\u307E\u5165\u529B\u3067\u304D\u307E\u3059\u3002\u305D\u308C\u4EE5\u5916\u306E\u30AB\u30EC\u30F3\u30C0\u30FC\uFF08\u30C1\u30FC\u30E0\u30AB\u30EC\u30F3\u30C0\u30FC\u7B49\uFF09\u306F Google Calendar \u306E\u8A2D\u5B9A\u304B\u3089\u300C\u30AB\u30EC\u30F3\u30C0\u30FC ID\u300D\u3092\u30B3\u30D4\u30FC\u3057\u3066\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u300D
+   - \`placeholder\`: \`"alice@example.com, c_xxx@group.calendar.google.com"\`
 
-1. \`${requestToolName}\` \u3092\u547C\u3093\u3067\u30AB\u30EC\u30F3\u30C0\u30FC\u4E00\u89A7\u3092\u53D6\u5F97\u3059\u308B:
+2. \u5165\u529B\u3055\u308C\u305F\u5404\u30AB\u30EC\u30F3\u30C0\u30FC ID \`<id>\` \u306B\u3064\u3044\u3066 \`${requestToolName}\` \u3067\u758E\u901A\u78BA\u8A8D:
    - \`method\`: \`"GET"\`
-   - \`path\`: \`"/users/me/calendarList"\`
+   - \`path\`: \`"/calendars/<id>"\`
    - \`scopes\`: \`${READONLY_SCOPES}\`
+   - \u6210\u529F\u3059\u308C\u3070\u3001\u30EC\u30B9\u30DD\u30F3\u30B9 \`data.summary\` \u3092\u30AB\u30EC\u30F3\u30C0\u30FC\u540D\u3068\u3057\u3066\u4FDD\u6301
+   - \u5931\u6557 (404 / 403 \u7B49) \u306F\u30A2\u30AF\u30BB\u30B9\u4E0D\u53EF\u3068\u3057\u3066\u8A18\u9332
 
-2. \u53D6\u5F97\u7D50\u679C\u306B\u5FDC\u3058\u3066\u5206\u5C90:
-   - \u7D50\u679C\u304C\u7A7A: \u30A2\u30AF\u30BB\u30B9\u65B9\u6CD5\u304C \`"service-account"\` \u3060\u3051\u306A\u3089\u30B9\u30C6\u30C3\u30D7 5 (\u30A8\u30B9\u30AB\u30EC\u30FC\u30B7\u30E7\u30F3) \u3078\u3002\`"both"\` \u306E\u5834\u5408\u306F\u305D\u306E\u307E\u307E\u30B9\u30C6\u30C3\u30D7 3 \u3078\u9032\u3080
-   - \u7D50\u679C\u304C\u3042\u308B: \`askUserQuestion\` \u3067\u30AB\u30EC\u30F3\u30C0\u30FC\u3092\u9078\u3070\u305B\u308B
-     - \`type\`: \`"multiSelect"\`
-     - \`question\`: \u300C\u4F7F\u7528\u3059\u308B\u30AB\u30EC\u30F3\u30C0\u30FC\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u53EF\uFF09\u300D
-     - \`options\`: \u5404\u30AB\u30EC\u30F3\u30C0\u30FC\u306B\u3064\u3044\u3066 \`label\`: \`"<\u30AB\u30EC\u30F3\u30C0\u30FC\u540D>"\`\u3001\`value\`: \`"<calendarId>"\`
+3. \u7D50\u679C\u306B\u5FDC\u3058\u3066\u5206\u5C90:
+   - **\u5168 ID \u5931\u6557**: \u30A2\u30AF\u30BB\u30B9\u65B9\u6CD5\u304C \`"service-account"\` \u3060\u3051\u306A\u3089\u30B9\u30C6\u30C3\u30D7 5 \u3078\u3002\`"both"\` \u306E\u5834\u5408\u306F\u305D\u306E\u307E\u307E\u30B9\u30C6\u30C3\u30D7 3 \u3078\u9032\u3080
+   - **\u4E00\u90E8\u307E\u305F\u306F\u5168\u4EF6\u6210\u529F**: \u6210\u529F\u3057\u305F\u30AB\u30EC\u30F3\u30C0\u30FC\u3092\u305D\u306E\u307E\u307E\u30B9\u30C6\u30C3\u30D7 4 \u7528\u306E\u9078\u629E\u7D50\u679C\u3068\u3057\u3066\u78BA\u5B9A\u3059\u308B\u3002\u5931\u6557\u304C\u3042\u308C\u3070\u3001\u305D\u306E\u65E8\u3092 1 \u6587\u3067\u77ED\u304F\u4F1D\u3048\u308B
+
+## \u30B9\u30C6\u30C3\u30D7 3: \u30C9\u30E1\u30A4\u30F3\u5168\u4F53\u306E\u59D4\u4EFB\u7D4C\u8DEF (\`"delegation"\` \u307E\u305F\u306F \`"both"\` \u306E\u5834\u5408)
 
-## \u30B9\u30C6\u30C3\u30D7 3: \u30C9\u30E1\u30A4\u30F3\u5168\u4F53\u306E\u59D4\u4EFB\u7D4C\u8DEF\u306E\u767A\u898B\u3068\u9078\u629E (\`"delegation"\` \u307E\u305F\u306F \`"both"\` \u306E\u5834\u5408)
+\u5404 Workspace \u30E6\u30FC\u30B6\u30FC\u304C\u6301\u3063\u3066\u3044\u308B\u591A\u6570\u306E\u30AB\u30EC\u30F3\u30C0\u30FC\u304B\u3089\u3001\u5BFE\u8C61\u3092\u7D5E\u308A\u8FBC\u307F\u307E\u3059\u3002
 
 1. \`askUserQuestion\` \u3067\u5BFE\u8C61\u30E6\u30FC\u30B6\u30FC\u306E\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u3092\u805E\u304F:
    - \`type\`: \`"freeText"\`
-   - \`question\`: \u300C\u30A2\u30AF\u30BB\u30B9\u3057\u305F\u3044\u30AB\u30EC\u30F3\u30C0\u30FC\u3092\u6240\u6709\u3059\u308B Google Workspace \u30E6\u30FC\u30B6\u30FC\u306E\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u53EF\u3001\u30AB\u30F3\u30DE\u533A\u5207\u308A\uFF09\u3002Workspace \u7BA1\u7406\u8005\u304C\u3001\u3053\u306E\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8\u306B\u5BFE\u3057\u3066\u30C9\u30E1\u30A4\u30F3\u5168\u4F53\u306E\u59D4\u4EFB\u3092\u3042\u3089\u304B\u3058\u3081\u627F\u8A8D\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\uFF08[\u7BA1\u7406\u8005\u5411\u3051\u8A2D\u5B9A\u30AC\u30A4\u30C9](https://support.google.com/a/answer/162106)\uFF09\u3002\u300D
+   - \`question\`: \u300C\u30A2\u30AF\u30BB\u30B9\u3057\u305F\u3044\u30AB\u30EC\u30F3\u30C0\u30FC\u3092\u6240\u6709\u3059\u308B Google Workspace \u30E6\u30FC\u30B6\u30FC\u306E\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u53EF\u3001\u30AB\u30F3\u30DE\u533A\u5207\u308A\uFF09\u3002Workspace \u7BA1\u7406\u8005\u304C\u3042\u3089\u304B\u3058\u3081\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8 \`<serviceAccountEmail>\` \u306B\u5BFE\u3057\u3066\u30C9\u30E1\u30A4\u30F3\u5168\u4F53\u306E\u59D4\u4EFB\u3092\u627F\u8A8D\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\uFF08[\u7BA1\u7406\u8005\u5411\u3051\u8A2D\u5B9A\u30AC\u30A4\u30C9](https://support.google.com/a/answer/162106)\uFF09\u3002\u300D
    - \`placeholder\`: \`"alice@example.com, bob@example.com"\`
 
-2. \u30E6\u30FC\u30B6\u30FC\u304B\u3089\u53D7\u3051\u53D6\u3063\u305F\u6587\u5B57\u5217\u304B\u3089\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u3092\u62BD\u51FA\u3057\u3001\u5404 \`<email>\` \u306B\u3064\u3044\u3066 \`${requestWithDelegationToolName}\` \u3092\u547C\u3076:
+2. \u5165\u529B\u3055\u308C\u305F\u5404\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9 \`<email>\` \u306B\u3064\u3044\u3066 \`${requestWithDelegationToolName}\` \u3092\u547C\u3073\u3001\u305D\u306E\u30E6\u30FC\u30B6\u30FC\u304C\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u308B\u30AB\u30EC\u30F3\u30C0\u30FC\u4E00\u89A7\u3092\u53D6\u5F97:
    - \`method\`: \`"GET"\`
    - \`path\`: \`"/users/me/calendarList"\`
    - \`subject\`: \`<email>\`
    - \`scopes\`: \`${READONLY_SCOPES}\`
 
-3. \u53D6\u5F97\u7D50\u679C\u306B\u5FDC\u3058\u3066\u5206\u5C90:
-   - \u5168 email \u3067\u53D6\u5F97\u5931\u6557: \u30A2\u30AF\u30BB\u30B9\u65B9\u6CD5\u304C \`"delegation"\` \u3060\u3051\u3001\u3082\u3057\u304F\u306F \`"both"\` \u3067\u30B9\u30C6\u30C3\u30D7 2 \u3067\u3082 0 \u4EF6\u306E\u5834\u5408\u306F\u30B9\u30C6\u30C3\u30D7 5 \u3078\u3002\`"both"\` \u3067\u30B9\u30C6\u30C3\u30D7 2 \u306B\u30AB\u30EC\u30F3\u30C0\u30FC\u304C\u3042\u3063\u305F\u5834\u5408\u306F\u305D\u306E\u307E\u307E\u30B9\u30C6\u30C3\u30D7 4 \u3078
-   - \u4E00\u90E8\u307E\u305F\u306F\u5168\u4EF6\u6210\u529F: \`askUserQuestion\` \u3067\u30AB\u30EC\u30F3\u30C0\u30FC\u3092\u9078\u3070\u305B\u308B
+3. \u7D50\u679C\u306B\u5FDC\u3058\u3066\u5206\u5C90:
+   - **\u5168 email \u3067\u5931\u6557**: \u30A2\u30AF\u30BB\u30B9\u65B9\u6CD5\u304C \`"delegation"\` \u3060\u3051\u3001\u307E\u305F\u306F \`"both"\` \u3067\u30B9\u30C6\u30C3\u30D7 2 \u3067\u3082 0 \u4EF6\u306E\u3068\u304D\u306F\u30B9\u30C6\u30C3\u30D7 5 \u3078\u3002\`"both"\` \u3067\u30B9\u30C6\u30C3\u30D7 2 \u306B\u30AB\u30EC\u30F3\u30C0\u30FC\u304C\u3042\u308C\u3070\u3001\u305D\u306E\u307E\u307E\u30B9\u30C6\u30C3\u30D7 4 \u3078\u9032\u3080
+   - **\u4E00\u90E8\u307E\u305F\u306F\u5168\u4EF6\u6210\u529F**: \`askUserQuestion\` \u3067\u30AB\u30EC\u30F3\u30C0\u30FC\u3092\u7D5E\u308A\u8FBC\u307E\u305B\u308B
      - \`type\`: \`"multiSelect"\`
      - \`question\`: \u300C\u4F7F\u7528\u3059\u308B\u30AB\u30EC\u30F3\u30C0\u30FC\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u53EF\uFF09\u300D
-     - \`options\`: \u5404\u30AB\u30EC\u30F3\u30C0\u30FC\u306B\u3064\u3044\u3066 \`label\`: \`"<\u30AB\u30EC\u30F3\u30C0\u30FC\u540D> (\u6240\u6709\u8005: <\u305D\u306E\u3068\u304D\u306E subject>)"\`\u3001\`value\`: \`"<calendarId>"\`
+     - \`options\`: \u767A\u898B\u3057\u305F\u5404\u30AB\u30EC\u30F3\u30C0\u30FC\u306B\u3064\u3044\u3066 \`label\`: \`"<\u30AB\u30EC\u30F3\u30C0\u30FC\u540D> (\u6240\u6709\u8005: <\u305D\u306E\u3068\u304D\u306E subject>)"\`\u3001\`value\`: \`"<calendarId>"\`
      - \u4E00\u90E8\u5931\u6557\u304C\u3042\u308C\u3070\u3001\u305D\u306E\u65E8\u3092 1 \u6587\u3067\u77ED\u304F\u4F1D\u3048\u308B
 
 ## \u30B9\u30C6\u30C3\u30D7 4: Project Knowledge \u306B\u8A18\u9332
 
-\u30B9\u30C6\u30C3\u30D7 2 \u3068 3 \u3067\u9078\u3070\u308C\u305F calendarId \u96C6\u5408\u3092\u30C7\u30A3\u30B9\u30AB\u30D0\u30EA\u7D50\u679C\u3068\u7A81\u304D\u5408\u308F\u305B\u3066\u3001\u5404\u30AB\u30EC\u30F3\u30C0\u30FC\u306E\u7D4C\u8DEF\u3068 subject \u3092\u7279\u5B9A\u3059\u308B\u3002\`finalizeSetup\` \u3092\u547C\u3073\u3001\`projectKnowledge\` \u306E \`#### \u30B9\u30B3\u30FC\u30D7\` \u7BC0\u306B\u5404\u30AB\u30EC\u30F3\u30C0\u30FC\u3092 1 \u884C\u305A\u3064\u5217\u6319\u3059\u308B:
-- \u30C9\u30E1\u30A4\u30F3\u5168\u4F53\u306E\u59D4\u4EFB\u7D4C\u7531: \`- calendar: <calendarId> (delegation, subject: <subject>, name: "<\u30AB\u30EC\u30F3\u30C0\u30FC\u540D>")\`
-- \u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8\u7D4C\u8DEF: \`- calendar: <calendarId> (service-account, name: "<\u30AB\u30EC\u30F3\u30C0\u30FC\u540D>")\`
+\u30B9\u30C6\u30C3\u30D7 2 \u3068 3 \u3067\u78BA\u5B9A\u3057\u305F calendarId \u96C6\u5408\u3092\u7D71\u5408\u3059\u308B\u3002\u5404 calendarId \u306B\u3064\u3044\u3066\u3001\u30B9\u30C6\u30C3\u30D7 2 \u3067\u758E\u901A\u78BA\u8A8D\u3057\u305F\u7D50\u679C\u304B\u3001\u30B9\u30C6\u30C3\u30D7 3 \u306E\u30C7\u30A3\u30B9\u30AB\u30D0\u30EA\u7D50\u679C\u304B\u3089\u7D4C\u8DEF\u3068 (delegation \u306E\u5834\u5408\u306F) subject \u3092\u7279\u5B9A\u3059\u308B\u3002\`finalizeSetup\` \u3092\u547C\u3073\u3001\u5404\u30AB\u30EC\u30F3\u30C0\u30FC\u3092\u300C\u30AB\u30EC\u30F3\u30C0\u30FC\u540D\u30FB\u30AB\u30EC\u30F3\u30C0\u30FC ID\u30FB\u30A2\u30AF\u30BB\u30B9\u7D4C\u8DEF\uFF08delegation \u304B service-account \u304B\uFF09\u30FBdelegation \u306E\u5834\u5408\u306F subject\u300D\u3068\u3068\u3082\u306B\u3053\u306E\u30B3\u30CD\u30AF\u30B7\u30E7\u30F3\u306E\u30B9\u30B3\u30FC\u30D7\u60C5\u5831\u3068\u3057\u3066\u8A18\u9332\u3059\u308B\u3002
 
-## \u30B9\u30C6\u30C3\u30D7 5: \u6700\u7D42\u7684\u306B\u30AB\u30EC\u30F3\u30C0\u30FC\u304C 0 \u4EF6\u306E\u5834\u5408\u306E\u30A8\u30B9\u30AB\u30EC\u30FC\u30B7\u30E7\u30F3
+## \u30B9\u30C6\u30C3\u30D7 5: \u6700\u7D42\u7684\u306B\u30AB\u30EC\u30F3\u30C0\u30FC\u304C 0 \u4EF6\u306E\u3068\u304D\u306E\u30A8\u30B9\u30AB\u30EC\u30FC\u30B7\u30E7\u30F3
 
-\u6700\u7D42\u7684\u306B\u9078\u629E\u30AB\u30EC\u30F3\u30C0\u30FC\u304C 1 \u4EF6\u3082\u7121\u3044\u5834\u5408 (\u5404\u7D4C\u8DEF\u306E\u767A\u898B\u304C\u7A7A\u3001\u307E\u305F\u306F\u9078\u629E\u3055\u308C\u306A\u304B\u3063\u305F)\u3001\u30A8\u30E9\u30FC\u30EC\u30B9\u30DD\u30F3\u30B9\u304B\u3089 \`serviceAccountEmail\` \u3092\u53D6\u308A\u51FA\u3057\u3001\`askUserQuestion\` \u3067\u6B21\u306E\u3088\u3046\u306B\u6848\u5185\u3059\u308B:
+\u6700\u7D42\u7684\u306B\u5BFE\u8C61\u30AB\u30EC\u30F3\u30C0\u30FC\u304C 1 \u4EF6\u3082\u306A\u3044\u5834\u5408\u3001\`askUserQuestion\` \u3067\u6B21\u306E\u3088\u3046\u306B\u6848\u5185\u3059\u308B:
 
-- \`question\`: \u300C\u30A2\u30AF\u30BB\u30B9\u53EF\u80FD\u306A\u30AB\u30EC\u30F3\u30C0\u30FC\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u6B21\u306E\u3044\u305A\u308C\u304B\u3092\u884C\u3063\u3066\u304B\u3089\u7D9A\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8: \`<serviceAccountEmail>\`\u3002\u300D
+- \`question\`: \u300C\u30A2\u30AF\u30BB\u30B9\u53EF\u80FD\u306A\u30AB\u30EC\u30F3\u30C0\u30FC\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8 \`<serviceAccountEmail>\` \u3067\u6B21\u306E\u3044\u305A\u308C\u304B\u3092\u884C\u3063\u3066\u304B\u3089\u7D9A\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u300D
 - \`options\`: \u3053\u3053\u307E\u3067\u306B\u8A66\u3057\u305F\u7D4C\u8DEF\u306B\u5FDC\u3058\u3066\u4EE5\u4E0B\u3092\u7D44\u307F\u5408\u308F\u305B\u308B:
   - \u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8\u7D4C\u8DEF\u3092\u8A66\u3057\u305F\u5834\u5408: \`{ label: "\u5BFE\u8C61\u30AB\u30EC\u30F3\u30C0\u30FC\u3092\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8\u306B\u5171\u6709\u3057\u305F\u306E\u3067\u30EA\u30C8\u30E9\u30A4", value: "retry" }\`
   - \u30C9\u30E1\u30A4\u30F3\u5168\u4F53\u306E\u59D4\u4EFB\u7D4C\u8DEF\u3092\u8A66\u3057\u305F\u5834\u5408: \`{ label: "\u30C9\u30E1\u30A4\u30F3\u5168\u4F53\u306E\u59D4\u4EFB\u3092\u627F\u8A8D\u3057\u305F\u306E\u3067\u30EA\u30C8\u30E9\u30A4", value: "retry" }\`
@@ -598,17 +647,28 @@ var googleCalendarOnboarding = new ConnectorOnboarding({
   - \u5E38\u306B: \`{ label: "\u5225\u306E\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8\u3067\u8A2D\u5B9A\u3057\u76F4\u3059", value: "change-service-account" }\`
 
 \u9078\u629E\u7D50\u679C\u306B\u5FDC\u3058\u305F\u6319\u52D5:
-- "retry": \u76F4\u524D\u306E\u7D4C\u8DEF\u3092\u518D probe (\u5177\u4F53\u7684\u306A\u3084\u308A\u76F4\u3057\u65B9\u306F\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u306B\u4EFB\u305B\u308B)
+- "retry": \u76F4\u524D\u306E\u7D4C\u8DEF\u3092\u518D probe (\u30EA\u30C8\u30E9\u30A4\u306E\u4ED5\u65B9\u306F\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u304C\u6587\u8108\u306B\u5FDC\u3058\u3066\u5224\u65AD)
 - "restart": \u30B9\u30C6\u30C3\u30D7 1 \u304B\u3089\u518D\u5B9F\u884C
 - "change-service-account": \`updateConnectionParameters\` \u3092\u547C\u3093\u3067\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8 JSON \u3092\u518D\u5165\u529B\u3055\u305B\u308B:
   - \`parameterSlug\`: \`"${SERVICE_ACCOUNT_KEY_PARAM_SLUG}"\`
-  - \u5B8C\u4E86\u5F8C\u3001\u30B9\u30C6\u30C3\u30D7 1 \u304B\u3089\u518D\u5B9F\u884C
+  - \u5B8C\u4E86\u5F8C\u3001\u30B9\u30C6\u30C3\u30D7 0 \u304B\u3089\u518D\u5B9F\u884C
 
 ## \u5236\u7D04
 
 - \u4E0A\u8A18\u4EE5\u5916\u306E API \u547C\u3073\u51FA\u3057\u3092 setup \u4E2D\u306B\u884C\u308F\u306A\u3044
 - \u30C4\u30FC\u30EB\u547C\u3073\u51FA\u3057\u306E\u9593\u306F 1 \u6587\u3060\u3051\u66F8\u3044\u3066\u5373\u6B21\u306E\u30C4\u30FC\u30EB\u547C\u3073\u51FA\u3057`,
-    en: `Set up the Google Calendar connection. Ask the user how they want to access calendars, discover and select the target calendars, and record them in Project Knowledge.
+    en: `Set up the Google Calendar connection. Ask the user how they want to access calendars and record the target calendars in Project Knowledge.
+
+## Step 0: Get the service account email
+
+We need the service account email so we can show it to the user in the next steps.
+
+Call \`${requestToolName}\` once and remember the \`serviceAccountEmail\` from the response:
+- \`method\`: \`"GET"\`
+- \`path\`: \`"/users/me/calendarList"\`
+- \`scopes\`: \`${READONLY_SCOPES}\`
+
+\`serviceAccountEmail\` is returned regardless of success or failure, so the list payload itself can be ignored at this stage. Refer to the captured value as \`<serviceAccountEmail>\` in the steps below.
 
 ## Step 1: Choose the access method
 
@@ -620,50 +680,56 @@ Call \`askUserQuestion\`:
   - \`{ label: "Calendars of users in your organization (via Domain-wide Delegation)", value: "delegation" }\`
   - \`{ label: "Both", value: "both" }\`
 
-## Step 2: Discover and select via the service-account path (when \`"service-account"\` or \`"both"\`)
+## Step 2: Service-account path (when \`"service-account"\` or \`"both"\`)
 
-1. Call \`${requestToolName}\`:
+Take calendar IDs that the user has already shared with \`<serviceAccountEmail>\`, and verify each one. No multiSelect step (the user has already specified which calendars to use by entering their IDs).
+
+1. Ask the user for calendar IDs:
+   - \`type\`: \`"freeText"\`
+   - \`question\`: "Enter the IDs of the calendars you want to access (comma-separated for multiple). Each calendar must already be shared with \`<serviceAccountEmail>\`. For someone's primary calendar you can enter their email address directly. For other calendars (such as team calendars), copy the 'Calendar ID' from the calendar settings in Google Calendar."
+   - \`placeholder\`: \`"alice@example.com, c_xxx@group.calendar.google.com"\`
+
+2. For each calendar ID \`<id>\`, verify access by calling \`${requestToolName}\`:
    - \`method\`: \`"GET"\`
-   - \`path\`: \`"/users/me/calendarList"\`
+   - \`path\`: \`"/calendars/<id>"\`
    - \`scopes\`: \`${READONLY_SCOPES}\`
+   - On success, capture \`data.summary\` as the calendar name
+   - On failure (404 / 403 / etc.), record the ID as inaccessible
 
-2. Branch on the result:
-   - Empty: if the access method is \`"service-account"\` only, jump to Step 5. If \`"both"\`, continue to Step 3.
-   - Non-empty: ask the user to pick:
-     - \`type\`: \`"multiSelect"\`
-     - \`question\`: "Select the calendars to use (multiple allowed)"
-     - \`options\`: For each calendar, \`label\`: \`"<calendar name>"\`, \`value\`: \`"<calendarId>"\`
+3. Branch on the results:
+   - **All IDs failed**: if the access method is \`"service-account"\` only, jump to Step 5. If \`"both"\`, continue to Step 3.
+   - **Any success**: take the verified calendars as the selection for Step 4. If some failed, mention them briefly in one sentence.
+
+## Step 3: Domain-wide Delegation path (when \`"delegation"\` or \`"both"\`)
 
-## Step 3: Discover and select via the Domain-wide Delegation path (when \`"delegation"\` or \`"both"\`)
+Discover calendars from each Workspace user and let the user narrow them down.
 
-1. Ask the user for target emails:
+1. Ask the user for the target Workspace user emails:
    - \`type\`: \`"freeText"\`
-   - \`question\`: "Enter the email addresses of the Google Workspace users whose calendars you want to access (comma-separated for multiple). Your Workspace admin must have authorized Domain-wide Delegation for this service account in advance ([admin setup guide](https://support.google.com/a/answer/162106))."
+   - \`question\`: "Enter the email addresses of the Google Workspace users whose calendars you want to access (comma-separated for multiple). Your Workspace admin must have authorized Domain-wide Delegation for service account \`<serviceAccountEmail>\` in advance ([admin setup guide](https://support.google.com/a/answer/162106))."
    - \`placeholder\`: \`"alice@example.com, bob@example.com"\`
 
-2. Extract individual emails and, for each \`<email>\`, call \`${requestWithDelegationToolName}\`:
+2. For each email \`<email>\`, list calendars accessible to that user via \`${requestWithDelegationToolName}\`:
    - \`method\`: \`"GET"\`
    - \`path\`: \`"/users/me/calendarList"\`
    - \`subject\`: \`<email>\`
    - \`scopes\`: \`${READONLY_SCOPES}\`
 
 3. Branch on the results:
-   - All emails failed: if the access method is \`"delegation"\` only, or it's \`"both"\` but Step 2 also produced 0 calendars, jump to Step 5. If \`"both"\` and Step 2 had calendars, proceed to Step 4.
-   - Any success: ask the user to pick:
+   - **All emails failed**: if the access method is \`"delegation"\` only, or \`"both"\` with no calendars from Step 2, jump to Step 5. If \`"both"\` and Step 2 had calendars, continue to Step 4.
+   - **Any success**: ask the user to narrow down via \`askUserQuestion\`:
      - \`type\`: \`"multiSelect"\`
      - \`question\`: "Select the calendars to use (multiple allowed)"
-     - \`options\`: For each calendar, \`label\`: \`"<calendar name> (owner: <the subject used>)"\`, \`value\`: \`"<calendarId>"\`
-     - If some emails failed, mention that briefly in one sentence.
+     - \`options\`: For each discovered calendar, \`label\`: \`"<calendar name> (owner: <the subject used>)"\`, \`value\`: \`"<calendarId>"\`
+     - If some emails failed, mention them briefly in one sentence.
 
 ## Step 4: Record in Project Knowledge
 
-Aggregate the calendarIds selected in Steps 2 and 3, cross-reference the discovery results to recover each calendar's access path and subject, and call \`finalizeSetup\`. Under \`#### \u30B9\u30B3\u30FC\u30D7\` in \`projectKnowledge\`, list each calendar on its own line:
-- Via Domain-wide Delegation: \`- calendar: <calendarId> (delegation, subject: <subject>, name: "<calendar name>")\`
-- Via service account: \`- calendar: <calendarId> (service-account, name: "<calendar name>")\`
+Aggregate the calendarIds from Steps 2 and 3. Cross-reference each calendarId against the verification result (Step 2) or the discovery result (Step 3) to recover its access path and, for delegation, the subject. Call \`finalizeSetup\` and record each calendar with its name, calendar ID, access path (delegation or service-account), and (for delegation) the subject as this connection's scope info.
 
 ## Step 5: Escalation when zero calendars are selected
 
-If the final selected calendar set is empty (every attempted path returned nothing, or the user picked nothing), take \`serviceAccountEmail\` from any failed tool response and call \`askUserQuestion\`:
+When no calendars end up selected, call \`askUserQuestion\`:
 
 - \`question\`: "No accessible calendars found. Please do one of the following before continuing. Service account: \`<serviceAccountEmail>\`."
 - \`options\`: Combine these based on which paths were attempted:
@@ -673,11 +739,11 @@ If the final selected calendar set is empty (every attempted path returned nothi
   - Always: \`{ label: "Use a different service account", value: "change-service-account" }\`
 
 Behavior per selection:
-- "retry": re-probe the path that was just attempted (leave the exact retry plan to the agent)
+- "retry": re-probe the path that was just attempted (the agent decides the exact retry plan)
 - "restart": re-run from Step 1
 - "change-service-account": call \`updateConnectionParameters\` to have the user re-upload the service account JSON:
   - \`parameterSlug\`: \`"${SERVICE_ACCOUNT_KEY_PARAM_SLUG}"\`
-  - After it completes, re-run from Step 1
+  - After it completes, re-run from Step 0
 
 ## Constraints
 
@@ -685,18 +751,18 @@ Behavior per selection:
 - Write at most 1 sentence between tool calls`
   },
   dataOverviewInstructions: {
-    en: `For each calendar recorded under \`#### \u30B9\u30B3\u30FC\u30D7\`, fetch metadata and a small sample of upcoming events. The annotation on each line tells you which tool to use:
-- \`(delegation, subject: <email>, ...)\` \u2192 \`${requestWithDelegationToolName}\` with \`subject: <email>\`
-- \`(service-account, ...)\` \u2192 \`${requestToolName}\`
+    en: `For each calendar configured for this connection, fetch metadata and a small sample of upcoming events. Pick the tool that matches the calendar's access path:
+- Calendars accessed via delegation \u2192 \`${requestWithDelegationToolName}\` with the user's email as \`subject\`
+- Calendars shared directly with the service account \u2192 \`${requestToolName}\`
 
 Pass \`scopes: ${READONLY_SCOPES}\` for every call.
 
 For each calendar:
 1. \`method=GET\`, \`path=/calendars/<id>\` to fetch metadata.
 2. \`method=GET\`, \`path=/calendars/<id>/events\`, \`queryParams={ timeMin: <RFC3339 now>, maxResults: "10", singleEvents: "true", orderBy: "startTime" }\`.`,
-    ja: `\`#### \u30B9\u30B3\u30FC\u30D7\` \u306E\u5404\u30AB\u30EC\u30F3\u30C0\u30FC\u306B\u3064\u3044\u3066\u3001\u30E1\u30BF\u30C7\u30FC\u30BF\u3068\u76F4\u8FD1\u306E\u30A4\u30D9\u30F3\u30C8\u3092\u5C11\u91CF\u53D6\u5F97\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u5404\u884C\u306E\u6CE8\u91C8\u3067\u4F7F\u7528\u3059\u308B\u30C4\u30FC\u30EB\u3092\u9078\u3073\u307E\u3059:
-- \`(delegation, subject: <email>, ...)\` \u2192 \`${requestWithDelegationToolName}\` \u3092 \`subject: <email>\` \u4ED8\u304D\u3067\u547C\u3076
-- \`(service-account, ...)\` \u2192 \`${requestToolName}\` \u3092\u547C\u3076
+    ja: `\u3053\u306E\u30B3\u30CD\u30AF\u30B7\u30E7\u30F3\u3067\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5404\u30AB\u30EC\u30F3\u30C0\u30FC\u306B\u3064\u3044\u3066\u3001\u30E1\u30BF\u30C7\u30FC\u30BF\u3068\u76F4\u8FD1\u306E\u30A4\u30D9\u30F3\u30C8\u3092\u5C11\u91CF\u53D6\u5F97\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u30A2\u30AF\u30BB\u30B9\u7D4C\u8DEF\u306B\u5FDC\u3058\u3066\u30C4\u30FC\u30EB\u3092\u9078\u3073\u307E\u3059:
+- delegation \u7D4C\u7531\u306E\u30AB\u30EC\u30F3\u30C0\u30FC \u2192 \`${requestWithDelegationToolName}\` \u3092\u3001\u5BFE\u8C61\u30E6\u30FC\u30B6\u30FC\u306E\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u3092 \`subject\` \u3068\u3057\u3066\u547C\u3076
+- service account \u306B\u76F4\u63A5\u5171\u6709\u3055\u308C\u305F\u30AB\u30EC\u30F3\u30C0\u30FC \u2192 \`${requestToolName}\` \u3092\u547C\u3076
 
 \`scopes\` \u306F\u6BCE\u56DE \`${READONLY_SCOPES}\` \u3092\u6E21\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
@@ -719,6 +785,7 @@ var googleCalendarConnector = new ConnectorPlugin({
   iconUrl: "https://images.ctfassets.net/9ncizv60xc5y/2YsqoBEpdELmfDeFcyGHyE/4494c633b5ae15e562cb739cd85442c1/google-calendar.png",
   parameters,
   releaseFlag: { dev1: true, dev2: true, prod: true },
+  categories: ["productivity"],
   onboarding: googleCalendarOnboarding,
   systemPrompt: {
     en: `### Tools
@@ -744,10 +811,10 @@ Per-endpoint scope reference: https://developers.google.com/calendar/api/auth
 
 ### Choosing the right tool
 
-Read \`#### \u30B9\u30B3\u30FC\u30D7\` in the project knowledge for this connection. Each calendar appears as a \`- calendar: <id> (...)\` line whose annotation tells you which tool to use:
+Each calendar configured for this connection has an access path. Match the path to the tool:
 
-- \`(delegation, subject: <email>, name: "...")\` \u2192 use \`request_with_delegation\` and pass \`subject: <email>\`
-- \`(service-account, name: "...")\` \u2192 use \`request\` (no \`subject\`)
+- A Workspace user's calendar accessed via Domain-wide Delegation \u2192 use \`request_with_delegation\` and pass that user's email as \`subject\`
+- A calendar shared directly with the service account \u2192 use \`request\` (no \`subject\`)
 
 ### Path conventions
 
@@ -802,14 +869,14 @@ export default async function handler(c: Context) {
     orderBy: "startTime",
   });
 
-  // Project knowledge says: alice@example.com is reachable via delegation
+  // alice@example.com is accessed via delegation
   const aliceRes = await calendar.requestWithDelegation(
     \`/calendars/alice@example.com/events?\${qs}\`,
     { subject: "alice@example.com", scopes: READ },
   );
   const alice = await aliceRes.json();
 
-  // Project knowledge says: team@example.com is shared with the SA
+  // team@example.com is shared directly with the service account
   const teamRes = await calendar.request(
     \`/calendars/team@example.com/events?\${qs}\`,
     { scopes: READ },
@@ -842,10 +909,10 @@ export default async function handler(c: Context) {
 
 ### \u9069\u5207\u306A\u30C4\u30FC\u30EB\u306E\u9078\u3073\u65B9
 
-\u3053\u306E\u30B3\u30CD\u30AF\u30B7\u30E7\u30F3\u306E Project Knowledge \u306E \`#### \u30B9\u30B3\u30FC\u30D7\` \u3092\u8AAD\u3093\u3067\u304F\u3060\u3055\u3044\u3002\u5404\u30AB\u30EC\u30F3\u30C0\u30FC\u306F \`- calendar: <id> (...)\` \u5F62\u5F0F\u306E\u884C\u3068\u3057\u3066\u8A18\u9332\u3055\u308C\u3066\u304A\u308A\u3001\u6CE8\u91C8\u304C\u3069\u3061\u3089\u306E\u30C4\u30FC\u30EB\u3092\u4F7F\u3046\u3079\u304D\u304B\u3092\u793A\u3057\u307E\u3059:
+\u3053\u306E\u30B3\u30CD\u30AF\u30B7\u30E7\u30F3\u3067\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5404\u30AB\u30EC\u30F3\u30C0\u30FC\u306B\u306F\u30A2\u30AF\u30BB\u30B9\u7D4C\u8DEF\u304C\u3042\u308A\u307E\u3059\u3002\u7D4C\u8DEF\u306B\u5FDC\u3058\u3066\u30C4\u30FC\u30EB\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044:
 
-- \`(delegation, subject: <email>, name: "...")\` \u2192 \`request_with_delegation\` \u3092\u4F7F\u3044\u3001\`subject: <email>\` \u3092\u6E21\u3059
-- \`(service-account, name: "...")\` \u2192 \`request\` \u3092\u4F7F\u3046\uFF08\`subject\` \u4E0D\u8981\uFF09
+- delegation \u7D4C\u7531\uFF08Workspace \u30E6\u30FC\u30B6\u30FC\u306E\u30AB\u30EC\u30F3\u30C0\u30FC\u306B Domain-wide Delegation \u3067\u30A2\u30AF\u30BB\u30B9\uFF09\u2192 \`request_with_delegation\` \u3092\u4F7F\u3044\u3001\u5BFE\u8C61\u30E6\u30FC\u30B6\u30FC\u306E\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u3092 \`subject\` \u3068\u3057\u3066\u6E21\u3059
+- service account \u7D4C\u7531\uFF08\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8\u306B\u76F4\u63A5\u5171\u6709\u3055\u308C\u305F\u30AB\u30EC\u30F3\u30C0\u30FC\uFF09\u2192 \`request\` \u3092\u4F7F\u3046\uFF08\`subject\` \u4E0D\u8981\uFF09
 
 ### \u30D1\u30B9\u306E\u66F8\u304D\u65B9
 
@@ -900,14 +967,14 @@ export default async function handler(c: Context) {
     orderBy: "startTime",
   });
 
-  // Project Knowledge: alice@example.com \u306F delegation \u7D4C\u8DEF\u3067\u30A2\u30AF\u30BB\u30B9\u53EF\u80FD
+  // alice@example.com \u306F delegation \u7D4C\u8DEF\u3067\u30A2\u30AF\u30BB\u30B9
   const aliceRes = await calendar.requestWithDelegation(
     \`/calendars/alice@example.com/events?\${qs}\`,
     { subject: "alice@example.com", scopes: READ },
   );
   const alice = await aliceRes.json();
 
-  // Project Knowledge: team@example.com \u306F SA \u306B\u5171\u6709\u3055\u308C\u3066\u3044\u308B
+  // team@example.com \u306F SA \u306B\u76F4\u63A5\u5171\u6709
   const teamRes = await calendar.request(
     \`/calendars/team@example.com/events?\${qs}\`,
     { scopes: READ },

package/dist/connectors/google-docs.js

@@ -107,6 +107,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
   releaseFlag;
   proxyPolicy;
   experimentalAttributes;
+  categories;
   onboarding;
   systemPrompt;
   tools;
@@ -122,6 +123,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
     this.releaseFlag = config.releaseFlag;
     this.proxyPolicy = config.proxyPolicy;
     this.experimentalAttributes = config.experimentalAttributes;
+    this.categories = config.categories ?? [];
     this.onboarding = config.onboarding;
     this.systemPrompt = config.systemPrompt;
     this.tools = config.tools;
@@ -201,6 +203,16 @@ var AUTH_TYPES = {
   USER_PASSWORD: "user-password"
 };
 
+// ../connectors/src/lib/normalize-path.ts
+function normalizeRequestPath(path2, basePathSegment) {
+  let p = path2.trim();
+  if (!p.startsWith("/")) p = "/" + p;
+  if (p === basePathSegment || p.startsWith(basePathSegment + "/")) {
+    p = p.slice(basePathSegment.length) || "/";
+  }
+  return p;
+}
+
 // ../connectors/src/connectors/google-docs/setup.ts
 var googleDocsOnboarding = new ConnectorOnboarding({
   dataOverviewInstructions: {
@@ -216,7 +228,9 @@ var parameters = {};
 
 // ../connectors/src/connectors/google-docs/tools/request.ts
 import { z } from "zod";
-var DOCS_BASE_URL2 = "https://docs.googleapis.com/v1/documents";
+var DOCS_BASE_HOST = "https://docs.googleapis.com";
+var DOCS_BASE_PATH_SEGMENT = "/v1/documents";
+var DOCS_BASE_URL2 = `${DOCS_BASE_HOST}${DOCS_BASE_PATH_SEGMENT}`;
 var REQUEST_TIMEOUT_MS = 6e4;
 var cachedToken = null;
 async function getProxyToken(config) {
@@ -291,7 +305,11 @@ Authentication is handled automatically via OAuth proxy.`,
       `[connector-request] google-docs/${connection2.name}: ${method} ${path2}`
     );
     try {
-      let url = `${DOCS_BASE_URL2}${path2 === "" || path2.startsWith("/") ? "" : "/"}${path2}`;
+      const normalizedPath = normalizeRequestPath(
+        path2,
+        DOCS_BASE_PATH_SEGMENT
+      );
+      let url = `${DOCS_BASE_URL2}${normalizedPath === "/" ? "" : normalizedPath}`;
       if (queryParams) {
         const searchParams = new URLSearchParams(queryParams);
         url += `?${searchParams.toString()}`;
@@ -342,6 +360,7 @@ var googleDocsConnector = new ConnectorPlugin({
   iconUrl: "https://images.ctfassets.net/9ncizv60xc5y/6vvcGJisvXjOumeTvswjzf/e9bb39e453cc0b71a20f26019b23b0d2/google_docs.png",
   parameters,
   releaseFlag: { dev1: true, dev2: false, prod: false },
+  categories: ["productivity"],
   onboarding: googleDocsOnboarding,
   proxyPolicy: {
     allowlist: [