alchemy 2.0.0-beta.60 → 2.0.0-beta.62

package/README.md

@@ -53,6 +53,21 @@ One `bind()` wires the binding, env var, and typed connection — at deploy time
 bun add alchemy@next effect@next
 ```
 
+## GitHub Action
+
+Use the root action to deploy `prod` from `main`, deploy PR previews as
+`staging-{number}`, and destroy PR previews when the PR closes:
+
+```yaml
+- uses: alchemy-run/alchemy-effect@v1
+  env:
+    CLOUDFLARE_ACCOUNT_ID: ${{ vars.CLOUDFLARE_ACCOUNT_ID }}
+    CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+```
+
+The workflow must install the `alchemy` CLI before this action runs.
+
 ## Bootstrap with an AI coding agent
 
 Paste this into Claude Code, Cursor, or any agent that can fetch a URL:

package/bin/cli.js

@@ -89,7 +89,15 @@ process.on("uncaughtException", (error) => {
 
 // Substring match (not regex) — bun may wrap the line in ANSI color codes
 // when stderr is piped to a TTY-aware parent, so anchored regex is fragile.
+//
+// "directory mismatch for directory" is bun's known-benign internal warning
+// triggered by --tsconfig-override (oven-sh/bun#25730): the resolver openat()s
+// the tsconfig basename against a cached dir fd that isn't its parent, falls
+// back to an absolute open, and logs. Bun's own tsconfig-override tests
+// tolerate the same line. Only our dev path passes --tsconfig-override, which
+// is why published installs never see it.
 foregroundChild(runtime, args, {
   stderrFilter: (line) =>
-    !line.includes("is not in the project directory and will not be watched"),
+    !line.includes("is not in the project directory and will not be watched") &&
+    !line.includes("directory mismatch for directory"),
 });

package/bin/exec.js

@@ -92,8 +92,11 @@ var init_interactive = __esm({ "lib/Util/interactive.js": (() => {
 
 //#endregion
 //#region lib/Auth/AuthProvider.js
-var interactiveMutex, AuthError, AuthProviders;
+var AUTH_LANDING_HOST, AUTH_SUCCESS_URL, AUTH_ERROR_URL, interactiveMutex, AuthError, AuthProviders;
 var init_AuthProvider = __esm({ "lib/Auth/AuthProvider.js": (() => {
+	AUTH_LANDING_HOST = "https://v2.alchemy.run";
+	AUTH_SUCCESS_URL = `${AUTH_LANDING_HOST}/auth/success`;
+	AUTH_ERROR_URL = `${AUTH_LANDING_HOST}/auth/error`;
 	interactiveMutex = Semaphore.makeUnsafe(1);
 	AuthError = class extends Schema.TaggedErrorClass()("AuthError", {
 		message: Schema.String,
@@ -292,12 +295,13 @@ var init_FQN = __esm({ "lib/FQN.js": (() => {
 
 //#endregion
 //#region lib/Provider.js
-var Provider, isProviderCollectionService, findProviderByType, tryFindProviderByType;
+var Provider, isProviderCollectionService, isProviderService, findProviderByType, tryFindProviderByType;
 var init_Provider = __esm({ "lib/Provider.js": (() => {
 	Provider = (type) => EffectContext.Service()(type);
 	isProviderCollectionService = (value) => {
 		return typeof value === "object" && value !== null && "kind" in value && value.kind === "ProviderCollection";
 	};
+	isProviderService = (value) => typeof value === "object" && value !== null && "reconcile" in value && typeof value.reconcile === "function" && "delete" in value && typeof value.delete === "function";
 	findProviderByType = ((type) => tryFindProviderByType(type).pipe(Effect.flatMap(Option.match({
 		onNone: () => Effect.die(`Provider not found for ${type}`),
 		onSome: (provider) => Effect.succeed(provider)
@@ -311,6 +315,9 @@ var init_Provider = __esm({ "lib/Provider.js": (() => {
 			const provider = value.get(resourceType);
 			if (provider) return Option.some(provider);
 		}
+		for (const value of context.mapUnsafe.values()) if (isProviderCollectionService(value)) {
+			for (const provider of Object.values(value.providers)) if (provider.aliases?.includes(resourceType)) return Option.some(provider);
+		} else if (isProviderService(value) && value.aliases?.includes(resourceType)) return Option.some(value);
 		return Option.none();
 	});
 }) });
@@ -369,7 +376,7 @@ function proxy(self) {
 		has: (_, prop) => prop === ExprSymbol || prop === inspect ? true : prop in self,
 		get: (target$1, prop) => prop === Symbol.toPrimitive ? (hint) => {
 			throw new Error(`Cannot coerce Output<${self[inspect]()}> to a ${hint === "number" ? "number" : "string"} via JS coercion. Use Output.interpolate\`...\` or Output.map(output, fn) to compose Outputs — the value isn't known until deploy time.`);
-		} : prop === ExprSymbol ? self : prop === inspect ? target$1[inspect] : isResourceExpr(self) && self.stables && prop in self.stables ? self.stables[prop] : prop in self ? typeof self[prop] === "function" && !("kind" in self) ? new PropExpr(proxy$1, prop) : self[prop] : new PropExpr(proxy$1, prop),
+		} : prop === ExprSymbol ? self : prop === inspect ? target$1[inspect] : (isResourceExpr(self) || isRefExpr(self)) && self.stables && prop in self.stables ? self.stables[prop] : prop in self ? typeof self[prop] === "function" && !("kind" in self) ? new PropExpr(proxy$1, prop) : self[prop] : new PropExpr(proxy$1, prop),
 		apply: (_, thisArg, args) => {
 			if (isPropExpr(self)) {
 				if (self.identifier === "map" || self.identifier === "apply") return new ApplyExpr(self.expr, args[0]);
@@ -393,7 +400,7 @@ var init_Output = __esm({ "lib/Output.js": (() => {
 	of = (resource) => {
 		if (isRef(resource)) {
 			const metadata = getRefMetadata(resource);
-			return new RefExpr(metadata.stack, metadata.stage, metadata.id);
+			return new RefExpr(metadata.stack, metadata.stage, metadata.id, metadata.type !== void 0 ? { Type: metadata.type } : void 0);
 		}
 		return new ResourceExpr(resource);
 	};
@@ -546,12 +553,14 @@ var init_Output = __esm({ "lib/Output.js": (() => {
 		stack;
 		stage;
 		resourceId;
+		stables;
 		kind = "RefExpr";
-		constructor(stack, stage$1, resourceId) {
+		constructor(stack, stage$1, resourceId, stables) {
 			super();
 			this.stack = stack;
 			this.stage = stage$1;
 			this.resourceId = resourceId;
+			this.stables = stables;
 			return proxy(this);
 		}
 		[inspect]() {
@@ -776,7 +785,7 @@ var init_Stack = __esm({ "lib/Stack.js": (() => {
 	createStageProxy = (stackName) => new Proxy({}, { get: (_, stage$1) => stackRef(stackName, { stage: stage$1 }) });
 	StackName = Stack.use((stack) => Effect.succeed(stack.name));
 	make$2 = (options) => (effect) => Effect.scope.pipe(Effect.flatMap((scope) => {
-		if (options.state == null) return Effect.die(/* @__PURE__ */ new Error(`Stack "${options.name}" is missing a state store. Add a \`state\` layer to the stack options, e.g.:\n  Alchemy.Stack("${options.name}", {\n    providers: Cloudflare.providers(),\n    state: Cloudflare.state(), // <-- required\n  }, ...)\nSee https://v2.alchemy.run/concepts/state-store for available state stores.`));
+		if (options.state == null) return Effect.die(/* @__PURE__ */ new Error(`Stack "${options.name}" is missing a state store. Add a \`state\` layer to the stack options, e.g.:\n  Alchemy.Stack("${options.name}", {\n    providers: Cloudflare.providers(),\n    state: Cloudflare.state(), // <-- required\n  }, ...)\nSee https://v2.alchemy.run/state-store for available state stores.`));
 		if (options.providers == null) return Effect.die(/* @__PURE__ */ new Error(`Stack "${options.name}" is missing a providers layer. Add a \`providers\` layer to the stack options, e.g.:\n  Alchemy.Stack("${options.name}", {\n    providers: Cloudflare.providers(), // <-- required\n    state: Cloudflare.state(),\n  }, ...)`));
 		return options.providers.pipe(Layer.provideMerge(options.state), Layer.provideMerge(Layer.effect(Stack, Stage.pipe(Effect.map((stage$1) => options.stack ?? {
 			name: options.name,
@@ -861,7 +870,7 @@ const make$1 = Effect.fn(function* (spawnerUrl) {
 		requireServicesAt: "lookup"
 	});
 	return RpcProviderProxy.of({ get: Effect.fn(function* (mainUrl, providerName) {
-		const session = yield* cache.lookup(mainUrl);
+		const session = yield* Cache.get(cache, mainUrl);
 		return unwrapRpcHandlers(yield* Effect.promise(() => session.getProvider(providerName)), ["tail"]);
 	}) });
 });
@@ -1167,6 +1176,7 @@ const make = (stack, options = {}) => Effect.gen(function* () {
 			const newBindings = dedupeBindings(stack.bindings[resource.FQN] ?? []);
 			const diff = yield* provider.diff ? provider.diff({
 				id: resource.LogicalId,
+				fqn: resource.FQN,
 				olds: oldProps,
 				instanceId: oldState.instanceId,
 				news: props,
@@ -1299,6 +1309,7 @@ const make = (stack, options = {}) => Effect.gen(function* () {
 			const adoptInstanceId = yield* generateInstanceId();
 			const readResult = yield* provider.read({
 				id,
+				fqn,
 				instanceId: adoptInstanceId,
 				olds: news,
 				output: void 0
@@ -1311,7 +1322,7 @@ const make = (stack, options = {}) => Effect.gen(function* () {
 					resourceType: resource.Type,
 					logicalId: id
 				});
-				const adoptedState = {
+				oldState = {
 					status: "created",
 					fqn,
 					logicalId: id,
@@ -1325,13 +1336,6 @@ const make = (stack, options = {}) => Effect.gen(function* () {
 					downstream,
 					removalPolicy: resource.RemovalPolicy
 				};
-				yield* state.set({
-					stack: stackName,
-					stage: stage$1,
-					fqn,
-					value: adoptedState
-				});
-				oldState = adoptedState;
 				forceUpdateAfterAdoption = true;
 			}
 		}
@@ -1353,6 +1357,7 @@ const make = (stack, options = {}) => Effect.gen(function* () {
 			if (provider.read) {
 				const attr = yield* provider.read({
 					id,
+					fqn,
 					instanceId: oldState.instanceId,
 					olds: oldState.props,
 					output: oldState.attr
@@ -1370,6 +1375,7 @@ const make = (stack, options = {}) => Effect.gen(function* () {
 		const oldProps = oldState.props;
 		const diff = yield* asEffect(provider?.diff?.({
 			id,
+			fqn,
 			olds: oldProps,
 			instanceId: oldState.instanceId,
 			output: oldState.attr,
@@ -1579,6 +1585,7 @@ const make = (stack, options = {}) => Effect.gen(function* () {
 			if (oldState.attr === void 0) {
 				if (provider.read) attr = yield* provider.read({
 					id: logicalId,
+					fqn,
 					instanceId: oldState.instanceId,
 					olds: oldState.props,
 					output: oldState.attr
@@ -1759,6 +1766,10 @@ const executeNode = (fqn, node, tracker, ready, readyStable, terminalStatuses, s
 		yield* signalReady;
 	});
 	if (node.action === "noop") {
+		if (node.state.resourceType !== node.resource.Type) yield* commit({
+			...node.state,
+			resourceType: node.resource.Type
+		});
 		yield* signalReadyStable;
 		yield* storeAndSignal({
 			output: node.state.attr,
@@ -1836,6 +1847,7 @@ const executeNode = (fqn, node, tracker, ready, readyStable, terminalStatuses, s
 				yield* report("pre-creating");
 				attr = yield* node.provider.precreate({
 					id: logicalId,
+					fqn,
 					news: node.props,
 					session: scopedSession,
 					instanceId,
@@ -1869,6 +1881,7 @@ const executeNode = (fqn, node, tracker, ready, readyStable, terminalStatuses, s
 			const bindingOutputs = excludeDeletedBindings(yield* evaluate(node.bindings, outputs));
 			attr = yield* node.provider.reconcile({
 				id: logicalId,
+				fqn,
 				news,
 				instanceId,
 				bindings: bindingOutputs,
@@ -1934,6 +1947,7 @@ const executeNode = (fqn, node, tracker, ready, readyStable, terminalStatuses, s
 			const bindingOutputs = excludeDeletedBindings(yield* evaluate(node.bindings, outputs));
 			const attr = yield* node.provider.reconcile({
 				id: logicalId,
+				fqn,
 				news,
 				instanceId,
 				bindings: bindingOutputs,
@@ -2004,6 +2018,7 @@ const executeNode = (fqn, node, tracker, ready, readyStable, terminalStatuses, s
 				const retain = node.resource.RemovalPolicy === "retain";
 				if (old.attr !== void 0 && !retain) yield* node.provider.delete({
 					id: logicalId,
+					fqn,
 					instanceId: old.instanceId,
 					olds: old.props,
 					output: old.attr,
@@ -2027,6 +2042,7 @@ const executeNode = (fqn, node, tracker, ready, readyStable, terminalStatuses, s
 				yield* report("pre-creating");
 				attr = yield* node.provider.precreate({
 					id: logicalId,
+					fqn,
 					news: node.props,
 					session: scopedSession,
 					instanceId,
@@ -2062,6 +2078,7 @@ const executeNode = (fqn, node, tracker, ready, readyStable, terminalStatuses, s
 			const bindingOutputs = excludeDeletedBindings(yield* evaluate(node.bindings, outputs));
 			attr = yield* node.provider.reconcile({
 				id: logicalId,
+				fqn,
 				news,
 				instanceId,
 				bindings: bindingOutputs,
@@ -2260,6 +2277,7 @@ const converge = Effect.fn(function* (plan, tracker, terminalStatuses, session,
 			};
 			const attr = yield* node.provider.reconcile({
 				id: logicalId,
+				fqn,
 				news: newProps,
 				instanceId,
 				bindings: newBindings,
@@ -2459,6 +2477,7 @@ const collectGarbage = Effect.fn(function* (plan, session) {
 				if (retainOldGeneration) yield* scopedSession.note("Retaining replaced resource (removal policy: retain)...");
 				if (attr !== void 0 && !retainOldGeneration) yield* provider.delete({
 					id: logicalId,
+					fqn,
 					instanceId,
 					olds: props,
 					output: attr,
@@ -2529,6 +2548,12 @@ const excludeDeletedBindings = (bindings) => bindings.flatMap(({ action, sid, da
 
 //#endregion
 //#region lib/Cli/commands/_shared.js
+init_AuthProvider();
+init_Profile();
+init_Stack();
+init_Stage();
+init_ConfigProvider();
+init_FileLogger();
 var __rewriteRelativeImportExtension = void 0 && (void 0).__rewriteRelativeImportExtension || function(path$1, preserveJsx) {
 	if (typeof path$1 === "string" && /^\.\.?\//.test(path$1)) return path$1.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function(m, tsx, d, ext, cm) {
 		return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : d + ext + "." + cm.toLowerCase() + "js";
@@ -2546,7 +2571,10 @@ const dryRun = Flag.boolean("dry-run").pipe(Flag.withDescription("Dry run the de
 const yes = Flag.boolean("yes").pipe(Flag.withDescription("Yes to all prompts"), Flag.withDefault(false));
 const force = Flag.boolean("force").pipe(Flag.withDescription("Force updates for resources that would otherwise no-op"), Flag.withDefault(false));
 const script = Argument.file("main", { mustExist: true }).pipe(Argument.withDescription("Main file to deploy, defaults to alchemy.run.ts"), Argument.withDefault("alchemy.run.ts"));
-const profile = Flag.string("profile").pipe(Flag.withDescription("Auth profile to use (~/.alchemy/profiles.json). Defaults to 'default' or $ALCHEMY_PROFILE."), Flag.optional, Flag.map(Option.getOrElse(() => "default")));
+const profile = Flag.string("profile").pipe(Flag.withDescription("Auth profile to use (~/.alchemy/profiles.json). Defaults to $ALCHEMY_PROFILE or 'default'."), Flag.optional, Flag.mapEffect(Effect.fn(function* (profile$1) {
+	if (Option.isSome(profile$1)) return profile$1.value;
+	return yield* ALCHEMY_PROFILE.pipe(Effect.catch(() => Effect.succeed("default")));
+})));
 const resourceFilter = Flag.string("filter").pipe(Flag.withDescription("Comma-separated logical resource IDs (e.g. Api,Sandbox). Only those resources are included."), Flag.optional, Flag.map(Option.getOrUndefined));
 /**
 * Wraps a CLI command handler with a top-level OpenTelemetry span
@@ -2593,7 +2621,11 @@ const printProfile = Effect.fn(function* (profile$1, stored, registry) {
 			for (const [k, v] of Object.entries(rest)) yield* Console.log(`  ${k}: ${typeof v === "string" ? v : JSON.stringify(v)}`);
 			continue;
 		}
-		yield* provider.prettyPrint(profile$1, cfg);
+		yield* provider.prettyPrint(profile$1, cfg).pipe(Effect.catchCause((cause) => {
+			const error = Cause.squash(cause);
+			const message = error instanceof Error ? error.message : String(error);
+			return Console.log(`  Failed to retrieve credentials: ${message}`);
+		}));
 	}
 });
 const importStack = Effect.fn(function* (main) {
@@ -2602,6 +2634,43 @@ const importStack = Effect.fn(function* (main) {
 	if (!Effect.isEffect(stackEffect)) return yield* Effect.die(/* @__PURE__ */ new Error(`Main file '${main}' must export a default stack definition (export default Alchemy.Stack({...}))`));
 	return stackEffect;
 });
+/**
+* Placeholder {@link Stack.Stack} value used while building a stack's
+* `providers()` layer out of band. No real resources exist yet — we only
+* want the layer's provider/auth registrations and cloud-environment
+* services, so `resources`/`bindings`/`actions` are empty and the stage is a
+* sentinel.
+*/
+const placeholderStack = (name) => ({
+	actions: {},
+	bindings: {},
+	name,
+	resources: {},
+	stage: "placeholder"
+});
+/**
+* Import a stack entrypoint and build its `providers()` (+ `state()`) layer
+* out of band against placeholder {@link Stack.Stack}/{@link Stage} services,
+* so its `AuthProviderLayer` registrations land in an {@link AuthProviders}
+* registry and the built context holds every resource provider plus the
+* cloud-environment services their operations need.
+*
+* Shared by `alchemy login`, `alchemy profile show`, and `alchemy unsafe
+* nuke`. The caller decides what to do with the result — use `authProviders`
+* (login / profile show) or `context` (nuke) — and whether a missing/invalid
+* entrypoint is fatal (login / nuke let it propagate) or best-effort
+* (profile show wraps the call in `Effect.catchCause`).
+*/
+const buildStackProviders = Effect.fn("buildStackProviders")(function* (options) {
+	const authProviders = options.registry ?? {};
+	const stackEffect = yield* importStack(options.main);
+	const configProvider = withProfileOverride(yield* loadConfigProvider(options.envFile), options.profile);
+	return {
+		authProviders,
+		context: yield* Layer.build((stackEffect.providers ?? Layer.empty).pipe(Layer.provideMerge(stackEffect.state ?? Layer.empty), Layer.provideMerge(Layer.mergeAll(Layer.succeed(AuthProviders, authProviders), ConfigProvider.layer(configProvider), options.logger ?? Logger.layer([fileLogger("out")], { mergeWithExisting: true }), Layer.succeed(Stage, "placeholder"), Layer.succeed(Stack, placeholderStack(stackEffect.stackName)), options.extra ?? Layer.empty)))),
+		stackEffect
+	};
+});
 
 //#endregion
 //#region lib/Cli/commands/deploy.js