alchemy 2.0.0-beta.34 → 2.0.0-beta.35

package/src/Cli/commands/login.ts

@@ -7,16 +7,12 @@ import * as Layer from "effect/Layer";
 import * as Logger from "effect/Logger";
 import { Command, Flag } from "effect/unstable/cli";
 
-import { AuthProviders } from "../..//Auth/AuthProvider";
-import {
-  getProfile,
-  setProfile,
-  withProfileOverride,
-} from "../..//Auth/Profile";
-import { Stage } from "../..//Stage";
-import * as State from "../..//State/index";
-import { loadConfigProvider } from "../..//Util/ConfigProvider";
-import { fileLogger } from "../..//Util/FileLogger";
+import { AuthProviders } from "../../Auth/AuthProvider.ts";
+import { Profile, withProfileOverride } from "../../Auth/Profile.ts";
+import { Stage } from "../../Stage.ts";
+import * as State from "../../State/index.ts";
+import { loadConfigProvider } from "../../Util/ConfigProvider.ts";
+import { fileLogger } from "../../Util/FileLogger.ts";
 
 import {
   envFile,
@@ -73,6 +69,7 @@ export const loginCommand = Command.make(
       );
 
       yield* Effect.gen(function* () {
+        const profiles = yield* Profile;
         yield* Effect.catchCause(stackEffect, (cause) =>
           Console.warn(
             `Ignoring error while building stack for login (likely due to missing or broken credentials):\n${Cause.pretty(cause)}`,
@@ -93,13 +90,13 @@ export const loginCommand = Command.make(
           providers,
           (provider) =>
             Effect.gen(function* () {
-              const existing = yield* getProfile(profile);
+              const existing = yield* profiles.getProfile(profile);
               const stored = existing?.[provider.name];
 
               let cfg: { method: string };
               if (configure || stored == null) {
                 cfg = yield* provider.configure(profile, { ci });
-                yield* setProfile(profile, {
+                yield* profiles.setProfile(profile, {
                   ...existing,
                   [provider.name]: cfg,
                 });

package/src/Cli/commands/logs.ts

@@ -6,14 +6,14 @@ import * as Logger from "effect/Logger";
 import * as Option from "effect/Option";
 import { Command, Flag } from "effect/unstable/cli";
 
-import { findProviderByType, type LogLine } from "../..//Provider";
-import { Stage } from "../..//Stage";
-import * as State from "../..//State/index";
-import { loadConfigProvider } from "../..//Util/ConfigProvider";
-import { fileLogger } from "../..//Util/FileLogger";
-
-import { AuthProviders } from "../..//Auth/AuthProvider";
-import { withProfileOverride } from "../..//Auth/Profile";
+import { findProviderByType, type LogLine } from "../../Provider.ts";
+import { Stage } from "../../Stage.ts";
+import * as State from "../../State/index.ts";
+import { loadConfigProvider } from "../../Util/ConfigProvider.ts";
+import { fileLogger } from "../../Util/FileLogger.ts";
+
+import { AuthProviders } from "../../Auth/AuthProvider.ts";
+import { withProfileOverride } from "../../Auth/Profile.ts";
 import {
   envFile,
   formatLocalTimestamp,

package/src/Cli/commands/profile.ts

@@ -5,18 +5,13 @@ import * as Layer from "effect/Layer";
 import * as Logger from "effect/Logger";
 import { Command } from "effect/unstable/cli";
 
-import { AuthProviders } from "../..//Auth/AuthProvider";
-import { deleteProfileCredentials } from "../..//Auth/Credentials";
-import {
-  deleteProfile,
-  getProfile,
-  readConfig,
-  withProfileOverride,
-} from "../..//Auth/Profile";
-import { AwsAuth } from "../..//AWS/AuthProvider";
-import { CloudflareAuth } from "../..//Cloudflare/Auth/AuthProvider";
-import { loadConfigProvider } from "../..//Util/ConfigProvider";
-import { fileLogger } from "../../Util/FileLogger";
+import { AuthProviders } from "../../Auth/AuthProvider.ts";
+import { CredentialsStore } from "../../Auth/Credentials.ts";
+import { Profile, withProfileOverride } from "../../Auth/Profile.ts";
+import { AwsAuth } from "../../AWS/AuthProvider.ts";
+import { CloudflareAuth } from "../../Cloudflare/Auth/AuthProvider.ts";
+import { loadConfigProvider } from "../../Util/ConfigProvider.ts";
+import { fileLogger } from "../../Util/FileLogger.ts";
 
 import { envFile, instrumentCommand, profile } from "./_shared.ts";
 
@@ -27,9 +22,10 @@ const showCommand = Command.make(
     "alchemy.profile": a.profile,
   }))(
     Effect.fnUntraced(function* ({ profile, envFile }) {
-      const stored = yield* getProfile(profile);
+      const profiles = yield* Profile;
+      const stored = yield* profiles.getProfile(profile);
       if (stored == null) {
-        const config = yield* readConfig;
+        const config = yield* profiles.readConfig;
         const names = Object.keys(config.profiles);
         yield* Console.log(`Profile '${profile}' not found.`);
         if (names.length > 0) {
@@ -96,8 +92,10 @@ const clearCommand = Command.make(
     "alchemy.profile": a.profile,
   }))(
     Effect.fnUntraced(function* ({ profile }) {
-      const removed = yield* deleteProfile(profile);
-      yield* deleteProfileCredentials(profile);
+      const profiles = yield* Profile;
+      const store = yield* CredentialsStore;
+      const removed = yield* profiles.deleteProfile(profile);
+      yield* store.deleteProfile(profile);
       if (removed) {
         yield* Console.log(
           `Cleared profile '${profile}' and all its credentials.`,

package/src/Cli/commands/state.ts

@@ -6,14 +6,14 @@ import * as Logger from "effect/Logger";
 import * as Option from "effect/Option";
 import { Argument, Command, Flag } from "effect/unstable/cli";
 
-import { AuthProviders } from "../../Auth/AuthProvider";
-import { withProfileOverride } from "../../Auth/Profile";
-import { Stage } from "../../Stage";
-import * as State from "../../State/index";
-import { encodeState } from "../../State/StateEncoding";
-import * as Clank from "../../Util/Clank";
-import { loadConfigProvider } from "../../Util/ConfigProvider";
-import { fileLogger } from "../../Util/FileLogger";
+import { AuthProviders } from "../../Auth/AuthProvider.ts";
+import { withProfileOverride } from "../../Auth/Profile.ts";
+import { Stage } from "../../Stage.ts";
+import * as State from "../../State/index.ts";
+import { encodeState } from "../../State/StateEncoding.ts";
+import * as Clank from "../../Util/Clank.ts";
+import { loadConfigProvider } from "../../Util/ConfigProvider.ts";
+import { fileLogger } from "../../Util/FileLogger.ts";
 
 import {
   envFile,

package/src/Cli/commands/tail.ts

@@ -6,14 +6,14 @@ import * as Logger from "effect/Logger";
 import * as Stream from "effect/Stream";
 import * as Command from "effect/unstable/cli/Command";
 
-import { findProviderByType, type LogLine } from "../..//Provider";
-import { Stage } from "../..//Stage";
-import * as State from "../..//State/index";
-import { loadConfigProvider } from "../..//Util/ConfigProvider";
-import { fileLogger } from "../..//Util/FileLogger";
-
-import { AuthProviders } from "../..//Auth/AuthProvider";
-import { withProfileOverride } from "../..//Auth/Profile";
+import { findProviderByType, type LogLine } from "../../Provider.ts";
+import { Stage } from "../../Stage.ts";
+import * as State from "../../State/index.ts";
+import { loadConfigProvider } from "../../Util/ConfigProvider.ts";
+import { fileLogger } from "../../Util/FileLogger.ts";
+
+import { AuthProviders } from "../../Auth/AuthProvider.ts";
+import { withProfileOverride } from "../../Auth/Profile.ts";
 import {
   envFile,
   formatLocalTimestamp,

package/src/Cli/exec.ts

@@ -4,16 +4,20 @@ import * as Layer from "effect/Layer";
 import * as Schema from "effect/Schema";
 import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
 
-import { AlchemyContextLive } from "../AlchemyContext";
+import { AlchemyContextLive } from "../AlchemyContext.ts";
+import { CredentialsStoreLive } from "../Auth/Credentials.ts";
+import { ProfileLive } from "../Auth/Profile.ts";
 import { PlatformServices } from "../Util/PlatformServices.ts";
 import { execStack, ExecStackOptions } from "./commands/deploy.ts";
-import { inkCLI } from "./tui/InkCLI.tsx";
+import { selectCli } from "./selectCli.ts";
 
 const services = Layer.mergeAll(
   Layer.provideMerge(AlchemyContextLive, PlatformServices),
+  Layer.provide(ProfileLive, PlatformServices),
+  Layer.provide(CredentialsStoreLive, PlatformServices),
   FetchHttpClient.layer,
   ConfigProvider.layer(ConfigProvider.fromEnv()),
-  inkCLI(),
+  selectCli(),
 );
 
 export const exec = () =>

package/src/Cli/main.ts

@@ -5,12 +5,16 @@ import * as Command from "effect/unstable/cli/Command";
 import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
 
 import { AlchemyContextLive } from "alchemy/AlchemyContext";
+import { CredentialsStoreLive } from "alchemy/Auth/Credentials";
+import { ProfileLive } from "alchemy/Auth/Profile";
 import { TelemetryLive } from "alchemy/Telemetry/Layer";
 import { PlatformServices } from "alchemy/Util/PlatformServices";
 import packageJson from "../../package.json" with { type: "json" };
 
+import { checkLatestVersion } from "./checkVersion.ts";
 import { handleCancellation } from "./commands/_shared.ts";
-import { bootstrapCommand } from "./commands/bootstrap.ts";
+import { awsCommand } from "./commands/aws.ts";
+import { cloudflareCommand } from "./commands/cloudflare.ts";
 import {
   deployCommand,
   destroyCommand,
@@ -22,11 +26,12 @@ import { logsCommand } from "./commands/logs.ts";
 import { profileCommand } from "./commands/profile.ts";
 import { stateCommand } from "./commands/state.ts";
 import { tailCommand } from "./commands/tail.ts";
-import { inkCLI } from "./tui/InkCLI.tsx";
+import { selectCli } from "./selectCli.ts";
 
 const root = Command.make("alchemy", {}).pipe(
   Command.withSubcommands([
-    bootstrapCommand,
+    awsCommand,
+    cloudflareCommand,
     deployCommand,
     devCommand,
     destroyCommand,
@@ -46,13 +51,23 @@ const cli = Command.run(root, {
 
 const services = Layer.mergeAll(
   Layer.provideMerge(AlchemyContextLive, PlatformServices),
+  Layer.provide(ProfileLive, PlatformServices),
+  Layer.provide(CredentialsStoreLive, PlatformServices),
   FetchHttpClient.layer,
   ConfigProvider.layer(ConfigProvider.fromEnv()),
   TelemetryLive,
-  inkCLI(),
+  selectCli(),
 );
 
-export const main = cli.pipe(
+const program = Effect.gen(function* () {
+  // Best-effort, non-blocking check for a newer published version. If the
+  // CLI command finishes before the registry responds, the fiber is
+  // interrupted on scope close — that's intentional.
+  yield* checkLatestVersion.pipe(Effect.forkScoped);
+  return yield* cli;
+});
+
+export const main = program.pipe(
   // $USER and $STAGE are set by the environment
   Effect.provide(services),
   Effect.scoped,

package/src/Cli/selectCli.ts

@@ -0,0 +1,33 @@
+import * as Layer from "effect/Layer";
+import type { Cli } from "./Cli.ts";
+import { LoggingCli } from "./LoggingCli.ts";
+import { inkCLI } from "./tui/InkCLI.tsx";
+
+/**
+ * Returns true when the current process looks like it's being driven by a
+ * coding agent, CI runner, or anything else that won't render an interactive
+ * TUI well. The Ink renderer repaints the screen on every event, which floods
+ * agent transcripts with redundant frames; LoggingCli emits one line per
+ * status change instead.
+ */
+export const isNonInteractive = (): boolean => {
+  const env = process.env;
+  if (env.ALCHEMY_PLAIN === "1" || env.ALCHEMY_NO_TUI === "1") return true;
+  if (env.ALCHEMY_TUI === "1") return false;
+  if (!process.stdout.isTTY) return true;
+  if (env.CI) return true;
+  // Known coding-agent env vars. These are best-effort — the isTTY check
+  // above already catches most cases since agents typically pipe stdout.
+  if (
+    env.CLAUDECODE ||
+    env.CLAUDE_CODE_ENTRYPOINT ||
+    env.CURSOR_AGENT ||
+    env.AIDER_MODEL ||
+    env.CODEX_CLI
+  )
+    return true;
+  return false;
+};
+
+export const selectCli = (): Layer.Layer<Cli> =>
+  isNonInteractive() ? LoggingCli : inkCLI();