runline 0.32.0 → 0.34.0

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

@@ -29,7 +29,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 } 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 +52,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,6 +502,7 @@ const settingsSchemas = {
 export default function googleCalendar(rl) {
     rl.setName("googleCalendar");
     rl.setVersion("0.1.0");
+    rl.setCredential(googleCredential("googleCalendar", SCOPES));
     rl.setOAuth({
         authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
         tokenUrl: "https://oauth2.googleapis.com/token",
@@ -712,7 +714,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 +781,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 +799,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 +825,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 +837,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 +851,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 +959,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 +968,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 +987,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 } 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,6 +374,7 @@ const groupSchemas = {
 export default function googleContacts(rl) {
     rl.setName("googleContacts");
     rl.setVersion("0.1.0");
+    rl.setCredential(googleCredential("googleContacts", SCOPES));
     rl.setOAuth({
         authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
         tokenUrl: "https://oauth2.googleapis.com/token",

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 } from "../../_shared/googleAuth.js";
 import { registerDocumentsActions } from "./documents.js";
 import { registerFormattingActions } from "./formatting.js";
 import { registerImagesActions } from "./images.js";
@@ -18,6 +19,7 @@ import { registerTextActions } from "./text.js";
 export default function googleDocs(rl) {
     rl.setName("googleDocs");
     rl.setVersion("0.1.0");
+    rl.setCredential(googleCredential("googleDocs", SCOPES));
     rl.setOAuth({
         authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
         tokenUrl: "https://oauth2.googleapis.com/token",

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 : "";

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

@@ -55,7 +55,8 @@
  */
 import { createReadStream, readFileSync, statSync, writeFileSync } from "node:fs";
 import * as t from "typebox";
-import { googleJsonRequest, googleResponse } from "../../_shared/googleAuth.js";
+import { jsonAnswer, pathSegment } from "../../_shared/credentials.js";
+import { googleCredential, googleJsonRequest, googleResponse, } from "../../_shared/googleAuth.js";
 import { Id, NonEmptyString, RawGoogleObject, StringMap, StringOrStringArray, stringEnum, } from "../../_shared/googleSchemas.js";
 const PermissionRole = stringEnum([
     "owner",
@@ -110,11 +111,6 @@ function driveResponse(ctx, url, init = {}) {
 }
 // ─── Request ─────────────────────────────────────────────────────
 const API_BASE = "https://www.googleapis.com";
-function filePathId(id) {
-    if (!/^[a-zA-Z0-9_-]+$/.test(id))
-        throw new Error("googleDrive: invalid file ID");
-    return id;
-}
 function uploadSession(value) {
     if (!value || !/^https:\/\/www\.googleapis\.com\/upload\/drive\/v3\/files(?:\/[a-zA-Z0-9_-]+)?\?/.test(value))
         throw new Error("googleDrive: invalid resumable session Location");
@@ -354,6 +350,7 @@ const SCOPES = ["https://www.googleapis.com/auth/drive"];
 export default function googleDrive(rl) {
     rl.setName("googleDrive");
     rl.setVersion("0.1.0");
+    rl.setCredential(googleCredential("googleDrive", SCOPES));
     rl.setOAuth({
         authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
         tokenUrl: "https://oauth2.googleapis.com/token",
@@ -487,7 +484,7 @@ export default function googleDrive(rl) {
                 qs.ocrLanguage = p.ocrLanguage;
             if (p.useContentAsIndexableText)
                 qs.useContentAsIndexableText = p.useContentAsIndexableText;
-            return driveRequest(ctx, "PATCH", `/drive/v3/files/${uploaded.id}`, {}, qs);
+            return driveRequest(ctx, "PATCH", `/drive/v3/files/${pathSegment(uploaded.id)}`, {}, qs);
         },
     });
     rl.registerAction("file.createFromText", {
@@ -523,7 +520,7 @@ export default function googleDrive(rl) {
                 const doc = (await driveRequest(ctx, "POST", "/drive/v3/files", metadata, {
                     supportsAllDrives: true,
                 }));
-                const res = await driveResponse(ctx, `https://docs.googleapis.com/v1/documents/${encodeURIComponent(doc.id)}:batchUpdate`, {
+                const res = await driveResponse(ctx, `https://docs.googleapis.com/v1/documents/${pathSegment(doc.id)}:batchUpdate`, {
                     method: "POST",
                     headers: {
                         "Content-Type": "application/json",
@@ -573,7 +570,7 @@ export default function googleDrive(rl) {
         async execute(input, ctx) {
             const p = (input ?? {});
             const fileId = p.fileId;
-            const meta = (await driveRequest(ctx, "GET", `/drive/v3/files/${fileId}`, undefined, { fields: "mimeType,name", supportsAllDrives: true }));
+            const meta = (await driveRequest(ctx, "GET", `/drive/v3/files/${pathSegment(fileId)}`, undefined, { fields: "mimeType,name", supportsAllDrives: true }));
             const isGoogleNative = meta.mimeType?.includes("vnd.google-apps");
             let url;
             let contentType = meta.mimeType;
@@ -587,13 +584,13 @@ export default function googleDrive(rl) {
                 };
                 const mime = p.googleDocFormat ?? defaults[type] ?? "application/pdf";
                 contentType = mime;
-                const u = new URL(`${API_BASE}/drive/v3/files/${filePathId(fileId)}/export`);
+                const u = new URL(`${API_BASE}/drive/v3/files/${pathSegment(fileId)}/export`);
                 u.searchParams.set("mimeType", mime);
                 u.searchParams.set("supportsAllDrives", "true");
                 url = u.toString();
             }
             else {
-                const u = new URL(`${API_BASE}/drive/v3/files/${filePathId(fileId)}`);
+                const u = new URL(`${API_BASE}/drive/v3/files/${pathSegment(fileId)}`);
                 u.searchParams.set("alt", "media");
                 u.searchParams.set("supportsAllDrives", "true");
                 url = u.toString();
@@ -640,7 +637,7 @@ export default function googleDrive(rl) {
             if (p.folderId || p.driveId) {
                 body.parents = [resolveParent(p.folderId, p.driveId)];
             }
-            return driveRequest(ctx, "POST", `/drive/v3/files/${p.fileId}/copy`, body, { supportsAllDrives: true });
+            return driveRequest(ctx, "POST", `/drive/v3/files/${pathSegment(p.fileId)}/copy`, body, { supportsAllDrives: true });
         },
     });
     rl.registerAction("file.move", {
@@ -653,10 +650,10 @@ export default function googleDrive(rl) {
         }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            const current = (await driveRequest(ctx, "GET", `/drive/v3/files/${p.fileId}`, undefined, { fields: "parents", supportsAllDrives: true }));
+            const current = (await driveRequest(ctx, "GET", `/drive/v3/files/${pathSegment(p.fileId)}`, undefined, { fields: "parents", supportsAllDrives: true }));
             const removeParents = (current.parents ?? []).join(",");
             const addParents = resolveParent(p.folderId, p.driveId);
-            return driveRequest(ctx, "PATCH", `/drive/v3/files/${p.fileId}`, undefined, {
+            return driveRequest(ctx, "PATCH", `/drive/v3/files/${pathSegment(p.fileId)}`, undefined, {
                 supportsAllDrives: true,
                 addParents,
                 removeParents,
@@ -719,7 +716,7 @@ export default function googleDrive(rl) {
                 const c = resolveContent(p);
                 const mimeType = c.mimeType ?? p.mimeType ?? "application/octet-stream";
                 if (c.buffer) {
-                    const url = new URL(`${API_BASE}/upload/drive/v3/files/${filePathId(fileId)}`);
+                    const url = new URL(`${API_BASE}/upload/drive/v3/files/${pathSegment(fileId)}`);
                     url.searchParams.set("uploadType", "media");
                     url.searchParams.set("supportsAllDrives", "true");
                     for (const key of [
@@ -744,7 +741,7 @@ export default function googleDrive(rl) {
                 }
                 else if (c.path) {
                     // Resumable PATCH
-                    const initUrl = new URL(`${API_BASE}/upload/drive/v3/files/${filePathId(fileId)}`);
+                    const initUrl = new URL(`${API_BASE}/upload/drive/v3/files/${pathSegment(fileId)}`);
                     initUrl.searchParams.set("uploadType", "resumable");
                     initUrl.searchParams.set("supportsAllDrives", "true");
                     for (const key of [
@@ -814,11 +811,11 @@ export default function googleDrive(rl) {
                 body.appProperties = p.appProperties;
             if (Object.keys(body).length === 0) {
                 if (hasBytes && p.fields) {
-                    return driveRequest(ctx, "GET", `/drive/v3/files/${fileId}`, undefined, { supportsAllDrives: true, fields: p.fields });
+                    return driveRequest(ctx, "GET", `/drive/v3/files/${pathSegment(fileId)}`, undefined, { supportsAllDrives: true, fields: p.fields });
                 }
                 return { id: fileId, success: true };
             }
-            return driveRequest(ctx, "PATCH", `/drive/v3/files/${fileId}`, body, {
+            return driveRequest(ctx, "PATCH", `/drive/v3/files/${pathSegment(fileId)}`, body, {
                 supportsAllDrives: true,
                 fields: p.fields,
             });
@@ -831,12 +828,12 @@ export default function googleDrive(rl) {
         async execute(input, ctx) {
             const p = (input ?? {});
             if (p.deletePermanently) {
-                await driveRequest(ctx, "DELETE", `/drive/v3/files/${p.fileId}`, undefined, {
+                await driveRequest(ctx, "DELETE", `/drive/v3/files/${pathSegment(p.fileId)}`, undefined, {
                     supportsAllDrives: true,
                 });
             }
             else {
-                await driveRequest(ctx, "PATCH", `/drive/v3/files/${p.fileId}`, { trashed: true }, { supportsAllDrives: true });
+                await driveRequest(ctx, "PATCH", `/drive/v3/files/${pathSegment(p.fileId)}`, { trashed: true }, { supportsAllDrives: true });
             }
             return { id: p.fileId, success: true };
         },
@@ -847,7 +844,7 @@ export default function googleDrive(rl) {
         inputSchema: t.Object({ fileId: Id, fields: t.Optional(NonEmptyString) }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            return driveRequest(ctx, "GET", `/drive/v3/files/${p.fileId}`, undefined, { supportsAllDrives: true, fields: p.fields ?? "*" });
+            return driveRequest(ctx, "GET", `/drive/v3/files/${pathSegment(p.fileId)}`, undefined, { supportsAllDrives: true, fields: p.fields ?? "*" });
         },
     });
     rl.registerAction("file.share", {
@@ -914,7 +911,7 @@ export default function googleDrive(rl) {
                 qs.moveToNewOwnersRoot = p.moveToNewOwnersRoot;
             if (p.useDomainAdminAccess !== undefined)
                 qs.useDomainAdminAccess = p.useDomainAdminAccess;
-            return driveRequest(ctx, "POST", `/drive/v3/files/${p.fileId}/permissions`, body, qs);
+            return driveRequest(ctx, "POST", `/drive/v3/files/${pathSegment(p.fileId)}/permissions`, body, qs);
         },
     });
     rl.registerAction("file.listPermissions", {
@@ -923,7 +920,7 @@ export default function googleDrive(rl) {
         inputSchema: t.Object({ fileId: Id, useDomainAdminAccess: t.Optional(t.Boolean()) }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            return driveRequest(ctx, "GET", `/drive/v3/files/${p.fileId}/permissions`, undefined, {
+            return driveRequest(ctx, "GET", `/drive/v3/files/${pathSegment(p.fileId)}/permissions`, undefined, {
                 supportsAllDrives: true,
                 useDomainAdminAccess: p.useDomainAdminAccess,
                 fields: "*",
@@ -936,7 +933,7 @@ export default function googleDrive(rl) {
         inputSchema: t.Object({ fileId: Id, permissionId: Id }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            await driveRequest(ctx, "DELETE", `/drive/v3/files/${p.fileId}/permissions/${p.permissionId}`, undefined, { supportsAllDrives: true });
+            await driveRequest(ctx, "DELETE", `/drive/v3/files/${pathSegment(p.fileId)}/permissions/${pathSegment(p.permissionId)}`, undefined, { supportsAllDrives: true });
             return { success: true };
         },
     });
@@ -974,12 +971,12 @@ export default function googleDrive(rl) {
         async execute(input, ctx) {
             const p = (input ?? {});
             if (p.deletePermanently) {
-                await driveRequest(ctx, "DELETE", `/drive/v3/files/${p.folderId}`, undefined, {
+                await driveRequest(ctx, "DELETE", `/drive/v3/files/${pathSegment(p.folderId)}`, undefined, {
                     supportsAllDrives: true,
                 });
             }
             else {
-                await driveRequest(ctx, "PATCH", `/drive/v3/files/${p.folderId}`, { trashed: true }, { supportsAllDrives: true });
+                await driveRequest(ctx, "PATCH", `/drive/v3/files/${pathSegment(p.folderId)}`, { trashed: true }, { supportsAllDrives: true });
             }
             return { id: p.folderId, success: true };
         },
@@ -1045,7 +1042,7 @@ export default function googleDrive(rl) {
                 if (p[k] !== undefined)
                     qs[k] = p[k];
             }
-            return driveRequest(ctx, "POST", `/drive/v3/files/${p.folderId}/permissions`, body, qs);
+            return driveRequest(ctx, "POST", `/drive/v3/files/${pathSegment(p.folderId)}/permissions`, body, qs);
         },
     });
     // ── File / folder search ──────────────────────────────
@@ -1147,7 +1144,7 @@ export default function googleDrive(rl) {
             const qs = {};
             if (p.useDomainAdminAccess !== undefined)
                 qs.useDomainAdminAccess = p.useDomainAdminAccess;
-            return driveRequest(ctx, "GET", `/drive/v3/drives/${p.driveId}`, undefined, qs);
+            return driveRequest(ctx, "GET", `/drive/v3/drives/${pathSegment(p.driveId)}`, undefined, qs);
         },
     });
     rl.registerAction("drive.list", {
@@ -1200,7 +1197,7 @@ export default function googleDrive(rl) {
                 if (p[k] !== undefined)
                     body[k] = p[k];
             }
-            return driveRequest(ctx, "PATCH", `/drive/v3/drives/${p.driveId}`, body);
+            return driveRequest(ctx, "PATCH", `/drive/v3/drives/${pathSegment(p.driveId)}`, body);
         },
     });
     rl.registerAction("drive.delete", {
@@ -1209,7 +1206,7 @@ export default function googleDrive(rl) {
         inputSchema: t.Object({ driveId: Id }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            await driveRequest(ctx, "DELETE", `/drive/v3/drives/${p.driveId}`);
+            await driveRequest(ctx, "DELETE", `/drive/v3/drives/${pathSegment(p.driveId)}`);
             return { success: true };
         },
     });
@@ -1251,7 +1248,7 @@ export default function googleDrive(rl) {
             do {
                 if (pageToken)
                     query.pageToken = pageToken;
-                const page = (await driveRequest(ctx, "GET", `/drive/v3/files/${fileId}/comments`, undefined, query));
+                const page = (await driveRequest(ctx, "GET", `/drive/v3/files/${pathSegment(fileId)}/comments`, undefined, query));
                 if (Array.isArray(page.comments))
                     out.push(...page.comments);
                 pageToken = page.nextPageToken;
@@ -1265,7 +1262,7 @@ export default function googleDrive(rl) {
         inputSchema: t.Object({ fileId: Id, commentId: Id, includeDeleted: t.Optional(t.Boolean()) }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            return driveRequest(ctx, "GET", `/drive/v3/files/${p.fileId}/comments/${p.commentId}`, undefined, { fields: COMMENT_FIELDS, includeDeleted: p.includeDeleted ?? false });
+            return driveRequest(ctx, "GET", `/drive/v3/files/${pathSegment(p.fileId)}/comments/${pathSegment(p.commentId)}`, undefined, { fields: COMMENT_FIELDS, includeDeleted: p.includeDeleted ?? false });
         },
     });
     rl.registerAction("comment.create", {
@@ -1281,7 +1278,7 @@ export default function googleDrive(rl) {
             const body = { content: p.content };
             if (p.quotedFileContent)
                 body.quotedFileContent = p.quotedFileContent;
-            return driveRequest(ctx, "POST", `/drive/v3/files/${p.fileId}/comments`, body, { fields: COMMENT_FIELDS });
+            return driveRequest(ctx, "POST", `/drive/v3/files/${pathSegment(p.fileId)}/comments`, body, { fields: COMMENT_FIELDS });
         },
     });
     rl.registerAction("comment.update", {
@@ -1290,7 +1287,7 @@ export default function googleDrive(rl) {
         inputSchema: t.Object({ fileId: Id, commentId: Id, content: NonEmptyString }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            return driveRequest(ctx, "PATCH", `/drive/v3/files/${p.fileId}/comments/${p.commentId}`, { content: p.content }, { fields: COMMENT_FIELDS });
+            return driveRequest(ctx, "PATCH", `/drive/v3/files/${pathSegment(p.fileId)}/comments/${pathSegment(p.commentId)}`, { content: p.content }, { fields: COMMENT_FIELDS });
         },
     });
     rl.registerAction("comment.delete", {
@@ -1299,7 +1296,7 @@ export default function googleDrive(rl) {
         inputSchema: t.Object({ fileId: Id, commentId: Id }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            await driveRequest(ctx, "DELETE", `/drive/v3/files/${p.fileId}/comments/${p.commentId}`);
+            await driveRequest(ctx, "DELETE", `/drive/v3/files/${pathSegment(p.fileId)}/comments/${pathSegment(p.commentId)}`);
             return { success: true };
         },
     });
@@ -1309,7 +1306,7 @@ export default function googleDrive(rl) {
         inputSchema: t.Object({ fileId: Id, commentId: Id, content: t.Optional(NonEmptyString) }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            return driveRequest(ctx, "POST", `/drive/v3/files/${p.fileId}/comments/${p.commentId}/replies`, { action: "resolve", content: p.content ?? "Resolved." }, { fields: REPLY_FIELDS });
+            return driveRequest(ctx, "POST", `/drive/v3/files/${pathSegment(p.fileId)}/comments/${pathSegment(p.commentId)}/replies`, { action: "resolve", content: p.content ?? "Resolved." }, { fields: REPLY_FIELDS });
         },
     });
     rl.registerAction("comment.reopen", {
@@ -1318,7 +1315,7 @@ export default function googleDrive(rl) {
         inputSchema: t.Object({ fileId: Id, commentId: Id, content: t.Optional(NonEmptyString) }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            return driveRequest(ctx, "POST", `/drive/v3/files/${p.fileId}/comments/${p.commentId}/replies`, { action: "reopen", content: p.content ?? "Reopened." }, { fields: REPLY_FIELDS });
+            return driveRequest(ctx, "POST", `/drive/v3/files/${pathSegment(p.fileId)}/comments/${pathSegment(p.commentId)}/replies`, { action: "reopen", content: p.content ?? "Reopened." }, { fields: REPLY_FIELDS });
         },
     });
     rl.registerAction("reply.list", {
@@ -1342,7 +1339,7 @@ export default function googleDrive(rl) {
             do {
                 if (pageToken)
                     query.pageToken = pageToken;
-                const page = (await driveRequest(ctx, "GET", `/drive/v3/files/${p.fileId}/comments/${p.commentId}/replies`, undefined, query));
+                const page = (await driveRequest(ctx, "GET", `/drive/v3/files/${pathSegment(p.fileId)}/comments/${pathSegment(p.commentId)}/replies`, undefined, query));
                 if (Array.isArray(page.replies))
                     out.push(...page.replies);
                 pageToken = page.nextPageToken;
@@ -1364,7 +1361,7 @@ export default function googleDrive(rl) {
             const body = { content: p.content };
             if (p.action === "resolve" || p.action === "reopen")
                 body.action = p.action;
-            return driveRequest(ctx, "POST", `/drive/v3/files/${p.fileId}/comments/${p.commentId}/replies`, body, { fields: REPLY_FIELDS });
+            return driveRequest(ctx, "POST", `/drive/v3/files/${pathSegment(p.fileId)}/comments/${pathSegment(p.commentId)}/replies`, body, { fields: REPLY_FIELDS });
         },
     });
     rl.registerAction("reply.update", {
@@ -1373,7 +1370,7 @@ export default function googleDrive(rl) {
         inputSchema: t.Object({ fileId: Id, commentId: Id, replyId: Id, content: NonEmptyString }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            return driveRequest(ctx, "PATCH", `/drive/v3/files/${p.fileId}/comments/${p.commentId}/replies/${p.replyId}`, { content: p.content }, { fields: REPLY_FIELDS });
+            return driveRequest(ctx, "PATCH", `/drive/v3/files/${pathSegment(p.fileId)}/comments/${pathSegment(p.commentId)}/replies/${pathSegment(p.replyId)}`, { content: p.content }, { fields: REPLY_FIELDS });
         },
     });
     rl.registerAction("reply.delete", {
@@ -1382,7 +1379,7 @@ export default function googleDrive(rl) {
         inputSchema: t.Object({ fileId: Id, commentId: Id, replyId: Id }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            await driveRequest(ctx, "DELETE", `/drive/v3/files/${p.fileId}/comments/${p.commentId}/replies/${p.replyId}`);
+            await driveRequest(ctx, "DELETE", `/drive/v3/files/${pathSegment(p.fileId)}/comments/${pathSegment(p.commentId)}/replies/${pathSegment(p.replyId)}`);
             return { success: true };
         },
     });
@@ -1420,7 +1417,7 @@ export default function googleDrive(rl) {
             do {
                 if (pageToken)
                     query.pageToken = pageToken;
-                const page = (await driveRequest(ctx, "GET", `/drive/v3/files/${fileId}/revisions`, undefined, query));
+                const page = (await driveRequest(ctx, "GET", `/drive/v3/files/${pathSegment(fileId)}/revisions`, undefined, query));
                 if (Array.isArray(page.revisions))
                     out.push(...page.revisions);
                 pageToken = page.nextPageToken;
@@ -1434,7 +1431,7 @@ export default function googleDrive(rl) {
         inputSchema: t.Object({ fileId: Id, revisionId: Id }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            return driveRequest(ctx, "GET", `/drive/v3/files/${p.fileId}/revisions/${p.revisionId}`, undefined, { fields: REVISION_FIELDS });
+            return driveRequest(ctx, "GET", `/drive/v3/files/${pathSegment(p.fileId)}/revisions/${pathSegment(p.revisionId)}`, undefined, { fields: REVISION_FIELDS });
         },
     });
     rl.registerAction("revision.download", {
@@ -1445,7 +1442,7 @@ export default function googleDrive(rl) {
             const p = (input ?? {});
             const fileId = p.fileId;
             const revisionId = p.revisionId;
-            const url = new URL(`${API_BASE}/drive/v3/files/${filePathId(fileId)}/revisions/${filePathId(revisionId)}`);
+            const url = new URL(`${API_BASE}/drive/v3/files/${pathSegment(fileId)}/revisions/${pathSegment(revisionId)}`);
             url.searchParams.set("alt", "media");
             const res = await driveResponse(ctx, url.toString());
             if (!res.ok) {
@@ -1500,7 +1497,7 @@ export default function googleDrive(rl) {
             if (Object.keys(body).length === 0) {
                 throw new Error("googleDrive.revision.update: pass at least one of keepForever / published / publishAuto / publishedOutsideDomain.");
             }
-            return driveRequest(ctx, "PATCH", `/drive/v3/files/${p.fileId}/revisions/${p.revisionId}`, body, { fields: REVISION_FIELDS });
+            return driveRequest(ctx, "PATCH", `/drive/v3/files/${pathSegment(p.fileId)}/revisions/${pathSegment(p.revisionId)}`, body, { fields: REVISION_FIELDS });
         },
     });
     rl.registerAction("revision.delete", {
@@ -1509,7 +1506,7 @@ export default function googleDrive(rl) {
         inputSchema: t.Object({ fileId: Id, revisionId: Id }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            await driveRequest(ctx, "DELETE", `/drive/v3/files/${p.fileId}/revisions/${p.revisionId}`);
+            await driveRequest(ctx, "DELETE", `/drive/v3/files/${pathSegment(p.fileId)}/revisions/${pathSegment(p.revisionId)}`);
             return { success: true };
         },
     });
@@ -1522,7 +1519,7 @@ export default function googleDrive(rl) {
             const fileId = p.fileId;
             const revisionId = p.revisionId;
             // 1. Pull the chosen revision's bytes.
-            const dl = await driveResponse(ctx, `${API_BASE}/drive/v3/files/${encodeURIComponent(fileId)}/revisions/${encodeURIComponent(revisionId)}?alt=media`);
+            const dl = await driveResponse(ctx, `${API_BASE}/drive/v3/files/${pathSegment(fileId)}/revisions/${pathSegment(revisionId)}?alt=media`);
             if (!dl.ok) {
                 throw new Error(`googleDrive: revision restore download failed (HTTP ${dl.status})`);
             }
@@ -1531,7 +1528,7 @@ export default function googleDrive(rl) {
                 dl.headers.get("content-type") ??
                 "application/octet-stream";
             // 2. Multipart-PATCH them as the new head of the same file.
-            const url = new URL(`${API_BASE}/upload/drive/v3/files/${filePathId(fileId)}`);
+            const url = new URL(`${API_BASE}/upload/drive/v3/files/${pathSegment(fileId)}`);
             url.searchParams.set("uploadType", "multipart");
             url.searchParams.set("supportsAllDrives", "true");
             url.searchParams.set("fields", "id,name,mimeType,modifiedTime,size,headRevisionId,webViewLink");
@@ -1546,7 +1543,7 @@ export default function googleDrive(rl) {
             if (!res.ok) {
                 throw new Error(`googleDrive: revision restore upload failed (HTTP ${res.status})`);
             }
-            const head = (await res.json());
+            const head = (await jsonAnswer(res));
             return { fileId, restoredFromRevisionId: revisionId, head };
         },
     });
@@ -1688,7 +1685,7 @@ export default function googleDrive(rl) {
             if (Object.keys(body).length === 0 && !qs.removeExpiration) {
                 throw new Error("googleDrive.permission.update: pass at least one of role / expirationTime / removeExpiration.");
             }
-            return driveRequest(ctx, "PATCH", `/drive/v3/files/${p.fileId}/permissions/${p.permissionId}`, body, qs);
+            return driveRequest(ctx, "PATCH", `/drive/v3/files/${pathSegment(p.fileId)}/permissions/${pathSegment(p.permissionId)}`, body, qs);
         },
     });
     // ─── Access proposals ───────────────────────────────────────────
@@ -1706,7 +1703,7 @@ export default function googleDrive(rl) {
             const out = [];
             let pageToken;
             do {
-                const page = (await driveRequest(ctx, "GET", `/drive/v3/files/${p.fileId}/accessproposals`, undefined, { pageSize: p.pageSize ?? 100, pageToken }));
+                const page = (await driveRequest(ctx, "GET", `/drive/v3/files/${pathSegment(p.fileId)}/accessproposals`, undefined, { pageSize: p.pageSize ?? 100, pageToken }));
                 if (Array.isArray(page.accessProposals))
                     out.push(...page.accessProposals);
                 pageToken = page.nextPageToken;
@@ -1744,7 +1741,7 @@ export default function googleDrive(rl) {
             }
             if (p.sendNotification !== undefined)
                 body.sendNotification = p.sendNotification;
-            return driveRequest(ctx, "POST", `/drive/v3/files/${p.fileId}/accessproposals/${p.proposalId}:resolve`, body);
+            return driveRequest(ctx, "POST", `/drive/v3/files/${pathSegment(p.fileId)}/accessproposals/${pathSegment(p.proposalId)}:resolve`, body);
         },
     });
     // ─── About ───────────────────────────────────────────────────────
@@ -1771,7 +1768,7 @@ export default function googleDrive(rl) {
         }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            const u = new URL(`${API_BASE}/drive/v3/files/${filePathId(String(p.fileId))}/export`);
+            const u = new URL(`${API_BASE}/drive/v3/files/${pathSegment(p.fileId)}/export`);
             u.searchParams.set("mimeType", p.mimeType);
             const res = await driveResponse(ctx, u.toString());
             if (!res.ok) {

package/dist/plugins/googleImage/src/credentials.js

@@ -0,0 +1,14 @@
+import { staticCredential } from "../../_shared/credentials.js";
+/** A Google AI API key, appended by the transport as the `key` query
+ *  parameter on the Generative Language API. */
+export const googleImageCredential = staticCredential({
+    id: "googleImage",
+    auth: { kind: "queryKey", param: "key" },
+    local: { secret: "apiKey" },
+    targets: {
+        api: {
+            baseUrl: "https://generativelanguage.googleapis.com/v1beta/",
+            methods: ["POST"],
+        },
+    },
+});