@dragonmastery/tamer 0.29.0 → 0.30.0

package/dist/{fetchStackImports-C-1THPYL.mjs → fetchStackImports-ClUYZy_U.mjs}

@@ -1,6 +1,6 @@
 import { f as getDispatchNamespaces, n as materializeTamerResolvable, r as materializeVars } from "./normalize-DVSTRZhO.mjs";
-import { t as getWorkers } from "./loader-DAvCKLTT.mjs";
-import { f as stackNameForConfig, o as effectiveDispatchNamespaceName, s as isEphemeralEnv, t as StateManager } from "./StateManager-DTqtLLVX.mjs";
+import { t as getWorkers } from "./loader-DnT9iqz9.mjs";
+import { f as stackNameForConfig, o as effectiveDispatchNamespaceName, s as isEphemeralEnv, t as StateManager } from "./StateManager-JLBtz9V-.mjs";
 import { n as r2S3CredentialsFromEnv, t as emptyR2BucketViaS3 } from "./r2S3EmptyBucket-DD81ZWQ7.mjs";
 import { n as logApplyChange } from "./planFormat-CJw8Kq2s.mjs";
 import { resolve } from "path";
@@ -14,6 +14,10 @@ var NamingEngine = class {
 		this.tenant = tenant;
 		this.conventions = conventions;
 	}
+	/** Tenant id for per-resource {@link CloudflareNameFn} overrides. */
+	get tenantId() {
+		return this.tenant.id;
+	}
 	d1SingleName(logicalName, env) {
 		if (this.conventions?.d1Single) return this.conventions.d1Single(logicalName, this.tenant.id, env);
 		return `db_${logicalName}_t_${this.tenant.id}_${env}`;
@@ -153,6 +157,10 @@ var NamingEngine = class {
 		if (env === "local") return `${this.tenant.slug}-${workerKey}-${this.tenant.id}`;
 		return `${this.tenant.slug}-${workerKey}-${env}-${this.tenant.id}`;
 	}
+	/** Whether stack {@link NamingConventions.d1Shard} is configured. */
+	hasD1ShardConvention() {
+		return Boolean(this.conventions?.d1Shard);
+	}
 	d1MatchPattern(logicalName, env) {
 		if (this.conventions?.d1Shard) return (name) => {
 			const shardDate = this.extractD1ShardDate(name);
@@ -843,6 +851,71 @@ async function resolveWorkerConfig(config, workerKey, workerConfig, env, baseDir
 	};
 }
 
+//#endregion
+//#region src/core/naming/resolveCloudflareName.ts
+function resolveOverride(fn, tenantId, env, ctx) {
+	if (!fn) return void 0;
+	return fn(tenantId, env, ctx);
+}
+/** Managed D1 Cloudflare database name (not external `databaseName`). */
+function resolveD1CloudflareName(config, env, naming, shardDate) {
+	const tenantId = naming.tenantId;
+	if (config.type === "single") {
+		const override$1 = resolveOverride(config.cloudflareName, tenantId, env);
+		if (override$1 !== void 0) return override$1;
+		return naming.d1SingleName(config.logicalName, env);
+	}
+	if (!shardDate) throw new Error(`Sharded D1 "${config.logicalName}" requires shardDate`);
+	const override = resolveOverride(config.cloudflareName, tenantId, env, { shardDate });
+	if (override !== void 0) return override;
+	return naming.d1ShardName(config.logicalName, shardDate, env);
+}
+function resolveR2CloudflareName(config, env, naming) {
+	const override = resolveOverride(config.cloudflareName, naming.tenantId, env);
+	if (override !== void 0) return override;
+	return naming.r2BucketName(config.logicalName, env);
+}
+function resolveWorkflowCloudflareName(config, env, naming) {
+	const override = resolveOverride(config.cloudflareName, naming.tenantId, env);
+	if (override !== void 0) return override;
+	return naming.workflowName(config.logicalName, env);
+}
+function resolveKVCloudflareName(config, env, naming) {
+	const override = resolveOverride(config.cloudflareName, naming.tenantId, env);
+	if (override !== void 0) return override;
+	return naming.kvNamespaceName(config.logicalName, env);
+}
+function resolveQueueCloudflareName(config, env, naming) {
+	const override = resolveOverride(config.cloudflareName, naming.tenantId, env);
+	if (override !== void 0) return override;
+	return naming.queueName(config.logicalName, env);
+}
+function resolveHyperdriveCloudflareName(config, env, naming) {
+	const override = resolveOverride(config.cloudflareName, naming.tenantId, env);
+	if (override !== void 0) return override;
+	return naming.hyperdriveName(config.logicalName, env);
+}
+function resolveVectorizeCloudflareName(config, env, naming) {
+	const override = resolveOverride(config.cloudflareName, naming.tenantId, env);
+	if (override !== void 0) return override;
+	return naming.vectorizeName(config.logicalName, env);
+}
+function resolveAIGatewayCloudflareName(config, env, naming) {
+	const override = resolveOverride(config.cloudflareName, naming.tenantId, env);
+	if (override !== void 0) return override;
+	return naming.aiGatewayId(config.logicalName, env);
+}
+function resolvePipelineCloudflareName(config, env, naming) {
+	const override = resolveOverride(config.cloudflareName, naming.tenantId, env);
+	if (override !== void 0) return override;
+	return naming.pipelineName(config.logicalName, env);
+}
+function resolveSecretsStoreCloudflareName(config, env, naming) {
+	const override = resolveOverride(config.cloudflareName, naming.tenantId, env);
+	if (override !== void 0) return override;
+	return naming.secretsStoreName(config.logicalName, env);
+}
+
 //#endregion
 //#region src/features/d1/d1.ownership.ts
 function d1IsExternal(config) {
@@ -863,7 +936,34 @@ function d1CloudflareDatabaseName(config, env, naming) {
 		if (typeof n !== "string" || !n.trim()) throw new Error(`D1 "${config.logicalName}" has ownership "external" but databaseName is empty — ensure imports are pre-fetched and config is merged with resolveWorkerConfig / mergeWorkerConfigWithResolvedRefs.`);
 		return n.trim();
 	}
-	return naming.d1SingleName(config.logicalName, env);
+	return resolveD1CloudflareName(config, env, naming);
+}
+
+//#endregion
+//#region src/features/d1/d1.naming.ts
+function d1DeriveName(config, env, shardDate, naming) {
+	if (config.type === "single") return resolveD1CloudflareName(config, env, naming);
+	if (!shardDate) throw new Error(`Sharded D1 "${config.logicalName}" requires shardDate`);
+	return resolveD1CloudflareName(config, env, naming, shardDate);
+}
+function d1MatchPattern(config, env, naming) {
+	if (config.type === "single") {
+		const exactName = resolveD1CloudflareName(config, env, naming);
+		return (name) => name === exactName;
+	}
+	if (config.cloudflareName || naming.hasD1ShardConvention()) return (name) => {
+		const shardDate = d1ExtractShardDate(name, naming);
+		if (!shardDate) return false;
+		try {
+			return resolveD1CloudflareName(config, env, naming, shardDate) === name;
+		} catch {
+			return false;
+		}
+	};
+	return naming.d1MatchPattern(config.logicalName, env);
+}
+function d1ExtractShardDate(name, naming) {
+	return naming.extractD1ShardDate(name);
 }
 
 //#endregion
@@ -900,7 +1000,7 @@ async function d1Apply(resources, tenant, env, api, state, naming, addShard) {
 		if (addShard && addShard !== config.logicalName) continue;
 		if (addShard && addShard === config.logicalName) {
 			const shardDate$1 = todayNoDashes();
-			const derivedName$1 = naming.d1ShardName(config.logicalName, shardDate$1, env);
+			const derivedName$1 = d1DeriveName(config, env, shardDate$1, naming);
 			if (state.get(derivedName$1)) continue;
 			const { uuid: uuid$1 } = await api.d1Create(derivedName$1);
 			state.set(derivedName$1, {
@@ -919,7 +1019,7 @@ async function d1Apply(resources, tenant, env, api, state, naming, addShard) {
 		const allResources = state.getAll();
 		if (Object.values(allResources).filter((e) => e.type === "d1_database" && "logicalName" in e && e.logicalName === config.logicalName).length > 0) continue;
 		const shardDate = todayNoDashes();
-		const derivedName = naming.d1ShardName(config.logicalName, shardDate, env);
+		const derivedName = d1DeriveName(config, env, shardDate, naming);
 		const { uuid } = await api.d1Create(derivedName);
 		state.set(derivedName, {
 			type: "d1_database",
@@ -935,19 +1035,6 @@ async function d1Apply(resources, tenant, env, api, state, naming, addShard) {
 	}
 }
 
-//#endregion
-//#region src/features/d1/d1.naming.ts
-function d1MatchPattern(config, env, naming) {
-	if (config.type === "single") {
-		const exactName = naming.d1SingleName(config.logicalName, env);
-		return (name) => name === exactName;
-	}
-	return naming.d1MatchPattern(config.logicalName, env);
-}
-function d1ExtractShardDate(name, naming) {
-	return naming.extractD1ShardDate(name);
-}
-
 //#endregion
 //#region src/features/d1/d1.sync.ts
 function d1Sync(allD1, resources, tenant, env, state, naming) {
@@ -1024,7 +1111,7 @@ function d1Drift(allD1, resources, env, state, naming) {
 			});
 			continue;
 		}
-		const pattern = naming.d1MatchPattern(config.logicalName, env);
+		const pattern = d1MatchPattern(config, env, naming);
 		const cfShards = allD1.filter((db) => pattern(db.name));
 		const cfShardNames = new Set(cfShards.map((s) => s.name));
 		const stateShards = d1State.filter((e) => e.logicalName === config.logicalName && !!e.shardDate);
@@ -1175,6 +1262,22 @@ function resourcesFrom(source) {
 	return source;
 }
 
+//#endregion
+//#region src/core/registry/findResourceForImport.ts
+/**
+* Find the first declared resource config matching `logical` across all workers.
+* Used by `tamer import` to validate CF names against {@link cloudflareName} overrides.
+*/
+async function findWorkerResourceByLogicalName(config, configKey, logical, baseDir) {
+	const workers = await getWorkers(config, baseDir);
+	for (const [, wc] of workers) {
+		const list = wc.resources?.[configKey];
+		if (!list) continue;
+		const hit = list.find((r) => r.logicalName === logical);
+		if (hit) return hit;
+	}
+}
+
 //#endregion
 //#region src/features/d1/d1.module.ts
 const d1Module = {
@@ -1217,11 +1320,13 @@ const d1Module = {
 			console.warn(`Rollback: failed to delete D1 ${entry.derivedName}:`, err);
 		}
 	},
-	async importOne({ options, env, api, state, naming, ts }) {
+	async importOne({ options, env, api, state, naming, config, baseDir, ts }) {
 		if (!options.cfId) throw new Error("import d1: --cf-id <uuid> is required");
+		const resourceConfig = await findWorkerResourceByLogicalName(config, "d1", options.logical, baseDir);
+		if (!resourceConfig) throw new Error(`import d1: no resources.d1 entry with logicalName "${options.logical}" in the Tamer project config`);
 		const hit = (await api.d1ListAll()).find((d) => d.uuid === options.cfId);
 		if (!hit) throw new Error(`import d1: D1 database with uuid "${options.cfId}" not found in account`);
-		const derivedName = options.shardDate ? naming.d1ShardName(options.logical, options.shardDate, env) : naming.d1SingleName(options.logical, env);
+		const derivedName = options.shardDate ? d1DeriveName(resourceConfig, env, options.shardDate, naming) : d1DeriveName(resourceConfig, env, void 0, naming);
 		if (hit.name !== derivedName) throw new Error(`import d1: cf name "${hit.name}" does not match derived "${derivedName}" — wrong --logical, missing --shard-date, or naming convention drift?`);
 		const bindingKey = options.shardDate ? naming.d1ShardBindingKey(options.logical, options.shardDate) : naming.d1SingleBindingKey(options.logical);
 		const existing = state.get(derivedName);
@@ -1240,6 +1345,22 @@ const d1Module = {
 	}
 };
 
+//#endregion
+//#region src/features/r2/r2.naming.ts
+function r2DeriveName(config, env, naming) {
+	return resolveR2CloudflareName(config, env, naming);
+}
+function r2MatchPattern(config, env, naming) {
+	if (config.cloudflareName) {
+		const expected = resolveR2CloudflareName(config, env, naming);
+		return (name) => name === expected;
+	}
+	return naming.r2MatchPattern(config.logicalName, env);
+}
+function r2ExtractDate(name, naming) {
+	return naming.extractR2Date(name);
+}
+
 //#endregion
 //#region src/features/r2/r2.apply.ts
 function existingR2ForLogical(state, logicalName) {
@@ -1257,7 +1378,7 @@ function assertValidR2BucketName(name, logicalName) {
 }
 async function r2Apply(resources, tenant, env, api, state, naming) {
 	for (const config of resources) {
-		const derivedName = naming.r2BucketName(config.logicalName, env);
+		const derivedName = r2DeriveName(config, env, naming);
 		if (state.get(derivedName)) {
 			console.log(`R2: skip "${derivedName}" (already in state; logical "${config.logicalName}")`);
 			continue;
@@ -1282,17 +1403,11 @@ async function r2Apply(resources, tenant, env, api, state, naming) {
 	}
 }
 
-//#endregion
-//#region src/features/r2/r2.naming.ts
-function r2ExtractDate(name, naming) {
-	return naming.extractR2Date(name);
-}
-
 //#endregion
 //#region src/features/r2/r2.sync.ts
 function r2Sync(allR2, resources, tenant, env, state, naming) {
 	for (const config of resources) {
-		const pattern = naming.r2MatchPattern(config.logicalName, env);
+		const pattern = r2MatchPattern(config, env, naming);
 		const match = allR2.find((b) => pattern(b.name));
 		if (match) {
 			const createdDate = r2ExtractDate(match.name, naming) ?? match.creation_date.slice(0, 10);
@@ -1329,7 +1444,7 @@ function r2Drift(allR2, resources, env, state, naming) {
 	const allState = state.getAll();
 	const r2State = Object.values(allState).filter((e) => e.type === "r2_bucket");
 	for (const config of resources) {
-		const pattern = naming.r2MatchPattern(config.logicalName, env);
+		const pattern = r2MatchPattern(config, env, naming);
 		const cfMatch = allR2.find((b) => pattern(b.name));
 		const stateEntry = r2State.find((e) => e.logicalName === config.logicalName);
 		if (stateEntry && !cfNames.has(stateEntry.derivedName)) {
@@ -1407,7 +1522,7 @@ function r2Status(resources, env, state, naming) {
 		const entry = Object.values(allResources).find((e) => e.type === "r2_bucket" && e.logicalName === config.logicalName);
 		results.push({
 			binding: entry?.bindingKey ?? naming.r2BindingKey(config.logicalName),
-			name: entry?.derivedName ?? naming.r2BucketName(config.logicalName, env),
+			name: entry?.derivedName ?? r2DeriveName(config, env, naming),
 			status: entry ? "ok" : "missing"
 		});
 	}
@@ -1455,12 +1570,14 @@ const r2Module = {
 			console.warn(`Rollback: failed to delete R2 ${entry.derivedName}:`, err);
 		}
 	},
-	async importOne({ options, env, api, state, naming, ts }) {
+	async importOne({ options, env, api, state, naming, config, baseDir, ts }) {
 		const bucketName = options.cfId;
 		if (!bucketName) throw new Error("import r2: --cf-id <bucket-name> is required");
+		const resourceConfig = await findWorkerResourceByLogicalName(config, "r2", options.logical, baseDir);
+		if (!resourceConfig) throw new Error(`import r2: no resources.r2 entry with logicalName "${options.logical}" in the Tamer project config`);
 		const hit = (await api.r2ListAll()).find((b) => b.name === bucketName);
 		if (!hit) throw new Error(`import r2: bucket "${bucketName}" not found in account`);
-		if (!naming.r2MatchPattern(options.logical, env)(hit.name)) throw new Error(`import r2: bucket name "${hit.name}" does not match expected pattern for logical "${options.logical}" and env "${env}"`);
+		if (!r2MatchPattern(resourceConfig, env, naming)(hit.name)) throw new Error(`import r2: bucket name "${hit.name}" does not match expected pattern for logical "${options.logical}" and env "${env}"`);
 		const derivedName = hit.name;
 		const createdDate = options.createdDate ?? naming.extractR2Date(hit.name) ?? hit.creation_date.slice(0, 10);
 		const bindingKey = naming.r2BindingKey(options.logical);
@@ -1478,11 +1595,17 @@ const r2Module = {
 	}
 };
 
+//#endregion
+//#region src/features/kv/kv.naming.ts
+function kvDeriveName(config, env, naming) {
+	return resolveKVCloudflareName(config, env, naming);
+}
+
 //#endregion
 //#region src/features/kv/kv.apply.ts
 async function kvApply(resources, tenant, env, api, state, naming) {
 	for (const config of resources) {
-		const derivedName = naming.kvNamespaceName(config.logicalName, env);
+		const derivedName = kvDeriveName(config, env, naming);
 		if (state.get(derivedName)) continue;
 		const { id } = await api.kvCreate(derivedName);
 		state.set(derivedName, {
@@ -1501,7 +1624,7 @@ async function kvApply(resources, tenant, env, api, state, naming) {
 //#region src/features/kv/kv.sync.ts
 function kvSync(allKV, resources, tenant, env, state, naming) {
 	for (const config of resources) {
-		const derivedName = naming.kvNamespaceName(config.logicalName, env);
+		const derivedName = kvDeriveName(config, env, naming);
 		const match = allKV.find((ns) => ns.title === derivedName);
 		if (match) state.set(derivedName, {
 			type: "kv_namespace",
@@ -1528,7 +1651,7 @@ function kvDrift(allKV, resources, env, state, naming) {
 	const allState = state.getAll();
 	const kvState = Object.values(allState).filter((e) => e.type === "kv_namespace");
 	for (const config of resources) {
-		const derivedName = naming.kvNamespaceName(config.logicalName, env);
+		const derivedName = kvDeriveName(config, env, naming);
 		const cfId = cfByTitle.get(derivedName);
 		const stateEntry = kvState.find((e) => e.logicalName === config.logicalName);
 		if (stateEntry && !cfId) drift.missingFromCloudflare.push({
@@ -1571,7 +1694,7 @@ async function kvDestroy(_env, state, api, config, baseDir, _force) {
 function kvGenerate(resources, env, state, naming) {
 	const bindings = [];
 	for (const config of resources) {
-		const derivedName = naming.kvNamespaceName(config.logicalName, env);
+		const derivedName = kvDeriveName(config, env, naming);
 		const entry = state.get(derivedName);
 		if (!entry || entry.type !== "kv_namespace") throw new Error(`KV "${config.logicalName}" not in state. Run 'tamer apply --env ${env}' first.`);
 		bindings.push({
@@ -1587,7 +1710,7 @@ function kvGenerate(resources, env, state, naming) {
 function kvStatus(resources, env, state, naming) {
 	const results = [];
 	for (const config of resources) {
-		const derivedName = naming.kvNamespaceName(config.logicalName, env);
+		const derivedName = kvDeriveName(config, env, naming);
 		const entry = state.get(derivedName);
 		results.push({
 			binding: naming.kvBindingKey(config.logicalName),
@@ -1642,11 +1765,13 @@ const kvModule = {
 			console.warn(`Rollback: failed to delete KV ${entry.derivedName}:`, err);
 		}
 	},
-	async importOne({ options, env, api, state, naming, ts }) {
+	async importOne({ options, env, api, state, naming, config, baseDir, ts }) {
 		if (!options.cfId) throw new Error("import kv: --cf-id <namespace-id> is required");
+		const resourceConfig = await findWorkerResourceByLogicalName(config, "kv", options.logical, baseDir);
+		if (!resourceConfig) throw new Error(`import kv: no resources.kv entry with logicalName "${options.logical}" in the Tamer project config`);
 		const hit = (await api.kvListAll()).find((k) => k.id === options.cfId);
 		if (!hit) throw new Error(`import kv: KV namespace id "${options.cfId}" not found in account`);
-		const derivedName = naming.kvNamespaceName(options.logical, env);
+		const derivedName = kvDeriveName(resourceConfig, env, naming);
 		if (hit.title !== derivedName) throw new Error(`import kv: cf title "${hit.title}" does not match derived "${derivedName}"`);
 		const bindingKey = naming.kvBindingKey(options.logical);
 		const existing = state.get(derivedName);
@@ -1663,6 +1788,12 @@ const kvModule = {
 	}
 };
 
+//#endregion
+//#region src/features/queues/queues.naming.ts
+function queueDeriveName(config, env, naming) {
+	return resolveQueueCloudflareName(config, env, naming);
+}
+
 //#endregion
 //#region src/features/queues/queues.apply.ts
 const STATE_KEY_PREFIX$6 = "queue:";
@@ -1671,7 +1802,7 @@ function stateKey$6(derivedName) {
 }
 async function queuesApply(resources, _tenant, env, api, state, naming) {
 	for (const config of resources) {
-		const derivedName = naming.queueName(config.logicalName, env);
+		const derivedName = queueDeriveName(config, env, naming);
 		const key = stateKey$6(derivedName);
 		if (state.get(key)) continue;
 		const ts = (/* @__PURE__ */ new Date()).toISOString();
@@ -1693,7 +1824,7 @@ async function queuesApply(resources, _tenant, env, api, state, naming) {
 //#region src/features/queues/queues.sync.ts
 function queuesSync(allQueues, resources, _tenant, env, state, naming) {
 	for (const config of resources) {
-		const derivedName = naming.queueName(config.logicalName, env);
+		const derivedName = queueDeriveName(config, env, naming);
 		const match = allQueues.find((q) => q.queue_name === derivedName);
 		if (!match) continue;
 		const key = `queue:${derivedName}`;
@@ -1724,7 +1855,7 @@ function queuesDrift(allQueues, resources, env, state, naming) {
 	const cfByName = new Map(allQueues.map((q) => [q.queue_name, q.queue_id]));
 	const stateEntries = Object.values(state.getAll()).filter((e) => e.type === "queue");
 	for (const config of resources) {
-		const derivedName = naming.queueName(config.logicalName, env);
+		const derivedName = queueDeriveName(config, env, naming);
 		const cfId = cfByName.get(derivedName);
 		const stateEntry = stateEntries.find((e) => e.logicalName === config.logicalName);
 		if (stateEntry && !cfId) drift.missingFromCloudflare.push({
@@ -1773,7 +1904,7 @@ function queuesGenerate(resources, env, state, naming) {
 	const producers = [];
 	for (const config of resources) {
 		if (config.consumerOnly) continue;
-		const derivedName = naming.queueName(config.logicalName, env);
+		const derivedName = queueDeriveName(config, env, naming);
 		const entry = state.get(`queue:${derivedName}`);
 		if (!entry || entry.type !== "queue") throw new Error(`Queue "${config.logicalName}" not in state. Run 'tamer apply --env ${env}' first.`);
 		producers.push({
@@ -1790,7 +1921,7 @@ function queuesGenerate(resources, env, state, naming) {
 function queuesStatus(resources, env, state, naming) {
 	const out = [];
 	for (const config of resources) {
-		const derivedName = naming.queueName(config.logicalName, env);
+		const derivedName = queueDeriveName(config, env, naming);
 		const entry = state.get(`queue:${derivedName}`);
 		out.push({
 			binding: config.binding?.trim() || naming.queueBindingKey(config.logicalName),
@@ -1853,11 +1984,13 @@ const queuesModule = {
 			console.warn(`Rollback: failed to delete queue ${entry.derivedName}:`, err);
 		}
 	},
-	async importOne({ options, env, api, state, naming, ts }) {
+	async importOne({ options, env, api, state, naming, config, baseDir, ts }) {
 		if (!options.cfId) throw new Error("import queue: --cf-id <queue-id> is required");
+		const resourceConfig = await findWorkerResourceByLogicalName(config, "queues", options.logical, baseDir);
+		if (!resourceConfig) throw new Error(`import queue: no resources.queues entry with logicalName "${options.logical}" in the Tamer project config`);
 		const hit = (await api.queuesListAll()).find((q) => q.queue_id === options.cfId);
 		if (!hit) throw new Error(`import queue: queue id "${options.cfId}" not found in account`);
-		const derivedName = naming.queueName(options.logical, env);
+		const derivedName = queueDeriveName(resourceConfig, env, naming);
 		if (hit.queue_name !== derivedName) throw new Error(`import queue: cf name "${hit.queue_name}" does not match derived "${derivedName}"`);
 		const bindingKey = naming.queueBindingKey(options.logical);
 		const key = `queue:${derivedName}`;
@@ -1905,13 +2038,19 @@ function resolveHyperdriveOrigin(config) {
 	};
 }
 
+//#endregion
+//#region src/features/hyperdrive/hyperdrive.naming.ts
+function hyperdriveDeriveName(config, env, naming) {
+	return resolveHyperdriveCloudflareName(config, env, naming);
+}
+
 //#endregion
 //#region src/features/hyperdrive/hyperdrive.diff.ts
 function hyperdriveDiffPlanItems(args) {
 	const { resources, env, state, naming } = args;
 	const items = [];
 	for (const config of resources) {
-		const derivedName = naming.hyperdriveName(config.logicalName, env);
+		const derivedName = hyperdriveDeriveName(config, env, naming);
 		const entry = state.get(`hyperdrive:${derivedName}`);
 		if (!entry || entry.type !== "hyperdrive") continue;
 		const changes = computeChanges$1(entry, config);
@@ -1970,7 +2109,7 @@ function stateKey$5(derivedName) {
 }
 async function hyperdriveApply(resources, _tenant, env, api, state, naming) {
 	for (const config of resources) {
-		const derivedName = naming.hyperdriveName(config.logicalName, env);
+		const derivedName = hyperdriveDeriveName(config, env, naming);
 		const key = stateKey$5(derivedName);
 		const existing = state.get(key);
 		const ts = (/* @__PURE__ */ new Date()).toISOString();
@@ -2028,7 +2167,7 @@ async function hyperdriveApply(resources, _tenant, env, api, state, naming) {
 //#region src/features/hyperdrive/hyperdrive.sync.ts
 function hyperdriveSync(allHyperdrive, resources, _tenant, env, state, naming) {
 	for (const config of resources) {
-		const derivedName = naming.hyperdriveName(config.logicalName, env);
+		const derivedName = hyperdriveDeriveName(config, env, naming);
 		const match = allHyperdrive.find((h) => h.name === derivedName);
 		if (!match) continue;
 		const key = `hyperdrive:${derivedName}`;
@@ -2061,7 +2200,7 @@ function hyperdriveDrift(allHyperdrive, resources, env, state, naming) {
 	const cfByName = new Map(allHyperdrive.map((h) => [h.name, h.id]));
 	const stateEntries = Object.values(state.getAll()).filter((e) => e.type === "hyperdrive");
 	for (const config of resources) {
-		const derivedName = naming.hyperdriveName(config.logicalName, env);
+		const derivedName = hyperdriveDeriveName(config, env, naming);
 		const cfId = cfByName.get(derivedName);
 		const stateEntry = stateEntries.find((e) => e.logicalName === config.logicalName);
 		if (stateEntry && !cfId) drift.missingFromCloudflare.push({
@@ -2104,7 +2243,7 @@ async function hyperdriveDestroy(_env, state, api, config, baseDir, _force) {
 function hyperdriveGenerate(resources, env, state, naming) {
 	const out = [];
 	for (const config of resources) {
-		const derivedName = naming.hyperdriveName(config.logicalName, env);
+		const derivedName = hyperdriveDeriveName(config, env, naming);
 		const entry = state.get(`hyperdrive:${derivedName}`);
 		if (!entry || entry.type !== "hyperdrive") throw new Error(`Hyperdrive "${config.logicalName}" not in state. Run 'tamer apply --env ${env}' first.`);
 		out.push({
@@ -2121,7 +2260,7 @@ function hyperdriveGenerate(resources, env, state, naming) {
 function hyperdriveStatus(resources, env, state, naming) {
 	const out = [];
 	for (const config of resources) {
-		const derivedName = naming.hyperdriveName(config.logicalName, env);
+		const derivedName = hyperdriveDeriveName(config, env, naming);
 		const entry = state.get(`hyperdrive:${derivedName}`);
 		out.push({
 			binding: config.binding?.trim() || naming.hyperdriveBindingKey(config.logicalName),
@@ -2187,11 +2326,13 @@ const hyperdriveModule = {
 			console.warn(`Rollback: failed to delete Hyperdrive ${entry.derivedName}:`, err);
 		}
 	},
-	async importOne({ options, env, api, state, naming, ts }) {
+	async importOne({ options, env, api, state, naming, config, baseDir, ts }) {
 		if (!options.cfId) throw new Error("import hyperdrive: --cf-id <config-id> is required");
+		const resourceConfig = await findWorkerResourceByLogicalName(config, "hyperdrive", options.logical, baseDir);
+		if (!resourceConfig) throw new Error(`import hyperdrive: no resources.hyperdrive entry with logicalName "${options.logical}" in the Tamer project config`);
 		const hit = (await api.hyperdriveListAll()).find((h) => h.id === options.cfId);
 		if (!hit) throw new Error(`import hyperdrive: config id "${options.cfId}" not found in account`);
-		const derivedName = naming.hyperdriveName(options.logical, env);
+		const derivedName = hyperdriveDeriveName(resourceConfig, env, naming);
 		if (hit.name !== derivedName) throw new Error(`import hyperdrive: cf name "${hit.name}" does not match derived "${derivedName}"`);
 		const bindingKey = naming.hyperdriveBindingKey(options.logical);
 		const key = `hyperdrive:${derivedName}`;
@@ -2213,6 +2354,12 @@ const hyperdriveModule = {
 	}
 };
 
+//#endregion
+//#region src/features/vectorize/vectorize.naming.ts
+function vectorizeDeriveName(config, env, naming) {
+	return resolveVectorizeCloudflareName(config, env, naming);
+}
+
 //#endregion
 //#region src/features/vectorize/vectorize.apply.ts
 const STATE_KEY_PREFIX$4 = "vectorize:";
@@ -2221,7 +2368,7 @@ function stateKey$4(derivedName) {
 }
 async function vectorizeApply(resources, _tenant, env, api, state, naming) {
 	for (const config of resources) {
-		const derivedName = naming.vectorizeName(config.logicalName, env);
+		const derivedName = vectorizeDeriveName(config, env, naming);
 		const key = stateKey$4(derivedName);
 		const existing = state.get(key);
 		if (existing) {
@@ -2257,7 +2404,7 @@ async function vectorizeApply(resources, _tenant, env, api, state, naming) {
 //#region src/features/vectorize/vectorize.sync.ts
 function vectorizeSync(allIndexes, resources, _tenant, env, state, naming) {
 	for (const config of resources) {
-		const derivedName = naming.vectorizeName(config.logicalName, env);
+		const derivedName = vectorizeDeriveName(config, env, naming);
 		const match = allIndexes.find((i) => i.name === derivedName);
 		if (!match) continue;
 		const key = `vectorize:${derivedName}`;
@@ -2289,7 +2436,7 @@ function vectorizeDrift(allIndexes, resources, env, state, naming) {
 	const cfByName = new Map(allIndexes.map((i) => [i.name, i.id ?? i.name]));
 	const stateEntries = Object.values(state.getAll()).filter((e) => e.type === "vectorize");
 	for (const config of resources) {
-		const derivedName = naming.vectorizeName(config.logicalName, env);
+		const derivedName = vectorizeDeriveName(config, env, naming);
 		const cfId = cfByName.get(derivedName);
 		const stateEntry = stateEntries.find((e) => e.logicalName === config.logicalName);
 		if (stateEntry && !cfId) drift.missingFromCloudflare.push({
@@ -2337,7 +2484,7 @@ async function vectorizeDestroy(_env, state, api, config, baseDir, _force) {
 function vectorizeGenerate(resources, env, state, naming) {
 	const out = [];
 	for (const config of resources) {
-		const derivedName = naming.vectorizeName(config.logicalName, env);
+		const derivedName = vectorizeDeriveName(config, env, naming);
 		const entry = state.get(`vectorize:${derivedName}`);
 		if (!entry || entry.type !== "vectorize") throw new Error(`Vectorize index "${config.logicalName}" not in state. Run 'tamer apply --env ${env}' first.`);
 		out.push({
@@ -2353,7 +2500,7 @@ function vectorizeGenerate(resources, env, state, naming) {
 function vectorizeStatus(resources, env, state, naming) {
 	const out = [];
 	for (const config of resources) {
-		const derivedName = naming.vectorizeName(config.logicalName, env);
+		const derivedName = vectorizeDeriveName(config, env, naming);
 		const entry = state.get(`vectorize:${derivedName}`);
 		out.push({
 			binding: config.binding?.trim() || naming.vectorizeBindingKey(config.logicalName),
@@ -2370,7 +2517,7 @@ function vectorizeDiffPlanItems(args) {
 	const { resources, env, state, naming } = args;
 	const items = [];
 	for (const config of resources) {
-		const derivedName = naming.vectorizeName(config.logicalName, env);
+		const derivedName = vectorizeDeriveName(config, env, naming);
 		const key = `vectorize:${derivedName}`;
 		const entry = state.get(key);
 		if (!entry || entry.type !== "vectorize") continue;
@@ -2456,12 +2603,14 @@ const vectorizeModule = {
 			console.warn(`Rollback: failed to delete Vectorize ${entry.derivedName}:`, err);
 		}
 	},
-	async importOne({ options, env, api, state, naming, ts }) {
+	async importOne({ options, env, api, state, naming, config, baseDir, ts }) {
 		const indexName = options.cfId;
 		if (!indexName) throw new Error("import vectorize: --cf-id <index-name> is required");
+		const resourceConfig = await findWorkerResourceByLogicalName(config, "vectorize", options.logical, baseDir);
+		if (!resourceConfig) throw new Error(`import vectorize: no resources.vectorize entry with logicalName "${options.logical}" in the Tamer project config`);
 		const hit = (await api.vectorizeListAll()).find((v) => v.name === indexName);
 		if (!hit) throw new Error(`import vectorize: index "${indexName}" not found in account`);
-		const derivedName = naming.vectorizeName(options.logical, env);
+		const derivedName = vectorizeDeriveName(resourceConfig, env, naming);
 		if (hit.name !== derivedName) throw new Error(`import vectorize: cf name "${hit.name}" does not match derived "${derivedName}"`);
 		if (!hit.config) throw new Error(`import vectorize: cf index "${hit.name}" returned no config (dimensions/metric)`);
 		const metric = hit.config.metric;
@@ -2511,13 +2660,19 @@ function resolveAIGatewayConfig(config) {
 	};
 }
 
+//#endregion
+//#region src/features/ai-gateway/ai-gateway.naming.ts
+function aiGatewayDeriveName(config, env, naming) {
+	return resolveAIGatewayCloudflareName(config, env, naming);
+}
+
 //#endregion
 //#region src/features/ai-gateway/ai-gateway.diff.ts
 function aiGatewayDiffPlanItems(args) {
 	const { resources, env, state, naming } = args;
 	const items = [];
 	for (const config of resources) {
-		const derivedName = naming.aiGatewayId(config.logicalName, env);
+		const derivedName = aiGatewayDeriveName(config, env, naming);
 		const entry = state.get(`ai_gateway:${derivedName}`);
 		if (!entry || entry.type !== "ai_gateway") continue;
 		const changes = computeChanges(entry, config);
@@ -2601,7 +2756,7 @@ function stateKey$3(derivedName) {
 }
 async function aiGatewayApply(resources, _tenant, env, api, state, naming) {
 	for (const config of resources) {
-		const derivedName = naming.aiGatewayId(config.logicalName, env);
+		const derivedName = aiGatewayDeriveName(config, env, naming);
 		const key = stateKey$3(derivedName);
 		const existing = state.get(key);
 		const resolved = resolveAIGatewayConfig(config);
@@ -2677,7 +2832,7 @@ async function aiGatewayApply(resources, _tenant, env, api, state, naming) {
 //#region src/features/ai-gateway/ai-gateway.sync.ts
 function aiGatewaySync(allGateways, resources, _tenant, env, state, naming) {
 	for (const config of resources) {
-		const derivedName = naming.aiGatewayId(config.logicalName, env);
+		const derivedName = aiGatewayDeriveName(config, env, naming);
 		const match = allGateways.find((g) => g.id === derivedName);
 		if (!match) continue;
 		const key = `ai_gateway:${derivedName}`;
@@ -2715,7 +2870,7 @@ function aiGatewayDrift(allGateways, resources, env, state, naming) {
 	const cfIds = new Set(allGateways.map((g) => g.id));
 	const stateEntries = Object.values(state.getAll()).filter((e) => e.type === "ai_gateway");
 	for (const config of resources) {
-		const derivedName = naming.aiGatewayId(config.logicalName, env);
+		const derivedName = aiGatewayDeriveName(config, env, naming);
 		const inCloudflare = cfIds.has(derivedName);
 		const stateEntry = stateEntries.find((e) => e.logicalName === config.logicalName);
 		if (stateEntry && !inCloudflare) drift.missingFromCloudflare.push({
@@ -2758,7 +2913,7 @@ async function aiGatewayDestroy(_env, state, api, config, baseDir, _force) {
 function aiGatewayStatus(resources, env, state, naming) {
 	const out = [];
 	for (const config of resources) {
-		const derivedName = naming.aiGatewayId(config.logicalName, env);
+		const derivedName = aiGatewayDeriveName(config, env, naming);
 		const entry = state.get(`ai_gateway:${derivedName}`);
 		out.push({
 			binding: naming.aiGatewayBindingKey(config.logicalName),
@@ -2817,12 +2972,14 @@ const aiGatewayModule = {
 			console.warn(`Rollback: failed to delete AI Gateway ${entry.derivedName}:`, err);
 		}
 	},
-	async importOne({ options, env, api, state, naming, ts }) {
+	async importOne({ options, env, api, state, naming, config, baseDir, ts }) {
 		const gatewayId = options.cfId;
 		if (!gatewayId) throw new Error("import ai_gateway: --cf-id <gateway-id> is required");
+		const resourceConfig = await findWorkerResourceByLogicalName(config, "aiGateway", options.logical, baseDir);
+		if (!resourceConfig) throw new Error(`import ai_gateway: no resources.aiGateway entry with logicalName "${options.logical}" in the Tamer project config`);
 		const hit = (await api.aiGatewayListAll()).find((g) => g.id === gatewayId);
 		if (!hit) throw new Error(`import ai_gateway: gateway "${gatewayId}" not found in account`);
-		const derivedName = naming.aiGatewayId(options.logical, env);
+		const derivedName = aiGatewayDeriveName(resourceConfig, env, naming);
 		if (hit.id !== derivedName) throw new Error(`import ai_gateway: cf id "${hit.id}" does not match derived "${derivedName}"`);
 		const key = `ai_gateway:${derivedName}`;
 		const existing = state.get(key);
@@ -2847,6 +3004,12 @@ const aiGatewayModule = {
 	}
 };
 
+//#endregion
+//#region src/features/pipelines/pipelines.naming.ts
+function pipelineDeriveName(config, env, naming) {
+	return resolvePipelineCloudflareName(config, env, naming);
+}
+
 //#endregion
 //#region src/features/pipelines/pipelines.apply.ts
 const STATE_KEY_PREFIX$2 = "pipeline:";
@@ -2861,7 +3024,7 @@ function stateKey$2(derivedName) {
 */
 async function pipelinesApply(resources, _tenant, env, api, state, naming) {
 	for (const config of resources) {
-		const derivedName = naming.pipelineName(config.logicalName, env);
+		const derivedName = pipelineDeriveName(config, env, naming);
 		const key = stateKey$2(derivedName);
 		if (state.get(key)) continue;
 		const ts = (/* @__PURE__ */ new Date()).toISOString();
@@ -2887,7 +3050,7 @@ async function pipelinesApply(resources, _tenant, env, api, state, naming) {
 //#region src/features/pipelines/pipelines.sync.ts
 function pipelinesSync(allPipelines, resources, _tenant, env, state, naming) {
 	for (const config of resources) {
-		const derivedName = naming.pipelineName(config.logicalName, env);
+		const derivedName = pipelineDeriveName(config, env, naming);
 		const match = allPipelines.find((p) => p.name === derivedName);
 		if (!match) continue;
 		const key = `pipeline:${derivedName}`;
@@ -2919,7 +3082,7 @@ function pipelinesDrift(allPipelines, resources, env, state, naming) {
 	const cfByName = new Map(allPipelines.map((p) => [p.name, p]));
 	const stateEntries = Object.values(state.getAll()).filter((e) => e.type === "pipeline");
 	for (const config of resources) {
-		const derivedName = naming.pipelineName(config.logicalName, env);
+		const derivedName = pipelineDeriveName(config, env, naming);
 		const inCloudflare = cfByName.has(derivedName);
 		const stateEntry = stateEntries.find((e) => e.logicalName === config.logicalName);
 		if (stateEntry && !inCloudflare) drift.missingFromCloudflare.push({
@@ -2972,7 +3135,7 @@ async function pipelinesDestroy(_env, state, api, config, baseDir, _force) {
 function pipelinesGenerate(resources, env, state, naming) {
 	const out = [];
 	for (const config of resources) {
-		const derivedName = naming.pipelineName(config.logicalName, env);
+		const derivedName = pipelineDeriveName(config, env, naming);
 		const entry = state.get(`pipeline:${derivedName}`);
 		if (!entry || entry.type !== "pipeline") throw new Error(`Pipeline "${config.logicalName}" not in state. Run 'tamer apply --env ${env}' first.`);
 		out.push({
@@ -2988,7 +3151,7 @@ function pipelinesGenerate(resources, env, state, naming) {
 function pipelinesStatus(resources, env, state, naming) {
 	const out = [];
 	for (const config of resources) {
-		const derivedName = naming.pipelineName(config.logicalName, env);
+		const derivedName = pipelineDeriveName(config, env, naming);
 		const entry = state.get(`pipeline:${derivedName}`);
 		out.push({
 			binding: config.binding?.trim() || naming.pipelineBindingKey(config.logicalName),
@@ -3005,7 +3168,7 @@ function pipelinesDiffPlanItems(args) {
 	const { resources, env, state, naming } = args;
 	const items = [];
 	for (const config of resources) {
-		const derivedName = naming.pipelineName(config.logicalName, env);
+		const derivedName = pipelineDeriveName(config, env, naming);
 		const key = `pipeline:${derivedName}`;
 		const entry = state.get(key);
 		if (!entry || entry.type !== "pipeline") continue;
@@ -3097,12 +3260,14 @@ const pipelinesModule = {
 			console.warn(`Rollback: failed to delete Pipeline ${entry.derivedName}:`, err);
 		}
 	},
-	async importOne({ options, env, api, state, naming, ts }) {
+	async importOne({ options, env, api, state, naming, config, baseDir, ts }) {
 		const pipelineId = options.cfId;
 		if (!pipelineId) throw new Error("import pipeline: --cf-id <pipeline-id> is required");
+		const resourceConfig = await findWorkerResourceByLogicalName(config, "pipelines", options.logical, baseDir);
+		if (!resourceConfig) throw new Error(`import pipeline: no resources.pipelines entry with logicalName "${options.logical}" in the Tamer project config`);
 		const hit = (await api.pipelineListAll()).find((p) => p.id === pipelineId);
 		if (!hit) throw new Error(`import pipeline: pipeline "${pipelineId}" not found in account`);
-		const derivedName = naming.pipelineName(options.logical, env);
+		const derivedName = pipelineDeriveName(resourceConfig, env, naming);
 		if (hit.name !== derivedName) throw new Error(`import pipeline: cf name "${hit.name}" does not match derived "${derivedName}"`);
 		const key = `pipeline:${derivedName}`;
 		const existing = state.get(key);
@@ -3121,13 +3286,23 @@ const pipelinesModule = {
 	}
 };
 
+//#endregion
+//#region src/features/workflows/workflows.naming.ts
+function workflowDeriveName(config, env, naming) {
+	return resolveWorkflowCloudflareName(config, env, naming);
+}
+function workflowMatchPattern(config, env, naming) {
+	const expected = resolveWorkflowCloudflareName(config, env, naming);
+	return (name) => name === expected;
+}
+
 //#endregion
 //#region src/features/workflows/workflows.diff.ts
 function workflowsDiffPlanItems(args) {
 	const { resources, env, state, naming, worker } = args;
 	const items = [];
 	for (const config of resources) {
-		const derivedName = naming.workflowName(config.logicalName, env);
+		const derivedName = workflowDeriveName(config, env, naming);
 		const key = `workflow:${derivedName}`;
 		const entry = state.get(key);
 		if (!entry || entry.type !== "workflow") continue;
@@ -3214,7 +3389,7 @@ function limitsEqual(a, b) {
 */
 async function workflowsApply(resources, _tenant, env, api, state, naming, worker) {
 	for (const config of resources) {
-		const derivedName = naming.workflowName(config.logicalName, env);
+		const derivedName = workflowDeriveName(config, env, naming);
 		const scriptName = resolveScriptName(config, worker);
 		const key = stateKey$1(derivedName);
 		const existing = state.get(key);
@@ -3267,8 +3442,8 @@ async function workflowsApply(resources, _tenant, env, api, state, naming, worke
 */
 function workflowsSync(allWorkflows, resources, _tenant, env, state, naming) {
 	for (const config of resources) {
-		const derivedName = naming.workflowName(config.logicalName, env);
-		const pattern = naming.workflowMatchPattern(config.logicalName, env);
+		const derivedName = workflowDeriveName(config, env, naming);
+		const pattern = workflowMatchPattern(config, env, naming);
 		const match = allWorkflows.find((w) => pattern(w.name));
 		if (!match) continue;
 		const key = `workflow:${derivedName}`;
@@ -3302,7 +3477,7 @@ function workflowsDrift(allWorkflows, resources, env, state, naming) {
 	const cfByName = new Map(allWorkflows.map((w) => [w.name, w]));
 	const stateEntries = Object.values(state.getAll()).filter((e) => e.type === "workflow");
 	for (const config of resources) {
-		const derivedName = naming.workflowName(config.logicalName, env);
+		const derivedName = workflowDeriveName(config, env, naming);
 		const inCloudflare = cfByName.has(derivedName);
 		const stateEntry = stateEntries.find((e) => e.logicalName === config.logicalName);
 		if (stateEntry && !inCloudflare) drift.missingFromCloudflare.push({
@@ -3356,7 +3531,7 @@ async function workflowsDestroy(_env, state, api, config, baseDir, _force) {
 function workflowsGenerate(resources, env, state, naming, worker) {
 	const out = [];
 	for (const config of resources) {
-		const derivedName = naming.workflowName(config.logicalName, env);
+		const derivedName = workflowDeriveName(config, env, naming);
 		const entry = state.get(`workflow:${derivedName}`);
 		if (!entry || entry.type !== "workflow") throw new Error(`Workflow "${config.logicalName}" not in state. Run 'tamer apply --env ${env}' first.`);
 		const explicitScript = config.scriptName?.trim();
@@ -3378,7 +3553,7 @@ function workflowsGenerate(resources, env, state, naming, worker) {
 function workflowsStatus(resources, env, state, naming) {
 	const out = [];
 	for (const config of resources) {
-		const derivedName = naming.workflowName(config.logicalName, env);
+		const derivedName = workflowDeriveName(config, env, naming);
 		const entry = state.get(`workflow:${derivedName}`);
 		out.push({
 			binding: config.binding?.trim() || naming.workflowBindingKey(config.logicalName),
@@ -3446,10 +3621,11 @@ const workflowsModule = {
 			console.warn(`Rollback: failed to delete Workflow ${entry.derivedName}:`, err);
 		}
 	},
-	async importOne({ options, env, api, state, naming, ts }) {
-		const all = await api.workflowListAll();
-		const derivedName = naming.workflowName(options.logical, env);
-		const hit = all.find((w) => w.name === derivedName);
+	async importOne({ options, env, api, state, naming, config, baseDir, ts }) {
+		const resourceConfig = await findWorkerResourceByLogicalName(config, "workflows", options.logical, baseDir);
+		if (!resourceConfig) throw new Error(`import workflow: no resources.workflows entry with logicalName "${options.logical}" in the Tamer project config`);
+		const derivedName = workflowDeriveName(resourceConfig, env, naming);
+		const hit = (await api.workflowListAll()).find((w) => w.name === derivedName);
 		if (!hit) throw new Error(`import workflow: no workflow named "${derivedName}" found in account`);
 		if (options.cfId && hit.id !== options.cfId) throw new Error(`import workflow: cf id "${hit.id}" does not match --cf-id "${options.cfId}"`);
 		const key = `workflow:${derivedName}`;
@@ -3470,6 +3646,12 @@ const workflowsModule = {
 	}
 };
 
+//#endregion
+//#region src/features/secrets-store/secrets-store.naming.ts
+function secretsStoreDeriveName(config, env, naming) {
+	return resolveSecretsStoreCloudflareName(config, env, naming);
+}
+
 //#endregion
 //#region src/features/secrets-store/secrets-store.apply.ts
 const STATE_KEY_PREFIX = "secrets_store:";
@@ -3488,7 +3670,7 @@ async function secretsStoreApply(resources, _tenant, env, api, state, naming) {
 	if (resources.length === 0) return;
 	let allStores = null;
 	for (const config of resources) {
-		const derivedName = naming.secretsStoreName(config.logicalName, env);
+		const derivedName = secretsStoreDeriveName(config, env, naming);
 		const key = stateKey(derivedName);
 		const existing = state.get(key);
 		const wantsBindingKey = naming.secretsStoreBindingKey(config.logicalName);
@@ -3522,7 +3704,7 @@ async function secretsStoreApply(resources, _tenant, env, api, state, naming) {
 */
 function secretsStoreSync(allStores, resources, _tenant, env, state, naming) {
 	for (const config of resources) {
-		const derivedName = naming.secretsStoreName(config.logicalName, env);
+		const derivedName = secretsStoreDeriveName(config, env, naming);
 		const match = allStores.find((s) => s.name === derivedName);
 		if (!match) continue;
 		const key = `secrets_store:${derivedName}`;
@@ -3553,7 +3735,7 @@ function secretsStoreDrift(allStores, resources, env, state, naming) {
 	const cfByName = new Map(allStores.map((s) => [s.name, s]));
 	const stateEntries = Object.values(state.getAll()).filter((e) => e.type === "secrets_store");
 	for (const config of resources) {
-		const derivedName = naming.secretsStoreName(config.logicalName, env);
+		const derivedName = secretsStoreDeriveName(config, env, naming);
 		const inCloudflare = cfByName.has(derivedName);
 		const stateEntry = stateEntries.find((e) => e.logicalName === config.logicalName);
 		if (stateEntry && !inCloudflare) drift.missingFromCloudflare.push({
@@ -3598,7 +3780,7 @@ async function secretsStoreDestroy(_env, state, api, config, baseDir, _force) {
 function secretsStoreStatus(resources, env, state, naming) {
 	const out = [];
 	for (const config of resources) {
-		const derivedName = naming.secretsStoreName(config.logicalName, env);
+		const derivedName = secretsStoreDeriveName(config, env, naming);
 		const entry = state.get(`secrets_store:${derivedName}`);
 		out.push({
 			binding: naming.secretsStoreBindingKey(config.logicalName),
@@ -3653,9 +3835,11 @@ const secretsStoreModule = {
 			console.warn(`Rollback: failed to delete Secrets Store ${entry.derivedName}:`, err);
 		}
 	},
-	async importOne({ options, env, api, state, naming, ts }) {
+	async importOne({ options, env, api, state, naming, config, baseDir, ts }) {
+		const resourceConfig = await findWorkerResourceByLogicalName(config, "secretsStores", options.logical, baseDir);
+		if (!resourceConfig) throw new Error(`import secret_store: no resources.secretsStores entry with logicalName "${options.logical}" in the Tamer project config`);
 		const all = await api.secretsStoreListAll();
-		const derivedName = naming.secretsStoreName(options.logical, env);
+		const derivedName = secretsStoreDeriveName(resourceConfig, env, naming);
 		const hit = all.find((s) => s.name === derivedName);
 		if (!hit) throw new Error(`import secret_store: no store named "${derivedName}" found in account`);
 		if (options.cfId && hit.id !== options.cfId) throw new Error(`import secret_store: cf id "${hit.id}" does not match --cf-id "${options.cfId}"`);
@@ -3822,5 +4006,5 @@ async function fetchStackImports(api, config, env) {
 }
 
 //#endregion
-export { namingFromConfig as _, resourceModules as a, d1SkipsProvisionAndMigrate as c, mergedWorkerConfigForEnv as d, resolveDeployedWorkerName as f, wranglerConfigCliArgs as g, resolveReferencesInString as h, getResourceModule as i, buildIntraStackScriptNameMap as l, rewriteIntraStackServiceTargets as m, importedStackNames as n, logicalNamesForResourceKind as o, resolveWorkerConfig as p, scanConfigForImports as r, d1CloudflareDatabaseName as s, fetchStackImports as t, mergeWorkerConfigForResourcePick as u };
-//# sourceMappingURL=fetchStackImports-C-1THPYL.mjs.map
+export { wranglerConfigCliArgs as _, resourceModules as a, d1CloudflareDatabaseName as c, mergeWorkerConfigForResourcePick as d, mergedWorkerConfigForEnv as f, resolveReferencesInString as g, rewriteIntraStackServiceTargets as h, getResourceModule as i, d1SkipsProvisionAndMigrate as l, resolveWorkerConfig as m, importedStackNames as n, secretsStoreDeriveName as o, resolveDeployedWorkerName as p, scanConfigForImports as r, logicalNamesForResourceKind as s, fetchStackImports as t, buildIntraStackScriptNameMap as u, namingFromConfig as v };
+//# sourceMappingURL=fetchStackImports-ClUYZy_U.mjs.map