alchemy 0.27.0 → 0.29.0

package/lib/util/cli.js

@@ -1,64 +1,32 @@
-import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import { Box, render, Static, Text, useApp } from "ink";
-import Spinner from "ink-spinner";
-import { format } from "node:util";
-import { useCallback, useEffect, useRef, useState } from "react";
 import packageJson from "../../package.json" with { type: "json" };
 import { dedent } from "./dedent.js";
-export function LoggerCLI({ alchemyInfo, setLogger }) {
-    const [logs, setLogs] = useState([{ id: 0, text: "#heading" }]);
-    const [tasks, setTasks] = useState(new Map());
-    const { exit } = useApp();
-    let nextId = useRef(1);
-    const log = useCallback((...args) => setLogs((prev) => [
-        ...prev,
-        { id: nextId.current++, text: format(...args) },
-    ]), []);
-    const task = useCallback((id, data) => {
-        setTasks((prev) => {
-            prev.set(id, data);
-            return prev;
-        });
-    }, []);
-    useEffect(() => {
-        setLogger({
-            log: log,
-            warn: log,
-            error: log,
-            task: task,
-            exit: () => exit(),
-        });
-        return () => {
-            setTasks(new Map());
-            setLogs([]);
-        };
-    }, [exit, log, setLogger, task]);
-    return (_jsxs(_Fragment, { children: [_jsx(Static, { items: logs, children: (log) => {
-                    if (log.id === 0) {
-                        return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "column", borderStyle: "round", padding: 1, children: [_jsxs(Text, { color: "green", bold: true, children: ["Alchemy (v", packageJson.version, ")"] }), _jsxs(Text, { color: "gray", bold: true, children: ["App:", " ", _jsx(Text, { color: "magenta", bold: false, children: alchemyInfo.appName })] }), _jsxs(Text, { color: "gray", bold: true, children: ["Phase:", " ", _jsx(Text, { color: "magenta", bold: false, children: alchemyInfo.phase })] }), _jsxs(Text, { color: "gray", bold: true, children: ["Stage:", " ", _jsx(Text, { color: "magenta", bold: false, children: alchemyInfo.stage })] })] }), _jsx(Text, { color: "green", bold: true, children: "Logs" })] }, log.text));
-                    }
-                    return (_jsx(Text, { color: "gray", wrap: "wrap", children: log.text }, log.id));
-                } }), _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: "green", bold: true, children: "Tasks" }), _jsx(Box, { flexDirection: "column", paddingLeft: 1, children: Array.from(tasks.entries()).map(([id, task]) => (_jsxs(Box, { flexDirection: "row", gap: 1, children: [!task.status || task.status === "pending" ? (_jsx(Spinner, {})) : task.status === "success" ? (_jsx(Text, { color: "green", children: "\u2713" })) : (_jsx(Text, { color: "red", children: "\u2717" })), task.prefix && (_jsx(Text, { color: task.prefixColor ?? "white", bold: true, children: task.prefix.padStart(9) })), task.resource && (_jsxs(Text, { color: "gray", bold: true, children: ["[", task.resource, "]"] })), _jsx(Text, { bold: true, children: task.message })] }, id))) })] })] }));
-}
+// ANSI color codes
+const colors = {
+    reset: "\x1b[0m",
+    cyanBright: "\x1b[96m",
+    yellowBright: "\x1b[93m",
+    magenta: "\x1b[35m",
+    greenBright: "\x1b[92m",
+    redBright: "\x1b[91m",
+    gray: "\x1b[90m",
+};
+// Check if colors should be disabled
+const shouldDisableColors = () => {
+    return Boolean(process.env.CI || process.env.NO_COLOR || !process.stdout.isTTY);
+};
+// Apply color if colors are enabled
+const colorize = (text, color) => {
+    if (shouldDisableColors()) {
+        return text;
+    }
+    return `${colors[color]}${text}${colors.reset}`;
+};
 let loggerApi = null;
-export const createLoggerInstance = (alchemyInfo) => {
+export const createLoggerInstance = (alchemyInfo, customLogger) => {
     if (loggerApi)
         return loggerApi;
-    if (process.env.CI ||
-        process.env.USE_FALLBACK_LOGGER ||
-        !process.stdin.isTTY) {
-        loggerApi = createFallbackLogger(alchemyInfo);
-        return loggerApi;
-    }
-    render(_jsx(LoggerCLI, { alchemyInfo: alchemyInfo, setLogger: (logger) => {
-            loggerApi = logger;
-        } }), {
-        exitOnCtrlC: true,
-    });
-    process.on("SIGINT", () => {
-        loggerApi?.exit();
-        process.exit(0);
-    });
+    // Use custom logger if provided, otherwise use the basic fallback logger
+    loggerApi = customLogger ?? createFallbackLogger(alchemyInfo);
     return loggerApi;
 };
 export const createDummyLogger = () => {
@@ -72,7 +40,7 @@ export const createDummyLogger = () => {
 };
 export const createFallbackLogger = (alchemyInfo) => {
     console.log(dedent `
-    Alchemy (v${packageJson.version})
+    ${colorize("Alchemy", "cyanBright")} (v${packageJson.version})
     App: ${alchemyInfo.appName}
     Phase: ${alchemyInfo.phase}
     Stage: ${alchemyInfo.stage}
@@ -80,9 +48,27 @@ export const createFallbackLogger = (alchemyInfo) => {
   `);
     return {
         log: console.log,
-        error: console.error,
-        warn: console.warn,
-        task: () => { },
+        error: (...args) => console.error(colorize("ERROR", "redBright"), ...args),
+        warn: (...args) => console.warn(colorize("WARN", "yellowBright"), ...args),
+        task: (_id, data) => {
+            const prefix = data.prefix ? `[${data.prefix}]` : "";
+            // Pad the prefix to ensure consistent alignment (12 characters total including brackets)
+            const paddedPrefix = prefix.padEnd(12);
+            const prefixWithColor = data.prefixColor && prefix
+                ? colorize(paddedPrefix, data.prefixColor)
+                : paddedPrefix;
+            const resource = data.resource ? colorize(data.resource, "gray") : "";
+            const message = data.message;
+            if (prefixWithColor && resource) {
+                console.log(`${prefixWithColor}${resource} ${message}`);
+            }
+            else if (prefixWithColor) {
+                console.log(`${prefixWithColor}${message}`);
+            }
+            else {
+                console.log(`${message}`);
+            }
+        },
         exit: () => { },
     };
 };

package/lib/util/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/util/cli.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/util/cli.ts"],"names":[],"mappings":"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"}

package/lib/util/logger.d.ts

@@ -1,3 +1,3 @@
-import type { LoggerApi } from "./cli.tsx";
+import type { LoggerApi } from "./cli.ts";
 export declare const logger: LoggerApi;
 //# sourceMappingURL=logger.d.ts.map

package/lib/util/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/util/logger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,eAAO,MAAM,MAAM,WAajB,CAAC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/util/logger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,eAAO,MAAM,MAAM,WAajB,CAAC"}

package/lib/util/telemetry/client.js

@@ -29,7 +29,7 @@ export class TelemetryClient {
     }
     record(event, timestamp = Date.now()) {
         if (!this.context) {
-            throw new Error("Context not initialized");
+            return;
         }
         const payload = {
             ...event,

package/lib/util/telemetry/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/util/telemetry/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/util/telemetry/client.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "0.27.0",
+  "version": "0.29.0",
   "type": "module",
   "module": "./lib/index.js",
   "license": "Apache-2.0",
@@ -162,7 +162,6 @@
     "@types/diff": "^5.0.0",
     "@types/libsodium-wrappers": "^0.7.14",
     "@types/node": "latest",
-    "@types/react": "^19.1.6",
     "@types/turndown": "^5.0.5",
     "ai": "^4.1.16",
     "arktype": "^2.1.16",
@@ -170,12 +169,10 @@
     "change-case": "^5.4.4",
     "cloudflare": "^4.2.0",
     "cpx": "^1.5.0",
-    "ink": "^6.0.0",
-    "ink-spinner": "^5.0.0",
     "libsodium-wrappers": "^0.7.15",
+    "miniflare": "^4.0.0",
     "openpgp": "^6.1.0",
     "prettier": "^3.5.3",
-    "react": "^19.1.0",
     "turndown": "^7.2.0",
     "typedoc": "^0.28.1",
     "typedoc-plugin-markdown": "^4.6.0",

package/src/alchemy.ts

@@ -17,6 +17,40 @@ import { secret } from "./secret.ts";
 import type { StateStoreType } from "./state.ts";
 import { logger } from "./util/logger.ts";
 import { TelemetryClient } from "./util/telemetry/client.ts";
+import type { LoggerApi } from "./util/cli.ts";
+
+/**
+ * Parses CLI arguments to extract alchemy options
+ */
+function parseCliArgs(): Partial<AlchemyOptions> {
+  const args = process.argv.slice(2);
+  const options: Partial<AlchemyOptions> = {};
+
+  // Parse phase from CLI arguments
+  if (args.includes("--destroy")) {
+    options.phase = "destroy";
+  } else if (args.includes("--read")) {
+    options.phase = "read";
+  }
+
+  // Parse quiet flag
+  if (args.includes("--quiet")) {
+    options.quiet = true;
+  }
+
+  // Parse stage argument (--stage my-stage)
+  const stageIndex = args.indexOf("--stage");
+  if (stageIndex !== -1 && stageIndex + 1 < args.length) {
+    options.stage = args[stageIndex + 1];
+  }
+
+  // Get password from environment variables
+  if (process.env.ALCHEMY_PASSWORD) {
+    options.password = process.env.ALCHEMY_PASSWORD;
+  }
+
+  return options;
+}
 
 /**
  * Type alias for semantic highlighting of `alchemy` as a type keyword
@@ -28,9 +62,16 @@ export const alchemy: Alchemy = _alchemy as any;
 /**
  * The Alchemy interface provides core functionality and is augmented by providers.
  * Supports both application scoping with secrets and template string interpolation.
+ * Automatically parses CLI arguments for common options.
+ *
+ * @example
+ * // Simple usage with automatic CLI argument parsing
+ * const app = await alchemy("my-app");
+ * // Now supports: --destroy, --read, --quiet, --stage my-stage
+ * // Environment variables: PASSWORD, ALCHEMY_PASSWORD, ALCHEMY_STAGE, USER
  *
  * @example
- * // Create an application scope with stage and secret handling
+ * // Create an application scope with explicit options (overrides CLI args)
  * const app = await alchemy("github:alchemy", {
  *   stage: "prod",
  *   phase: "up",
@@ -68,8 +109,15 @@ export interface Alchemy {
   /**
    * Creates a new application scope with the given name and options.
    * Used to create and manage resources with proper secret handling.
+   * Automatically parses CLI arguments: --destroy, --read, --quiet, --stage <name>
+   * Environment variables: PASSWORD, ALCHEMY_PASSWORD, ALCHEMY_STAGE, USER
    *
    * @example
+   * // Simple usage with CLI argument parsing
+   * const app = await alchemy("my-app");
+   *
+   * @example
+   * // With explicit options (overrides CLI args)
    * const app = await alchemy("my-app", {
    *   stage: "prod",
    *   // Required for encrypting/decrypting secrets
@@ -114,20 +162,29 @@ async function _alchemy(
 ): Promise<Scope | string | never> {
   if (typeof args[0] === "string") {
     const [appName, options] = args as [string, AlchemyOptions?];
-    const phase = isRuntime ? "read" : (options?.phase ?? "up");
+
+    // Parse CLI arguments and merge with provided options (explicit options take precedence)
+    const cliOptions = parseCliArgs();
+    const mergedOptions = {
+      ...cliOptions,
+      ...options,
+    };
+
+    const phase = isRuntime ? "read" : (mergedOptions?.phase ?? "up");
     const telemetryClient =
-      options?.parent?.telemetryClient ??
+      mergedOptions?.parent?.telemetryClient ??
       TelemetryClient.create({
         phase,
-        enabled: options?.telemetry ?? true,
-        quiet: options?.quiet ?? false,
+        enabled: mergedOptions?.telemetry ?? true,
+        quiet: mergedOptions?.quiet ?? false,
       });
     const root = new Scope({
-      ...options,
+      ...mergedOptions,
       appName,
-      stage: options?.stage ?? process.env.ALCHEMY_STAGE,
+      stage:
+        mergedOptions?.stage ?? process.env.ALCHEMY_STAGE ?? process.env.USER,
       phase,
-      password: options?.password ?? process.env.ALCHEMY_PASSWORD,
+      password: mergedOptions?.password ?? process.env.ALCHEMY_PASSWORD,
       telemetryClient,
     });
     try {
@@ -137,7 +194,7 @@ async function _alchemy(
       // see Scope.finalize for where we pop the global scope
       Scope.globals.push(root);
     }
-    if (options?.phase === "destroy") {
+    if (mergedOptions?.phase === "destroy") {
       await destroy(root);
       return process.exit(0);
     }
@@ -308,6 +365,11 @@ export interface AlchemyOptions {
    * @default true
    */
   telemetry?: boolean;
+  /**
+   * A custom logger instance to use for this scope.
+   * If not provided, the default fallback logger will be used.
+   */
+  logger?: LoggerApi;
 }
 
 export interface ScopeOptions extends AlchemyOptions {

package/src/apply.ts

@@ -15,7 +15,7 @@ import {
 import { Scope } from "./scope.ts";
 import { serialize } from "./serde.ts";
 import type { State } from "./state.ts";
-import { formatFQN } from "./util/cli.tsx";
+import { formatFQN } from "./util/cli.ts";
 import { logger } from "./util/logger.ts";
 import type { Telemetry } from "./util/telemetry/index.ts";
 
@@ -41,12 +41,6 @@ async function _apply<Out extends Resource>(
   const scope = resource[ResourceScope];
   const start = performance.now();
   try {
-    logger.task(resource[ResourceFQN], {
-      prefix: "SETUP",
-      prefixColor: "cyanBright",
-      resource: formatFQN(resource[ResourceFQN]),
-      message: "Setting up Resource...",
-    });
     const quiet = props?.quiet ?? scope.quiet;
     await scope.init();
     let state: State | undefined = (await scope.state.get(
@@ -112,13 +106,12 @@ async function _apply<Out extends Resource>(
       ) {
         if (!quiet) {
           logger.task(resource[ResourceFQN], {
-            prefix: "SKIPPED",
+            prefix: "skipped",
             prefixColor: "yellowBright",
             resource: formatFQN(resource[ResourceFQN]),
             message: "Skipped Resource (no changes)",
             status: "success",
           });
-          logger.log(`Skipping ${resource[ResourceFQN]} (no changes)`);
         }
         options?.resolveInnerScope?.(
           new Scope({
@@ -142,14 +135,11 @@ async function _apply<Out extends Resource>(
 
     if (!quiet) {
       logger.task(resource[ResourceFQN], {
-        prefix: phase === "create" ? "CREATING" : "UPDATING",
+        prefix: phase === "create" ? "creating" : "updating",
         prefixColor: "magenta",
         resource: formatFQN(resource[ResourceFQN]),
         message: `${phase === "create" ? "Creating" : "Updating"} Resource...`,
       });
-      logger.log(
-        `${phase === "create" ? "Create" : "Update"}:  "${resource[ResourceFQN]}"`,
-      );
     }
 
     scope.telemetryClient.record({
@@ -195,15 +185,12 @@ async function _apply<Out extends Resource>(
     );
     if (!quiet) {
       logger.task(resource[ResourceFQN], {
-        prefix: phase === "create" ? "CREATED" : "UPDATED",
+        prefix: phase === "create" ? "created" : "updated",
         prefixColor: "greenBright",
         resource: formatFQN(resource[ResourceFQN]),
         message: `${phase === "create" ? "Created" : "Updated"} Resource`,
         status: "success",
       });
-      logger.log(
-        `${phase === "create" ? "Created" : "Updated"}: "${resource[ResourceFQN]}"`,
-      );
     }
 
     const status = phase === "create" ? "created" : "updated";

package/src/cloudflare/do-state-store/internal.ts

@@ -104,6 +104,7 @@ export async function upsertStateStoreWorker(
   api: CloudflareApi,
   workerName: string,
   token: string,
+  force: boolean,
 ) {
   const key = `worker:${workerName}`;
   const cached = cache.get(key);
@@ -111,7 +112,7 @@ export async function upsertStateStoreWorker(
     return;
   }
   const { found, tag } = await getWorkerStatus(api, workerName);
-  if (found && tag === TAG) {
+  if (found && tag === TAG && !force) {
     cache.set(key, TAG);
     return;
   }

package/src/cloudflare/do-state-store/store.ts

@@ -88,7 +88,12 @@ export class DOStateStore implements StateStore {
     const api = await createCloudflareApi(this.options);
     const [subdomain, _] = await Promise.all([
       getAccountSubdomain(api),
-      upsertStateStoreWorker(api, workerName, token),
+      upsertStateStoreWorker(
+        api,
+        workerName,
+        token,
+        this.options.worker?.force ?? false,
+      ),
     ]);
     const client = new DOStateStoreClient({
       app: this.scope.appName ?? "alchemy",
@@ -97,9 +102,26 @@ export class DOStateStore implements StateStore {
       token,
     });
     // This ensures the token is correct and the worker is ready to use.
-    // RPC methods are retried, which is what we want here in case the worker is not ready yet.
-    await client.rpc("validate", null);
-    return client;
+    let last: Response | undefined;
+    let delay = 1000;
+    for (let i = 0; i < 20; i++) {
+      const res = await client.validate();
+      if (res.ok) {
+        return client;
+      }
+      if (!last) {
+        console.log("Waiting for state store deployment...");
+      }
+      last = res;
+      // Exponential backoff with jitter
+      const jitter = Math.random() * 0.1 * delay;
+      await new Promise((resolve) => setTimeout(resolve, delay + jitter));
+      delay *= 1.5; // Increase the delay for next attempt
+      delay = Math.min(delay, 10000); // Cap at 10 seconds
+    }
+    throw new Error(
+      `Failed to access state store: ${last?.status} ${last?.statusText}`,
+    );
   }
 
   private async getClient() {

package/src/cloudflare/secrets-store.ts

@@ -220,33 +220,34 @@ const _SecretsStore = Resource("cloudflare::SecretsStore", async function <
 
     await insertSecrets(api, storeId, props);
   } else {
-    try {
+    // If adopt is true, first check if a store with this name already exists
+    if (props.adopt) {
+      console.log(`Checking for existing secrets store '${name}' to adopt`);
+      const existingStore = await findSecretsStoreByName(api, name);
+
+      if (existingStore) {
+        console.log(`Found existing secrets store '${name}', adopting it`);
+        storeId = existingStore.id;
+        createdAt = existingStore.createdAt || Date.now();
+      } else {
+        console.log(
+          `No existing secrets store '${name}' found, creating new one`,
+        );
+        const { id } = await createSecretsStore(api, {
+          ...props,
+          name,
+        });
+        createdAt = Date.now();
+        storeId = id;
+      }
+    } else {
+      // Default behavior: create a new store
       const { id } = await createSecretsStore(api, {
         ...props,
         name,
       });
       createdAt = Date.now();
       storeId = id;
-    } catch (error) {
-      if (
-        props.adopt &&
-        error instanceof Error &&
-        error.message.includes("already exists")
-      ) {
-        console.log(`Secrets store '${name}' already exists, adopting it`);
-        const existingStore = await findSecretsStoreByName(api, name);
-
-        if (!existingStore) {
-          throw new Error(
-            `Failed to find existing secrets store '${name}' for adoption`,
-          );
-        }
-
-        storeId = existingStore.id;
-        createdAt = existingStore.createdAt || Date.now();
-      } else {
-        throw error;
-      }
     }
 
     await insertSecrets(api, storeId, props);

package/src/cloudflare/worker-assets.ts

@@ -3,6 +3,7 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import { AsyncQueue } from "../util/async-queue.ts";
 import { getContentType } from "../util/content-type.ts";
+import { CloudflareApiError } from "./api-error.ts";
 import type { CloudflareApi } from "./api.ts";
 import type { Assets } from "./assets.ts";
 import type { AssetsConfig, WorkerProps } from "./worker.ts";
@@ -84,6 +85,21 @@ export async function uploadAssets(
   const sessionData =
     (await uploadSessionResponse.json()) as UploadSessionResponse;
 
+  if (!sessionData?.success) {
+    if (sessionData?.errors) {
+      throw new CloudflareApiError(
+        `Failed to start assets upload session:\n${sessionData.errors
+          .map((error) => `- ${error.code}: ${error.message}`)
+          .join("\n")}`,
+        uploadSessionResponse,
+      );
+    }
+    throw new CloudflareApiError(
+      `Failed to start assets upload session: ${uploadSessionResponse.statusText}`,
+      uploadSessionResponse,
+    );
+  }
+
   // If there are no buckets, assets are already uploaded or empty
   if (!sessionData.result.buckets || sessionData.result.buckets.length === 0) {
     return {

package/src/destroy.ts

@@ -10,7 +10,7 @@ import {
   ResourceSeq,
 } from "./resource.ts";
 import { Scope } from "./scope.ts";
-import { formatFQN } from "./util/cli.tsx";
+import { formatFQN } from "./util/cli.ts";
 import { logger } from "./util/logger.ts";
 
 export class DestroyedSignal extends Error {}
@@ -70,7 +70,6 @@ export async function destroy<Type extends string>(
       parent: instance[ResourceScope],
       scopeName: instance[ResourceID],
     });
-    logger.log("Destroying scope", scope.chain.join("/"));
     return await destroy(scope, options);
   }
 
@@ -90,12 +89,11 @@ export async function destroy<Type extends string>(
   try {
     if (!quiet) {
       logger.task(instance[ResourceFQN], {
-        prefix: "DELETING",
-        prefixColor: "magenta",
+        prefix: "deleting",
+        prefixColor: "redBright",
         resource: formatFQN(instance[ResourceFQN]),
         message: "Deleting Resource...",
       });
-      logger.log(`Delete:  "${instance[ResourceFQN]}"`);
     }
 
     const state = await scope.state.get(instance[ResourceID]);
@@ -152,13 +150,12 @@ export async function destroy<Type extends string>(
 
     if (!quiet) {
       logger.task(instance[ResourceFQN], {
-        prefix: "DELETED",
+        prefix: "deleted",
         prefixColor: "greenBright",
         resource: formatFQN(instance[ResourceFQN]),
         message: "Deleted Resource",
         status: "success",
       });
-      logger.log(`Deleted: "${instance[ResourceFQN]}"`);
     }
   } catch (error) {
     logger.error(error);