@tailor-platform/sdk 1.47.1 → 1.48.0

package/dist/{runtime-XjP6JMmP.mjs → runtime-CNg0w27y.mjs}

@@ -1,12 +1,12 @@
 
-import { r as db } from "./tailordb-DjlNUV6u.mjs";
-import { $ as FilterSchema, A as FunctionExecution_Status, B as AuthOAuth2Client_GrantType, C as TailorDBType_Permission_Operator, D as IdPLang, E as PipelineResolver_OperationType, F as AuthConnection_Type, H as AuthSCIMAttribute_Type, I as AuthHookPoint, J as GetApplicationSchemaHealthResponse_ApplicationSchemaHealthStatus, K as TenantProviderConfig_TenantProviderType, L as AuthIDPConfig_AuthType, M as ExecutorJobStatus, N as ExecutorTargetType, O as IdPPermissionOperator, P as ExecutorTriggerType, Q as Condition_Operator, R as AuthInvokerSchema, S as TailorDBGQLPermission_Permit, T as TailorDBType_PermitAction, U as AuthSCIMAttribute_Uniqueness, V as AuthSCIMAttribute_Mutability, W as AuthSCIMConfig_AuthorizationType, X as Subgraph_ServiceType, Y as ApplicationSchemaUpdateAttemptStatus, Z as ConditionSchema, _ as WorkspacePlatformUserRole, a as fetchMachineUserToken, b as TailorDBGQLPermission_Action, d as initOperatorClient, et as PageDirection, g as OperatorService, h as userAgent, i as fetchAll, k as IdPPermissionPermit, m as resolveStaticWebsiteUrls, o as fetchPaged, p as platformBaseUrl, q as UserProfileProviderConfig_UserProfileProviderType, v as WorkflowExecution_Status, w as TailorDBType_Permission_Permit, x as TailorDBGQLPermission_Operator, y as WorkflowJobExecution_Status, z as AuthOAuth2Client_ClientType } from "./client-DbyKSN1F.mjs";
+import { t as db } from "./schema-C5QjYEc-.mjs";
+import { $ as FilterSchema, A as FunctionExecution_Status, B as AuthOAuth2Client_GrantType, C as TailorDBType_Permission_Operator, D as IdPLang, E as PipelineResolver_OperationType, F as AuthConnection_Type, H as AuthSCIMAttribute_Type, I as AuthHookPoint, J as GetApplicationSchemaHealthResponse_ApplicationSchemaHealthStatus, K as TenantProviderConfig_TenantProviderType, L as AuthIDPConfig_AuthType, M as ExecutorJobStatus, N as ExecutorTargetType, O as IdPPermissionOperator, P as ExecutorTriggerType, Q as Condition_Operator, R as AuthInvokerSchema, S as TailorDBGQLPermission_Permit, T as TailorDBType_PermitAction, U as AuthSCIMAttribute_Uniqueness, V as AuthSCIMAttribute_Mutability, W as AuthSCIMConfig_AuthorizationType, X as Subgraph_ServiceType, Y as ApplicationSchemaUpdateAttemptStatus, Z as ConditionSchema, _ as WorkspacePlatformUserRole, a as fetchMachineUserToken, b as TailorDBGQLPermission_Action, d as initOperatorClient, et as PageDirection, g as OperatorService, h as userAgent, i as fetchAll, k as IdPPermissionPermit, m as resolveStaticWebsiteUrls, o as fetchPaged, p as platformBaseUrl, q as UserProfileProviderConfig_UserProfileProviderType, v as WorkflowExecution_Status, w as TailorDBType_Permission_Permit, x as TailorDBGQLPermission_Operator, y as WorkflowJobExecution_Status, z as AuthOAuth2Client_ClientType } from "./client-_kHh0Pip.mjs";
 import { a as parseBoolean, i as symbols, n as logger, r as styles, t as CIPromptError } from "./logger-DTNAMYGy.mjs";
-import { C as loadWorkspaceId, D as writePlatformConfig, S as loadAccessToken, _ as getDistDir, d as buildResolverOperationHookExpr, f as OAuth2ClientSchema, g as createBundleCache, h as loadFilesWithIgnores, m as stringifyFunction, n as generatePluginFilesIfNeeded, p as TailorDBTypeSchema, r as loadApplication, s as createExecutorService, t as defineApplication, u as buildExecutorArgsExpr, v as hashFile, w as readPlatformConfig, y as loadConfig } from "./application-C7H7y0hS.mjs";
+import { C as loadConfigPath, O as writePlatformConfig, S as loadAccessToken, T as readPlatformConfig, _ as getDistDir, d as buildResolverOperationHookExpr, f as OAuth2ClientSchema, g as createBundleCache, h as loadFilesWithIgnores, m as stringifyFunction, n as generatePluginFilesIfNeeded, p as TailorDBTypeSchema, r as loadApplication, s as createExecutorService, t as defineApplication, u as buildExecutorArgsExpr, v as hashFile, w as loadWorkspaceId, y as loadConfig } from "./application-DUENhx4Y.mjs";
 import { t as multiline } from "./multiline-e3IpANmS.mjs";
 import { t as readPackageJson } from "./package-json-6Px8bDpG.mjs";
-import { n as isCLIError, t as createCLIError } from "./errors-wNQxQQBH.mjs";
-import { r as withSpan } from "./telemetry-DcL8Fsm_.mjs";
+import { n as isCLIError, t as createCLIError } from "./errors-pMPXghkO.mjs";
+import { r as withSpan } from "./telemetry-C1Y56L5E.mjs";
 import { arg, createDefineCommand, defineCommand, runCommand } from "politty";
 import { z } from "zod";
 import * as fs$1 from "node:fs";
@@ -23,7 +23,7 @@ import { xdgConfig } from "xdg-basedir";
 import { Code, ConnectError } from "@connectrpc/connect";
 import { resolveTSConfig } from "pkg-types";
 import { ScalarType, create, fromJson, toJson } from "@bufbuild/protobuf";
-import * as crypto from "node:crypto";
+import * as crypto$1 from "node:crypto";
 import { createHash } from "node:crypto";
 import { ExitPromptError } from "@inquirer/core";
 import { confirm, input, password } from "@inquirer/prompts";
@@ -31,6 +31,7 @@ import { isCI } from "std-env";
 import * as rolldown from "rolldown";
 import * as fs from "node:fs/promises";
 import { glob } from "node:fs/promises";
+import { parseSync } from "oxc-parser";
 import * as inflection from "inflection";
 import { setTimeout as setTimeout$1 } from "timers/promises";
 import { spawn } from "node:child_process";
@@ -1443,6 +1444,11 @@ function trnPrefix(workspaceId) {
 }
 const sdkNameLabelKey = "sdk-name";
 const sdkVersionLabelKey = "sdk-version";
+const sdkAppIdLabelKey = "sdk-app-id";
+const appIdLabelPrefix = "app-";
+function toAppIdLabelValue(appId) {
+	return `${appIdLabelPrefix}${appId}`;
+}
 /**
 * Check whether existing metadata was produced by the current SDK version.
 * @param existingLabels - Labels currently stored on the remote resource
@@ -1453,13 +1459,33 @@ function hasMatchingSdkVersion(existingLabels, desiredLabels) {
 	return existingLabels?.[sdkVersionLabelKey] === desiredLabels?.[sdkVersionLabelKey];
 }
 /**
+* Determine whether a remote resource is owned by the given application.
+* When the resource carries an `sdk-app-id`, ownership is decided strictly
+* by id match — a resource explicitly tagged with another app's id is
+* NOT ours even if the legacy sdk-name happens to match. Resources without
+* `sdk-app-id` (legacy) fall back to sdk-name comparison.
+* @param labels - Labels currently stored on the remote resource
+* @param appName - Application name from the local config
+* @param appId - Stable application id from the local config (when present)
+* @returns True when the resource is owned by the application
+*/
+function isOwnedByApp(labels, appName, appId) {
+	if (!labels) return false;
+	const labelAppId = labels[sdkAppIdLabelKey];
+	if (labelAppId) return appId !== void 0 && labelAppId === toAppIdLabelValue(appId);
+	return labels[sdkNameLabelKey] === appName;
+}
+/**
 * Build metadata request with SDK labels.
-* @param trn - Target TRN
-* @param appName - Application name label
-* @param existingLabels - Existing labels to preserve (optional)
+* @param params - Parameters for building the metadata request
+* @param params.trn - Target TRN
+* @param params.appName - Application name label
+* @param params.appId - Stable application id label (when managed by SDK)
+* @param params.existingLabels - Existing labels to preserve (optional)
 * @returns Metadata request
 */
-async function buildMetaRequest(trn, appName, existingLabels) {
+async function buildMetaRequest(params) {
+	const { trn, appName, appId, existingLabels } = params;
 	const packageJson = await readPackageJson();
 	const sdkVersion = packageJson.version ? `v${packageJson.version.replace(/\./g, "-")}` : "unknown";
 	return {
@@ -1467,7 +1493,8 @@ async function buildMetaRequest(trn, appName, existingLabels) {
 		labels: {
 			...existingLabels ?? {},
 			[sdkNameLabelKey]: appName,
-			[sdkVersionLabelKey]: sdkVersion
+			[sdkVersionLabelKey]: sdkVersion,
+			...appId ? { [sdkAppIdLabelKey]: toAppIdLabelValue(appId) } : {}
 		}
 	};
 }
@@ -1568,11 +1595,20 @@ async function planApplication(context) {
 		}
 	});
 	if (forRemoval) {
-		if (existingApplications.some((app) => app.name === application.name)) changeSet.deletes.push({
-			name: application.name,
+		const ownedAppNames = /* @__PURE__ */ new Set();
+		if (existingApplications.some((app) => app.name === application.name)) ownedAppNames.add(application.name);
+		if (application.id) {
+			const others = existingApplications.filter((app) => !ownedAppNames.has(app.name));
+			const owned = await Promise.all(others.map(async (app) => {
+				return isOwnedByApp(await fetchAppLabels(client, workspaceId, app.name), application.name, application.id) ? app.name : null;
+			}));
+			for (const name of owned) if (name) ownedAppNames.add(name);
+		}
+		for (const name of ownedAppNames) changeSet.deletes.push({
+			name,
 			request: {
 				workspaceId,
-				applicationName: application.name
+				applicationName: name
 			}
 		});
 		return changeSet;
@@ -1602,7 +1638,11 @@ async function planApplication(context) {
 		});
 		if (idpConfigs.length > 0) authIdpConfigName = idpConfigs[0].name;
 	}
-	const metaRequest = await buildMetaRequest(trn$6(workspaceId, application.name), application.name);
+	const metaRequest = await buildMetaRequest({
+		trn: trn$6(workspaceId, application.name),
+		appName: application.name,
+		appId: application.id
+	});
 	const expectedLocalWebsites = new Set(application.staticWebsiteServices.map((website) => website.name));
 	const resolvedCors = await resolveStaticWebsiteUrls(client, workspaceId, application.config.cors, "CORS", { expectedLocalNames: expectedLocalWebsites });
 	const desired = normalizeComparableApplication(application, authNamespace, authIdpConfigName, resolvedCors);
@@ -1617,9 +1657,22 @@ async function planApplication(context) {
 		disableIntrospection: application.config.disableIntrospection
 	};
 	const existing = existingApplications.find((app) => app.name === application.name);
+	if (application.id) {
+		const otherApps = existingApplications.filter((app) => app.name !== application.name);
+		const renamedAway = await Promise.all(otherApps.map(async (app) => {
+			return isOwnedByApp(await fetchAppLabels(client, workspaceId, app.name), application.name, application.id) ? app.name : null;
+		}));
+		for (const name of renamedAway) if (name) changeSet.deletes.push({
+			name,
+			request: {
+				workspaceId,
+				applicationName: name
+			}
+		});
+	}
 	if (existing) {
-		const { metadata } = await client.getMetadata({ trn: trn$6(workspaceId, application.name) });
-		if (metadata?.labels?.["sdk-name"] === application.name && hasMatchingSdkVersion(metadata?.labels, metaRequest.labels) && areApplicationsEqual(existing, desired)) changeSet.unchanged.push({ name: application.name });
+		const labels = await fetchAppLabels(client, workspaceId, application.name);
+		if (isOwnedByApp(labels, application.name, application.id) && hasMatchingSdkVersion(labels, metaRequest.labels) && areApplicationsEqual(existing, desired)) changeSet.unchanged.push({ name: application.name });
 		else changeSet.updates.push({
 			name: application.name,
 			request,
@@ -1632,6 +1685,15 @@ async function planApplication(context) {
 	});
 	return changeSet;
 }
+async function fetchAppLabels(client, workspaceId, appName) {
+	try {
+		const { metadata } = await client.getMetadata({ trn: trn$6(workspaceId, appName) });
+		return metadata?.labels;
+	} catch (error) {
+		if (error instanceof ConnectError && error.code === Code.NotFound) return;
+		throw error;
+	}
+}
 function protoSubgraph(subgraph) {
 	let serviceType;
 	switch (subgraph.Type) {
@@ -1757,10 +1819,11 @@ function hasNonSecretFieldChanged(existing, desired) {
 * @param client - Operator client instance
 * @param workspaceId - Workspace ID
 * @param appName - Application name for ownership
+* @param appId - Stable application id (when managed by SDK)
 * @param auths - Auth services with connection configs
 * @returns Planned changes for auth connections
 */
-async function planAuthConnections(client, workspaceId, appName, auths) {
+async function planAuthConnections(client, workspaceId, appName, appId, auths) {
 	const changeSet = createChangeSet("Auth connections");
 	const conflicts = [];
 	const unmanaged = [];
@@ -1787,7 +1850,8 @@ async function planAuthConnections(client, workspaceId, appName, auths) {
 			const { metadata } = await client.getMetadata({ trn: connectionTrn(workspaceId, resource.name) });
 			existingConnections[resource.name] = {
 				resource,
-				label: metadata?.labels[sdkNameLabelKey]
+				label: metadata?.labels[sdkNameLabelKey],
+				allLabels: metadata?.labels
 			};
 		} catch (error) {
 			if (error instanceof ConnectError && error.code === Code.InvalidArgument) {
@@ -1802,17 +1866,23 @@ async function planAuthConnections(client, workspaceId, appName, auths) {
 	const state = loadSecretsState();
 	for (const [name, config] of Object.entries(desiredConnections)) {
 		const existing = existingConnections[name];
-		const metaRequest = metadataSupported ? await buildMetaRequest(connectionTrn(workspaceId, name), appName) : void 0;
+		const metaRequest = metadataSupported ? await buildMetaRequest({
+			trn: connectionTrn(workspaceId, name),
+			appName,
+			appId
+		}) : void 0;
 		if (existing) {
-			if (metadataSupported && !existing.label) unmanaged.push({
-				resourceType: "Auth connection",
-				resourceName: name
-			});
-			else if (existing.label && existing.label !== appName) conflicts.push({
-				resourceType: "Auth connection",
-				resourceName: name,
-				currentOwner: existing.label
-			});
+			if (!isOwnedByApp(existing.allLabels, appName, appId)) {
+				if (metadataSupported && !existing.label) unmanaged.push({
+					resourceType: "Auth connection",
+					resourceName: name
+				});
+				else if (existing.label) conflicts.push({
+					resourceType: "Auth connection",
+					resourceName: name,
+					currentOwner: existing.label
+				});
+			}
 			const currentHash = hashConnectionConfig(config);
 			const storedHash = state.connections?.[name];
 			if (hasNonSecretFieldChanged(existing.resource, config) || currentHash !== storedHash) changeSet.replaces.push({
@@ -1834,11 +1904,12 @@ async function planAuthConnections(client, workspaceId, appName, auths) {
 	}
 	for (const [name, entry] of Object.entries(existingConnections)) {
 		if (!entry) continue;
-		if (entry.label && entry.label !== appName) {
+		const owned = isOwnedByApp(entry.allLabels, appName, appId);
+		if (entry.label && !owned) {
 			resourceOwners.add(entry.label);
 			continue;
 		}
-		if (entry.label === appName || !metadataSupported) changeSet.deletes.push({
+		if (owned || !metadataSupported) changeSet.deletes.push({
 			name,
 			request: {
 				workspaceId,
@@ -1934,7 +2005,7 @@ const CHUNK_SIZE = 64 * 1024;
 * @returns Hex-encoded SHA-256 hash
 */
 function computeContentHash(content) {
-	return crypto.createHash("sha256").update(content, "utf-8").digest("hex");
+	return crypto$1.createHash("sha256").update(content, "utf-8").digest("hex");
 }
 function functionRegistryTrn$1(workspaceId, name) {
 	return `trn:v1:workspace:${workspaceId}:function_registry:${name}`;
@@ -2103,10 +2174,11 @@ function filterBundledWorkflowJobs(jobs, usedJobNames) {
 * @param client - Operator client instance
 * @param workspaceId - Workspace ID
 * @param appName - Application name
+* @param appId - Stable application id (when managed by SDK)
 * @param entries - Desired function entries
 * @returns Planned changes
 */
-async function planFunctionRegistry(client, workspaceId, appName, entries) {
+async function planFunctionRegistry(client, workspaceId, appName, appId, entries) {
 	const changeSet = createChangeSet("Function registry");
 	const conflicts = [];
 	const unmanaged = [];
@@ -2138,19 +2210,23 @@ async function planFunctionRegistry(client, workspaceId, appName, entries) {
 	}));
 	for (const entry of entries) {
 		const existing = existingMap[entry.name];
-		const metaRequest = await buildMetaRequest(functionRegistryTrn$1(workspaceId, entry.name), appName);
+		const metaRequest = await buildMetaRequest({
+			trn: functionRegistryTrn$1(workspaceId, entry.name),
+			appName,
+			appId
+		});
 		if (existing) {
-			const isManagedByApp = existing.label === appName;
-			if (!existing.label) unmanaged.push({
+			const owned = isOwnedByApp(existing.allLabels, appName, appId);
+			if (!owned) if (!existing.label) unmanaged.push({
 				resourceType: "Function registry",
 				resourceName: entry.name
 			});
-			else if (existing.label !== appName) conflicts.push({
+			else conflicts.push({
 				resourceType: "Function registry",
 				resourceName: entry.name,
 				currentOwner: existing.label
 			});
-			if (existing.resource.contentHash === entry.contentHash && isManagedByApp && hasMatchingSdkVersion(existing.allLabels, metaRequest.labels)) changeSet.unchanged.push({ name: entry.name });
+			if (existing.resource.contentHash === entry.contentHash && owned && hasMatchingSdkVersion(existing.allLabels, metaRequest.labels)) changeSet.unchanged.push({ name: entry.name });
 			else changeSet.updates.push({
 				name: entry.name,
 				entry,
@@ -2166,8 +2242,9 @@ async function planFunctionRegistry(client, workspaceId, appName, entries) {
 	for (const [name, existing] of Object.entries(existingMap)) {
 		if (!existing) continue;
 		const label = existing.label;
-		if (label && label !== appName) resourceOwners.add(label);
-		if (label === appName) changeSet.deletes.push({
+		const owned = isOwnedByApp(existing.allLabels, appName, appId);
+		if (label && !owned) resourceOwners.add(label);
+		if (owned) changeSet.deletes.push({
 			name,
 			workspaceId
 		});
@@ -2659,7 +2736,7 @@ async function applyIdP(client, result, phase = "create-update") {
 async function planIdP(context) {
 	const { client, workspaceId, application, forRemoval, forceApplyAll = false, idpUserTriggerTargets } = context;
 	const idps = forRemoval ? [] : application.idpServices;
-	const { changeSet: serviceChangeSet, conflicts, unmanaged, resourceOwners } = await planServices$3(client, workspaceId, application.name, idps, idpUserTriggerTargets ?? /* @__PURE__ */ new Set());
+	const { changeSet: serviceChangeSet, conflicts, unmanaged, resourceOwners } = await planServices$3(client, workspaceId, application.name, application.id, idps, idpUserTriggerTargets ?? /* @__PURE__ */ new Set());
 	return {
 		changeSet: {
 			service: serviceChangeSet,
@@ -2746,7 +2823,7 @@ function areIdPServicesEqual(existing, desired) {
 		permission: normalizeComparablePermission(existing.permission)
 	}), desired);
 }
-async function planServices$3(client, workspaceId, appName, idps, idpUserTriggerTargets) {
+async function planServices$3(client, workspaceId, appName, appId, idps, idpUserTriggerTargets) {
 	const changeSet = createChangeSet("IdP services");
 	const conflicts = [];
 	const unmanaged = [];
@@ -2777,7 +2854,11 @@ async function planServices$3(client, workspaceId, appName, idps, idpUserTrigger
 	for (const idp of idps) {
 		const namespaceName = idp.name;
 		const existing = existingServices[namespaceName];
-		const metaRequest = await buildMetaRequest(trn$5(workspaceId, namespaceName), appName);
+		const metaRequest = await buildMetaRequest({
+			trn: trn$5(workspaceId, namespaceName),
+			appName,
+			appId
+		});
 		let authorization;
 		switch (idp.authorization) {
 			case "insecure":
@@ -2823,17 +2904,17 @@ async function planServices$3(client, workspaceId, appName, idps, idpUserTrigger
 			permission: protoPermission
 		};
 		if (existing) {
-			const isManagedByApp = existing.label === appName;
-			if (!existing.label) unmanaged.push({
+			const owned = isOwnedByApp(existing.allLabels, appName, appId);
+			if (!owned) if (!existing.label) unmanaged.push({
 				resourceType: "IdP service",
 				resourceName: idp.name
 			});
-			else if (existing.label !== appName) conflicts.push({
+			else conflicts.push({
 				resourceType: "IdP service",
 				resourceName: idp.name,
 				currentOwner: existing.label
 			});
-			if (isManagedByApp && hasMatchingSdkVersion(existing.allLabels, metaRequest.labels) && areIdPServicesEqual(existing.resource, desired)) changeSet.unchanged.push({ name: namespaceName });
+			if (owned && hasMatchingSdkVersion(existing.allLabels, metaRequest.labels) && areIdPServicesEqual(existing.resource, desired)) changeSet.unchanged.push({ name: namespaceName });
 			else changeSet.updates.push({
 				name: namespaceName,
 				request,
@@ -2847,9 +2928,11 @@ async function planServices$3(client, workspaceId, appName, idps, idpUserTrigger
 		});
 	}
 	Object.entries(existingServices).forEach(([namespaceName]) => {
-		const label = existingServices[namespaceName]?.label;
-		if (label && label !== appName) resourceOwners.add(label);
-		if (label === appName) changeSet.deletes.push({
+		const entry = existingServices[namespaceName];
+		const label = entry?.label;
+		const owned = isOwnedByApp(entry?.allLabels, appName, appId);
+		if (label && !owned) resourceOwners.add(label);
+		if (owned) changeSet.deletes.push({
 			name: namespaceName,
 			request: {
 				workspaceId,
@@ -3097,7 +3180,7 @@ async function planAuth(context) {
 		await application.authService.resolveNamespaces();
 		auths.push(application.authService);
 	}
-	const { changeSet: serviceChangeSet, conflicts, unmanaged, resourceOwners } = await planServices$2(client, workspaceId, application.name, auths, forceApplyAll);
+	const { changeSet: serviceChangeSet, conflicts, unmanaged, resourceOwners } = await planServices$2(client, workspaceId, application.name, application.id, auths, forceApplyAll);
 	const deletedServices = serviceChangeSet.deletes.map((del) => del.name);
 	const expectedLocalWebsites = new Set(application.staticWebsiteServices.map((website) => website.name));
 	const [idpConfigChangeSet, userProfileConfigChangeSet, tenantConfigChangeSet, machineUserChangeSet, authHookChangeSet, oauth2ClientChangeSet, scimChangeSet, scimResourceChangeSet, connectionResult] = await Promise.all([
@@ -3109,7 +3192,7 @@ async function planAuth(context) {
 		planOAuth2Clients(client, workspaceId, auths, deletedServices, expectedLocalWebsites, forceApplyAll),
 		planSCIMConfigs(client, workspaceId, auths, deletedServices),
 		planSCIMResources(client, workspaceId, auths, deletedServices),
-		planAuthConnections(client, workspaceId, application.name, auths)
+		planAuthConnections(client, workspaceId, application.name, application.id, auths)
 	]);
 	return {
 		changeSet: {
@@ -3132,7 +3215,7 @@ async function planAuth(context) {
 function trn$4(workspaceId, name) {
 	return `trn:v1:workspace:${workspaceId}:auth:${name}`;
 }
-async function planServices$2(client, workspaceId, appName, auths, forceApplyAll = false) {
+async function planServices$2(client, workspaceId, appName, appId, auths, forceApplyAll = false) {
 	const changeSet = createChangeSet("Auth services");
 	const conflicts = [];
 	const unmanaged = [];
@@ -3156,30 +3239,35 @@ async function planServices$2(client, workspaceId, appName, auths, forceApplyAll
 		const { metadata } = await client.getMetadata({ trn: trn$4(workspaceId, resource.namespace.name) });
 		existingServices[resource.namespace.name] = {
 			resource,
-			label: metadata?.labels[sdkNameLabelKey]
+			label: metadata?.labels[sdkNameLabelKey],
+			allLabels: metadata?.labels
 		};
 	}));
 	for (const auth of auths) {
 		const { parsedConfig: config } = auth;
 		const existing = existingServices[config.name];
-		const metaRequest = await buildMetaRequest(trn$4(workspaceId, config.name), appName);
+		const metaRequest = await buildMetaRequest({
+			trn: trn$4(workspaceId, config.name),
+			appName,
+			appId
+		});
 		const request = {
 			workspaceId,
 			namespaceName: config.name,
 			publishSessionEvents: config.publishSessionEvents
 		};
 		if (existing) {
-			const isManagedByApp = existing.label === appName;
-			if (!existing.label) unmanaged.push({
+			const owned = isOwnedByApp(existing.allLabels, appName, appId);
+			if (!owned) if (!existing.label) unmanaged.push({
 				resourceType: "Auth service",
 				resourceName: config.name
 			});
-			else if (existing.label !== appName) conflicts.push({
+			else conflicts.push({
 				resourceType: "Auth service",
 				resourceName: config.name,
 				currentOwner: existing.label
 			});
-			if (!forceApplyAll && existing.resource.publishSessionEvents === (config.publishSessionEvents ?? false) && isManagedByApp) changeSet.unchanged.push({ name: config.name });
+			if (!forceApplyAll && existing.resource.publishSessionEvents === (config.publishSessionEvents ?? false) && owned) changeSet.unchanged.push({ name: config.name });
 			else changeSet.updates.push({
 				name: config.name,
 				request,
@@ -3193,9 +3281,11 @@ async function planServices$2(client, workspaceId, appName, auths, forceApplyAll
 		});
 	}
 	Object.entries(existingServices).forEach(([namespaceName]) => {
-		const label = existingServices[namespaceName]?.label;
-		if (label && label !== appName) resourceOwners.add(label);
-		if (label === appName) changeSet.deletes.push({
+		const entry = existingServices[namespaceName];
+		const label = entry?.label;
+		const owned = isOwnedByApp(entry?.allLabels, appName, appId);
+		if (label && !owned) resourceOwners.add(label);
+		if (owned) changeSet.deletes.push({
 			name: namespaceName,
 			request: {
 				workspaceId,
@@ -4159,10 +4249,99 @@ async function planAuthHooks(client, workspaceId, auths, deletedServices, forceA
 	return changeSet;
 }
 
+//#endregion
+//#region src/cli/commands/deploy/config-id-injector.ts
+const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+function findDefineConfigCalls(node, results) {
+	if (!node || typeof node !== "object") return;
+	const n = node;
+	if (n.type === "CallExpression") {
+		const ce = n;
+		if (ce.callee.type === "Identifier" && ce.callee.name === "defineConfig") {
+			const arg = ce.arguments[0];
+			const configObj = arg && arg.type === "ObjectExpression" ? arg : null;
+			results.push({
+				callExpr: ce,
+				configObj
+			});
+		}
+	}
+	for (const key of Object.keys(n)) {
+		const child = n[key];
+		if (Array.isArray(child)) for (const c of child) findDefineConfigCalls(c, results);
+		else if (child && typeof child === "object") findDefineConfigCalls(child, results);
+	}
+}
+function findIdProperty(obj) {
+	for (const prop of obj.properties) {
+		if (prop.type !== "Property") continue;
+		if ((prop.key.type === "Identifier" ? prop.key.name : prop.key.type === "Literal" ? prop.key.value : null) === "id") return prop;
+	}
+	return null;
+}
+/**
+* Ensure `tailor.config.ts` has an `id` property on the `defineConfig({...})`
+* argument. Generates a UUID when missing and writes it back to the file.
+* Returns null when the file does not contain a `defineConfig()` call (e.g.
+* a wrapper that re-exports another config).
+* @param configPath - Absolute path to the config file
+* @returns Resolved id and whether it was newly injected, or null if skipped
+*/
+async function ensureConfigId(configPath) {
+	const source = await fs$1.promises.readFile(configPath, "utf-8");
+	const { program } = parseSync(configPath, source);
+	const calls = [];
+	findDefineConfigCalls(program, calls);
+	if (calls.length === 0) return null;
+	if (calls.length > 1) throw new Error(`Multiple defineConfig() calls found in ${configPath}. Only one is supported.`);
+	const { configObj } = calls[0];
+	if (!configObj) throw new Error(`defineConfig() argument must be an inline object literal in ${configPath} so the SDK can manage the 'id' field.`);
+	const idProp = findIdProperty(configObj);
+	if (idProp) {
+		const value = idProp.value;
+		if (value.type !== "Literal") throw new Error(`'id' field in ${configPath} must be a string literal. To use this config for a separate app, delete it.`);
+		const literalValue = value.value;
+		if (typeof literalValue !== "string" || literalValue === "") throw new Error(`'id' field in ${configPath} must be a non-empty string literal. To use this config for a separate app, delete it.`);
+		if (!uuidRegex.test(literalValue)) throw new Error(`'id' field in ${configPath} must be a UUID. To use this config for a separate app, delete it.`);
+		return {
+			id: literalValue,
+			injected: false
+		};
+	}
+	const id = crypto.randomUUID();
+	const newSource = insertIdProperty(source, configObj, id);
+	await fs$1.promises.writeFile(configPath, newSource, "utf-8");
+	logger.info(`Generated app id and wrote to ${configPath}: ${id}`);
+	return {
+		id,
+		injected: true
+	};
+}
+const idComment = "// SDK-managed app id — do not edit, except when copying this config to a separate app.";
+function insertIdProperty(source, configObj, id) {
+	const idLiteral = `id: ${JSON.stringify(id)}`;
+	if (configObj.properties.length > 0) {
+		const firstProp = configObj.properties[0];
+		const lineStart = source.lastIndexOf("\n", firstProp.start - 1) + 1;
+		const indent = source.slice(lineStart, firstProp.start);
+		const insertion = `${idComment}\n${indent}${idLiteral},\n${indent}`;
+		return source.slice(0, firstProp.start) + insertion + source.slice(firstProp.start);
+	}
+	const openBracePos = configObj.start + 1;
+	const braceLineStart = source.lastIndexOf("\n", configObj.start) + 1;
+	const baseIndent = source.slice(braceLineStart).match(/^[\t ]*/)?.[0] ?? "";
+	const innerIndent = `${baseIndent}  `;
+	const insertion = `\n${innerIndent}${idComment}\n${innerIndent}${idLiteral},\n${baseIndent}`;
+	return source.slice(0, openBracePos) + insertion + source.slice(openBracePos);
+}
+
 //#endregion
 //#region src/cli/commands/deploy/confirm.ts
 /**
 * Confirm reassignment of resources when owner conflicts are detected.
+* Splits into two scenarios: id regeneration (same sdk-name, different
+* sdk-app-id) and name mismatch (different sdk-name). Each gets its own
+* prompt because the user-facing meaning is different.
 * @param conflicts - Detected owner conflicts
 * @param appName - Target application name
 * @param yes - Whether to auto-confirm without prompting
@@ -4170,6 +4349,30 @@ async function planAuthHooks(client, workspaceId, auths, deletedServices, forceA
 */
 async function confirmOwnerConflict(conflicts, appName, yes) {
 	if (conflicts.length === 0) return;
+	const idRegenerated = conflicts.filter((c) => c.currentOwner === appName);
+	const nameMismatches = conflicts.filter((c) => c.currentOwner !== appName);
+	if (idRegenerated.length > 0) await confirmIdRegeneration(idRegenerated, appName, yes);
+	if (nameMismatches.length > 0) await confirmNameMismatch(nameMismatches, appName, yes);
+}
+async function confirmIdRegeneration(conflicts, appName, yes) {
+	logger.warn(`Application id was regenerated for "${appName}":`);
+	logger.log("  These resources still carry the previous id.");
+	logger.newline();
+	logger.log(`  ${styles.info("Resources")}:`);
+	for (const c of conflicts) logger.log(`    • ${styles.bold(c.resourceType)} ${styles.info(`"${c.resourceName}"`)}`);
+	if (yes) {
+		logger.success("Re-tagging resources with the new id (--yes flag specified)...", { mode: "plain" });
+		return;
+	}
+	if (!await prompt.confirm({
+		message: `Re-tag these resources with the new id for "${appName}"?\n${styles.dim("(The id in tailor.config.ts was removed since the previous deploy, so a new one was generated)")}`,
+		default: false
+	})) throw new Error(multiline`
+      Apply cancelled. Resources remain tagged with the previous id.
+      To override, run again and confirm, or use --yes flag.
+    `);
+}
+async function confirmNameMismatch(conflicts, appName, yes) {
 	const currentOwners = [...new Set(conflicts.map((c) => c.currentOwner))];
 	logger.warn("Application name mismatch detected:");
 	logger.log(`  ${styles.warning("Current application(s)")}: ${currentOwners.map((o) => styles.bold(`"${o}"`)).join(", ")}`);
@@ -4329,19 +4532,24 @@ async function planExecutor(context) {
 	const executors = forRemoval ? {} : await application.executorService?.loadExecutors() ?? {};
 	for (const executor of Object.values(executors)) {
 		const existing = existingExecutors[executor.name];
-		const metaRequest = await buildMetaRequest(trn$3(workspaceId, executor.name), application.name);
+		const metaRequest = await buildMetaRequest({
+			trn: trn$3(workspaceId, executor.name),
+			appName: application.name,
+			appId: application.id
+		});
 		const desiredExecutor = protoExecutor(application, executor);
 		if (existing) {
-			if (!existing.label) unmanaged.push({
+			const owned = isOwnedByApp(existing.allLabels, application.name, application.id);
+			if (!owned) if (!existing.label) unmanaged.push({
 				resourceType: "Executor",
 				resourceName: executor.name
 			});
-			else if (existing.label !== application.name) conflicts.push({
+			else conflicts.push({
 				resourceType: "Executor",
 				resourceName: executor.name,
 				currentOwner: existing.label
 			});
-			if (existing.label === application.name && hasMatchingSdkVersion(existing.allLabels, metaRequest.labels) && areExecutorsEqual(existing.resource, desiredExecutor)) changeSet.unchanged.push({ name: executor.name });
+			if (owned && hasMatchingSdkVersion(existing.allLabels, metaRequest.labels) && areExecutorsEqual(existing.resource, desiredExecutor)) changeSet.unchanged.push({ name: executor.name });
 			else changeSet.updates.push({
 				name: executor.name,
 				request: {
@@ -4361,9 +4569,11 @@ async function planExecutor(context) {
 		});
 	}
 	Object.entries(existingExecutors).forEach(([name]) => {
-		const label = existingExecutors[name]?.label;
-		if (label && label !== application.name) resourceOwners.add(label);
-		if (label === application.name) changeSet.deletes.push({
+		const entry = existingExecutors[name];
+		const label = entry?.label;
+		const owned = isOwnedByApp(entry?.allLabels, application.name, application.id);
+		if (label && !owned) resourceOwners.add(label);
+		if (owned) changeSet.deletes.push({
 			name,
 			request: {
 				workspaceId,
@@ -4722,7 +4932,7 @@ async function planPipeline(context) {
 		pipelines.push(pipeline);
 	}
 	const executors = forRemoval ? [] : Object.values(await application.executorService?.loadExecutors() ?? {});
-	const { changeSet: serviceChangeSet, conflicts, unmanaged, resourceOwners } = await planServices$1(client, workspaceId, application.name, pipelines);
+	const { changeSet: serviceChangeSet, conflicts, unmanaged, resourceOwners } = await planServices$1(client, workspaceId, application.name, application.id, pipelines);
 	const { changeSet: resolverChangeSet } = await planResolvers(client, workspaceId, pipelines, executors, serviceChangeSet.deletes.map((del) => del.name), application.env, application.authService?.config.name, forceApplyAll);
 	return {
 		changeSet: {
@@ -4737,7 +4947,7 @@ async function planPipeline(context) {
 function trn$2(workspaceId, name) {
 	return `trn:v1:workspace:${workspaceId}:pipeline:${name}`;
 }
-async function planServices$1(client, workspaceId, appName, pipelines) {
+async function planServices$1(client, workspaceId, appName, appId, pipelines) {
 	const changeSet = createChangeSet("Pipeline services");
 	const conflicts = [];
 	const unmanaged = [];
@@ -4767,18 +4977,23 @@ async function planServices$1(client, workspaceId, appName, pipelines) {
 	}));
 	for (const pipeline of pipelines) {
 		const existing = existingServices[pipeline.namespace];
-		const metaRequest = await buildMetaRequest(trn$2(workspaceId, pipeline.namespace), appName);
+		const metaRequest = await buildMetaRequest({
+			trn: trn$2(workspaceId, pipeline.namespace),
+			appName,
+			appId
+		});
 		if (existing) {
-			if (!existing.label) unmanaged.push({
+			const owned = isOwnedByApp(existing.allLabels, appName, appId);
+			if (!owned) if (!existing.label) unmanaged.push({
 				resourceType: "Pipeline service",
 				resourceName: pipeline.namespace
 			});
-			else if (existing.label !== appName) conflicts.push({
+			else conflicts.push({
 				resourceType: "Pipeline service",
 				resourceName: pipeline.namespace,
 				currentOwner: existing.label
 			});
-			if (existing.label === appName && hasMatchingSdkVersion(existing.allLabels, metaRequest.labels)) changeSet.unchanged.push({ name: pipeline.namespace });
+			if (owned && hasMatchingSdkVersion(existing.allLabels, metaRequest.labels)) changeSet.unchanged.push({ name: pipeline.namespace });
 			else changeSet.updates.push({
 				name: pipeline.namespace,
 				request: {
@@ -4798,9 +5013,11 @@ async function planServices$1(client, workspaceId, appName, pipelines) {
 		});
 	}
 	Object.entries(existingServices).forEach(([namespaceName]) => {
-		const label = existingServices[namespaceName]?.label;
-		if (label && label !== appName) resourceOwners.add(label);
-		if (label === appName) changeSet.deletes.push({
+		const entry = existingServices[namespaceName];
+		const label = entry?.label;
+		const owned = isOwnedByApp(entry?.allLabels, appName, appId);
+		if (label && !owned) resourceOwners.add(label);
+		if (owned) changeSet.deletes.push({
 			name: namespaceName,
 			request: {
 				workspaceId,
@@ -5062,17 +5279,22 @@ async function planSecretManager(context) {
 		const vaultName = vault.vaultName;
 		const existing = existingVaults[vaultName];
 		if (existing) {
-			const metaRequest = await buildMetaRequest(vaultTrn$1(workspaceId, vaultName), application.name);
-			if (!existing.label) unmanaged.push({
+			const metaRequest = await buildMetaRequest({
+				trn: vaultTrn$1(workspaceId, vaultName),
+				appName: application.name,
+				appId: application.id
+			});
+			const owned = isOwnedByApp(existing.allLabels, application.name, application.id);
+			if (!owned) if (!existing.label) unmanaged.push({
 				resourceType: "Secret Manager vault",
 				resourceName: vaultName
 			});
-			else if (existing.label !== application.name) conflicts.push({
+			else conflicts.push({
 				resourceType: "Secret Manager vault",
 				resourceName: vaultName,
 				currentOwner: existing.label
 			});
-			if (existing.label === application.name && hasMatchingSdkVersion(existing.allLabels, metaRequest.labels)) vaultChangeSet.unchanged.push({ name: vaultName });
+			if (owned && hasMatchingSdkVersion(existing.allLabels, metaRequest.labels)) vaultChangeSet.unchanged.push({ name: vaultName });
 			else vaultChangeSet.updates.push({
 				name: vaultName,
 				workspaceId
@@ -5133,8 +5355,9 @@ async function planSecretManager(context) {
 	for (const [name, entry] of Object.entries(existingVaults)) {
 		if (!entry) continue;
 		const label = entry.label;
-		if (label && label !== application.name) resourceOwners.add(label);
-		if (label === application.name) {
+		const owned = isOwnedByApp(entry.allLabels, application.name, application.id);
+		if (label && !owned) resourceOwners.add(label);
+		if (owned) {
 			const secrets = await fetchAll(async (pageToken, maxPageSize) => {
 				try {
 					const { secrets, nextPageToken } = await client.listSecretManagerSecrets({
@@ -5190,12 +5413,20 @@ async function applySecretManager(client, result, phase = "create-update", appli
 				secretmanagerVaultName: create.name
 			});
 			if (application) {
-				const metaRequest = await buildMetaRequest(vaultTrn$1(create.workspaceId, create.name), application.name);
+				const metaRequest = await buildMetaRequest({
+					trn: vaultTrn$1(create.workspaceId, create.name),
+					appName: application.name,
+					appId: application.id
+				});
 				await client.setMetadata(metaRequest);
 			}
 		}));
 		if (application) await Promise.all(vaultChangeSet.updates.map(async (update) => {
-			const metaRequest = await buildMetaRequest(vaultTrn$1(update.workspaceId, update.name), application.name);
+			const metaRequest = await buildMetaRequest({
+				trn: vaultTrn$1(update.workspaceId, update.name),
+				appName: application.name,
+				appId: application.id
+			});
 			await client.setMetadata(metaRequest);
 		}));
 		await Promise.all(secretChangeSet.creates.map((create) => client.createSecretManagerSecret({
@@ -5316,7 +5547,11 @@ async function planStaticWebsite(context) {
 		const config = websiteService;
 		const name = websiteService.name;
 		const existing = existingWebsites[name];
-		const metaRequest = await buildMetaRequest(trn$1(workspaceId, name), application.name);
+		const metaRequest = await buildMetaRequest({
+			trn: trn$1(workspaceId, name),
+			appName: application.name,
+			appId: application.id
+		});
 		const desired = normalizeComparableStaticWebsite(config);
 		const request = {
 			workspaceId,
@@ -5327,17 +5562,17 @@ async function planStaticWebsite(context) {
 			}
 		};
 		if (existing) {
-			const isManagedByApp = existing.label === application.name;
-			if (!existing.label) unmanaged.push({
+			const owned = isOwnedByApp(existing.allLabels, application.name, application.id);
+			if (!owned) if (!existing.label) unmanaged.push({
 				resourceType: "StaticWebsite",
 				resourceName: name
 			});
-			else if (existing.label !== application.name) conflicts.push({
+			else conflicts.push({
 				resourceType: "StaticWebsite",
 				resourceName: name,
 				currentOwner: existing.label
 			});
-			if (isManagedByApp && hasMatchingSdkVersion(existing.allLabels, metaRequest.labels) && areStaticWebsitesEqual(existing.resource, desired)) changeSet.unchanged.push({ name });
+			if (owned && hasMatchingSdkVersion(existing.allLabels, metaRequest.labels) && areStaticWebsitesEqual(existing.resource, desired)) changeSet.unchanged.push({ name });
 			else changeSet.updates.push({
 				name,
 				request,
@@ -5351,9 +5586,11 @@ async function planStaticWebsite(context) {
 		});
 	}
 	Object.entries(existingWebsites).forEach(([name]) => {
-		const label = existingWebsites[name]?.label;
-		if (label && label !== application.name) resourceOwners.add(label);
-		if (label === application.name) changeSet.deletes.push({
+		const entry = existingWebsites[name];
+		const label = entry?.label;
+		const owned = isOwnedByApp(entry?.allLabels, application.name, application.id);
+		if (label && !owned) resourceOwners.add(label);
+		if (owned) changeSet.deletes.push({
 			name,
 			request: {
 				workspaceId,
@@ -7657,7 +7894,7 @@ async function planTailorDB(context) {
 		tailordbs.push(tailordb);
 	}
 	const executors = forRemoval ? [] : Object.values(await application.executorService?.loadExecutors() ?? {});
-	const { changeSet: serviceChangeSet, conflicts, unmanaged, resourceOwners } = await planServices(client, workspaceId, application.name, tailordbs);
+	const { changeSet: serviceChangeSet, conflicts, unmanaged, resourceOwners } = await planServices(client, workspaceId, application.name, application.id, tailordbs);
 	const deletedServices = serviceChangeSet.deletes.map((del) => del.name);
 	const [typeChangeSet, gqlPermissionChangeSet] = await Promise.all([planTypes(client, workspaceId, tailordbs, executors, deletedServices, void 0, forceApplyAll), planGqlPermissions(client, workspaceId, tailordbs, deletedServices, forceApplyAll)]);
 	return {
@@ -7731,7 +7968,7 @@ function areTailorDBServicesEqual(existing, desired) {
 		defaultTimezone: "UTC"
 	}));
 }
-async function planServices(client, workspaceId, appName, tailordbs) {
+async function planServices(client, workspaceId, appName, appId, tailordbs) {
 	const changeSet = createChangeSet("TailorDB services");
 	const conflicts = [];
 	const unmanaged = [];
@@ -7761,18 +7998,24 @@ async function planServices(client, workspaceId, appName, tailordbs) {
 	}));
 	for (const tailordb of tailordbs) {
 		const existing = existingServices[tailordb.namespace];
-		const metaRequest = await buildMetaRequest(trn(workspaceId, tailordb.namespace), appName, existing?.allLabels);
+		const metaRequest = await buildMetaRequest({
+			trn: trn(workspaceId, tailordb.namespace),
+			appName,
+			appId,
+			existingLabels: existing?.allLabels
+		});
 		if (existing) {
-			if (!existing.label) unmanaged.push({
+			const owned = isOwnedByApp(existing.allLabels, appName, appId);
+			if (!owned) if (!existing.label) unmanaged.push({
 				resourceType: "TailorDB service",
 				resourceName: tailordb.namespace
 			});
-			else if (existing.label !== appName) conflicts.push({
+			else conflicts.push({
 				resourceType: "TailorDB service",
 				resourceName: tailordb.namespace,
 				currentOwner: existing.label
 			});
-			if (existing.label === appName && hasMatchingSdkVersion(existing.allLabels, metaRequest.labels) && areTailorDBServicesEqual(existing.resource, tailordb)) changeSet.unchanged.push({ name: tailordb.namespace });
+			if (owned && hasMatchingSdkVersion(existing.allLabels, metaRequest.labels) && areTailorDBServicesEqual(existing.resource, tailordb)) changeSet.unchanged.push({ name: tailordb.namespace });
 			else changeSet.updates.push({
 				name: tailordb.namespace,
 				metaRequest
@@ -7789,9 +8032,11 @@ async function planServices(client, workspaceId, appName, tailordbs) {
 		});
 	}
 	Object.entries(existingServices).forEach(([namespaceName]) => {
-		const label = existingServices[namespaceName]?.label;
-		if (label && label !== appName) resourceOwners.add(label);
-		if (label === appName) changeSet.deletes.push({
+		const entry = existingServices[namespaceName];
+		const label = entry?.label;
+		const owned = isOwnedByApp(entry?.allLabels, appName, appId);
+		if (label && !owned) resourceOwners.add(label);
+		if (owned) changeSet.deletes.push({
 			name: namespaceName,
 			request: {
 				workspaceId,
@@ -8434,9 +8679,9 @@ function formatMigrationCheckResults(results) {
 * @returns Promise that resolves when workflows are applied
 */
 async function applyWorkflow(client, result, phase = "create-update") {
-	const { changeSet, appName } = result;
+	const { changeSet, appName, appId } = result;
 	if (phase === "create-update") {
-		const jobFunctionVersions = await registerJobFunctions(client, changeSet, appName, result.unchangedWorkflowJobNames);
+		const jobFunctionVersions = await registerJobFunctions(client, changeSet, appName, appId, result.unchangedWorkflowJobNames);
 		await Promise.all([...changeSet.creates.map(async (create) => {
 			const filteredVersions = filterJobFunctionVersions(jobFunctionVersions, create.usedJobNames);
 			await client.createWorkflow({
@@ -8484,10 +8729,11 @@ function filterJobFunctionVersions(allVersions, usedJobNames) {
 * @param client - Operator client instance
 * @param changeSet - Workflow change set
 * @param appName - Application name
+* @param appId
 * @param unchangedWorkflowJobNames - Job function names used by unchanged workflows
 * @returns Map of job function names to versions
 */
-async function registerJobFunctions(client, changeSet, appName, unchangedWorkflowJobNames = /* @__PURE__ */ new Set()) {
+async function registerJobFunctions(client, changeSet, appName, appId, unchangedWorkflowJobNames = /* @__PURE__ */ new Set()) {
 	const jobFunctionVersions = {};
 	const firstWorkflow = changeSet.creates[0] || changeSet.updates[0] || changeSet.deletes[0];
 	if (!firstWorkflow) return jobFunctionVersions;
@@ -8515,7 +8761,11 @@ async function registerJobFunctions(client, changeSet, appName, unchangedWorkflo
 				jobFunctionName: jobName,
 				scriptRef: workflowJobFunctionName(jobName)
 			});
-			await client.setMetadata(await buildMetaRequest(jobFunctionTrn(workspaceId, jobName), appName));
+			await client.setMetadata(await buildMetaRequest({
+				trn: jobFunctionTrn(workspaceId, jobName),
+				appName,
+				appId
+			}));
 			return {
 				jobName,
 				version: response.jobFunction?.version
@@ -8526,7 +8776,7 @@ async function registerJobFunctions(client, changeSet, appName, unchangedWorkflo
 	const unusedJobFunctions = existingJobFunctions.filter((jobName) => !allUsedJobNames.has(jobName));
 	await Promise.all(unusedJobFunctions.map(async (jobName) => {
 		const { metadata } = await client.getMetadata({ trn: jobFunctionTrn(workspaceId, jobName) });
-		if (metadata?.labels?.["sdk-name"] === appName) await client.setMetadata({
+		if (isOwnedByApp(metadata?.labels, appName, appId)) await client.setMetadata({
 			trn: jobFunctionTrn(workspaceId, jobName),
 			labels: { [sdkNameLabelKey]: "" }
 		});
@@ -8564,12 +8814,13 @@ function jobFunctionTrn(workspaceId, name) {
 * @param client - Operator client instance
 * @param workspaceId - Workspace ID
 * @param appName - Application name
+* @param appId
 * @param workflows - Parsed workflows
 * @param mainJobDeps - Main job dependencies by workflow
 * @param unchangedJobFunctions - Job functions already proven unchanged by function registry plan
 * @returns Planned workflow changes
 */
-async function planWorkflow(client, workspaceId, appName, workflows, mainJobDeps, unchangedJobFunctions = /* @__PURE__ */ new Set()) {
+async function planWorkflow(client, workspaceId, appName, appId, workflows, mainJobDeps, unchangedJobFunctions = /* @__PURE__ */ new Set()) {
 	const changeSet = createChangeSet("Workflows");
 	const conflicts = [];
 	const unmanaged = [];
@@ -8594,20 +8845,25 @@ async function planWorkflow(client, workspaceId, appName, workflows, mainJobDeps
 	}));
 	for (const workflow of Object.values(workflows)) {
 		const existing = existingWorkflows[workflow.name];
-		const metaRequest = await buildMetaRequest(workflowTrn$1(workspaceId, workflow.name), appName);
+		const metaRequest = await buildMetaRequest({
+			trn: workflowTrn$1(workspaceId, workflow.name),
+			appName,
+			appId
+		});
 		const usedJobNames = mainJobDeps[workflow.mainJob.name];
 		if (!usedJobNames) throw new Error(`Job "${workflow.mainJob.name}" (mainJob of workflow "${workflow.name}") was not found.\n\nPossible causes:\n  - The job is not exported as a named export\n  - The file containing the job is not included in workflow.files glob pattern\n\nSolution:\n  export const ${workflow.mainJob.name} = createWorkflowJob({ name: "${workflow.mainJob.name}", ... })`);
 		if (existing) {
-			if (!existing.label) unmanaged.push({
+			const owned = isOwnedByApp(existing.allLabels, appName, appId);
+			if (!owned) if (!existing.label) unmanaged.push({
 				resourceType: "Workflow",
 				resourceName: workflow.name
 			});
-			else if (existing.label !== appName) conflicts.push({
+			else conflicts.push({
 				resourceType: "Workflow",
 				resourceName: workflow.name,
 				currentOwner: existing.label
 			});
-			if (existing.label === appName && hasMatchingSdkVersion(existing.allLabels, metaRequest.labels) && canTreatWorkflowAsUnchanged(existing.resource, workflow, usedJobNames, unchangedJobFunctions)) {
+			if (owned && hasMatchingSdkVersion(existing.allLabels, metaRequest.labels) && canTreatWorkflowAsUnchanged(existing.resource, workflow, usedJobNames, unchangedJobFunctions)) {
 				changeSet.unchanged.push({ name: workflow.name });
 				for (const jobName of usedJobNames) unchangedWorkflowJobNames.add(jobName);
 			} else changeSet.updates.push({
@@ -8629,8 +8885,9 @@ async function planWorkflow(client, workspaceId, appName, workflows, mainJobDeps
 	Object.values(existingWorkflows).forEach((existing) => {
 		if (!existing) return;
 		const label = existing.label;
-		if (label && label !== appName) resourceOwners.add(label);
-		if (label === appName) changeSet.deletes.push({
+		const owned = isOwnedByApp(existing.allLabels, appName, appId);
+		if (label && !owned) resourceOwners.add(label);
+		if (owned) changeSet.deletes.push({
 			name: existing.resource.name,
 			workspaceId,
 			workflowId: existing.resource.id,
@@ -8643,6 +8900,7 @@ async function planWorkflow(client, workspaceId, appName, workflows, mainJobDeps
 		unmanaged,
 		resourceOwners,
 		appName,
+		appId,
 		unchangedWorkflowJobNames
 	};
 }
@@ -8765,7 +9023,11 @@ function collectIdpUserTriggerTargets(application) {
 	return targets;
 }
 async function shouldForceApplyAll(client, workspaceId, application, functionEntries) {
-	const desiredLabels = (await buildMetaRequest(applicationTrn(workspaceId, application.name), application.name)).labels;
+	const desiredLabels = (await buildMetaRequest({
+		trn: applicationTrn(workspaceId, application.name),
+		appName: application.name,
+		appId: application.id
+	})).labels;
 	const candidateTrns = /* @__PURE__ */ new Set();
 	if (application.subgraphs.length > 0) candidateTrns.add(applicationTrn(workspaceId, application.name));
 	application.staticWebsiteServices.forEach((website) => {
@@ -8902,9 +9164,16 @@ async function deploy(options) {
 	return withSpan("deploy", async (rootSpan) => {
 		rootSpan.setAttribute("deploy.dry_run", options?.dryRun ?? false);
 		const { config, application, workflowBuildResult, bundledScripts, buildOnly } = await withSpan("build", async () => {
-			const { config, plugins } = await withSpan("build.loadConfig", () => loadConfig(options?.configPath));
 			const dryRun = options?.dryRun ?? false;
 			const buildOnly = options?.buildOnly ?? parseBoolean(process.env.TAILOR_PLATFORM_SDK_BUILD_ONLY) === true;
+			const { config, plugins } = await withSpan("build.loadConfig", async () => {
+				const foundPath = loadConfigPath(options?.configPath);
+				if (foundPath && !dryRun && !buildOnly) {
+					const resolvedPath = path.resolve(process.cwd(), foundPath);
+					if (fs$1.existsSync(resolvedPath)) await ensureConfigId(resolvedPath);
+				}
+				return loadConfig(options?.configPath);
+			});
 			const noCache = options?.noCache ?? false;
 			const packageJson = await readPackageJson();
 			const cacheDir = path.resolve(getDistDir(), "cache");
@@ -8982,7 +9251,7 @@ async function deploy(options) {
 				forceApplyAll,
 				idpUserTriggerTargets
 			};
-			const functionRegistry = await withSpan("plan.functionRegistry", () => planFunctionRegistry(client, workspaceId, application.name, functionEntries));
+			const functionRegistry = await withSpan("plan.functionRegistry", () => planFunctionRegistry(client, workspaceId, application.name, application.id, functionEntries));
 			const unchangedWorkflowJobs = new Set(functionRegistry.changeSet.unchanged.filter((entry) => entry.name.startsWith(WORKFLOW_PREFIX)).map((entry) => entry.name.slice(WORKFLOW_PREFIX.length)));
 			const [tailorDB, staticWebsite, idp, auth, pipeline, app, executor, workflow, secretManager] = await Promise.all([
 				withSpan("plan.tailorDB", () => planTailorDB(ctx)),
@@ -8992,7 +9261,7 @@ async function deploy(options) {
 				withSpan("plan.pipeline", () => planPipeline(ctx)),
 				withSpan("plan.application", () => planApplication(ctx)),
 				withSpan("plan.executor", () => planExecutor(ctx)),
-				withSpan("plan.workflow", () => planWorkflow(client, workspaceId, application.name, workflowService?.workflows ?? {}, workflowBuildResult?.mainJobDeps ?? {}, unchangedWorkflowJobs)),
+				withSpan("plan.workflow", () => planWorkflow(client, workspaceId, application.name, application.id, workflowService?.workflows ?? {}, workflowBuildResult?.mainJobDeps ?? {}, unchangedWorkflowJobs)),
 				withSpan("plan.secretManager", () => planSecretManager(ctx))
 			]);
 			return {
@@ -11820,7 +12089,9 @@ function createGenerationManager(params) {
 */
 async function generate$1(options) {
 	return withSpan("generate", async (rootSpan) => {
-		const { config, generators, plugins } = await withSpan("generate.loadConfig", async () => loadConfig(options?.configPath));
+		const { config, generators, plugins } = await withSpan("generate.loadConfig", async () => {
+			return loadConfig(options?.configPath);
+		});
 		const watch = options?.watch ?? false;
 		rootSpan.setAttribute("generate.watch", watch);
 		rootSpan.setAttribute("generate.generators.count", generators.length);
@@ -12648,8 +12919,8 @@ async function execRemove(client, workspaceId, application, config, confirm) {
 	const pipeline = await planPipeline(ctx);
 	const app = await planApplication(ctx);
 	const executor = await planExecutor(ctx);
-	const workflow = await planWorkflow(client, workspaceId, application.name, {}, {});
-	const functionRegistry = await planFunctionRegistry(client, workspaceId, application.name, []);
+	const workflow = await planWorkflow(client, workspaceId, application.name, application.id, {}, {});
+	const functionRegistry = await planFunctionRegistry(client, workspaceId, application.name, application.id, []);
 	const secretManager = await planSecretManager(ctx);
 	functionRegistry.changeSet.print();
 	staticWebsite.changeSet.print();
@@ -13372,7 +13643,7 @@ async function generate(options) {
 	if (options.init) await handleInitOption(namespacesWithMigrations, options.yes);
 	let pluginManager;
 	if (plugins.length > 0) pluginManager = new PluginManager(plugins);
-	const { defineApplication } = await import("./application-Csq5jxYP.mjs");
+	const { defineApplication } = await import("./application-BNkNt47b.mjs");
 	const application = defineApplication({
 		config,
 		pluginManager
@@ -15187,7 +15458,7 @@ async function runRepl(options) {
 	const execute = await prepareQueryExecutor(options);
 	const historyPath = getReplHistoryPath(options.engine, options.profile, options.workspaceId);
 	const validate = createReplValidator(options.engine);
-	const { highlightSqlLine, highlightGraphqlLine, replTransform } = await import("./repl-editor-CZpLlOBj.mjs");
+	const { highlightSqlLine, highlightGraphqlLine, replTransform } = await import("./repl-editor-jZ493eQI.mjs");
 	const highlight = options.engine === "sql" ? highlightSqlLine : highlightGraphqlLine;
 	const prompt = createPrompt({
 		prefix: "",
@@ -15521,4 +15792,4 @@ function isDeno() {
 
 //#endregion
 export { deleteCommand$1 as $, getMigrationDirPath as $t, truncate as A, executionsCommand as At, updateOrganization as B, MIGRATION_LABEL_KEY as Bt, listCommand$2 as C, toPageDirection as Cn, jobsCommand as Ct, resumeWorkflow as D, startWorkflow as Dt, resumeCommand as E, startCommand as Et, showCommand as F, getCommand$6 as Ft, getCommand$1 as G, INITIAL_SCHEMA_NUMBER as Gt, treeCommand as H, bundleMigrationScript as Ht, logBetaWarning as I, getExecutor as It, updateFolder as J, compareLocalTypesWithSnapshot as Jt, getOrganization as K, MIGRATE_FILE_NAME as Kt, remove as L, deploy as Lt, generate as M, listWorkflowExecutions as Mt, generateCommand as N, functionExecutionStatusToString as Nt, listCommand$3 as O, getCommand$5 as Ot, show as P, formatKeyValueTable as Pt, getFolder as Q, getLatestMigrationNumber as Qt, removeCommand$1 as R, executeScript as Rt, listApps as S, paginationArgs as Sn, getExecutorJob as St, healthCommand as T, watchExecutorJob as Tt, listCommand$4 as U, DB_TYPES_FILE_NAME as Ut, organizationTree as V, parseMigrationLabelNumber as Vt, listOrganizations as W, DIFF_FILE_NAME as Wt, listFolders as X, createSnapshotFromLocalTypes as Xt, listCommand$5 as Y, compareSnapshots as Yt, getCommand$2 as Z, formatMigrationNumber as Zt, getWorkspace as _, commonArgs as _n, webhookCommand as _t, updateUser as a, reconstructSnapshotFromMigrations as an, getCommand$3 as at, createCommand as b, isVerbose as bn, listCommand$9 as bt, listCommand as c, hasChanges as cn, tokenCommand as ct, inviteUser as d, trnPrefix as dn, generate$1 as dt, getMigrationFilePath as en, deleteFolder as et, restoreCommand as f, generateUserTypes as fn, listCommand$8 as ft, getCommand as g, defineAppCommand as gn, listWebhookExecutors as gt, listWorkspaces as h, apiCall as hn, getFunctionRegistry as ht, updateCommand as i, loadDiff as in, listOAuth2Clients as it, truncateCommand as j, getWorkflowExecution as jt, listWorkflows as k, getWorkflow as kt, listUsers as l, getNamespacesWithMigrations as ln, listCommand$7 as lt, listCommand$1 as m, apiCommand as mn, getCommand$4 as mt, query as n, getNextMigrationNumber as nn, createFolder as nt, removeCommand as o, formatDiffSummary as on, getOAuth2Client as ot, restoreWorkspace as p, prompt as pn, listFunctionRegistries as pt, updateCommand$2 as q, SCHEMA_FILE_NAME as qt, queryCommand as r, isValidMigrationNumber as rn, listCommand$6 as rt, removeUser as s, formatMigrationDiff as sn, getMachineUserToken as st, isNativeTypeScriptRuntime as t, getMigrationFiles as tn, createCommand$1 as tt, inviteCommand as u, sdkNameLabelKey as un, listMachineUsers as ut, deleteCommand as v, confirmationArgs as vn, triggerCommand as vt, getAppHealth as w, workspaceArgs as wn, listExecutorJobs as wt, createWorkspace as x, pagedLogArgs as xn, listExecutors as xt, deleteWorkspace as y, deploymentArgs as yn, triggerExecutor as yt, updateCommand$1 as z, waitForExecution$1 as zt };
-//# sourceMappingURL=runtime-XjP6JMmP.mjs.map
+//# sourceMappingURL=runtime-CNg0w27y.mjs.map