runline 0.33.0 → 0.35.0

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

@@ -53,10 +53,13 @@
  * for larger files, driven off whether the caller supplies bytes
  * (Buffer) vs a path (streamed).
  */
-import { createReadStream, readFileSync, statSync, writeFileSync } from "node:fs";
+import { createReadStream, statSync, writeFileSync } from "node:fs";
 import * as t from "typebox";
-import { googleJsonRequest, googleResponse } from "../../_shared/googleAuth.js";
+import { standardBase64 } from "../../_shared/base64.js";
+import { jsonAnswer, pathSegment } from "../../_shared/credentials.js";
+import { googleCredential, googleJsonRequest, googleOAuth, googleResponse, } from "../../_shared/googleAuth.js";
 import { Id, NonEmptyString, RawGoogleObject, StringMap, StringOrStringArray, stringEnum, } from "../../_shared/googleSchemas.js";
+import { readLocalFile } from "../../_shared/localFile.js";
 const PermissionRole = stringEnum([
     "owner",
     "organizer",
@@ -110,11 +113,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");
@@ -146,9 +144,12 @@ async function paginateAll(ctx, path, key, qs) {
  * mimeType. For resumable uploads we keep paths as paths so we can
  * stream instead of buffering 500 MB in memory.
  */
-function resolveContent(p) {
+async function resolveContent(p) {
     if (typeof p.contentBase64 === "string") {
-        const buf = Buffer.from(p.contentBase64, "base64");
+        const base64 = standardBase64(p.contentBase64);
+        if (base64 === undefined)
+            throw new Error("googleDrive: contentBase64 is not valid base64");
+        const buf = Buffer.from(base64, "base64");
         return {
             buffer: buf,
             size: buf.byteLength,
@@ -172,9 +173,14 @@ function resolveContent(p) {
         const BUFFER_THRESHOLD = 5 * 1024 * 1024;
         const fileName = p.name ?? p.contentPath.split("/").pop();
         if (stat.size <= BUFFER_THRESHOLD) {
+            const buffer = await readLocalFile(p.contentPath, {
+                subject: "googleDrive: contentPath",
+                maxBytes: BUFFER_THRESHOLD,
+                oversize: "googleDrive: contentPath grew while reading; retry the upload",
+            });
             return {
-                buffer: readFileSync(p.contentPath),
-                size: stat.size,
+                buffer,
+                size: buffer.byteLength,
                 mimeType: p.mimeType,
                 fileName,
             };
@@ -354,37 +360,8 @@ const SCOPES = ["https://www.googleapis.com/auth/drive"];
 export default function googleDrive(rl) {
     rl.setName("googleDrive");
     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 Drive API:",
-            "     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_DRIVE_CLIENT_ID and GOOGLE_DRIVE_CLIENT_SECRET.",
-        ],
-    });
+    rl.setCredential(googleCredential("googleDrive", SCOPES));
+    rl.setOAuth(googleOAuth("googleDrive", SCOPES, "GOOGLE_DRIVE"));
     rl.setConnectionSchema({
         authMethod: { type: "string", required: false, description: "delegated or serviceAccount (legacy configs infer the method)" },
         clientId: {
@@ -460,7 +437,7 @@ export default function googleDrive(rl) {
         }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            const content = resolveContent(p);
+            const content = await resolveContent(p);
             const metadata = {
                 name: content.fileName ?? "Untitled",
                 parents: [resolveParent(p.folderId, p.driveId)],
@@ -487,7 +464,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 +500,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 +550,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 +564,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 +617,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 +630,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,
@@ -716,10 +693,10 @@ export default function googleDrive(rl) {
             // Step 1: upload new bytes if provided. Drive requires PATCH on
             // the upload endpoint for content replacement.
             if (hasBytes) {
-                const c = resolveContent(p);
+                const c = await 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 +721,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 +791,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 +808,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 +824,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 +891,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 +900,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 +913,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 +951,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 +1022,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 +1124,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 +1177,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 +1186,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 +1228,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 +1242,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 +1258,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 +1267,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 +1276,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 +1286,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 +1295,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 +1319,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 +1341,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 +1350,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 +1359,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 +1397,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 +1411,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 +1422,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) {
@@ -1497,10 +1474,7 @@ export default function googleDrive(rl) {
                 if (p[k] !== undefined)
                     body[k] = p[k];
             }
-            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 +1483,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 +1496,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 +1505,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 +1520,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 };
         },
     });
@@ -1685,10 +1659,7 @@ export default function googleDrive(rl) {
                 qs.removeExpiration = true;
             if (p.useDomainAdminAccess)
                 qs.useDomainAdminAccess = true;
-            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 +1677,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 +1715,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 +1742,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"],
+        },
+    },
+});

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

@@ -18,8 +18,18 @@
  * inline next to the instruction and writes the edited result to disk.
  */
 import * as t from "typebox";
+import { credentialJson, pathSegment } from "../../_shared/credentials.js";
 import { readImageInput, SEND_FILE_NOTE, writeImageFile, } from "../../_shared/mediaFile.js";
-const BASE = "https://generativelanguage.googleapis.com/v1beta/models";
+import { googleImageCredential } from "./credentials.js";
+/** The model as one path segment before the fixed :generateContent verb. */
+function generateContent(ctx, model, body) {
+    return credentialJson(ctx, googleImageCredential, "googleImage", {
+        target: "api",
+        path: `models/${pathSegment(model)}:generateContent`,
+        method: "POST",
+        json: body,
+    });
+}
 /** Write every inline image part of a Gemini response to disk. */
 function saveInlineImages(data, saveDir) {
     const stamp = Date.now();
@@ -43,6 +53,7 @@ function saveInlineImages(data, saveDir) {
 export default function googleImage(rl) {
     rl.setName("googleImage");
     rl.setVersion("0.1.0");
+    rl.setCredential(googleImageCredential);
     rl.setConnectionSchema({
         apiKey: {
             type: "string",
@@ -72,22 +83,11 @@ export default function googleImage(rl) {
             if (typeof p.prompt !== "string" || p.prompt.length === 0) {
                 throw new Error("googleImage: prompt is required");
             }
-            const apiKey = ctx.connection.config.apiKey;
             const model = p.model ?? "gemini-2.5-flash-image";
-            const url = `${BASE}/${model}:generateContent?key=${encodeURIComponent(apiKey)}`;
-            const body = {
+            const data = await generateContent(ctx, model, {
                 contents: [{ parts: [{ text: p.prompt }] }],
                 generationConfig: { responseModalities: ["IMAGE", "TEXT"] },
-            };
-            const res = await fetch(url, {
-                method: "POST",
-                headers: { "Content-Type": "application/json" },
-                body: JSON.stringify(body),
             });
-            if (!res.ok) {
-                throw new Error(`Google API error ${res.status}: ${await res.text()}`);
-            }
-            const data = (await res.json());
             const images = saveInlineImages(data, p.saveDir);
             return { provider: "googleImage", model, images, note: SEND_FILE_NOTE };
         },
@@ -117,11 +117,9 @@ export default function googleImage(rl) {
             if (typeof p.prompt !== "string" || p.prompt.length === 0) {
                 throw new Error("googleImage: prompt is required");
             }
-            const img = readImageInput(p.imagePath, "googleImage");
-            const apiKey = ctx.connection.config.apiKey;
+            const img = await readImageInput(p.imagePath, "googleImage");
             const model = p.model ?? "gemini-2.5-flash-image";
-            const url = `${BASE}/${model}:generateContent?key=${encodeURIComponent(apiKey)}`;
-            const body = {
+            const data = await generateContent(ctx, model, {
                 contents: [
                     {
                         parts: [
@@ -131,16 +129,7 @@ export default function googleImage(rl) {
                     },
                 ],
                 generationConfig: { responseModalities: ["IMAGE", "TEXT"] },
-            };
-            const res = await fetch(url, {
-                method: "POST",
-                headers: { "Content-Type": "application/json" },
-                body: JSON.stringify(body),
             });
-            if (!res.ok) {
-                throw new Error(`Google API error ${res.status}: ${await res.text()}`);
-            }
-            const data = (await res.json());
             const images = saveInlineImages(data, p.saveDir);
             if (images.length === 0) {
                 throw new Error("googleImage: the model returned no edited image — it may have refused; try a more specific instruction");