alchemy 2.0.0-beta.84 → 2.0.0-beta.85

package/src/Cli/commands/logs.ts

@@ -3,8 +3,8 @@ import * as Console from "effect/Console";
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
 import * as Stream from "effect/Stream";
-import * as Logs from "../../Alchemist/routes/logs.ts";
-import { paint } from "../CliKit/index.ts";
+import * as Alchemist from "../../Alchemist/index.ts";
+import { paint } from "../../Util/Terminal.ts";
 import { formatLocalTimestamp, TAIL_COLORS } from "../Format.ts";
 import { config, envFile, parseSince, profile, resolveStage, stage } from "./flags.ts";
 import { instrumentCommand } from "./instrument.ts";
@@ -59,41 +59,33 @@ const runLogs = Effect.fn(function* ({
     .split(",")
     .map((resource) => resource.trim())
     .filter((resource) => resource.length > 0);
-  const target = {
-    entrypoint: main,
-    stage,
-    profile,
-    envFile: Option.getOrUndefined(envFile),
+  const stack = yield* Alchemist.importStack(main);
+  const options = { stage, profile, envFile: Option.getOrUndefined(envFile) };
+  // Colors are assigned as each resource first appears, so the command
+  // builds the stack once instead of listing resources up front.
+  const colors = new Map<string, (typeof TAIL_COLORS)[number]>();
+  const format = (entry: Alchemist.Logs.LogEntry) => {
+    const fqn = entry.resource.fqn;
+    if (!colors.has(fqn)) colors.set(fqn, TAIL_COLORS[colors.size % TAIL_COLORS.length]!);
+    return `${paint(colors.get(fqn)!, `${formatLocalTimestamp(entry.timestamp)} [${fqn}]`)} ${entry.message}`;
   };
-  const available = yield* Logs.resources(target);
-  const selectedSet = new Set(selected);
-  const matching = available.filter(
-    (resource) =>
-      selectedSet.size === 0 ||
-      selectedSet.has(resource.fqn) ||
-      selectedSet.has(resource.logicalId),
-  );
-  const colors = new Map(
-    matching.map((resource, index) => [resource.fqn, TAIL_COLORS[index % TAIL_COLORS.length]!]),
-  );
-  const format = (entry: { resource: { fqn: string }; timestamp: Date; message: string }) =>
-    `${paint(colors.get(entry.resource.fqn) ?? "gray", `${formatLocalTimestamp(entry.timestamp)} [${entry.resource.fqn}]`)} ${entry.message}`;
 
   if (tail) {
-    const tailing = matching.filter((resource) => resource.supportsTail);
-    if (tailing.length === 0) {
-      yield* Console.log("No matching resources support live logs.");
-      return;
-    }
-    yield* Console.log(`Tailing: ${tailing.map(({ logicalId }) => logicalId).join(", ")}`);
-    yield* Logs.tail({ target, resources: selected }).pipe(
-      Stream.runForEach((entry) => Console.log(format(entry))),
+    // The merged stream ends at once when no selected resource can tail.
+    let received = false;
+    yield* Alchemist.Logs.tail({ ...options, stack, resources: selected }).pipe(
+      Stream.runForEach((entry) => {
+        received = true;
+        return Console.log(format(entry));
+      }),
     );
+    if (!received) yield* Console.log("No matching resources support live logs.");
     return;
   }
 
-  const entries = yield* Logs.entries({
-    target,
+  const entries = yield* Alchemist.Logs.entries({
+    ...options,
+    stack,
     resources: selected,
     limit,
     since: sinceDate,

package/src/Cli/commands/nuke.ts

@@ -4,8 +4,8 @@ import * as Console from "effect/Console";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
-import * as Nuke from "../../Alchemist/routes/nuke.ts";
-import * as CliKit from "../../Cli/CliKit/index.ts";
+import * as Alchemist from "../../Alchemist/index.ts";
+import * as Interaction from "../../Interaction.ts";
 import { renderNukeScan, renderNukeDelete, reviewNuke } from "../components/view/Nuke.tsx";
 import { formatElapsed } from "../Format.ts";
 import { exitDeclined, UserInputError } from "./errors.ts";
@@ -58,12 +58,13 @@ const dryRunFlag = Flag.Boolean("dry-run").pipe(
 const compileFilter = (expression: string) =>
   Effect.try({
     try: () =>
+      // oxlint-disable-next-line typescript/no-implied-eval -- --filter is a user-supplied JS expression by design
       new Function("scope", `with (scope) { return (${expression}); }`) as (scope: {
         resource: Record<string, unknown>;
       }) => unknown,
     catch: (cause) =>
       new UserInputError({
-        message: `--filter expression ${JSON.stringify(expression)} failed to compile: ${cause}`,
+        message: `--filter expression ${JSON.stringify(expression)} failed to compile: ${cause instanceof Error ? cause.message : String(cause)}`,
       }),
   }).pipe(
     Effect.map(
@@ -72,7 +73,7 @@ const compileFilter = (expression: string) =>
           try: () => Boolean(predicate({ resource })),
           catch: (cause) =>
             new UserInputError({
-              message: `--filter expression ${JSON.stringify(expression)} threw while evaluating a resource: ${cause}`,
+              message: `--filter expression ${JSON.stringify(expression)} threw while evaluating a resource: ${cause instanceof Error ? cause.message : String(cause)}`,
             }),
         }),
     ),
@@ -104,16 +105,18 @@ const nukeCommand = Command.make(
           "alchemy.main": args.main,
         }))(
           Effect.fn(function* (args) {
-            const scan = yield* Nuke.scan({
-              entrypoint: args.main,
-              profile: args.profile,
-              envFile: Option.getOrUndefined(args.envFile),
-              mode: args.local ? "local" : "live",
-              include: args.include,
-              exclude: args.exclude,
-              concurrency: args.concurrency,
-              providerTimeoutSeconds: Duration.toSeconds(args.timeout),
-            }).pipe(renderNukeScan());
+            const scan = yield* Effect.flatMap(Alchemist.importStack(args.main), (stack) =>
+              Alchemist.Nuke.scan({
+                stack,
+                profile: args.profile,
+                envFile: Option.getOrUndefined(args.envFile),
+                dev: args.local,
+                include: args.include,
+                exclude: args.exclude,
+                concurrency: args.concurrency,
+                providerTimeoutSeconds: Duration.toSeconds(args.timeout),
+              }),
+            ).pipe(renderNukeScan());
             const predicates = yield* Effect.forEach(args.filter, compileFilter);
             const targets: Array<(typeof scan.resources)[number]> = [];
             for (const resource of scan.resources) {
@@ -127,7 +130,7 @@ const nukeCommand = Command.make(
               if (!matches.some(Boolean)) targets.push(resource);
             }
             if (targets.length === 0) {
-              yield* CliKit.accessors.output.info("Nothing to delete.");
+              yield* Interaction.info("Nothing to delete.");
               return;
             }
             const approved = yield* reviewNuke(targets, {
@@ -136,7 +139,7 @@ const nukeCommand = Command.make(
               dryRun: args.dryRun,
             });
             if (!approved) {
-              yield* CliKit.accessors.output.info("Aborted.");
+              yield* Interaction.info("Aborted.");
               return yield* exitDeclined;
             }
             if (args.dryRun) {
@@ -144,28 +147,24 @@ const nukeCommand = Command.make(
               return;
             }
             const deleteStartedAt = yield* Clock.currentTimeMillis;
-            const result = yield* Nuke.execute({
+            const result = yield* Alchemist.Nuke.execute({
               scan,
               resources: targets,
               strategy: args.independent
-                ? { _tag: "independent", retries: args.retries }
-                : { _tag: "coordinated" },
+                ? { type: "independent", retries: args.retries }
+                : { type: "coordinated" },
               concurrency: args.concurrency,
               providerTimeoutSeconds: Duration.toSeconds(args.timeout),
             }).pipe(renderNukeDelete(targets, scan.mode));
             const deleteElapsed = (yield* Clock.currentTimeMillis) - deleteStartedAt;
-            yield* CliKit.accessors.output.success(
+            yield* Interaction.success(
               `Deleted ${result.deleted.length} resource(s) over ${result.passes} pass(es) (${formatElapsed(deleteElapsed)}).`,
             );
             if (result.held.length > 0) {
-              yield* CliKit.accessors.output.warning(
-                `${result.held.length} resource(s) were held back.`,
-              );
+              yield* Interaction.warning(`${result.held.length} resource(s) were held back.`);
             }
             if (result.failed.length > 0) {
-              yield* CliKit.accessors.output.error(
-                `${result.failed.length} resource(s) could not be deleted.`,
-              );
+              yield* Interaction.error(`${result.failed.length} resource(s) could not be deleted.`);
             }
           }),
         ),

package/src/Cli/commands/profile/commands.ts

@@ -5,13 +5,13 @@ import * as Clock from "effect/Clock";
 import * as ConfigProvider from "effect/ConfigProvider";
 import * as Console from "effect/Console";
 import * as Effect from "effect/Effect";
+import * as Match from "effect/Match";
 import * as Option from "effect/Option";
 import * as Redacted from "effect/Redacted";
-import { Progress } from "../../../Alchemist/Progress.ts";
-import * as Profiles from "../../../Alchemist/routes/profile.ts";
+import * as Alchemist from "../../../Alchemist/index.ts";
 import { getEnv } from "../../../Auth/Env.ts";
 import { resolveProfileName } from "../../../Auth/Resolve.ts";
-import * as CliKit from "../../../Cli/CliKit/index.ts";
+import * as Interaction from "../../../Interaction.ts";
 import { loadConfigProvider } from "../../../Util/ConfigProvider.ts";
 import { formatElapsed } from "../../Format.ts";
 import { exitDeclined, failWithHelp, UserInputError } from "../errors.ts";
@@ -64,8 +64,8 @@ const listCommand = Command.make(
   { envFile },
   instrumentCommand("profile.list")(
     Effect.fn(function* () {
-      const entries = yield* Profiles.list();
-      const cli = yield* CliKit.CliKit;
+      const entries = yield* Alchemist.Profile.list();
+      const cli = yield* Interaction.Interaction;
       if (cli.terminal.input) {
         const { profileListNode } = yield* profileTui;
         yield* cli.output.print(profileListNode(entries));
@@ -93,8 +93,8 @@ const createCommand = Command.make(
     "alchemy.profile": a.name,
   }))(
     Effect.fn(function* ({ name }) {
-      yield* Profiles.create({ name });
-      yield* CliKit.accessors.output.success(
+      yield* Alchemist.Profile.create({ name });
+      yield* Interaction.success(
         `Created profile '${name}'. Run \`alchemy profile edit --profile ${name}\` to connect accounts.`,
       );
     }),
@@ -110,13 +110,11 @@ const renameCommand = Command.make(
   }))(
     Effect.fn(function* ({ name, newName }) {
       if (Option.isSome(newName)) {
-        yield* Profiles.rename({
+        yield* Alchemist.Profile.rename({
           name,
           newName: newName.value.trim(),
         });
-        yield* CliKit.accessors.output.success(
-          `Renamed profile '${name}' to '${newName.value.trim()}'.`,
-        );
+        yield* Interaction.success(`Renamed profile '${name}' to '${newName.value.trim()}'.`);
         return;
       }
       yield* renameProfileFlow(name, undefined);
@@ -196,7 +194,7 @@ const resolveSetValues = Effect.fn(function* (
         try: () => readFileSync(0, "utf8").trim(),
         catch: (cause) =>
           new UserInputError({
-            message: `Could not read stdin for --set ${key}=-: ${cause}`,
+            message: `Could not read stdin for --set ${key}=-: ${cause instanceof Error ? cause.message : String(cause)}`,
           }),
       });
     } else if (raw.startsWith("env:")) {
@@ -261,7 +259,7 @@ const editCommand = Command.make(
       }
       if (configureInput !== undefined) {
         const provider = (add[0] ?? reconfigure[0])!;
-        yield* Profiles.configure({
+        yield* Alchemist.Profile.configure({
           profile: selectedProfile,
           provider,
           entrypoint: main,
@@ -275,22 +273,20 @@ const editCommand = Command.make(
             ]),
           ),
         });
-        yield* CliKit.accessors.output.success(
+        yield* Interaction.success(
           `${add.length === 1 ? "Added" : "Updated"} '${provider}' in profile '${selectedProfile}'.`,
         );
         return;
       }
       if (add.length === 0 && reconfigure.length === 0 && remove.length > 0) {
         for (const provider of remove) {
-          yield* Profiles.removeProvider({
+          yield* Alchemist.Profile.removeProvider({
             profile: selectedProfile,
             provider,
             entrypoint: main,
             envFile: Option.getOrUndefined(envFile),
           });
-          yield* CliKit.accessors.output.success(
-            `Removed '${provider}' from profile '${selectedProfile}'.`,
-          );
+          yield* Interaction.success(`Removed '${provider}' from profile '${selectedProfile}'.`);
         }
         return;
       }
@@ -325,31 +321,35 @@ const refreshCommand = Command.make(
     Effect.fn(function* ({ profile, providers, envFile, main }) {
       const selectedProfile = yield* resolveProfileName(envFile, profile);
       const refreshStarted = new Map<string, number>();
-      yield* Profiles.refresh({
+      yield* Alchemist.Profile.refresh({
         profile: selectedProfile,
         providers,
         entrypoint: main,
         envFile: Option.getOrUndefined(envFile),
       }).pipe(
-        Effect.provideService(Progress, (event) =>
-          event._tag === "provider.refresh.started"
-            ? Clock.currentTimeMillis.pipe(
-                Effect.tap((now) => Effect.sync(() => refreshStarted.set(event.provider, now))),
-                Effect.andThen(CliKit.accessors.output.info(`Refreshing ${event.provider}`)),
-              )
-            : event._tag === "provider.refresh.completed"
-              ? Clock.currentTimeMillis.pipe(
+        Alchemist.onEvent(
+          Match.type<Alchemist.Event>().pipe(
+            Match.discriminators("type")({
+              "provider.refresh.started": (event) =>
+                Clock.currentTimeMillis.pipe(
+                  Effect.tap((now) => Effect.sync(() => refreshStarted.set(event.provider, now))),
+                  Effect.andThen(Interaction.info(`Refreshing ${event.provider}`)),
+                ),
+              "provider.refresh.completed": (event) =>
+                Clock.currentTimeMillis.pipe(
                   Effect.flatMap((now) => {
                     const from = refreshStarted.get(event.provider);
-                    return CliKit.accessors.output.success(
+                    return Interaction.success(
                       `Refreshed ${event.provider}${from === undefined ? "" : ` (${formatElapsed(now - from)})`}`,
                     );
                   }),
-                )
-              : Effect.void,
+                ),
+            }),
+            Match.orElse(() => Effect.void),
+          ),
         ),
       );
-      yield* CliKit.accessors.output.success(`Refreshed profile '${selectedProfile}'.`);
+      yield* Interaction.success(`Refreshed profile '${selectedProfile}'.`);
     }),
   ),
 ).pipe(
@@ -361,14 +361,14 @@ const currentCommand = Command.make(
   { envFile },
   instrumentCommand("profile.current")(
     Effect.fn(function* () {
-      const selected = yield* Profiles.current();
+      const selected = yield* Alchemist.Profile.current();
       const source =
         selected.source === "configuration"
           ? "ALCHEMY_PROFILE"
           : selected.source === "default"
             ? "built-in default"
             : "command line";
-      const cli = yield* CliKit.CliKit;
+      const cli = yield* Interaction.Interaction;
       if (cli.terminal.input) {
         const { currentProfileNode } = yield* profileTui;
         yield* cli.output.print(currentProfileNode(selected.name, source));
@@ -401,7 +401,7 @@ export const profileCommand = Command.make(
   { envFile, main: config },
   instrumentCommand("profile")(
     Effect.fn(function* ({ envFile, main }) {
-      if (!(yield* CliKit.CliKit).terminal.input) {
+      if (!(yield* Interaction.Interaction).terminal.input) {
         // No terminal to drive the hub — show the subcommand help instead,
         // which documents the flag-driven equivalents of every hub action.
         return yield* failWithHelp(["alchemy", "profile"]);

package/src/Cli/commands/profile/flows.ts

@@ -2,8 +2,9 @@ import * as Console from "effect/Console";
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
 import * as Redacted from "effect/Redacted";
-import * as Profiles from "../../../Alchemist/routes/profile.ts";
-import * as CliKit from "../../../Cli/CliKit/index.ts";
+import * as Alchemist from "../../../Alchemist/index.ts";
+import * as Interaction from "../../../Interaction.ts";
+import { glyphsFor } from "../../../Util/Theme.ts";
 import { confirmOrDecline } from "../confirm.ts";
 import { isPromptCancellation } from "../errors.ts";
 
@@ -22,7 +23,7 @@ export const showProfileFlow = Effect.fn(function* (options: {
   envFile: Option.Option<string>;
   main: string;
 }) {
-  const profile = yield* Profiles.get({
+  const profile = yield* Alchemist.Profile.get({
     name: options.profileName,
     includeProviderStatus: true,
     entrypoint: options.main,
@@ -48,14 +49,14 @@ export const renameProfileFlow = Effect.fn(function* (
 ) {
   const newName = (
     suppliedNewName ??
-    (yield* CliKit.accessors.prompt.text({
+    (yield* Interaction.text({
       message: `Rename profile '${name}' to`,
       placeholder: `${name}-new`,
       validate: (value) => (value.trim().length > 0 ? undefined : "Profile name is required"),
     }))
   ).trim();
-  yield* Profiles.rename({ name, newName });
-  yield* CliKit.accessors.output.success(`Renamed profile '${name}' to '${newName}'.`);
+  yield* Alchemist.Profile.rename({ name, newName });
+  yield* Interaction.success(`Renamed profile '${name}' to '${newName}'.`);
   return newName;
 });
 
@@ -67,7 +68,7 @@ export const deleteProfileFlow = Effect.fn(function* (options: {
 }) {
   // Existence check only — skip the provider-status probe (it imports the
   // stack entrypoint and reaches provider APIs).
-  const exists = yield* Profiles.get({
+  const exists = yield* Alchemist.Profile.get({
     name: options.name,
     includeProviderStatus: false,
   }).pipe(Effect.option);
@@ -83,8 +84,8 @@ export const deleteProfileFlow = Effect.fn(function* (options: {
     confirmLabel: "Delete",
     cancelLabel: "Cancel",
   });
-  yield* Profiles.deleteProfile({ name: options.name });
-  yield* CliKit.accessors.output.success(`Deleted profile '${options.name}' and its credentials.`);
+  yield* Alchemist.Profile.deleteProfile({ name: options.name });
+  yield* Interaction.success(`Deleted profile '${options.name}' and its credentials.`);
   return true;
 });
 
@@ -115,20 +116,23 @@ export const editProfileFlow = Effect.fn(function* (options: {
   if (plan.length === 0) {
     // Only connected names/methods are needed for the cycle prompt; the
     // status probe would import the entrypoint and reach provider APIs.
-    const profile = yield* Profiles.get({
+    const profile = yield* Alchemist.Profile.get({
       name: options.selectedProfile,
       includeProviderStatus: false,
     });
-    const available = yield* Profiles.providers({
+    const available = yield* Alchemist.Profile.providers({
       profile: options.selectedProfile,
       entrypoint: options.main,
       envFile: Option.getOrUndefined(options.envFile),
     });
     const connected = new Map(profile.providers.map((item) => [item.name, item]));
     const names = [...new Set([...connected.keys(), ...available.map(({ name }) => name)])].sort();
-    const prompt = yield* CliKit.CliKit;
+    const prompt = yield* Interaction.Interaction;
     const { editStateStyle } = yield* profileTui;
-    const glyphs = CliKit.glyphsFor(prompt.terminal.unicode);
+    const { cycleSelectScreen } = yield* Effect.promise(
+      () => import("../../../Cli/components/view/Prompts.tsx"),
+    );
+    const glyphs = glyphsFor(prompt.terminal.unicode);
     const state = (
       key: keyof typeof editStateStyle,
       value: { provider: string; action: EditAction } | null,
@@ -154,24 +158,26 @@ export const editProfileFlow = Effect.fn(function* (options: {
             states: [state("skip", null), state("add", { provider, action: "add" })],
           },
     );
-    plan = (yield* prompt.prompt.cycle({
-      message: `Manage accounts in profile '${options.selectedProfile}'`,
-      options: choices,
-      requireChange: true,
-    })).filter((item) => item !== null);
+    plan = (yield* prompt.prompt.screen(
+      cycleSelectScreen({
+        message: `Manage accounts in profile '${options.selectedProfile}'`,
+        options: choices,
+        requireChange: true,
+      }),
+    )).filter((item) => item !== null);
   }
 
   const outcomes: EditOutcome[] = [];
   for (const step of plan) {
     const run =
       step.action === "remove"
-        ? Profiles.removeProvider({
+        ? Alchemist.Profile.removeProvider({
             profile: options.selectedProfile,
             provider: step.provider,
             entrypoint: options.main,
             envFile: Option.getOrUndefined(options.envFile),
           })
-        : Profiles.configure({
+        : Alchemist.Profile.configure({
             profile: options.selectedProfile,
             provider: step.provider,
             entrypoint: options.main,

package/src/Cli/commands/profile/hub.ts

@@ -1,11 +1,9 @@
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
 import * as Ref from "effect/Ref";
-import { Progress } from "../../../Alchemist/Progress.ts";
-import * as Profiles from "../../../Alchemist/routes/profile.ts";
-import { importStack } from "../../../Alchemist/Session.ts";
+import * as Alchemist from "../../../Alchemist/index.ts";
 import { DEFAULT_PROFILE_NAME } from "../../../Auth/Profile.ts";
-import { CliKit } from "../../CliKit/index.ts";
+import { Interaction } from "../../../Interaction.ts";
 import { isPromptCancellation } from "../errors.ts";
 
 export const profileHub = Effect.fn(function* (options: {
@@ -13,7 +11,7 @@ export const profileHub = Effect.fn(function* (options: {
   main: string;
 }) {
   const envFile = Option.getOrUndefined(options.envFile);
-  const computeEntries = Profiles.list().pipe(
+  const computeEntries = Alchemist.Profile.list().pipe(
     Effect.map((profiles) =>
       profiles.map((profile) => ({
         name: profile.name,
@@ -36,16 +34,16 @@ export const profileHub = Effect.fn(function* (options: {
   // the credential spinner mid-frame. Like deploy's planning session, show a
   // static (non-spinning) row that makes no motion promise. Failures are
   // ignored here — `loadDetails` re-imports from the cache and surfaces them.
-  const cli = yield* CliKit;
+  const cli = yield* Interaction;
   yield* Effect.scoped(
     Effect.gen(function* () {
-      yield* cli.live.progress({
+      yield* cli.progress({
         label: "Importing stack module",
         spinning: false,
       });
       // let the row paint before synchronous module evaluation starts
       yield* Effect.sleep("1 millis");
-      yield* importStack(options.main).pipe(Effect.ignore);
+      yield* Alchemist.importStack(options.main).pipe(Effect.ignore);
     }),
   );
 
@@ -55,13 +53,13 @@ export const profileHub = Effect.fn(function* (options: {
     loadDetails: (name) =>
       Effect.gen(function* () {
         const [profile, providers] = yield* Effect.all([
-          Profiles.get({
+          Alchemist.Profile.get({
             name,
             includeProviderStatus: true,
             entrypoint: options.main,
             envFile,
           }),
-          Profiles.providers({
+          Alchemist.Profile.providers({
             profile: name,
             entrypoint: options.main,
             envFile,
@@ -92,18 +90,18 @@ export const profileHub = Effect.fn(function* (options: {
         let selected: string | undefined;
         let message: string;
         if (action.kind === "create") {
-          yield* Profiles.create({ name: action.name });
+          yield* Alchemist.Profile.create({ name: action.name });
           selected = action.name;
           message = `Created profile '${action.name}'.`;
         } else if (action.kind === "rename") {
-          yield* Profiles.rename({
+          yield* Alchemist.Profile.rename({
             name: action.name,
             newName: action.newName,
           });
           selected = action.newName;
           message = `Renamed '${action.name}' to '${action.newName}'.`;
         } else {
-          yield* Profiles.deleteProfile({ name: action.name });
+          yield* Alchemist.Profile.deleteProfile({ name: action.name });
           message = `Deleted '${action.name}' and its credentials.`;
         }
         const entries = yield* refreshEntries;
@@ -120,14 +118,14 @@ export const profileHub = Effect.fn(function* (options: {
     runFlow: (action, events) =>
       Effect.gen(function* () {
         if (action.kind === "refresh") {
-          yield* Profiles.refresh({
+          yield* Alchemist.Profile.refresh({
             profile: action.name,
             providers: action.provider === undefined ? undefined : [action.provider],
             entrypoint: options.main,
             envFile,
           }).pipe(
-            Effect.provideService(Progress, (event) =>
-              event._tag === "provider.refresh.started"
+            Alchemist.onEvent((event) =>
+              event.type === "provider.refresh.started"
                 ? events.onProviderStart(event.provider)
                 : Effect.void,
             ),
@@ -143,7 +141,7 @@ export const profileHub = Effect.fn(function* (options: {
 
         const outcomes: string[] = [];
         for (const provider of action.remove) {
-          yield* Profiles.removeProvider({
+          yield* Alchemist.Profile.removeProvider({
             profile: action.name,
             provider,
             entrypoint: options.main,
@@ -156,7 +154,7 @@ export const profileHub = Effect.fn(function* (options: {
           ["reconfigure", action.reconfigure],
         ] as const) {
           for (const provider of names) {
-            yield* Profiles.configure({
+            yield* Alchemist.Profile.configure({
               profile: action.name,
               provider,
               entrypoint: options.main,

package/src/Cli/commands/provider.ts

@@ -1,9 +1,9 @@
 import { Command, Flag } from "effect/cli";
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
-import * as Provider from "../../Alchemist/routes/provider.ts";
+import * as Alchemist from "../../Alchemist/index.ts";
 import * as Contributions from "../../Contributions.ts";
-import { CliKit } from "../CliKit/CliKit.ts";
+import { Interaction } from "../../Interaction.ts";
 import { setExitCode } from "./errors.ts";
 import { config, envFile, profile } from "./flags.ts";
 import { instrumentCommand } from "./instrument.ts";
@@ -21,8 +21,8 @@ const checkEnvCommand = Command.make(
   { provider: checkedProviders, main: config, envFile, profile },
   instrumentCommand("provider.check-env")(
     Effect.fn(function* ({ provider: requested, main, envFile, profile }) {
-      const cli = yield* CliKit;
-      const result = yield* Provider.checkEnvironment({
+      const cli = yield* Interaction;
+      const result = yield* Alchemist.Provider.checkEnvironment({
         entrypoint: main,
         envFile: Option.getOrUndefined(envFile),
         profile,