@tailor-platform/sdk 1.1.3 → 1.2.1

package/dist/{list-BticEhbi.mjs → list-9sLkfPfn.mjs}

@@ -7,7 +7,10 @@ import path from "node:path";
 import { loadEnvFile } from "node:process";
 import { z } from "zod";
 import chalk from "chalk";
+import util, { formatWithOptions } from "node:util";
 import { createConsola } from "consola";
+import { formatDistanceToNowStrict } from "date-fns";
+import { getBorderCharacters, table } from "table";
 import { OAuth2Client } from "@badgateway/oauth2-client";
 import { MethodOptions_IdempotencyLevel, ValueSchema, file_google_protobuf_descriptor, file_google_protobuf_duration, file_google_protobuf_field_mask, file_google_protobuf_struct, file_google_protobuf_timestamp, timestampDate } from "@bufbuild/protobuf/wkt";
 import { Code, ConnectError, createClient } from "@connectrpc/connect";
@@ -24,7 +27,6 @@ import ml from "multiline-ts";
 import { xdgConfig } from "xdg-basedir";
 import { pathToFileURL } from "node:url";
 import { glob } from "node:fs/promises";
-import util from "node:util";
 import assert from "node:assert";
 import * as inflection from "inflection";
 import * as rolldown from "rolldown";
@@ -33,8 +35,6 @@ import { create, fromJson } from "@bufbuild/protobuf";
 import { spawn } from "node:child_process";
 import chokidar from "chokidar";
 import * as madgeModule from "madge";
-import { formatDistanceToNowStrict } from "date-fns";
-import { getBorderCharacters, table } from "table";
 import ora from "ora";
 
 //#region src/cli/utils/errors.ts
@@ -250,19 +250,64 @@ const symbols = {
 	bullet: chalk.gray("•"),
 	arrow: chalk.gray("→")
 };
-const defaultLogger = createConsola({ formatOptions: { date: false } });
-const streamLogger = createConsola({ formatOptions: { date: true } });
-const plainLogger = createConsola({ formatOptions: {
-	date: false,
-	compact: true
-} });
-/**
-* Logger object for CLI output
-*/
+let _jsonMode = false;
+const TYPE_ICONS = {
+	info: "ℹ",
+	success: "✔",
+	warn: "⚠",
+	error: "✖",
+	debug: "⚙",
+	trace: "→",
+	log: ""
+};
+var IconReporter = class {
+	log(logObj, ctx) {
+		const stdout = ctx.options.stdout || process.stdout;
+		const stderr = ctx.options.stderr || process.stderr;
+		const formatOptions = ctx.options.formatOptions;
+		const message = formatWithOptions({
+			breakLength: stdout.columns || 80,
+			compact: formatOptions.compact
+		}, ...logObj.args);
+		const icon = TYPE_ICONS[logObj.type] || "";
+		const prefix = icon ? `${icon} ` : "";
+		const timestamp = formatOptions.date && logObj.date ? `${logObj.date.toLocaleTimeString()} ` : "";
+		stderr.write(`${timestamp}${prefix}${message}\n`);
+	}
+};
+var PlainReporter = class {
+	log(logObj, ctx) {
+		const stderr = ctx.options.stderr || process.stderr;
+		const message = formatWithOptions({
+			breakLength: 100,
+			compact: ctx.options.formatOptions.compact
+		}, ...logObj.args);
+		stderr.write(`${message}\n`);
+	}
+};
+const defaultLogger = createConsola({
+	reporters: [new IconReporter()],
+	formatOptions: { date: false }
+});
+const streamLogger = createConsola({
+	reporters: [new IconReporter()],
+	formatOptions: { date: true }
+});
+const plainLogger = createConsola({
+	reporters: [new PlainReporter()],
+	formatOptions: {
+		date: false,
+		compact: true
+	}
+});
 const logger = {
-	jsonMode: false,
+	get jsonMode() {
+		return _jsonMode;
+	},
+	set jsonMode(value) {
+		_jsonMode = value;
+	},
 	info(message, opts) {
-		if (this.jsonMode) return;
 		switch (opts?.mode ?? "default") {
 			case "stream":
 				streamLogger.info(message);
@@ -274,7 +319,6 @@ const logger = {
 		}
 	},
 	success(message, opts) {
-		if (this.jsonMode) return;
 		switch (opts?.mode ?? "default") {
 			case "stream":
 				streamLogger.success(message);
@@ -286,7 +330,6 @@ const logger = {
 		}
 	},
 	warn(message, opts) {
-		if (this.jsonMode) return;
 		switch (opts?.mode ?? "default") {
 			case "stream":
 				streamLogger.warn(message);
@@ -309,21 +352,45 @@ const logger = {
 		}
 	},
 	log(message) {
-		if (this.jsonMode) return;
 		plainLogger.log(message);
 	},
 	newline() {
-		if (this.jsonMode) return;
 		plainLogger.log("");
 	},
 	debug(message) {
-		if (this.jsonMode) return;
 		plainLogger.log(styles.dim(message));
 	},
-	data(dataValue, formatFn) {
-		if (this.jsonMode) plainLogger.log(JSON.stringify(dataValue, null, 2));
-		else if (formatFn) formatFn(dataValue);
-		else plainLogger.log(String(dataValue));
+	out(data$1) {
+		if (typeof data$1 === "string") {
+			process.stdout.write(data$1.endsWith("\n") ? data$1 : data$1 + "\n");
+			return;
+		}
+		if (this.jsonMode) {
+			console.log(JSON.stringify(data$1));
+			return;
+		}
+		if (!Array.isArray(data$1)) {
+			const t$2 = table(Object.entries(data$1), {
+				singleLine: true,
+				border: getBorderCharacters("norc")
+			});
+			process.stdout.write(t$2);
+			return;
+		}
+		if (data$1.length === 0) return;
+		const headers = Array.from(new Set(data$1.flatMap((item) => Object.keys(item))));
+		const t$1 = table([headers, ...data$1.map((item) => headers.map((header) => {
+			const value = item[header];
+			if (value === null || value === void 0) return "";
+			if ((header === "createdAt" || header === "updatedAt") && typeof value === "string") return formatDistanceToNowStrict(new Date(value), { addSuffix: true });
+			return String(value);
+		}))], {
+			border: getBorderCharacters("norc"),
+			drawHorizontalLine: (lineIndex, rowCount) => {
+				return lineIndex === 0 || lineIndex === 1 || lineIndex === rowCount;
+			}
+		});
+		process.stdout.write(t$1);
 	},
 	prompt(message, options) {
 		if (T) throw new CIPromptError();
@@ -100795,11 +100862,11 @@ function trnPrefix(workspaceId) {
 	return `trn:v1:workspace:${workspaceId}`;
 }
 const sdkNameLabelKey = "sdk-name";
-async function buildMetaRequest(trn$8, appName) {
+async function buildMetaRequest(trn$7, appName) {
 	const packageJson$1 = await readPackageJson();
 	const sdkVersion = packageJson$1.version ? `v${packageJson$1.version.replace(/\./g, "-")}` : "unknown";
 	return {
-		trn: trn$8,
+		trn: trn$7,
 		labels: {
 			[sdkNameLabelKey]: appName,
 			"sdk-version": sdkVersion
@@ -100850,7 +100917,7 @@ async function applyApplication(client, changeSet, phase = "create-update") {
 		await client.deleteApplication(del.request);
 	}));
 }
-function trn$7(workspaceId, name$1) {
+function trn$6(workspaceId, name$1) {
 	return `trn:v1:workspace:${workspaceId}:application:${name$1}`;
 }
 async function planApplication({ client, workspaceId, application, forRemoval }) {
@@ -100901,7 +100968,7 @@ async function planApplication({ client, workspaceId, application, forRemoval })
 		});
 		if (idpConfigs.length > 0) authIdpConfigName = idpConfigs[0].name;
 	}
-	const metaRequest = await buildMetaRequest(trn$7(workspaceId, application.name), application.name);
+	const metaRequest = await buildMetaRequest(trn$6(workspaceId, application.name), application.name);
 	if (existingApplications.some((app) => app.name === application.name)) changeSet.updates.push({
 		name: application.name,
 		request: {
@@ -101037,7 +101104,7 @@ async function planIdP({ client, workspaceId, application, forRemoval }) {
 		resourceOwners
 	};
 }
-function trn$6(workspaceId, name$1) {
+function trn$5(workspaceId, name$1) {
 	return `trn:v1:workspace:${workspaceId}:idp:${name$1}`;
 }
 async function planServices$3(client, workspaceId, appName, idps) {
@@ -101060,7 +101127,7 @@ async function planServices$3(client, workspaceId, appName, idps) {
 	const existingServices = {};
 	await Promise.all(withoutLabel.map(async (resource) => {
 		if (!resource.namespace?.name) return;
-		const { metadata } = await client.getMetadata({ trn: trn$6(workspaceId, resource.namespace.name) });
+		const { metadata } = await client.getMetadata({ trn: trn$5(workspaceId, resource.namespace.name) });
 		existingServices[resource.namespace.name] = {
 			resource,
 			label: metadata?.labels[sdkNameLabelKey]
@@ -101069,7 +101136,7 @@ async function planServices$3(client, workspaceId, appName, idps) {
 	for (const idp of idps) {
 		const namespaceName = idp.name;
 		const existing = existingServices[namespaceName];
-		const metaRequest = await buildMetaRequest(trn$6(workspaceId, namespaceName), appName);
+		const metaRequest = await buildMetaRequest(trn$5(workspaceId, namespaceName), appName);
 		let authorization;
 		switch (idp.authorization) {
 			case "insecure":
@@ -101284,7 +101351,7 @@ async function planAuth({ client, workspaceId, application, forRemoval }) {
 		resourceOwners
 	};
 }
-function trn$5(workspaceId, name$1) {
+function trn$4(workspaceId, name$1) {
 	return `trn:v1:workspace:${workspaceId}:auth:${name$1}`;
 }
 async function planServices$2(client, workspaceId, appName, auths) {
@@ -101307,7 +101374,7 @@ async function planServices$2(client, workspaceId, appName, auths) {
 	const existingServices = {};
 	await Promise.all(withoutLabel.map(async (resource) => {
 		if (!resource.namespace?.name) return;
-		const { metadata } = await client.getMetadata({ trn: trn$5(workspaceId, resource.namespace.name) });
+		const { metadata } = await client.getMetadata({ trn: trn$4(workspaceId, resource.namespace.name) });
 		existingServices[resource.namespace.name] = {
 			resource,
 			label: metadata?.labels[sdkNameLabelKey]
@@ -101316,7 +101383,7 @@ async function planServices$2(client, workspaceId, appName, auths) {
 	for (const auth of auths) {
 		const { parsedConfig: config } = auth;
 		const existing = existingServices[config.name];
-		const metaRequest = await buildMetaRequest(trn$5(workspaceId, config.name), appName);
+		const metaRequest = await buildMetaRequest(trn$4(workspaceId, config.name), appName);
 		if (existing) {
 			if (!existing.label) unmanaged.push({
 				resourceType: "Auth service",
@@ -102126,7 +102193,7 @@ async function applyExecutor(client, result, phase = "create-update") {
 	})]);
 	else if (phase === "delete") await Promise.all(changeSet.deletes.map((del) => client.deleteExecutorExecutor(del.request)));
 }
-function trn$4(workspaceId, name$1) {
+function trn$3(workspaceId, name$1) {
 	return `trn:v1:workspace:${workspaceId}:executor:${name$1}`;
 }
 async function planExecutor({ client, workspaceId, application, forRemoval }) {
@@ -102148,7 +102215,7 @@ async function planExecutor({ client, workspaceId, application, forRemoval }) {
 	});
 	const existingExecutors = {};
 	await Promise.all(withoutLabel.map(async (resource) => {
-		const { metadata } = await client.getMetadata({ trn: trn$4(workspaceId, resource.name) });
+		const { metadata } = await client.getMetadata({ trn: trn$3(workspaceId, resource.name) });
 		existingExecutors[resource.name] = {
 			resource,
 			label: metadata?.labels[sdkNameLabelKey]
@@ -102157,7 +102224,7 @@ async function planExecutor({ client, workspaceId, application, forRemoval }) {
 	const executors = forRemoval ? {} : await application.executorService?.loadExecutors() ?? {};
 	for (const executor of Object.values(executors)) {
 		const existing = existingExecutors[executor.name];
-		const metaRequest = await buildMetaRequest(trn$4(workspaceId, executor.name), application.name);
+		const metaRequest = await buildMetaRequest(trn$3(workspaceId, executor.name), application.name);
 		if (existing) {
 			if (!existing.label) unmanaged.push({
 				resourceType: "Executor",
@@ -102205,10 +102272,20 @@ async function planExecutor({ client, workspaceId, application, forRemoval }) {
 		resourceOwners
 	};
 }
+/**
+* Build args expression for resolverExecuted trigger.
+* Transforms server's succeeded/failed fields to success/result/error fields.
+*/
+function buildResolverExecutedArgsExpr(additionalFields) {
+	const baseFields = `...args, appNamespace: args.namespaceName, success: !!args.succeeded, result: args.succeeded?.result.resolver, error: args.failed?.error`;
+	return additionalFields ? `({ ${baseFields}, ${additionalFields} })` : `({ ${baseFields} })`;
+}
 function protoExecutor(appName, executor, env) {
 	const trigger = executor.trigger;
 	let triggerType;
 	let triggerConfig;
+	const envField = `env: ${JSON.stringify(env)}`;
+	const baseArgsExpr = `({ ...args, appNamespace: args.namespaceName, ${envField} })`;
 	const eventType = {
 		recordCreated: "tailordb.type_record.created",
 		recordUpdated: "tailordb.type_record.updated",
@@ -102234,7 +102311,7 @@ function protoExecutor(appName, executor, env) {
 				case: "event",
 				value: {
 					eventType: eventType[trigger.kind],
-					condition: { expr: [`args.typeName === "${trigger.typeName}"`, ...trigger.condition ? [`(${stringifyFunction(trigger.condition)})({ ...args, appNamespace: args.namespaceName })`] : []].join(" && ") }
+					condition: { expr: [`args.typeName === "${trigger.typeName}"`, ...trigger.condition ? [`(${stringifyFunction(trigger.condition)})(${baseArgsExpr})`] : []].join(" && ") }
 				}
 			} };
 			break;
@@ -102244,7 +102321,7 @@ function protoExecutor(appName, executor, env) {
 				case: "event",
 				value: {
 					eventType: eventType[trigger.kind],
-					condition: { expr: [`args.resolverName === "${trigger.resolverName}"`, ...trigger.condition ? [`(${stringifyFunction(trigger.condition)})({ ...args, appNamespace: args.namespaceName, result: args.succeeded?.result, error: args.failed?.error })`] : []].join(" && ") }
+					condition: { expr: [`args.resolverName === "${trigger.resolverName}"`, ...trigger.condition ? [`(${stringifyFunction(trigger.condition)})(${buildResolverExecutedArgsExpr(envField)})`] : []].join(" && ") }
 				}
 			} };
 			break;
@@ -102260,13 +102337,14 @@ function protoExecutor(appName, executor, env) {
 	const target = executor.operation;
 	let targetType;
 	let targetConfig;
+	const argsExpr = trigger.kind === "resolverExecuted" ? buildResolverExecutedArgsExpr(envField) : baseArgsExpr;
 	switch (target.kind) {
 		case "webhook":
 			targetType = ExecutorTargetType.WEBHOOK;
 			targetConfig = { config: {
 				case: "webhook",
 				value: {
-					url: { expr: `(${stringifyFunction(target.url)})(args)` },
+					url: { expr: `(${stringifyFunction(target.url)})(${argsExpr})` },
 					headers: target.headers ? Object.entries(target.headers).map(([key, v$1]) => {
 						let value;
 						if (typeof v$1 === "string") value = {
@@ -102285,7 +102363,7 @@ function protoExecutor(appName, executor, env) {
 							value
 						};
 					}) : void 0,
-					body: target.requestBody ? { expr: `(${stringifyFunction(target.requestBody)})(args)` } : void 0
+					body: target.requestBody ? { expr: `(${stringifyFunction(target.requestBody)})(${argsExpr})` } : void 0
 				}
 			} };
 			break;
@@ -102296,7 +102374,7 @@ function protoExecutor(appName, executor, env) {
 				value: {
 					appName: target.appName ?? appName,
 					query: target.query,
-					variables: target.variables ? { expr: `(${stringifyFunction(target.variables)})(args)` } : void 0,
+					variables: target.variables ? { expr: `(${stringifyFunction(target.variables)})(${argsExpr})` } : void 0,
 					invoker: target.authInvoker ?? void 0
 				}
 			} };
@@ -102312,7 +102390,7 @@ function protoExecutor(appName, executor, env) {
 				value: {
 					name: `${executor.name}__target`,
 					script,
-					variables: { expr: `({ ...args, appNamespace: args.namespaceName, env: ${JSON.stringify(env)} })` },
+					variables: { expr: argsExpr },
 					invoker: target.authInvoker ?? void 0
 				}
 			} };
@@ -102324,7 +102402,7 @@ function protoExecutor(appName, executor, env) {
 				case: "workflow",
 				value: {
 					workflowName: target.workflowName,
-					variables: target.args ? typeof target.args === "function" ? { expr: `(${stringifyFunction(target.args)})(args)` } : { expr: JSON.stringify(target.args) } : void 0,
+					variables: target.args ? typeof target.args === "function" ? { expr: `(${stringifyFunction(target.args)})(${argsExpr})` } : { expr: JSON.stringify(target.args) } : void 0,
 					invoker: target.authInvoker ?? void 0
 				}
 			} };
@@ -102413,7 +102491,7 @@ async function planPipeline({ client, workspaceId, application, forRemoval }) {
 		resourceOwners
 	};
 }
-function trn$3(workspaceId, name$1) {
+function trn$2(workspaceId, name$1) {
 	return `trn:v1:workspace:${workspaceId}:pipeline:${name$1}`;
 }
 async function planServices$1(client, workspaceId, appName, pipelines) {
@@ -102436,7 +102514,7 @@ async function planServices$1(client, workspaceId, appName, pipelines) {
 	const existingServices = {};
 	await Promise.all(withoutLabel.map(async (resource) => {
 		if (!resource.namespace?.name) return;
-		const { metadata } = await client.getMetadata({ trn: trn$3(workspaceId, resource.namespace.name) });
+		const { metadata } = await client.getMetadata({ trn: trn$2(workspaceId, resource.namespace.name) });
 		existingServices[resource.namespace.name] = {
 			resource,
 			label: metadata?.labels[sdkNameLabelKey]
@@ -102444,7 +102522,7 @@ async function planServices$1(client, workspaceId, appName, pipelines) {
 	}));
 	for (const pipeline of pipelines) {
 		const existing = existingServices[pipeline.namespace];
-		const metaRequest = await buildMetaRequest(trn$3(workspaceId, pipeline.namespace), appName);
+		const metaRequest = await buildMetaRequest(trn$2(workspaceId, pipeline.namespace), appName);
 		if (existing) {
 			if (!existing.label) unmanaged.push({
 				resourceType: "Pipeline service",
@@ -102637,7 +102715,7 @@ async function applyStaticWebsite(client, result, phase = "create-update") {
 	})]);
 	else if (phase === "delete") await Promise.all(changeSet.deletes.map((del) => client.deleteStaticWebsite(del.request)));
 }
-function trn$2(workspaceId, name$1) {
+function trn$1(workspaceId, name$1) {
 	return `trn:v1:workspace:${workspaceId}:staticwebsite:${name$1}`;
 }
 async function planStaticWebsite({ client, workspaceId, application, forRemoval }) {
@@ -102659,7 +102737,7 @@ async function planStaticWebsite({ client, workspaceId, application, forRemoval
 	});
 	const existingWebsites = {};
 	await Promise.all(withoutLabel.map(async (resource) => {
-		const { metadata } = await client.getMetadata({ trn: trn$2(workspaceId, resource.name) });
+		const { metadata } = await client.getMetadata({ trn: trn$1(workspaceId, resource.name) });
 		existingWebsites[resource.name] = {
 			resource,
 			label: metadata?.labels[sdkNameLabelKey]
@@ -102670,7 +102748,7 @@ async function planStaticWebsite({ client, workspaceId, application, forRemoval
 		const config = websiteService;
 		const name$1 = websiteService.name;
 		const existing = existingWebsites[name$1];
-		const metaRequest = await buildMetaRequest(trn$2(workspaceId, name$1), application.name);
+		const metaRequest = await buildMetaRequest(trn$1(workspaceId, name$1), application.name);
 		if (existing) {
 			if (!existing.label) unmanaged.push({
 				resourceType: "StaticWebsite",
@@ -102768,7 +102846,7 @@ async function planTailorDB({ client, workspaceId, application, forRemoval }) {
 		resourceOwners
 	};
 }
-function trn$1(workspaceId, name$1) {
+function trn(workspaceId, name$1) {
 	return `${trnPrefix(workspaceId)}:tailordb:${name$1}`;
 }
 async function planServices(client, workspaceId, appName, tailordbs) {
@@ -102791,7 +102869,7 @@ async function planServices(client, workspaceId, appName, tailordbs) {
 	const existingServices = {};
 	await Promise.all(withoutLabel.map(async (resource) => {
 		if (!resource.namespace?.name) return;
-		const { metadata } = await client.getMetadata({ trn: trn$1(workspaceId, resource.namespace.name) });
+		const { metadata } = await client.getMetadata({ trn: trn(workspaceId, resource.namespace.name) });
 		existingServices[resource.namespace.name] = {
 			resource,
 			label: metadata?.labels[sdkNameLabelKey]
@@ -102799,7 +102877,7 @@ async function planServices(client, workspaceId, appName, tailordbs) {
 	}));
 	for (const tailordb of tailordbs) {
 		const existing = existingServices[tailordb.namespace];
-		const metaRequest = await buildMetaRequest(trn$1(workspaceId, tailordb.namespace), appName);
+		const metaRequest = await buildMetaRequest(trn(workspaceId, tailordb.namespace), appName);
 		if (existing) {
 			if (!existing.label) unmanaged.push({
 				resourceType: "TailorDB service",
@@ -103272,9 +103350,9 @@ function protoGqlOperand(operand) {
 //#endregion
 //#region src/cli/apply/services/workflow.ts
 async function applyWorkflow(client, result, phase = "create-update") {
-	const { changeSet } = result;
+	const { changeSet, appName } = result;
 	if (phase === "create-update") {
-		const jobFunctionVersions = await registerJobFunctions(client, changeSet);
+		const jobFunctionVersions = await registerJobFunctions(client, changeSet, appName);
 		await Promise.all([...changeSet.creates.map(async (create$1) => {
 			const filteredVersions = filterJobFunctionVersions(jobFunctionVersions, create$1.usedJobNames);
 			await client.createWorkflow({
@@ -103311,44 +103389,58 @@ function filterJobFunctionVersions(allVersions, usedJobNames) {
 * Register job functions used by any workflow.
 * Only registers jobs that are actually used (based on usedJobNames in changeSet).
 * Uses create for new jobs and update for existing jobs.
+* Sets metadata on used JobFunctions and removes metadata from unused ones.
 */
-async function registerJobFunctions(client, changeSet) {
+async function registerJobFunctions(client, changeSet, appName) {
 	const jobFunctionVersions = {};
 	const firstWorkflow = changeSet.creates[0] || changeSet.updates[0];
 	if (!firstWorkflow) return jobFunctionVersions;
 	const { workspaceId, scripts } = firstWorkflow;
 	const allUsedJobNames = /* @__PURE__ */ new Set();
 	for (const item of [...changeSet.creates, ...changeSet.updates]) for (const jobName of item.usedJobNames) allUsedJobNames.add(jobName);
-	const existingJobNames = await fetchAll(async (pageToken) => {
+	const existingJobFunctions = await fetchAll(async (pageToken) => {
 		const response = await client.listWorkflowJobFunctions({
 			workspaceId,
 			pageToken
 		});
 		return [response.jobFunctions.map((j) => j.name), response.nextPageToken];
 	});
-	const existingJobNamesSet = new Set(existingJobNames);
+	const existingJobNamesSet = new Set(existingJobFunctions);
 	const results = await Promise.all(Array.from(allUsedJobNames).map(async (jobName) => {
 		const script = scripts.get(jobName);
 		if (!script) throw new Error(`No bundled script found for job "${jobName}". Please run "generate" command before "apply".`);
+		const response = existingJobNamesSet.has(jobName) ? await client.updateWorkflowJobFunction({
+			workspaceId,
+			jobFunctionName: jobName,
+			script
+		}) : await client.createWorkflowJobFunction({
+			workspaceId,
+			jobFunctionName: jobName,
+			script
+		});
+		await client.setMetadata(await buildMetaRequest(jobFunctionTrn(workspaceId, jobName), appName));
 		return {
 			jobName,
-			version: (existingJobNamesSet.has(jobName) ? await client.updateWorkflowJobFunction({
-				workspaceId,
-				jobFunctionName: jobName,
-				script
-			}) : await client.createWorkflowJobFunction({
-				workspaceId,
-				jobFunctionName: jobName,
-				script
-			})).jobFunction?.version
+			version: response.jobFunction?.version
 		};
 	}));
 	for (const { jobName, version: version$4 } of results) if (version$4) jobFunctionVersions[jobName] = version$4;
+	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?.[sdkNameLabelKey] === appName) await client.setMetadata({
+			trn: jobFunctionTrn(workspaceId, jobName),
+			labels: { [sdkNameLabelKey]: "" }
+		});
+	}));
 	return jobFunctionVersions;
 }
-function trn(workspaceId, name$1) {
+function workflowTrn(workspaceId, name$1) {
 	return `trn:v1:workspace:${workspaceId}:workflow:${name$1}`;
 }
+function jobFunctionTrn(workspaceId, name$1) {
+	return `trn:v1:workspace:${workspaceId}:workflow_job_function:${name$1}`;
+}
 async function planWorkflow(client, workspaceId, appName, workflows, mainJobDeps) {
 	const changeSet = new ChangeSet("Workflows");
 	const conflicts = [];
@@ -103366,7 +103458,7 @@ async function planWorkflow(client, workspaceId, appName, workflows, mainJobDeps
 	});
 	const existingWorkflows = {};
 	await Promise.all(withoutLabel.map(async (resource) => {
-		const { metadata } = await client.getMetadata({ trn: trn(workspaceId, resource.name) });
+		const { metadata } = await client.getMetadata({ trn: workflowTrn(workspaceId, resource.name) });
 		existingWorkflows[resource.name] = {
 			resource,
 			label: metadata?.labels[sdkNameLabelKey]
@@ -103375,7 +103467,7 @@ async function planWorkflow(client, workspaceId, appName, workflows, mainJobDeps
 	const allScripts = await loadWorkflowScripts();
 	for (const workflow of Object.values(workflows)) {
 		const existing = existingWorkflows[workflow.name];
-		const metaRequest = await buildMetaRequest(trn(workspaceId, workflow.name), appName);
+		const metaRequest = await buildMetaRequest(workflowTrn(workspaceId, workflow.name), appName);
 		const usedJobNames = mainJobDeps[workflow.mainJob.name];
 		if (!usedJobNames) throw new Error(`No dependency info found for mainJob "${workflow.mainJob.name}". Please run "generate" command before "apply".`);
 		if (existing) {
@@ -103420,7 +103512,8 @@ async function planWorkflow(client, workspaceId, appName, workflows, mainJobDeps
 		changeSet,
 		conflicts,
 		unmanaged,
-		resourceOwners
+		resourceOwners,
+		appName
 	};
 }
 async function loadWorkflowScripts() {
@@ -104073,7 +104166,6 @@ var GenerationManager = class {
 	async generate(watch) {
 		logger.newline();
 		logger.log(`Generation for application: ${styles.highlight(this.application.config.name)}`);
-		logger.newline();
 		const app = this.application;
 		for (const db of app.tailorDBServices) {
 			const namespace = db.namespace;
@@ -104365,42 +104457,6 @@ const generateCommand = defineCommand({
 	})
 });
 
-//#endregion
-//#region src/cli/utils/format.ts
-function humanizeRelativeTime(isoString) {
-	const date = new Date(isoString);
-	if (Number.isNaN(date.getTime())) return isoString;
-	return formatDistanceToNowStrict(date, { addSuffix: true });
-}
-function printData(data$1, json = false) {
-	if (json) {
-		console.log(JSON.stringify(data$1));
-		return;
-	}
-	if (!Array.isArray(data$1)) {
-		const t$2 = table(Object.entries(data$1), {
-			singleLine: true,
-			border: getBorderCharacters("norc")
-		});
-		process.stdout.write(t$2);
-		return;
-	}
-	if (data$1.length === 0) return;
-	const headers = Array.from(new Set(data$1.flatMap((item) => Object.keys(item))));
-	const t$1 = table([headers, ...data$1.map((item) => headers.map((header) => {
-		const value = item[header];
-		if (value === null || value === void 0) return "";
-		if ((header === "createdAt" || header === "updatedAt") && typeof value === "string") return humanizeRelativeTime(value);
-		return String(value);
-	}))], {
-		border: getBorderCharacters("norc"),
-		drawHorizontalLine: (lineIndex, rowCount) => {
-			return lineIndex === 0 || lineIndex === 1 || lineIndex === rowCount;
-		}
-	});
-	process.stdout.write(t$1);
-}
-
 //#endregion
 //#region src/cli/machineuser/list.ts
 function machineUserInfo(user) {
@@ -104447,11 +104503,12 @@ const listCommand$3 = defineCommand({
 		...deploymentArgs
 	},
 	run: withCommonArgs(async (args) => {
-		printData(await listMachineUsers({
+		const machineUsers = await listMachineUsers({
 			workspaceId: args["workspace-id"],
 			profile: args.profile,
 			configPath: args.config
-		}), args.json);
+		});
+		logger.out(machineUsers);
 	})
 });
 
@@ -104509,11 +104566,12 @@ const tokenCommand = defineCommand({
 			profile: args.profile,
 			configPath: args.config
 		});
-		printData({
+		const tokenInfo = {
 			access_token: token.accessToken,
 			token_type: token.tokenType,
 			expires_at: token.expiresAt
-		}, args.json);
+		};
+		logger.out(tokenInfo);
 	})
 });
 
@@ -104593,12 +104651,13 @@ const getCommand$1 = defineCommand({
 		}
 	},
 	run: withCommonArgs(async (args) => {
-		printData(await getOAuth2Client({
+		const credentials = await getOAuth2Client({
 			name: args.name,
 			workspaceId: args["workspace-id"],
 			profile: args.profile,
 			configPath: args.config
-		}), args.json);
+		});
+		logger.out(credentials);
 	})
 });
 
@@ -104639,11 +104698,12 @@ const listCommand$2 = defineCommand({
 		...deploymentArgs
 	},
 	run: withCommonArgs(async (args) => {
-		printData(await listOAuth2Clients({
+		const oauth2Clients = await listOAuth2Clients({
 			workspaceId: args["workspace-id"],
 			profile: args.profile,
 			configPath: args.config
-		}), args.json);
+		});
+		logger.out(oauth2Clients);
 	})
 });
 
@@ -104808,14 +104868,48 @@ const showCommand = defineCommand({
 		}
 	},
 	run: withCommonArgs(async (args) => {
-		printData(await show({
+		const appInfo = await show({
 			workspaceId: args["workspace-id"],
 			profile: args.profile,
 			configPath: args.config
-		}), args.json);
+		});
+		logger.out(appInfo);
 	})
 });
 
+//#endregion
+//#region src/cli/utils/format.ts
+/**
+* Formats a table with consistent single-line border style.
+* Use this instead of importing `table` directly.
+*/
+function formatTable(data$1, config) {
+	return table(data$1, {
+		...config,
+		border: getBorderCharacters("norc")
+	});
+}
+/**
+* Formats a key-value table with single-line border style.
+*/
+function formatKeyValueTable(data$1) {
+	return formatTable(data$1, { singleLine: true });
+}
+/**
+* Formats a table with headers, using single-line border style.
+* Draws horizontal lines only at top, after header, and bottom.
+*/
+function formatTableWithHeaders(headers, rows) {
+	return formatTable([headers, ...rows], { drawHorizontalLine: (lineIndex, rowCount) => {
+		return lineIndex === 0 || lineIndex === 1 || lineIndex === rowCount;
+	} });
+}
+function humanizeRelativeTime(isoString) {
+	const date = new Date(isoString);
+	if (Number.isNaN(date.getTime())) return isoString;
+	return formatDistanceToNowStrict(date, { addSuffix: true });
+}
+
 //#endregion
 //#region src/cli/workflow/args.ts
 const nameArgs = { name: {
@@ -105066,7 +105160,7 @@ function printExecutionWithLogs(execution) {
 		["startedAt", execution.startedAt],
 		["finishedAt", execution.finishedAt]
 	];
-	process.stdout.write(table(summaryData, { singleLine: true }));
+	logger.out(formatKeyValueTable(summaryData));
 	if (execution.jobDetails && execution.jobDetails.length > 0) {
 		logger.log(styles.bold("\nJob Executions:"));
 		for (const job of execution.jobDetails) {
@@ -105135,13 +105229,16 @@ const executionsCommand = defineCommand({
 			if (!args.json) logger.info(`Execution ID: ${execution.id}`, { mode: "stream" });
 			const result = args.wait ? await waitWithSpinner(wait, interval, args.json) : execution;
 			if (args.logs && !args.json) printExecutionWithLogs(result);
-			else printData(result, args.json);
-		} else printData(await listWorkflowExecutions({
-			workspaceId: args["workspace-id"],
-			profile: args.profile,
-			workflowName: args["workflow-name"],
-			status: args.status
-		}), args.json);
+			else logger.out(result);
+		} else {
+			const executions = await listWorkflowExecutions({
+				workspaceId: args["workspace-id"],
+				profile: args.profile,
+				workflowName: args["workflow-name"],
+				status: args.status
+			});
+			logger.out(executions);
+		}
 	})
 });
 
@@ -105183,11 +105280,12 @@ const getCommand = defineCommand({
 		...nameArgs
 	},
 	run: withCommonArgs(async (args) => {
-		printData(await getWorkflow({
+		const workflow = await getWorkflow({
 			name: args.name,
 			workspaceId: args["workspace-id"],
 			profile: args.profile
-		}), args.json);
+		});
+		logger.out(workflow);
 	})
 });
 
@@ -105225,7 +105323,7 @@ const listCommand$1 = defineCommand({
 			workspaceId: args["workspace-id"],
 			profile: args.profile
 		});
-		if (args.json) printData(workflows, args.json);
+		if (args.json) logger.out(workflows);
 		else {
 			if (workflows.length === 0) {
 				logger.info("No workflows found.");
@@ -105243,7 +105341,7 @@ const listCommand$1 = defineCommand({
 				w.jobFunctions.toString(),
 				humanizeRelativeTime(w.updatedAt)
 			]);
-			process.stdout.write(table([headers, ...rows]));
+			logger.out(formatTableWithHeaders(headers, rows));
 		}
 	})
 });
@@ -105401,9 +105499,9 @@ const startCommand = defineCommand({
 			configPath: args.config,
 			interval
 		});
-		if (!args.json) logger.info(`Execution ID: ${executionId}`, { mode: "stream" });
+		logger.info(`Execution ID: ${executionId}`, { mode: "stream" });
 		if (args.wait) {
-			const result = await wait({ showProgress: !args.json });
+			const result = await wait({ showProgress: true });
 			if (args.logs && !args.json) {
 				const { execution } = await getWorkflowExecution({
 					executionId,
@@ -105412,8 +105510,8 @@ const startCommand = defineCommand({
 					logs: true
 				});
 				printExecutionWithLogs(execution);
-			} else printData(result, args.json);
-		} else printData({ executionId }, args.json);
+			} else logger.out(result);
+		} else logger.out({ executionId });
 	})
 });
 
@@ -105486,8 +105584,8 @@ const resumeCommand = defineCommand({
 					logs: true
 				});
 				printExecutionWithLogs(execution);
-			} else printData(result, args.json);
-		} else printData({ executionId }, args.json);
+			} else logger.out(result);
+		} else logger.out({ executionId });
 	})
 });
 
@@ -105583,7 +105681,7 @@ const createCommand = defineCommand({
 			folderId: args["folder-id"]
 		});
 		if (!args.json) logger.success(`Workspace "${args.name}" created successfully.`);
-		printData(workspace, args.json);
+		logger.out(workspace);
 	})
 });
 
@@ -105688,13 +105786,14 @@ const listCommand = defineCommand({
 			throw new Error(`--limit must be a positive integer, got '${args.limit}'`);
 		}
 		const workspaces = await listWorkspaces({ limit });
-		printData(args.json ? workspaces : workspaces.map(({ updatedAt: _$1, createdAt, ...rest }) => ({
+		const formattedWorkspaces = args.json ? workspaces : workspaces.map(({ updatedAt: _$1, createdAt, ...rest }) => ({
 			...rest,
 			createdAt: humanizeRelativeTime(createdAt)
-		})), args.json);
+		}));
+		logger.out(formattedWorkspaces);
 	})
 });
 
 //#endregion
-export { jsonArgs as $, printData as A, loadAccessToken as B, listOAuth2Clients as C, tokenCommand as D, getMachineUserToken as E, generateUserTypes as F, fetchUserInfo as G, readPlatformConfig as H, loadConfig as I, readPackageJson as J, initOAuth2Client as K, apiCall as L, generateCommand as M, apply as N, listCommand$3 as O, applyCommand as P, deploymentArgs as Q, apiCommand as R, listCommand$2 as S, getOAuth2Client as T, writePlatformConfig as U, loadWorkspaceId as V, fetchAll as W, commonArgs as X, PATScope as Y, confirmationArgs as Z, listWorkflowExecutions as _, createCommand as a, remove as b, resumeWorkflow as c, listCommand$1 as d, withCommonArgs as et, listWorkflows as f, getWorkflowExecution as g, executionsCommand as h, deleteWorkspace as i, generate as j, listMachineUsers as k, startCommand as l, getWorkflow as m, listWorkspaces as n, logger as nt, createWorkspace as o, getCommand as p, initOperatorClient as q, deleteCommand as r, resumeCommand as s, listCommand as t, workspaceArgs as tt, startWorkflow as u, show as v, getCommand$1 as w, removeCommand as x, showCommand as y, fetchLatestToken as z };
-//# sourceMappingURL=list-BticEhbi.mjs.map
+export { withCommonArgs as $, generate as A, loadWorkspaceId as B, listOAuth2Clients as C, tokenCommand as D, getMachineUserToken as E, loadConfig as F, initOAuth2Client as G, writePlatformConfig as H, apiCall as I, PATScope as J, initOperatorClient as K, apiCommand as L, apply as M, applyCommand as N, listCommand$3 as O, generateUserTypes as P, jsonArgs as Q, fetchLatestToken as R, listCommand$2 as S, getOAuth2Client as T, fetchAll as U, readPlatformConfig as V, fetchUserInfo as W, confirmationArgs as X, commonArgs as Y, deploymentArgs as Z, listWorkflowExecutions as _, createCommand as a, remove as b, resumeWorkflow as c, listCommand$1 as d, workspaceArgs as et, listWorkflows as f, getWorkflowExecution as g, executionsCommand as h, deleteWorkspace as i, generateCommand as j, listMachineUsers as k, startCommand as l, getWorkflow as m, listWorkspaces as n, createWorkspace as o, getCommand as p, readPackageJson as q, deleteCommand as r, resumeCommand as s, listCommand as t, logger as tt, startWorkflow as u, show as v, getCommand$1 as w, removeCommand as x, showCommand as y, loadAccessToken as z };
+//# sourceMappingURL=list-9sLkfPfn.mjs.map