alchemy 2.0.0-beta.39 → 2.0.0-beta.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "2.0.0-beta.39",
+  "version": "2.0.0-beta.40",
   "homepage": "https://alchemy.run",
   "license": "Apache-2.0",
   "author": "Sam Goodwin <sam@alchemy.run>",
@@ -130,6 +130,12 @@
       "worker": "./src/Cloudflare/index.ts",
       "import": "./lib/Cloudflare/index.js"
     },
+    "./Cloudflare/Bridge": {
+      "types": "./lib/Cloudflare/Bridge.d.ts",
+      "bun": "./src/Cloudflare/Bridge.ts",
+      "worker": "./src/Cloudflare/Bridge.ts",
+      "import": "./lib/Cloudflare/Bridge.js"
+    },
     "./Cloudflare/Live": {
       "types": "./lib/Cloudflare/Live.d.ts",
       "bun": "./src/Cloudflare/Live.ts",
@@ -270,17 +276,17 @@
     "access": "public"
   },
   "dependencies": {
+    "@alchemy.run/node-utils": "0.0.2",
     "@aws-sdk/credential-providers": "^3.0.0",
     "@clack/prompts": "^0.11.0",
-    "@distilled.cloud/aws": "^0.20.1",
-    "@distilled.cloud/axiom": "^0.20.1",
-    "@distilled.cloud/cloudflare": "^0.20.1",
-    "@distilled.cloud/cloudflare-rolldown-plugin": "0.3.0",
-    "@distilled.cloud/cloudflare-runtime": "0.3.2",
-    "@distilled.cloud/cloudflare-vite-plugin": "0.2.0",
-    "@distilled.cloud/core": "^0.20.1",
-    "@distilled.cloud/neon": "^0.20.1",
-    "pg": "^8.13.0",
+    "@distilled.cloud/aws": "^0.21.0",
+    "@distilled.cloud/axiom": "^0.21.0",
+    "@distilled.cloud/cloudflare": "^0.21.0",
+    "@distilled.cloud/cloudflare-rolldown-plugin": "0.5.4",
+    "@distilled.cloud/cloudflare-runtime": "0.5.4",
+    "@distilled.cloud/cloudflare-vite-plugin": "0.5.4",
+    "@distilled.cloud/core": "^0.21.0",
+    "@distilled.cloud/neon": "^0.21.0",
     "@effect/vitest": ">=4.0.0-beta.66 || >=4.0.0",
     "@libsql/client": "^0.17.0",
     "@octokit/rest": "^22.0.1",
@@ -298,8 +304,8 @@
     "libsodium-wrappers": "^0.8.3",
     "magic-string": "^0.30.21",
     "pathe": "^2.0.3",
+    "pg": "^8.13.0",
     "picomatch": "^4.0.4",
-    "proper-lockfile": "^4.1.2",
     "react": "^19.2.0",
     "rolldown": "1.0.0-rc.17",
     "sonda": "^0.11.1",
@@ -318,7 +324,6 @@
     "@types/bun": "latest",
     "@types/node": "latest",
     "@types/picomatch": "^4.0.0",
-    "@types/proper-lockfile": "^4.1.4",
     "@types/react": "^19.2.2",
     "@types/ws": "^8.18.1",
     "better-auth": "^1.6.2",

package/src/AWS/EC2/hosted.ts

@@ -231,7 +231,7 @@ import * as Layer from "effect/Layer";
 import * as Logger from "effect/Logger";
 import * as Region from "@distilled.cloud/aws/Region";
 
-import { ${handler} as handler } from "${importPath}";
+import { ${handler} as handler } from ${JSON.stringify(importPath)};
 
 const platform = Layer.mergeAll(
   NodeServices.layer,

package/src/AWS/ECS/Task.ts

@@ -492,7 +492,7 @@ import * as Layer from "effect/Layer";
 import * as Logger from "effect/Logger";
 import * as Region from "@distilled.cloud/aws/Region";
 
-import { ${handler} as handler } from "${importPath}";
+import { ${handler} as handler } from ${JSON.stringify(importPath)};
 
 const platform = Layer.mergeAll(
   NodeServices.layer,

package/src/AWS/Lambda/Function.ts

@@ -679,7 +679,7 @@ import * as Region from "@distilled.cloud/aws/Region";
 import * as Context from "effect/Context";
 import { MinimumLogLevel } from "effect/References";
 
-import entrypoint from "${importPath}";
+import entrypoint from ${JSON.stringify(importPath)};
 
 const tag = Context.Service("${Self.key}")
 const layer = makeEntrypointLayer(tag, entrypoint);

package/src/Auth/Lock.ts

@@ -1,7 +1,7 @@
+import * as lockfile from "@alchemy.run/node-utils";
 import * as Effect from "effect/Effect";
 import * as fs from "node:fs/promises";
 import * as path from "pathe";
-import lockfile from "proper-lockfile";
 import { rootDir } from "./Profile.ts";
 
 const lockDir = path.join(rootDir, "lock");
@@ -11,9 +11,10 @@ const lockDir = path.join(rootDir, "lock");
  * critical section concurrently for the same `key`, both within this
  * process and across other processes on the same machine.
  *
- * Uses `proper-lockfile` for both: it tracks in-process holders by path
- * (so same-process callers wait via `retries`) and uses an OS file lock
- * for cross-process coordination, with stale-lock detection at 60s.
+ * Uses `@alchemy.run/node-utils` lockfile for both: it tracks in-process
+ * holders by path (so same-process callers wait via `retries`) and uses
+ * an OS file lock for cross-process coordination, with stale-lock
+ * detection at 60s.
  */
 export const withLock = <A, E, R>(
   key: string,
@@ -23,10 +24,10 @@ export const withLock = <A, E, R>(
   return Effect.acquireUseRelease(
     Effect.promise(async () => {
       await fs.mkdir(lockDir, { recursive: true });
-      await fs.writeFile(lockPath, "", { flag: "a" });
       return await lockfile.lock(lockPath, {
         retries: { retries: 600, minTimeout: 50, maxTimeout: 50 },
         stale: 5_000,
+        realpath: false,
       });
     }),
     () => effect,

package/src/Axiom/Chart.ts

@@ -24,7 +24,8 @@ export type ChartKind =
   | "Statistic"
   | "Heatmap"
   | "LogStream"
-  | "Note";
+  | "Note"
+  | "SmartFilter";
 
 /**
  * Minimum chart payload Axiom's `POST /v2/dashboards` accepts.
@@ -67,6 +68,58 @@ export interface NoteChart extends BaseChart {
   readonly type: "Note";
 }
 
+/**
+ * A dashboard filter bar (Axiom calls it `SmartFilter` on the wire,
+ * `Filter bar` in the UI). Holds one or more filters whose IDs can
+ * be referenced from other charts' APL via
+ * `declare query_parameters (<filter-id>:string = "")`.
+ *
+ * Unlike data charts, `SmartFilter` has no top-level `query` field —
+ * each filter inside `filters` may carry its own option-source APL.
+ */
+export interface SmartFilterChart {
+  readonly id: string;
+  readonly type: "SmartFilter";
+  /** Optional display name for the filter bar element. */
+  readonly name?: string;
+  readonly filters: readonly SmartFilter[];
+}
+
+/**
+ * One filter inside a {@link SmartFilterChart}. Either a free-text
+ * `search` filter or a dropdown `select` filter. Select filters draw
+ * their options from either an inline `list` or an APL `query`.
+ */
+export type SmartFilter = SmartFilterSearch | SmartFilterSelect;
+
+export interface SmartFilterSearch {
+  readonly id: string;
+  readonly type: "search";
+  readonly name?: string;
+  readonly active?: boolean;
+}
+
+export interface SmartFilterSelect {
+  readonly id: string;
+  readonly type: "select";
+  readonly name?: string;
+  readonly active?: boolean;
+  /** `"list"` for inline `options`, `"apl"` for a query-driven dropdown. */
+  readonly selectType?: "list" | "apl";
+  /**
+   * APL query that returns rows shaped `{ key, value }`. Axiom shows
+   * `key` in the dropdown and substitutes `value` into chart queries.
+   */
+  readonly apl?: { readonly apl: string };
+  /** Inline key/value options when `selectType === "list"`. */
+  readonly options?: readonly {
+    readonly id?: string;
+    readonly key: string;
+    readonly value: string;
+    readonly default?: boolean;
+  }[];
+}
+
 export type Chart =
   | TimeSeriesChart
   | TableChart
@@ -74,7 +127,8 @@ export type Chart =
   | StatisticChart
   | HeatmapChart
   | LogStreamChart
-  | NoteChart;
+  | NoteChart
+  | SmartFilterChart;
 
 /**
  * Mirrors Axiom's `CreateDashboardInput.dashboard.layout` cell schema.

package/src/Bundle/Bundle.ts

@@ -186,34 +186,58 @@ export const watch = (
     ),
   );
 
-const ENTRY_MODULE_ID = "virtual:alchemy-entry";
-const ENTRY_MODULE_REGEX = new RegExp(`^${ENTRY_MODULE_ID}$`);
+const ENTRY_PREFIX = "\0virtual:alchemy-entry:";
+// oxlint-disable-next-line no-control-regex
+const ENTRY_REGEX = /^\0virtual:alchemy-entry:/;
 
 export const virtualEntryPlugin = Effect.gen(function* () {
   const path = yield* Path.Path;
+
+  const normalizeInput = (
+    input: rolldown.InputOption,
+  ): Record<string, string> => {
+    if (typeof input === "string") {
+      return { [path.parse(input).name || "index"]: input };
+    } else if (Array.isArray(input)) {
+      return Object.fromEntries(input.map((p) => [path.parse(p).name, p]));
+    } else {
+      return input;
+    }
+  };
+
   return (content: (importPath: string) => string) => {
-    let importPath: string | undefined;
+    const entries = new Map<string, string>();
     return {
       name: "alchemy:virtual-entry",
-      options(inputOptions) {
-        assert(
-          typeof inputOptions.input === "string",
-          "input must be a string",
-        );
-        importPath = `./${path.relative(inputOptions.cwd ?? process.cwd(), inputOptions.input).replaceAll("\\", "/")}`;
-        inputOptions.input = ENTRY_MODULE_ID;
+      options: {
+        order: "pre",
+        handler(inputOptions) {
+          const cwd = inputOptions.cwd ?? process.cwd();
+          const input = normalizeInput(inputOptions.input ?? {});
+          inputOptions.input = Object.fromEntries(
+            Object.entries(input).map(([name, p]) => {
+              const id = `${ENTRY_PREFIX}${name}`;
+              entries.set(id, path.resolve(cwd, p));
+              return [name, id];
+            }),
+          );
+        },
       },
       resolveId: {
-        filter: { id: ENTRY_MODULE_REGEX },
-        handler() {
-          return { id: ENTRY_MODULE_ID };
+        filter: { id: ENTRY_REGEX },
+        handler(id) {
+          return entries.has(id) ? { id } : null;
         },
       },
       load: {
-        filter: { id: ENTRY_MODULE_REGEX },
-        handler() {
-          assert(importPath !== undefined, "importPath must be defined");
-          return { code: content(importPath), moduleType: "ts" };
+        filter: { id: ENTRY_REGEX },
+        handler(id) {
+          const entry = entries.get(id);
+          assert(entry !== undefined, `unknown alchemy entry: ${id}`);
+          return {
+            code: content(entry),
+            moduleType: "ts",
+          };
         },
       },
     } satisfies rolldown.Plugin;

package/src/Cloudflare/AiGateway/AiGateway.ts

@@ -200,17 +200,17 @@ export type AiGateway = Resource<
     rateLimitingInterval: number | null;
     rateLimitingLimit: number | null;
     rateLimitingTechnique: AiGatewayRateLimitingTechnique;
-    authentication: boolean | undefined;
-    dlp: AiGatewayDlp | null | undefined;
-    isDefault: boolean | undefined;
-    logManagement: number | null | undefined;
-    logManagementStrategy: AiGatewayLogManagementStrategy | null | undefined;
-    logpush: boolean | undefined;
-    logpushPublicKey: string | null | undefined;
-    otel: AiGatewayOtel[] | null | undefined;
-    storeId: string | null | undefined;
-    stripe: AiGatewayStripe | null | undefined;
-    zdr: boolean | undefined;
+    authentication: boolean;
+    dlp: AiGatewayDlp | undefined;
+    isDefault: boolean;
+    logManagement: number;
+    logManagementStrategy: AiGatewayLogManagementStrategy;
+    logpush: boolean;
+    logpushPublicKey: string | undefined;
+    otel: AiGatewayOtel[] | undefined;
+    storeId: string;
+    stripe: AiGatewayStripe | undefined;
+    zdr: boolean;
   },
   never,
   Providers
@@ -301,17 +301,21 @@ export const AiGatewayProvider = () =>
             rateLimitingInterval: props?.rateLimitingInterval ?? null,
             rateLimitingLimit: props?.rateLimitingLimit ?? null,
             rateLimitingTechnique: props?.rateLimitingTechnique ?? "fixed",
-            authentication: props?.authentication,
-            dlp: props?.dlp,
-            isDefault: props?.isDefault,
-            logManagement: props?.logManagement,
-            logManagementStrategy: props?.logManagementStrategy,
-            logpush: props?.logpush,
-            logpushPublicKey: props?.logpushPublicKey,
-            otel: props?.otel,
-            storeId: props?.storeId,
-            stripe: props?.stripe,
-            zdr: props?.zdr,
+            // Defaults align with what Cloudflare's API returns for an
+            // unconfigured gateway, so the reconciler converges to noop
+            // when the user didn't explicitly set the field.
+            authentication: props?.authentication ?? false,
+            dlp: props?.dlp ?? undefined,
+            isDefault: props?.isDefault ?? false,
+            logManagement: props?.logManagement ?? 100_000,
+            logManagementStrategy:
+              props?.logManagementStrategy ?? "STOP_INSERTING",
+            logpush: props?.logpush ?? false,
+            logpushPublicKey: props?.logpushPublicKey ?? undefined,
+            otel: props?.otel ?? undefined,
+            storeId: props?.storeId ?? "",
+            stripe: props?.stripe ?? undefined,
+            zdr: props?.zdr ?? false,
           };
         });
 
@@ -334,17 +338,18 @@ export const AiGatewayProvider = () =>
         rateLimitingInterval: nullIfZero(gateway.rateLimitingInterval),
         rateLimitingLimit: nullIfZero(gateway.rateLimitingLimit),
         rateLimitingTechnique: gateway.rateLimitingTechnique ?? "fixed",
-        authentication: gateway.authentication ?? undefined,
-        dlp: gateway.dlp,
-        isDefault: gateway.isDefault ?? undefined,
-        logManagement: gateway.logManagement,
-        logManagementStrategy: gateway.logManagementStrategy,
-        logpush: gateway.logpush ?? undefined,
-        logpushPublicKey: gateway.logpushPublicKey,
-        otel: gateway.otel,
-        storeId: gateway.storeId,
-        stripe: gateway.stripe,
-        zdr: gateway.zdr ?? undefined,
+        authentication: gateway.authentication ?? false,
+        dlp: gateway.dlp ?? undefined,
+        isDefault: gateway.isDefault ?? false,
+        logManagement: gateway.logManagement ?? 100_000,
+        logManagementStrategy:
+          gateway.logManagementStrategy ?? "STOP_INSERTING",
+        logpush: gateway.logpush ?? false,
+        logpushPublicKey: gateway.logpushPublicKey ?? undefined,
+        otel: gateway.otel ?? undefined,
+        storeId: gateway.storeId ?? "",
+        stripe: gateway.stripe ?? undefined,
+        zdr: gateway.zdr ?? false,
       });
 
       const mutable = (gateway: AiGateway["Attributes"]) => ({
@@ -355,7 +360,7 @@ export const AiGatewayProvider = () =>
         rateLimitingLimit: gateway.rateLimitingLimit,
         rateLimitingTechnique: gateway.rateLimitingTechnique,
         authentication: gateway.authentication,
-        dlp: gateway.dlp ?? undefined,
+        dlp: gateway.dlp,
         isDefault: gateway.isDefault,
         logManagement: gateway.logManagement,
         logManagementStrategy: gateway.logManagementStrategy,
@@ -434,48 +439,10 @@ export const AiGatewayProvider = () =>
             return { action: "replace" } as const;
           }
 
-          const oldMutable = output
-            ? mutable(output)
-            : yield* desired(id, olds).pipe(
-                Effect.map((old) => ({
-                  cacheInvalidateOnUpdate: old.cacheInvalidateOnUpdate,
-                  cacheTtl: old.cacheTtl,
-                  collectLogs: old.collectLogs,
-                  rateLimitingInterval: old.rateLimitingInterval,
-                  rateLimitingLimit: old.rateLimitingLimit,
-                  rateLimitingTechnique: old.rateLimitingTechnique,
-                  authentication: old.authentication,
-                  dlp: old.dlp,
-                  isDefault: old.isDefault,
-                  logManagement: old.logManagement,
-                  logManagementStrategy: old.logManagementStrategy,
-                  logpush: old.logpush,
-                  logpushPublicKey: old.logpushPublicKey,
-                  otel: old.otel,
-                  storeId: old.storeId,
-                  stripe: old.stripe,
-                  zdr: old.zdr,
-                })),
-              );
-          const nextMutable = {
-            cacheInvalidateOnUpdate: next.cacheInvalidateOnUpdate,
-            cacheTtl: next.cacheTtl,
-            collectLogs: next.collectLogs,
-            rateLimitingInterval: next.rateLimitingInterval,
-            rateLimitingLimit: next.rateLimitingLimit,
-            rateLimitingTechnique: next.rateLimitingTechnique,
-            authentication: next.authentication,
-            dlp: next.dlp,
-            isDefault: next.isDefault,
-            logManagement: next.logManagement,
-            logManagementStrategy: next.logManagementStrategy,
-            logpush: next.logpush,
-            logpushPublicKey: next.logpushPublicKey,
-            otel: next.otel,
-            storeId: next.storeId,
-            stripe: next.stripe,
-            zdr: next.zdr,
-          };
+          const oldMutable = mutable(
+            output ?? ((yield* desired(id, olds)) as AiGateway["Attributes"]),
+          );
+          const nextMutable = mutable(next as AiGateway["Attributes"]);
           if (!deepEqual(oldMutable, nextMutable)) {
             return { action: "update" } as const;
           }

package/src/Cloudflare/Bridge.ts

@@ -0,0 +1,2 @@
+export * from "./Workers/InferEnv.ts";
+export * from "./Workers/Rpc.ts";

package/src/Cloudflare/Container/ContainerApplication.ts

@@ -540,7 +540,7 @@ import * as Logger from "effect/Logger";
 import * as Context from "effect/Context";
 import { MinimumLogLevel } from "effect/References";
 
-import ${handler === "default" ? "entrypoint" : `{ ${handler} as entrypoint }`} from "${importPath}";
+import ${handler === "default" ? "entrypoint" : `{ ${handler} as entrypoint }`} from ${JSON.stringify(importPath)};
 
 const tag = Context.Service("${Self.key}")
 const layer = makeEntrypointLayer(tag, entrypoint);

package/src/Cloudflare/Container/StartContainer.ts

@@ -7,7 +7,11 @@ import * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";
 import * as HttpServerResponse from "effect/unstable/http/HttpServerResponse";
 import { type Fetcher } from "../Fetcher.ts";
 import { DurableObjectState } from "../Workers/DurableObjectState.ts";
-import { type Container, ContainerError } from "./Container.ts";
+import {
+  type Container,
+  type ContainerStartupOptions,
+  ContainerError,
+} from "./Container.ts";
 
 /**
  * Runs the Container in a Durable Object and monitors it, providing a durable fetch and RPC interface to it.
@@ -15,13 +19,16 @@ import { type Container, ContainerError } from "./Container.ts";
 export const start = Effect.fnUntraced(function* <
   Shape extends Container,
   Req = never,
->(containerEff: Effect.Effect<Shape, never, Req | DurableObjectState>) {
+>(
+  containerEff: Effect.Effect<Shape, never, Req | DurableObjectState>,
+  options?: ContainerStartupOptions,
+) {
   const container = yield* containerEff;
 
   const ensureRunning = Effect.gen(function* () {
     if (yield* container.running) return;
     yield* Effect.logInfo("Container not running, starting...");
-    yield* container.start();
+    yield* container.start(options);
     yield* Effect.logInfo("Container started, launching monitor");
     yield* Effect.forkDetach(
       container.monitor().pipe(

package/src/Cloudflare/Local/Sidecar.ts

@@ -1,48 +1,77 @@
 import { RuntimeError } from "@distilled.cloud/cloudflare-runtime/RuntimeError";
-import * as Worker from "@distilled.cloud/cloudflare-runtime/Worker";
 import * as Effect from "effect/Effect";
 import * as Schema from "effect/Schema";
 import { BundleError } from "../../Bundle/Bundle.ts";
+import type { ResourceBinding } from "../../Resource.ts";
 import * as RpcClient from "../../Sidecar/RpcClient.ts";
 import { defineSchema } from "../../Sidecar/RpcHandler.ts";
-import type { WorkerBinding } from "../Workers/Worker.ts";
-import type { WorkerBundleOptions } from "../Workers/WorkerBundle.ts";
-
-export interface ServeOptions extends WorkerBundleOptions {
-  name: string;
-  bindings: WorkerBinding[];
-  /**
-   * Local-mode hyperdrive connection details, keyed by binding name.
-   * Forwarded to the runtime as the worker's `hyperdrives` field.
-   */
-  hyperdrives?: Record<string, Worker.HyperdriveOrigin>;
-  durableObjectNamespaces: Worker.DurableObjectNamespace[];
+import type { Worker, WorkerProps } from "../Workers/Worker.ts";
+
+export interface ReconcileOptions {
+  id: string;
+  props: WorkerProps;
+  bindings: ResourceBinding<Worker["Binding"]>[];
+  stack: { name: string; stage: string };
+  instanceId: string;
 }
 
+export class ValidationError extends Schema.TaggedErrorClass<ValidationError>()(
+  "ValidationError",
+  {
+    message: Schema.String,
+    hint: Schema.optional(Schema.String),
+    value: Schema.Unknown,
+  },
+) {}
+
 export const ServeResult = Schema.Struct({
-  name: Schema.String,
-  address: Schema.String,
+  workerId: Schema.String,
+  workerName: Schema.String,
+  logpush: Schema.UndefinedOr(Schema.Boolean),
+  url: Schema.String,
+  tags: Schema.Array(Schema.String).pipe(Schema.mutable),
+  durableObjectNamespaces: Schema.Record(Schema.String, Schema.String),
+  domains: Schema.Array(
+    Schema.Struct({
+      hostname: Schema.String,
+      id: Schema.String,
+      zoneId: Schema.String,
+    }),
+  ).pipe(Schema.mutable),
+  crons: Schema.Array(Schema.String).pipe(Schema.mutable),
+  accountId: Schema.String,
 });
 export type ServeResult = typeof ServeResult.Type;
 
-export const ServeError = Schema.Union([RuntimeError, BundleError]);
+export const ServeError = Schema.Union([
+  RuntimeError,
+  BundleError,
+  ValidationError,
+]);
 export type ServeError = typeof ServeError.Type;
 
+export const DiffResult = Schema.Struct({
+  action: Schema.Literals(["update", "noop"]),
+});
+export type DiffResult = typeof DiffResult.Type;
+
 export const SidecarSchema = defineSchema<Sidecar["Service"]>({
-  serve: {
+  diff: { success: DiffResult, error: Schema.Never },
+  reconcile: {
     success: ServeResult,
     error: ServeError,
   },
-  stop: { success: Schema.Void, error: Schema.Never },
+  delete: { success: Schema.Void, error: Schema.Never },
 });
 
 export class Sidecar extends RpcClient.RpcClientService<
   Sidecar,
   {
-    readonly serve: (
-      options: ServeOptions,
+    readonly diff: (options: ReconcileOptions) => Effect.Effect<DiffResult>;
+    readonly reconcile: (
+      options: ReconcileOptions,
     ) => Effect.Effect<ServeResult, ServeError>;
-    readonly stop: (name: string) => Effect.Effect<void>;
+    readonly delete: (id: string) => Effect.Effect<void>;
   }
 >()("Sidecar") {}