alchemy 0.70.2 → 0.71.1

package/README.md

@@ -1,6 +1,6 @@
 # Alchemy
 
-[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/sam-goodwin/alchemy)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/alchemy-run/alchemy)
 
 Alchemy is an embeddable, TypeScript-native Infrastructure-as-Code (IaC) library for modeling Resources that are Created, Updated and Deleted automatically.
 

package/bin/alchemy.js

@@ -17,12 +17,13 @@ import lockfile from "proper-lockfile";
 import crypto$1, { createHash } from "node:crypto";
 import { onExit } from "signal-exit";
 import { AsyncLocalStorage } from "node:async_hooks";
+import http, { createServer } from "node:http";
+import https from "node:https";
+import { URL as URL$1, fileURLToPath } from "node:url";
 import path$1 from "pathe";
 import assert from "node:assert";
-import http, { createServer } from "node:http";
 import { WebSocketServer } from "ws";
 import { Buffer as Buffer$1 } from "node:buffer";
-import { fileURLToPath } from "node:url";
 import { StringDecoder } from "node:string_decoder";
 import tty from "node:tty";
 import { scheduler, setImmediate as setImmediate$1, setTimeout as setTimeout$1 } from "node:timers/promises";
@@ -36733,13 +36734,13 @@ function envPaths(name$1, { suffix = "nodejs" } = {}) {
 //#endregion
 //#region package.json
 var name = "alchemy";
-var version = "0.70.2";
+var version = "0.71.1";
 var license = "Apache-2.0";
 var author = "Sam Goodwin <sam@alchemy.run>";
 var homepage = "https://alchemy.run";
 var repository = {
 	"type": "git",
-	"url": "git+https://github.com/sam-goodwin/alchemy.git",
+	"url": "git+https://github.com/alchemy-run/alchemy.git",
 	"directory": "alchemy"
 };
 var type = "module";
@@ -36875,6 +36876,10 @@ var exports$1 = {
 		"bun": "./src/stripe/index.ts",
 		"import": "./lib/stripe/index.js"
 	},
+	"./test/vite": {
+		"bun": "./src/test/vite.ts",
+		"import": "./lib/test/vite.js"
+	},
 	"./upstash": {
 		"bun": "./src/upstash/index.ts",
 		"import": "./lib/upstash/index.js"
@@ -36892,6 +36897,7 @@ var dependencies = {
 	"@aws-sdk/credential-providers": "^3.0.0",
 	"@cloudflare/unenv-preset": "^2.6.3",
 	"@iarna/toml": "^2.2.5",
+	"@octokit/rest": "^21.1.1",
 	"@smithy/node-config-provider": "^4.0.0",
 	"@smithy/types": "^4.6.0",
 	"aws4fetch": "^1.0.20",
@@ -36930,12 +36936,12 @@ var peerDependencies = {
 	"@cloudflare/vite-plugin": "^1.10.1",
 	"@cloudflare/workers-types": "catalog:",
 	"@libsql/client": "^0.15.12",
-	"@octokit/rest": "^21.1.1",
 	"@opennextjs/cloudflare": "^1.6.5",
 	"astro": "^5.13.2",
 	"drizzle-orm": "^0.44.2",
 	"rwsdk": "^0.1.36",
-	"stripe": "^18.5.0"
+	"stripe": "^18.5.0",
+	"wrangler": "catalog:"
 };
 var peerDependenciesMeta = {
 	"@astrojs/cloudflare": { "optional": true },
@@ -36951,7 +36957,6 @@ var peerDependenciesMeta = {
 	"@cloudflare/vite-plugin": { "optional": true },
 	"@cloudflare/workers-types": { "optional": true },
 	"@opennextjs/cloudflare": { "optional": true },
-	"@octokit/rest": { "optional": true },
 	"@libsql/client": { "optional": true },
 	"astro": { "optional": true },
 	"drizzle-orm": { "optional": true },
@@ -37010,7 +37015,7 @@ var devDependencies = {
 	"tsdown": "^0.14.2",
 	"typescript": "catalog:",
 	"undici": "^7.14.0",
-	"wrangler": "^4.27.0",
+	"wrangler": "^4.42.2",
 	"zod": "^4.0.10"
 };
 var package_default = {
@@ -37032,6 +37037,14 @@ var package_default = {
 	devDependencies
 };
 
+//#endregion
+//#region src/util/cli-args.ts
+const cliArgs = process.argv.slice(2);
+function parseOption(option, defaultValue) {
+	const i$2 = cliArgs.indexOf(option);
+	return i$2 !== -1 && i$2 + 1 < cliArgs.length ? cliArgs[i$2 + 1] : defaultValue;
+}
+
 //#endregion
 //#region src/util/logger.ts
 const logger = new Proxy({}, { get: (_$2, prop) => {
@@ -37198,9 +37211,12 @@ const collectData = memoize(async () => {
 		getRuntime$1(),
 		getEnvironment()
 	]);
+	const sessionId = parseOption("--telemetry-session-id") ?? process.env.ALCHEMY_TELEMETRY_SESSION_ID ?? globalThis.ALCHEMY_TELEMETRY_SESSION_ID ?? crypto.randomUUID();
+	const referrer = parseOption("--telemetry-ref") ?? process.env.ALCHEMY_TELEMETRY_REF ?? globalThis.ALCHEMY_TELEMETRY_REF ?? "";
 	return {
 		userId: userId ?? "",
-		sessionId: crypto.randomUUID(),
+		sessionId,
+		referrer,
 		platform: os.platform(),
 		osVersion: os.release(),
 		arch: os.arch(),
@@ -37228,7 +37244,7 @@ async function createAndSendEvent(data, error$83) {
 			...await collectData(),
 			...serializeError(error$83)
 		};
-		await fetch(TELEMETRY_API_URL, {
+		await fetchNoResponse(TELEMETRY_API_URL, {
 			method: "POST",
 			headers: { "Content-Type": "application/json" },
 			body: JSON.stringify(eventData)
@@ -37255,6 +37271,34 @@ function serializeError(error$83) {
 		errorStack: ""
 	};
 }
+async function fetchNoResponse(url$2, options = {}) {
+	const parsedUrl = new URL$1(url$2);
+	const isHttps = parsedUrl.protocol === "https:";
+	const client = isHttps ? https : http;
+	const body = options.body || "";
+	const headers = {
+		...options.headers,
+		"Content-Length": Buffer.byteLength(body)
+	};
+	const requestOptions = {
+		hostname: parsedUrl.hostname,
+		port: parsedUrl.port || (isHttps ? 443 : 80),
+		path: parsedUrl.pathname + parsedUrl.search,
+		method: options.method || "GET",
+		headers
+	};
+	await new Promise((resolve$1, reject) => {
+		const req = client.request(requestOptions);
+		req.on("error", (error$83) => {
+			reject(error$83);
+		});
+		if (body) req.write(body);
+		req.once("finish", () => {
+			resolve$1(void 0);
+		});
+		req.end();
+	});
+}
 
 //#endregion
 //#region src/state/instrumented-state-store.ts
@@ -37276,7 +37320,7 @@ var InstrumentedStateStore = class {
 			error$83 = err;
 			throw err;
 		} finally {
-			createAndSendEvent({
+			await createAndSendEvent({
 				event,
 				stateStore: this.stateStoreClass,
 				duration: performance.now() - start
@@ -37646,6 +37690,13 @@ const find = async (...args) => {
 //#region src/util/root-dir.ts
 const ALCHEMY_ROOT = process.env.ALCHEMY_ROOT ?? process.cwd();
 
+//#endregion
+//#region src/util/validate-resource-id.ts
+function validateResourceID(id, qualifier = "Resource") {
+	if (!id) throw new Error(`${qualifier} ID cannot be an empty string: "${id}"`);
+	if (id.includes(":")) throw new Error(`${qualifier} ID cannot include colons: "${id}"`);
+}
+
 //#endregion
 //#region src/scope.ts
 var RootScopeStateAttemptError = class extends Error {
@@ -37697,11 +37748,11 @@ var Scope = class Scope {
 	dotAlchemy;
 	isSelected;
 	profile;
+	startedAt;
 	providerCredentials;
 	isErrored = false;
 	isSkipped = false;
 	finalized = false;
-	startedAt = performance.now();
 	deferred = [];
 	cleanups = [];
 	get appName() {
@@ -37709,21 +37760,23 @@ var Scope = class Scope {
 		return this.scopeName;
 	}
 	constructor(options) {
-		const { scopeName, parent, stage, password, stateStore, quiet, phase, local, watch: watch$1, tunnel, force: force$1, destroyStrategy, logger: logger$1, adopt: adopt$1, dotAlchemy, rootDir, isSelected, noTrack, profile,...providerCredentials } = options;
+		const { scopeName, parent, stage, password, stateStore, quiet, phase, local, watch: watch$1, tunnel, force: force$1, destroyStrategy, logger: logger$1, adopt: adopt$1, dotAlchemy, rootDir, isSelected, noTrack, profile, startedAt,...providerCredentials } = options;
 		this.scopeName = scopeName;
 		this.name = this.scopeName;
 		this.parent = parent ?? Scope.getScope();
 		this.rootDir = rootDir ?? this.parent?.rootDir ?? ALCHEMY_ROOT;
 		this.isSelected = isSelected ?? this.parent?.isSelected;
+		this.startedAt = startedAt ?? this.parent?.startedAt ?? performance.now();
 		this.dotAlchemy = dotAlchemy ?? this.parent?.dotAlchemy ?? path.resolve(this.rootDir, ".alchemy");
 		this.providerCredentials = providerCredentials;
-		const isChild = this.parent !== void 0;
-		if (this.scopeName?.includes(":") && isChild) throw new Error(`Scope name "${this.scopeName}" cannot contain double colons`);
 		this.stage = stage ?? this.parent?.stage ?? DEFAULT_STAGE;
 		this.profile = profile ?? this.parent?.profile;
 		this.parent?.children.set(this.scopeName, this);
 		this.quiet = quiet ?? this.parent?.quiet ?? false;
-		if (this.parent && !this.scopeName) throw new Error("Scope name is required when creating a child scope");
+		if (this.parent) {
+			if (!this.scopeName) throw new Error("Scope name is required when creating a child scope");
+			validateResourceID(this.scopeName, "Scope");
+		}
 		this.password = password ?? this.parent?.password;
 		this.noTrack = noTrack ?? this.parent?.noTrack ?? false;
 		const resolvedPhase = phase ?? this.parent?.phase;
@@ -37740,7 +37793,7 @@ var Scope = class Scope {
 		this.force = force$1 ?? this.parent?.force ?? false;
 		this.adopt = adopt$1 ?? this.parent?.adopt ?? false;
 		this.destroyStrategy = destroyStrategy ?? this.parent?.destroyStrategy ?? "sequential";
-		if (this.local) this.logger.warnOnce("Development mode is in beta. Please report any issues to https://github.com/sam-goodwin/alchemy/issues.");
+		if (this.local) this.logger.warnOnce("Development mode is in beta. Please report any issues to https://github.com/alchemy-run/alchemy/issues.");
 		this.stateStore = stateStore ?? this.parent?.stateStore ?? ((scope) => new FileSystemStateStore(scope));
 		this.state = new InstrumentedStateStore(this.stateStore(this));
 		this.dataMutex = new AsyncMutex();
@@ -37874,10 +37927,10 @@ var Scope = class Scope {
 	async finalize(options) {
 		const shouldForce = options?.force || this.parent === void 0 || this?.parent?.scopeName === this.root.scopeName;
 		if (this.phase === "read") {
-			createAndSendEvent({
-				event: "alchemy.success",
+			if (this.parent == null) await createAndSendEvent({
+				event: this.isErrored ? "alchemy.error" : "alchemy.success",
 				duration: performance.now() - this.startedAt
-			});
+			}, this.isErrored ? /* @__PURE__ */ new Error("Scope failed") : void 0);
 			return;
 		}
 		if (this.finalized && !shouldForce) return;
@@ -37901,17 +37954,11 @@ var Scope = class Scope {
 				force: shouldForce,
 				noop: options?.noop
 			});
-			createAndSendEvent({
-				event: "alchemy.success",
-				duration: performance.now() - this.startedAt
-			});
-		} else if (this.isErrored) {
-			this.logger.warn("Scope is in error, skipping finalize");
-			createAndSendEvent({
-				event: "alchemy.error",
-				duration: performance.now() - this.startedAt
-			}, /* @__PURE__ */ new Error("Scope failed"));
-		}
+		} else if (this.isErrored) this.logger.warn("Scope is in error, skipping finalize");
+		if (this.parent == null) await createAndSendEvent({
+			event: this.isErrored ? "alchemy.error" : "alchemy.success",
+			duration: performance.now() - this.startedAt
+		}, this.isErrored ? /* @__PURE__ */ new Error("Scope failed") : void 0);
 		if (!this.parent && process.env.ALCHEMY_TEST_KILL_ON_FINALIZE) {
 			await this.cleanup();
 			process.exit(0);
@@ -38064,6 +38111,7 @@ async function destroy$1(...args) {
 	const scope = instance[ResourceScope];
 	if (!scope) logger.warn(`Resource "${instance[ResourceFQN]}" has no scope`);
 	const quiet = options?.quiet ?? scope.quiet;
+	const start = performance.now();
 	try {
 		if (!quiet && !options?.noop) logger.task(instance[ResourceFQN], {
 			prefix: options?.replace ? "cleanup" : "deleting",
@@ -38071,6 +38119,14 @@ async function destroy$1(...args) {
 			resource: formatFQN(instance[ResourceFQN]),
 			message: options?.replace ? "Cleaning Up Old Resource..." : "Deleting Resource..."
 		});
+		await createAndSendEvent({
+			event: "resource.start",
+			resource: instance[ResourceKind],
+			status: "deleting",
+			phase: "destroy",
+			duration: performance.now() - start,
+			replaced: !!options?.replace
+		});
 		let state;
 		let props;
 		if (options?.replace) {
@@ -38141,7 +38197,24 @@ async function destroy$1(...args) {
 			message: options?.replace ? "Old Resource Cleanup Complete" : "Deleted Resource",
 			status: "success"
 		});
+		await createAndSendEvent({
+			event: "resource.success",
+			resource: instance[ResourceKind],
+			status: "deleted",
+			phase: "destroy",
+			duration: performance.now() - start,
+			replaced: !!options?.replace
+		});
 	} catch (error$83) {
+		let errorToSend = error$83 instanceof Error ? error$83 : new Error(String(error$83));
+		await createAndSendEvent({
+			event: "resource.error",
+			resource: instance[ResourceKind],
+			duration: performance.now() - start,
+			phase: "destroy",
+			status: "deleting",
+			replaced: !!options?.replace
+		}, errorToSend);
 		logger.error(error$83);
 		throw error$83;
 	}
@@ -38242,12 +38315,13 @@ _alchemy.env = env;
 * Implementation of the alchemy function.
 */
 async function _alchemy(appName, options) {
-	const cliArgs = process.argv.slice(2);
+	const startedAt = performance.now();
+	let firstAnalyticsPromise;
+	if (!options?.noTrack) firstAnalyticsPromise = createAndSendEvent({
+		event: "alchemy.start",
+		duration: performance.now() - startedAt
+	});
 	const app = parseOption("--app");
-	function parseOption(option, defaultValue) {
-		const i$2 = cliArgs.indexOf(option);
-		return i$2 !== -1 && i$2 + 1 < cliArgs.length ? cliArgs[i$2 + 1] : defaultValue;
-	}
 	const mergedOptions = {
 		phase: app && app !== appName ? "read" : cliArgs.includes("--destroy") ? "destroy" : cliArgs.includes("--read") ? "read" : "up",
 		local: cliArgs.includes("--local") || cliArgs.includes("--dev"),
@@ -38284,7 +38358,8 @@ If this is a mistake, you can disable this check by setting the ALCHEMY_CI_STATE
 		phase,
 		password: mergedOptions?.password ?? process.env.ALCHEMY_PASSWORD,
 		noTrack: mergedOptions?.noTrack ?? false,
-		isSelected: app === void 0 ? void 0 : app === appName
+		isSelected: app === void 0 ? void 0 : app === appName,
+		startedAt
 	});
 	onExit((code) => {
 		root.cleanup().then(() => {
@@ -38303,9 +38378,14 @@ If this is a mistake, you can disable this check by setting the ALCHEMY_CI_STATE
 	Scope.storage.enterWith(root);
 	Scope.storage.enterWith(stage);
 	if (mergedOptions?.phase === "destroy") {
-		await destroy$1(stage);
+		const err = await destroy$1(stage).catch((e) => e);
+		if (!options?.noTrack) await createAndSendEvent({
+			event: err instanceof Error ? "alchemy.error" : "alchemy.success",
+			duration: performance.now() - root.startedAt
+		}, err instanceof Error ? err : void 0);
 		return process.exit(0);
 	}
+	if (firstAnalyticsPromise) await firstAnalyticsPromise;
 	return root;
 }
 /**
@@ -39170,23 +39250,23 @@ var ExitSignal = class extends Error {
 };
 var CancelSignal = class extends Error {};
 const loggingMiddleware = t.middleware(async ({ path: path$33, next }) => {
-	createAndSendEvent({
+	await createAndSendEvent({
 		event: "cli.start",
 		command: path$33
 	});
 	let exitCode = 0;
 	try {
-		const result = await next();
-		createAndSendEvent({
+		await next();
+		await createAndSendEvent({
 			event: "cli.success",
 			command: path$33
 		});
-		return result;
 	} catch (error$83) {
-		createAndSendEvent({
-			event: error$83 instanceof ExitSignal && error$83.code === 0 ? "cli.success" : "cli.error",
+		const isSafeExit = error$83 instanceof ExitSignal && error$83.code === 0;
+		await createAndSendEvent({
+			event: isSafeExit ? "cli.success" : "cli.error",
 			command: path$33
-		});
+		}, isSafeExit ? void 0 : error$83);
 		if (error$83 instanceof ExitSignal) exitCode = error$83.code;
 		else throw error$83;
 	} finally {
@@ -55276,12 +55356,15 @@ const execArgs = {
 	envFile: zod_default.string().optional().describe("Path to environment file to load"),
 	app: zod_default.string().optional().describe("Select a specific application to target"),
 	rootDir: zod_default.string().optional().describe("Path to the root directory of the project"),
-	profile: zod_default.string().optional().describe("Alchemy profile to use for authoriziing requests")
+	profile: zod_default.string().optional().describe("Alchemy profile to use for authorizing requests")
 };
 async function execAlchemy(main, { cwd: cwd$1 = process.cwd(), quiet, force: force$1, stage, destroy: destroy$2, watch: watch$1, envFile, read: read$5, dev: dev$1, inspect: inspect$1, inspectBrk, inspectWait, adopt: adopt$1, app, rootDir, profile }) {
 	const args = [];
 	const execArgs$1 = [];
 	const shouldInspect = (inspect$1 || inspectBrk || inspectWait) ?? false;
+	const telemetryData = await collectData();
+	args.push(`--telemetry-session-id ${telemetryData.sessionId}`);
+	args.push(`--telemetry-ref ${telemetryData.referrer ? `${telemetryData.referrer}+cli` : "cli"}`);
 	if (quiet) args.push("--quiet");
 	if (read$5) args.push("--read");
 	if (force$1) args.push("--force");
@@ -55366,7 +55449,7 @@ async function execAlchemy(main, { cwd: cwd$1 = process.cwd(), quiet, force: for
 	const { promise: inspectorUrlPromise, resolve: resolveInspectorUrl } = promiseWithResolvers();
 	process.on("SIGINT", async () => {
 		await exitPromise;
-		process.exit(sanitizeExitCode(child.exitCode));
+		throw new ExitSignal(sanitizeExitCode(child.exitCode));
 	});
 	const child = spawn(command, {
 		cwd: cwd$1,
@@ -55421,7 +55504,7 @@ async function execAlchemy(main, { cwd: cwd$1 = process.cwd(), quiet, force: for
 	}
 	const exitPromise = once(child, "exit");
 	await exitPromise.catch(() => {});
-	process.exit(sanitizeExitCode(child.exitCode));
+	throw new ExitSignal(sanitizeExitCode(child.exitCode));
 }
 /**
 * If exit code is 130 (SIGINT) or null, return 0.
@@ -231134,7 +231217,6 @@ import { Worker } from "alchemy/cloudflare";
 const app = await alchemy("${context$1.projectName}");
 
 export const worker = await Worker("worker", {
-  name: \`\${app.name}-\${app.stage}\`,
   entrypoint: "src/worker.ts",
 });
 
@@ -231147,7 +231229,6 @@ import { Vite } from "alchemy/cloudflare";
 const app = await alchemy("${context$1.projectName}");
 
 export const worker = await Vite("${context$1.projectName}", {
-  name: \`\${app.name}-\${app.stage}-website\`,
   // replace if different from default:
   //
   // main: "./.output/server/index.mjs",
@@ -231170,7 +231251,6 @@ import { Astro } from "alchemy/cloudflare";
 const app = await alchemy("${context$1.projectName}");
 
 export const worker = await Astro("website", {
-  name: \`\${app.name}-\${app.stage}-website\`,
   // replace if different from default:
   //
   // main: "./.output/server/index.mjs",
@@ -231192,7 +231272,6 @@ import { ReactRouter } from "alchemy/cloudflare";
 const app = await alchemy("${context$1.projectName}");
 
 export const worker = await ReactRouter("website", {
-  name: \`\${app.name}-\${app.stage}-website\`,
   // replace if different from default:
   //
   // main: "build/server/index.js",
@@ -231215,7 +231294,6 @@ import { SvelteKit } from "alchemy/cloudflare";
 const app = await alchemy("${context$1.projectName}");
 
 export const worker = await SvelteKit("website", {
-  name: \`\${app.name}-\${app.stage}-website\`,
   // replace if different from default:
   //
   // main: "./.output/server/index.mjs",
@@ -231237,7 +231315,6 @@ import { TanStackStart } from "alchemy/cloudflare";
 const app = await alchemy("${context$1.projectName}");
 
 export const worker = await TanStackStart("website", {
-  name: \`\${app.name}-\${app.stage}-website\`,
   // replace if different from default:
   //
   // main: "./.output/server/index.mjs",
@@ -231259,12 +231336,10 @@ import { D1Database, DurableObjectNamespace, Redwood } from "alchemy/cloudflare"
 const app = await alchemy("${context$1.projectName}");
 
 const database = await D1Database("database", {
-  name: \`\${app.name}-\${app.stage}-db\`,
   migrationsDir: "migrations",
 });
 
 export const worker = await Redwood("website", {
-  name: \`\${app.name}-\${app.stage}-website\`,
   bindings: {
     AUTH_SECRET_KEY: alchemy.secret(process.env.AUTH_SECRET_KEY),
     DB: database,
@@ -231293,7 +231368,6 @@ import { Nextjs } from "alchemy/cloudflare";
 const app = await alchemy("${context$1.projectName}");
 
 export const website = await Nextjs("website", {
-  name: \`\${app.name}-\${app.stage}-website\`,
 });
 
 console.log({
@@ -231310,7 +231384,6 @@ import { Nuxt } from "alchemy/cloudflare";
 const app = await alchemy("${context$1.projectName}");
 
 export const website = await Nuxt("website", {
-  name: \`\${app.name}-\${app.stage}-website\`,
   // replace if different from default:
   //
   // main: "./.output/server/index.mjs",

package/bin/commands/init.ts

@@ -255,7 +255,6 @@ import { Worker } from "alchemy/cloudflare";
 const app = await alchemy("${context.projectName}");
 
 export const worker = await Worker("worker", {
-  name: \`\${app.name}-\${app.stage}\`,
   entrypoint: "src/worker.ts",
 });
 
@@ -269,7 +268,6 @@ import { Vite } from "alchemy/cloudflare";
 const app = await alchemy("${context.projectName}");
 
 export const worker = await Vite("${context.projectName}", {
-  name: \`\${app.name}-\${app.stage}-website\`,
   // replace if different from default:
   //
   // main: "./.output/server/index.mjs",
@@ -293,7 +291,6 @@ import { Astro } from "alchemy/cloudflare";
 const app = await alchemy("${context.projectName}");
 
 export const worker = await Astro("website", {
-  name: \`\${app.name}-\${app.stage}-website\`,
   // replace if different from default:
   //
   // main: "./.output/server/index.mjs",
@@ -316,7 +313,6 @@ import { ReactRouter } from "alchemy/cloudflare";
 const app = await alchemy("${context.projectName}");
 
 export const worker = await ReactRouter("website", {
-  name: \`\${app.name}-\${app.stage}-website\`,
   // replace if different from default:
   //
   // main: "build/server/index.js",
@@ -340,7 +336,6 @@ import { SvelteKit } from "alchemy/cloudflare";
 const app = await alchemy("${context.projectName}");
 
 export const worker = await SvelteKit("website", {
-  name: \`\${app.name}-\${app.stage}-website\`,
   // replace if different from default:
   //
   // main: "./.output/server/index.mjs",
@@ -363,7 +358,6 @@ import { TanStackStart } from "alchemy/cloudflare";
 const app = await alchemy("${context.projectName}");
 
 export const worker = await TanStackStart("website", {
-  name: \`\${app.name}-\${app.stage}-website\`,
   // replace if different from default:
   //
   // main: "./.output/server/index.mjs",
@@ -386,12 +380,10 @@ import { D1Database, DurableObjectNamespace, Redwood } from "alchemy/cloudflare"
 const app = await alchemy("${context.projectName}");
 
 const database = await D1Database("database", {
-  name: \`\${app.name}-\${app.stage}-db\`,
   migrationsDir: "migrations",
 });
 
 export const worker = await Redwood("website", {
-  name: \`\${app.name}-\${app.stage}-website\`,
   bindings: {
     AUTH_SECRET_KEY: alchemy.secret(process.env.AUTH_SECRET_KEY),
     DB: database,
@@ -421,7 +413,6 @@ import { Nextjs } from "alchemy/cloudflare";
 const app = await alchemy("${context.projectName}");
 
 export const website = await Nextjs("website", {
-  name: \`\${app.name}-\${app.stage}-website\`,
 });
 
 console.log({
@@ -439,7 +430,6 @@ import { Nuxt } from "alchemy/cloudflare";
 const app = await alchemy("${context.projectName}");
 
 export const website = await Nuxt("website", {
-  name: \`\${app.name}-\${app.stage}-website\`,
   // replace if different from default:
   //
   // main: "./.output/server/index.mjs",

package/bin/services/execute-alchemy.ts

@@ -8,6 +8,7 @@ import { detectRuntime } from "../../src/util/detect-node-runtime.ts";
 import { detectPackageManager } from "../../src/util/detect-package-manager.ts";
 import { exists } from "../../src/util/exists.ts";
 import { promiseWithResolvers } from "../../src/util/promise-with-resolvers.ts";
+import { collectData } from "../../src/util/telemetry.ts";
 import { ExitSignal } from "../trpc.ts";
 import { CDPProxy } from "./cdp-manager/cdp-proxy.ts";
 import { CDPManager } from "./cdp-manager/server.ts";
@@ -75,7 +76,7 @@ export const execArgs = {
   profile: z
     .string()
     .optional()
-    .describe("Alchemy profile to use for authoriziing requests"),
+    .describe("Alchemy profile to use for authorizing requests"),
 } as const;
 
 export async function execAlchemy(
@@ -121,6 +122,13 @@ export async function execAlchemy(
 
   const shouldInspect = (inspect || inspectBrk || inspectWait) ?? false;
 
+  const telemetryData = await collectData();
+
+  args.push(`--telemetry-session-id ${telemetryData.sessionId}`);
+  args.push(
+    `--telemetry-ref ${telemetryData.referrer ? `${telemetryData.referrer}+cli` : "cli"}`,
+  );
+
   if (quiet) args.push("--quiet");
   if (read) args.push("--read");
   if (force) args.push("--force");
@@ -238,7 +246,7 @@ export async function execAlchemy(
 
   process.on("SIGINT", async () => {
     await exitPromise;
-    process.exit(sanitizeExitCode(child.exitCode));
+    throw new ExitSignal(sanitizeExitCode(child.exitCode));
   });
 
   const child = spawn(command, {
@@ -298,7 +306,8 @@ export async function execAlchemy(
 
   const exitPromise = once(child, "exit");
   await exitPromise.catch(() => {});
-  process.exit(sanitizeExitCode(child.exitCode));
+
+  throw new ExitSignal(sanitizeExitCode(child.exitCode));
 }
 
 /**

package/bin/trpc.ts

@@ -6,7 +6,7 @@ import { createAndSendEvent } from "../src/util/telemetry.ts";
 export const t = trpcServer.initTRPC.meta<TrpcCliMeta>().create();
 
 export class ExitSignal extends Error {
-  constructor(public code: 0 | 1 = 0) {
+  constructor(public code = 0) {
     super(`Process exit with code ${code}`);
     this.name = "ExitSignal";
   }
@@ -15,27 +15,27 @@ export class ExitSignal extends Error {
 export class CancelSignal extends Error {}
 
 const loggingMiddleware = t.middleware(async ({ path, next }) => {
-  createAndSendEvent({
+  await createAndSendEvent({
     event: "cli.start",
     command: path,
   });
   let exitCode = 0;
 
   try {
-    const result = await next();
-    createAndSendEvent({
+    await next();
+    await createAndSendEvent({
       event: "cli.success",
       command: path,
     });
-    return result;
   } catch (error) {
-    createAndSendEvent({
-      event:
-        error instanceof ExitSignal && error.code === 0
-          ? "cli.success"
-          : "cli.error",
-      command: path,
-    });
+    const isSafeExit = error instanceof ExitSignal && error.code === 0;
+    await createAndSendEvent(
+      {
+        event: isSafeExit ? "cli.success" : "cli.error",
+        command: path,
+      },
+      isSafeExit ? undefined : error,
+    );
     if (error instanceof ExitSignal) {
       exitCode = error.code;
     } else {