alchemy 2.0.0-beta.51 → 2.0.0-beta.53

package/lib/Cloudflare/Workers/Worker.js

@@ -1,11 +1,11 @@
 import * as workers from "@distilled.cloud/cloudflare/workers";
 import * as zones from "@distilled.cloud/cloudflare/zones";
-import * as Config from "effect/Config";
 import * as Context from "effect/Context";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Path from "effect/Path";
+import * as Predicate from "effect/Predicate";
 import * as Redacted from "effect/Redacted";
 import * as Schedule from "effect/Schedule";
 import * as crypto from "node:crypto";
@@ -429,36 +429,40 @@ export const WorkerProvider = () => selectLayer({
 });
 export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(function* () {
     const path = yield* Path.Path;
-    const { accountId } = yield* CloudflareEnvironment;
     const bundler = yield* WorkerBundle;
     const stack = yield* Stack;
-    const createScriptSubdomain = yield* workers.createScriptSubdomain;
-    const deleteScript = yield* workers.deleteScript;
-    const getScriptSubdomain = yield* workers.getScriptSubdomain;
-    const getScriptSchedule = yield* workers.getScriptSchedule;
-    const getScriptSettings = yield* workers.getScriptScriptAndVersionSetting;
-    const getSubdomain = yield* workers.getSubdomain;
-    const putScript = yield* workers.putScript;
-    const putScriptSchedule = yield* workers.putScriptSchedule;
-    const putDomain = yield* workers.putDomain;
-    const listDomains = yield* workers.listDomains;
-    const deleteDomain = yield* workers.deleteDomain;
-    const listZones = yield* zones.listZones;
+    // const createScriptSubdomain = yield* workers.createScriptSubdomain;
+    // const deleteScript = yield* workers.deleteScript;
+    // const getScriptSubdomain = yield* workers.getScriptSubdomain;
+    // const getScriptSchedule = yield* workers.getScriptSchedule;
+    // const getScriptSettings = yield* workers.getScriptScriptAndVersionSetting;
+    // const getSubdomain = yield* workers.getSubdomain;
+    // const putScript = yield* workers.putScript;
+    // const putScriptSchedule = yield* workers.putScriptSchedule;
+    // const putDomain = yield* workers.putDomain;
+    // const listDomains = yield* workers.listDomains;
+    // const deleteDomain = yield* workers.deleteDomain;
+    // const listZones = yield* zones.listZones;
     const telemetry = yield* CloudflareLogs;
-    const getAccountSubdomain = (accountId) => getSubdomain({
+    const getAccountSubdomain = (accountId) => workers
+        .getSubdomain({
         accountId,
-    }).pipe(Effect.map((result) => result.subdomain));
+    })
+        .pipe(Effect.map((result) => result.subdomain));
     // Toggle the workers.dev subdomain via `POST /subdomain` with
     // `enabled: true | false`. Mirrors the upstream Alchemy
     // implementation in `.vendor/alchemy/.../worker-subdomain.ts`.
     // When enabling we also set `previewsEnabled: true` so the
     // script is reachable both at its stable workers.dev URL and at
     // version-preview URLs; on disable we send just `enabled: false`.
-    const setWorkerSubdomain = (name, enabled) => createScriptSubdomain({
-        accountId,
-        scriptName: name,
-        enabled,
-        previewsEnabled: enabled ? true : undefined,
+    const setWorkerSubdomain = Effect.fnUntraced(function* (name, enabled) {
+        const { accountId } = yield* yield* CloudflareEnvironment;
+        return yield* workers.createScriptSubdomain({
+            accountId,
+            scriptName: name,
+            enabled,
+            previewsEnabled: enabled ? true : undefined,
+        });
     });
     // Convert non-ASCII hostnames (emoji, IDN, etc.) to punycode so the
     // Cloudflare API receives the form it stores domains in. `new URL(...)`
@@ -475,11 +479,17 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
         ? []
         : Array.from(new Set((Array.isArray(domain) ? domain : [domain]).map(toPunycode)));
     const normalizeCrons = (crons) => Array.from(new Set(crons ?? []));
-    const getWorkerCrons = (scriptName) => getScriptSchedule({
-        accountId,
-        scriptName,
-    }).pipe(Effect.map((response) => normalizeCrons(response.schedules.map((schedule) => schedule.cron))), Effect.catchTag("WorkerNotFound", () => Effect.succeed([])));
+    const getWorkerCrons = Effect.fnUntraced(function* (scriptName) {
+        const { accountId } = yield* yield* CloudflareEnvironment;
+        return yield* workers
+            .getScriptSchedule({
+            accountId,
+            scriptName,
+        })
+            .pipe(Effect.map((response) => normalizeCrons(response.schedules.map((schedule) => schedule.cron))), Effect.catchTag("WorkerNotFound", () => Effect.succeed([])));
+    });
     const reconcileCrons = (scriptName, desired, previous, session) => Effect.gen(function* () {
+        const { accountId } = yield* yield* CloudflareEnvironment;
         const live = yield* getWorkerCrons(scriptName);
         const desiredSorted = [...desired].sort();
         const liveSorted = [...live].sort();
@@ -490,11 +500,13 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
         if (desired.length > 0 || previous.length > 0 || live.length > 0) {
             yield* session.note(`Reconciling Cron Triggers (${desired.length}) ...`);
         }
-        const result = yield* putScriptSchedule({
+        const result = yield* workers
+            .putScriptSchedule({
             accountId,
             scriptName,
             body: desired.map((cron) => ({ cron })),
-        }).pipe(Effect.retry({
+        })
+            .pipe(Effect.retry({
             while: (error) => error?._tag === "WorkerNotFound",
             schedule: Schedule.exponential(200).pipe(Schedule.both(Schedule.recurs(15))),
         }));
@@ -509,7 +521,9 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
         const cached = zoneCache.get(hostname);
         if (cached)
             return cached;
-        const zoneList = yield* listZones({}).pipe(Effect.map((response) => response.result ?? []));
+        const zoneList = yield* zones
+            .listZones({})
+            .pipe(Effect.map((response) => response.result ?? []));
         for (const zone of zoneList) {
             zoneCache.set(zone.name, zone.id);
         }
@@ -526,16 +540,19 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
             "Ensure the parent zone exists in this account.");
     });
     const reconcileDomains = (scriptName, desired) => Effect.gen(function* () {
+        const { accountId } = yield* yield* CloudflareEnvironment;
         // Always query the live state of domains attached to *this*
         // Worker rather than trusting `_previous` from local state.
         // State may have been wiped, populated by another machine, or
         // simply be out of date. Without this we PUT domains that are
         // already registered to this same Worker and Cloudflare
         // returns a confusing "hostname already in use" error.
-        const liveAll = yield* listDomains({
+        const liveAll = yield* workers
+            .listDomains({
             accountId,
             service: scriptName,
-        }).pipe(Effect.map((r) => (r.result ?? []).flatMap((d) => d.id && d.hostname && d.zoneId
+        })
+            .pipe(Effect.map((r) => (r.result ?? []).flatMap((d) => d.id && d.hostname && d.zoneId
             ? [
                 {
                     id: d.id,
@@ -550,7 +567,9 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
         // Detach what's no longer wanted. Use the live list so we
         // don't try to delete domains we no longer track.
         const toRemove = liveAll.filter((d) => !desiredSet.has(d.hostname));
-        yield* Effect.all(toRemove.map((d) => deleteDomain({ accountId, domainId: d.id }).pipe(Effect.catchTag("DomainNotFound", () => Effect.void))), { concurrency: "unbounded" });
+        yield* Effect.all(toRemove.map((d) => workers
+            .deleteDomain({ accountId, domainId: d.id })
+            .pipe(Effect.catchTag("DomainNotFound", () => Effect.void))), { concurrency: "unbounded" });
         if (desired.length === 0)
             return [];
         const zoneCache = new Map();
@@ -571,10 +590,12 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
             // Not attached to this Worker — but it could still belong
             // to another Worker. Check before we try to PUT so we can
             // emit a helpful error instead of the raw 409.
-            const otherOwner = yield* listDomains({
+            const otherOwner = yield* workers
+                .listDomains({
                 accountId,
                 hostname,
-            }).pipe(Effect.map((r) => (r.result ?? []).find((d) => d.hostname === hostname && d.service !== scriptName)), Effect.catch(() => Effect.succeed(undefined)));
+            })
+                .pipe(Effect.map((r) => (r.result ?? []).find((d) => d.hostname === hostname && d.service !== scriptName)), Effect.catch(() => Effect.succeed(undefined)));
             if (otherOwner?.id) {
                 return yield* Effect.die(new Error(`Cannot attach hostname '${hostname}' to Worker '${scriptName}': ` +
                     `it is already attached to Worker '${otherOwner.service ?? "<unknown>"}'. ` +
@@ -585,12 +606,14 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
             // PUT /accounts/.../workers/domains right after `putScript`
             // can return `WorkerNotFound` until Cloudflare's script
             // registry has propagated. Retry on that specific tag.
-            const res = yield* putDomain({
+            const res = yield* workers
+                .putDomain({
                 accountId,
                 hostname,
                 service: scriptName,
                 zoneId,
-            }).pipe(Effect.retry({
+            })
+                .pipe(Effect.retry({
                 while: (error) => error?._tag === "WorkerNotFound",
                 schedule: Schedule.exponential(200).pipe(Schedule.both(Schedule.recurs(15))),
             }));
@@ -629,10 +652,13 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
         ? [binding.className]
         : []) ?? []));
     const getWorkerSettingsWithDurableObjects = Effect.fnUntraced(function* (scriptName, expectedClassNames) {
-        return yield* getScriptSettings({
+        const { accountId } = yield* yield* CloudflareEnvironment;
+        return yield* workers
+            .getScriptScriptAndVersionSetting({
             accountId,
             scriptName,
-        }).pipe(Effect.map((settings) => {
+        })
+            .pipe(Effect.map((settings) => {
             const namespaces = getDurableObjectNamespaces(settings.bindings);
             const missing = expectedClassNames.filter((className) => !namespaces[className]);
             if (missing.length > 0) {
@@ -654,13 +680,9 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
         if (!assets) {
             return undefined;
         }
-        if (typeof assets === "object" &&
-            "path" in assets &&
-            "hash" in assets) {
-            return yield* readAssets({
-                directory: assets.path,
-                config: assets.config,
-            });
+        if (typeof assets === "object" && "hash" in assets) {
+            const { hash: _, ...config } = assets;
+            return yield* readAssets(config);
         }
         // Handle string path or AssetsProps
         return yield* readAssets(typeof assets === "string" ? { directory: assets } : assets);
@@ -693,7 +715,7 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
                     : Redacted.isRedacted(value) &&
                         typeof Redacted.value(value) === "string"
                         ? Redacted.value(value)
-                        : Config.isConfig(value) || Effect.isEffect(value)
+                        : Effect.isEffect(value)
                             ? yield* value
                             : undefined,
             ];
@@ -707,10 +729,10 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
         const [assets, bundle] = yield* Effect.all([
             assetsDirectory
                 ? readAssets({
+                    ...(props.assets && typeof props.assets !== "string"
+                        ? props.assets
+                        : undefined),
                     directory: assetsDirectory,
-                    config: typeof props.assets === "object" && "config" in props.assets
-                        ? props.assets.config
-                        : undefined,
                 })
                 : Effect.succeed(undefined),
             serverBundle
@@ -773,7 +795,14 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
             input,
         },
     })));
+    const normalizePrebuiltAssets = (assets, output) => {
+        if (!Predicate.hasProperty(assets, "hash"))
+            return undefined;
+        const { directory: _, hash, ...config } = assets;
+        return { config, hash, skip: hash === output?.hash?.assets };
+    };
     const putWorker = Effect.fnUntraced(function* (id, news, bindings, olds, output, session, existingSettings) {
+        const { accountId } = yield* yield* CloudflareEnvironment;
         const name = yield* createWorkerName(id, news.name);
         yield* Effect.logInfo(`Cloudflare Worker ${olds ? "update" : "create"}: preparing bundle for ${name}`);
         // If the caller handed us a precomputed asset hash that matches
@@ -781,21 +810,10 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
         // entirely and tell Cloudflare to keep the assets it already
         // has bound to this script. The disk read is the expensive
         // part; the script PUT happens either way.
-        const previousAssetsHash = output?.hash?.assets;
-        const precomputedAssetsHash = news.assets &&
-            typeof news.assets === "object" &&
-            "path" in news.assets &&
-            "hash" in news.assets
-            ? news.assets.hash
-            : undefined;
-        const assetsConfigFromProps = news.assets &&
-            typeof news.assets === "object" &&
-            "config" in news.assets
-            ? news.assets.config
-            : undefined;
-        const skipAssetsRead = precomputedAssetsHash !== undefined &&
-            precomputedAssetsHash === previousAssetsHash;
-        const { assets, bundle, hash: preparedHash, } = yield* prepareAssetsAndBundle(id, news, { skipAssetsRead });
+        const prebuiltAssets = normalizePrebuiltAssets(news.assets, output);
+        const { assets, bundle, hash: preparedHash, } = yield* prepareAssetsAndBundle(id, news, {
+            skipAssetsRead: prebuiltAssets?.skip,
+        });
         // When the caller supplied a precomputed hash (e.g. via
         // `Build.Command`), store *that* hash in output state so the
         // next diff can short-circuit by comparing it directly. The
@@ -804,20 +822,18 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
         // build-input hash and will never match it on the next pass.
         const hash = {
             ...preparedHash,
-            assets: precomputedAssetsHash ?? preparedHash.assets,
+            assets: prebuiltAssets?.hash ?? preparedHash.assets,
         };
         const metadataBindings = bindings.flatMap((b) => b.data.bindings ?? []);
         const expectedDurableObjectClassNames = getExpectedDurableObjectClassNames(metadataBindings, name);
         let metadataAssets;
         let keepAssets = false;
-        if (skipAssetsRead) {
+        if (prebuiltAssets?.skip) {
             // Hash matched what's already on Cloudflare: keep the
             // existing asset manifest and skip the upload session.
             yield* Effect.logInfo(`Cloudflare Worker update: assets unchanged for ${name}, keeping existing`);
             keepAssets = true;
-            metadataAssets = assetsConfigFromProps
-                ? { config: assetsConfigFromProps }
-                : undefined;
+            metadataAssets = { config: prebuiltAssets.config };
             metadataBindings.push({
                 type: "assets",
                 name: "ASSETS",
@@ -831,7 +847,7 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
             // disk). In that case still keep the existing manifest and
             // skip the upload session — Cloudflare's content-addressed
             // session would no-op on every byte anyway.
-            if (assets.hash === previousAssetsHash) {
+            if (assets.hash === prebuiltAssets?.hash) {
                 yield* Effect.logInfo(`Cloudflare Worker update: assets unchanged for ${name}, keeping existing`);
                 keepAssets = true;
                 metadataAssets = { config: assets.config };
@@ -905,10 +921,12 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
         yield* session.note(`Uploading worker (${bundleSize}) ...`);
         // Read existing worker settings for migration tracking
         const oldSettings = existingSettings ??
-            (yield* getScriptSettings({
+            (yield* workers
+                .getScriptScriptAndVersionSetting({
                 accountId,
                 scriptName: name,
-            }).pipe(Effect.map((s) => s), Effect.catch(() => Effect.succeed(undefined))));
+            })
+                .pipe(Effect.map((s) => s), Effect.catch(() => Effect.succeed(undefined))));
         const oldTags = Array.from(new Set(oldSettings?.tags ?? []));
         const oldBindings = oldSettings?.bindings ?? [];
         // Parse alchemy:do:{logicalId}:{className} tags
@@ -1026,12 +1044,14 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
             tailConsumers: undefined,
             usageModel: undefined,
         };
-        const worker = yield* putScript({
+        const worker = yield* workers
+            .putScript({
             accountId,
             scriptName: name,
             metadata,
             files: bundle.files,
-        }).pipe(Effect.catch((err) => {
+        })
+            .pipe(Effect.catch((err) => {
             // When adopting a Worker managed by Wrangler (or after a previous
             // deploy with mismatched migrations), the old_tag precondition
             // fails. The only way to discover the actual tag is through the
@@ -1042,7 +1062,7 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
                 : err);
             const expectedTag = msg.match(/when expected tag is ['"]?([^'"]+)['"]?/)?.[1];
             if (expectedTag) {
-                return putScript({
+                return workers.putScript({
                     accountId,
                     scriptName: name,
                     metadata: {
@@ -1067,10 +1087,12 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
         // Cloudflare currently has it (disabled by default, or whatever
         // a previous failed/external action left it as).
         const desiredSubdomainEnabled = news.url !== false;
-        const observedSubdomain = yield* getScriptSubdomain({
+        const observedSubdomain = yield* workers
+            .getScriptSubdomain({
             accountId,
             scriptName: name,
-        }).pipe(Effect.orElseSucceed(() => ({
+        })
+            .pipe(Effect.orElseSucceed(() => ({
             enabled: false,
             previewsEnabled: false,
         })));
@@ -1128,9 +1150,7 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
             if (!props.assets) {
                 return false;
             }
-            const assetsHash = typeof props.assets === "object" &&
-                "path" in props.assets &&
-                "hash" in props.assets
+            const assetsHash = Predicate.hasProperty(props.assets, "hash")
                 ? props.assets.hash
                 : undefined;
             if (assetsHash === undefined) {
@@ -1168,9 +1188,7 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
         // assume the assets changed; `putWorker` will read once,
         // hash, and use `keepAssets` if it turns out nothing actually
         // changed.
-        const assetsHash = typeof props.assets === "object" &&
-            "path" in props.assets &&
-            "hash" in props.assets
+        const assetsHash = Predicate.hasProperty(props.assets, "hash")
             ? props.assets.hash
             : undefined;
         if (assetsHash === undefined) {
@@ -1181,6 +1199,7 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
     return Worker.Provider.of({
         stables: ["workerId", "workerName"],
         diff: Effect.fnUntraced(function* ({ id, news, olds, output, newBindings, }) {
+            const { accountId } = yield* yield* CloudflareEnvironment;
             if (!isResolved(news))
                 return undefined;
             if ((output?.accountId ?? accountId) !== accountId) {
@@ -1223,6 +1242,7 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
             }
         }),
         precreate: Effect.fnUntraced(function* ({ id, news, session }) {
+            const { accountId } = yield* yield* CloudflareEnvironment;
             const name = yield* createWorkerName(id, news.name);
             const exportMap = (news.exports ?? {});
             const durableObjects = Object.keys(exportMap)
@@ -1241,10 +1261,12 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
             ]));
             yield* Effect.logInfo(`Cloudflare Worker precreate: starting ${name}`);
             yield* Effect.logInfo(`Cloudflare Worker precreate: durable objects ${JSON.stringify(durableObjects)}`);
-            const existingSettings = yield* getScriptSettings({
+            const existingSettings = yield* workers
+                .getScriptScriptAndVersionSetting({
                 accountId,
                 scriptName: name,
-            }).pipe(Effect.catchTag("WorkerNotFound", () => Effect.succeed(undefined)));
+            })
+                .pipe(Effect.catchTag("WorkerNotFound", () => Effect.succeed(undefined)));
             let durableObjectNamespaces = getDurableObjectNamespaces(existingSettings?.bindings);
             if (existingSettings) {
                 // Engine has already cleared this resource for write via
@@ -1258,7 +1280,8 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
                 const placeholderScript = `${doClasses.length > 0 ? 'import { DurableObject } from "cloudflare:workers";\n\n' : ""}export default { fetch() { return new Response("Alchemy worker is being deployed...") } };\n${doClasses
                     .map((className) => `export class ${className} extends DurableObject {}`)
                     .join("\n")}`;
-                yield* putScript({
+                yield* workers
+                    .putScript({
                     accountId,
                     scriptName: name,
                     metadata: {
@@ -1297,7 +1320,8 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
                             type: "application/javascript+module",
                         }),
                     ],
-                }).pipe(
+                })
+                    .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
@@ -1332,6 +1356,7 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
             };
         }),
         read: Effect.fnUntraced(function* ({ id, output, olds }) {
+            const { accountId } = yield* yield* CloudflareEnvironment;
             const workerName = output?.workerName ?? (yield* createWorkerName(id, olds?.name));
             yield* Effect.logInfo(`Cloudflare Worker read: checking ${workerName}`);
             // We deliberately don't call `listScripts({ accountId })` here:
@@ -1343,18 +1368,20 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
             // surrounding `Effect.catchTag` turns into `undefined` — that's
             // all the existence check we need.
             const [subdomain, settings, domainsList] = yield* Effect.all([
-                getScriptSubdomain({
+                workers.getScriptSubdomain({
                     accountId,
                     scriptName: workerName,
                 }),
-                getScriptSettings({
+                workers.getScriptScriptAndVersionSetting({
                     accountId,
                     scriptName: workerName,
                 }),
-                listDomains({
+                workers
+                    .listDomains({
                     accountId,
                     service: workerName,
-                }).pipe(Effect.map((r) => r.result ?? [])),
+                })
+                    .pipe(Effect.map((r) => r.result ?? [])),
             ]);
             // Preserve the order the user provided in `olds.domain`. The
             // Cloudflare API returns domains in non-deterministic order,
@@ -1399,6 +1426,7 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
                 : Unowned(attrs);
         }, (effect) => effect.pipe(Effect.catchTag("WorkerNotFound", () => Effect.succeed(undefined)))),
         reconcile: Effect.fnUntraced(function* ({ id, news, olds, bindings, output, session, }) {
+            const { accountId } = yield* yield* CloudflareEnvironment;
             const name = output?.workerName ?? (yield* createWorkerName(id, news.name));
             const durableObjects = getDurableObjectBindings(bindings, name).map(({ logicalId, className }) => ({
                 logicalId,
@@ -1411,10 +1439,12 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
             // existing settings inform asset/migration decisions and let the
             // reconciler converge whether the worker is brand-new, adopted, or
             // an in-place update.
-            const existingSettings = yield* getScriptSettings({
+            const existingSettings = yield* workers
+                .getScriptScriptAndVersionSetting({
                 accountId,
                 scriptName: name,
-            }).pipe(Effect.catchTag("WorkerNotFound", () => Effect.succeed(undefined)));
+            })
+                .pipe(Effect.catchTag("WorkerNotFound", () => Effect.succeed(undefined)));
             yield* Effect.logInfo(`Cloudflare Worker reconcile: existing durable object tags ${JSON.stringify((existingSettings?.tags ?? []).filter((tag) => tag.startsWith("alchemy:do:")))}`);
             yield* Effect.logInfo(`Cloudflare Worker reconcile: previous durable object tags ${JSON.stringify((output?.tags ?? []).filter((tag) => tag.startsWith("alchemy:do:")))}`);
             return yield* putWorker(id, news, bindings, olds, output, session, existingSettings);
@@ -1425,21 +1455,26 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
             // We no longer track `{ id, zoneId }` on the output; fetching
             // straight from Cloudflare handles both the normal case and
             // adopted workers whose domains we never recorded.
-            const liveDomains = yield* listDomains({
+            const liveDomains = yield* workers
+                .listDomains({
                 accountId: output.accountId,
                 service: output.workerName,
-            }).pipe(Effect.map((r) => r.result ?? []), Effect.catch(() => Effect.succeed([])));
+            })
+                .pipe(Effect.map((r) => r.result ?? []), Effect.catch(() => Effect.succeed([])));
             if (liveDomains.length) {
                 yield* Effect.all(liveDomains.flatMap((d) => d.id
                     ? [
-                        deleteDomain({
+                        workers
+                            .deleteDomain({
                             accountId: output.accountId,
                             domainId: d.id,
-                        }).pipe(Effect.catchTag("DomainNotFound", () => Effect.void)),
+                        })
+                            .pipe(Effect.catchTag("DomainNotFound", () => Effect.void)),
                     ]
                     : []), { concurrency: "unbounded" });
             }
-            yield* deleteScript({
+            yield* workers
+                .deleteScript({
                 accountId: output.accountId,
                 scriptName: output.workerName,
                 // Force teardown of queue consumers, durable object classes, and
@@ -1448,7 +1483,8 @@ export const LiveWorkerProvider = () => Provider.effect(Worker, Effect.gen(funct
                 // and leave the script in CF. Alchemy is the source of truth for
                 // the worker, so we want a hard delete on teardown.
                 force: true,
-            }).pipe(Effect.catchTag("WorkerNotFound", () => Effect.void));
+            })
+                .pipe(Effect.catchTag("WorkerNotFound", () => Effect.void));
         }),
         tail: ({ output }) => telemetry.tailScript({
             accountId: output.accountId,