alchemy 2.0.0-beta.76 → 2.0.0-beta.77

package/lib/Cloudflare/StateStore/CredentialsFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"CredentialsFile.js","sourceRoot":"","sources":["../../../src/Cloudflare/StateStore/CredentialsFile.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC;AAqBzD;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,WAAwC,EACxC,gBAAwB,EACf,EAAE,CACX,WAAW,CAAC,SAAS,IAAI,IAAI,IAAI,WAAW,CAAC,SAAS,KAAK,gBAAgB,CAAC"}
+{"version":3,"file":"CredentialsFile.js","sourceRoot":"","sources":["../../../src/Cloudflare/StateStore/CredentialsFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC;AAEzD;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,MAAM,CAAC,MAAM,CAAC;IACvD,GAAG,EAAE,MAAM,CAAC,MAAM;IAClB,uDAAuD;IACvD,SAAS,EAAE,MAAM,CAAC,MAAM;IACxB,uEAAuE;IACvE,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC;CAC1C,CAAC,CAAC;AAIH;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,WAAwC,EACxC,gBAAwB,EACf,EAAE,CACX,WAAW,CAAC,SAAS,IAAI,IAAI,IAAI,WAAW,CAAC,SAAS,KAAK,gBAAgB,CAAC"}

package/lib/Cloudflare/StateStore/State.d.ts

@@ -9,10 +9,10 @@ import { AuthError } from "../../Auth/AuthProvider.ts";
 import { CredentialsStore } from "../../Auth/Credentials.ts";
 import * as Output from "../../Output.ts";
 import { State, type StateService } from "../../State/State.ts";
+import * as Interaction from "../../Interaction.ts";
 import * as Access from "../Access.ts";
 import * as CloudflareEnvironment from "../CloudflareEnvironment.ts";
-import { type StoredStateStoreCredentials } from "./CredentialsFile.ts";
-export declare const state: () => Layer.Layer<State, never, AlchemyContext | import("../../Artifacts.ts").ArtifactStore | import("../../index.ts").AuthProviders | import("effect/unstable/process/ChildProcessSpawner").ChildProcessSpawner | import("../../index.ts").Cli | import("effect/FileSystem").FileSystem | HttpClient.HttpClient | import("effect/Path").Path>;
+export declare const state: () => Layer.Layer<State, never, AlchemyContext | import("../../Artifacts.ts").ArtifactStore | import("../../index.ts").AuthProviders | import("effect/unstable/process/ChildProcessSpawner").ChildProcessSpawner | import("effect/Crypto").Crypto | import("effect/FileSystem").FileSystem | HttpClient.HttpClient | Interaction.Interaction | import("effect/Path").Path>;
 export interface BootstrapOptions {
     /** @default "alchemy-state-store" */
     workerName?: string;
@@ -21,7 +21,7 @@ export interface BootstrapOptions {
     /** @default "default" */
     profile?: string;
 }
-export declare const bootstrap: (options?: BootstrapOptions) => Effect.Effect<StateService, Access.AccessError | AuthError | import("@distilled.cloud/axiom").BadGateway | import("@distilled.cloud/cloudflare").CloudflareError | import("@distilled.cloud/cloudflare").CloudflareHttpError | import("@distilled.cloud/cloudflare").CloudflareParseError | import("@distilled.cloud/cloudflare").CloudflareRateLimited | Config.ConfigError | import("@distilled.cloud/axiom").ConfigError | import("../../Auth/Demand.ts").CredentialsRequired | import("../../Apply.ts").DestroyError | workers.Forbidden | import("@distilled.cloud/axiom").GatewayTimeout | import("effect/unstable/http/HttpClientError").HttpClientError | import("@distilled.cloud/axiom").InternalServerError | SecretsStore.InvalidAccountId | Output.InvalidReferenceError | import("@distilled.cloud/cloudflare").InvalidRoute | workers.InvalidRoute | Output.MissingSourceError | import("@distilled.cloud/cloudflare").OAuthRefreshError | import("effect/PlatformError").PlatformError | import("@distilled.cloud/axiom").ServiceUnavailable | import("../../State/State.ts").StateStoreError | StateStoreVersionNotReady | workers.SubdomainNotFound | import("@distilled.cloud/axiom").TooManyRequests | import("@distilled.cloud/axiom").Unauthorized | import("@distilled.cloud/cloudflare").UnknownCloudflareError, Access.Access | AlchemyContext | import("../../Artifacts.ts").ArtifactStore | import("../../index.ts").Cli | CloudflareEnvironment.CloudflareEnvironment | CredentialsStore | import("effect/FileSystem").FileSystem | import("effect/Path").Path | SecretsStore.CloudflareOpContext>;
+export declare const bootstrap: (options?: BootstrapOptions) => Effect.Effect<StateService, Access.AccessError | AuthError | import("@distilled.cloud/fly-io").BadGateway | import("@distilled.cloud/cloudflare").CloudflareError | import("@distilled.cloud/cloudflare").CloudflareHttpError | import("@distilled.cloud/cloudflare").CloudflareParseError | import("@distilled.cloud/cloudflare").CloudflareRateLimited | Config.ConfigError | import("@distilled.cloud/fly-io").ConfigError | import("../../Auth/Demand.ts").CredentialsRequired | import("../../Apply.ts").DestroyError | workers.Forbidden | import("@distilled.cloud/fly-io").GatewayTimeout | import("effect/unstable/http/HttpClientError").HttpClientError | import("@distilled.cloud/fly-io").InternalServerError | SecretsStore.InvalidAccountId | Output.InvalidReferenceError | import("@distilled.cloud/cloudflare").InvalidRoute | workers.InvalidRoute | Output.MissingSourceError | import("../../Auth/AuthProvider.ts").NeedsReauth | import("@distilled.cloud/cloudflare").OAuthRefreshError | import("effect/PlatformError").PlatformError | import("../../Auth/Profile.ts").ProfileError | import("@distilled.cloud/fly-io").ServiceUnavailable | import("../../State/State.ts").StateStoreError | StateStoreVersionNotReady | workers.SubdomainNotFound | import("@distilled.cloud/fly-io").TooManyRequests | import("@distilled.cloud/fly-io").Unauthorized | import("@distilled.cloud/cloudflare").UnknownCloudflareError, Access.Access | AlchemyContext | import("../../Artifacts.ts").ArtifactStore | CloudflareEnvironment.CloudflareEnvironment | CredentialsStore | import("effect/FileSystem").FileSystem | Interaction.Interaction | import("effect/Path").Path | import("../../Auth/Profile.ts").ProfileStore | SecretsStore.CloudflareOpContext>;
 export interface TeardownOptions {
     /** @default "alchemy-state-store" */
     workerName?: string;
@@ -46,7 +46,7 @@ export interface TeardownOptions {
  * re-run. Intended for reclaiming a throwaway account after testing; on a
  * shared account it only removes resources alchemy created.
  */
-export declare const teardownStateStore: (options?: TeardownOptions) => Effect.Effect<void, Config.ConfigError | workers.QueueConsumerConflict | workers.ServiceBindingConflict | SecretsStore.CloudflareOpError, CloudflareEnvironment.CloudflareEnvironment | CredentialsStore | SecretsStore.CloudflareOpContext>;
+export declare const teardownStateStore: (options?: TeardownOptions) => Effect.Effect<void, import("effect/PlatformError").PlatformError | import("../../Auth/Profile.ts").ProfileError | workers.QueueConsumerConflict | workers.ServiceBindingConflict | SecretsStore.CloudflareOpError, CloudflareEnvironment.CloudflareEnvironment | CredentialsStore | Interaction.Interaction | import("../../Auth/Profile.ts").ProfileStore | SecretsStore.CloudflareOpContext>;
 /**
  * Writes against a *just-deployed* state-store worker can fail
  * transiently while Cloudflare propagates the script, its route, and
@@ -80,7 +80,11 @@ export declare const isTransientBootstrapWriteError: (error: {
  * `CloudflareEnvironment`, `Credentials`, `HttpClient`, and
  * `FileSystem`.
  */
-export declare const loginWithCloudflare: (profileName: string, force: boolean) => Effect.Effect<StoredStateStoreCredentials, AuthError | import("@distilled.cloud/axiom").BadGateway | import("@distilled.cloud/cloudflare").CloudflareError | import("@distilled.cloud/cloudflare").CloudflareHttpError | import("@distilled.cloud/cloudflare").CloudflareParseError | import("@distilled.cloud/cloudflare").CloudflareRateLimited | Config.ConfigError | import("@distilled.cloud/axiom").ConfigError | workers.Forbidden | import("@distilled.cloud/axiom").GatewayTimeout | import("effect/unstable/http/HttpClientError").HttpClientError | import("@distilled.cloud/axiom").InternalServerError | SecretsStore.InvalidAccountId | import("@distilled.cloud/cloudflare").InvalidRoute | workers.InvalidRoute | import("@distilled.cloud/cloudflare").OAuthRefreshError | import("@distilled.cloud/axiom").ServiceUnavailable | workers.SubdomainNotFound | import("@distilled.cloud/axiom").TooManyRequests | import("@distilled.cloud/axiom").Unauthorized | import("@distilled.cloud/cloudflare").UnknownCloudflareError, Access.Access | CloudflareEnvironment.CloudflareEnvironment | CredentialsStore | SecretsStore.CloudflareOpContext>;
+export declare const loginWithCloudflare: (profileName: string, force: boolean) => Effect.Effect<{
+    readonly url: string;
+    readonly authToken: string;
+    readonly accountId?: string | undefined;
+}, AuthError | import("@distilled.cloud/fly-io").BadGateway | import("@distilled.cloud/cloudflare").CloudflareError | import("@distilled.cloud/cloudflare").CloudflareHttpError | import("@distilled.cloud/cloudflare").CloudflareParseError | import("@distilled.cloud/cloudflare").CloudflareRateLimited | Config.ConfigError | import("@distilled.cloud/fly-io").ConfigError | workers.Forbidden | import("@distilled.cloud/fly-io").GatewayTimeout | import("effect/unstable/http/HttpClientError").HttpClientError | import("@distilled.cloud/fly-io").InternalServerError | SecretsStore.InvalidAccountId | import("@distilled.cloud/cloudflare").InvalidRoute | workers.InvalidRoute | import("@distilled.cloud/cloudflare").OAuthRefreshError | import("@distilled.cloud/fly-io").ServiceUnavailable | workers.SubdomainNotFound | import("@distilled.cloud/fly-io").TooManyRequests | import("@distilled.cloud/fly-io").Unauthorized | import("@distilled.cloud/cloudflare").UnknownCloudflareError, Access.Access | CloudflareEnvironment.CloudflareEnvironment | CredentialsStore | Interaction.Interaction | SecretsStore.CloudflareOpContext>;
 declare class StateStoreVersionNotReady extends Error {
     readonly expected: number;
     readonly observed: number | undefined;

package/lib/Cloudflare/StateStore/State.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"State.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/StateStore/State.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,2CAA2C,CAAC;AAC1E,OAAO,KAAK,OAAO,MAAM,qCAAqC,CAAC;AAC/D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAItC,OAAO,KAAK,UAAU,MAAM,iCAAiC,CAAC;AAK9D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAI7D,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAC;AAU1C,OAAO,EAAE,KAAK,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAMhE,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AACvC,OAAO,KAAK,qBAAqB,MAAM,6BAA6B,CAAC;AAGrE,OAAO,EAEL,KAAK,2BAA2B,EAEjC,MAAM,sBAAsB,CAAC;AAU9B,eAAO,MAAM,KAAK,gVA2Lf,CAAC;AAEJ,MAAM,WAAW,gBAAgB;IAC/B,qCAAqC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qBAAqB;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,yBAAyB;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,SAAS,aAAa,gBAAgB,miDAsGhD,CAAC;AAEJ,MAAM,WAAW,eAAe;IAC9B,qCAAqC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yBAAyB;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,aAAa,eAAe,iPA6FxD,CAAC;AA0HJ;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,8BAA8B,UAAW;IACpD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,KAAG,OAUH,CAAC;AA8EF;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,mBAAmB,gBAAiB,MAAM,SAAS,OAAO,smCA4GpE,CAAC;AAuDJ,cAAM,yBAA0B,SAAQ,KAAK;IAGzC,QAAQ,CAAC,QAAQ,EAAE,MAAM;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS;IAHvC,QAAQ,CAAC,IAAI,+BAA+B;IAC5C,YACW,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAKtC;CACF;AA2LD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,2BAA2B,UAAW,OAAO,KAAG,OAe5D,CAAC"}
+{"version":3,"file":"State.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/StateStore/State.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,2CAA2C,CAAC;AAC1E,OAAO,KAAK,OAAO,MAAM,qCAAqC,CAAC;AAC/D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAItC,OAAO,KAAK,UAAU,MAAM,iCAAiC,CAAC;AAK9D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAI7D,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAC;AAW1C,OAAO,EAAE,KAAK,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAKhE,OAAO,KAAK,WAAW,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AACvC,OAAO,KAAK,qBAAqB,MAAM,6BAA6B,CAAC;AAiBrE,eAAO,MAAM,KAAK,4WAgNf,CAAC;AAEJ,MAAM,WAAW,gBAAgB;IAC/B,qCAAqC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qBAAqB;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,yBAAyB;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAoBD,eAAO,MAAM,SAAS,aAAa,gBAAgB,srDAkGhD,CAAC;AAEJ,MAAM,WAAW,eAAe;IAC9B,qCAAqC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yBAAyB;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,aAAa,eAAe,mYAwGxD,CAAC;AA0HJ;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,8BAA8B,UAAW;IACpD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,KAAG,OAUH,CAAC;AA8EF;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,mBAAmB,gBAAiB,MAAM,SAAS,OAAO;;;;0lCAiHpE,CAAC;AAuDJ,cAAM,yBAA0B,SAAQ,KAAK;IAGzC,QAAQ,CAAC,QAAQ,EAAE,MAAM;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS;IAHvC,QAAQ,CAAC,IAAI,+BAA+B;IAC5C,YACW,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAKtC;CACF;AA4LD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,2BAA2B,UAAW,OAAO,KAAG,OAe5D,CAAC"}

package/lib/Cloudflare/StateStore/State.js

@@ -16,29 +16,30 @@ import { adopt } from "../../AdoptPolicy.js";
 import { AlchemyContext } from "../../AlchemyContext.js";
 import { AuthError } from "../../Auth/AuthProvider.js";
 import { CredentialsStore } from "../../Auth/Credentials.js";
-import { ALCHEMY_PROFILE } from "../../Auth/Profile.js";
+import { currentProfileName } from "../../Auth/Profile.js";
 import * as Cloudflare from "../../Cloudflare/Providers.js";
 import { deploy } from "../../Deploy.js";
 import * as Output from "../../Output.js";
 import { RandomProvider } from "../../Random.js";
 import * as Alchemy from "../../Stack.js";
+import { Progress } from "../../Report.js";
 import { StateApi } from "../../State/HttpStateApi.js";
 import { checkHttpStateStoreAuth, makeHttpStateStore, } from "../../State/HttpStateStore.js";
 import { makeLocalState } from "../../State/LocalState.js";
 import { State } from "../../State/State.js";
 import { recordStateStoreInit, recordStateStoreOp, } from "../../Telemetry/Metrics.js";
-import * as Clank from "../../Util/Clank.js";
+import * as Interaction from "../../Interaction.js";
 import * as Access from "../Access.js";
 import * as CloudflareEnvironment from "../CloudflareEnvironment.js";
 import { EdgeSessionError, createEdgeSession } from "../EdgeSession.js";
 import Api, { STATE_STORE_SCRIPT_NAME, STATE_STORE_VERSION } from "./Api.js";
-import { CREDENTIALS_FILE, isStateStoreCredentialsStale, } from "./CredentialsFile.js";
+import { CREDENTIALS_FILE, StoredStateStoreCredentials, isStateStoreCredentialsStale, } from "./CredentialsFile.js";
 import { AuthToken, AuthTokenSecretName, EncryptionKeySecretName, TokenValue, } from "./Token.js";
 const CI = Config.boolean("CI").pipe(Config.withDefault(false));
 export const state = () => Layer.effect(State, Effect.gen(function* () {
     const isCI = yield* CI;
     const scriptName = STATE_STORE_SCRIPT_NAME;
-    const profileName = yield* ALCHEMY_PROFILE;
+    const profileName = yield* currentProfileName;
     const localStage = `${profileName}_${scriptName}`;
     const credStore = yield* CredentialsStore;
     // `deploy --yes` flows in here (via AlchemyContext.updateStateStore) to
@@ -51,19 +52,27 @@ export const state = () => Layer.effect(State, Effect.gen(function* () {
         if (yield* hasLocalStack(localStage)) {
             // if there's still a local stack, then we need to finish the bootstrap
             // TODO(sam): what if the local stack was
-            return yield* deployWithLocalState({
+            const task = (yield* Interaction.Interaction).task;
+            return yield* task({
+                label: `Resuming Cloudflare State Store '${scriptName}' deployment`,
+            }, deployWithLocalState({
                 scriptName,
                 profileName,
                 isCI,
                 force: false,
-            });
+            })).pipe(withStateBootstrapEvents(scriptName));
         }
         const ensureLatest = ({ url, authToken, }) => Effect.gen(function* () {
             const { matches, expected, observed } = yield* checkStateStoreVersion(url);
             if (observed === undefined) {
                 const shouldDeploy = autoUpdateStateStore ||
-                    (yield* Clank.confirm({
+                    (yield* Interaction.accessors.prompt.confirm({
                         message: `Cloudflare State Store '${scriptName}' is not available. Do you want to deploy it?`,
+                        // Deploying is the constructive happy path, not destructive
+                        // — keep default-yes despite the prompt-wide default-no.
+                        initialValue: true,
+                        confirmLabel: "Deploy",
+                        cancelLabel: "Cancel",
                     }));
                 if (shouldDeploy) {
                     return yield* bootstrap({
@@ -72,7 +81,7 @@ export const state = () => Layer.effect(State, Effect.gen(function* () {
                     });
                 }
                 else {
-                    return yield* Effect.die(new Clank.PromptCancelled());
+                    return yield* Effect.die(new Interaction.TerminalCancelled());
                 }
             }
             const httpState = yield* ensureAccess({ url, authToken });
@@ -81,15 +90,19 @@ export const state = () => Layer.effect(State, Effect.gen(function* () {
             }
             // The store is out of date. Upgrade it in place.
             const upgrade = Effect.gen(function* () {
-                yield* Clank.info(`Cloudflare State Store '${scriptName}' is out of date ` +
-                    `(expected v${expected}, observed v${observed ?? "unknown"}); upgrading...`);
-                const stateStoreOptions = yield* deployStateStore({
-                    stage: scriptName,
-                    state: httpState,
-                    force: false,
-                });
-                return yield* makeCloudflareStateStore(stateStoreOptions);
-            });
+                const interaction = yield* Interaction.Interaction;
+                return yield* interaction.task({
+                    label: `Updating Cloudflare State Store '${scriptName}'`,
+                    detail: `v${observed ?? "unknown"} → v${expected}`,
+                }, Effect.gen(function* () {
+                    const stateStoreOptions = yield* deployStateStore({
+                        stage: scriptName,
+                        state: httpState,
+                        force: false,
+                    });
+                    return yield* makeCloudflareStateStore(stateStoreOptions);
+                }));
+            }).pipe(withStateBootstrapEvents(scriptName));
             if (autoUpdateStateStore) {
                 // `--yes`: upgrade automatically (also unblocks CI).
                 return yield* upgrade;
@@ -98,19 +111,23 @@ export const state = () => Layer.effect(State, Effect.gen(function* () {
                 return yield* Effect.die(new AuthError({
                     message: `Cloudflare State store is out of date ` +
                         `(expected v${expected}, observed v${observed ?? "unknown"}). ` +
-                        `Run 'alchemy bootstrap cloudflare --profile <your-ci-profile>' to upgrade it first, or pass --yes.`,
+                        `Run 'alchemy provider cloudflare bootstrap --profile <your-ci-profile>' to upgrade it first, or pass --yes.`,
                 }));
             }
             else {
-                const shouldDeploy = yield* Clank.confirm({
+                const shouldDeploy = yield* Interaction.accessors.prompt.confirm({
                     message: `Cloudflare State Store '${scriptName}' is out of date ` +
                         `(expected v${expected}, observed v${observed ?? "unknown"})`,
+                    // Upgrading is the constructive happy path — default-yes.
+                    initialValue: true,
+                    confirmLabel: "Upgrade",
+                    cancelLabel: "Cancel",
                 });
                 if (shouldDeploy) {
                     return yield* upgrade;
                 }
                 else {
-                    return yield* Effect.die(new Clank.PromptCancelled());
+                    return yield* Effect.die(new Interaction.TerminalCancelled());
                 }
             }
         });
@@ -118,7 +135,6 @@ export const state = () => Layer.effect(State, Effect.gen(function* () {
             const isAuth = yield* checkHttpStateStoreAuth(credentials);
             if (!isAuth) {
                 // our token is wrong, force a refresh
-                yield* Clank.info(`Cloudflare State store authentication failed, refreshing credentials...`);
                 const credentials = yield* loginWithCloudflare(profileName, true);
                 if (!(yield* checkHttpStateStoreAuth(credentials))) {
                     return yield* Effect.die(new AuthError({
@@ -130,7 +146,7 @@ export const state = () => Layer.effect(State, Effect.gen(function* () {
             return yield* makeCloudflareStateStore(credentials);
         });
         const { accountId } = yield* yield* CloudflareEnvironment.CloudflareEnvironment;
-        const credentials = yield* credStore.read(profileName, CREDENTIALS_FILE);
+        const credentials = yield* credStore.read(profileName, CREDENTIALS_FILE, StoredStateStoreCredentials);
         if (credentials) {
             // The cached `url`/`authToken` are minted per-account (the `url`
             // encodes the account via its workers.dev subdomain). If the
@@ -139,7 +155,7 @@ export const state = () => Layer.effect(State, Effect.gen(function* () {
             // silently read/write state in the wrong account, so discard it
             // and fall through to re-derivation from the current account.
             if (isStateStoreCredentialsStale(credentials, accountId)) {
-                yield* Clank.info(`Cloudflare State Store credentials were minted for a different ` +
+                yield* Interaction.accessors.output.info(`Cloudflare State Store credentials were minted for a different ` +
                     `Cloudflare account; re-deriving for the current account.`);
                 yield* credStore
                     .delete(profileName, CREDENTIALS_FILE)
@@ -158,15 +174,18 @@ export const state = () => Layer.effect(State, Effect.gen(function* () {
         }
         else if (isCI) {
             return yield* Effect.die(new AuthError({
-                message: `Cloudflare State store not found. Run 'alchemy bootstrap cloudflare --profile <your-ci-profile>' to deploy it first, or pass --yes.`,
+                message: `Cloudflare State store not found. Run 'alchemy provider cloudflare bootstrap --profile <your-ci-profile>' to deploy it first, or pass --yes.`,
             }));
         }
         else {
-            return yield* Clank.confirm({
+            const confirm = Interaction.accessors.prompt.confirm;
+            return yield* confirm({
                 message: "Cloudflare State Store not found. Do you want to deploy it?",
+                // Deploying is the constructive happy path — default-yes.
+                initialValue: true,
             }).pipe(Effect.flatMap((shouldDeploy) => shouldDeploy
                 ? bootstrap()
-                : Effect.die(new Clank.PromptCancelled())));
+                : Effect.die(new Interaction.TerminalCancelled())));
         }
     }).pipe(recordStateStoreInit, Effect.orDie);
     return yield* Effect.cached(init.pipe(Effect.provideContext(context)));
@@ -179,9 +198,24 @@ export const state = () => Layer.effect(State, Effect.gen(function* () {
 // `provide` (not `provideMerge`) so the distilled Retry tag stays
 // out of this layer's public type.
 Layer.provide(Cloudflare.CloudflareApiLive()), Layer.orDie);
-export const bootstrap = (options = {}) => Effect.gen(function* () {
+/**
+ * Report `state.bootstrap.*` progress events around a state-store deploy or
+ * upgrade. Bootstrap runs lazily inside the plan's "loading state" phase,
+ * can take many seconds (it deploys a worker), and would otherwise be
+ * invisible to non-interactive renderers and traces — the Interaction task only
+ * paints the local terminal.
+ */
+const withStateBootstrapEvents = (store) => (effect) => Effect.gen(function* () {
+    const report = yield* Progress;
+    yield* report({ _tag: "state.bootstrap.started", store });
+    const result = yield* effect;
+    yield* report({ _tag: "state.bootstrap.completed", store });
+    return result;
+});
+export const bootstrap = (options = {}) => withStateBootstrapEvents(options.workerName ?? STATE_STORE_SCRIPT_NAME)(Effect.gen(function* () {
+    const interaction = yield* Interaction.Interaction;
     const isCI = yield* CI;
-    const profileName = options.profile ?? (yield* ALCHEMY_PROFILE);
+    const profileName = options.profile ?? (yield* currentProfileName);
     const scriptName = options.workerName ?? STATE_STORE_SCRIPT_NAME;
     const force = options.force ?? false;
     const localStage = `${profileName}_${scriptName}`;
@@ -194,20 +228,21 @@ export const bootstrap = (options = {}) => Effect.gen(function* () {
     yield* annotateAccountHash();
     if (yield* hasLocalStack(localStage)) {
         // if there's a local stack still, we can assume we did not finish hoisting it, so finish that
-        yield* Clank.info(`Resuming Cloudflare State Store '${scriptName}' deployment...`);
         // resume deployment
-        return yield* deployWithLocalState({
+        return yield* interaction.task({
+            label: `Resuming Cloudflare State Store '${scriptName}' deployment`,
+        }, deployWithLocalState({
             scriptName,
             profileName,
             isCI,
             force,
-        }).pipe(Effect.tap(() => Clank.success(`Cloudflare State Store '${scriptName}' is ready.`)));
+        }));
     }
     const { accountId } = yield* yield* CloudflareEnvironment.CloudflareEnvironment;
     if (yield* isStateStoreServing(accountId)) {
         // this is a regular update, let's check if it needs an update and refresh credentials
         if (!force) {
-            yield* Clank.info(`Worker '${scriptName}' already exists; adopting and refreshing credentials. ` +
+            yield* Interaction.accessors.output.info(`Worker '${scriptName}' already exists; adopting and refreshing credentials. ` +
                 `Use --force to redeploy.`);
         }
         const credentials = yield* loginWithCloudflare(profileName, 
@@ -217,43 +252,40 @@ export const bootstrap = (options = {}) => Effect.gen(function* () {
         if (!isCI) {
             // we don't write credentials in CI because the file system is ephemeral
             const store = yield* CredentialsStore;
-            yield* store.write(profileName, CREDENTIALS_FILE, credentials);
+            yield* store.write(profileName, CREDENTIALS_FILE, StoredStateStoreCredentials, credentials);
         }
         const { matches, expected, observed } = yield* checkStateStoreVersion(url);
         const httpState = yield* makeCloudflareStateStore({ url, authToken });
         if (!matches || force) {
-            if (matches && force) {
-                yield* Clank.info(`Cloudflare State Store '${scriptName}' is up to date; force redeploying...`);
-            }
-            else {
-                yield* Clank.info(`Cloudflare State Store '${scriptName}' is out of date ` +
-                    `(expected v${expected}, observed v${observed ?? "unknown"}); redeploying...`);
-            }
-            return yield* makeCloudflareStateStore(yield* deployStateStore({
+            return yield* interaction.task({
+                label: `${matches ? "Redeploying" : "Updating"} Cloudflare State Store '${scriptName}'`,
+                detail: matches
+                    ? "forced"
+                    : `v${observed ?? "unknown"} → v${expected}`,
+            }, deployStateStore({
                 stage: scriptName,
                 state: httpState,
                 force,
-            }));
+            }).pipe(Effect.flatMap(makeCloudflareStateStore)));
         }
         else {
             return httpState;
         }
     }
     else {
-        yield* Clank.info(`Deploying Cloudflare State Store '${scriptName}'...`);
-        return yield* deployWithLocalState({
+        return yield* interaction.task({ label: `Deploying Cloudflare State Store '${scriptName}'` }, deployWithLocalState({
             scriptName,
             profileName,
             isCI,
             force,
-        }).pipe(Effect.tap(() => Clank.success(`Cloudflare State Store '${scriptName}' is ready.`)));
+        }));
     }
 }).pipe(Effect.withSpan("state_store.bootstrap", {
     attributes: {
         "alchemy.state_store.op": "bootstrap",
         "alchemy.state_store.script_name": options.workerName ?? STATE_STORE_SCRIPT_NAME,
     },
-}));
+})));
 /**
  * The inverse of {@link bootstrap}: tear down the Cloudflare-deployed state
  * store. Deletes the state-store Worker and the secrets it created in the
@@ -266,7 +298,8 @@ export const bootstrap = (options = {}) => Effect.gen(function* () {
  * shared account it only removes resources alchemy created.
  */
 export const teardownStateStore = (options = {}) => Effect.gen(function* () {
-    const profileName = options.profile ?? (yield* ALCHEMY_PROFILE);
+    const interaction = yield* Interaction.Interaction;
+    const profileName = options.profile ?? (yield* currentProfileName);
     const scriptName = options.workerName ?? STATE_STORE_SCRIPT_NAME;
     const deleteEmptyStore = options.deleteEmptySecretsStore ?? true;
     const { accountId } = yield* yield* CloudflareEnvironment.CloudflareEnvironment;
@@ -276,8 +309,8 @@ export const teardownStateStore = (options = {}) => Effect.gen(function* () {
         "alchemy.state_store.profile": profileName,
     });
     // 1. Delete the state-store Worker.
-    yield* Clank.info(`Deleting state store worker '${scriptName}'...`);
-    yield* workers.deleteScript({ accountId, scriptName, force: true }).pipe(Effect.asVoid, Effect.catchTag("WorkerNotFound", () => Clank.info(`  Worker '${scriptName}' not found (already gone).`)));
+    yield* Interaction.accessors.output.info(`Deleting state store worker '${scriptName}'...`);
+    yield* workers.deleteScript({ accountId, scriptName, force: true }).pipe(Effect.asVoid, Effect.catchTag("WorkerNotFound", () => interaction.output.info(`  Worker '${scriptName}' not found (already gone).`)));
     // 2. Delete the secrets the state store created, plus any now-empty store.
     const ourSecretNames = new Set([
         AuthTokenSecretName,
@@ -290,7 +323,7 @@ export const teardownStateStore = (options = {}) => Effect.gen(function* () {
             .pipe(Stream.runCollect, Effect.map((chunk) => Array.from(chunk)), Effect.catchTag(["StoreNotFound", "InvalidAccountId"], () => Effect.succeed([])));
         const ours = secrets.filter((s) => ourSecretNames.has(s.name));
         for (const secret of ours) {
-            yield* Clank.info(`Deleting secret '${secret.name}'...`);
+            yield* Interaction.accessors.output.info(`Deleting secret '${secret.name}'...`);
             yield* SecretsStore.deleteStoreSecret({
                 accountId,
                 storeId: store.id,
@@ -299,7 +332,7 @@ export const teardownStateStore = (options = {}) => Effect.gen(function* () {
         }
         const remaining = secrets.length - ours.length;
         if (deleteEmptyStore && remaining === 0) {
-            yield* Clank.info(`Deleting empty secrets store '${store.id}'...`);
+            yield* Interaction.accessors.output.info(`Deleting empty secrets store '${store.id}'...`);
             yield* SecretsStore.deleteStore({
                 accountId,
                 storeId: store.id,
@@ -307,14 +340,14 @@ export const teardownStateStore = (options = {}) => Effect.gen(function* () {
             }).pipe(Effect.asVoid, Effect.catchTag(["StoreNotFound", "NotFound", "InvalidAccountId"], () => Effect.void));
         }
         else if (remaining > 0) {
-            yield* Clank.info(`Secrets store '${store.id}' still has ${remaining} other ` +
+            yield* Interaction.accessors.output.info(`Secrets store '${store.id}' still has ${remaining} other ` +
                 `secret(s); leaving it in place.`);
         }
     }
     // 3. Drop the locally cached state-store credentials for this profile.
     const credStore = yield* CredentialsStore;
     yield* credStore.delete(profileName, CREDENTIALS_FILE).pipe(Effect.ignore);
-    yield* Clank.success(`Cloudflare State Store '${scriptName}' torn down.`);
+    yield* Interaction.accessors.output.success(`Cloudflare State Store '${scriptName}' torn down.`);
 }).pipe(Effect.withSpan("state_store.teardown", {
     attributes: {
         "alchemy.state_store.op": "teardown",
@@ -504,7 +537,7 @@ export const loginWithCloudflare = (profileName, force) => Effect.gen(function*
     const { accountId } = yield* yield* CloudflareEnvironment.CloudflareEnvironment;
     if (!force) {
         // try and read from the cached credentials first if not forcing (force will always refresh)
-        const credentials = yield* credStore.read(profileName, CREDENTIALS_FILE);
+        const credentials = yield* credStore.read(profileName, CREDENTIALS_FILE, StoredStateStoreCredentials);
         // Ignore a cache minted for a different account (or a legacy file with
         // no `accountId`) — reusing it would hand back the wrong account's
         // state-store URL. Fall through to re-derive against `accountId`.
@@ -513,53 +546,53 @@ export const loginWithCloudflare = (profileName, force) => Effect.gen(function*
             return credentials;
         }
     }
-    // 1. Locate the single Secrets Store on the account.
-    const store = yield* SecretsStore.listStores
-        .items({ accountId })
-        .pipe(Stream.runHead, Effect.map(Option.getOrUndefined));
-    if (!store) {
-        return yield* Effect.fail(new AuthError({
-            message: "No Secrets Store found on this account. Deploy the state store first.",
-        }));
-    }
-    // 2. Fetch the auth-token from Secrets Store with a temporary edge-preview worker
-    const authToken = yield* readSecretViaEdge(STATE_STORE_SCRIPT_NAME, store.id, AuthTokenSecretName).pipe(Effect.retry({
-        while: (error) => isWorkersPreviewConfigurationError(error) ||
-            isTransientEdgeSessionError(error),
-        // Cap the exponential delay at 2s so 15 retries stay within
-        // ~30s instead of doubling unboundedly.
-        schedule: Schedule.max([
-            Schedule.min([
-                Schedule.exponential(200),
-                Schedule.spaced("2 seconds"),
+    const interaction = yield* Interaction.Interaction;
+    const credentials = yield* interaction.task({ label: "Refreshing Cloudflare State Store credentials" }, Effect.gen(function* () {
+        // 1. Locate the single Secrets Store on the account.
+        const store = yield* SecretsStore.listStores
+            .items({ accountId })
+            .pipe(Stream.runHead, Effect.map(Option.getOrUndefined));
+        if (!store) {
+            return yield* Effect.fail(new AuthError({
+                message: "No Secrets Store found on this account. Deploy the state store first.",
+            }));
+        }
+        // 2. Fetch the auth-token from Secrets Store with a temporary edge-preview worker.
+        const authToken = yield* readSecretViaEdge(STATE_STORE_SCRIPT_NAME, store.id, AuthTokenSecretName).pipe(Effect.retry({
+            while: (error) => isWorkersPreviewConfigurationError(error) ||
+                isTransientEdgeSessionError(error),
+            // Cap the exponential delay at 2s so 15 retries stay within
+            // ~30s instead of doubling unboundedly.
+            schedule: Schedule.max([
+                Schedule.min([
+                    Schedule.exponential(200),
+                    Schedule.spaced("2 seconds"),
+                ]),
+                Schedule.recurs(15),
             ]),
-            Schedule.recurs(15),
-        ]),
-    }));
-    // 3. Derive the deployed worker URL.
-    const { subdomain } = yield* workers.getSubdomain({ accountId });
-    const url = `https://${STATE_STORE_SCRIPT_NAME}.${subdomain}.workers.dev`;
-    if (!isCI) {
-        // 4. Persist credentials. The profile entry is managed by
-        //    `loadOrConfigure` when this is invoked through `configure`.
-        yield* credStore
-            .write(profileName, CREDENTIALS_FILE, {
+        }));
+        // 3. Derive the deployed worker URL.
+        const { subdomain } = yield* workers.getSubdomain({ accountId });
+        const url = `https://${STATE_STORE_SCRIPT_NAME}.${subdomain}.workers.dev`;
+        const credentials = {
             url,
             authToken: authToken.trim(),
             accountId,
-        })
-            .pipe(Effect.mapError((e) => new AuthError({
-            message: "Failed to write credentials",
-            cause: e,
-        })));
-        yield* Clank.success(`HTTP state store credentials saved for '${profileName}'.`);
-        yield* Clank.info(`  url:     ${url}`);
-    }
-    return {
-        url,
-        authToken: authToken.trim(),
-        accountId,
-    };
+        };
+        if (!isCI) {
+            // 4. Persist credentials for subsequent invocations.
+            yield* credStore
+                .write(profileName, CREDENTIALS_FILE, StoredStateStoreCredentials, credentials)
+                .pipe(Effect.mapError((e) => new AuthError({
+                message: "Failed to write credentials",
+                cause: e,
+            })));
+        }
+        return credentials;
+    }));
+    if (!isCI)
+        yield* interaction.output.info(`  url:     ${credentials.url}`);
+    return credentials;
 }).pipe(Effect.catchTag("EdgeSessionError", (e) => Effect.fail(new AuthError({
     message: `Edge-preview secret read failed: ${e.message}`,
     cause: e.cause,
@@ -737,10 +770,10 @@ const readSecretViaEdge = (scriptName, storeId, secretName) => Effect.gen(functi
     },
 }));
 const writeCredentials = (url, authToken) => Effect.gen(function* () {
-    const profileName = yield* ALCHEMY_PROFILE;
+    const profileName = yield* currentProfileName;
     const credStore = yield* CredentialsStore;
     const { accountId } = yield* yield* CloudflareEnvironment.CloudflareEnvironment;
-    yield* credStore.write(profileName, CREDENTIALS_FILE, {
+    yield* credStore.write(profileName, CREDENTIALS_FILE, StoredStateStoreCredentials, {
         url,
         authToken,
         accountId,