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

package/src/Cloudflare/Workers/WorkerAsyncBindings.ts

@@ -1,12 +1,10 @@
 import type { PutScriptRequest } from "@distilled.cloud/cloudflare/workers";
-import * as Config from "effect/Config";
 import * as Effect from "effect/Effect";
 import * as Redacted from "effect/Redacted";
 import type { InputProps } from "../../Input.ts";
 import * as Output from "../../Output.ts";
 import type { ResourceBinding } from "../../Resource.ts";
 import { isYieldableEffectLike } from "../../Util/effect.ts";
-import { asEffect } from "../../Util/types.ts";
 import { isAiGateway } from "../AiGateway/AiGateway.ts";
 import { isAnalyticsEngineDataset } from "../AnalyticsEngine/AnalyticsEngineDataset.ts";
 import { isArtifacts } from "../Artifacts/Artifacts.ts";
@@ -51,8 +49,10 @@ export const bindWorkerAsyncBindings = Effect.fnUntraced(function* (
           : bindingEff
       ) as WorkerBindingResource;
 
-      const bindingMeta: InputProps<WorkerBinding> | undefined =
-        yield* asEffect(toBinding(bindingName, binding));
+      const bindingMeta: InputProps<WorkerBinding> | undefined = toBinding(
+        bindingName,
+        binding,
+      );
 
       if (bindingMeta) {
         yield* resource.bind`${bindingName}`({
@@ -75,20 +75,14 @@ type BindingSpec = InputProps<
 const toBinding = (
   bindingName: string,
   binding: WorkerBindingResource,
-): BindingSpec | Effect.Effect<BindingSpec> | undefined => {
-  // narrowing to Config<unknown> doesn't work for us, we need any
-  const isConfig: (a: any) => a is Config.Config<any> = Config.isConfig;
-  // narrowing to Redacted<unknown> doesn't work for us, we need any
-  const isRedacted: (a: any) => a is Redacted.Redacted<any> =
-    Redacted.isRedacted;
-
+): BindingSpec => {
   if (typeof binding === "string") {
     return {
       type: "plain_text",
       name: bindingName,
       text: binding,
     };
-  } else if (isRedacted(binding)) {
+  } else if (Redacted.isRedacted(binding)) {
     const val = Redacted.value(binding);
     if (typeof val === "string") {
       return {
@@ -103,14 +97,6 @@ const toBinding = (
         text: JSON.stringify(val),
       };
     }
-  } else if (isConfig(binding)) {
-    return binding.pipe(
-      Effect.flatMap((json) => {
-        const b = toBinding(bindingName, json)!;
-        return Effect.isEffect(b) ? b : Effect.succeed(b);
-      }),
-      Effect.orDie,
-    );
   } else if (isAssets(binding)) {
     return {
       type: "assets",
@@ -228,7 +214,7 @@ const toBinding = (
     return {
       type: "worker_loader",
       name: bindingName,
-    } as any;
+    };
   } else {
     return {
       type: "json",

package/src/Cloudflare/Workers/Workflow.ts

@@ -491,9 +491,6 @@ export const WorkflowProvider = () =>
     WorkflowResource,
     Effect.gen(function* () {
       const ctx = yield* AlchemyContext;
-      const { accountId } = yield* CloudflareEnvironment;
-      const putWorkflow = yield* workflows.putWorkflow;
-      const deleteWorkflow = yield* workflows.deleteWorkflow;
 
       return WorkflowResource.Provider.of({
         // The `workflowId` is no longer marked as stable because if you start in dev mode, the ID will change on first deploy.
@@ -505,6 +502,7 @@ export const WorkflowProvider = () =>
           }
         }),
         reconcile: Effect.fnUntraced(function* ({ news, output }) {
+          const { accountId } = yield* yield* CloudflareEnvironment;
           const acct = output?.accountId ?? accountId;
           yield* Effect.logInfo(
             `Cloudflare Workflow reconcile: ${news.workflowName}`,
@@ -522,7 +520,7 @@ export const WorkflowProvider = () =>
           // payloads converge to the same state and a missing workflow is
           // created on the spot. There is no separate observe step needed
           // — the API is naturally reconciler-shaped.
-          const result = yield* putWorkflow({
+          const result = yield* workflows.putWorkflow({
             accountId: acct,
             workflowName: news.workflowName,
             className: news.className,
@@ -540,10 +538,12 @@ export const WorkflowProvider = () =>
           yield* Effect.logInfo(
             `Cloudflare Workflow delete: ${output.workflowName}`,
           );
-          yield* deleteWorkflow({
-            accountId: output.accountId,
-            workflowName: output.workflowName,
-          }).pipe(Effect.catchTag("WorkflowNotFound", () => Effect.void));
+          yield* workflows
+            .deleteWorkflow({
+              accountId: output.accountId,
+              workflowName: output.workflowName,
+            })
+            .pipe(Effect.catchTag("WorkflowNotFound", () => Effect.void));
         }),
       });
     }),

package/src/Cloudflare/Zaraz/ZarazConfig.ts

@@ -194,6 +194,93 @@ export const ZarazConfig = Object.assign(
   },
 );
 
+export const ZarazConfigProvider = () =>
+  Provider.succeed(ZarazConfig, {
+    stables: ["zoneId"],
+    diff: Effect.fn(function* ({ olds, news, output }) {
+      if (!output) return undefined;
+      if (!isResolved(news)) return undefined;
+
+      const zoneId = yield* resolve(news.zone);
+      if (zoneId !== output.zoneId) {
+        return { action: "replace" } as const;
+      }
+
+      const outputConfig = fromAttributes(output);
+      const comparableOutput = configForCompare(outputConfig, olds, news);
+      const desired = desiredConfig(outputConfig, news);
+      const desiredWorkflow = news.workflow ?? output.workflow;
+      if (
+        desiredWorkflow !== output.workflow ||
+        !deepEqual(
+          comparableConfig(comparableOutput),
+          comparableConfig(desired),
+        )
+      ) {
+        return { action: "update" } as const;
+      }
+    }),
+    read: Effect.fn(function* ({ olds, output }) {
+      const zoneId =
+        output?.zoneId ?? (olds ? yield* resolve(olds.zone) : undefined);
+      if (!zoneId) return undefined;
+      return yield* observe(zoneId);
+    }),
+    reconcile: Effect.fn(function* ({ news, output }) {
+      const zoneId = output?.zoneId ?? (yield* resolve(news.zone));
+      const observed = yield* observe(zoneId);
+      const observedConfig = fromAttributes(observed);
+      const desired = desiredConfig(observedConfig, news);
+      const desiredWorkflow = news.workflow ?? observed.workflow;
+
+      const updatedConfig = deepEqual(
+        comparableConfig(observedConfig),
+        comparableConfig(desired),
+      )
+        ? observedConfig
+        : yield* zaraz.putConfig(toPutConfig(zoneId, desired));
+      const updatedWorkflow =
+        desiredWorkflow === observed.workflow
+          ? observed.workflow
+          : yield* zaraz.putZaraz({
+              zoneId,
+              workflow: desiredWorkflow,
+            });
+
+      return toAttributes(zoneId, updatedConfig, updatedWorkflow);
+    }),
+    delete: Effect.fn(function* ({ output, olds }) {
+      if (olds.delete !== true) return;
+      const defaults = yield* zaraz.getDefault({ zoneId: output.zoneId });
+      yield* zaraz.putConfig(toPutConfig(output.zoneId, defaults));
+      if (olds.workflow !== undefined) {
+        yield* zaraz.putZaraz({
+          zoneId: output.zoneId,
+          workflow: "realtime",
+        });
+      }
+    }),
+  });
+
+const resolve = Effect.fnUntraced(function* (zone: ZoneReference) {
+  const { accountId } = yield* yield* CloudflareEnvironment;
+  return yield* resolveZoneId({
+    accountId,
+    zone,
+    hostname: typeof zone === "string" ? zone : (zone.name ?? ""),
+  });
+});
+
+const observe = (zoneId: string) =>
+  Effect.all({
+    config: zaraz.getConfig({ zoneId }),
+    workflow: zaraz.getWorkflow({ zoneId }),
+  }).pipe(
+    Effect.map(({ config, workflow }) =>
+      toAttributes(zoneId, config, workflow),
+    ),
+  );
+
 type ConfigResponse =
   | zaraz.GetConfigResponse
   | zaraz.PutConfigResponse
@@ -302,102 +389,3 @@ const configForCompare = (
     variables: props.variables,
   };
 };
-
-export const ZarazConfigProvider = () =>
-  Provider.effect(
-    ZarazConfig,
-    Effect.gen(function* () {
-      const { accountId } = yield* CloudflareEnvironment;
-      const getConfig = yield* zaraz.getConfig;
-      const putConfig = yield* zaraz.putConfig;
-      const getDefault = yield* zaraz.getDefault;
-      const getWorkflow = yield* zaraz.getWorkflow;
-      // Cloudflare's OpenAPI operation name is `putZaraz`, but the endpoint
-      // updates the zone's Zaraz workflow mode.
-      const putWorkflow = yield* zaraz.putZaraz;
-
-      const resolve = (zone: ZoneReference) =>
-        resolveZoneId({
-          accountId,
-          zone,
-          hostname: typeof zone === "string" ? zone : (zone.name ?? ""),
-        });
-
-      const observe = (zoneId: string) =>
-        Effect.all({
-          config: getConfig({ zoneId }),
-          workflow: getWorkflow({ zoneId }),
-        }).pipe(
-          Effect.map(({ config, workflow }) =>
-            toAttributes(zoneId, config, workflow),
-          ),
-        );
-
-      return {
-        stables: ["zoneId"],
-        diff: Effect.fn(function* ({ olds, news, output }) {
-          if (!output) return undefined;
-          if (!isResolved(news)) return undefined;
-
-          const zoneId = yield* resolve(news.zone);
-          if (zoneId !== output.zoneId) {
-            return { action: "replace" } as const;
-          }
-
-          const outputConfig = fromAttributes(output);
-          const comparableOutput = configForCompare(outputConfig, olds, news);
-          const desired = desiredConfig(outputConfig, news);
-          const desiredWorkflow = news.workflow ?? output.workflow;
-          if (
-            desiredWorkflow !== output.workflow ||
-            !deepEqual(
-              comparableConfig(comparableOutput),
-              comparableConfig(desired),
-            )
-          ) {
-            return { action: "update" } as const;
-          }
-        }),
-        read: Effect.fn(function* ({ olds, output }) {
-          const zoneId =
-            output?.zoneId ?? (olds ? yield* resolve(olds.zone) : undefined);
-          if (!zoneId) return undefined;
-          return yield* observe(zoneId);
-        }),
-        reconcile: Effect.fn(function* ({ news, output }) {
-          const zoneId = output?.zoneId ?? (yield* resolve(news.zone));
-          const observed = yield* observe(zoneId);
-          const observedConfig = fromAttributes(observed);
-          const desired = desiredConfig(observedConfig, news);
-          const desiredWorkflow = news.workflow ?? observed.workflow;
-
-          const updatedConfig = deepEqual(
-            comparableConfig(observedConfig),
-            comparableConfig(desired),
-          )
-            ? observedConfig
-            : yield* putConfig(toPutConfig(zoneId, desired));
-          const updatedWorkflow =
-            desiredWorkflow === observed.workflow
-              ? observed.workflow
-              : yield* putWorkflow({
-                  zoneId,
-                  workflow: desiredWorkflow,
-                });
-
-          return toAttributes(zoneId, updatedConfig, updatedWorkflow);
-        }),
-        delete: Effect.fn(function* ({ output, olds }) {
-          if (olds.delete !== true) return;
-          const defaults = yield* getDefault({ zoneId: output.zoneId });
-          yield* putConfig(toPutConfig(output.zoneId, defaults));
-          if (olds.workflow !== undefined) {
-            yield* putWorkflow({
-              zoneId: output.zoneId,
-              workflow: "realtime",
-            });
-          }
-        }),
-      };
-    }),
-  );

package/src/Cloudflare/Zone/Zone.ts

@@ -193,11 +193,10 @@ export const ZoneProvider = () =>
   Provider.effect(
     Zone,
     Effect.gen(function* () {
-      const { accountId } = yield* CloudflareEnvironment;
-      const get = yield* zones.getZone;
-      const create = yield* zones.createZone;
-      const patch = yield* zones.patchZone;
-      const del = yield* zones.deleteZone;
+      // const get = yield* zones.getZone;
+      // const create = yield* zones.createZone;
+      // const patch = yield* zones.patchZone;
+      // const del = yield* zones.deleteZone;
 
       return {
         stables: ["name", "zoneId", "accountId"],
@@ -220,12 +219,13 @@ export const ZoneProvider = () =>
           return undefined;
         }),
         read: Effect.fn(function* ({ output, olds }) {
+          const { accountId } = yield* yield* CloudflareEnvironment;
           const name = output?.name ?? olds?.name;
           // Owned path: we have persisted state (our own zoneId) — refresh it.
           if (output?.zoneId) {
-            const result = yield* get({ zoneId: output.zoneId }).pipe(
-              Effect.catch(() => Effect.succeed(undefined)),
-            );
+            const result = yield* zones
+              .getZone({ zoneId: output.zoneId })
+              .pipe(Effect.catch(() => Effect.succeed(undefined)));
             if (result) return toZoneAttributes(result, accountId);
           }
           // Adoption path: no state of our own, but a zone with this name
@@ -236,12 +236,13 @@ export const ZoneProvider = () =>
           if (name) {
             const match = yield* findZoneByName({ accountId, name });
             if (!match) return undefined;
-            const result = yield* get({ zoneId: match.id });
+            const result = yield* zones.getZone({ zoneId: match.id });
             return Unowned(toZoneAttributes(result, accountId));
           }
           return undefined;
         }),
         reconcile: Effect.fn(function* ({ news, output }) {
+          const { accountId } = yield* yield* CloudflareEnvironment;
           // 1. Observe — do we have a live zone for this name?
           let zoneId = output?.zoneId;
           if (!zoneId) {
@@ -254,33 +255,35 @@ export const ZoneProvider = () =>
 
           // 2. Ensure — create if missing.
           if (!zoneId) {
-            zoneId = yield* create({
-              account: { id: accountId },
-              name: news.name,
-              type: news.type ?? "full",
-            }).pipe(
-              Effect.map((created) => created.id),
-              // A concurrent deploy (or a prior crashed run) may have created
-              // the zone between our observe and create — recover by resolving
-              // its id rather than failing the reconcile.
-              Effect.catchTag("ZoneAlreadyExists", () =>
-                findZoneByName({ accountId, name: news.name }).pipe(
-                  Effect.flatMap((match) =>
-                    match
-                      ? Effect.succeed(match.id)
-                      : Effect.fail(
-                          new Error(
-                            `Cloudflare reported zone ${news.name} already exists but it could not be found`,
+            zoneId = yield* zones
+              .createZone({
+                account: { id: accountId },
+                name: news.name,
+                type: news.type ?? "full",
+              })
+              .pipe(
+                Effect.map((created) => created.id),
+                // A concurrent deploy (or a prior crashed run) may have created
+                // the zone between our observe and create — recover by resolving
+                // its id rather than failing the reconcile.
+                Effect.catchTag("ZoneAlreadyExists", () =>
+                  findZoneByName({ accountId, name: news.name }).pipe(
+                    Effect.flatMap((match) =>
+                      match
+                        ? Effect.succeed(match.id)
+                        : Effect.fail(
+                            new Error(
+                              `Cloudflare reported zone ${news.name} already exists but it could not be found`,
+                            ),
                           ),
-                        ),
+                    ),
                   ),
                 ),
-              ),
-            );
+              );
           }
 
           // 3. Sync — apply mutable settings (type/paused/vanity NS).
-          const observed = yield* get({ zoneId });
+          const observed = yield* zones.getZone({ zoneId });
           const desiredType = news.type ?? "full";
           const desiredPaused = news.paused ?? false;
           const desiredVanity = news.vanityNameServers ?? [];
@@ -290,7 +293,7 @@ export const ZoneProvider = () =>
             !stringArrayEq(observed.vanityNameServers ?? [], desiredVanity);
 
           if (needsPatch) {
-            yield* patch({
+            yield* zones.patchZone({
               zoneId,
               type: desiredType,
               paused: desiredPaused,
@@ -298,12 +301,12 @@ export const ZoneProvider = () =>
             });
           }
 
-          const final = yield* get({ zoneId });
+          const final = yield* zones.getZone({ zoneId });
           return toZoneAttributes(final, accountId);
         }),
         delete: Effect.fn(function* ({ output }) {
           if (!output.zoneId) return;
-          yield* del({ zoneId: output.zoneId }).pipe(
+          yield* zones.deleteZone({ zoneId: output.zoneId }).pipe(
             // Zone already gone — idempotent delete.
             Effect.catchTag("InvalidZoneIdentifier", () => Effect.void),
           );

package/src/GitHub/Comment.ts

@@ -1,8 +1,8 @@
-import { Octokit } from "@octokit/rest";
 import * as Effect from "effect/Effect";
 import * as Provider from "../Provider.ts";
 import { Resource } from "../Resource.ts";
 import { dedent } from "../Util/dedent.ts";
+import { Octokit } from "./Octokit.ts";
 import * as GitHub from "./Providers.ts";
 
 export interface CommentProps {
@@ -37,12 +37,6 @@ export interface CommentProps {
    * @default false
    */
   allowDelete?: boolean;
-
-  /**
-   * GitHub API token. If not provided, falls back to
-   * `GITHUB_ACCESS_TOKEN` or `GITHUB_TOKEN` environment variables.
-   */
-  token?: string;
 }
 
 export interface Comment extends Resource<
@@ -149,22 +143,11 @@ export interface Comment extends Resource<
  */
 export const Comment = Resource<Comment>("GitHub.Comment");
 
-function resolveToken(props: CommentProps): string | undefined {
-  return (
-    props.token ?? process.env.GITHUB_ACCESS_TOKEN ?? process.env.GITHUB_TOKEN
-  );
-}
-
-function createClient(props: CommentProps): Octokit {
-  return new Octokit({ auth: resolveToken(props) });
-}
-
 export const CommentProvider = () =>
   Provider.succeed(Comment, {
     stables: ["commentId"],
-
     reconcile: Effect.fn(function* ({ news, output }) {
-      const octokit = createClient(news);
+      const octokit = yield* Octokit;
       const body = dedent(news.body);
 
       // Observe — GitHub assigns `comment_id` server-side. Probe for live
@@ -230,7 +213,7 @@ export const CommentProvider = () =>
         return;
       }
 
-      const octokit = createClient(olds);
+      const octokit = yield* Octokit;
 
       yield* Effect.tryPromise(async () => {
         try {

package/src/GitHub/Credentials.ts

@@ -5,7 +5,7 @@ import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Redacted from "effect/Redacted";
 import { AuthError, getAuthProvider } from "../Auth/AuthProvider.ts";
-import { ALCHEMY_PROFILE, Profile } from "../Auth/Profile.ts";
+import { ALCHEMY_PROFILE, AlchemyProfile } from "../Auth/Profile.ts";
 import {
   GITHUB_AUTH_PROVIDER_NAME,
   type GitHubAuthConfig,
@@ -19,7 +19,7 @@ export interface GitHubCredentialsService {
 
 export class GitHubCredentials extends Context.Service<
   GitHubCredentials,
-  GitHubCredentialsService
+  Effect.Effect<GitHubCredentialsService>
 >()("GitHub::Credentials") {}
 
 const make = (token: Redacted.Redacted<string>): GitHubCredentialsService => ({
@@ -34,7 +34,9 @@ const make = (token: Redacted.Redacted<string>): GitHubCredentialsService => ({
 export const fromToken = (token: string | Redacted.Redacted<string>) =>
   Layer.succeed(
     GitHubCredentials,
-    make(typeof token === "string" ? Redacted.make(token) : token),
+    Effect.succeed(
+      make(typeof token === "string" ? Redacted.make(token) : token),
+    ),
   );
 
 /**
@@ -42,7 +44,7 @@ export const fromToken = (token: string | Redacted.Redacted<string>) =>
  * `GITHUB_ACCESS_TOKEN` or `GITHUB_TOKEN` at layer build time.
  */
 export const fromEnv = () =>
-  Layer.effect(
+  Layer.succeed(
     GitHubCredentials,
     Effect.gen(function* () {
       const access = yield* Config.redacted("GITHUB_ACCESS_TOKEN").pipe(
@@ -74,7 +76,7 @@ export const fromAuthProvider = () =>
   Layer.effect(
     GitHubCredentials,
     Effect.gen(function* () {
-      const profile = yield* Profile;
+      const profile = yield* AlchemyProfile;
       const auth = yield* getAuthProvider<
         GitHubAuthConfig,
         GitHubResolvedCredentials
@@ -93,6 +95,8 @@ export const fromAuthProvider = () =>
               message: `Failed to resolve GitHub credentials for profile '${profileName}': ${(e as { message?: string }).message ?? String(e)}`,
             }),
         ),
+        Effect.orDie,
+        Effect.cached,
       );
     }).pipe(Effect.orDie),
   );

package/src/GitHub/Octokit.ts

@@ -0,0 +1,9 @@
+import type { Octokit as _Octokit } from "@octokit/rest";
+import * as Effect from "effect/Effect";
+import { GitHubCredentials } from "./Credentials.ts";
+
+export const Octokit: Effect.Effect<_Octokit, never, GitHubCredentials> =
+  Effect.gen(function* () {
+    const creds = yield* yield* GitHubCredentials;
+    return creds.octokit();
+  });

package/src/GitHub/Secret.ts

@@ -1,9 +1,8 @@
-import type { Octokit } from "@octokit/rest";
 import * as Effect from "effect/Effect";
 import * as Redacted from "effect/Redacted";
 import * as Provider from "../Provider.ts";
 import { Resource } from "../Resource.ts";
-import { GitHubCredentials } from "./Credentials.ts";
+import { Octokit } from "./Octokit.ts";
 import type * as GitHub from "./Providers.ts";
 
 export interface SecretProps {
@@ -129,11 +128,6 @@ export interface Secret extends Resource<
  */
 export const Secret = Resource<Secret>("GitHub.Secret");
 
-const getOctokit = Effect.gen(function* () {
-  const creds = yield* GitHubCredentials;
-  return creds.octokit();
-});
-
 async function encryptValue(
   plaintext: string,
   publicKey: string,
@@ -153,8 +147,6 @@ async function encryptValue(
 export const SecretProvider = () =>
   Provider.succeed(Secret, {
     reconcile: Effect.fn(function* ({ news, olds }) {
-      const octokit = yield* getOctokit;
-
       // Observe — there's no API to read a secret's value back, so we can
       // only observe its location (repo vs. environment, environment name).
       // If the location changed, the previous secret is orphaned: delete
@@ -164,7 +156,7 @@ export const SecretProvider = () =>
         const wasEnv = !!olds.environment;
         const isEnv = !!news.environment;
         if (wasEnv !== isEnv || olds.environment !== news.environment) {
-          yield* deleteSecret(octokit, olds);
+          yield* deleteSecret(olds);
         }
       }
 
@@ -173,20 +165,17 @@ export const SecretProvider = () =>
       // value is encrypted client-side with the repo/environment public
       // key, so we re-encrypt and re-upload on every reconcile (Redacted
       // values can't be diffed across runs anyway).
-      yield* upsertSecret(octokit, news);
+      yield* upsertSecret(news);
       return { updatedAt: new Date().toISOString() };
     }),
 
     delete: Effect.fn(function* ({ olds }) {
-      const octokit = yield* getOctokit;
-      yield* deleteSecret(octokit, olds);
+      yield* deleteSecret(olds);
     }),
   });
 
-const upsertSecret = Effect.fn(function* (
-  octokit: Octokit,
-  props: SecretProps,
-) {
+const upsertSecret = Effect.fn(function* (props: SecretProps) {
+  const octokit = yield* Octokit;
   const plaintext = Redacted.value(props.value);
   const isEnv = !!props.environment;
 
@@ -232,10 +221,8 @@ const upsertSecret = Effect.fn(function* (
   });
 });
 
-const deleteSecret = Effect.fn(function* (
-  octokit: Octokit,
-  props: SecretProps,
-) {
+const deleteSecret = Effect.fn(function* (props: SecretProps) {
+  const octokit = yield* Octokit;
   yield* Effect.tryPromise(async () => {
     try {
       if (props.environment) {

package/src/GitHub/Variable.ts

@@ -1,7 +1,7 @@
 import * as Effect from "effect/Effect";
 import * as Provider from "../Provider.ts";
 import { Resource } from "../Resource.ts";
-import { GitHubCredentials } from "./Credentials.ts";
+import { Octokit } from "./Octokit.ts";
 import type * as GitHub from "./Providers.ts";
 
 export interface VariableProps {
@@ -102,15 +102,10 @@ export interface Variable extends Resource<
  */
 export const Variable = Resource<Variable>("GitHub.Variable");
 
-const getOctokit = Effect.gen(function* () {
-  const creds = yield* GitHubCredentials;
-  return creds.octokit();
-});
-
 export const VariableProvider = () =>
   Provider.succeed(Variable, {
     reconcile: Effect.fn(function* ({ news }) {
-      const octokit = yield* getOctokit;
+      const octokit = yield* Octokit;
 
       // Observe — `name` is the path identifier for repo variables; ask
       // GitHub directly for the live row. A 404 means it doesn't exist
@@ -162,7 +157,7 @@ export const VariableProvider = () =>
     }),
 
     delete: Effect.fn(function* ({ olds }) {
-      const octokit = yield* getOctokit;
+      const octokit = yield* Octokit;
 
       yield* Effect.tryPromise(async () => {
         try {