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

package/src/Cli/components/ui/Interactive.tsx

@@ -13,7 +13,7 @@ import { useEffect, useLayoutEffect, useRef, useState } from "@alchemy.run/sigil
 import type { JSX, ReactNode } from "react";
 import { copyToClipboard } from "../../../Util/Terminal.ts";
 import { theme } from "../../../Util/Theme.ts";
-import type { AwaitExternalOptions, Choice, CycleChoice } from "../types.ts";
+import type { Choice, CycleChoice } from "../types.ts";
 import { useCliEnvironment, useGlyphs, useKeyGlyphs } from "./Environment.tsx";
 import { KeyBar, Spinner } from "./Feedback.tsx";
 import { Box, overflowListWindow } from "./Layout.tsx";
@@ -393,7 +393,7 @@ export function TextField({
   active,
   ariaLabel,
 }: TextFieldProps) {
-  // Prompts are serialized by the CliKit runtime, so an enabled field owns
+  // Prompts are serialized by the Sigil renderer, so an enabled field owns
   // the input stream outright — no Sigil focus negotiation. (Coupling this to
   // useFocus({autoFocus}) silently disabled the field whenever any other
   // focusable was already mounted.)
@@ -593,7 +593,20 @@ export const useCycleNavigation = (stateCounts: ReadonlyArray<number>) => {
   return { cursor, indices, move, setCursor, cycle } as const;
 };
 
-export interface ExternalWaitProps extends AwaitExternalOptions {
+export interface BrowserLoginWaitProps {
+  readonly message: string;
+  readonly waitingLabel: string;
+  readonly url: string;
+  /** Short code the user confirms on the login page. */
+  readonly code?: string;
+  readonly openFailed?: boolean;
+  /** Open the login URL again from the waiting screen. */
+  readonly onOpen?: () => Promise<void>;
+  /** Allow Enter to switch to manual code entry. */
+  readonly allowManualInput: boolean;
+  readonly inputLabel?: string;
+  readonly placeholder?: string;
+  readonly validate?: (value: string) => string | Error | undefined;
   readonly onSubmit: (value: string) => void;
   readonly onCancel: () => void;
 }
@@ -741,21 +754,21 @@ export function ChoiceGroup<Value>({
   );
 }
 
-/** Browser/OAuth waiting screen with URL controls and manual-entry fallback. */
-export function ExternalWait({
+/** Browser login waiting screen with URL controls and manual-entry fallback. */
+export function BrowserLoginWait({
   message,
   waitingLabel,
   url,
   code,
   openFailed = false,
   onOpen,
-  allowManualInput = true,
+  allowManualInput,
   inputLabel,
   placeholder,
   validate,
   onSubmit,
   onCancel,
-}: ExternalWaitProps) {
+}: BrowserLoginWaitProps) {
   const { stdout } = useStdout();
   const glyphs = useGlyphs();
   const keyGlyphs = useKeyGlyphs();
@@ -787,7 +800,7 @@ export function ExternalWait({
     else if (shortcut === "o" && onOpen !== undefined) {
       setBrowserFailed(false);
       void onOpen().catch(() => setBrowserFailed(true));
-    } else if (shortcut === "c" && url !== undefined) {
+    } else if (shortcut === "c") {
       copyToClipboard(url, stdout ?? process.stdout);
       setCopied(true);
       clearTimeout(copiedTimer.current);
@@ -831,12 +844,8 @@ export function ExternalWait({
       message={message}
       keys={[
         ...(allowManualInput ? ([[keyGlyphs.enter, "enter code manually"]] as const) : []),
-        ...(url === undefined
-          ? []
-          : ([
-              ...(onOpen === undefined ? [] : ([["o", "open browser"]] as const)),
-              ["c", copied ? `${glyphs.success} copied` : "copy URL"],
-            ] as const)),
+        ...(onOpen === undefined ? [] : ([["o", "open browser"]] as const)),
+        ["c", copied ? `${glyphs.success} copied` : "copy URL"],
         [keyGlyphs.escape, "cancel"],
       ]}
     >
@@ -855,7 +864,7 @@ export function ExternalWait({
             {glyphs.warning} Could not open the browser. Copy and open the URL manually.
           </Text>
         ) : null}
-        {url === undefined ? null : <Link href={url}>{url}</Link>}
+        <Link href={url}>{url}</Link>
       </Box>
     </PromptFrame>
   );

package/src/Cli/components/ui/Layout.tsx

@@ -19,7 +19,7 @@ export { VirtualList } from "@alchemy.run/sigil";
 
 export type BoxProps = ComponentProps<typeof SigilBox>;
 
-/** Theme-aware Sigil container used by CliKit layouts. */
+/** Theme-aware Sigil container used by CLI layouts. */
 export const Box: ForwardRefExoticComponent<PropsWithoutRef<BoxProps> & RefAttributes<DOMElement>> =
   forwardRef<DOMElement, BoxProps>(function Box(props, ref) {
     const { colors } = useCliEnvironment();

package/src/Cli/components/ui/Typography.tsx

@@ -21,7 +21,7 @@ export interface TextProps extends Omit<ComponentProps<typeof SigilText>, "color
   readonly color?: ComponentProps<typeof SigilText>["color"];
 }
 
-/** CliKit typography primitive. Consumers never import Sigil directly. */
+/** CLI typography primitive. Consumers never import Sigil directly. */
 export function Text({
   tone = "default",
   color,

package/src/Cli/components/ui/index.ts

@@ -1,8 +1,8 @@
 /**
  * Composable terminal layouts and interaction widgets.
  *
- * This is a separate entrypoint from `alchemy/Cli/CliKit` so importing the
- * injectable service does not eagerly load React, Sigil or Yoga.
+ * Kept apart from `Interaction` so importing the service does not eagerly
+ * load React, Sigil or Yoga.
  */
 export {
   CliEnvironment,

package/src/Cli/components/view/ApprovePlan.tsx

@@ -2,8 +2,9 @@
 /** @jsxImportSource @alchemy.run/sigil */
 import { useMemo, useState } from "@alchemy.run/sigil/react";
 import type { JSX } from "react";
+import { Screen, type ScreenController } from "../../../Interaction.ts";
 import type { Plan as AlchemyPlan } from "../../../Plan.ts";
-import { Screen, theme, type ScreenController } from "../../CliKit/index.ts";
+import { theme } from "../../../Util/Theme.ts";
 import {
   ChoiceGroup,
   Box,

package/src/Cli/components/view/Format.tsx

@@ -0,0 +1,58 @@
+/** @jsxRuntime automatic */
+/** @jsxImportSource @alchemy.run/sigil */
+import { stripVTControlCharacters } from "node:util";
+import { renderToString } from "@alchemy.run/sigil";
+import type { RenderOptions, TerminalCapabilities, View } from "../types.ts";
+import { CliEnvironment } from "../ui/Environment.tsx";
+import { Text } from "../ui/Typography.tsx";
+
+export const normalizeView = (view: View): View => {
+  if (typeof view === "string" || typeof view === "number" || typeof view === "bigint") {
+    return <Text>{String(view)}</Text>;
+  }
+  // Contract: an array of primitives renders as ONE Text line with the
+  // elements concatenated (no separator) — matching how React renders
+  // adjacent text children. Callers wanting separators must join themselves.
+  if (
+    Array.isArray(view) &&
+    view.every(
+      (item) =>
+        item === null ||
+        item === undefined ||
+        typeof item === "boolean" ||
+        typeof item === "string" ||
+        typeof item === "number" ||
+        typeof item === "bigint",
+    )
+  ) {
+    return (
+      <Text>
+        {view
+          .filter((item) => item !== null && item !== undefined && typeof item !== "boolean")
+          .map(String)
+          .join("")}
+      </Text>
+    );
+  }
+  return view;
+};
+
+/** Render a layout to a string without a live renderer (help, plain output, snapshots). */
+export const formatView = (
+  view: View,
+  capabilities: TerminalCapabilities,
+  options: RenderOptions = {},
+): string => {
+  const colors = options.colors ?? capabilities.colors;
+  // The renderer and the components must agree on the width: components size
+  // themselves from the environment's `columns`, so an explicit render width
+  // has to flow into the capabilities too, not only into renderToString.
+  const columns = options.columns ?? capabilities.columns;
+  const output = renderToString(
+    <CliEnvironment capabilities={{ ...capabilities, colors, columns }}>
+      {normalizeView(view)}
+    </CliEnvironment>,
+    { columns, colorProfile: colors ? "truecolor" : "none" },
+  ).replace(/[\s\n]+$/, "");
+  return colors ? output : stripVTControlCharacters(output);
+};

package/src/Cli/components/view/Help.tsx

@@ -7,17 +7,11 @@ import type { HelpDoc } from "effect/cli/HelpDoc";
 import * as Option from "effect/Option";
 import type { JSX } from "react";
 import packageJson from "../../../../package.json" with { type: "json" };
-import type { CliKit } from "../../CliKit/CliKit.ts";
-import {
-  ANSI_BOLD,
-  ANSI_DIM,
-  ansiFg,
-  glyphsFor,
-  paint,
-  truncate,
-  theme,
-} from "../../CliKit/index.ts";
+import type { Interaction } from "../../../Interaction.ts";
+import { ANSI_BOLD, ANSI_DIM, ansiFg, paint, truncate } from "../../../Util/Terminal.ts";
+import { glyphsFor, theme } from "../../../Util/Theme.ts";
 import { Box, Heading, Text, useGlyphs } from "../ui/index.ts";
+import { formatView } from "./Format.tsx";
 import { Logo } from "./Logo.tsx";
 
 const commandLabel = (command: { readonly name: string; readonly alias?: string | undefined }) =>
@@ -278,12 +272,13 @@ function SubHelp({ doc, root = false }: SubHelpProps): JSX.Element {
   );
 }
 
-const formatSubHelp = (cli: CliKit["Service"], doc: HelpDoc) => {
+const formatSubHelp = (cli: Interaction["Service"], doc: HelpDoc) => {
   const termCols = cli.terminal.columns;
-  return cli.output.format(
+  return formatView(
     <Box width={termCols}>
       <SubHelp doc={doc} />
     </Box>,
+    cli.terminal,
     { columns: termCols },
   );
 };
@@ -291,15 +286,16 @@ const formatSubHelp = (cli: CliKit["Service"], doc: HelpDoc) => {
 /** Hide the logo entirely when it can't be at least this many columns wide. */
 const MIN_LOGO_COLS = 20;
 
-const formatRootHelp = (cli: CliKit["Service"], doc: HelpDoc) => {
+const formatRootHelp = (cli: Interaction["Service"], doc: HelpDoc) => {
   const termCols = cli.terminal.columns;
 
   // First pass: render the text alone to measure its exact footprint (post
   // ANSI codes and wrapping), then size the logo into the leftover space.
-  const text = cli.output.format(
+  const text = formatView(
     <Box width={termCols}>
       <SubHelp doc={doc} root />
     </Box>,
+    cli.terminal,
     { columns: termCols },
   );
 
@@ -318,7 +314,7 @@ const formatRootHelp = (cli: CliKit["Service"], doc: HelpDoc) => {
 
   if (logoCols < MIN_LOGO_COLS) return text;
 
-  return cli.output.format(
+  return formatView(
     <Box flexDirection="row" width={termCols}>
       <SubHelp doc={doc} root />
       <Box flexGrow={1} flexDirection="column" justifyContent="center" alignItems="center">
@@ -333,17 +329,18 @@ const formatRootHelp = (cli: CliKit["Service"], doc: HelpDoc) => {
         </Box>
       </Box>
     </Box>,
+    cli.terminal,
     { columns: termCols },
   );
 };
 
-export const brandedCliFormatter = (cli: CliKit["Service"]): CliOutput.Formatter => {
+export const brandedCliFormatter = (cli: Interaction["Service"]): CliOutput.Formatter => {
   const fallback = CliOutput.defaultFormatter();
   const glyphs = glyphsFor(cli.terminal.unicode);
   const formatErrorLine = (message: string) =>
     `${paint(ansiFg(theme.color.danger), `${glyphs.error} error:`)} ${message}`;
   return {
-    ...fallback,
+    formatCliError: fallback.formatCliError,
     formatHelpDoc: (doc) =>
       doc.usage.startsWith("alchemy <subcommand>")
         ? formatRootHelp(cli, doc)

package/src/Cli/components/view/Logo.tsx

@@ -10,7 +10,7 @@
  */
 import { useMemo } from "@alchemy.run/sigil/react";
 import type { JSX } from "react";
-import { theme } from "../../CliKit/index.ts";
+import { theme } from "../../../Util/Theme.ts";
 import { Box, Text } from "../ui/index.ts";
 
 const VIEWBOX = 24;

package/src/Cli/components/view/Nuke.tsx

@@ -2,10 +2,14 @@
 /** @jsxImportSource @alchemy.run/sigil */
 import * as Effect from "effect/Effect";
 import * as Exit from "effect/Exit";
+import * as LogLevel from "effect/LogLevel";
+import * as Match from "effect/Match";
+import { onEvent, type Event } from "../../../Events.ts";
+import { Interaction } from "../../../Interaction.ts";
 import type { Result as NukeResult, Target } from "../../../Nuke.ts";
 import type { ProviderMode } from "../../../ProviderMode.ts";
-import { Progress, type ProgressEvent } from "../../../Report.ts";
-import { CliKit } from "../../CliKit/index.ts";
+import { currentConsoleSettings } from "../../GlobalLog.ts";
+import { present } from "../../Present.ts";
 import {
   LiveStore,
   ProgressBar,
@@ -31,24 +35,25 @@ export class NukeProgressStore extends LiveStore<NukeProgressState> {
     super({ total: 0, completed: 0, resources: 0, inFlight: [] });
   }
 
-  emit(event: ProgressEvent) {
-    this.update((state) => {
-      switch (event._tag) {
-        case "nuke.scan.started":
-          return { ...state, total: event.total };
-        case "nuke.scan.provider.started":
-          return { ...state, inFlight: [...state.inFlight, event.provider] };
-        case "nuke.scan.provider.completed":
-          return {
+  emit(event: Event) {
+    this.update((state) =>
+      Match.value(event).pipe(
+        Match.discriminators("type")({
+          "nuke.scan.started": (event) => ({ ...state, total: event.total }),
+          "nuke.scan.provider.started": (event) => ({
+            ...state,
+            inFlight: [...state.inFlight, event.provider],
+          }),
+          "nuke.scan.provider.completed": (event) => ({
             ...state,
             completed: state.completed + 1,
             resources: state.resources + event.resources,
             inFlight: state.inFlight.filter((id) => id !== event.provider),
-          };
-        default:
-          return state;
-      }
-    });
+          }),
+        }),
+        Match.orElse(() => state),
+      ),
+    );
   }
 }
 
@@ -92,31 +97,44 @@ export function NukeProgress({ store }: { store: NukeProgressStore }) {
   );
 }
 
-const logNukeEvent = (event: ProgressEvent, interactive: boolean) => {
-  if (event._tag === "nuke.scan.provider.completed") {
-    if (event.error !== undefined) return Effect.logWarning(`${event.provider}: ${event.error}`);
-    if (!interactive) return Effect.logInfo(`scanned ${event.provider} (${event.resources})`);
-  } else if (event._tag === "nuke.resource.failed") {
-    return Effect.logWarning(`${event.provider} ${event.resource}: ${event.message}`);
-  } else if (!interactive && event._tag === "nuke.resource.deleted") {
-    return Effect.logInfo(`deleted ${event.provider} ${event.resource}`);
-  }
-  return Effect.void;
-};
+const logNukeEvent = (event: Event, interactive: boolean) =>
+  Match.value(event).pipe(
+    Match.discriminators("type")({
+      "nuke.scan.provider.completed": (event) =>
+        event.error !== undefined
+          ? present(`${event.provider}: ${event.error}`, { level: "Warn" })
+          : interactive
+            ? Effect.void
+            : present(`scanned ${event.provider} (${event.resources})`),
+      "nuke.resource.failed": (event) =>
+        present(`${event.provider} ${event.resource}: ${event.message}`, { level: "Warn" }),
+      "nuke.resource.deleted": (event) =>
+        interactive ? Effect.void : present(`deleted ${event.provider} ${event.resource}`),
+    }),
+    Match.orElse(() => Effect.void),
+  );
 
 /** Scan progress stays separate until the inventory is ready to review. */
+/**
+ * `--log-level debug` (or lower) streams debug records to the console; the
+ * live progress view would repaint over them, so it falls back to plain lines.
+ */
+const debugConsole = Effect.map(currentConsoleSettings, ({ floor }) =>
+  LogLevel.isLessThan(floor, "Info"),
+);
+
 export const renderNukeScan =
   () =>
   <A, E, R>(effect: Effect.Effect<A, E, R>) =>
     Effect.gen(function* () {
-      const cli = yield* CliKit;
+      const cli = yield* Interaction;
       const store = new NukeProgressStore();
       const live =
-        cli.terminal.input && !process.env.DEBUG
-          ? yield* cli.live.open(<NukeProgress store={store} />)
+        cli.terminal.input && !(yield* debugConsole)
+          ? yield* cli.live(<NukeProgress store={store} />)
           : undefined;
       return yield* effect.pipe(
-        Effect.provideService(Progress, (event) =>
+        onEvent((event) =>
           Effect.gen(function* () {
             if (live) store.emit(event);
             yield* logNukeEvent(event, live !== undefined);
@@ -128,28 +146,35 @@ export const renderNukeScan =
 
 /** Drive the same resource rows used by the preview through their deletion lifecycle. */
 export const renderNukeDelete =
-  (targets: ReadonlyArray<Pick<Target, "providerId" | "displayName">>, mode: ProviderMode) =>
+  (
+    targets: ReadonlyArray<Pick<Target, "key" | "providerId" | "displayName">>,
+    mode: ProviderMode,
+  ) =>
   <A extends NukeResult, E, R>(effect: Effect.Effect<A, E, R>) =>
     Effect.gen(function* () {
-      const cli = yield* CliKit;
+      const cli = yield* Interaction;
       const tree = new PlanTree(nukePlan(targets, { mode }), {
         mode: "apply",
         label: "Deleting resources",
         busy: true,
       });
       const live =
-        cli.terminal.input && !process.env.DEBUG
-          ? yield* cli.live.open(<Plan tree={tree} />, { persistOnClose: true })
+        cli.terminal.input && !(yield* debugConsole)
+          ? yield* cli.live(<Plan tree={tree} />, { persistOnClose: true })
           : undefined;
       return yield* effect.pipe(
-        Effect.provideService(Progress, (event) =>
-          Effect.gen(function* () {
-            if (event._tag === "apply.resource.status" || event._tag === "apply.resource.note")
-              tree.emit(event);
-            else if (event._tag === "nuke.pass.started")
-              tree.setLabel(`Deleting resources · pass ${event.pass}`);
-            yield* logNukeEvent(event, live !== undefined);
-          }),
+        onEvent((event) =>
+          Effect.sync(() =>
+            Match.value(event).pipe(
+              Match.discriminators("type")({
+                "apply.resource.status": (event) => tree.emit(event),
+                "apply.resource.note": (event) => tree.emit(event),
+                "nuke.pass.started": (event) =>
+                  tree.setLabel(`Deleting resources · pass ${event.pass}`),
+              }),
+              Match.orElse(() => undefined),
+            ),
+          ).pipe(Effect.andThen(logNukeEvent(event, live !== undefined))),
         ),
         Effect.onExit((exit) =>
           Effect.sync(() => {
@@ -170,13 +195,13 @@ export const renderNukeDelete =
 
 /** Cloud inventory rows carry display identity only, never fabricated stack state. */
 export const nukePlan = (
-  targets: ReadonlyArray<Pick<Target, "providerId" | "displayName">>,
+  targets: ReadonlyArray<Pick<Target, "key" | "providerId" | "displayName">>,
   options: { mode: ProviderMode },
 ): PlanTreeData => ({
   defaultMode: options.mode,
   rows: targets
-    .map((target, index) => ({
-      key: `nuke/${index}`,
+    .map((target) => ({
+      key: target.key,
       type: "resource" as const,
       id: target.providerId,
       resourceType: target.providerId,
@@ -203,14 +228,14 @@ export const nukePlan = (
 });
 
 export const reviewNuke = Effect.fn(function* (
-  targets: ReadonlyArray<Pick<Target, "providerId" | "displayName">>,
+  targets: ReadonlyArray<Pick<Target, "key" | "providerId" | "displayName">>,
   options: {
     mode: ProviderMode;
     yes: boolean;
     dryRun: boolean;
   },
 ) {
-  const cli = yield* CliKit;
+  const cli = yield* Interaction;
   const plan = nukePlan(targets, options);
   if (options.yes || options.dryRun) {
     yield* cli.output.print(
@@ -226,7 +251,7 @@ export const reviewNuke = Effect.fn(function* (
     );
     return true;
   }
-  return yield* cli.prompt.custom(
+  return yield* cli.prompt.screen(
     planDecisionScreen({
       plan,
       label: "Nuke",

package/src/Cli/components/view/PlanDecision.tsx

@@ -2,8 +2,8 @@
 /** @jsxImportSource @alchemy.run/sigil */
 import { useMemo, useState } from "@alchemy.run/sigil/react";
 import type { JSX } from "react";
+import { Screen, type ScreenController } from "../../../Interaction.ts";
 import type { Plan } from "../../../Plan.ts";
-import { Screen, type ScreenController } from "../../CliKit/index.ts";
 import { PromptFrame, ChoiceGroup, useKeyGlyphs, useTerminalInput } from "../ui/index.ts";
 import type { PlanTreeData } from "./PlanTree.ts";
 import { Plan as PlanComponent, PlanTree } from "./PlanView.tsx";

package/src/Cli/components/view/PlanRow.tsx

@@ -5,7 +5,7 @@
  * namespaces through this component so they look like the same tree.
  */
 import type { JSX } from "react";
-import { theme } from "../../CliKit/index.ts";
+import { theme } from "../../../Util/Theme.ts";
 import { Row, Text, useGlyphs } from "../ui/index.ts";
 import { actionStyle, type PlanAction } from "./statusStyle.ts";
 

package/src/Cli/components/view/PlanTree.ts

@@ -1,6 +1,6 @@
+import type { ApplyEvent, ApplyStatus, ResourceStatusChanged } from "../../../Events.ts";
 import type { ActionApply, ActionDelete, CRUD, Plan } from "../../../Plan.ts";
 import type { ProviderMode } from "../../../ProviderMode.ts";
-import type { ApplyEvent, ApplyStatus, ResourceStatusChanged } from "../../../Report.ts";
 import {
   buildNamespaceTree,
   buildPlanSummary,
@@ -313,7 +313,7 @@ export class PlanTree {
       };
     };
 
-    if (event._tag === "apply.resource.status") {
+    if (event.type === "apply.resource.status") {
       const current = tasks.get(key);
       if (current) {
         tasks.set(key, {

package/src/Cli/components/view/PlanView.tsx

@@ -20,9 +20,9 @@
  */
 import { useMemo, useSyncExternalStore } from "@alchemy.run/sigil/react";
 import type { JSX, ReactNode } from "react";
+import type { ApplyStatus } from "../../../Events.ts";
 import type { Plan as AlchemyPlan } from "../../../Plan.ts";
-import type { ApplyStatus } from "../../../Report.ts";
-import { theme } from "../../CliKit/index.ts";
+import { theme } from "../../../Util/Theme.ts";
 import { formatElapsed } from "../../Format.ts";
 import { formatModeNote } from "../../ModeTag.ts";
 import type { ActionVerb, PlanSummaryCounts } from "../../NamespaceTree.ts";

package/src/Cli/components/view/Profile.tsx

@@ -1,7 +1,7 @@
 /** @jsxRuntime automatic */
 /** @jsxImportSource @alchemy.run/sigil */
 import type { JSX } from "react";
-import { theme } from "../../CliKit/index.ts";
+import { theme } from "../../../Util/Theme.ts";
 import {
   Box,
   Gutter,
@@ -412,7 +412,7 @@ function CurrentProfile({
 }
 
 /**
- * View builders consumed by `CliKit.print` and the interactive profile app.
+ * View builders consumed by `Interaction.output.print` and the interactive profile app.
  */
 export const profileListNode = (profiles: ReadonlyArray<ProfileListDisplay>): JSX.Element => (
   <ProfileList profiles={profiles} />

package/src/Cli/components/view/ProfileDashboard.tsx

@@ -21,7 +21,8 @@ import * as Effect from "effect/Effect";
 import * as Fiber from "effect/Fiber";
 import * as Scheduler from "effect/Scheduler";
 import type { JSX } from "react";
-import { CliKit, theme, type NonInteractiveTerminal } from "../../CliKit/index.ts";
+import { Interaction, type NonInteractiveTerminal } from "../../../Interaction.ts";
+import { theme } from "../../../Util/Theme.ts";
 import {
   Alert,
   Box,
@@ -701,16 +702,16 @@ export interface DashboardSessionOptions<R> {
 }
 
 /**
- * Runs the dashboard inside CliKit's application renderer. Pure actions and
- * edit/refresh flows share the same frame, and the application clears it on
+ * Runs the dashboard inside one Interaction session. Pure actions and
+ * edit/refresh flows share the same frame, and the session clears it on
  * exit.
  */
 export const runProfileDashboardSession = <R,>(
   options: DashboardSessionOptions<R>,
-): Effect.Effect<void, NonInteractiveTerminal, R | CliKit> =>
-  Effect.flatMap(CliKit, (cli) =>
-    cli.application(
-      // live.open is Scope-bound; the session scope is its release backstop
+): Effect.Effect<void, NonInteractiveTerminal, R | Interaction> =>
+  Effect.flatMap(Interaction, (cli) =>
+    cli.session(
+      // live is Scope-bound; the session scope is its release backstop
       // (the ensuring(live.close) below settles it on the normal path).
       Effect.scoped(
         Effect.gen(function* () {
@@ -760,7 +761,7 @@ export const runProfileDashboardSession = <R,>(
             options.entries.findIndex((entry) => entry.name === options.selected),
           );
 
-          const live = yield* cli.live.open(
+          const live = yield* cli.live(
             <Dashboard store={store} initialSelected={initialSelected} />,
             { placement: "beforeTranscript" },
           );
@@ -812,10 +813,10 @@ export const runProfileDashboardSession = <R,>(
                       info: () => Effect.void,
                       success: () => Effect.void,
                     },
-                  } satisfies CliKit["Service"];
-                  const result = yield* cli.wizard(
+                  } satisfies Interaction["Service"];
+                  const result = yield* cli.session(
                     action.kind === "refresh"
-                      ? flowEffect.pipe(Effect.provideService(CliKit, quietRefreshCli))
+                      ? flowEffect.pipe(Effect.provideService(Interaction, quietRefreshCli))
                       : flowEffect,
                   );
                   const entries = yield* options.reloadEntries;