alchemy 2.0.0-beta.37 → 2.0.0-beta.38

package/src/Cloudflare/Email/SendEmailBinding.ts

@@ -0,0 +1,124 @@
+import type * as runtime from "@cloudflare/workers-types";
+import * as Data from "effect/Data";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Binding from "../../Binding.ts";
+import type { ResourceLike } from "../../Resource.ts";
+import { isWorker, WorkerEnvironment } from "../Workers/Worker.ts";
+import type { SendEmail } from "./SendEmail.ts";
+
+/**
+ * Email body shape for the builder-form `send` call. Either `text`, `html`,
+ * or both must be provided.
+ */
+export interface SendEmailMessage {
+  from: string | runtime.EmailAddress;
+  to: string | string[];
+  subject: string;
+  replyTo?: string | runtime.EmailAddress;
+  cc?: string | string[];
+  bcc?: string | string[];
+  headers?: Record<string, string>;
+  text?: string;
+  html?: string;
+  attachments?: runtime.EmailAttachment[];
+}
+
+export class SendEmailError extends Data.TaggedError("SendEmailError")<{
+  message: string;
+  cause?: unknown;
+}> {}
+
+export interface SendEmailClient {
+  /**
+   * The raw runtime `SendEmail` binding. Use this when you need direct
+   * access to the Cloudflare object (e.g. to send a pre-built
+   * `EmailMessage` from `cloudflare:email`).
+   */
+  raw: Effect.Effect<runtime.SendEmail, never, WorkerEnvironment>;
+  /**
+   * Send an email using the builder form. Equivalent to calling
+   * `env.<name>.send({ from, to, subject, text, html, ... })`.
+   */
+  send(
+    message: SendEmailMessage,
+  ): Effect.Effect<runtime.EmailSendResult, SendEmailError, WorkerEnvironment>;
+  /**
+   * Send a raw `EmailMessage` (constructed via `cloudflare:email`).
+   */
+  sendRaw(
+    message: runtime.EmailMessage,
+  ): Effect.Effect<runtime.EmailSendResult, SendEmailError, WorkerEnvironment>;
+}
+
+/**
+ * A typed runtime accessor for a Cloudflare `send_email` Worker binding.
+ *
+ * @binding
+ */
+export class SendEmailBinding extends Binding.Service<
+  SendEmailBinding,
+  (sender: SendEmail) => Effect.Effect<SendEmailClient>
+>()("Cloudflare.SendEmail.Binding") {}
+
+export const SendEmailBindingLive = Layer.effect(
+  SendEmailBinding,
+  Effect.gen(function* () {
+    const bind = yield* SendEmailBindingPolicy;
+
+    return Effect.fnUntraced(function* (sender: SendEmail) {
+      yield* bind(sender);
+
+      const raw = WorkerEnvironment.useSync(
+        (env) => (env as Record<string, runtime.SendEmail>)[sender.name]!,
+      );
+
+      const tryPromise = <T>(
+        fn: () => Promise<T>,
+      ): Effect.Effect<T, SendEmailError> =>
+        Effect.tryPromise({
+          try: fn,
+          catch: (error: any) =>
+            new SendEmailError({
+              message: error?.message ?? "Unknown send_email error",
+              cause: error,
+            }),
+        });
+
+      return {
+        raw,
+        send: (message: SendEmailMessage) =>
+          raw.pipe(Effect.flatMap((s) => tryPromise(() => s.send(message)))),
+        sendRaw: (message: runtime.EmailMessage) =>
+          raw.pipe(Effect.flatMap((s) => tryPromise(() => s.send(message)))),
+      } satisfies SendEmailClient;
+    });
+  }),
+);
+
+export class SendEmailBindingPolicy extends Binding.Policy<
+  SendEmailBindingPolicy,
+  (sender: SendEmail) => Effect.Effect<void>
+>()("Cloudflare.SendEmail.Binding") {}
+
+export const SendEmailBindingPolicyLive = SendEmailBindingPolicy.layer.succeed(
+  Effect.fnUntraced(function* (host: ResourceLike, sender: SendEmail) {
+    if (isWorker(host)) {
+      yield* host.bind(sender.name, {
+        bindings: [
+          {
+            type: "send_email",
+            name: sender.name,
+            destinationAddress: sender.destinationAddress,
+            allowedDestinationAddresses: sender.allowedDestinationAddresses,
+            allowedSenderAddresses: sender.allowedSenderAddresses,
+          },
+        ],
+      });
+    } else {
+      return yield* Effect.die(
+        new Error(`SendEmailBinding does not support runtime '${host.Type}'`),
+      );
+    }
+  }),
+);

package/src/Cloudflare/Email/index.ts

@@ -0,0 +1,5 @@
+export * from "./EmailAddress.ts";
+export * from "./EmailRouting.ts";
+export * from "./EmailRule.ts";
+export * from "./SendEmail.ts";
+export * from "./SendEmailBinding.ts";

package/src/Cloudflare/Images/ImagesBinding.ts

@@ -87,7 +87,7 @@ export const ImagesBindingLive = Layer.effect(
 
     return Effect.fn(function* (images: ImagesLike) {
       yield* Policy(images);
-      const env = WorkerEnvironment.asEffect();
+      const env = WorkerEnvironment;
       const raw = env.pipe(
         Effect.map(
           (env) => (env as Record<string, cf.ImagesBinding>)[images.name]!,

package/src/Cloudflare/KV/KVNamespaceBinding.ts

@@ -229,7 +229,7 @@ export const KVNamespaceBindingLive = Layer.effect(
 
     return Effect.fn(function* (bucket: KVNamespace) {
       yield* bind(bucket);
-      const env = WorkerEnvironment.asEffect();
+      const env = WorkerEnvironment;
       const raw = env.pipe(
         Effect.map(
           (env) =>

package/src/Cloudflare/Local/SidecarServer.ts

@@ -55,7 +55,7 @@ const services = Layer.provideMerge(
   PlatformServices,
 );
 
-RpcServer.makeRpcServer(Sidecar.asEffect(), SidecarSchema).pipe(
+RpcServer.makeRpcServer(Sidecar, SidecarSchema).pipe(
   Effect.provide(services),
   Effect.scoped,
   runMain,

package/src/Cloudflare/Providers.ts

@@ -21,6 +21,7 @@ import * as CloudflareEnvironment from "./CloudflareEnvironment.ts";
 import * as Containers from "./Container/index.ts";
 import * as Credentials from "./Credentials.ts";
 import * as D1 from "./D1/index.ts";
+import * as Email from "./Email/index.ts";
 import * as Hyperdrive from "./Hyperdrive/index.ts";
 import * as Images from "./Images/index.ts";
 import * as KV from "./KV/index.ts";
@@ -57,6 +58,10 @@ export const providers = () =>
       Containers.Container,
       D1.D1ConnectionPolicy,
       D1.D1Database,
+      Email.EmailAddress,
+      Email.EmailRouting,
+      Email.EmailRule,
+      Email.SendEmailBindingPolicy,
       Hyperdrive.Hyperdrive,
       Hyperdrive.HyperdriveBindingPolicy,
       Images.ImagesBindingPolicy,
@@ -92,6 +97,10 @@ export const providers = () =>
         Containers.ContainerProvider(),
         D1.D1ConnectionPolicyLive,
         D1.DatabaseProvider(),
+        Email.EmailAddressProvider(),
+        Email.EmailRoutingProvider(),
+        Email.EmailRuleProvider(),
+        Email.SendEmailBindingPolicyLive,
         Hyperdrive.HyperdriveBindingPolicyLive,
         Hyperdrive.HyperdriveProvider(),
         Images.ImagesBindingPolicyLive,

package/src/Cloudflare/Queue/QueueBinding.ts

@@ -71,7 +71,7 @@ export const QueueBindingLive = Layer.effect(
 
     return Effect.fn(function* (queue: Queue) {
       yield* bind(queue);
-      const env = WorkerEnvironment.asEffect();
+      const env = WorkerEnvironment;
       const raw = env.pipe(
         Effect.map((env) => (env as Record<string, any>)[queue.LogicalId]),
       );

package/src/Cloudflare/R2/R2BucketBinding.ts

@@ -146,7 +146,7 @@ export const R2BucketBindingLive = Layer.effect(
 
     return Effect.fn(function* (bucket: R2Bucket) {
       yield* bind(bucket);
-      const env = WorkerEnvironment.asEffect();
+      const env = WorkerEnvironment;
       const raw = env.pipe(
         Effect.map(
           (env) => (env as Record<string, runtime.R2Bucket>)[bucket.LogicalId],

package/src/Cloudflare/SecretsStore/SecretBinding.ts

@@ -45,7 +45,7 @@ export const SecretBindingLive = Layer.effect(
 
     return Effect.fn(function* (secret: Secret) {
       yield* bind(secret);
-      const env = WorkerEnvironment.asEffect();
+      const env = WorkerEnvironment;
       const raw = env.pipe(
         Effect.map(
           (env) =>

package/src/Cloudflare/Workers/Assets.ts

@@ -6,6 +6,7 @@ import * as Path from "effect/Path";
 import type { PlatformError } from "effect/PlatformError";
 import type { ScopedPlanStatusSession } from "../../Cli/Cli.ts";
 import { sha256, sha256Object } from "../../Util/index.ts";
+import createIgnore from "../../Util/ignore.ts";
 
 const MAX_ASSET_SIZE = 1024 * 1024 * 25; // 25MB
 const MAX_ASSET_COUNT = 20_000;
@@ -97,12 +98,10 @@ const maybeReadString = Effect.fnUntraced(function* (file: string) {
   );
 });
 
-const createIgnoreMatcher = Effect.fnUntraced(function* (patterns: string[]) {
-  const matcher = yield* Effect.promise(() =>
-    import("ignore").then(({ default: ignore }) => ignore().add(patterns)),
-  );
+const createIgnoreMatcher = (patterns: string[]) => {
+  const matcher = createIgnore().add(patterns);
   return (file: string) => matcher.ignores(file);
-});
+};
 
 export const readAssets = Effect.fnUntraced(function* (props: AssetsProps) {
   const fs = yield* FileSystem.FileSystem;
@@ -114,7 +113,7 @@ export const readAssets = Effect.fnUntraced(function* (props: AssetsProps) {
     maybeReadString(path.join(resolvedDirectory, "_headers")),
     maybeReadString(path.join(resolvedDirectory, "_redirects")),
   ]);
-  const ignores = yield* createIgnoreMatcher([
+  const ignores = createIgnoreMatcher([
     ".assetsignore",
     "_headers",
     "_redirects",

package/src/Cloudflare/Workers/Worker.ts

@@ -35,11 +35,11 @@ import {
   type PlatformProps,
   type Rpc,
 } from "../../Platform.ts";
-import { isYieldableEffectLike } from "../../Util/effect.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource, type ResourceBinding } from "../../Resource.ts";
 import * as Serverless from "../../Serverless/index.ts";
 import { Stack } from "../../Stack.ts";
+import { isYieldableEffectLike } from "../../Util/effect.ts";
 import type { AiGateway } from "../AiGateway/AiGateway.ts";
 import {
   isAnalyticsEngineDataset,
@@ -51,7 +51,6 @@ import {
 } from "../Artifacts/Artifacts.ts";
 import { CloudflareEnvironment } from "../CloudflareEnvironment.ts";
 import { D1Database } from "../D1/D1Database.ts";
-import { fromCloudflareFetcher } from "../Fetcher.ts";
 import type {
   Hyperdrive,
   HyperdriveDevOrigin,
@@ -1088,7 +1087,7 @@ export const bindWorker = Effect.fnUntraced(function* <Shape, Req = never>(
   // cold-start). `WorkerEnvironment` only exists at exec phase on the
   // deployed worker, so we hand `makeRpcStub` an `Effect<stub>` that
   // resolves the binding lazily on each method call.
-  const stubEff = WorkerEnvironment.asEffect().pipe(
+  const stubEff = WorkerEnvironment.pipe(
     Effect.map((env) => (env as Record<string, unknown>)[worker.LogicalId]),
   );
   return makeRpcStub<Shape>(stubEff);
@@ -2363,7 +2362,23 @@ export const LiveWorkerProvider = () =>
                   type: "application/javascript+module",
                 }),
               ],
-            });
+            }).pipe(
+              // Cloudflare's PUT /workers/scripts/{name} intermittently
+              // returns code 10002 / "An unknown error has occurred" on the
+              // first put for a fresh worker name. Surfaced as the shared
+              // `InternalServerError` upstream (alchemy-run/distilled#290).
+              // Also match `UnknownCloudflareError` for older
+              // @distilled.cloud/cloudflare versions that haven't picked
+              // up the patch yet.
+              Effect.retry({
+                while: (e: any) =>
+                  e._tag === "InternalServerError" ||
+                  e._tag === "UnknownCloudflareError",
+                schedule: Schedule.exponential(1000).pipe(
+                  Schedule.both(Schedule.recurs(5)),
+                ),
+              }),
+            );
             if (doClasses.length > 0) {
               ({ durableObjectNamespaces } =
                 yield* getWorkerSettingsWithDurableObjects(name, doClasses));

package/src/Cloudflare/Workers/WorkerBundle.ts

@@ -163,14 +163,12 @@ import { MinimumLogLevel } from "effect/References";
 import { NodeServices } from "@effect/platform-node";
 import { Stack } from "alchemy/Stack";
 import { WorkerEnvironment, makeDurableObjectBridge, makeWorkerBridge${hasWfClasses ? ", makeWorkflowBridge" : ""}, ExportedHandlerMethods } from "alchemy/Cloudflare";
+import { makeEntrypointLayer } from "alchemy/Runtime";
 
-import entry from "${importPath}";
+import entrypoint from "${importPath}";
 
 const tag = Context.Service("${Self.key}")
-const layer =
-  typeof entry?.build === "function"
-    ? entry
-    : Layer.effect(tag, typeof entry?.asEffect === "function" ? entry.asEffect() : entry);
+const layer = makeEntrypointLayer(tag, entrypoint);
 
 const platform = Layer.mergeAll(
   NodeServices.layer,
@@ -189,7 +187,7 @@ const stack = Layer.succeed(
   }
 );
 
-const exportsEffect = tag.asEffect().pipe(
+const exportsEffect = tag.pipe(
   Effect.flatMap(func => func.RuntimeContext.exports),
   Effect.provide(
     layer.pipe(

package/src/Cloudflare/Workers/Workflow.ts

@@ -73,7 +73,7 @@ export const sleep = (
   name: string,
   duration: string | number,
 ): Effect.Effect<void, never, WorkflowStep> =>
-  WorkflowStep.asEffect().pipe(
+  WorkflowStep.pipe(
     Effect.flatMap((step) => step.sleep(name, duration)),
     Effect.orDie,
   );
@@ -85,7 +85,7 @@ export const sleepUntil = (
   name: string,
   timestamp: Date | number,
 ): Effect.Effect<void, never, WorkflowStep> =>
-  WorkflowStep.asEffect().pipe(
+  WorkflowStep.pipe(
     Effect.flatMap((step) => step.sleepUntil(name, timestamp)),
     Effect.orDie,
   );

package/src/Cloudflare/index.ts

@@ -6,6 +6,7 @@ export * from "./CloudflareEnvironment.ts";
 export * from "./Container/index.ts";
 export * from "./D1/index.ts";
 export * from "./EdgeSession.ts";
+export * from "./Email/index.ts";
 export * from "./Hyperdrive/index.ts";
 export * from "./Images/index.ts";
 export * from "./KV/index.ts";

package/src/Construct.ts

@@ -49,11 +49,7 @@ import * as Namespace from "./Namespace.ts";
  * ```
  */
 export const fn: {
-  <
-    Eff extends Effect.Yieldable<any, any, any, any>,
-    AEff,
-    Props extends object,
-  >(
+  <Eff extends Effect.Effect<any, any, any>, AEff, Props extends object>(
     body: (id: string, props: Props) => Generator<Eff, AEff, never>,
   ): (
     id: string,
@@ -62,12 +58,12 @@ export const fn: {
     AEff,
     [Eff] extends [never]
       ? never
-      : [Eff] extends [Effect.Yieldable<infer _S, infer _A, infer E, infer _R>]
+      : [Eff] extends [Effect.Effect<infer _A, infer E, infer _R>]
         ? E
         : never,
     [Eff] extends [never]
       ? never
-      : [Eff] extends [Effect.Yieldable<infer _S, infer _A, infer _E, infer R>]
+      : [Eff] extends [Effect.Effect<infer _A, infer _E, infer R>]
         ? R
         : never
   >;

package/src/Destroy.ts

@@ -28,6 +28,7 @@ export const destroy = ({
         // TODO(sam): probably better to have Plan.destroy and Plan.update
         resources: {},
         bindings: {},
+        actions: {},
         output: {},
       }).pipe(Effect.flatMap(Apply.apply)),
     { stage, dev, scope },

package/src/Http.ts

@@ -80,7 +80,7 @@ export const safeHttpEffect = <Req = never>(
 export const resolvePort = (options: { port?: number } | undefined) =>
   options?.port !== undefined
     ? Effect.succeed(options.port)
-    : Config.number("PORT").pipe(Config.withDefault(3000)).asEffect();
+    : Config.number("PORT").pipe(Config.withDefault(3000));
 
 export const BunHttpServer = () =>
   Layer.effect(

package/src/Namespace.ts

@@ -40,10 +40,10 @@ export const set = (namespace: string | NamespaceNode) =>
   );
 
 export const CurrentNamespace = Effect.serviceOption(Namespace)
-  .asEffect()
+
   .pipe(Effect.map(Option.getOrUndefined));
 
-export const CurrentChain = CurrentNamespace.asEffect().pipe(
+export const CurrentChain = CurrentNamespace.pipe(
   Effect.map(function findRoot(ns): string[] {
     if (ns?.Parent) {
       return [ns.Id, ...findRoot(ns.Parent)];
@@ -52,9 +52,9 @@ export const CurrentChain = CurrentNamespace.asEffect().pipe(
   }),
 );
 
-export const Parent = Namespace.asEffect().pipe(Effect.map((ns) => ns?.Parent));
+export const Parent = Namespace.pipe(Effect.map((ns) => ns?.Parent));
 
-export const Root = Namespace.asEffect().pipe(
+export const Root = Namespace.pipe(
   Effect.map(function findRoot(ns) {
     if (ns.Parent) {
       return findRoot(ns.Parent);

package/src/Neon/Branch.ts

@@ -1,16 +1,43 @@
+import {
+  createProjectBranch,
+  deleteProjectBranch,
+  getConnectionURI,
+  getProjectBranch,
+  listProjectBranchDatabases,
+  listProjectBranches,
+  type ListProjectBranchesOutput,
+  updateProjectBranch,
+} from "@distilled.cloud/neon";
 import * as Effect from "effect/Effect";
 import * as Redacted from "effect/Redacted";
 import { isResolved } from "../Diff.ts";
 import { createPhysicalName } from "../PhysicalName.ts";
 import * as Provider from "../Provider.ts";
 import { Resource } from "../Resource.ts";
-import * as api from "./api.ts";
 import { applyMigrations, runSql } from "./Migrations.ts";
 import { parsePostgresOrigin, type PostgresOrigin } from "./PostgresOrigin.ts";
-import type { Project } from "./Project.ts";
+import { type Project, waitForOperations } from "./Project.ts";
 import type { Providers } from "./Providers.ts";
 import { listSqlFiles, readSqlFile } from "./SqlFile.ts";
 
+const findBranchByName = (projectId: string, name: string) =>
+  Effect.gen(function* () {
+    const matches: ListProjectBranchesOutput["branches"][number][] = [];
+    let cursor: string | undefined;
+    do {
+      const page = yield* listProjectBranches({
+        project_id: projectId,
+        search: name,
+        ...(cursor !== undefined ? { cursor } : {}),
+      });
+      for (const b of page.branches) {
+        if (b.name === name) matches.push(b);
+      }
+      cursor = page.pagination?.next;
+    } while (cursor);
+    return matches;
+  });
+
 const DEFAULT_MIGRATIONS_TABLE = "neon_migrations";
 
 export type BranchSource =
@@ -202,7 +229,7 @@ const resolveParentBranchId = (
       return source.branchId as unknown as string;
     }
     if ("name" in source && source.name) {
-      const matches = yield* api.findBranchByName(projectId, source.name);
+      const matches = yield* findBranchByName(projectId, source.name);
       if (matches.length === 0) {
         return yield* Effect.die(
           `Parent branch "${source.name}" not found in project ${projectId}`,
@@ -218,9 +245,7 @@ const resolveParentBranchId = (
     return undefined as string | undefined;
   });
 
-const buildEndpoints = (
-  endpoints: BranchEndpointConfig[] | undefined,
-): api.CreateBranchEndpoint[] => {
+const buildEndpoints = (endpoints: BranchEndpointConfig[] | undefined) => {
   const list = endpoints ?? [{ type: "read_write" as const }];
   return list.map((e) => ({
     type: e.type,
@@ -237,13 +262,15 @@ const fetchConnection = (
   roleName: string,
 ) =>
   Effect.gen(function* () {
-    const direct = yield* api.getConnectionUri(projectId, {
+    const direct = yield* getConnectionURI({
+      project_id: projectId,
       branch_id: branchId,
       database_name: databaseName,
       role_name: roleName,
       pooled: false,
     });
-    const pooled = yield* api.getConnectionUri(projectId, {
+    const pooled = yield* getConnectionURI({
+      project_id: projectId,
       branch_id: branchId,
       database_name: databaseName,
       role_name: roleName,
@@ -318,31 +345,30 @@ export const BranchProvider = () =>
         }),
         read: Effect.fn(function* ({ id, output, olds }) {
           if (output?.branchId) {
-            return yield* api
-              .getProjectBranch(output.projectId, output.branchId)
-              .pipe(
-                Effect.map(({ branch }) => ({
-                  ...output,
-                  branchName: branch.name,
-                  protected: branch.protected,
-                  default: branch.default,
-                  expiresAt: branch.expires_at,
-                })),
-                Effect.catchTag("BranchNotFound", () =>
-                  Effect.succeed(undefined),
-                ),
-              );
+            return yield* getProjectBranch({
+              project_id: output.projectId,
+              branch_id: output.branchId,
+            }).pipe(
+              Effect.map(({ branch }) => ({
+                ...output,
+                branchName: branch.name,
+                protected: branch.protected,
+                default: branch.default,
+                expiresAt: branch.expires_at,
+              })),
+              Effect.catchTag("NotFound", () => Effect.succeed(undefined)),
+            );
           }
           if (!olds?.project) return undefined;
           const projectId = resolveProjectId(olds.project as BranchSource);
           const name = yield* createBranchName(id, olds.name);
-          const matches = yield* api.findBranchByName(projectId, name);
+          const matches = yield* findBranchByName(projectId, name);
           const match = matches[0];
           if (!match) return undefined;
-          const dbs = yield* api.listProjectBranchDatabases(
-            projectId,
-            match.id,
-          );
+          const dbs = yield* listProjectBranchDatabases({
+            project_id: projectId,
+            branch_id: match.id,
+          });
           const db = dbs.databases[0];
           if (!db) return undefined;
           const conn = yield* fetchConnection(
@@ -383,31 +409,33 @@ export const BranchProvider = () =>
           // otherwise sync the mutable scalar fields on the existing
           // branch via updateProjectBranch.
           const branchInfo = output
-            ? yield* api
-                .updateProjectBranch(output.projectId, output.branchId, {
+            ? yield* updateProjectBranch({
+                project_id: output.projectId,
+                branch_id: output.branchId,
+                branch: {
                   name: newName !== output.branchName ? newName : undefined,
                   protected: news.protected,
                   expires_at: news.expiresAt ?? null,
-                })
-                .pipe(
-                  Effect.map((r) => ({
-                    branchId: output.branchId,
-                    branchName: r.branch.name,
-                    projectId: output.projectId,
-                    parentBranchId: output.parentBranchId,
-                    parentLsn: output.parentLsn,
-                    parentTimestamp: output.parentTimestamp,
-                    initSource: output.initSource,
-                    protected: r.branch.protected,
-                    default: output.default,
-                    expiresAt: r.branch.expires_at,
-                    databaseName: output.databaseName,
-                    roleName: output.roleName,
-                    connectionUri: output.connectionUri,
-                    pooledConnectionUri: output.pooledConnectionUri,
-                    origin: output.origin,
-                  })),
-                )
+                },
+              }).pipe(
+                Effect.map((r) => ({
+                  branchId: output.branchId,
+                  branchName: r.branch.name,
+                  projectId: output.projectId,
+                  parentBranchId: output.parentBranchId,
+                  parentLsn: output.parentLsn,
+                  parentTimestamp: output.parentTimestamp,
+                  initSource: output.initSource,
+                  protected: r.branch.protected,
+                  default: output.default,
+                  expiresAt: r.branch.expires_at,
+                  databaseName: output.databaseName,
+                  roleName: output.roleName,
+                  connectionUri: output.connectionUri,
+                  pooledConnectionUri: output.pooledConnectionUri,
+                  origin: output.origin,
+                })),
+              )
             : yield* Effect.gen(function* () {
                 const projectId = resolveProjectId(
                   news.project as BranchSource,
@@ -416,17 +444,20 @@ export const BranchProvider = () =>
                   news.parentBranch as ParentBranchSource | undefined,
                   projectId,
                 );
-                const created = yield* api.createProjectBranch(projectId, {
-                  name: newName,
-                  parent_id: parentBranchId,
-                  parent_lsn: news.parentLsn,
-                  parent_timestamp: news.parentTimestamp,
-                  init_source: news.initSource,
-                  protected: news.protected,
-                  expires_at: news.expiresAt,
+                const created = yield* createProjectBranch({
+                  project_id: projectId,
+                  branch: {
+                    name: newName,
+                    parent_id: parentBranchId,
+                    parent_lsn: news.parentLsn,
+                    parent_timestamp: news.parentTimestamp,
+                    init_source: news.initSource,
+                    protected: news.protected,
+                    expires_at: news.expiresAt,
+                  },
                   endpoints: buildEndpoints(news.endpoints),
                 });
-                yield* api.waitForOperations(created.operations);
+                yield* waitForOperations(created.operations);
 
                 const db = created.databases[0];
                 if (!db) {
@@ -492,7 +523,10 @@ export const BranchProvider = () =>
           };
         }),
         delete: Effect.fn(function* ({ output }) {
-          yield* api.deleteProjectBranch(output.projectId, output.branchId);
+          yield* deleteProjectBranch({
+            project_id: output.projectId,
+            branch_id: output.branchId,
+          }).pipe(Effect.catchTag("NotFound", () => Effect.void));
         }),
       };
     }),