studiocms 0.1.0-beta.26 → 0.1.0-beta.27

package/CHANGELOG.md

@@ -1,5 +1,44 @@
 # studiocms
 
+## 0.1.0-beta.27
+
+### Patch Changes
+
+- [#807](https://github.com/withstudiocms/studiocms/pull/807) [`6833a1d`](https://github.com/withstudiocms/studiocms/commit/6833a1dd46b34914c087dc57cffc28950d038911) Thanks [@Adammatthiesen](https://github.com/Adammatthiesen)! - Enable the "Draft" toggle on the Edit Page for all pages (including the `index` page) so the `draft` field is submitted with the form. Previously the disabled control omitted this field from the payload, preventing changes to draft status.
+
+- [#852](https://github.com/withstudiocms/studiocms/pull/852) [`ce2f95c`](https://github.com/withstudiocms/studiocms/commit/ce2f95c4c78778cdb0ce867012de05c8f1e3dc67) Thanks [@Adammatthiesen](https://github.com/Adammatthiesen)! - fix: Ensure slug is not an empty string, or an invalid slug.
+
+- [#804](https://github.com/withstudiocms/studiocms/pull/804) [`82cd1bf`](https://github.com/withstudiocms/studiocms/commit/82cd1bfd1a442015c266df733988f29fdaafaaf4) Thanks [@renovate](https://github.com/apps/renovate)! - fix(deps): update dependency @iconify-json/simple-icons to ^1.2.51
+
+- [#810](https://github.com/withstudiocms/studiocms/pull/810) [`3d4c4ea`](https://github.com/withstudiocms/studiocms/commit/3d4c4eae4b425db1f0dde5712177faa68d3c9712) Thanks [@renovate](https://github.com/apps/renovate)! - fix(deps): update dependency @iconify-json/simple-icons to ^1.2.52
+
+- [#841](https://github.com/withstudiocms/studiocms/pull/841) [`c661a9f`](https://github.com/withstudiocms/studiocms/commit/c661a9f7f4deb1f1ec695bbb8702c5d570dc4c20) Thanks [@renovate](https://github.com/apps/renovate)! - fix(deps): update dependency dompurify to ^3.2.7
+
+- [#813](https://github.com/withstudiocms/studiocms/pull/813) [`e1f531f`](https://github.com/withstudiocms/studiocms/commit/e1f531f7bd3705a988fe67205ce6bd2665d7d33d) Thanks [@Adammatthiesen](https://github.com/Adammatthiesen)! - Create new test export for helping aid in CI testing
+
+- [#772](https://github.com/withstudiocms/studiocms/pull/772) [`ecc664c`](https://github.com/withstudiocms/studiocms/commit/ecc664cbb560f03db2078dc8d23135f9e966a7d4) Thanks [@Adammatthiesen](https://github.com/Adammatthiesen)! - Deduplicate CLI utilities and unify avatar URL generation (Libravatar)
+
+- [#809](https://github.com/withstudiocms/studiocms/pull/809) [`15854f2`](https://github.com/withstudiocms/studiocms/commit/15854f2bf620d3ea83da5af6a1651b31e9c433f6) Thanks [@Adammatthiesen](https://github.com/Adammatthiesen)! - Integrate new effect helper for drizzle libsql db client
+
+- [#774](https://github.com/withstudiocms/studiocms/pull/774) [`3b59fcf`](https://github.com/withstudiocms/studiocms/commit/3b59fcf7885d5c4952bd30279fa8ea2e2f0f5eaa) Thanks [@Adammatthiesen](https://github.com/Adammatthiesen)! - Refactor CLI to utilize new Effect-ful clack module from `@withstudiocms/effect`
+
+- [#770](https://github.com/withstudiocms/studiocms/pull/770) [`67d8973`](https://github.com/withstudiocms/studiocms/commit/67d8973cd703f6d3a5c50e31d3f051ef8f938548) Thanks [@Adammatthiesen](https://github.com/Adammatthiesen)! - Migrate CLI to new authkit package
+
+- [#781](https://github.com/withstudiocms/studiocms/pull/781) [`1848b0c`](https://github.com/withstudiocms/studiocms/commit/1848b0ce4d8bbb908a3207079fbbeeda446e3cb7) Thanks [@Adammatthiesen](https://github.com/Adammatthiesen)! - Cleans CLI to utilize fully Effect-TS based code instead of raw JS/TS, allowing better error handling and code maintainability.
+
+- [#823](https://github.com/withstudiocms/studiocms/pull/823) [`6c65ddb`](https://github.com/withstudiocms/studiocms/commit/6c65ddb94a15997801ebee43ac90d3f380248a86) Thanks [@Adammatthiesen](https://github.com/Adammatthiesen)! - Setup initial testing for StudioCMS
+
+- [#785](https://github.com/withstudiocms/studiocms/pull/785) [`c86f4f4`](https://github.com/withstudiocms/studiocms/commit/c86f4f4ab0873c29246582a8dbcab645057d146c) Thanks [@Adammatthiesen](https://github.com/Adammatthiesen)! - rename internal file to avoid confusion with tests during dev
+
+- [#789](https://github.com/withstudiocms/studiocms/pull/789) [`5713f15`](https://github.com/withstudiocms/studiocms/commit/5713f154eb15aad8d2c2c8a5a5c13611ff03dee8) Thanks [@Adammatthiesen](https://github.com/Adammatthiesen)! - Correct parameter in CLI add command.
+
+- Updated dependencies [[`71d8948`](https://github.com/withstudiocms/studiocms/commit/71d894899a417e3a249c5f47e527223ade38b4fc), [`9d3784c`](https://github.com/withstudiocms/studiocms/commit/9d3784c1de98a4bc7bb913742c3977e16c87cc1b), [`726e07a`](https://github.com/withstudiocms/studiocms/commit/726e07a458fff9e50d4c02b80e0312f52f05e730), [`bf15ff6`](https://github.com/withstudiocms/studiocms/commit/bf15ff65a5f4ba6c2e4cd616d3c45ba0da784a1a), [`627119b`](https://github.com/withstudiocms/studiocms/commit/627119bfde88e9c2ea74a29817d91fb6afbab33d), [`3b59fcf`](https://github.com/withstudiocms/studiocms/commit/3b59fcf7885d5c4952bd30279fa8ea2e2f0f5eaa), [`3d3612d`](https://github.com/withstudiocms/studiocms/commit/3d3612d510f4827acfb4de364d39e835a693818f), [`c2c2b73`](https://github.com/withstudiocms/studiocms/commit/c2c2b73a71009769e38ea4b30ae4010f6f0fdd14), [`67d8973`](https://github.com/withstudiocms/studiocms/commit/67d8973cd703f6d3a5c50e31d3f051ef8f938548), [`47a2fed`](https://github.com/withstudiocms/studiocms/commit/47a2fedd8ed1c751def929058772ea78532e8d7d), [`c478f2d`](https://github.com/withstudiocms/studiocms/commit/c478f2dba7fb5cc923e0dbf0367fa2a050fcdc2d), [`fbb9ad1`](https://github.com/withstudiocms/studiocms/commit/fbb9ad10555f26c8e6261cd71a7650ab4aeb64f9), [`faf2a70`](https://github.com/withstudiocms/studiocms/commit/faf2a70ae57d136a9ccbbdebad70897e42c14c64), [`55885eb`](https://github.com/withstudiocms/studiocms/commit/55885eba617d8ec790e68ed0985f8530628140d8), [`0e8e280`](https://github.com/withstudiocms/studiocms/commit/0e8e280c4a2a7552d3b78b370600019e49f5a459), [`9b85861`](https://github.com/withstudiocms/studiocms/commit/9b85861b20ca9eb2aa2c434b225ff85399bb04f0)]:
+  - @withstudiocms/auth-kit@0.1.0-beta.2
+  - @withstudiocms/component-registry@0.1.0-beta.3
+  - @withstudiocms/internal_helpers@0.1.0-beta.2
+  - @withstudiocms/config-utils@0.1.0-beta.4
+  - @withstudiocms/effect@0.1.0-beta.3
+
 ## 0.1.0-beta.26
 
 ### Patch Changes

package/README.md

@@ -4,6 +4,8 @@ StudioCMS is a dedicated Astro native content management system (CMS) built on t
 
 > [!IMPORTANT]
 > This project is still in early development and it is not yet ready for production use. If you encounter any issues or have ideas for new features, please let us know by [opening an issue](https://github.com/withstudiocms/studiocms/issues/new/choose) on our GitHub repository.
+>
+> During our `0.1.0-beta.x` phase, breaking changes may ship in patch releases.
 
 ## Sponsor
 

package/dist/cli/add/index.d.ts

@@ -21,6 +21,6 @@ export declare const createPrettyError: (err: Error) => Effect.Effect<Error, nev
 export declare const resolveConfigPath: (root: URL) => Effect.Effect<URL | undefined, import("effect/Cause").UnknownException, never>;
 export declare function appendForwardSlash(path: string): string;
 export declare const plugin: Cli.Args.Args<string[]>;
-export declare const addPlugin: Cli.Command.Command<"add", never, import("astro/errors").AstroError | import("effect/Cause").UnknownException | Effect.Effect<Error, never, never>, {
+export declare const addPlugin: Cli.Command.Command<"add", never, Error | Effect.Effect<Error, never, never>, {
     readonly plugin: string[];
 }>;

package/dist/cli/add/index.js

@@ -2,6 +2,7 @@ import { existsSync, promises as fs } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { cancelled, success } from "@withstudiocms/cli-kit/messages";
 import { exists, pathToFileURL, resolveRoot } from "@withstudiocms/cli-kit/utils";
+import { intro, note, outro } from "@withstudiocms/effect/clack";
 import { builders, loadFile } from "magicast";
 import { getDefaultExportOptions } from "magicast/helpers";
 import { Cli, Console, Effect, genLogger, Layer } from "../../effect.js";
@@ -129,12 +130,14 @@ const addPlugin = Cli.Command.make(
     plugin
   },
   ({ plugin: plugin2 }) => Effect.gen(function* () {
-    const validator = yield* ValidatePlugins;
-    const installer = yield* TryToInstallPlugins;
-    const updater = yield* UpdateStudioCMSConfig;
-    const context = yield* genContext;
-    const { cwd, prompts, chalk } = context;
-    prompts.intro("StudioCMS CLI Utilities (add)");
+    const [validator, installer, updater, context] = yield* Effect.all([
+      ValidatePlugins,
+      TryToInstallPlugins,
+      UpdateStudioCMSConfig,
+      genContext
+    ]);
+    const { cwd, chalk } = context;
+    yield* intro("StudioCMS CLI Utilities (add)");
     const pluginNames = plugin2.map((name) => {
       const aliasName = ALIASES.get(name);
       if (!aliasName) return name;
@@ -150,7 +153,7 @@ const addPlugin = Cli.Command.make(
         break;
       }
       case 2 /* cancelled */: {
-        prompts.note(
+        yield* note(
           cancelled(
             `Dependencies ${chalk.bold("NOT")} installed.`,
             "Be sure to install them manually before continuing!"
@@ -164,7 +167,7 @@ const addPlugin = Cli.Command.make(
       case 0 /* none */:
         break;
     }
-    const configURL = yield* resolveOrCreateConfig(new URL(rootPath));
+    const configURL = yield* resolveOrCreateConfig(root);
     yield* Console.debug(`found config at ${configURL}`);
     const mod = yield* loadConfigModule(configURL, validatedPlugins);
     let configResult;
@@ -179,7 +182,7 @@ const addPlugin = Cli.Command.make(
     }
     switch (configResult) {
       case 2 /* cancelled */: {
-        prompts.outro(cancelled(`Your configuration has ${chalk.bold("NOT")} been updated.`));
+        yield* outro(cancelled(`Your configuration has ${chalk.bold("NOT")} been updated.`));
         break;
       }
       case 0 /* none */: {
@@ -193,11 +196,11 @@ const addPlugin = Cli.Command.make(
             (plugin3) => !deps.includes(plugin3.packageName)
           );
           if (missingDeps.length === 0) {
-            prompts.outro("Configuration up-to-date.");
+            yield* outro("Configuration up-to-date.");
             break;
           }
         }
-        prompts.outro("Configuration up-to-date.");
+        yield* outro("Configuration up-to-date.");
         break;
       }
       // NOTE: failure shouldn't happen in practice because `updateAstroConfig` doesn't return that.
@@ -206,7 +209,7 @@ const addPlugin = Cli.Command.make(
       case 1 /* updated */:
       case void 0: {
         const list = validatedPlugins.map((plugin3) => `  - ${plugin3.pluginName}`).join("\n");
-        prompts.outro(
+        yield* outro(
           success(
             `Added the following plugin${validatedPlugins.length === 1 ? "" : "s"} to your project:
  ${list}`

package/dist/cli/add/tryToInstallPlugins.d.ts

@@ -3,7 +3,7 @@ import { CliContext } from '../utils/context.js';
 import { type PluginInfo, UpdateResult } from './index.js';
 declare const TryToInstallPlugins_base: Effect.Service.Class<TryToInstallPlugins, "TryToInstallPlugins", {
     readonly effect: Effect.Effect<{
-        run: (plugins: PluginInfo[]) => Effect.Effect<UpdateResult, import("astro/errors").AstroError | import("effect/Cause").UnknownException, CliContext>;
+        run: (plugins: PluginInfo[]) => Effect.Effect<UpdateResult, Error, CliContext>;
     }, never, never>;
 }>;
 export declare class TryToInstallPlugins extends TryToInstallPlugins_base {

package/dist/cli/add/tryToInstallPlugins.js

@@ -1,5 +1,5 @@
-import { askToContinue } from "@withstudiocms/cli-kit/messages";
 import { exec } from "@withstudiocms/cli-kit/utils";
+import { askToContinue, note, spinner } from "@withstudiocms/effect/clack";
 import { detect, resolveCommand } from "package-manager-detector";
 import { Console, Effect, genLogger } from "../../effect.js";
 import { CliContext } from "../utils/context.js";
@@ -11,7 +11,7 @@ class TryToInstallPlugins extends Effect.Service()(
   {
     effect: genLogger("studiocms/cli/add/validatePlugins/TryToInstallPlugins.effect")(function* () {
       const run = (plugins) => genLogger("studiocms/cli/add/validatePlugins/TryToInstallPlugins.effect.run")(function* () {
-        const { prompts, chalk, cwd } = yield* CliContext;
+        const { chalk, cwd } = yield* CliContext;
         const packageManager = yield* Effect.tryPromise(
           () => detect({
             cwd,
@@ -47,14 +47,14 @@ class TryToInstallPlugins extends Effect.Service()(
         const message = `
 ${boxenMessage}
 `;
-        prompts.note(
+        yield* note(
           `${chalk.magenta("StudioCMS will run the following command:")}
  ${chalk.dim("If you skip this step, you can always run it yourself later")}
 ${message}`
         );
-        if (yield* Effect.tryPromise(() => askToContinue(prompts))) {
-          const spinner = prompts.spinner();
-          spinner.start("Installing dependencies...");
+        if (yield* askToContinue()) {
+          const spin = yield* spinner();
+          yield* spin.start("Installing dependencies...");
           const response = yield* Effect.tryPromise({
             try: async () => {
               await exec(installCommand.command, [...installCommand.args, ...installSpecifiers], {
@@ -63,13 +63,16 @@ ${message}`
                   env: { NODE_ENV: void 0 }
                 }
               });
-              spinner.stop("Dependencies installed.");
               return UpdateResult.updated;
             },
             catch: (err) => err
           }).pipe(Effect.catchAll((err) => Effect.succeed(err)));
+          if (response === UpdateResult.updated) {
+            yield* spin.stop("Dependencies installed!");
+            return response;
+          }
           if (response instanceof Error || response && typeof response === "object" && "message" in response) {
-            spinner.stop("Error installing dependencies");
+            yield* spin.stop("Error installing dependencies");
             yield* Console.debug(`[add]: Error installing dependencies ${response}`);
             yield* Console.error(`
 ${response.stdout || response.message}

package/dist/cli/add/updateStudioCMSConfig.d.ts

@@ -4,7 +4,7 @@ import { CliContext } from '../utils/context.js';
 import { UpdateResult } from './index.js';
 declare const UpdateStudioCMSConfig_base: Effect.Service.Class<UpdateStudioCMSConfig, "UpdateStudioCMSConfig", {
     readonly effect: Effect.Effect<{
-        run: (configURL: URL, mod: ProxifiedModule<any>) => Effect.Effect<UpdateResult.none | UpdateResult.updated | UpdateResult.cancelled, import("astro/errors").AstroError | import("effect/Cause").UnknownException, CliContext>;
+        run: (configURL: URL, mod: ProxifiedModule<any>) => Effect.Effect<UpdateResult.none | UpdateResult.updated | UpdateResult.cancelled, Error, CliContext>;
     }, never, never>;
 }>;
 export declare class UpdateStudioCMSConfig extends UpdateStudioCMSConfig_base {

package/dist/cli/add/updateStudioCMSConfig.js

@@ -1,6 +1,6 @@
 import { promises as fs } from "node:fs";
 import { fileURLToPath } from "node:url";
-import { askToContinue } from "@withstudiocms/cli-kit/messages";
+import { askToContinue, note } from "@withstudiocms/effect/clack";
 import { diffWords } from "diff";
 import { generateCode } from "magicast";
 import { Console, Effect, genLogger } from "../../effect.js";
@@ -15,7 +15,7 @@ class UpdateStudioCMSConfig extends Effect.Service()(
         const run = (configURL, mod) => genLogger("studiocms/cli/add/updateStudioCMSConfig/UpdateStudioCMSConfig.effect.run")(
           function* () {
             const context = yield* CliContext;
-            const { prompts, chalk } = context;
+            const { chalk } = context;
             const input = yield* Effect.tryPromise(
               () => fs.readFile(fileURLToPath(configURL), { encoding: "utf-8" })
             );
@@ -44,12 +44,12 @@ class UpdateStudioCMSConfig extends Effect.Service()(
             const message = `
 ${boxenMessage}
 `;
-            prompts.note(
+            yield* note(
               `
  ${chalk.magenta("StudioCMS will make the following changes to your config file:")}
 ${message}`
             );
-            if (yield* Effect.tryPromise(() => askToContinue(prompts))) {
+            if (yield* askToContinue()) {
               yield* Effect.tryPromise(
                 () => fs.writeFile(fileURLToPath(configURL), output, { encoding: "utf-8" })
               );

package/dist/cli/add/validatePlugins.d.ts

@@ -3,7 +3,7 @@ import { CliContext } from '../utils/context.js';
 import { type PluginInfo } from './index.js';
 declare const ValidatePlugins_base: Effect.Service.Class<ValidatePlugins, "ValidatePlugins", {
     readonly effect: Effect.Effect<{
-        run: (names: string[]) => Effect.Effect<PluginInfo[], import("effect/Cause").UnknownException, CliContext>;
+        run: (names: string[]) => Effect.Effect<PluginInfo[], Error, CliContext>;
     }, never, never>;
 }>;
 export declare class ValidatePlugins extends ValidatePlugins_base {

package/dist/cli/add/validatePlugins.js

@@ -1,4 +1,4 @@
-import { askToContinue } from "@withstudiocms/cli-kit/messages";
+import { askToContinue, spinner } from "@withstudiocms/effect/clack";
 import { Effect, genLogger } from "../../effect.js";
 import { CliContext } from "../utils/context.js";
 import { StudioCMSScopes } from "./index.js";
@@ -6,9 +6,9 @@ import { fetchPackageJson, parsePluginName } from "./npm-utils.js";
 class ValidatePlugins extends Effect.Service()("ValidatePlugins", {
   effect: genLogger("studiocms/cli/add/validatePlugins/ValidatePlugins.effect")(function* () {
     const run = (names) => genLogger("studiocms/cli/add/validatePlugins/ValidatePlugins.effect.run")(function* () {
-      const { prompts, chalk } = yield* CliContext;
-      const spinner = yield* Effect.try(() => prompts.spinner());
-      spinner.start("Resolving packages...");
+      const { chalk } = yield* CliContext;
+      const spin = yield* spinner();
+      yield* spin.start("Resolving packages...");
       const entries = [];
       for (const plugin of names) {
         const parsed = yield* parsePluginName(plugin);
@@ -23,17 +23,17 @@ class ValidatePlugins extends Effect.Service()("ValidatePlugins", {
           const firstPartyPkgCheck = yield* fetchPackageJson(scope, name, tag);
           if (firstPartyPkgCheck instanceof Error) {
             if (firstPartyPkgCheck.message) {
-              spinner.message(chalk.yellow(firstPartyPkgCheck.message));
+              yield* spin.message(chalk.yellow(firstPartyPkgCheck.message));
             }
-            spinner.message(
+            yield* spin.message(
               chalk.yellow(`${chalk.bold(plugin)} is not an official StudioCMS package.`)
             );
-            if (!(yield* Effect.tryPromise(() => askToContinue(prompts)))) {
+            if (!(yield* askToContinue())) {
               throw new Error(
                 `No problem! Find our official plugins at ${chalk.magenta("https://docs.studiocms.dev")}`
               );
             }
-            spinner.start("Resolving with third party packages...");
+            yield* spin.start("Resolving with third party packages...");
             pkgType = "third-party";
           } else {
             pkgType = "first-party";
@@ -44,7 +44,7 @@ class ValidatePlugins extends Effect.Service()("ValidatePlugins", {
           const thirdPartyPkgCheck = yield* fetchPackageJson(scope, name, tag);
           if (thirdPartyPkgCheck instanceof Error) {
             if (thirdPartyPkgCheck.message) {
-              spinner.message(chalk.yellow(thirdPartyPkgCheck.message));
+              yield* spin.message(chalk.yellow(thirdPartyPkgCheck.message));
             }
             throw new Error(`Unable to fetch ${chalk.bold(plugin)}. Does the package exist?`);
           }
@@ -77,7 +77,7 @@ class ValidatePlugins extends Effect.Service()("ValidatePlugins", {
           pluginName
         });
       }
-      spinner.stop("Packages Resolved.");
+      yield* spin.stop("Packages Resolved.");
       return entries;
     });
     return { run };

package/dist/cli/crypto/genJWT/index.js

@@ -5,6 +5,7 @@ import {
   StudioCMSColorwayInfoBg
 } from "@withstudiocms/cli-kit/colors";
 import { boxen, label } from "@withstudiocms/cli-kit/messages";
+import { intro, log, outro, spinner } from "@withstudiocms/effect/clack";
 import { SignJWT } from "jose";
 import { importPKCS8 } from "jose/key/import";
 import { Cli, Effect, genLogger } from "../../../effect.js";
@@ -58,19 +59,19 @@ const genJWT = Cli.Command.make(
     }
     if (debug2) logger.debug("Getting context");
     const context = yield* genContext;
-    const { prompts, chalk } = context;
+    const { chalk } = context;
     if (debug2) logger.debug("Init complete, starting...");
-    prompts.intro(label("StudioCMS Crypto: Generate JWT", StudioCMSColorwayBg, chalk.bold));
-    const spinner = prompts.spinner();
+    yield* intro(label("StudioCMS Crypto: Generate JWT", StudioCMSColorwayBg, chalk.bold));
+    const spin = yield* spinner();
     try {
-      spinner.start("Getting Key from keyFile");
+      yield* spin.start("Getting Key from keyFile");
       if (debug2) logger.debug(`Key file path: ${keyFile2}`);
       if (debug2) logger.debug(`Key file exists: ${fs.existsSync(keyFile2)}`);
       if (debug2) logger.debug(`Key file is a file: ${fs.statSync(keyFile2).isFile()}`);
       const keyString = yield* Effect.try(() => fs.readFileSync(keyFile2, "utf8"));
       if (debug2) logger.debug(`Key string: ${keyString}`);
       if (!keyString) {
-        spinner.stop("Key not found, or invalid");
+        yield* spin.stop("Key not found, or invalid");
         return yield* Effect.fail(new Error("Key not found, or invalid"));
       }
       const alg = "EdDSA";
@@ -78,7 +79,7 @@ const genJWT = Cli.Command.make(
       try {
         privateKey = yield* Effect.tryPromise(() => importPKCS8(keyString, alg));
       } catch (_e) {
-        spinner.stop("Invalid or unsupported private key");
+        yield* spin.stop("Invalid or unsupported private key");
         return yield* Effect.fail(new Error("Invalid or unsupported private key"));
       }
       const NOW = /* @__PURE__ */ new Date();
@@ -87,28 +88,28 @@ const genJWT = Cli.Command.make(
         () => new SignJWT({ sub: "libsql-client" }).setProtectedHeader({ alg }).setIssuedAt(NOW).setExpirationTime(expirationDate).setIssuer("admin").sign(privateKey)
       );
       const base64UrlJwt = yield* convertJwtToBase64Url(jwt);
-      spinner.stop("Token Generated.");
-      prompts.log.success(
+      yield* spin.stop("Token Generated.");
+      yield* log.success(
         boxen(chalk.bold(`${label("Token Generated!", StudioCMSColorwayInfoBg, chalk.bold)}`), {
           ln1: "Your new Token has been generated successfully:",
           ln3: `Token: ${chalk.magenta(jwt)}`,
           ln5: `Base64Url Token: ${chalk.blue(base64UrlJwt)}`
         })
       );
-      prompts.outro(
+      yield* outro(
         `${label("You can now use this token where needed.", StudioCMSColorwayBg, chalk.bold)} Stuck? Join us on Discord at ${StudioCMSColorway.bold.underline("https://chat.studiocms.dev")}`
       );
     } catch (err) {
       if (err instanceof Error) {
         if (err.message.includes("ENOENT")) {
-          prompts.log.error("Key file not found: Please check the file path and try again.");
+          yield* log.error("Key file not found: Please check the file path and try again.");
         } else if (err.message.includes("permission")) {
-          prompts.log.error("Permission denied: Cannot read the key file.");
+          yield* log.error("Permission denied: Cannot read the key file.");
         } else {
-          prompts.log.error(`Error generating JWT: ${err.message}`);
+          yield* log.error(`Error generating JWT: ${err.message}`);
         }
       } else {
-        prompts.log.error(`Unexpected error generating JWT: ${err}`);
+        yield* log.error(`Unexpected error generating JWT: ${err}`);
       }
       return yield* Effect.fail(new Error("JWT ERROR: Unknown"));
     }

package/dist/cli/getTurso/index.js

@@ -1,15 +1,13 @@
 import { runInteractiveCommand } from "@withstudiocms/cli-kit/utils";
-import { Cli, Effect, genLogger } from "../../effect.js";
+import { Cli, Effect } from "../../effect.js";
 const getTurso = Cli.Command.make(
   "get-turso",
   {},
-  () => genLogger("studiocms/cli/getTurso")(function* () {
-    yield* Effect.tryPromise({
-      try: () => runInteractiveCommand("curl -sSfL https://get.tur.so/install.sh | bash").then(
-        () => console.log("Turso CLI install command completed.")
-      ),
-      catch: (error) => console.error(`Failed to run Turso install: ${error.message}`)
-    });
+  () => Effect.tryPromise({
+    try: () => runInteractiveCommand("curl -sSfL https://get.tur.so/install.sh | bash").then(
+      () => console.log("Turso CLI install command completed.")
+    ),
+    catch: (error) => console.error(`Failed to run Turso install: ${error.message}`)
   })
 ).pipe(Cli.Command.withDescription("Install the Turso CLI"));
 export {

package/dist/cli/index.js

@@ -1,10 +1,12 @@
-import { readJson } from "@withstudiocms/cli-kit/utils";
+import { readJson } from "@withstudiocms/internal_helpers/utils";
+import dotenv from "dotenv";
 import { Cli, Effect, Layer, PlatformNode } from "../effect.js";
 import { addPlugin } from "./add/index.js";
 import { cryptoCMD } from "./crypto/index.js";
 import { getTurso } from "./getTurso/index.js";
 import { initCMD } from "./init/index.js";
 import { usersCMD } from "./users/index.js";
+dotenv.config({ quiet: true });
 const pkgJson = readJson(new URL("../../package.json", import.meta.url));
 const command = Cli.Command.make("studiocms").pipe(
   Cli.Command.withDescription("StudioCMS CLI Utility Toolkit"),

package/dist/cli/init/index.js

@@ -1,9 +1,11 @@
 import { StudioCMSColorwayBg } from "@withstudiocms/cli-kit/colors";
 import { label } from "@withstudiocms/cli-kit/messages";
-import { Cli, Console, Effect, genLogger } from "../../effect.js";
-import { CliContext, genContext } from "../utils/context.js";
-import { intro } from "../utils/intro.js";
-import { logger } from "../utils/logger.js";
+import { intro, log, multiselect, tasks } from "@withstudiocms/effect/clack";
+import { Cli, Effect, genLogger } from "../../effect.js";
+import { CliContext, genContext, parseDebug } from "../utils/context.js";
+import { intro as SCMS_Intro } from "../utils/intro.js";
+import { buildDebugLogger } from "../utils/logger.js";
+import { appendOptionsToSteps } from "../utils/types.js";
 import { env } from "./steps/env.js";
 import { next } from "./steps/next.js";
 const debug = Cli.Options.boolean("debug").pipe(
@@ -16,68 +18,63 @@ const dryRun = Cli.Options.boolean("dry-run").pipe(
   Cli.Options.withAlias("d"),
   Cli.Options.withDescription("Dry run mode")
 );
+const exitIfEmpty = Effect.fn(function* (context, items, itemType) {
+  if (items.length === 0) {
+    yield* log.error(`No ${itemType} selected, exiting...`);
+    yield* context.exit(0);
+  }
+});
+const OptionToStepMap = {
+  env
+};
 const initCMD = Cli.Command.make(
   "init",
   { debug, dryRun },
-  ({ debug: _debug, dryRun: dryRun2 }) => genLogger("studiocms/cli/init")(function* () {
-    let debug2;
-    if (typeof _debug !== "boolean") {
-      debug2 = yield* _debug;
-    } else {
-      debug2 = _debug;
-    }
-    const dry = yield* dryRun2;
-    const context = yield* genContext;
-    const { prompts, chalk } = context;
-    yield* Console.log("Starting interactive CLI...");
-    debug2 && logger.debug(`Options: ${JSON.stringify({ debug: debug2, dry }, null, 2)}`);
-    debug2 && logger.debug(`Context: ${JSON.stringify(context, null, 2)}`);
-    yield* Console.log("");
-    prompts.intro(
-      `${label("StudioCMS", StudioCMSColorwayBg, chalk.black)} Interactive CLI - initializing...`
-    );
-    yield* intro(debug2).pipe(CliContext.makeProvide(context));
+  ({ debug: rawDebug, dryRun: rawDryRun }) => genLogger("studiocms/cli/init")(function* () {
+    const [dry, context, debug2] = yield* Effect.all([
+      rawDryRun,
+      genContext,
+      parseDebug(rawDebug)
+    ]);
+    const debugLogger = yield* buildDebugLogger(debug2);
+    const cliContext = CliContext.makeProvide(context);
+    yield* Effect.all([
+      debugLogger("Starting interactive CLI..."),
+      debugLogger(`Options: ${JSON.stringify({ debug: debug2, dry }, null, 2)}`),
+      debugLogger(`Context: ${JSON.stringify(context, null, 2)}`),
+      intro(
+        `${label("StudioCMS", StudioCMSColorwayBg, context.chalk.black)} Interactive CLI - initializing...`
+      )
+    ]);
+    yield* SCMS_Intro(debug2).pipe(cliContext);
     const steps = [];
-    debug2 && logger.debug("Running Option selection...");
-    const options = yield* Effect.tryPromise(
-      () => prompts.multiselect({
+    const [_dropOptionLog, options] = yield* Effect.all([
+      debugLogger("Running Option selection..."),
+      multiselect({
         message: "What would you like to do? (Select all that apply)",
         options: [{ value: "env", label: "Setup Environment File", hint: "Create a .env file" }]
       })
-    );
+    ]);
     if (typeof options === "symbol") {
-      context.pCancel(options);
-    } else {
-      options.includes("env") && steps.push(env);
-    }
-    if (steps.length === 0) {
-      prompts.log.error("No steps selected, exiting...");
-      context.exit(1);
-    }
-    debug2 && logger.debug("Running steps...");
-    for (const step of steps) {
-      yield* Effect.tryPromise({
-        try: () => step(context, debug2, dry),
-        catch: (error) => {
-          prompts.log.error(
-            `Step execution failed: ${error instanceof Error ? error.message : String(error)}`
-          );
-          return new Error(
-            `Step execution failed: ${error instanceof Error ? error.message : String(error)}`
-          );
-        }
-      });
-    }
-    debug2 && logger.debug("Running tasks...");
-    if (context.tasks.length === 0) {
-      prompts.log.error("No tasks selected, exiting...");
-      context.exit(0);
+      return yield* context.pCancel(options);
     }
-    yield* Effect.tryPromise(() => prompts.tasks(context.tasks));
-    debug2 && logger.debug("Running next steps...");
-    yield* next(debug2).pipe(CliContext.makeProvide(context));
-    debug2 && logger.debug("Interactive CLI completed, exiting...");
-    context.exit(0);
+    appendOptionsToSteps(options, steps, OptionToStepMap);
+    yield* exitIfEmpty(context, steps, "steps");
+    yield* Effect.all([
+      debugLogger("Running steps..."),
+      Effect.forEach(steps, (step) => step(context, debug2, dry))
+    ]);
+    yield* exitIfEmpty(context, context.tasks, "tasks");
+    yield* Effect.all([
+      debugLogger(`Tasks to run: ${context.tasks.length}`),
+      debugLogger("Running tasks..."),
+      tasks(context.tasks)
+    ]);
+    yield* Effect.all([
+      debugLogger("Tasks complete, running next steps..."),
+      next(debug2).pipe(cliContext)
+    ]);
+    yield* Effect.all([debugLogger("Interactive CLI completed, exiting..."), context.exit(0)]);
   })
 ).pipe(Cli.Command.withDescription("Initialize the StudioCMS project after new installation."));
 export {

package/dist/cli/init/steps/env.d.ts

@@ -1,7 +1,7 @@
-import type { StepFn } from '../../utils/types.js';
+import type { EffectStepFn } from '../../utils/types.js';
 export declare enum EnvBuilderAction {
     builder = "builder",
     example = "example",
     none = "none"
 }
-export declare const env: StepFn;
+export declare const env: EffectStepFn;