runline 0.33.0 → 0.35.0

package/dist/plugins/googleAppsScript/src/index.js

@@ -1,5 +1,6 @@
 import * as t from "typebox";
-import { googleJsonRequest } from "../../_shared/googleAuth.js";
+import { pathSegment } from "../../_shared/credentials.js";
+import { googleCredential, googleJsonRequest, googleOAuth, } from "../../_shared/googleAuth.js";
 import { Id, NonEmptyString, PositiveInteger, stringEnum, } from "../../_shared/googleSchemas.js";
 const SCRIPT_API = "https://script.googleapis.com/v1";
 const DRIVE_API = "https://www.googleapis.com/drive/v3";
@@ -33,21 +34,63 @@ const scriptFileSchema = t.Object({
     type: scriptFileTypeSchema,
     source: t.String(),
 }, { additionalProperties: false });
+/** `T` is the caller's statement of the answer's shape, unchecked, as for any parsed JSON. */
 async function call(ctx, method, url, payload) {
     return googleJsonRequest(ctx, "googleAppsScript", SCOPES, method, url, payload);
 }
 export default function googleAppsScript(rl) {
     rl.setName("googleAppsScript");
     rl.setVersion("1.0.0");
+    rl.setCredential(googleCredential("googleAppsScript", SCOPES));
+    rl.setOAuth(googleOAuth("googleAppsScript", SCOPES, "GOOGLE_APPS_SCRIPT"));
     rl.setConnectionSchema({
-        authMethod: { type: "string", required: false, description: "delegated or serviceAccount (legacy configs infer the method)" },
-        clientId: { type: "string", required: false, description: "OAuth client ID", env: "GOOGLE_APPS_SCRIPT_CLIENT_ID" },
-        clientSecret: { type: "string", required: false, description: "OAuth client secret", env: "GOOGLE_APPS_SCRIPT_CLIENT_SECRET" },
-        refreshToken: { type: "string", required: false, description: "OAuth refresh token", env: "GOOGLE_APPS_SCRIPT_REFRESH_TOKEN" },
-        serviceAccountJson: { type: "string", required: false, description: "Service-account key JSON", env: "GOOGLE_APPS_SCRIPT_SERVICE_ACCOUNT_JSON" },
-        serviceAccountEmail: { type: "string", required: false, description: "Service-account email", env: "GOOGLE_APPS_SCRIPT_SERVICE_ACCOUNT_EMAIL" },
-        serviceAccountPrivateKey: { type: "string", required: false, description: "Service-account private key", env: "GOOGLE_APPS_SCRIPT_SERVICE_ACCOUNT_PRIVATE_KEY" },
-        serviceAccountSubject: { type: "string", required: false, description: "User to impersonate (domain-wide delegation)", env: "GOOGLE_APPS_SCRIPT_SERVICE_ACCOUNT_SUBJECT" },
+        authMethod: {
+            type: "string",
+            required: false,
+            description: "delegated or serviceAccount (legacy configs infer the method)",
+        },
+        clientId: {
+            type: "string",
+            required: false,
+            description: "OAuth client ID",
+            env: "GOOGLE_APPS_SCRIPT_CLIENT_ID",
+        },
+        clientSecret: {
+            type: "string",
+            required: false,
+            description: "OAuth client secret",
+            env: "GOOGLE_APPS_SCRIPT_CLIENT_SECRET",
+        },
+        refreshToken: {
+            type: "string",
+            required: false,
+            description: "OAuth refresh token",
+            env: "GOOGLE_APPS_SCRIPT_REFRESH_TOKEN",
+        },
+        serviceAccountJson: {
+            type: "string",
+            required: false,
+            description: "Service-account key JSON",
+            env: "GOOGLE_APPS_SCRIPT_SERVICE_ACCOUNT_JSON",
+        },
+        serviceAccountEmail: {
+            type: "string",
+            required: false,
+            description: "Service-account email",
+            env: "GOOGLE_APPS_SCRIPT_SERVICE_ACCOUNT_EMAIL",
+        },
+        serviceAccountPrivateKey: {
+            type: "string",
+            required: false,
+            description: "Service-account private key",
+            env: "GOOGLE_APPS_SCRIPT_SERVICE_ACCOUNT_PRIVATE_KEY",
+        },
+        serviceAccountSubject: {
+            type: "string",
+            required: false,
+            description: "User to impersonate (domain-wide delegation)",
+            env: "GOOGLE_APPS_SCRIPT_SERVICE_ACCOUNT_SUBJECT",
+        },
     });
     rl.registerAction("script.list", {
         access: "read",
@@ -61,16 +104,17 @@ export default function googleAppsScript(rl) {
             })),
         }, { additionalProperties: false }),
         async execute(input, ctx) {
+            const p = input;
             const params = new URLSearchParams({
                 q: "mimeType='application/vnd.google-apps.script' and trashed=false",
                 fields: "files(id,name,modifiedTime)",
-                pageSize: String(input.pageSize ?? 50),
+                pageSize: String(p.pageSize ?? 50),
                 orderBy: "modifiedTime desc",
             });
             const res = await call(ctx, "GET", `${DRIVE_API}/files?${params}`);
             let files = res.files ?? [];
-            if (input.query) {
-                const q = String(input.query).toLowerCase();
+            if (p.query) {
+                const q = String(p.query).toLowerCase();
                 files = files.filter((f) => (f.name || "").toLowerCase().includes(q));
             }
             return { count: files.length, scripts: files };
@@ -81,8 +125,9 @@ export default function googleAppsScript(rl) {
         description: "Get all files of an Apps Script project (name, type, source).",
         inputSchema: t.Object({ scriptId: Id }, { additionalProperties: false }),
         async execute(input, ctx) {
-            const res = await call(ctx, "GET", `${SCRIPT_API}/projects/${input.scriptId}/content`);
-            return { scriptId: input.scriptId, files: res.files ?? [] };
+            const p = input;
+            const res = await call(ctx, "GET", `${SCRIPT_API}/projects/${pathSegment(p.scriptId)}/content`);
+            return { scriptId: p.scriptId, files: res.files ?? [] };
         },
     });
     rl.registerAction("project.readFile", {
@@ -96,10 +141,11 @@ export default function googleAppsScript(rl) {
             }),
         }, { additionalProperties: false }),
         async execute(input, ctx) {
-            const res = await call(ctx, "GET", `${SCRIPT_API}/projects/${input.scriptId}/content`);
-            const file = (res.files ?? []).find((f) => f.name === input.name);
+            const p = input;
+            const res = await call(ctx, "GET", `${SCRIPT_API}/projects/${pathSegment(p.scriptId)}/content`);
+            const file = (res.files ?? []).find((f) => f.name === p.name);
             if (!file)
-                throw new Error(`No file "${input.name}". Available: ${(res.files ?? []).map((f) => f.name).join(", ")}`);
+                throw new Error(`No file "${p.name}". Available: ${(res.files ?? []).map((f) => f.name).join(", ")}`);
             return { name: file.name, type: file.type, source: file.source };
         },
     });
@@ -113,17 +159,21 @@ export default function googleAppsScript(rl) {
             type: t.Optional(stringEnum(["SERVER_JS", "HTML", "JSON"])),
         }, { additionalProperties: false }),
         async execute(input, ctx) {
-            const cur = await call(ctx, "GET", `${SCRIPT_API}/projects/${input.scriptId}/content`);
+            const p = input;
+            const cur = await call(ctx, "GET", `${SCRIPT_API}/projects/${pathSegment(p.scriptId)}/content`);
             const files = cur.files ?? [];
-            const idx = files.findIndex((f) => f.name === input.name);
-            const type = input.type || (input.name === "appsscript" ? "JSON" : files[idx]?.type || "SERVER_JS");
-            const entry = { name: input.name, type, source: input.source };
+            const idx = files.findIndex((f) => f.name === p.name);
+            const type = p.type ||
+                (p.name === "appsscript" ? "JSON" : files[idx]?.type || "SERVER_JS");
+            const entry = { name: p.name, type, source: p.source };
             if (idx >= 0)
                 files[idx] = entry;
             else
                 files.push(entry);
-            await call(ctx, "PUT", `${SCRIPT_API}/projects/${input.scriptId}/content`, { files });
-            return { scriptId: input.scriptId, updated: input.name, fileCount: files.length };
+            await call(ctx, "PUT", `${SCRIPT_API}/projects/${pathSegment(p.scriptId)}/content`, {
+                files,
+            });
+            return { scriptId: p.scriptId, updated: p.name, fileCount: files.length };
         },
     });
     rl.registerAction("project.updateContent", {
@@ -141,8 +191,9 @@ export default function googleAppsScript(rl) {
             }),
         }, { additionalProperties: false }),
         async execute(input, ctx) {
-            const res = await call(ctx, "PUT", `${SCRIPT_API}/projects/${input.scriptId}/content`, { files: input.files });
-            return { scriptId: input.scriptId, fileCount: (res.files ?? []).length };
+            const p = input;
+            const res = await call(ctx, "PUT", `${SCRIPT_API}/projects/${pathSegment(p.scriptId)}/content`, { files: p.files });
+            return { scriptId: p.scriptId, fileCount: (res.files ?? []).length };
         },
     });
     rl.registerAction("project.create", {
@@ -156,11 +207,16 @@ export default function googleAppsScript(rl) {
             })),
         }, { additionalProperties: false }),
         async execute(input, ctx) {
-            const payload = { title: input.title };
-            if (input.parentId)
-                payload.parentId = input.parentId;
+            const p = input;
+            const payload = { title: p.title };
+            if (p.parentId)
+                payload.parentId = p.parentId;
             const res = await call(ctx, "POST", `${SCRIPT_API}/projects`, payload);
-            return { scriptId: res.scriptId, title: res.title, parentId: res.parentId };
+            return {
+                scriptId: res.scriptId,
+                title: res.title,
+                parentId: res.parentId,
+            };
         },
     });
     rl.registerAction("version.create", {
@@ -171,8 +227,13 @@ export default function googleAppsScript(rl) {
             description: t.Optional(t.String()),
         }, { additionalProperties: false }),
         async execute(input, ctx) {
-            const res = await call(ctx, "POST", `${SCRIPT_API}/projects/${input.scriptId}/versions`, { description: input.description || "" });
-            return { scriptId: input.scriptId, versionNumber: res.versionNumber, description: res.description };
+            const p = input;
+            const res = await call(ctx, "POST", `${SCRIPT_API}/projects/${pathSegment(p.scriptId)}/versions`, { description: p.description || "" });
+            return {
+                scriptId: p.scriptId,
+                versionNumber: res.versionNumber,
+                description: res.description,
+            };
         },
     });
     rl.registerAction("deployment.create", {
@@ -185,10 +246,11 @@ export default function googleAppsScript(rl) {
             manifestFileName: t.Optional(t.String({ minLength: 1, description: "Defaults to 'appsscript'." })),
         }, { additionalProperties: false }),
         async execute(input, ctx) {
-            const res = await call(ctx, "POST", `${SCRIPT_API}/projects/${input.scriptId}/deployments`, {
-                versionNumber: input.versionNumber,
-                manifestFileName: input.manifestFileName || "appsscript",
-                description: input.description || "",
+            const p = input;
+            const res = await call(ctx, "POST", `${SCRIPT_API}/projects/${pathSegment(p.scriptId)}/deployments`, {
+                versionNumber: p.versionNumber,
+                manifestFileName: p.manifestFileName || "appsscript",
+                description: p.description || "",
             });
             return { deploymentId: res.deploymentId, entryPoints: res.entryPoints };
         },
@@ -205,10 +267,11 @@ export default function googleAppsScript(rl) {
             })),
         }, { additionalProperties: false }),
         async execute(input, ctx) {
-            const res = await call(ctx, "POST", `${SCRIPT_API}/scripts/${input.scriptId}:run`, {
-                function: input.functionName,
-                parameters: input.parameters ?? [],
-                devMode: input.devMode === undefined ? true : input.devMode,
+            const p = input;
+            const res = await call(ctx, "POST", `${SCRIPT_API}/scripts/${pathSegment(p.scriptId)}:run`, {
+                function: p.functionName,
+                parameters: p.parameters ?? [],
+                devMode: p.devMode === undefined ? true : p.devMode,
             });
             if (res.error) {
                 const d = res.error.details?.[0];
@@ -225,12 +288,16 @@ export default function googleAppsScript(rl) {
             pageSize: t.Optional(t.Integer({ minimum: 1, maximum: 50, description: "Default 20." })),
         }, { additionalProperties: false }),
         async execute(input, ctx) {
+            const p = input;
             const params = new URLSearchParams({
-                "userProcessFilter.scriptId": input.scriptId,
-                pageSize: String(input.pageSize ?? 20),
+                "userProcessFilter.scriptId": p.scriptId,
+                pageSize: String(p.pageSize ?? 20),
             });
             const res = await call(ctx, "GET", `${SCRIPT_API}/processes?${params}`);
-            return { count: (res.processes ?? []).length, processes: res.processes ?? [] };
+            return {
+                count: (res.processes ?? []).length,
+                processes: res.processes ?? [],
+            };
         },
     });
 }

package/dist/plugins/googleCalendar/src/index.js

@@ -1,13 +1,10 @@
 /**
  * Google Calendar plugin for runline.
  *
- * Authentication mirrors the gmail plugin: OAuth2 user flow, seeded
- * once via `runline auth googleCalendar`. The connection stores
- * `clientId`, `clientSecret`, `refreshToken`, plus cached
- * `accessToken` + `accessTokenExpiresAt`. Token refresh is lazy —
- * when the cached token is missing or within 60 s of expiry the
- * plugin hits `https://oauth2.googleapis.com/token` and persists
- * the new token via `ctx.updateConnection`.
+ * Authentication mirrors the gmail plugin: the Google grant's OAuth2
+ * user flow, seeded once via `runline auth googleCalendar`, with the
+ * access token refreshed lazily (60 s skew) and cached on the
+ * connection as the grant's.
  *
  * Surface area:
  *
@@ -29,7 +26,8 @@
  */
 import rrulePkg from "rrule";
 import * as t from "typebox";
-import { googleJsonRequest } from "../../_shared/googleAuth.js";
+import { pathSegment } from "../../_shared/credentials.js";
+import { googleCredential, googleJsonRequest, googleOAuth, } from "../../_shared/googleAuth.js";
 import { Id, NonEmptyString, NonEmptyStringArray, PositiveInteger, StringOrStringArray, stringEnum, } from "../../_shared/googleSchemas.js";
 // `rrule` ships as CJS; named imports fail under Node ESM.
 const { RRule } = rrulePkg;
@@ -51,9 +49,9 @@ async function paginateAll(ctx, path, key, qs) {
 }
 // ─── Helpers ─────────────────────────────────────────────────────
 function encodeCalendarId(id) {
-    // Calendar IDs are email-shaped. Decode-then-encode tolerates
-    // double-encoded input from upstream callers.
-    return encodeURIComponent(decodeURIComponent(id));
+    // Calendar IDs are email-shaped. Decoding first tolerates
+    // already-encoded input from upstream callers.
+    return pathSegment(decodeURIComponent(id));
 }
 function splitAttendees(input) {
     if (input === undefined || input === null)
@@ -501,37 +499,8 @@ const settingsSchemas = {
 export default function googleCalendar(rl) {
     rl.setName("googleCalendar");
     rl.setVersion("0.1.0");
-    rl.setOAuth({
-        authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
-        tokenUrl: "https://oauth2.googleapis.com/token",
-        scopes: SCOPES,
-        authParams: { access_type: "offline", prompt: "consent" },
-        setupHelp: [
-            "You need a Google Cloud OAuth client. Takes ~5 minutes, one time.",
-            "",
-            "1. Create or pick a Google Cloud project:",
-            "     https://console.cloud.google.com/projectcreate",
-            "",
-            "2. Enable the Google Calendar API:",
-            "     https://console.cloud.google.com/apis/library/calendar-json.googleapis.com",
-            "",
-            "3. Configure the OAuth consent screen (first time only):",
-            "     https://console.cloud.google.com/apis/credentials/consent",
-            "     • Audience: External",
-            "",
-            "4. Add yourself as a test user:",
-            "     https://console.cloud.google.com/auth/audience",
-            "",
-            "5. Create the OAuth client:",
-            "     https://console.cloud.google.com/apis/credentials",
-            "     • + Create credentials → OAuth client ID",
-            "     • Application type: Web application",
-            "     • Authorized redirect URIs → + Add URI: {{redirectUri}}",
-            "",
-            "6. Paste the Client ID and Client Secret below, or export",
-            "   GOOGLE_CALENDAR_CLIENT_ID and GOOGLE_CALENDAR_CLIENT_SECRET.",
-        ],
-    });
+    rl.setCredential(googleCredential("googleCalendar", SCOPES));
+    rl.setOAuth(googleOAuth("googleCalendar", SCOPES, "GOOGLE_CALENDAR"));
     rl.setConnectionSchema({
         authMethod: { type: "string", required: false, description: "delegated or serviceAccount (legacy configs infer the method)" },
         clientId: {
@@ -712,7 +681,7 @@ export default function googleCalendar(rl) {
                 qs.timeZone = p.timeZone;
             if (p.maxAttendees)
                 qs.maxAttendees = p.maxAttendees;
-            const res = (await calRequest(ctx, "GET", `/calendars/${encodeCalendarId(p.calendarId)}/events/${p.eventId}`, undefined, qs));
+            const res = (await calRequest(ctx, "GET", `/calendars/${encodeCalendarId(p.calendarId)}/events/${pathSegment(p.eventId)}`, undefined, qs));
             if (p.nextOccurrence !== false)
                 addNextOccurrence([res]);
             return res;
@@ -779,7 +748,7 @@ export default function googleCalendar(rl) {
                 qs.showDeleted = p.showDeleted;
             if (p.pageToken)
                 qs.pageToken = p.pageToken;
-            const path = `/calendars/${encodeCalendarId(p.calendarId)}/events/${p.eventId}/instances`;
+            const path = `/calendars/${encodeCalendarId(p.calendarId)}/events/${pathSegment(p.eventId)}/instances`;
             if (p.returnAll)
                 return paginateAll(ctx, path, "items", qs);
             if (p.maxResults)
@@ -797,7 +766,7 @@ export default function googleCalendar(rl) {
             const calendarId = encodeCalendarId(p.calendarId);
             // Series edit: resolve the instance's recurringEventId and patch that instead.
             if (p.modifyTarget === "series") {
-                const instance = (await calRequest(ctx, "GET", `/calendars/${calendarId}/events/${eventId}`));
+                const instance = (await calRequest(ctx, "GET", `/calendars/${calendarId}/events/${pathSegment(eventId)}`));
                 if (!instance.recurringEventId) {
                     throw new Error(`googleCalendar: event ${eventId} is not part of a recurrence series`);
                 }
@@ -823,7 +792,7 @@ export default function googleCalendar(rl) {
                 qs.sendNotifications = p.sendNotifications;
             if (p.maxAttendees)
                 qs.maxAttendees = p.maxAttendees;
-            return calRequest(ctx, "PATCH", `/calendars/${calendarId}/events/${eventId}`, body, qs);
+            return calRequest(ctx, "PATCH", `/calendars/${calendarId}/events/${pathSegment(eventId)}`, body, qs);
         },
     });
     rl.registerAction("event.delete", {
@@ -835,7 +804,7 @@ export default function googleCalendar(rl) {
             const qs = {};
             if (p.sendUpdates)
                 qs.sendUpdates = p.sendUpdates;
-            return calRequest(ctx, "DELETE", `/calendars/${encodeCalendarId(p.calendarId)}/events/${p.eventId}`, undefined, qs);
+            return calRequest(ctx, "DELETE", `/calendars/${encodeCalendarId(p.calendarId)}/events/${pathSegment(p.eventId)}`, undefined, qs);
         },
     });
     rl.registerAction("event.move", {
@@ -849,7 +818,7 @@ export default function googleCalendar(rl) {
             };
             if (p.sendUpdates)
                 qs.sendUpdates = p.sendUpdates;
-            return calRequest(ctx, "POST", `/calendars/${encodeCalendarId(p.calendarId)}/events/${p.eventId}/move`, undefined, qs);
+            return calRequest(ctx, "POST", `/calendars/${encodeCalendarId(p.calendarId)}/events/${pathSegment(p.eventId)}/move`, undefined, qs);
         },
     });
     // ─── FreeBusy ────────────────────────────────────────────────────
@@ -957,7 +926,7 @@ export default function googleCalendar(rl) {
         inputSchema: aclSchemas.update,
         async execute(input, ctx) {
             const p = (input ?? {});
-            return calRequest(ctx, "PATCH", `/calendars/${encodeCalendarId(p.calendarId)}/acl/${encodeURIComponent(p.ruleId)}`, { role: p.role });
+            return calRequest(ctx, "PATCH", `/calendars/${encodeCalendarId(p.calendarId)}/acl/${pathSegment(p.ruleId)}`, { role: p.role });
         },
     });
     rl.registerAction("acl.delete", {
@@ -966,7 +935,7 @@ export default function googleCalendar(rl) {
         inputSchema: aclSchemas.delete,
         async execute(input, ctx) {
             const p = (input ?? {});
-            await calRequest(ctx, "DELETE", `/calendars/${encodeCalendarId(p.calendarId)}/acl/${encodeURIComponent(p.ruleId)}`);
+            await calRequest(ctx, "DELETE", `/calendars/${encodeCalendarId(p.calendarId)}/acl/${pathSegment(p.ruleId)}`);
             return { success: true };
         },
     });
@@ -985,7 +954,7 @@ export default function googleCalendar(rl) {
         inputSchema: settingsSchemas.get,
         async execute(input, ctx) {
             const p = (input ?? {});
-            return calRequest(ctx, "GET", `/users/me/settings/${encodeURIComponent(p.setting)}`);
+            return calRequest(ctx, "GET", `/users/me/settings/${pathSegment(p.setting)}`);
         },
     });
 }

package/dist/plugins/googleContacts/src/index.js

@@ -19,11 +19,13 @@
  *
  * The People API uses `resourceName` ("people/c1234…") as the
  * canonical identifier; we accept either the full `resourceName` or
- * the bare ID and normalize. The response always includes a
- * convenience `contactId` field stripped from `resourceName`.
+ * the bare ID and normalize, and either way the ID is one path
+ * segment. The response always includes a convenience `contactId`
+ * field stripped from `resourceName`.
  */
 import * as t from "typebox";
-import { googleJsonRequest } from "../../_shared/googleAuth.js";
+import { pathSegment } from "../../_shared/credentials.js";
+import { googleCredential, googleJsonRequest, googleOAuth, } from "../../_shared/googleAuth.js";
 import { Id, NonEmptyString, PositiveInteger, stringEnum, } from "../../_shared/googleSchemas.js";
 // ─── Fields ─────────────────────────────────────────────────────
 /**
@@ -103,14 +105,14 @@ async function paginateAll(ctx, path, key, qs) {
  * Accepts either the raw ID (`c1234…`) or the full prefixed form.
  */
 function normalizeContactResource(input) {
-    if (!input)
-        throw new Error("googleContacts: contact ID is required");
-    return input.startsWith("people/") ? input : `people/${input}`;
+    const id = input.startsWith("people/") ? input.slice("people/".length) : input;
+    return `people/${pathSegment(id)}`;
 }
 function normalizeGroupResource(input) {
-    if (!input)
-        throw new Error("googleContacts: group ID is required");
-    return input.startsWith("contactGroups/") ? input : `contactGroups/${input}`;
+    const id = input.startsWith("contactGroups/")
+        ? input.slice("contactGroups/".length)
+        : input;
+    return `contactGroups/${pathSegment(id)}`;
 }
 function contactIdFromResource(resourceName) {
     if (!resourceName)
@@ -372,37 +374,8 @@ const groupSchemas = {
 export default function googleContacts(rl) {
     rl.setName("googleContacts");
     rl.setVersion("0.1.0");
-    rl.setOAuth({
-        authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
-        tokenUrl: "https://oauth2.googleapis.com/token",
-        scopes: SCOPES,
-        authParams: { access_type: "offline", prompt: "consent" },
-        setupHelp: [
-            "You need a Google Cloud OAuth client. Takes ~5 minutes, one time.",
-            "",
-            "1. Create or pick a Google Cloud project:",
-            "     https://console.cloud.google.com/projectcreate",
-            "",
-            "2. Enable the People API:",
-            "     https://console.cloud.google.com/apis/library/people.googleapis.com",
-            "",
-            "3. Configure the OAuth consent screen:",
-            "     https://console.cloud.google.com/apis/credentials/consent",
-            "     • Audience: External",
-            "",
-            "4. Add yourself as a test user:",
-            "     https://console.cloud.google.com/auth/audience",
-            "",
-            "5. Create the OAuth client:",
-            "     https://console.cloud.google.com/apis/credentials",
-            "     • + Create credentials → OAuth client ID",
-            "     • Application type: Web application",
-            "     • Authorized redirect URIs → + Add URI: {{redirectUri}}",
-            "",
-            "6. Paste the Client ID and Client Secret below, or export",
-            "   GOOGLE_CONTACTS_CLIENT_ID and GOOGLE_CONTACTS_CLIENT_SECRET.",
-        ],
-    });
+    rl.setCredential(googleCredential("googleContacts", SCOPES));
+    rl.setOAuth(googleOAuth("googleContacts", SCOPES, "GOOGLE_CONTACTS"));
     rl.setConnectionSchema({
         authMethod: { type: "string", required: false, description: "delegated or serviceAccount (legacy configs infer the method)" },
         clientId: { type: "string", required: false, env: "GOOGLE_CONTACTS_CLIENT_ID" },

package/dist/plugins/googleDocs/src/index.js

@@ -7,6 +7,7 @@
  * — the Docs API itself only creates blank documents without a
  * target folder.
  */
+import { googleCredential, googleOAuth } from "../../_shared/googleAuth.js";
 import { registerDocumentsActions } from "./documents.js";
 import { registerFormattingActions } from "./formatting.js";
 import { registerImagesActions } from "./images.js";
@@ -18,38 +19,8 @@ import { registerTextActions } from "./text.js";
 export default function googleDocs(rl) {
     rl.setName("googleDocs");
     rl.setVersion("0.1.0");
-    rl.setOAuth({
-        authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
-        tokenUrl: "https://oauth2.googleapis.com/token",
-        scopes: SCOPES,
-        authParams: { access_type: "offline", prompt: "consent" },
-        setupHelp: [
-            "You need a Google Cloud OAuth client. Takes ~5 minutes, one time.",
-            "",
-            "1. Create or pick a Google Cloud project:",
-            "     https://console.cloud.google.com/projectcreate",
-            "",
-            "2. Enable the Google Docs API (and Drive API for document.create):",
-            "     https://console.cloud.google.com/apis/library/docs.googleapis.com",
-            "     https://console.cloud.google.com/apis/library/drive.googleapis.com",
-            "",
-            "3. Configure the OAuth consent screen:",
-            "     https://console.cloud.google.com/apis/credentials/consent",
-            "     • Audience: External",
-            "",
-            "4. Add yourself as a test user:",
-            "     https://console.cloud.google.com/auth/audience",
-            "",
-            "5. Create the OAuth client:",
-            "     https://console.cloud.google.com/apis/credentials",
-            "     • + Create credentials → OAuth client ID",
-            "     • Application type: Web application",
-            "     • Authorized redirect URIs → + Add URI: {{redirectUri}}",
-            "",
-            "6. Paste the Client ID and Client Secret below, or export",
-            "   GOOGLE_DOCS_CLIENT_ID and GOOGLE_DOCS_CLIENT_SECRET.",
-        ],
-    });
+    rl.setCredential(googleCredential("googleDocs", SCOPES));
+    rl.setOAuth(googleOAuth("googleDocs", SCOPES, "GOOGLE_DOCS"));
     rl.setConnectionSchema({
         authMethod: {
             type: "string",

package/dist/plugins/googleDocs/src/shared.js

@@ -1,4 +1,5 @@
 import * as t from "typebox";
+import { pathSegment } from "../../_shared/credentials.js";
 import { googleJsonRequest } from "../../_shared/googleAuth.js";
 import { RawGoogleObject } from "../../_shared/googleSchemas.js";
 export const SCOPES = [
@@ -68,7 +69,7 @@ export function extractDocumentId(input) {
     if (!input)
         throw new Error("googleDocs: documentId or URL is required");
     const m = input.match(DOC_URL_REGEX);
-    return m ? m[1] : input;
+    return pathSegment(m ? m[1] : input);
 }
 export function buildLocation(kind, segmentId, index, tabId) {
     const seg = segmentId && segmentId !== "body" ? segmentId : "";