alchemy 2.0.0-beta.52 → 2.0.0-beta.53

package/src/Cli/commands/_shared.ts

@@ -15,7 +15,7 @@ import {
   AuthError,
   AuthProviders,
 } from "../../Auth/AuthProvider.ts";
-import type { AlchemyProfile } from "../../Auth/Profile.ts";
+import type { AlchemyProfileProviders } from "../../Auth/Profile.ts";
 import type * as Stack from "../../Stack.ts";
 import { recordCli } from "../../Telemetry/Metrics.ts";
 import { PromptCancelled } from "../../Util/Clank.ts";
@@ -269,7 +269,7 @@ export const instrumentCommand =
  */
 export const printProfile = Effect.fn(function* (
   profile: string,
-  stored: AlchemyProfile,
+  stored: AlchemyProfileProviders,
   registry: AuthProviders["Service"],
 ) {
   yield* Console.log(`Profile: ${profile}`);

package/src/Cli/commands/aws.ts

@@ -16,7 +16,7 @@ import {
   destroyBootstrap as destroyBootstrapAws,
 } from "../../AWS/Bootstrap.ts";
 import * as AWSCredentials from "../../AWS/Credentials.ts";
-import * as AWSEnvironment from "../../AWS/Environment.ts";
+import { AWSEnvironment } from "../../AWS/Environment.ts";
 import * as AWSRegion from "../../AWS/Region.ts";
 import { loadConfigProvider } from "../../Util/ConfigProvider.ts";
 import { fileLogger } from "../../Util/FileLogger.ts";
@@ -72,14 +72,17 @@ const bootstrapCommand = Command.make(
         }
 
         const ambient = yield* Effect.context<FileSystem | Path | HttpClient>();
-        const environment = AWSEnvironment.makeEnvironment({
-          accountId: ssoProfile.sso_account_id,
-          region: region ?? ssoProfile.region ?? "us-east-1",
-          credentials: Auth.loadProfileCredentials(profile).pipe(
-            Effect.provide(ambient),
-          ),
-          profile,
-        });
+        const environment = Layer.succeed(
+          AWSEnvironment,
+          Effect.succeed({
+            accountId: ssoProfile.sso_account_id!,
+            region: region ?? ssoProfile.region ?? "us-east-1",
+            credentials: Auth.loadProfileCredentials(profile).pipe(
+              Effect.provide(ambient),
+            ),
+            profile,
+          }),
+        );
 
         const awsLayers = Layer.provideMerge(
           Layer.mergeAll(

package/src/Cli/commands/cloudflare.ts

@@ -565,7 +565,7 @@ const stateLogsCommand = Command.make(
 
       yield* Effect.gen(function* () {
         const { accountId } =
-          yield* CloudflareEnvironment.CloudflareEnvironment;
+          yield* yield* CloudflareEnvironment.CloudflareEnvironment;
         const telemetry = yield* CloudflareLogs;
 
         const formatLine = (line: { timestamp: Date; message: string }) =>

package/src/Cli/commands/login.ts

@@ -7,7 +7,7 @@ import * as Logger from "effect/Logger";
 import { Command, Flag } from "effect/unstable/cli";
 
 import { AuthProviders } from "../../Auth/AuthProvider.ts";
-import { Profile, withProfileOverride } from "../../Auth/Profile.ts";
+import { AlchemyProfile, withProfileOverride } from "../../Auth/Profile.ts";
 import { Stage } from "../../Stage.ts";
 import { loadConfigProvider } from "../../Util/ConfigProvider.ts";
 import { fileLogger } from "../../Util/FileLogger.ts";
@@ -20,7 +20,6 @@ import {
   printProfile,
   profile,
   script,
-  stage,
 } from "./_shared.ts";
 
 const loginConfigure = Flag.boolean("configure").pipe(
@@ -35,25 +34,18 @@ export const loginCommand = Command.make(
   {
     main: script,
     envFile,
-    stage,
     profile,
     configure: loginConfigure,
   },
   instrumentCommand(
     "login",
-    (a: {
-      main: string;
-      stage: string;
-      profile: string;
-      configure: boolean;
-    }) => ({
-      "alchemy.stage": a.stage,
+    (a: { main: string; profile: string; configure: boolean }) => ({
       "alchemy.profile": a.profile,
       "alchemy.main": a.main,
       "alchemy.configure": a.configure,
     }),
   )(
-    Effect.fnUntraced(function* ({ main, stage, envFile, profile, configure }) {
+    Effect.fnUntraced(function* ({ main, envFile, profile, configure }) {
       const stackEffect = yield* importStack(main);
 
       const authProviders: AuthProviders["Service"] = {};
@@ -72,20 +64,20 @@ export const loginCommand = Command.make(
                 ),
               ),
               Logger.layer([fileLogger("out")], { mergeWithExisting: true }),
-              Layer.succeed(Stage, stage),
+              Layer.succeed(Stage, "placeholder"),
               Layer.succeed(Stack, {
                 actions: {},
                 bindings: {},
                 name: stackEffect.stackName,
                 resources: {},
-                stage,
+                stage: "placeholder",
               }),
             ),
           ),
         ),
       );
 
-      const profiles = yield* Profile;
+      const profiles = yield* AlchemyProfile;
 
       const ci = yield* Config.boolean("CI").pipe(Config.withDefault(false));
       const providers = Object.values(authProviders);
@@ -116,14 +108,6 @@ export const loginCommand = Command.make(
             } else {
               cfg = stored;
             }
-
-            // `read` succeeds when creds are present and not expired
-            // (refreshing OAuth proactively if near expiry). Any failure
-            // — missing file, dead refresh token, etc. — falls through
-            // to `login`.
-            yield* provider
-              .read(profile, cfg)
-              .pipe(Effect.catch(() => provider.login(profile, cfg)));
           }),
         { discard: true },
       );

package/src/Cli/commands/profile.ts

@@ -7,7 +7,7 @@ import { Command } from "effect/unstable/cli";
 
 import { AuthProviders } from "../../Auth/AuthProvider.ts";
 import { CredentialsStore } from "../../Auth/Credentials.ts";
-import { Profile, withProfileOverride } from "../../Auth/Profile.ts";
+import { AlchemyProfile, withProfileOverride } from "../../Auth/Profile.ts";
 import { AwsAuth } from "../../AWS/AuthProvider.ts";
 import { AxiomAuth } from "../../Axiom/AuthProvider.ts";
 import { CloudflareAuth } from "../../Cloudflare/Auth/AuthProvider.ts";
@@ -31,7 +31,7 @@ const showCommand = Command.make(
     "alchemy.profile": a.profile,
   }))(
     Effect.fnUntraced(function* ({ profile, envFile }) {
-      const profiles = yield* Profile;
+      const profiles = yield* AlchemyProfile;
       const stored = yield* profiles.getProfile(profile);
       if (stored == null) {
         const config = yield* profiles.readConfig;
@@ -82,7 +82,7 @@ const clearCommand = Command.make(
     "alchemy.profile": a.profile,
   }))(
     Effect.fnUntraced(function* ({ profile }) {
-      const profiles = yield* Profile;
+      const profiles = yield* AlchemyProfile;
       const store = yield* CredentialsStore;
       const removed = yield* profiles.deleteProfile(profile);
       yield* store.deleteProfile(profile);

package/src/Cloudflare/AiGateway/AiGateway.ts

@@ -381,232 +381,233 @@ export const AiGateway = Resource<AiGateway>("Cloudflare.AiGateway")({
 });
 
 export const AiGatewayProvider = () =>
-  Provider.effect(
-    AiGateway,
-    Effect.gen(function* () {
-      const { accountId } = yield* CloudflareEnvironment;
-      const createAiGateway = yield* aiGateway.createAiGateway;
-      const getAiGateway = yield* aiGateway.getAiGateway;
-      const updateAiGateway = yield* aiGateway.updateAiGateway;
-      const deleteAiGateway = yield* aiGateway.deleteAiGateway;
+  Provider.succeed(AiGateway, {
+    stables: ["gatewayId", "accountId"],
+    diff: Effect.fn(function* ({ id, olds = {}, news = {}, output }) {
+      if (!isResolved(news)) return undefined;
+      const { accountId } = yield* yield* CloudflareEnvironment;
 
-      const createGatewayId = (id: string, gatewayId: string | undefined) =>
-        Effect.gen(function* () {
-          if (gatewayId) return gatewayId;
-          return yield* createPhysicalName({
-            id,
-            maxLength: 64,
-            lowercase: true,
-          });
-        });
+      const next = yield* desired(id, news);
+      const oldGatewayId =
+        output?.gatewayId ?? (yield* createGatewayId(id, olds.id));
+      if (
+        (output?.accountId ?? accountId) !== accountId ||
+        oldGatewayId !== next.gatewayId
+      ) {
+        return { action: "replace" } as const;
+      }
 
-      const desired = (id: string, props: AiGatewayProps | undefined) =>
-        Effect.gen(function* () {
-          return {
-            gatewayId: yield* createGatewayId(id, props?.id),
-            cacheInvalidateOnUpdate: props?.cacheInvalidateOnUpdate ?? false,
-            cacheTtl: props?.cacheTtl ?? null,
-            collectLogs: props?.collectLogs ?? true,
-            rateLimitingInterval: props?.rateLimitingInterval ?? null,
-            rateLimitingLimit: props?.rateLimitingLimit ?? null,
-            rateLimitingTechnique: props?.rateLimitingTechnique ?? "fixed",
-            // Defaults align with what Cloudflare's API returns for an
-            // unconfigured gateway, so the reconciler converges to noop
-            // when the user didn't explicitly set the field.
-            authentication: props?.authentication ?? false,
-            dlp: props?.dlp ?? undefined,
-            isDefault: props?.isDefault ?? false,
-            logManagement: props?.logManagement ?? 100_000,
-            logManagementStrategy:
-              props?.logManagementStrategy ?? "STOP_INSERTING",
-            logpush: props?.logpush ?? false,
-            logpushPublicKey: props?.logpushPublicKey ?? undefined,
-            otel: props?.otel ?? undefined,
-            storeId: props?.storeId ?? "",
-            stripe: props?.stripe ?? undefined,
-            zdr: props?.zdr ?? false,
-          };
-        });
+      const oldMutable = mutable(
+        output ?? ((yield* desired(id, olds)) as AiGateway["Attributes"]),
+      );
+      const nextMutable = mutable(next as AiGateway["Attributes"]);
+      if (!deepEqual(oldMutable, nextMutable)) {
+        return { action: "update" } as const;
+      }
+    }),
+    reconcile: Effect.fn(function* ({ id, news = {}, output }) {
+      const { accountId } = yield* yield* CloudflareEnvironment;
 
-      const mapGateway = (
-        gateway:
-          | aiGateway.GetAiGatewayResponse
-          | aiGateway.CreateAiGatewayResponse
-          | aiGateway.UpdateAiGatewayResponse,
-        accountId: string,
-      ): AiGateway["Attributes"] => ({
-        gatewayId: gateway.id,
-        accountId,
-        // accountTag: gateway.accountTag ?? undefined,
-        // internalId: gateway.internalId ?? undefined,
-        cacheInvalidateOnUpdate: gateway.cacheInvalidateOnUpdate,
-        cacheTtl: nullIfZero(gateway.cacheTtl),
-        collectLogs: gateway.collectLogs,
-        createdAt: gateway.createdAt,
-        modifiedAt: gateway.modifiedAt,
-        rateLimitingInterval: nullIfZero(gateway.rateLimitingInterval),
-        rateLimitingLimit: nullIfZero(gateway.rateLimitingLimit),
-        rateLimitingTechnique: gateway.rateLimitingTechnique ?? "fixed",
-        authentication: gateway.authentication ?? false,
-        // Distilled widened generated string enums to open unions (`string & {}`).
-        dlp: (gateway.dlp ?? undefined) as AiGatewayDlp | undefined,
-        isDefault: gateway.isDefault ?? false,
-        logManagement: gateway.logManagement ?? 100_000,
-        logManagementStrategy:
-          gateway.logManagementStrategy ?? "STOP_INSERTING",
-        logpush: gateway.logpush ?? false,
-        logpushPublicKey: gateway.logpushPublicKey ?? undefined,
-        otel: gateway.otel ?? undefined,
-        storeId: gateway.storeId ?? "",
-        stripe: gateway.stripe ?? undefined,
-        zdr: gateway.zdr ?? false,
-      });
+      const acct = output?.accountId ?? accountId;
+      const gatewayId =
+        output?.gatewayId ?? (yield* createGatewayId(id, news.id));
 
-      const mutable = (gateway: AiGateway["Attributes"]) => ({
-        cacheInvalidateOnUpdate: gateway.cacheInvalidateOnUpdate,
-        cacheTtl: gateway.cacheTtl,
-        collectLogs: gateway.collectLogs,
-        rateLimitingInterval: gateway.rateLimitingInterval,
-        rateLimitingLimit: gateway.rateLimitingLimit,
-        rateLimitingTechnique: gateway.rateLimitingTechnique,
-        authentication: gateway.authentication,
-        dlp: gateway.dlp,
-        isDefault: gateway.isDefault,
-        logManagement: gateway.logManagement,
-        logManagementStrategy: gateway.logManagementStrategy,
-        logpush: gateway.logpush,
-        logpushPublicKey: gateway.logpushPublicKey,
-        otel: gateway.otel,
-        storeId: gateway.storeId,
-        stripe: gateway.stripe,
-        zdr: gateway.zdr,
-      });
+      // Observe — fetch the gateway's current state. The Cloudflare API
+      // returns 404 when the gateway is missing, which we tolerate so the
+      // reconciler can fall through to create.
+      const observed = yield* aiGateway
+        .getAiGateway({
+          accountId: acct,
+          id: gatewayId,
+        })
+        .pipe(
+          Effect.catchTag("GatewayNotFound", () => Effect.succeed(undefined)),
+        );
 
-      const createRequest = Effect.fn(function* (
-        id: string,
-        props: AiGatewayProps | undefined,
-      ) {
-        const next = yield* desired(id, props);
-        return {
-          accountId,
-          id: next.gatewayId,
-          cacheInvalidateOnUpdate: next.cacheInvalidateOnUpdate,
-          cacheTtl: next.cacheTtl,
-          collectLogs: next.collectLogs,
-          rateLimitingInterval: next.rateLimitingInterval,
-          rateLimitingLimit: next.rateLimitingLimit,
-          rateLimitingTechnique: next.rateLimitingTechnique,
-          authentication: next.authentication,
-          logManagement: next.logManagement,
-          logManagementStrategy: next.logManagementStrategy,
-          logpush: next.logpush,
-          logpushPublicKey: next.logpushPublicKey,
-          zdr: next.zdr,
-        } satisfies aiGateway.CreateAiGatewayRequest;
-      });
+      // Ensure — create if missing. Tolerate `GatewayAlreadyExists` for
+      // idempotency: a peer reconciler may have created it concurrently,
+      // or state persistence may have failed after a previous create.
+      if (observed === undefined) {
+        const request = yield* createRequest(id, news);
+        yield* aiGateway
+          .createAiGateway(request)
+          .pipe(
+            Effect.catchTag("GatewayAlreadyExists", () =>
+              aiGateway.getAiGateway({ accountId: acct, id: request.id }),
+            ),
+          );
+      }
 
-      const updateRequest = Effect.fn(function* (
-        id: string,
-        props: AiGatewayProps | undefined,
-        accountId: string,
-      ) {
-        const next = yield* desired(id, props);
-        return {
-          accountId,
-          id: next.gatewayId,
-          cacheInvalidateOnUpdate: next.cacheInvalidateOnUpdate,
-          cacheTtl: next.cacheTtl,
-          collectLogs: next.collectLogs,
-          rateLimitingInterval: next.rateLimitingInterval,
-          rateLimitingLimit: next.rateLimitingLimit,
-          rateLimitingTechnique: next.rateLimitingTechnique,
-          authentication: next.authentication,
-          dlp: next.dlp,
-          logManagement: next.logManagement,
-          logManagementStrategy: next.logManagementStrategy,
-          logpush: next.logpush,
-          logpushPublicKey: next.logpushPublicKey,
-          otel: next.otel,
-          storeId: next.storeId,
-          stripe: next.stripe,
-          zdr: next.zdr,
-        } satisfies aiGateway.UpdateAiGatewayRequest;
-      });
+      // Sync — the Cloudflare AI Gateway update API is a full PATCH that
+      // overwrites all mutable fields. We always apply the desired shape
+      // so adoption, drift, and routine updates all converge.
+      const update = yield* updateRequest(id, news, acct);
+      const gateway = yield* aiGateway.updateAiGateway(update);
+      return mapGateway(gateway, acct);
+    }),
+    delete: Effect.fn(function* ({ output }) {
+      yield* aiGateway
+        .deleteAiGateway({
+          accountId: output.accountId,
+          id: output.gatewayId,
+        })
+        .pipe(Effect.catchTag("GatewayNotFound", () => Effect.void));
+    }),
+    read: Effect.fn(function* ({ id, olds, output }) {
+      const { accountId } = yield* yield* CloudflareEnvironment;
 
-      return {
-        stables: ["gatewayId", "accountId"],
-        diff: Effect.fn(function* ({ id, olds = {}, news = {}, output }) {
-          if (!isResolved(news)) return undefined;
-          const next = yield* desired(id, news);
-          const oldGatewayId =
-            output?.gatewayId ?? (yield* createGatewayId(id, olds.id));
-          if (
-            (output?.accountId ?? accountId) !== accountId ||
-            oldGatewayId !== next.gatewayId
-          ) {
-            return { action: "replace" } as const;
-          }
+      const gatewayId =
+        output?.gatewayId ?? (yield* createGatewayId(id, olds?.id));
+      const acct = output?.accountId ?? accountId;
+      return yield* aiGateway
+        .getAiGateway({
+          accountId: acct,
+          id: gatewayId,
+        })
+        .pipe(
+          Effect.map((gateway) => mapGateway(gateway, acct)),
+          Effect.catchTag("GatewayNotFound", () => Effect.succeed(undefined)),
+        );
+    }),
+  });
 
-          const oldMutable = mutable(
-            output ?? ((yield* desired(id, olds)) as AiGateway["Attributes"]),
-          );
-          const nextMutable = mutable(next as AiGateway["Attributes"]);
-          if (!deepEqual(oldMutable, nextMutable)) {
-            return { action: "update" } as const;
-          }
-        }),
-        reconcile: Effect.fn(function* ({ id, news = {}, output }) {
-          const acct = output?.accountId ?? accountId;
-          const gatewayId =
-            output?.gatewayId ?? (yield* createGatewayId(id, news.id));
+const createGatewayId = (id: string, gatewayId: string | undefined) =>
+  Effect.gen(function* () {
+    if (gatewayId) return gatewayId;
+    return yield* createPhysicalName({
+      id,
+      maxLength: 64,
+      lowercase: true,
+    });
+  });
+const desired = (id: string, props: AiGatewayProps | undefined) =>
+  Effect.gen(function* () {
+    return {
+      gatewayId: yield* createGatewayId(id, props?.id),
+      cacheInvalidateOnUpdate: props?.cacheInvalidateOnUpdate ?? false,
+      cacheTtl: props?.cacheTtl ?? null,
+      collectLogs: props?.collectLogs ?? true,
+      rateLimitingInterval: props?.rateLimitingInterval ?? null,
+      rateLimitingLimit: props?.rateLimitingLimit ?? null,
+      rateLimitingTechnique: props?.rateLimitingTechnique ?? "fixed",
+      // Defaults align with what Cloudflare's API returns for an
+      // unconfigured gateway, so the reconciler converges to noop
+      // when the user didn't explicitly set the field.
+      authentication: props?.authentication ?? false,
+      dlp: props?.dlp ?? undefined,
+      isDefault: props?.isDefault ?? false,
+      logManagement: props?.logManagement ?? 100_000,
+      logManagementStrategy: props?.logManagementStrategy ?? "STOP_INSERTING",
+      logpush: props?.logpush ?? false,
+      logpushPublicKey: props?.logpushPublicKey ?? undefined,
+      otel: props?.otel ?? undefined,
+      storeId: props?.storeId ?? "",
+      stripe: props?.stripe ?? undefined,
+      zdr: props?.zdr ?? false,
+    };
+  });
 
-          // Observe — fetch the gateway's current state. The Cloudflare API
-          // returns 404 when the gateway is missing, which we tolerate so the
-          // reconciler can fall through to create.
-          const observed = yield* getAiGateway({
-            accountId: acct,
-            id: gatewayId,
-          }).pipe(
-            Effect.catchTag("GatewayNotFound", () => Effect.succeed(undefined)),
-          );
+const mapGateway = (
+  gateway:
+    | aiGateway.GetAiGatewayResponse
+    | aiGateway.CreateAiGatewayResponse
+    | aiGateway.UpdateAiGatewayResponse,
+  accountId: string,
+): AiGateway["Attributes"] => ({
+  gatewayId: gateway.id,
+  accountId,
+  // accountTag: gateway.accountTag ?? undefined,
+  // internalId: gateway.internalId ?? undefined,
+  cacheInvalidateOnUpdate: gateway.cacheInvalidateOnUpdate,
+  cacheTtl: nullIfZero(gateway.cacheTtl),
+  collectLogs: gateway.collectLogs,
+  createdAt: gateway.createdAt,
+  modifiedAt: gateway.modifiedAt,
+  rateLimitingInterval: nullIfZero(gateway.rateLimitingInterval),
+  rateLimitingLimit: nullIfZero(gateway.rateLimitingLimit),
+  rateLimitingTechnique: gateway.rateLimitingTechnique ?? "fixed",
+  authentication: gateway.authentication ?? false,
+  // Distilled widened generated string enums to open unions (`string & {}`).
+  dlp: (gateway.dlp ?? undefined) as AiGatewayDlp | undefined,
+  isDefault: gateway.isDefault ?? false,
+  logManagement: gateway.logManagement ?? 100_000,
+  logManagementStrategy: gateway.logManagementStrategy ?? "STOP_INSERTING",
+  logpush: gateway.logpush ?? false,
+  logpushPublicKey: gateway.logpushPublicKey ?? undefined,
+  otel: gateway.otel ?? undefined,
+  storeId: gateway.storeId ?? "",
+  stripe: gateway.stripe ?? undefined,
+  zdr: gateway.zdr ?? false,
+});
 
-          // Ensure — create if missing. Tolerate `GatewayAlreadyExists` for
-          // idempotency: a peer reconciler may have created it concurrently,
-          // or state persistence may have failed after a previous create.
-          if (observed === undefined) {
-            const request = yield* createRequest(id, news);
-            yield* createAiGateway(request).pipe(
-              Effect.catchTag("GatewayAlreadyExists", () =>
-                getAiGateway({ accountId: acct, id: request.id }),
-              ),
-            );
-          }
+const mutable = (gateway: AiGateway["Attributes"]) => ({
+  cacheInvalidateOnUpdate: gateway.cacheInvalidateOnUpdate,
+  cacheTtl: gateway.cacheTtl,
+  collectLogs: gateway.collectLogs,
+  rateLimitingInterval: gateway.rateLimitingInterval,
+  rateLimitingLimit: gateway.rateLimitingLimit,
+  rateLimitingTechnique: gateway.rateLimitingTechnique,
+  authentication: gateway.authentication,
+  dlp: gateway.dlp,
+  isDefault: gateway.isDefault,
+  logManagement: gateway.logManagement,
+  logManagementStrategy: gateway.logManagementStrategy,
+  logpush: gateway.logpush,
+  logpushPublicKey: gateway.logpushPublicKey,
+  otel: gateway.otel,
+  storeId: gateway.storeId,
+  stripe: gateway.stripe,
+  zdr: gateway.zdr,
+});
+const createRequest = Effect.fn(function* (
+  id: string,
+  props: AiGatewayProps | undefined,
+) {
+  const next = yield* desired(id, props);
+  const { accountId } = yield* yield* CloudflareEnvironment;
 
-          // Sync — the Cloudflare AI Gateway update API is a full PATCH that
-          // overwrites all mutable fields. We always apply the desired shape
-          // so adoption, drift, and routine updates all converge.
-          const update = yield* updateRequest(id, news, acct);
-          const gateway = yield* updateAiGateway(update);
-          return mapGateway(gateway, acct);
-        }),
-        delete: Effect.fn(function* ({ output }) {
-          yield* deleteAiGateway({
-            accountId: output.accountId,
-            id: output.gatewayId,
-          }).pipe(Effect.catchTag("GatewayNotFound", () => Effect.void));
-        }),
-        read: Effect.fn(function* ({ id, olds, output }) {
-          const gatewayId =
-            output?.gatewayId ?? (yield* createGatewayId(id, olds?.id));
-          const acct = output?.accountId ?? accountId;
-          return yield* getAiGateway({
-            accountId: acct,
-            id: gatewayId,
-          }).pipe(
-            Effect.map((gateway) => mapGateway(gateway, acct)),
-            Effect.catchTag("GatewayNotFound", () => Effect.succeed(undefined)),
-          );
-        }),
-      };
-    }),
-  );
+  return {
+    accountId,
+    id: next.gatewayId,
+    cacheInvalidateOnUpdate: next.cacheInvalidateOnUpdate,
+    cacheTtl: next.cacheTtl,
+    collectLogs: next.collectLogs,
+    rateLimitingInterval: next.rateLimitingInterval,
+    rateLimitingLimit: next.rateLimitingLimit,
+    rateLimitingTechnique: next.rateLimitingTechnique,
+    authentication: next.authentication,
+    logManagement: next.logManagement,
+    logManagementStrategy: next.logManagementStrategy,
+    logpush: next.logpush,
+    logpushPublicKey: next.logpushPublicKey,
+    zdr: next.zdr,
+  } satisfies aiGateway.CreateAiGatewayRequest;
+});
+
+const updateRequest = Effect.fn(function* (
+  id: string,
+  props: AiGatewayProps | undefined,
+  accountId: string,
+) {
+  const next = yield* desired(id, props);
+  return {
+    accountId,
+    id: next.gatewayId,
+    cacheInvalidateOnUpdate: next.cacheInvalidateOnUpdate,
+    cacheTtl: next.cacheTtl,
+    collectLogs: next.collectLogs,
+    rateLimitingInterval: next.rateLimitingInterval,
+    rateLimitingLimit: next.rateLimitingLimit,
+    rateLimitingTechnique: next.rateLimitingTechnique,
+    authentication: next.authentication,
+    dlp: next.dlp,
+    logManagement: next.logManagement,
+    logManagementStrategy: next.logManagementStrategy,
+    logpush: next.logpush,
+    logpushPublicKey: next.logpushPublicKey,
+    otel: next.otel,
+    storeId: next.storeId,
+    stripe: next.stripe,
+    zdr: next.zdr,
+  } satisfies aiGateway.UpdateAiGatewayRequest;
+});