lael-labs/executor

apps/cloud/src/engine/execution-stack.ts+5−4

  */
 export const CLOUD_MOUNT_PREFIX = "/api" as const;
-// Initial Google launch boundary. Calendar + Sheets are sensitive scopes but
+// Initial Google launch boundary. Gmail uses gmail.modify for read, send, and
-// not restricted Workspace scopes; Gmail and account-wide Drive remain absent
+// trash operations while immediate permanent deletion remains absent until the
-// until their separate verification/security work is complete. The same scope
+// broader mail.google.com scope is approved. Account-wide Drive remains absent.
-// source builds the catalog auth templates, preventing config drift.
+// The same scope source builds the catalog auth templates, preventing drift.
 const GOOGLE_FIRST_PARTY_ALLOWED_SCOPES: readonly string[] = [
   ...new Set([
     ...googleCatalogOAuthScopesForPreset("google-calendar"),
+    ...googleCatalogOAuthScopesForPreset("google-gmail"),
     ...googleCatalogOAuthScopesForPreset("google-sheets"),
   ]),
 ];

apps/marketing/src/pages/index.astro+5−4

             <h1
               class="rise-1 text-[clamp(2.8rem,7.2vw,6rem)] font-semibold tracking-[-0.025em] leading-[1.02] text-ink mb-6 mx-auto max-w-[18ch] text-balance"
             >
-              Connect any agent to <span class="serif-italic">everything</span>.
+              Executor connects any agent to <span class="serif-italic">everything</span>.
             </h1>
             <p
               class="rise-2 mx-auto mb-12 max-w-[50ch] text-[clamp(1.05rem,2.4vw,1.3rem)] leading-[1.5] text-ink-2"
             >
-              Executor is an MCP gateway. Anything that speaks MCP, like Claude
+              Executor is an integration platform and MCP gateway for AI agents.
-              Code, Cursor, or Codex, points at one endpoint and reaches every
+              It lets you securely connect services such as Google Workspace,
-              tool you connect.
+              GitHub, and Slack, then read data and run the actions you request
+              through one endpoint.
             </p>
             <div class="rise-3 max-w-[760px] mx-auto mb-12">
               <div class="surface-card p-6 sm:p-7">

apps/marketing/src/pages/privacy.astro+14−4

   <p>
     If you connect a Google Workspace service, Executor uses the permissions you grant to perform the actions you
     request through that integration. Depending on the service and permissions you choose, this may include accessing
-    or modifying Google Calendar events, Google Sheets spreadsheets, or other Google Workspace content. Executor stores
+    or modifying Google Calendar events, Google Sheets spreadsheets, Gmail messages, drafts, threads, attachments,
-    OAuth credentials and connection metadata so the integration can continue working, and processes Google Workspace
+    labels, or other Google Workspace content. For Gmail, this can include reading and searching email, composing and
-    content when carrying out your requested tool calls and returning their results to you or the agent you directed to
+    sending messages, and organizing or moving messages to Trash when you request those actions.
-    make the call.
+  </p>
+  <p>
+    Executor stores OAuth credentials and connection metadata so the integration can continue working. It processes
+    Google Workspace content only while carrying out your requested tool calls and returning their results to you or
+    the agent you directed to make the call. That content can appear in the resulting agent session or in another
+    service when you explicitly direct Executor to send it there.
   </p>
   <p>
     We do not use Google Workspace API data for advertising or to train generalized artificial-intelligence or
     <a href="https://developers.google.com/terms/api-services-user-data-policy">Google API Services User Data Policy</a>,
     including its Limited Use requirements.
   </p>
+  <p>
+    You can stop Executor&apos;s access by deleting the Google connection in Executor or revoking Executor from your
+    Google Account permissions. To request deletion of your Executor account, stored OAuth credentials, connection
+    metadata, or other personal information, email <a href="mailto:rhys@executor.sh">rhys@executor.sh</a>.
+  </p>
   <h3>Website inputs and support communications</h3>
   <p>

e2e/scenarios/first-party-oauth.test.ts+36−4

 );
 scenario(
-  "First-party OAuth · Google offers Calendar and Sheets but refuses Gmail scopes",
+  "First-party OAuth · Google offers Gmail modify but refuses full Gmail and Drive scopes",
   {},
   Effect.scoped(
     Effect.gen(function* () {
       expect(google?.origin.kind).toBe("first_party");
       if (google?.origin.kind !== "first_party") return;
       expect(google.origin.allowedScopes).toContain("https://www.googleapis.com/auth/calendar");
+      expect(google.origin.allowedScopes).toContain("https://www.googleapis.com/auth/gmail.modify");
       expect(google.origin.allowedScopes).toContain("https://www.googleapis.com/auth/spreadsheets");
       expect(google.origin.allowedScopes).not.toContain("https://mail.google.com/");
       expect(google.origin.allowedScopes).not.toContain("https://www.googleapis.com/auth/drive");
             "openid",
             "email",
             "profile",
-            "https://mail.google.com/",
+            "https://www.googleapis.com/auth/gmail.modify",
           ]),
           slug: gmail,
         },
       });
+      const gmailStarted = yield* client.oauth.start({
+        payload: {
+          client: OAuthClientSlug.make("first-party:google"),
+          clientOwner: "org",
+          owner: "org",
+          name: ConnectionName.make("gmail"),
+          integration: gmail,
+          template: AuthTemplateSlug.make("oauth"),
+        },
+      });
+      expect(gmailStarted.status).toBe("redirect");
+      const gmailAuthorizationUrl =
+        gmailStarted.status === "redirect" ? gmailStarted.authorizationUrl : "";
+      expect(
+        new Set(new URL(gmailAuthorizationUrl).searchParams.get("scope")?.split(" ") ?? []),
+      ).toEqual(
+        new Set(["openid", "email", "profile", "https://www.googleapis.com/auth/gmail.modify"]),
+      );
+      const fullGmail = IntegrationSlug.make(unique("google_gmail_full"));
+      yield* client.openapi.addSpec({
+        payload: {
+          ...googleShapedIntegrationSpec([
+            "openid",
+            "email",
+            "profile",
+            "https://mail.google.com/",
+          ]),
+          slug: fullGmail,
+        },
+      });
       const blocked = yield* client.oauth
         .start({
           payload: {
             client: OAuthClientSlug.make("first-party:google"),
             clientOwner: "org",
             owner: "org",
-            name: ConnectionName.make("gmail"),
+            name: ConnectionName.make("gmail-full"),
-            integration: gmail,
+            integration: fullGmail,
             template: AuthTemplateSlug.make("oauth"),
           },
         })

packages/plugins/openapi/src/providers/google/discovery.test.ts+72−0

@@ -959,6 +959,78 @@ it.effect("bundles Google Discovery documents into one Google OpenAPI integratio · 958 unmodified lines
959	}),	959	}),
960	);	960	);
961		961
		962	it.effect("filters Gmail operations to the explicitly selected consent scope", () =>
		963	Effect.gen(function* () {
		964	const modifyScope = "https://www.googleapis.com/auth/gmail.modify";
		965	const fullScope = "https://mail.google.com/";
		966	const result = yield* convertGoogleDiscoveryBundleToOpenApi({
		967	consentScopes: [modifyScope],
		968	documents: [
		969	{
		970	discoveryUrl: "https://www.googleapis.com/discovery/v1/apis/gmail/v1/rest",
		971	// @effect-diagnostics-next-line preferSchemaOverJson:off
		972	documentText: JSON.stringify({
		973	name: "gmail",
		974	version: "v1",
		975	title: "Gmail API",
		976	rootUrl: "https://gmail.googleapis.com/",
		977	servicePath: "",
		978	auth: {
		979	oauth2: {
		980	scopes: {
		981	[modifyScope]: { description: "Read and modify Gmail" },
		982	[fullScope]: { description: "Full Gmail access" },
		983	},
		984	},
		985	},
		986	resources: {
		987	users: {
		988	resources: {
		989	messages: {
		990	methods: {
		991	list: {
		992	id: "gmail.users.messages.list",
		993	httpMethod: "GET",
		994	path: "gmail/v1/users/{userId}/messages",
		995	scopes: [modifyScope, fullScope],
		996	parameters: {
		997	userId: { location: "path", required: true, type: "string" },
		998	},
		999	},
		1000	delete: {
		1001	id: "gmail.users.messages.delete",
		1002	httpMethod: "DELETE",
		1003	path: "gmail/v1/users/{userId}/messages/{id}",
		1004	scopes: [fullScope],
		1005	parameters: {
		1006	userId: { location: "path", required: true, type: "string" },
		1007	id: { location: "path", required: true, type: "string" },
		1008	},
		1009	},
		1010	},
		1011	},
		1012	},
		1013	},
		1014	},
		1015	schemas: {},
		1016	}),
		1017	},
		1018	],
		1019	});
		1020
		1021	const spec = decodeConvertedSpec(result.specText);
		1022	const operationIds = Object.values(spec.paths).flatMap((path) =>
		1023	Object.values(path).map((operation) => operation.operationId),
		1024	);
		1025	expect(operationIds).toContain("gmail.users.messages.list");
		1026	expect(operationIds).not.toContain("gmail.users.messages.delete");
		1027	const oauthTemplate = result.authenticationTemplate?.find((entry) => entry.kind === "oauth2");
		1028	expect(oauthTemplate?.kind === "oauth2" ? oauthTemplate.scopes : undefined).toEqual([
		1029	modifyScope,
		1030	]);
		1031	}),
		1032	);
		1033
962	// ---------------------------------------------------------------------------	1034	// ---------------------------------------------------------------------------
963	// The merged bundle scope set is the COMPACTED + FILTERED union: sub-scopes	1035	// The merged bundle scope set is the COMPACTED + FILTERED union: sub-scopes
964	// collapse under their broad parent (`gmail.*` → `mail.google.com/`,	1036	// collapse under their broad parent (`gmail.*` → `mail.google.com/`,

packages/plugins/openapi/src/providers/google/discovery.ts+4−7

 const GOOGLE_PHOTOS_UPLOAD_TOOL_PATH = "photoslibrary.mediaItems.upload";
 const GOOGLE_PHOTOS_UPLOAD_PATH = "/v1/uploads";
-const isGooglePhotosService = (service: string): boolean =>
-  service === GOOGLE_PHOTOS_LIBRARY_SERVICE || service === GOOGLE_PHOTOS_PICKER_SERVICE;
 const discoveryScopesForService = (
   service: string,
   document: DiscoveryDocument,
     const schemaPrefix = schemaComponentPart(`${info.service}_${info.version}`);
     const schemaNameForRef = (name: string) => `${schemaPrefix}_${schemaComponentPart(name)}`;
     const scopeDescriptions = discoveryScopesForService(info.service, info.document);
-    const filterPhotosScopes = consentScopeSet !== null && isGooglePhotosService(info.service);
+    const filterConsentScopes = consentScopeSet !== null;
     for (const [scope, description] of Object.entries(scopeDescriptions)) {
-      if (filterPhotosScopes && !consentScopeSet.has(scope)) continue;
+      if (filterConsentScopes && !consentScopeSet.has(scope)) continue;
       rawScopes[scope] ??= description;
     }
       const rawPathTemplate = Option.getOrUndefined(method.path);
       if (!methodId || !rawPathTemplate || !method.httpMethod) continue;
       const methodScopes = discoveryMethodScopesForService(info.service, method);
-      const oauthScopes = filterPhotosScopes
+      const oauthScopes = filterConsentScopes
         ? methodScopes.filter((scope) => consentScopeSet.has(scope))
         : methodScopes;
-      if (filterPhotosScopes && methodScopes.length > 0 && oauthScopes.length === 0) continue;
+      if (filterConsentScopes && methodScopes.length > 0 && oauthScopes.length === 0) continue;
       const toolPath = methodId;
       const wirePath = rawPathTemplate.startsWith("/") ? rawPathTemplate : `/${rawPathTemplate}`;

packages/plugins/openapi/src/providers/google/presets.ts+1−1

@@ -250,7 +250,7 @@ export const googlePhotosOpenApiPresets: readonly GoogleOpenApiPreset[] = · 249 unmodified lines
250		250
251	export const googleOAuthConsentScopes: Readonly<Record<string, readonly string[]>> = {	251	export const googleOAuthConsentScopes: Readonly<Record<string, readonly string[]>> = {
252	"google-calendar": ["https://www.googleapis.com/auth/calendar"],	252	"google-calendar": ["https://www.googleapis.com/auth/calendar"],
253	"google-gmail": ["https://mail.google.com/"],	253	"google-gmail": ["https://www.googleapis.com/auth/gmail.modify"],
254	"google-sheets": ["https://www.googleapis.com/auth/spreadsheets"],	254	"google-sheets": ["https://www.googleapis.com/auth/spreadsheets"],
255	"google-drive": ["https://www.googleapis.com/auth/drive"],	255	"google-drive": ["https://www.googleapis.com/auth/drive"],
256	"google-docs": ["https://www.googleapis.com/auth/documents"],	256	"google-docs": ["https://www.googleapis.com/auth/documents"],

packages/plugins/openapi/src/providers/google/spec-format-adapter.ts+4−1

           ),
         { concurrency: 4 },
       );
-      const conversion = yield* convertGoogleDiscoveryBundleToOpenApi({ documents });
+      const conversion = yield* convertGoogleDiscoveryBundleToOpenApi({
+        documents,
+        ...(input.consentScopes ? { consentScopes: input.consentScopes } : {}),
+      });
       const document =
         documents.length === 1
           ? yield* parseJson(documents[0]!.documentText)

packages/plugins/openapi/src/sdk/plugin.ts+14−1

   const resolveSpecForInput = (
     config: Pick<
       OpenApiSpecConfig,
-      "spec" | "specFormat" | "specOverrides" | "headers" | "queryParams" | "baseUrl"
+      | "spec"
+      | "specFormat"
+      | "specOverrides"
+      | "headers"
+      | "queryParams"
+      | "baseUrl"
+      | "authenticationTemplate"
     >,
     httpClientLayer: Layer.Layer<HttpClient.HttpClient, never, never>,
   ): Effect.Effect<
             ...(config.headers ? { headers: config.headers } : {}),
             ...(config.queryParams ? { queryParams: config.queryParams } : {}),
           },
+          ...(config.authenticationTemplate
+            ? {
+                consentScopes: config.authenticationTemplate.flatMap((template) =>
+                  "kind" in template && template.kind === "oauth2" ? template.scopes : [],
+                ),
+              }
+            : {}),
           httpClientLayer,
         });
         return yield* applyOverridesToResolvedSpec(resolved, config.specOverrides);

packages/plugins/openapi/src/sdk/spec-format.ts+3−0

 export interface SpecFetchInput {
   readonly urls: readonly string[];
   readonly credentials?: SpecFetchCredentials;
+  /** Explicit OAuth scopes selected by the caller. Format adapters may use
+   *  these to omit operations that the resulting connection cannot invoke. */
+  readonly consentScopes?: readonly string[];
   readonly httpClientLayer: Layer.Layer<HttpClient.HttpClient, never, never>;
 }

packages/react/src/components/add-account-modal.tsx+19−0

@@ -1565,6 +1565,9 @@ function AddAccountModalView(props: AddAccountModalProps) { · 1564 unmodified lines
1565	[...oauthApps, ...oauthNearApps, ...oauthOtherApps].find(	1565	[...oauthApps, ...oauthNearApps, ...oauthOtherApps].find(
1566	(c: OAuthClientOption) => String(c.slug) === selectedApp,	1566	(c: OAuthClientOption) => String(c.slug) === selectedApp,
1567	) ?? null;	1567	) ?? null;
		1568	const isBuiltInGoogleClient =
		1569	chosenClient?.origin.kind === "first_party" &&
		1570	String(chosenClient.slug) === "first-party:google";
1568	const oauthBusy = ccBusy \|\| oauthPopup.busy;	1571	const oauthBusy = ccBusy \|\| oauthPopup.busy;
1569	const cimdConnecting = cimdBusy \|\| oauthPopup.busy;	1572	const cimdConnecting = cimdBusy \|\| oauthPopup.busy;
1570	const dcrConnecting = dcrBusy \|\| oauthPopup.busy;	1573	const dcrConnecting = dcrBusy \|\| oauthPopup.busy;
@@ -2880,6 +2883,22 @@ function AddAccountModalView(props: AddAccountModalProps) { · 1309 unmodified lines
2880	/>	2883	/>
2881	</div>	2884	</div>
2882	)}	2885	)}
		2886
		2887	{isBuiltInGoogleClient && showPlaceStep ? (
		2888	<p className="rounded-md border border-border/60 bg-muted/20 px-3 py-2 text-xs text-muted-foreground">
		2889	Executor uses the Google data you authorize only to perform the actions you
		2890	request. Read the{` `}
		2891	<a
		2892	href="https://executor.sh/privacy"
		2893	target="_blank"
		2894	rel="noreferrer"
		2895	className="font-medium text-foreground underline underline-offset-2"
		2896	>
		2897	privacy policy
		2898	</a>
		2899	.
		2900	</p>
		2901	) : null}
2883	</div>	2902	</div>
2884		2903
2885	{continueError ? (	2904	{continueError ? (