From c2908e52c68103f5882dba896542f7f7fdec5cf7 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 24 Oct 2024 13:40:09 +0200
Subject: [PATCH 01/34] fix: initialize empty smtp settings correctly

---
 .../lib/components/InstanceSettings.svelte    | 73 +++++++++++++------
 1 file changed, 51 insertions(+), 22 deletions(-)

diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte
index ac0aabd161..5ff2262058 100644
--- a/frontend/src/lib/components/InstanceSettings.svelte
+++ b/frontend/src/lib/components/InstanceSettings.svelte
@@ -102,8 +102,8 @@
 		if (values['base_url'] == undefined) {
 			values['base_url'] = 'http://localhost'
 		}
-		if (values['smtp_connect'] == undefined) {
-			values['smtp_connect'] = {}
+		if (values['smtp_settings'] == undefined) {
+			values['smtp_settings'] = {}
 		}
 		loading = false
 
@@ -274,22 +274,34 @@
 				<TabContent value={category}>
 					{#if category == 'SMTP'}
 						<div class="text-secondary pb-4 text-xs"
-							>Setting SMTP unlocks sending emails upon adding new users to the workspace or the instance or sending critical alerts.
-							<a target="_blank" href="https://www.windmill.dev/docs/misc/setup_smtp">Learn more</a></div
+							>Setting SMTP unlocks sending emails upon adding new users to the workspace or the
+							instance or sending critical alerts.
+							<a target="_blank" href="https://www.windmill.dev/docs/misc/setup_smtp">Learn more</a
+							></div
 						>
 					{:else if category == 'Registries'}
 						<div class="text-secondary pb-4 text-xs">
-							Add private registries for Pip, Bun and npm. <a target="_blank" href="https://www.windmill.dev/docs/advanced/imports">Learn more</a>
+							Add private registries for Pip, Bun and npm. <a
+								target="_blank"
+								href="https://www.windmill.dev/docs/advanced/imports">Learn more</a
+							>
 						</div>
 					{:else if category == 'Slack'}
 						<div class="text-secondary pb-4 text-xs">
-							Connecting your instance to a Slack workspace enables critical alerts to be sent to a Slack channel.
-							<a target="_blank" href="https://www.windmill.dev/docs/misc/saml_and_scim">Learn more</a>
+							Connecting your instance to a Slack workspace enables critical alerts to be sent to a
+							Slack channel.
+							<a target="_blank" href="https://www.windmill.dev/docs/misc/saml_and_scim"
+								>Learn more</a
+							>
 						</div>
 					{:else if category == 'SCIM/SAML'}
 						<div class="text-secondary pb-4 text-xs">
-							Setting up SAML and SCIM allows you to authenticate users using your identity provider.
-							<a target="_blank" href="https://www.windmill.dev/docs/advanced/instance_settings#slack">Learn more</a>
+							Setting up SAML and SCIM allows you to authenticate users using your identity
+							provider.
+							<a
+								target="_blank"
+								href="https://www.windmill.dev/docs/advanced/instance_settings#slack">Learn more</a
+							>
 						</div>
 					{:else if category == 'Debug'}
 						<div class="text-secondary pb-4 text-xs">
@@ -310,9 +322,11 @@
 							</ul>
 						</div>
 						{#if $enterpriseLicense}
-						<div class="text-secondary pb-4 text-xs">
-							On Enterprise Edition, you must send data to check that usage is in line with the terms of the subscription. You can either enable telemetry or regularly send usage data by clicking the button below.
-						</div>
+							<div class="text-secondary pb-4 text-xs">
+								On Enterprise Edition, you must send data to check that usage is in line with the
+								terms of the subscription. You can either enable telemetry or regularly send usage
+								data by clicking the button below.
+							</div>
 							<Button
 								on:click={sendStats}
 								variant="border"
@@ -340,12 +354,17 @@
 								{/if}
 
 								<div class="py-1" />
-									<div class="mb-2">
-										<span class="text-primary text-sm">When at least one of the below options is set, users will be able to login to
-											Windmill via their third-party account.
-											<br /> To test SSO, the recommended workflow is to to save the settings and try to
-											login in an incognito window. <a target="_blank" href="https://www.windmill.dev/docs/misc/setup_oauth#sso">Learn more</a></span>
-									</div>
+								<div class="mb-2">
+									<span class="text-primary text-sm"
+										>When at least one of the below options is set, users will be able to login to
+										Windmill via their third-party account.
+										<br /> To test SSO, the recommended workflow is to to save the settings and try
+										to login in an incognito window.
+										<a target="_blank" href="https://www.windmill.dev/docs/misc/setup_oauth#sso"
+											>Learn more</a
+										></span
+									>
+								</div>
 								<div class="flex flex-col gap-2 py-4">
 									<OAuthSetting name="google" bind:value={oauths['google']} />
 									<OAuthSetting name="microsoft" bind:value={oauths['microsoft']} />
@@ -374,7 +393,11 @@
 													<div class="p-2 border rounded">
 														<label class="block pb-2">
 															<span class="text-primary font-semibold text-sm">Custom Name</span>
-															<input type="text" placeholder="Custom Name" bind:value={oauths[k]['display_name']} />
+															<input
+																type="text"
+																placeholder="Custom Name"
+																bind:value={oauths[k]['display_name']}
+															/>
 														</label>
 														<label class="block pb-2">
 															<span class="text-primary font-semibold text-sm">Client Id</span>
@@ -429,12 +452,18 @@
 								</div>
 							{:else if ssoOrOauth === 'oauth'}
 								<div class="mb-2">
-									<span class="text-primary text-sm">When one of the below options is set, you will be able to create a specific
+									<span class="text-primary text-sm"
+										>When one of the below options is set, you will be able to create a specific
 										resource containing a token automatically generated by the third-party provider.
 										<br />
 										To test it after setting an oauth client, go to the Resources menu and create a new
-										one of the type of your oauth client (i.e. a 'github' resource if you set Github OAuth).
-										<br /><a target="_blank" href="https://www.windmill.dev/docs/misc/setup_oauth#oauth">Learn more</a></span>
+										one of the type of your oauth client (i.e. a 'github' resource if you set Github
+										OAuth).
+										<br /><a
+											target="_blank"
+											href="https://www.windmill.dev/docs/misc/setup_oauth#oauth">Learn more</a
+										></span
+									>
 								</div>
 								<div class="py-1" />
 								<OAuthSetting login={false} name="slack" bind:value={oauths['slack']} />

From 2cd46cc55f2866b0fc78d5c2cd49ec19cc496b7d Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 24 Oct 2024 14:42:37 +0200
Subject: [PATCH 02/34] fix(bash): correctly propagate sigterm for cancelled
 bash scripts

---
 Dockerfile                                   |  2 +-
 backend/windmill-worker/src/bash_executor.rs | 41 +++++++++++++++++---
 docker/DockerfileSlim                        |  2 +-
 docker/DockerfileSlimEe                      |  2 +-
 4 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4afb307c8f..8683aa9738 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -162,7 +162,7 @@ ENV GO_PATH=/usr/local/go/bin/go
 RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.4.18/uv-installer.sh | sh && mv /root/.cargo/bin/uv /usr/local/bin/uv
 
 RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - 
-RUN apt-get -y update && apt-get install -y curl nodejs awscli && apt-get clean \
+RUN apt-get -y update && apt-get install -y curl procps nodejs awscli && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
 # go build is slower the first time it is ran, so we prewarm it in the build
diff --git a/backend/windmill-worker/src/bash_executor.rs b/backend/windmill-worker/src/bash_executor.rs
index 128eb7d25f..ed7a1dd0f6 100644
--- a/backend/windmill-worker/src/bash_executor.rs
+++ b/backend/windmill-worker/src/bash_executor.rs
@@ -59,11 +59,42 @@ pub async fn handle_bash_job(
     append_logs(&job.id, &job.workspace_id, logs1, db).await;
 
     write_file(job_dir, "main.sh", &format!("set -e\n{content}"))?;
-    write_file(
-        job_dir,
-        "wrapper.sh",
-        &format!("set -o pipefail\nset -e\nmkfifo bp\ncat bp | tail -1 > ./result2.out &\n {bash} ./main.sh \"$@\" 2>&1 | tee bp\nwait $!", bash = BIN_BASH.as_str()),
-    )?;
+    let script = format!(
+        r#"
+set -o pipefail
+set -e
+
+# Function to kill child processes
+cleanup() {{
+    echo "Terminating child processes..."
+
+    # Ignore SIGTERM and SIGINT
+    trap '' SIGTERM SIGINT
+
+    # Kill the process group of the script (negative PID value)
+    pkill -P $$
+    exit
+}}
+
+
+# Trap SIGTERM (or other signals) and call cleanup function
+trap cleanup SIGTERM SIGINT
+
+# Create a named pipe
+mkfifo bp
+
+# Start background processes
+cat bp | tail -1 >> ./result2.out &
+
+# Run main.sh in the same process group
+{bash} ./main.sh "$@" 2>&1 | tee bp &
+
+# Wait for all background processes to finish
+wait
+"#,
+        bash = BIN_BASH.as_str(),
+    );
+    write_file(job_dir, "wrapper.sh", &script)?;
 
     let token = client.get_token().await;
     let mut reserved_variables = get_reserved_variables(job, &token, db).await?;
diff --git a/docker/DockerfileSlim b/docker/DockerfileSlim
index a0190933a4..16c2361a0d 100644
--- a/docker/DockerfileSlim
+++ b/docker/DockerfileSlim
@@ -11,7 +11,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - 
-RUN apt-get -y update && apt-get install -y curl nodejs awscli
+RUN apt-get -y update && apt-get install -y curl procps nodejs awscli
 
 ENV TZ=Etc/UTC
 
diff --git a/docker/DockerfileSlimEe b/docker/DockerfileSlimEe
index ef3771c767..65c6b55a19 100644
--- a/docker/DockerfileSlimEe
+++ b/docker/DockerfileSlimEe
@@ -11,7 +11,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - 
-RUN apt-get -y update && apt-get install -y curl nodejs awscli
+RUN apt-get -y update && apt-get install -y curl procps nodejs awscli
 
 ENV TZ=Etc/UTC
 

From 09a8a0361bd4be9c21f4933618b8e6e2d2ccb260 Mon Sep 17 00:00:00 2001
From: Stephen Beckstrand <spbeckstrand@gmail.com>
Date: Thu, 24 Oct 2024 09:40:59 -0600
Subject: [PATCH 03/34] chore: Update references to windmill-ee-full image
 (#4578)

* chore: Update windmill-ee-full image references

The messaging in a few backend executors references the need to
use the full enterprise image rather than `windmill-ee`. These
messages reference the `windmill-full-ee` image but its the image
is actually named `windmill-ee-full` under the available Packages.

* chore: Update refs to rust to ansible in ansible executor
---
 backend/windmill-worker/src/ansible_executor.rs | 4 ++--
 backend/windmill-worker/src/php_executor.rs     | 2 +-
 backend/windmill-worker/src/rust_executor.rs    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/windmill-worker/src/ansible_executor.rs b/backend/windmill-worker/src/ansible_executor.rs
index 9c2474d95f..ef18ddba13 100644
--- a/backend/windmill-worker/src/ansible_executor.rs
+++ b/backend/windmill-worker/src/ansible_executor.rs
@@ -185,7 +185,7 @@ async fn install_galaxy_collections(
 #[cfg(not(feature = "enterprise"))]
 fn check_ansible_exists() -> Result<(), error::Error> {
     if !Path::new(ANSIBLE_PLAYBOOK_PATH.as_str()).exists() {
-        let msg = format!("Couldn't find ansible-playbook at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-full` for your instance in order to run rust jobs.", ANSIBLE_PLAYBOOK_PATH.as_str());
+        let msg = format!("Couldn't find ansible-playbook at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-full` for your instance in order to run Ansible jobs.", ANSIBLE_PLAYBOOK_PATH.as_str());
         return Err(error::Error::NotFound(msg));
     }
     Ok(())
@@ -194,7 +194,7 @@ fn check_ansible_exists() -> Result<(), error::Error> {
 #[cfg(feature = "enterprise")]
 fn check_ansible_exists() -> Result<(), error::Error> {
     if !Path::new(ANSIBLE_PLAYBOOK_PATH.as_str()).exists() {
-        let msg = format!("Couldn't find ansible-playbook at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-full-ee` for your instance in order to run rust jobs.", ANSIBLE_PLAYBOOK_PATH.as_str());
+        let msg = format!("Couldn't find ansible-playbook at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-ee-full` for your instance in order to run Ansible jobs.", ANSIBLE_PLAYBOOK_PATH.as_str());
         return Err(error::Error::NotFound(msg));
     }
     Ok(())
diff --git a/backend/windmill-worker/src/php_executor.rs b/backend/windmill-worker/src/php_executor.rs
index b16e25f8ae..194e621fe1 100644
--- a/backend/windmill-worker/src/php_executor.rs
+++ b/backend/windmill-worker/src/php_executor.rs
@@ -143,7 +143,7 @@ fn check_php_exists() -> error::Result<()> {
 #[cfg(feature = "enterprise")]
 fn check_php_exists() -> error::Result<()> {
     if !Path::new(PHP_PATH.as_str()).exists() {
-        let msg = format!("Couldn't find php at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-full-ee` for your instance in order to run php jobs.", PHP_PATH.as_str());
+        let msg = format!("Couldn't find php at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-ee-full` for your instance in order to run php jobs.", PHP_PATH.as_str());
         return Err(error::Error::NotFound(msg));
     }
     Ok(())
diff --git a/backend/windmill-worker/src/rust_executor.rs b/backend/windmill-worker/src/rust_executor.rs
index 6a0090ab55..530be394ff 100644
--- a/backend/windmill-worker/src/rust_executor.rs
+++ b/backend/windmill-worker/src/rust_executor.rs
@@ -281,7 +281,7 @@ fn check_cargo_exists() -> Result<(), Error> {
 #[cfg(feature = "enterprise")]
 fn check_cargo_exists() -> Result<(), Error> {
     if !Path::new(CARGO_PATH.as_str()).exists() {
-        let msg = format!("Couldn't find cargo at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-full-ee` for your instance in order to run rust jobs.", CARGO_PATH.as_str());
+        let msg = format!("Couldn't find cargo at {}. This probably means that you are not using the windmill-full image. Please use the image `windmill-ee-full` for your instance in order to run rust jobs.", CARGO_PATH.as_str());
         return Err(Error::NotFound(msg));
     }
     Ok(())

From 0dae163fed6744740a21fa916649632d853604ad Mon Sep 17 00:00:00 2001
From: Alexander Petric <alpetric@users.noreply.github.com>
Date: Thu, 24 Oct 2024 16:58:39 -0400
Subject: [PATCH 04/34] ux: job queue critical alert settings ux improvements
 (#4577)

* improving the ux of queued jobs alert settings

* minor improvements

* removing name column
---
 .../lib/components/QueueMetricsDrawer.svelte  | 95 +++++++++++--------
 1 file changed, 58 insertions(+), 37 deletions(-)

diff --git a/frontend/src/lib/components/QueueMetricsDrawer.svelte b/frontend/src/lib/components/QueueMetricsDrawer.svelte
index 92e9faf4b1..a75caf5ff9 100644
--- a/frontend/src/lib/components/QueueMetricsDrawer.svelte
+++ b/frontend/src/lib/components/QueueMetricsDrawer.svelte
@@ -9,6 +9,18 @@
 	import Tooltip from './Tooltip.svelte'
 	import { enterpriseLicense } from '$lib/stores'
 
+	function updateChangesMade() {
+		changesMade = JSON.stringify(alerts) !== JSON.stringify(originalAlerts)
+	}
+
+	function handleInput(event) {
+		const target = event.target
+		console.log(target)
+		if (target.tagName.toLowerCase() === 'input') {
+			updateChangesMade()
+		}
+	}
+
 	type Alert = {
 		name: string
 		tags_to_monitor: string[]
@@ -70,16 +82,20 @@
 	}
 
 	function startEditing(index) {
+		if (editingIndex !== -1) {
+			const success = saveAlert(editingIndex)
+			if (!success) return
+		}
 		editingIndex = index
 		updateWorkerTags()
 	}
 
-	function saveAlert(index) {
+	function saveAlert(index): boolean {
 		const newAlert = alerts[index]
 
 		if (newAlert.tags_to_monitor.length === 0) {
 			sendUserToast('Please add at least one tag before saving.', true)
-			return
+			return false
 		}
 
 		if (
@@ -88,7 +104,7 @@
 			newAlert.alert_time_threshold_seconds <= 0
 		) {
 			sendUserToast('All numeric values must be strictly positive.', true)
-			return
+			return false
 		}
 
 		const alertExists = originalAlerts.some(
@@ -99,13 +115,15 @@
 		)
 
 		if (alertExists) {
-			sendUserToast('An identical alert already exists.', true)
-			return
+			sendUserToast('You can only define one alert per identical set of tags', true)
+			return false
 		}
 
 		editingIndex = -1
-		changesMade = JSON.stringify(alerts) !== JSON.stringify(originalAlerts)
+		updateChangesMade()
+
 		stagedNewAlert = false
+		return true
 	}
 
 	function stageDeleteAlert(index) {
@@ -126,16 +144,18 @@
 		}
 		newTag = ''
 		filteredTags = []
+		updateChangesMade()
 	}
 
 	function removeTag(alertIndex, tag) {
 		alerts[alertIndex].tags_to_monitor = alerts[alertIndex].tags_to_monitor.filter((t) => t !== tag)
+		updateChangesMade()
 	}
 
 	async function applyConfig() {
-		if (stagedNewAlert) {
-			sendUserToast('New alert staged. Please save or cancel the changes before applying.', true)
-			return
+		if (editingIndex !== -1) {
+			const success = saveAlert(editingIndex)
+			if (!success) return
 		}
 
 		try {
@@ -146,6 +166,7 @@
 			removedAlerts = []
 			changesMade = false
 			stagedNewAlert = false
+			editingIndex = -1
 		} catch (error) {
 			console.error('Failed to update config:', error)
 		}
@@ -167,7 +188,7 @@
 		}
 
 		const newAlert = {
-			name: 'New Alert',
+			name: 'Job Queue Alert',
 			tags_to_monitor: [],
 			jobs_num_threshold: 3,
 			alert_cooldown_seconds: 600,
@@ -177,6 +198,7 @@
 		alerts = [...alerts, newAlert]
 		editingIndex = alerts.length - 1
 		stagedNewAlert = true
+		updateChangesMade()
 		updateWorkerTags()
 	}
 
@@ -188,28 +210,35 @@
 		alerts[alertIndex].tags_to_monitor = [
 			...new Set([...alerts[alertIndex].tags_to_monitor, ...workerTags])
 		]
-		alerts = alerts // Trigger reactivity
+		alerts = [...alerts]
+		updateChangesMade()
 	}
 </script>
 
 <Drawer bind:this={drawer} size="800px">
-	<DrawerContent title="Queue Metrics" on:close={drawer.closeDrawer}>
+	<DrawerContent
+		title="Queues"
+		on:close={drawer.closeDrawer}
+		documentationLink="https://www.windmill.dev/docs/core_concepts/worker_groups#queue-metrics"
+	>
 		<Section
 			label="Queue Alert Settings"
 			collapsable={true}
-			tooltip="Manage queue alerts for monitoring queue metrics. These alerts will trigger a critical alert notification if the queue metrics are met."
+			tooltip="A critical alert is triggered when the number of jobs in the queue exceeds the set threshold and they have been waiting for at least the specified time. After an alert, no new alerts will be triggered during the cooldown period."
 			eeOnly={true}
 		>
 			{#if $enterpriseLicense}
 				{#if changesMade}
 					<div class="text-red-600 text-xs whitespace-nowrap pb-2">Non applied changes</div>
-					<div class="flex gap-2 pb-2">
-						<Button color="blue" size="xs" on:click={applyConfig}>
-							<SaveIcon size={16} /> Apply Config
-						</Button>
-						<Button color="light" size="xs" on:click={cancelChanges}>Cancel</Button>
-					</div>
 				{/if}
+				<div class="flex gap-2 pb-2">
+					<Button color="blue" size="xs" on:click={applyConfig} disabled={!changesMade}>
+						<SaveIcon size={16} /> Apply Config
+					</Button>
+					<Button color="light" size="xs" on:click={cancelChanges} disabled={!changesMade}>
+						Cancel
+					</Button>
+				</div>
 
 				{#if alerts.length > 0}
 					<div>
@@ -217,12 +246,6 @@
 							<table class="w-full border-collapse mb-2 text-xs table-auto">
 								<thead class="bg-gray-200 dark:bg-slate-600 text-left text-xs">
 									<tr>
-										<th class="p-2 min-w-[120px]">
-											Name
-											<Tooltip
-												markdownTooltip="The name of the alert. This will be used in the crticial alert notification and help identify the alert."
-											/>
-										</th>
 										<th class="p-2 w-full">
 											Queue Tags to Monitor
 											<Tooltip markdownTooltip="Queue tags to monitor for this alert." />
@@ -230,38 +253,31 @@
 										<th class="p-2 min-w-[65px]">
 											Jobs
 											<Tooltip
-												markdownTooltip="Number of jobs threshold. An alert will be triggerd if more than this number of jobs are in the queue for at least the time threshold."
+												markdownTooltip="Number of jobs threshold: An alert will be triggered if the number of jobs in the queue exceeds this threshold and they have been waiting for at least the specified time threshold."
 											/>
 										</th>
 										<th class="p-2 min-w-[115px]">
 											Cooldown (s)
 											<Tooltip
-												markdownTooltip="Cooldown period in seconds. The cooldown period is the time after an alert is triggered that no new alerts will be triggered."
+												markdownTooltip="Cooldown period in seconds: This defines the time interval after an alert is triggered during which no additional alerts will be sent."
 											/>
 										</th>
 										<th class="p-2 min-w-[105px]">
 											Time (s)
 											<Tooltip
-												markdownTooltip="Time threshold in seconds. An alert will be triggered if more than 'n jobs threshold' have been in the queue for at least this amount of time."
+												markdownTooltip="Time threshold in seconds: An alert will be triggered if the number of jobs in the queue exceeds the job threshold and they have remained in the queue for at least this duration."
 											/>
 										</th>
 										<th class="p-2 min-w-[100px]"> Actions </th>
 									</tr>
 								</thead>
-								<tbody>
+								<tbody on:input={handleInput}>
 									{#each alerts as alert, index}
 										<tr
 											class={removedAlerts.includes(alert)
 												? 'bg-red-100 dark:bg-red-900 pointer-events-none opacity-50'
 												: ''}
 										>
-											<td class="border p-2">
-												{#if editingIndex === index}
-													<input type="text" bind:value={alert.name} class="w-full p-1" />
-												{:else}
-													{alert.name}
-												{/if}
-											</td>
 											<td class="border p-2">
 												{#if editingIndex === index}
 													<div class="flex flex-wrap gap-1 mb-2">
@@ -282,8 +298,9 @@
 														<input
 															type="text"
 															bind:value={newTag}
-															placeholder="Add tag"
+															placeholder="{workerTags.length === alert.tags_to_monitor.length ? 'All tags already added' : 'Add tag from dropdown' }"
 															on:input={(e) => filterTags(e)}
+															disabled={workerTags.length === alert.tags_to_monitor.length}
 															class="p-1 flex-grow mr-1"
 														/>
 														<button on:click={() => addTag(index, newTag)} aria-label="Add Tag">
@@ -294,6 +311,7 @@
 													<button
 														on:click={() => addAllTags(index)}
 														class="text-xs hover:bg-gray-200 dark:hover:bg-gray-700 rounded px-2 py-1 mt-1"
+														disabled={workerTags.length === alert.tags_to_monitor.length}
 													>
 														Add All Tags
 													</button>
@@ -302,6 +320,7 @@
 															class="autocomplete-list border max-h-36 overflow-y-auto absolute z-50"
 														>
 															{#each filteredTags as tag}
+																{#if !alert.tags_to_monitor.includes(tag)}
 																<li>
 																	<button
 																		type="button"
@@ -311,6 +330,7 @@
 																		{tag}
 																	</button>
 																</li>
+																{/if}
 															{/each}
 														</ul>
 													{/if}
@@ -401,6 +421,7 @@
 				</p>
 			{/if}
 		</Section>
+		<h1 class="pt-4">Queue Metrics</h1>
 		<div class="p-8">
 			<QueueMetricsDrawerInner />
 		</div>

From 6572f7b509c7240c6688c919c51b3e5f8c64a076 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Fri, 25 Oct 2024 06:18:06 +0200
Subject: [PATCH 05/34] Update OAuthSetting.svelte

---
 frontend/src/lib/components/OAuthSetting.svelte | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/lib/components/OAuthSetting.svelte b/frontend/src/lib/components/OAuthSetting.svelte
index 632fcc63a1..e2fe394761 100644
--- a/frontend/src/lib/components/OAuthSetting.svelte
+++ b/frontend/src/lib/components/OAuthSetting.svelte
@@ -66,10 +66,12 @@
 	>
 	{#if enabled}
 		<div class="p-2 rounded border">
-			<label class="block pb-2">
-				<span class="text-primary font-semibold text-sm">Custom Name</span>
-				<input type="text" placeholder="Custom Name" bind:value={value['display_name']} />
-			</label>
+			{#if name != "slack"}
+				<label class="block pb-2">
+					<span class="text-primary font-semibold text-sm">Custom Name</span>
+					<input type="text" placeholder="Custom Name" bind:value={value['display_name']} />
+				</label>
+			{/if}
 			<label class="block pb-2">
 				<span class="text-primary font-semibold text-sm">Client Id</span>
 				<input type="text" placeholder="Client Id" bind:value={value['id']} />

From e4e5603a48426cf71375d18675f2f60b3c69f8a7 Mon Sep 17 00:00:00 2001
From: Alec Minchington <13358430+minchingtonak@users.noreply.github.com>
Date: Thu, 24 Oct 2024 23:19:42 -0700
Subject: [PATCH 06/34] feat: add Spotify oauth provider (#4581)

---
 backend/oauth_connect.json                    | 19 +++++++++++++++++++
 .../lib/components/InstanceSettings.svelte    |  3 ++-
 .../lib/components/icons/SpotifyIcon.svelte   |  9 +++++++++
 frontend/src/lib/components/icons/index.ts    |  4 +++-
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 frontend/src/lib/components/icons/SpotifyIcon.svelte

diff --git a/backend/oauth_connect.json b/backend/oauth_connect.json
index 034aece2f4..994d9999fd 100644
--- a/backend/oauth_connect.json
+++ b/backend/oauth_connect.json
@@ -152,5 +152,24 @@
       "vismanet_erp_interactive_api:read",
       "vismanet_erp_interactive_api:update"
     ]
+  },
+  "spotify": {
+    "auth_url": "https://accounts.spotify.com/authorize",
+    "token_url": "https://accounts.spotify.com/api/token",
+    "scopes": [
+      "user-read-playback-state",
+      "user-modify-playback-state",
+      "user-read-currently-playing",
+      "playlist-read-private",
+      "playlist-read-collaborative",
+      "playlist-modify-private",
+      "playlist-modify-public",
+      "user-follow-read",
+      "user-read-playback-position",
+      "user-read-recently-played",
+      "user-top-read",
+      "user-library-modify",
+      "user-library-read"
+    ]
   }
 }
\ No newline at end of file
diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte
index 5ff2262058..024ff0d1a9 100644
--- a/frontend/src/lib/components/InstanceSettings.svelte
+++ b/frontend/src/lib/components/InstanceSettings.svelte
@@ -206,7 +206,8 @@
 		'basecamp',
 		'linkedin',
 		'quickbooks',
-		'visma'
+		'visma',
+		'spotify'
 	]
 
 	let oauth_name = undefined
diff --git a/frontend/src/lib/components/icons/SpotifyIcon.svelte b/frontend/src/lib/components/icons/SpotifyIcon.svelte
new file mode 100644
index 0000000000..ce0da3d0d0
--- /dev/null
+++ b/frontend/src/lib/components/icons/SpotifyIcon.svelte
@@ -0,0 +1,9 @@
+<script lang="ts">
+	export let height = '24px'
+	export let width = '24px'
+</script>
+
+<svg {width} {height} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512">
+    <path fill="#1ed760" d="M248 8C111.1 8 0 119.1 0 256s111.1 248 248 248 248-111.1 248-248S384.9 8 248 8Z"/>
+    <path d="M406.6 231.1c-5.2 0-8.4-1.3-12.9-3.9-71.2-42.5-198.5-52.7-280.9-29.7-3.6 1-8.1 2.6-12.9 2.6-13.2 0-23.3-10.3-23.3-23.6 0-13.6 8.4-21.3 17.4-23.9 35.2-10.3 74.6-15.2 117.5-15.2 73 0 149.5 15.2 205.4 47.8 7.8 4.5 12.9 10.7 12.9 22.6 0 13.6-11 23.3-23.2 23.3zm-31 76.2c-5.2 0-8.7-2.3-12.3-4.2-62.5-37-155.7-51.9-238.6-29.4-4.8 1.3-7.4 2.6-11.9 2.6-10.7 0-19.4-8.7-19.4-19.4s5.2-17.8 15.5-20.7c27.8-7.8 56.2-13.6 97.8-13.6 64.9 0 127.6 16.1 177 45.5 8.1 4.8 11.3 11 11.3 19.7-.1 10.8-8.5 19.5-19.4 19.5zm-26.9 65.6c-4.2 0-6.8-1.3-10.7-3.6-62.4-37.6-135-39.2-206.7-24.5-3.9 1-9 2.6-11.9 2.6-9.7 0-15.8-7.7-15.8-15.8 0-10.3 6.1-15.2 13.6-16.8 81.9-18.1 165.6-16.5 237 26.2 6.1 3.9 9.7 7.4 9.7 16.5s-7.1 15.4-15.2 15.4z"/>
+</svg>
diff --git a/frontend/src/lib/components/icons/index.ts b/frontend/src/lib/components/icons/index.ts
index 8fb92470d8..da7e21ea91 100644
--- a/frontend/src/lib/components/icons/index.ts
+++ b/frontend/src/lib/components/icons/index.ts
@@ -91,6 +91,7 @@ import VismaIcon from './VismaIcon.svelte'
 import JumpCloudIcon from './JumpCloudIcon.svelte'
 import KeycloakIcon from './KeycloakIcon.svelte'
 import ZitadelIcon from './ZitadelIcon.svelte'
+import SpotifyIcon from './SpotifyIcon.svelte'
 
 export const APP_TO_ICON_COMPONENT = {
 	postgresql: PostgresIcon,
@@ -188,7 +189,8 @@ export const APP_TO_ICON_COMPONENT = {
 	visma: VismaIcon,
 	jumpcloud: JumpCloudIcon,
 	keycloak: KeycloakIcon,
-	zitadel: ZitadelIcon
+	zitadel: ZitadelIcon,
+	spotify: SpotifyIcon
 } as const
 
 export {

From 058d48ccab9feaafa2e7025f2e320b72e3094245 Mon Sep 17 00:00:00 2001
From: wendrul <53628737+wendrul@users.noreply.github.com>
Date: Fri, 25 Oct 2024 14:18:28 +0200
Subject: [PATCH 07/34] Make file_resources that are filled with a variable in
 ansible (#4584)

* Make file_resources that are filled with a variable in ansible

* Rename file_resources section to files

* Add variable example to init code
---
 .../parsers/windmill-parser-yaml/src/lib.rs   | 29 +++++++++++--
 .../windmill-worker/src/ansible_executor.rs   | 43 +++++++++++++------
 frontend/src/lib/script_helpers.ts            |  4 +-
 3 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/backend/parsers/windmill-parser-yaml/src/lib.rs b/backend/parsers/windmill-parser-yaml/src/lib.rs
index f008f2f34a..8c29c97b7e 100644
--- a/backend/parsers/windmill-parser-yaml/src/lib.rs
+++ b/backend/parsers/windmill-parser-yaml/src/lib.rs
@@ -188,9 +188,15 @@ pub struct AnsiblePlaybookOptions {
     pub force_handlers: Option<()>,
 }
 
+#[derive(Debug, Clone)]
+pub enum ResourceOrVariablePath {
+    Resource(String),
+    Variable(String),
+}
+
 #[derive(Debug, Clone)]
 pub struct FileResource {
-    pub resource_path: String,
+    pub resource_path: ResourceOrVariablePath,
     pub target_path: String,
 }
 
@@ -309,7 +315,7 @@ pub fn parse_ansible_reqs(
                         }
                     }
                 }
-                Yaml::String(key) if key == "file_resources" => {
+                Yaml::String(key) if key == "files" || key == "file_resources" => {
                     if let Yaml::Array(file_resources) = value {
                         let resources: anyhow::Result<Vec<FileResource>> =
                             file_resources.iter().map(parse_file_resource).collect();
@@ -440,7 +446,24 @@ fn parse_file_resource(yaml: &Yaml) -> anyhow::Result<FileResource> {
                     "No `target` provided for file resource {}. Please input a target relative path for the ansible playbook to see this file.",
                     resource_path
                 ))?;
-            return Ok(FileResource { resource_path: resource_path.clone(), target_path });
+            return Ok(FileResource {
+                resource_path: ResourceOrVariablePath::Resource(resource_path.clone()),
+                target_path,
+            });
+        }
+        if let Some(Yaml::String(resource_path)) = f.get(&Yaml::String("variable".to_string())) {
+            let target_path = f
+                .get(&Yaml::String("target".to_string()))
+                .and_then(|x| x.as_str())
+                .map(|x| x.to_string())
+                .ok_or(anyhow!(
+                    "No `target` provided for file resource {}. Please input a target relative path for the ansible playbook to see this file.",
+                    resource_path
+                ))?;
+            return Ok(FileResource {
+                resource_path: ResourceOrVariablePath::Variable(resource_path.clone()),
+                target_path,
+            });
         }
         return Err(anyhow!(
             "File resource should have a `resource` field, linking to a text file resource"
diff --git a/backend/windmill-worker/src/ansible_executor.rs b/backend/windmill-worker/src/ansible_executor.rs
index ef18ddba13..e897b86321 100644
--- a/backend/windmill-worker/src/ansible_executor.rs
+++ b/backend/windmill-worker/src/ansible_executor.rs
@@ -23,7 +23,7 @@ use windmill_common::{
     jobs::QueuedJob,
     worker::{to_raw_value, write_file, write_file_at_user_defined_location, WORKER_CONFIG},
 };
-use windmill_parser_yaml::AnsibleRequirements;
+use windmill_parser_yaml::{AnsibleRequirements, ResourceOrVariablePath};
 use windmill_queue::{append_logs, CanceledBy};
 
 use crate::{
@@ -556,20 +556,17 @@ async fn create_file_resources(
     }
 
     for file_res in &r.file_resources {
-        let r = client
-            .get_resource_value_interpolated::<serde_json::Value>(
-                &file_res.resource_path,
-                Some(job_id.to_string()),
-            )
-            .await?;
+        let r = get_resource_or_variable_content(
+            client,
+            &file_res.resource_path,
+            job_id.to_string(),
+        )
+        .await?;
         let path = file_res.target_path.clone();
         let validated_path = write_file_at_user_defined_location(
             job_dir,
             path.as_str(),
-            r.get("content").and_then(|v| v.as_str()).ok_or(anyhow!(
-                "Invalid text file resource {}, `content` field absent or invalid",
-                &file_res.resource_path
-            ))?,
+            &r,
         )
         .map_err(|e| anyhow!("Couldn't write text file at {}: {}", path, e))?;
 
@@ -579,7 +576,7 @@ async fn create_file_resources(
         );
 
         logs.push_str(&format!(
-            "\nCreated {} from {}",
+            "\nCreated {} from {:?}",
             file_res.target_path, file_res.resource_path
         ));
     }
@@ -587,3 +584,25 @@ async fn create_file_resources(
 
     Ok(nsjail_mounts)
 }
+
+async fn get_resource_or_variable_content(
+    client: &crate::AuthedClient,
+    path: &ResourceOrVariablePath,
+    job_id: String,
+) -> anyhow::Result<String> {
+    Ok(match path {
+        ResourceOrVariablePath::Resource(p) => {
+            let r = client
+                .get_resource_value_interpolated::<serde_json::Value>(&p, Some(job_id))
+                .await?;
+
+            r.get("content").and_then(|v| v.as_str()).ok_or(anyhow!(
+                "Invalid text file resource {}, `content` field absent or invalid",
+                p
+            ))?.to_string()
+        }
+        ResourceOrVariablePath::Variable(p) => {
+            client.get_variable_value(&p).await?
+        }
+    })
+}
diff --git a/frontend/src/lib/script_helpers.ts b/frontend/src/lib/script_helpers.ts
index f584ee9f19..a4bd376c34 100644
--- a/frontend/src/lib/script_helpers.ts
+++ b/frontend/src/lib/script_helpers.ts
@@ -635,9 +635,11 @@ inventory:
 
 # File resources will be written in the relative \`target\` location before
 # running the playbook
-# file_resources:
+# files:
   # - resource: u/user/fabulous_jinja_template
   #   target:  ./config_template.j2
+  # - variable: u/user/ssh_key
+  #   target:  ./ssh_key
 
 # Define the arguments of the windmill script
 extra_vars:

From 2cbf027653fb38d3f05079073ef1d68f9a58c01e Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Fri, 25 Oct 2024 17:44:41 +0200
Subject: [PATCH 08/34] fix: do not update created_at of scripts on lockfile
 generation

---
 ...e7bd5375ec5494179f4071e3bfe123d9600249cfa80c1103edd8.json} | 4 ++--
 backend/windmill-worker/src/worker_lockfiles.rs               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename backend/.sqlx/{query-ec47955683d811b12e82ff3e6aeafa0df46a320c436bad5eb1acc127df138a61.json => query-d697b7311430e7bd5375ec5494179f4071e3bfe123d9600249cfa80c1103edd8.json} (51%)

diff --git a/backend/.sqlx/query-ec47955683d811b12e82ff3e6aeafa0df46a320c436bad5eb1acc127df138a61.json b/backend/.sqlx/query-d697b7311430e7bd5375ec5494179f4071e3bfe123d9600249cfa80c1103edd8.json
similarity index 51%
rename from backend/.sqlx/query-ec47955683d811b12e82ff3e6aeafa0df46a320c436bad5eb1acc127df138a61.json
rename to backend/.sqlx/query-d697b7311430e7bd5375ec5494179f4071e3bfe123d9600249cfa80c1103edd8.json
index 2ed5e047db..e35c4e2730 100644
--- a/backend/.sqlx/query-ec47955683d811b12e82ff3e6aeafa0df46a320c436bad5eb1acc127df138a61.json
+++ b/backend/.sqlx/query-d697b7311430e7bd5375ec5494179f4071e3bfe123d9600249cfa80c1103edd8.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "UPDATE script SET lock = $1, created_at = now() WHERE hash = $2 AND workspace_id = $3",
+  "query": "UPDATE script SET lock = $1 WHERE hash = $2 AND workspace_id = $3",
   "describe": {
     "columns": [],
     "parameters": {
@@ -12,5 +12,5 @@
     },
     "nullable": []
   },
-  "hash": "ec47955683d811b12e82ff3e6aeafa0df46a320c436bad5eb1acc127df138a61"
+  "hash": "d697b7311430e7bd5375ec5494179f4071e3bfe123d9600249cfa80c1103edd8"
 }
diff --git a/backend/windmill-worker/src/worker_lockfiles.rs b/backend/windmill-worker/src/worker_lockfiles.rs
index c2209d9e73..f71c73f618 100644
--- a/backend/windmill-worker/src/worker_lockfiles.rs
+++ b/backend/windmill-worker/src/worker_lockfiles.rs
@@ -291,7 +291,7 @@ pub async fn handle_dependency_job<R: rsmq_async::RsmqConnection + Send + Sync +
             let hash = job.script_hash.unwrap_or(ScriptHash(0));
             let w_id = &job.workspace_id;
             sqlx::query!(
-                "UPDATE script SET lock = $1, created_at = now() WHERE hash = $2 AND workspace_id = $3",
+                "UPDATE script SET lock = $1 WHERE hash = $2 AND workspace_id = $3",
                 &content,
                 &hash.0,
                 w_id

From e0fefa22ee673b4c4c0a1aecf70334dd4988d874 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Fri, 25 Oct 2024 20:02:57 +0200
Subject: [PATCH 09/34] chore(main): release 1.412.0 (#4573)

* chore(main): release 1.412.0

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |  15 +
 backend/Cargo.lock                            | 256 +++++++++---------
 backend/Cargo.toml                            |   4 +-
 backend/windmill-api/openapi.yaml             |   2 +-
 benchmarks/lib.ts                             |   2 +-
 cli/main.ts                                   |   2 +-
 frontend/package-lock.json                    |   4 +-
 frontend/package.json                         |   2 +-
 lsp/Pipfile                                   |   4 +-
 openflow.openapi.yaml                         |   2 +-
 .../WindmillClient/WindmillClient.psd1        |   2 +-
 python-client/wmill/pyproject.toml            |   2 +-
 python-client/wmill_pg/pyproject.toml         |   2 +-
 typescript-client/jsr.json                    |   2 +-
 typescript-client/package.json                |   2 +-
 version.txt                                   |   2 +-
 16 files changed, 160 insertions(+), 145 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index adaa14ec7a..90a7dff66d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## [1.412.0](https://github.com/windmill-labs/windmill/compare/v1.411.1...v1.412.0) (2024-10-25)
+
+
+### Features
+
+* add Spotify oauth provider ([#4581](https://github.com/windmill-labs/windmill/issues/4581)) ([a46aa64](https://github.com/windmill-labs/windmill/commit/a46aa644b096e71e75b59507224ed92f7d2f99ba))
+
+
+### Bug Fixes
+
+* **app builder:** date input default value improvements ([9f43d5d](https://github.com/windmill-labs/windmill/commit/9f43d5dcd92ddcd0c0baeaa5271779520af652f4))
+* **bash:** correctly propagate sigterm for cancelled bash scripts ([134cfdb](https://github.com/windmill-labs/windmill/commit/134cfdb30eb8d29c2ecb1b78b8fabae2b6e10700))
+* do not update created_at of scripts on lockfile generation ([d1a28eb](https://github.com/windmill-labs/windmill/commit/d1a28eb7cac5f465e2b07f870a507b0cc5cc722a))
+* initialize empty smtp settings correctly ([84e0524](https://github.com/windmill-labs/windmill/commit/84e05249505c3d2f7eb7a4917f6bca503df81017))
+
 ## [1.411.1](https://github.com/windmill-labs/windmill/compare/v1.411.0...v1.411.1) (2024-10-22)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 6e3d854a2a..7a8da6eea7 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -117,9 +117,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -132,36 +132,36 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -441,7 +441,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -588,7 +588,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -636,7 +636,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -678,7 +678,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -939,9 +939,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime"
-version = "1.7.2"
+version = "1.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a065c0fe6fdbdf9f11817eb68582b2ab4aff9e9c39e986ae48f7ec576c6322db"
+checksum = "be28bd063fa91fd871d131fc8b68d7cd4c5fa0869bea68daca50dcb1cbd76be2"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-http",
@@ -983,9 +983,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-types"
-version = "1.2.7"
+version = "1.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b"
+checksum = "07c9cdc179e6afbf5d391ab08c85eac817b51c87e1892a5edb5f7bbdc64314b4"
 dependencies = [
  "base64-simd 0.8.0",
  "bytes",
@@ -1212,13 +1212,13 @@ dependencies = [
  "lazy_static",
  "lazycell",
  "log",
- "prettyplease 0.2.24",
+ "prettyplease 0.2.25",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.82",
+ "syn 2.0.85",
  "which 4.4.2",
 ]
 
@@ -1237,7 +1237,7 @@ dependencies = [
  "regex",
  "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -1381,7 +1381,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
  "syn_derive",
 ]
 
@@ -1484,7 +1484,7 @@ checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -1744,7 +1744,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -1764,9 +1764,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "combine"
@@ -2124,7 +2124,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -2172,7 +2172,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -2194,7 +2194,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core 0.20.10",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -2715,7 +2715,7 @@ dependencies = [
  "quote",
  "strum 0.25.0",
  "strum_macros 0.25.3",
- "syn 2.0.82",
+ "syn 2.0.85",
  "thiserror",
 ]
 
@@ -2907,7 +2907,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version 0.4.1",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -3004,7 +3004,7 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -3160,7 +3160,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -3180,7 +3180,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -3395,7 +3395,7 @@ checksum = "32016f1242eb82af5474752d00fd8ebcd9004bd69b462b1c91de833972d08ed4"
 dependencies = [
  "proc-macro2",
  "swc_macros_common",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -3427,7 +3427,7 @@ checksum = "e99b8b3c28ae0e84b604c75f721c21dc77afb3706076af5e8216d15fd1deaae3"
 dependencies = [
  "frunk_proc_macro_helpers",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -3439,7 +3439,7 @@ dependencies = [
  "frunk_core",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -3451,7 +3451,7 @@ dependencies = [
  "frunk_core",
  "frunk_proc_macro_helpers",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -3575,7 +3575,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -3828,7 +3828,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -4463,7 +4463,7 @@ dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -5113,7 +5113,7 @@ checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -5152,7 +5152,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
  "termcolor",
  "thiserror",
 ]
@@ -5562,7 +5562,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -5839,7 +5839,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -5865,29 +5865,29 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.6"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.6"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -6057,12 +6057,12 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.24"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "910d41a655dac3b764f1ade94821093d3610248694320cd072303a8eedcf221d"
+checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
 dependencies = [
  "proc-macro2",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -6115,7 +6115,7 @@ checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f"
 dependencies = [
  "proc-macro-rules-macros",
  "proc-macro2",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -6127,7 +6127,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -6188,7 +6188,7 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
- "syn 2.0.82",
+ "syn 2.0.85",
  "thiserror",
  "typify",
  "unicode-ident",
@@ -6208,7 +6208,7 @@ dependencies = [
  "serde_json",
  "serde_tokenstream",
  "serde_yaml",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -6251,7 +6251,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -6603,9 +6603,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -6934,7 +6934,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils",
- "syn 2.0.82",
+ "syn 2.0.85",
  "walkdir",
 ]
 
@@ -7314,7 +7314,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -7414,9 +7414,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
 
 [[package]]
 name = "serde"
-version = "1.0.212"
+version = "1.0.213"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccd4055b7e3937a5c2595e974f5bf1715a23919a595a04b5ad959bdbbb61ab04"
+checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
 dependencies = [
  "serde_derive",
 ]
@@ -7455,13 +7455,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.212"
+version = "1.0.213"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726adf8349784fb68a42e6466f49362ae039d9c5333cc6eb131f4d6f94bb9126"
+checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -7472,7 +7472,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -7547,7 +7547,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -7602,7 +7602,7 @@ dependencies = [
  "darling 0.20.10",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -7971,7 +7971,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -8042,7 +8042,7 @@ dependencies = [
  "quote",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -8065,7 +8065,7 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.82",
+ "syn 2.0.85",
  "tempfile",
  "tokio",
  "url",
@@ -8217,7 +8217,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -8271,7 +8271,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -8284,7 +8284,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -8392,7 +8392,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -8441,7 +8441,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -8526,7 +8526,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -8633,7 +8633,7 @@ checksum = "63db0adcff29d220c3d151c5b25c0eabe7e32dd936212b84cdaa1392e3130497"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -8644,7 +8644,7 @@ checksum = "f486687bfb7b5c560868f69ed2d458b880cebc9babebcb67e49f31b55c5bf847"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -8667,7 +8667,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -8683,9 +8683,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.82"
+version = "2.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021"
+checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8701,7 +8701,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -8727,7 +8727,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -8992,7 +8992,7 @@ checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -9217,7 +9217,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -9544,7 +9544,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -9781,7 +9781,7 @@ dependencies = [
  "regress",
  "schemars",
  "serde_json",
- "syn 2.0.82",
+ "syn 2.0.85",
  "thiserror",
  "unicode-ident",
 ]
@@ -9798,7 +9798,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_tokenstream",
- "syn 2.0.82",
+ "syn 2.0.85",
  "typify-impl",
 ]
 
@@ -10107,9 +10107,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "value-bag"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101"
+checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2"
 
 [[package]]
 name = "vcpkg"
@@ -10193,7 +10193,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
  "wasm-bindgen-shared",
 ]
 
@@ -10227,7 +10227,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -10260,7 +10260,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -10394,7 +10394,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "anyhow",
  "axum",
@@ -10435,7 +10435,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10520,7 +10520,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "base64 0.21.7",
  "chrono",
@@ -10538,7 +10538,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "chrono",
  "serde",
@@ -10551,7 +10551,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10597,7 +10597,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10612,7 +10612,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10634,19 +10634,19 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
 name = "windmill-parser"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10655,7 +10655,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10667,7 +10667,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10679,7 +10679,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10691,7 +10691,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10702,7 +10702,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10713,7 +10713,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10731,7 +10731,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10741,14 +10741,14 @@ dependencies = [
  "quote",
  "regex",
  "serde_json",
- "syn 2.0.82",
+ "syn 2.0.85",
  "toml 0.7.8",
  "windmill-parser",
 ]
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10760,7 +10760,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10778,7 +10778,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10799,7 +10799,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -10809,7 +10809,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10842,7 +10842,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -10852,7 +10852,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.411.1"
+version = "1.412.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -11218,7 +11218,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
  "synstructure",
 ]
 
@@ -11240,7 +11240,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -11260,7 +11260,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.82",
+ "syn 2.0.85",
  "synstructure",
 ]
 
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 11a097d2b7..3aa4965c23 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.411.1"
+version = "1.412.0"
 authors.workspace = true
 edition.workspace = true
 
@@ -28,7 +28,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.411.1"
+version = "1.412.0"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 969bdb0cac..366f26ccc0 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.411.1
+  version: 1.412.0
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index fda9176483..f2a96e160a 100644
--- a/benchmarks/lib.ts
+++ b/benchmarks/lib.ts
@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
 import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
 import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
 
-export const VERSION = "v1.411.1";
+export const VERSION = "v1.412.0";
 
 export async function login(email: string, password: string): Promise<string> {
   return await windmill.UserService.login({
diff --git a/cli/main.ts b/cli/main.ts
index 0fc9384525..b35fe1ddfd 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.411.1";
+export const VERSION = "1.412.0";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 7761d4f4a6..0a3c0c0b2e 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.411.1",
+	"version": "1.412.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.411.1",
+			"version": "1.412.0",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index dee26b8333..472cf8d8e0 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.411.1",
+	"version": "1.412.0",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 3ad5ebf804..f941cd2765 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.411.1"
-wmill_pg = ">=1.411.1"
+wmill = ">=1.412.0"
+wmill_pg = ">=1.412.0"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 6ce153606e..12139e1333 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.411.1
+  version: 1.412.0
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 6585bf264d..41037e86b0 100644
--- a/powershell-client/WindmillClient/WindmillClient.psd1
+++ b/powershell-client/WindmillClient/WindmillClient.psd1
@@ -12,7 +12,7 @@
 RootModule = 'WindmillClient.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.411.1'
+ModuleVersion = '1.412.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 6a51dae631..0f1406f6ff 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.411.1"
+version = "1.412.0"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/python-client/wmill_pg/pyproject.toml b/python-client/wmill_pg/pyproject.toml
index 8bb05b8084..6842abd95e 100644
--- a/python-client/wmill_pg/pyproject.toml
+++ b/python-client/wmill_pg/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill-pg"
-version = "1.411.1"
+version = "1.412.0"
 description = "An extension client for the wmill client library focused on pg"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/typescript-client/jsr.json b/typescript-client/jsr.json
index 4d617e7f3b..c14bba4800 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.411.1",
+  "version": "1.412.0",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./client.ts"]
diff --git a/typescript-client/package.json b/typescript-client/package.json
index bab741796c..fa29cc0a9c 100644
--- a/typescript-client/package.json
+++ b/typescript-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "windmill-client",
   "description": "Windmill SDK client for browsers and Node.js",
-  "version": "1.411.1",
+  "version": "1.412.0",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index d8999709d6..95cca4d565 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.411.1
+1.412.0

From 37eb38b5fa26ea31ce1c73857e99cc9c614a3fa2 Mon Sep 17 00:00:00 2001
From: Alexander Petric <alpetric@users.noreply.github.com>
Date: Sat, 26 Oct 2024 02:43:18 -0400
Subject: [PATCH 10/34] fix(docs): smtp setup documentation link (#4590)

---
 frontend/src/lib/components/InstanceSettings.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte
index 024ff0d1a9..3b42bd0e10 100644
--- a/frontend/src/lib/components/InstanceSettings.svelte
+++ b/frontend/src/lib/components/InstanceSettings.svelte
@@ -277,7 +277,7 @@
 						<div class="text-secondary pb-4 text-xs"
 							>Setting SMTP unlocks sending emails upon adding new users to the workspace or the
 							instance or sending critical alerts.
-							<a target="_blank" href="https://www.windmill.dev/docs/misc/setup_smtp">Learn more</a
+							<a target="_blank" href="https://www.windmill.dev/docs/advanced/instance_settings#smtp">Learn more</a
 							></div
 						>
 					{:else if category == 'Registries'}

From 85de44cb93c1ad2a2da0cc8657829a985ce20077 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Mon, 28 Oct 2024 00:47:19 +0100
Subject: [PATCH 11/34] feat: autoscaling v0 (#4593)

* all

* all

all

all

all

all

all

all

all

all

* all

* all

* nits

* nits
---
 ...65c01f40bae70af3683f1f09748f6020f0d49.json |  26 --
 ...d95226bd94ca3facb92a620ffa59dacad6705.json |  28 ++
 ...e89fc04765191f251945d14bbe78718714f6e.json |  39 ++
 ...4cf963ee26a3ad3a0a3d8dc064cb14c8fd9a6.json |  52 +++
 backend/Cargo.lock                            |  16 +
 backend/Cargo.toml                            |   5 +-
 backend/ee-repo-ref.txt                       |   2 +-
 .../20241024125924_autoscaling.down.sql       |   3 +
 .../20241024125924_autoscaling.up.sql         |  13 +
 backend/src/main.rs                           |   7 +-
 backend/src/monitor.rs                        |  26 +-
 backend/windmill-api/openapi.yaml             |  41 ++
 backend/windmill-api/src/configs.rs           |  28 ++
 backend/windmill-api/src/jobs.rs              |  31 +-
 backend/windmill-autoscaling/Cargo.toml       |  24 ++
 .../src/autoscaling_ee.rs                     |   6 +
 backend/windmill-autoscaling/src/lib.rs       |   2 +
 backend/windmill-common/src/lib.rs            |   4 +-
 backend/windmill-common/src/queue.rs          |  16 +
 backend/windmill-worker/src/pg_executor.rs    |   2 +-
 .../components/AutoscalingConfigEditor.svelte | 364 ++++++++++++++++++
 .../lib/components/AutoscalingEvents.svelte   |  73 ++++
 .../lib/components/InstanceSettings.svelte    |   4 +-
 .../src/lib/components/OAuthSetting.svelte    |   2 +-
 ...rkspaceGroup.svelte => WorkerGroup.svelte} |  26 +-
 .../flows/content/FlowSettings.svelte         |   2 +-
 frontend/src/lib/components/worker_group.ts   |  39 ++
 frontend/src/lib/utils.ts                     |   6 +-
 .../(root)/(logged)/workers/+page.svelte      |  52 +--
 29 files changed, 833 insertions(+), 106 deletions(-)
 delete mode 100644 backend/.sqlx/query-02b516dac764662194db1bc33e365c01f40bae70af3683f1f09748f6020f0d49.json
 create mode 100644 backend/.sqlx/query-1f5f0858909eb5bac63c4e3b1add95226bd94ca3facb92a620ffa59dacad6705.json
 create mode 100644 backend/.sqlx/query-4eca060026a0cb19c5794cd56ace89fc04765191f251945d14bbe78718714f6e.json
 create mode 100644 backend/.sqlx/query-6d134b137ae81534e145fc5b6474cf963ee26a3ad3a0a3d8dc064cb14c8fd9a6.json
 create mode 100644 backend/migrations/20241024125924_autoscaling.down.sql
 create mode 100644 backend/migrations/20241024125924_autoscaling.up.sql
 create mode 100644 backend/windmill-autoscaling/Cargo.toml
 create mode 100644 backend/windmill-autoscaling/src/autoscaling_ee.rs
 create mode 100644 backend/windmill-autoscaling/src/lib.rs
 create mode 100644 backend/windmill-common/src/queue.rs
 create mode 100644 frontend/src/lib/components/AutoscalingConfigEditor.svelte
 create mode 100644 frontend/src/lib/components/AutoscalingEvents.svelte
 rename frontend/src/lib/components/{WorkspaceGroup.svelte => WorkerGroup.svelte} (96%)
 create mode 100644 frontend/src/lib/components/worker_group.ts

diff --git a/backend/.sqlx/query-02b516dac764662194db1bc33e365c01f40bae70af3683f1f09748f6020f0d49.json b/backend/.sqlx/query-02b516dac764662194db1bc33e365c01f40bae70af3683f1f09748f6020f0d49.json
deleted file mode 100644
index 99f3606bcd..0000000000
--- a/backend/.sqlx/query-02b516dac764662194db1bc33e365c01f40bae70af3683f1f09748f6020f0d49.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT tag, count(*) as count FROM queue WHERE\n                scheduled_for <= now() - ('3 seconds')::interval AND running = false\n                GROUP BY tag",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "tag",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
-        "name": "count",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      null
-    ]
-  },
-  "hash": "02b516dac764662194db1bc33e365c01f40bae70af3683f1f09748f6020f0d49"
-}
diff --git a/backend/.sqlx/query-1f5f0858909eb5bac63c4e3b1add95226bd94ca3facb92a620ffa59dacad6705.json b/backend/.sqlx/query-1f5f0858909eb5bac63c4e3b1add95226bd94ca3facb92a620ffa59dacad6705.json
new file mode 100644
index 0000000000..0adff2fe2c
--- /dev/null
+++ b/backend/.sqlx/query-1f5f0858909eb5bac63c4e3b1add95226bd94ca3facb92a620ffa59dacad6705.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO autoscaling_event (worker_group, event_type, desired_workers, reason) VALUES ($1, $2, $3, $4)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        {
+          "Custom": {
+            "name": "autoscaling_event_type",
+            "kind": {
+              "Enum": [
+                "full_scaleout",
+                "scalein",
+                "scaleout"
+              ]
+            }
+          }
+        },
+        "Int4",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "1f5f0858909eb5bac63c4e3b1add95226bd94ca3facb92a620ffa59dacad6705"
+}
diff --git a/backend/.sqlx/query-4eca060026a0cb19c5794cd56ace89fc04765191f251945d14bbe78718714f6e.json b/backend/.sqlx/query-4eca060026a0cb19c5794cd56ace89fc04765191f251945d14bbe78718714f6e.json
new file mode 100644
index 0000000000..3b812a53db
--- /dev/null
+++ b/backend/.sqlx/query-4eca060026a0cb19c5794cd56ace89fc04765191f251945d14bbe78718714f6e.json
@@ -0,0 +1,39 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT event_type::AUTOSCALING_EVENT_TYPE AS \"event_type: _\", EXTRACT(EPOCH FROM (NOW() - applied_at))::int as seconds_ago FROM autoscaling_event WHERE worker_group = $1 ORDER BY applied_at DESC LIMIT 1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "event_type: _",
+        "type_info": {
+          "Custom": {
+            "name": "autoscaling_event_type",
+            "kind": {
+              "Enum": [
+                "full_scaleout",
+                "scalein",
+                "scaleout"
+              ]
+            }
+          }
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "seconds_ago",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      null
+    ]
+  },
+  "hash": "4eca060026a0cb19c5794cd56ace89fc04765191f251945d14bbe78718714f6e"
+}
diff --git a/backend/.sqlx/query-6d134b137ae81534e145fc5b6474cf963ee26a3ad3a0a3d8dc064cb14c8fd9a6.json b/backend/.sqlx/query-6d134b137ae81534e145fc5b6474cf963ee26a3ad3a0a3d8dc064cb14c8fd9a6.json
new file mode 100644
index 0000000000..03351cdeab
--- /dev/null
+++ b/backend/.sqlx/query-6d134b137ae81534e145fc5b6474cf963ee26a3ad3a0a3d8dc064cb14c8fd9a6.json
@@ -0,0 +1,52 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT id, worker_group, event_type::text, desired_workers, reason, applied_at FROM autoscaling_event WHERE worker_group = $1 ORDER BY applied_at DESC LIMIT 5",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 1,
+        "name": "worker_group",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "event_type",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 3,
+        "name": "desired_workers",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 4,
+        "name": "reason",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 5,
+        "name": "applied_at",
+        "type_info": "Timestamp"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      null,
+      false,
+      true,
+      false
+    ]
+  },
+  "hash": "6d134b137ae81534e145fc5b6474cf963ee26a3ad3a0a3d8dc064cb14c8fd9a6"
+}
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 7a8da6eea7..0d39293912 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -10426,6 +10426,7 @@ dependencies = [
  "uuid 1.11.0",
  "windmill-api",
  "windmill-api-client",
+ "windmill-autoscaling",
  "windmill-common",
  "windmill-git-sync",
  "windmill-indexer",
@@ -10549,6 +10550,21 @@ dependencies = [
  "windmill-common",
 ]
 
+[[package]]
+name = "windmill-autoscaling"
+version = "1.412.0"
+dependencies = [
+ "anyhow",
+ "rsmq_async",
+ "serde",
+ "serde_json",
+ "sqlx",
+ "tracing",
+ "uuid 1.11.0",
+ "windmill-common",
+ "windmill-queue",
+]
+
 [[package]]
 name = "windmill-common"
 version = "1.412.0"
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 3aa4965c23..700810d20a 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -13,6 +13,7 @@ members = [
     "./windmill-common",
     "./windmill-audit",
     "./windmill-git-sync",
+    "./windmill-autoscaling",
     "./windmill-indexer",
     "./windmill-macros",
     "./parsers/windmill-parser",
@@ -45,7 +46,7 @@ lto = "thin"
 
 [features]
 default = []
-enterprise = ["windmill-worker/enterprise", "windmill-queue/enterprise", "windmill-api/enterprise", "windmill-git-sync/enterprise", "windmill-common/prometheus", "windmill-common/enterprise", "windmill-indexer/enterprise"]
+enterprise = ["windmill-worker/enterprise", "windmill-queue/enterprise", "windmill-api/enterprise", "dep:windmill-autoscaling", "windmill-autoscaling/enterprise", "windmill-git-sync/enterprise", "windmill-common/prometheus", "windmill-common/enterprise", "windmill-indexer/enterprise"]
 enterprise_saml = ["windmill-api/enterprise_saml"]
 stripe = ["windmill-api/stripe"]
 benchmark = ["windmill-api/benchmark", "windmill-worker/benchmark", "windmill-queue/benchmark", "windmill-common/benchmark"]
@@ -72,6 +73,7 @@ windmill-git-sync.workspace = true
 windmill-api = { workspace = true, default-features = false }
 windmill-worker.workspace = true
 windmill-indexer = { workspace = true, optional = true }
+windmill-autoscaling = { workspace = true, optional = true }
 futures.workspace = true
 tracing.workspace = true
 sqlx.workspace = true
@@ -116,6 +118,7 @@ windmill-worker = { path = "./windmill-worker" }
 windmill-common = { path = "./windmill-common", default-features = false }
 windmill-audit = { path = "./windmill-audit" }
 windmill-git-sync = { path = "./windmill-git-sync" }
+windmill-autoscaling = { path = "./windmill-autoscaling" }
 windmill-indexer = {path = "./windmill-indexer"}
 windmill-macros = {path = "./windmill-macros"}
 windmill-parser = { path = "./parsers/windmill-parser" }
diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index 0b60c124b1..07ac755375 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-d61c163e0a311ecd86d1398aff883eaea8d0b09a
+816abd18b24831f251e11d44d274c8acef89df12
\ No newline at end of file
diff --git a/backend/migrations/20241024125924_autoscaling.down.sql b/backend/migrations/20241024125924_autoscaling.down.sql
new file mode 100644
index 0000000000..8f536a7553
--- /dev/null
+++ b/backend/migrations/20241024125924_autoscaling.down.sql
@@ -0,0 +1,3 @@
+-- Add down migration script here
+DROP TABLE autoscaling_event;
+DROP TYPE autoscaling_event_type;
diff --git a/backend/migrations/20241024125924_autoscaling.up.sql b/backend/migrations/20241024125924_autoscaling.up.sql
new file mode 100644
index 0000000000..fa3b161d56
--- /dev/null
+++ b/backend/migrations/20241024125924_autoscaling.up.sql
@@ -0,0 +1,13 @@
+-- Add up migration script here
+CREATE TYPE AUTOSCALING_EVENT_TYPE AS ENUM ('full_scaleout', 'scalein', 'scaleout');
+
+CREATE TABLE autoscaling_event (
+    id SERIAL PRIMARY KEY,
+    worker_group TEXT NOT NULL,
+    event_type AUTOSCALING_EVENT_TYPE NOT NULL,
+    desired_workers INTEGER NOT NULL,
+    applied_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    reason TEXT
+);
+
+CREATE INDEX autoscaling_event_worker_group_idx ON autoscaling_event (worker_group, applied_at);
\ No newline at end of file
diff --git a/backend/src/main.rs b/backend/src/main.rs
index 84deb4e6b5..f240961734 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -548,8 +548,11 @@ Windmill Community Edition {GIT_VERSION}
                     rx.recv().await?;
                 }
             }
-            tracing::info!("Starting phase 2 of shutdown");
-            killpill_phase2_tx.send(())?;
+            if killpill_phase2_tx.receiver_count() > 0 {
+                tracing::info!("Starting phase 2 of shutdown");
+                killpill_phase2_tx.send(())?;
+                tracing::info!("Phase 2 of shutdown completed");
+            }
             Ok(()) as anyhow::Result<()>
         };
 
diff --git a/backend/src/monitor.rs b/backend/src/monitor.rs
index 576a38de72..17dd833d62 100644
--- a/backend/src/monitor.rs
+++ b/backend/src/monitor.rs
@@ -27,7 +27,7 @@ use windmill_api::{
     DEFAULT_BODY_LIMIT, IS_SECURE, OAUTH_CLIENTS, REQUEST_SIZE_LIMIT, SAML_METADATA, SCIM_TOKEN,
 };
 #[cfg(feature = "enterprise")]
-use windmill_common::ee::{worker_groups_alerts, jobs_waiting_alerts};
+use windmill_common::ee::{jobs_waiting_alerts, worker_groups_alerts};
 use windmill_common::{
     auth::JWT_SECRET,
     ee::CriticalErrorChannel,
@@ -1068,6 +1068,15 @@ pub async fn monitor_db(
         }
     };
 
+    let apply_autoscaling_f = async {
+        #[cfg(feature = "enterprise")]
+        if server_mode && !initial_load {
+            if let Err(e) = windmill_autoscaling::apply_all_autoscaling(db).await {
+                tracing::error!("Error applying autoscaling: {:?}", e);
+            }
+        }
+    };
+
     join!(
         expired_items_f,
         zombie_jobs_f,
@@ -1075,6 +1084,7 @@ pub async fn monitor_db(
         verify_license_key_f,
         worker_groups_alerts_f,
         jobs_waiting_alerts_f,
+        apply_autoscaling_f,
     );
 }
 
@@ -1092,19 +1102,11 @@ pub async fn expose_queue_metrics(db: &Pool<Postgres>) {
         .unwrap_or(true);
 
     if metrics_enabled || save_metrics {
-        let queue_counts = sqlx::query!(
-            "SELECT tag, count(*) as count FROM queue WHERE
-                scheduled_for <= now() - ('3 seconds')::interval AND running = false
-                GROUP BY tag"
-        )
-        .fetch_all(db)
-        .await
-        .ok()
-        .unwrap_or_else(|| vec![]);
+        let queue_counts = windmill_common::queue::get_queue_counts(db).await;
 
         for q in queue_counts {
-            let count = q.count.unwrap_or(0);
-            let tag = q.tag;
+            let count = q.1;
+            let tag = q.0;
             if metrics_enabled {
                 let metric = (*QUEUE_COUNT).with_label_values(&[&tag]);
                 metric.set(count as i64);
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 366f26ccc0..e854bff21d 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -8198,6 +8198,29 @@ paths:
                 items:
                   $ref: "#/components/schemas/Config"
 
+  /configs/list_autoscaling_events/{worker_group}:
+    get:
+      summary: List autoscaling events
+      operationId: listAutoscalingEvents
+      tags:
+        - config
+      parameters:
+        - name: worker_group
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          description: List of autoscaling events
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: "#/components/schemas/AutoscalingEvent"
+
+
   /w/{workspace}/acls/get/{kind}/{path}:
     get:
       summary: get granular acls
@@ -12469,3 +12492,21 @@ components:
       properties:
         dancer:
           type: string
+
+    AutoscalingEvent:
+      type: object
+      properties:
+        id:
+          type: integer
+          format: int64
+        worker_group:
+          type: string
+        event_type:
+          type: string
+        desired_workers:
+          type: integer
+        reason:
+          type: string
+        applied_at:
+          type: string
+          format: date-time
diff --git a/backend/windmill-api/src/configs.rs b/backend/windmill-api/src/configs.rs
index 64c8a1884f..81b65216e0 100644
--- a/backend/windmill-api/src/configs.rs
+++ b/backend/windmill-api/src/configs.rs
@@ -29,6 +29,10 @@ pub fn global_service() -> Router {
         .route("/update/:name", post(update_config).delete(delete_config))
         .route("/get/:name", get(get_config))
         .route("/list", get(list_configs))
+        .route(
+            "/list_autoscaling_events/:worker_group",
+            get(list_autoscaling_events),
+        )
 }
 
 #[derive(Serialize, Deserialize, FromRow)]
@@ -177,6 +181,30 @@ async fn delete_config(
     Ok(format!("Deleted config {name}"))
 }
 
+#[derive(Serialize, Deserialize, FromRow)]
+struct AutoscalingEvent {
+    id: i64,
+    worker_group: String,
+    event_type: Option<String>,
+    desired_workers: i32,
+    reason: Option<String>,
+    applied_at: chrono::NaiveDateTime,
+}
+
+async fn list_autoscaling_events(
+    Extension(db): Extension<DB>,
+    Path(worker_group): Path<String>,
+) -> error::JsonResult<Vec<AutoscalingEvent>> {
+    let events = sqlx::query_as!(
+        AutoscalingEvent,
+        "SELECT id, worker_group, event_type::text, desired_workers, reason, applied_at FROM autoscaling_event WHERE worker_group = $1 ORDER BY applied_at DESC LIMIT 5",
+        worker_group
+    )
+    .fetch_all(&db)
+    .await?;
+    Ok(Json(events))
+}
+
 #[cfg(feature = "enterprise")]
 async fn list_configs(
     authed: ApiAuthed,
diff --git a/backend/windmill-api/src/jobs.rs b/backend/windmill-api/src/jobs.rs
index 53cd958c6f..7244b2be17 100644
--- a/backend/windmill-api/src/jobs.rs
+++ b/backend/windmill-api/src/jobs.rs
@@ -2815,7 +2815,6 @@ pub async fn run_flow_by_path_inner(
     let flow_path = flow_path.to_path();
     check_scopes(&authed, || format!("run:flow/{flow_path}"))?;
 
-
     let (tag, dedicated_worker, has_preprocessor) = sqlx::query!(
         "SELECT tag, dedicated_worker, flow_version.value->>'preprocessor_module' IS NOT NULL as has_preprocessor 
         FROM flow 
@@ -2910,7 +2909,6 @@ pub async fn restart_flow(
 ) -> error::Result<(StatusCode, String)> {
     check_license_key_valid().await?;
 
-
     let completed_job = sqlx::query_as::<_, CompletedJob>(
         "SELECT *, result->'wm_labels' as labels from completed_job WHERE id = $1 and workspace_id = $2",
     )
@@ -3010,7 +3008,6 @@ pub async fn run_script_by_path_inner(
 
     check_scopes(&authed, || format!("run:script/{script_path}"))?;
 
-
     let (job_payload, tag, _delete_after_use, timeout) =
         script_path_to_payload(script_path, &db, &w_id, run_query.skip_preprocessor).await?;
     let scheduled_for = run_query.get_scheduled_for(&db).await?;
@@ -3018,7 +3015,6 @@ pub async fn run_script_by_path_inner(
     let tag = run_query.tag.clone().or(tag);
     check_tag_available_for_workspace(&w_id, &tag).await?;
 
-
     let tx = PushIsolationLevel::Isolated(user_db, authed.clone().into(), rsmq);
 
     let (uuid, tx) = push(
@@ -3067,7 +3063,6 @@ pub async fn run_workflow_as_code(
     Query(wkflow_query): Query<WorkflowAsCodeQuery>,
     Json(task): Json<WorkflowTask>,
 ) -> error::Result<(StatusCode, String)> {
-
     let mut i = 1;
 
     if *CLOUD_HOSTED {
@@ -3079,23 +3074,18 @@ pub async fn run_workflow_as_code(
     check_license_key_valid().await?;
     check_tag_available_for_workspace(&w_id, &run_query.tag).await?;
 
-
     if *CLOUD_HOSTED {
         tracing::info!("workflow_as_code_tracing id {i} ");
         i += 1;
     }
 
-
     let job = get_queued_job(&job_id, &w_id, &db).await?;
 
-
-
     if *CLOUD_HOSTED {
         tracing::info!("workflow_as_code_tracing id {i} ");
         i += 1;
     }
 
-
     let job = not_found_if_none(job, "Queued Job", &job_id.to_string())?;
     let (job_payload, tag, _delete_after_use, timeout) = match job.job_kind {
         JobKind::Preview => (
@@ -3118,18 +3108,12 @@ pub async fn run_workflow_as_code(
             run_query.timeout,
         ),
         JobKind::Script => {
-            script_path_to_payload(
-                job.script_path(),
-                &db,
-                &w_id,
-                run_query.skip_preprocessor,
-            )
-            .await?
+            script_path_to_payload(job.script_path(), &db, &w_id, run_query.skip_preprocessor)
+                .await?
         }
         _ => return Err(anyhow::anyhow!("Not supported").into()),
     };
 
-
     if *CLOUD_HOSTED {
         tracing::info!("workflow_as_code_tracing id {i} ");
         i += 1;
@@ -3143,22 +3127,18 @@ pub async fn run_workflow_as_code(
 
     let tag = run_query.tag.clone().or(tag).or(Some(job.tag));
 
-
     if *CLOUD_HOSTED {
         tracing::info!("workflow_as_code_tracing id {i} ");
         i += 1;
     }
 
-
     let tx = PushIsolationLevel::Isolated(user_db, authed.clone().into(), rsmq);
 
-
     if *CLOUD_HOSTED {
         tracing::info!("workflow_as_code_tracing id {i} ");
         i += 1;
     }
 
-
     let (uuid, mut tx) = push(
         &db,
         tx,
@@ -3185,7 +3165,6 @@ pub async fn run_workflow_as_code(
     )
     .await?;
 
-
     if *CLOUD_HOSTED {
         tracing::info!("workflow_as_code_tracing id {i} ");
         i += 1;
@@ -3203,16 +3182,13 @@ pub async fn run_workflow_as_code(
         tracing::info!("Skipping update of flow status for job {job_id} in workspace {w_id}");
     }
 
-
     if *CLOUD_HOSTED {
         tracing::info!("workflow_as_code_tracing id {i} ");
         i += 1;
     }
 
-
     tx.commit().await?;
 
-
     if *CLOUD_HOSTED {
         tracing::info!("workflow_as_code_tracing id {i} ");
     }
@@ -3866,7 +3842,6 @@ pub async fn run_wait_result_flow_by_path_internal(
     let flow_path = flow_path.to_path();
     check_scopes(&authed, || format!("run:flow/{flow_path}"))?;
 
-
     let scheduled_for = run_query.get_scheduled_for(&db).await?;
 
     let (tag, dedicated_worker, early_return, has_preprocessor) = sqlx::query!(
@@ -4362,7 +4337,6 @@ async fn add_batch_jobs(
             }
         }
         "flow" => {
-
             let mut uuids: Vec<Uuid> = Vec::new();
             let payload = if let Some(ref fv) = batch_info.flow_value {
                 JobPayload::RawFlow { value: fv.clone(), path: None, restarted_from: None }
@@ -4580,7 +4554,6 @@ pub async fn run_job_by_hash_inner(
     #[cfg(feature = "enterprise")]
     check_license_key_valid().await?;
 
-
     let hash = script_hash.0;
     let (
         path,
diff --git a/backend/windmill-autoscaling/Cargo.toml b/backend/windmill-autoscaling/Cargo.toml
new file mode 100644
index 0000000000..7aada6f904
--- /dev/null
+++ b/backend/windmill-autoscaling/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "windmill-autoscaling"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+
+[lib]
+name = "windmill_autoscaling"
+path = "./src/lib.rs"
+
+[features]
+enterprise = ["windmill-queue/enterprise", "windmill-common/enterprise"]
+default = []
+
+[dependencies]
+uuid.workspace = true
+serde.workspace = true
+sqlx.workspace = true
+serde_json.workspace = true
+tracing.workspace = true
+windmill-common = { workspace = true, default-features = false }
+windmill-queue.workspace = true
+rsmq_async.workspace = true
+anyhow.workspace = true
\ No newline at end of file
diff --git a/backend/windmill-autoscaling/src/autoscaling_ee.rs b/backend/windmill-autoscaling/src/autoscaling_ee.rs
new file mode 100644
index 0000000000..1c9defbede
--- /dev/null
+++ b/backend/windmill-autoscaling/src/autoscaling_ee.rs
@@ -0,0 +1,6 @@
+use windmill_common::DB;
+
+pub async fn apply_all_autoscaling(_db: &DB) -> anyhow::Result<()> {
+    // Autoscaling is an ee feature
+    Ok(())
+}
diff --git a/backend/windmill-autoscaling/src/lib.rs b/backend/windmill-autoscaling/src/lib.rs
new file mode 100644
index 0000000000..28b9319244
--- /dev/null
+++ b/backend/windmill-autoscaling/src/lib.rs
@@ -0,0 +1,2 @@
+mod autoscaling_ee;
+pub use autoscaling_ee::*;
diff --git a/backend/windmill-common/src/lib.rs b/backend/windmill-common/src/lib.rs
index 0f25e12e46..bcac7b85fb 100644
--- a/backend/windmill-common/src/lib.rs
+++ b/backend/windmill-common/src/lib.rs
@@ -17,6 +17,7 @@ use scripts::ScriptLang;
 use sqlx::{Pool, Postgres};
 
 pub mod apps;
+pub mod auth;
 #[cfg(feature = "benchmark")]
 pub mod bench;
 pub mod db;
@@ -32,9 +33,8 @@ pub mod job_s3_helpers_ee;
 pub mod jobs;
 pub mod more_serde;
 pub mod oauth2;
+pub mod queue;
 pub mod s3_helpers;
-
-pub mod auth;
 pub mod schedule;
 pub mod scripts;
 pub mod server;
diff --git a/backend/windmill-common/src/queue.rs b/backend/windmill-common/src/queue.rs
new file mode 100644
index 0000000000..6cbb5611c5
--- /dev/null
+++ b/backend/windmill-common/src/queue.rs
@@ -0,0 +1,16 @@
+use std::collections::HashMap;
+
+use sqlx::{Pool, Postgres};
+
+pub async fn get_queue_counts(db: &Pool<Postgres>) -> HashMap<String, u32> {
+    sqlx::query_as::<_, (String, i64)>(
+        "SELECT tag, count(*) as count FROM queue WHERE
+            scheduled_for <= now() - ('3 seconds')::interval AND running = false
+            GROUP BY tag",
+    )
+    .fetch_all(db)
+    .await
+    .ok()
+    .map(|v| v.into_iter().map(|(k, v)| (k, v as u32)).collect())
+    .unwrap_or_else(|| HashMap::new())
+}
diff --git a/backend/windmill-worker/src/pg_executor.rs b/backend/windmill-worker/src/pg_executor.rs
index 7702b73b03..f27eeee12b 100644
--- a/backend/windmill-worker/src/pg_executor.rs
+++ b/backend/windmill-worker/src/pg_executor.rs
@@ -85,7 +85,7 @@ fn do_postgresql_inner<'a>(
             let arg_t = arg
                 .otyp
                 .as_ref()
-                .ok_or_else(|| anyhow::anyhow!("Missing otyp for pg arg"))?;
+                .ok_or_else(|| anyhow::anyhow!("Missing otzyp for pg arg"))?;
             let typ = &arg.typ;
             let param = convert_val(value, arg_t, typ)?;
             query_params.push(param);
diff --git a/frontend/src/lib/components/AutoscalingConfigEditor.svelte b/frontend/src/lib/components/AutoscalingConfigEditor.svelte
new file mode 100644
index 0000000000..3f763d835e
--- /dev/null
+++ b/frontend/src/lib/components/AutoscalingConfigEditor.svelte
@@ -0,0 +1,364 @@
+<script lang="ts">
+	import type { AutoscalingConfig } from './worker_group'
+	import Toggle from './Toggle.svelte'
+	import Section from './Section.svelte'
+	import Tooltip from './Tooltip.svelte'
+	import ToggleButtonGroup from './common/toggleButton-v2/ToggleButtonGroup.svelte'
+	import ToggleButton from './common/toggleButton-v2/ToggleButton.svelte'
+	import { Button } from './common'
+	import { ExternalLink } from 'lucide-svelte'
+	import { createEventDispatcher } from 'svelte'
+	import Label from './Label.svelte'
+	import MultiSelect from 'svelte-multiselect'
+
+	export let config: AutoscalingConfig | undefined
+	export let worker_tags: string[] | undefined
+
+	const dispatch = createEventDispatcher()
+	let test_input: number = 3
+</script>
+
+<div class="flex flex-row gap-16 pt-2">
+	<div class="space-y-4 flex flex-col gap-1 max-w-xs text-sm">
+		<h5>Rules</h5>
+		<Toggle
+			checked={config?.enabled ?? false}
+			options={{ right: 'Enabled' }}
+			on:change={(e) => {
+				dispatch('dirty')
+				if (e.detail) {
+					if (!config) {
+						config = {
+							enabled: true,
+							min_workers: 3,
+							max_workers: 10,
+							integration: { type: 'dryrun' }
+						}
+					} else {
+						config.enabled = true
+					}
+				} else {
+					config = {
+						...(config ?? {
+							min_workers: 3,
+							max_workers: 10,
+							integration: { type: 'dryrun' }
+						}),
+						enabled: false
+					}
+				}
+			}}
+		/>
+		<!-- svelte-ignore a11y-label-has-associated-control -->
+		<label>
+			Min # of Workers
+			{#if config !== undefined}
+				<input on:input={() => dispatch('dirty')} type="number" bind:value={config.min_workers} />
+				{#if config.min_workers !== undefined && config.min_workers != undefined && config.min_workers > config.max_workers}
+					<div class="text-red-600 text-xs whitespace-nowrap"
+						>Minimum cannot be {'>'} to Maximum</div
+					>
+				{/if}
+			{:else}
+				<input type="number" disabled />
+			{/if}
+		</label>
+		<!-- svelte-ignore a11y-label-has-associated-control -->
+		<label>
+			Max # of Workers
+			{#if config !== undefined}
+				<input on:input={() => dispatch('dirty')} type="number" bind:value={config.max_workers} />
+			{:else}
+				<input type="number" disabled />
+			{/if}
+		</label>
+		<div class="p-2">
+			<Section label="Advanced" small collapsable={true}>
+				<div class="flex flex-col gap-2 text-2xs">
+					<!-- svelte-ignore a11y-label-has-associated-control -->
+					<label>
+						Cooldown seconds after an incremental scale-in/out
+						{#if config !== undefined}
+							<input
+								on:input={() => dispatch('dirty')}
+								type="number"
+								step="1"
+								min="30"
+								placeholder="300"
+								bind:value={config.cooldown_seconds}
+							/>
+						{:else}
+							<input type="number" disabled />
+						{/if}
+					</label>
+					<!-- svelte-ignore a11y-label-has-associated-control -->
+					<label>
+						Cooldown seconds after a full scale out
+						{#if config !== undefined}
+							<input
+								on:input={() => dispatch('dirty')}
+								type="number"
+								step="1"
+								min="30"
+								placeholder="1500"
+								bind:value={config.full_scale_cooldown_seconds}
+							/>
+						{:else}
+							<input type="number" disabled />
+						{/if}
+					</label>
+					<!-- svelte-ignore a11y-label-has-associated-control -->
+					<label>
+						Num jobs waiting to trigger an incremental scale-out
+						{#if config !== undefined}
+							<input
+								on:input={() => dispatch('dirty')}
+								type="number"
+								bind:value={config.inc_scale_num_jobs_waiting}
+								placeholder="1"
+							/>
+						{:else}
+							<input type="number" disabled />
+						{/if}
+					</label>
+
+					<!-- svelte-ignore a11y-label-has-associated-control -->
+					<label>
+						Num jobs waiting to trigger a full scale out <Tooltip
+							>Default: max_workers, full scale out = scale out to max workers</Tooltip
+						>
+						{#if config !== undefined}
+							<input
+								on:input={() => dispatch('dirty')}
+								type="number"
+								placeholder="max workers"
+								bind:value={config.full_scale_jobs_waiting}
+							/>
+						{:else}
+							<input type="number" disabled />
+						{/if}
+					</label>
+					<!-- svelte-ignore a11y-label-has-associated-control -->
+					<label>
+						Occupancy rate % threhsold to go below to trigger a scale-in (decrease) <Tooltip
+							>Default: 25%, need to go below average of all of 15s, 5m and 30m occupancy rates</Tooltip
+						>
+						{#if config !== undefined}
+							<input
+								on:input={() => dispatch('dirty')}
+								type="number"
+								step="1"
+								min="0"
+								max="100"
+								placeholder="25"
+								bind:value={config.dec_scale_occupancy_rate}
+							/>
+						{:else}
+							<input type="number" step="0.01" disabled />
+						{/if}
+					</label>
+					<!-- svelte-ignore a11y-label-has-associated-control -->
+					<label>
+						Occupancy rate threshold to exceed to trigger an incremental scale-out (increase) <Tooltip
+							>Default: 75%, need to exceed average of all of 15s, 5m and 30m occupancy rates</Tooltip
+						>
+						{#if config !== undefined}
+							<input
+								on:input={() => dispatch('dirty')}
+								type="number"
+								step="1"
+								min="0"
+								max="100"
+								placeholder="75"
+								bind:value={config.inc_scale_occupancy_rate}
+							/>
+						{:else}
+							<input type="number" step="0.01" disabled />
+						{/if}
+					</label>
+					<!-- svelte-ignore a11y-label-has-associated-control -->
+					<label>
+						Num workers to scale-in/out by when incremental <Tooltip
+							>Default: (max_workers - min_workers) / 5</Tooltip
+						>
+						{#if config !== undefined}
+							<input
+								on:input={() => dispatch('dirty')}
+								type="number"
+								step="1"
+								min="1"
+								placeholder="(max_workers - min_workers) / 5"
+								bind:value={config.inc_num_workers}
+							/>
+						{:else}
+							<input type="number" disabled />
+						{/if}
+					</label>
+
+					<Label label="Custom tags to autoscale on">
+						<svelte:fragment slot="header">
+							<Tooltip>
+								By default, autoscaling will apply to the tags the worker group is assigned to but
+								you can override this here.
+							</Tooltip>
+						</svelte:fragment>
+						{#if config}
+							{#if config.custom_tags}
+								<MultiSelect
+									outerDivClass="text-secondary !bg-surface-disabled !border-0"
+									selected={config.custom_tags}
+									on:change={(e) => {
+										console.log(e.detail.type, config?.custom_tags)
+										if (e.detail && config?.custom_tags) {
+											if (e.detail.type === 'add') {
+												config.custom_tags = [...config.custom_tags, e.detail.option]
+											} else if (e.detail.type === 'remove') {
+												config.custom_tags = config.custom_tags.filter((t) => t !== e.detail.option)
+												if (config?.custom_tags && config.custom_tags.length == 0) {
+													config.custom_tags = undefined
+												}
+											} else if (e.detail.type === 'removeAll') {
+												config.custom_tags = undefined
+											} else {
+												console.error(
+													`Priority tags multiselect - unknown event type: '${e.detail.type}'`
+												)
+											}
+											dispatch('dirty')
+										}
+									}}
+									on:clear={() => {
+										if (config) {
+											config.custom_tags = undefined
+										}
+										dispatch('dirty')
+									}}
+									options={worker_tags ?? []}
+									selectedOptionsDraggable={false}
+									ulOptionsClass={'!bg-surface-secondary'}
+									placeholder="Tags"
+								/>
+							{:else}
+								<Button
+									color="light"
+									size="xs"
+									variant="contained"
+									on:click={() => {
+										if (config) {
+											config.custom_tags = []
+											dispatch('dirty')
+										}
+									}}>Add custom tags</Button
+								>
+							{/if}
+						{/if}
+					</Label>
+				</div>
+			</Section>
+		</div>
+	</div>
+	<div class="flex flex-col gap-1 max-w-xs text-sm">
+		<h5>Integration</h5>
+		{#if config?.integration}
+			<ToggleButtonGroup
+				on:selected={(e) => dispatch('dirty')}
+				bind:selected={config.integration.type}
+				class="mb-4 mt-2"
+			>
+				<ToggleButton
+					value="dryrun"
+					size="sm"
+					label="Dry run"
+					tooltip="See autoscaling events but not actual scaling actions will be performed"
+				/>
+				<ToggleButton
+					value="script"
+					size="sm"
+					label="Custom Script"
+					tooltip="Run a custom script to scale your worker group"
+				/>
+				<ToggleButton position="center" disabled value="ecs" size="sm" label="ECS (soon)" />
+				<ToggleButton position="right" disabled value="nomad" size="sm" label="Nomad (soon)" />
+				<ToggleButton
+					position="right"
+					disabled
+					value="kubernetes"
+					size="sm"
+					label="Kubernetes (soon)"
+				/>
+			</ToggleButtonGroup>
+
+			{#if config.integration.type === 'script'}
+				<label>
+					Script path on the 'admins' workspace
+					<input
+						on:input={() => dispatch('dirty')}
+						type="text"
+						bind:value={config.integration.path}
+					/>
+				</label>
+
+				<label>
+					Custom tag for executing script (optional)
+					{#if config.integration.tag}
+						<input
+							on:input={() => dispatch('dirty')}
+							type="text"
+							bind:value={config.integration.tag}
+						/>
+					{:else}
+						<Button
+							color="light"
+							size="xs"
+							variant="contained"
+							on:click={() => {
+								if (config?.integration?.type === 'script') {
+									config.integration.tag = 'bash'
+									dispatch('dirty')
+								}
+							}}>Set tag</Button
+						>
+					{/if}
+				</label>
+
+				<div class="flex mt-6 gap-2">
+					<Button
+						color="dark"
+						target="_blank"
+						endIcon={{ icon: ExternalLink }}
+						href="/scripts/add?hub=hub%2F9204%2Fhelper%2FScale%20a%20worker%20group%20deployed%20as%20a%20kubernetes%20service&workspace=admins"
+						>Create from template</Button
+					>
+					<Button
+						color="dark"
+						target="_blank"
+						href={`/runs/${config.integration.path}?workspace=admins`}
+						endIcon={{ icon: ExternalLink }}
+					>
+						See jobs
+					</Button>
+				</div>
+				<div class="flex flex-row gap-2 mt-4">
+					<Button color="light" size="xs" variant="contained">Test scaling</Button>
+					<div class="flex text-xs flex-row gap-2 items-center">
+						<input class="!w-16" type="number" bind:value={test_input} />
+						workers
+					</div>
+				</div>
+			{/if}
+		{:else}
+			<ToggleButtonGroup selected={'script'} disabled class="mb-4 mt-2">
+				<ToggleButton value="dryrun" size="sm" label="Dry run" />
+				<ToggleButton value="script" size="sm" label="Custom Script" />
+				<ToggleButton position="center" value="ecs" size="sm" label="ECS (soon)" />
+				<ToggleButton position="right" value="nomad" size="sm" label="Nomad (soon)" />
+				<ToggleButton position="right" value="kubernetes" size="sm" label="Kubernetes (soon)" />
+			</ToggleButtonGroup>
+
+			<label>
+				Script path on the 'admins' workspace
+				<input type="text" disabled />
+			</label>
+		{/if}
+	</div>
+</div>
diff --git a/frontend/src/lib/components/AutoscalingEvents.svelte b/frontend/src/lib/components/AutoscalingEvents.svelte
new file mode 100644
index 0000000000..36240cef4c
--- /dev/null
+++ b/frontend/src/lib/components/AutoscalingEvents.svelte
@@ -0,0 +1,73 @@
+<script lang="ts">
+	import { ConfigService, type AutoscalingEvent } from '$lib/gen'
+	import { LoaderIcon, RefreshCw } from 'lucide-svelte'
+	import { Button, Skeleton } from './common'
+	import { twMerge } from 'tailwind-merge'
+	import TimeAgo from './TimeAgo.svelte'
+	import { enterpriseLicense } from '$lib/stores'
+
+	export let worker_group: string
+
+	let loading = true
+	let events: AutoscalingEvent[] | undefined = undefined
+
+	$: worker_group && loadEvents()
+
+	async function loadEvents() {
+		loading = true
+		try {
+			events = await ConfigService.listAutoscalingEvents({ workerGroup: worker_group })
+		} catch (e) {
+			events = []
+			console.error(e)
+		} finally {
+			loading = false
+		}
+	}
+</script>
+
+<div>
+	<h6
+		class={!$enterpriseLicense || (events != undefined && events.length == 0)
+			? 'text-tertiary'
+			: ''}
+		>Autoscaling events {#if $enterpriseLicense}<span class="text-xs text-tertiary">(5 last)</span>
+			<span class="inline-flex ml-6">
+				<Button
+					startIcon={{
+						icon: loading ? LoaderIcon : RefreshCw,
+						classes: twMerge(
+							loading ? 'animate-spin text-blue-800' : '',
+							'transition-all text-gray-500 dark:text-white'
+						)
+					}}
+					color="light"
+					size="xs2"
+					btnClasses={twMerge(loading ? ' bg-blue-100 dark:bg-blue-400' : '', 'transition-all')}
+					on:click={() => loadEvents()}
+					iconOnly
+				/>
+			</span>{/if}
+	</h6>
+	{#if !$enterpriseLicense}
+		<div class="text-xs pt-2 text-tertiary">Autoscaling is an EE feature</div>
+	{:else if loading}
+		<Skeleton layout={[[12], 1]} />
+	{:else if events}
+		{#if events.length == 0}
+			<div class="text-xs pt-2 text-tertiary"
+				>No events, is autoscaling set in the worker group config?</div
+			>
+		{:else}
+			<div class="flex flex-col gap-2 text-xs text-tertiary pt-4">
+				{#each events as event}
+					<div class="flex flex-row gap-4">
+						<div class="text-primary">{event.event_type} to {event.desired_workers}</div>
+						<div class="text-secondary">{event.reason}</div>
+						<div class="text-tertiary"><TimeAgo date={event.applied_at ?? ''} /></div>
+					</div>
+				{/each}
+			</div>
+		{/if}
+	{/if}
+</div>
diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte
index 3b42bd0e10..c924fc8b3d 100644
--- a/frontend/src/lib/components/InstanceSettings.svelte
+++ b/frontend/src/lib/components/InstanceSettings.svelte
@@ -277,7 +277,9 @@
 						<div class="text-secondary pb-4 text-xs"
 							>Setting SMTP unlocks sending emails upon adding new users to the workspace or the
 							instance or sending critical alerts.
-							<a target="_blank" href="https://www.windmill.dev/docs/advanced/instance_settings#smtp">Learn more</a
+							<a
+								target="_blank"
+								href="https://www.windmill.dev/docs/advanced/instance_settings#smtp">Learn more</a
 							></div
 						>
 					{:else if category == 'Registries'}
diff --git a/frontend/src/lib/components/OAuthSetting.svelte b/frontend/src/lib/components/OAuthSetting.svelte
index e2fe394761..8277ddf396 100644
--- a/frontend/src/lib/components/OAuthSetting.svelte
+++ b/frontend/src/lib/components/OAuthSetting.svelte
@@ -66,7 +66,7 @@
 	>
 	{#if enabled}
 		<div class="p-2 rounded border">
-			{#if name != "slack"}
+			{#if name != 'slack'}
 				<label class="block pb-2">
 					<span class="text-primary font-semibold text-sm">Custom Name</span>
 					<input type="text" placeholder="Custom Name" bind:value={value['display_name']} />
diff --git a/frontend/src/lib/components/WorkspaceGroup.svelte b/frontend/src/lib/components/WorkerGroup.svelte
similarity index 96%
rename from frontend/src/lib/components/WorkspaceGroup.svelte
rename to frontend/src/lib/components/WorkerGroup.svelte
index f1e31405c0..14ce6787bc 100644
--- a/frontend/src/lib/components/WorkspaceGroup.svelte
+++ b/frontend/src/lib/components/WorkerGroup.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Copy, Plus, RefreshCcwIcon, Settings, Trash, X } from 'lucide-svelte'
-	import { Alert, Button, Drawer } from './common'
+	import { Alert, Badge, Button, Drawer } from './common'
 	import Multiselect from 'svelte-multiselect'
 	import ToggleButton from './common/toggleButton-v2/ToggleButton.svelte'
 	import ToggleButtonGroup from './common/toggleButton-v2/ToggleButtonGroup.svelte'
@@ -18,6 +18,8 @@
 	import AutoComplete from 'simple-svelte-autocomplete'
 	import YAML from 'yaml'
 	import Toggle from './Toggle.svelte'
+	import type { AutoscalingConfig } from './worker_group'
+	import AutoscalingConfigEditor from './AutoscalingConfigEditor.svelte'
 
 	export let name: string
 	export let config:
@@ -31,6 +33,7 @@
 				additional_python_paths?: string[]
 				pip_local_dependencies?: string[]
 				min_alive_workers_alert_threshold?: number
+				autoscaling?: AutoscalingConfig
 		  }
 	export let activeWorkers: number
 	export let customTags: string[] | undefined
@@ -65,6 +68,7 @@
 		additional_python_paths?: string[]
 		pip_local_dependencies?: string[]
 		min_alive_workers_alert_threshold?: number
+		autoscaling?: AutoscalingConfig
 	} = {}
 
 	function loadNConfig() {
@@ -438,7 +442,7 @@
 										</Tooltip>
 									</svelte:fragment>
 									<Multiselect
-										outerDivClass="text-secondary !bg-surface-disabled"
+										outerDivClass="text-secondary !bg-surface-disabled !border-0"
 										disabled={!$enterpriseLicense}
 										bind:selected={selectedPriorityTags}
 										on:change={(e) => {
@@ -452,6 +456,9 @@
 													delete nconfig.priority_tags[e.detail.option]
 												}
 												dirty = true
+											} else if (e.detail.type === 'removeAll') {
+												nconfig.priority_tags = undefined
+												dirty = true
 											} else {
 												console.error(
 													`Priority tags multiselect - unknown event type: '${e.detail.type}'`
@@ -782,6 +789,21 @@
 		</Section>
 		<div class="mt-8" />
 
+		<Section label="Autoscaling" collapsable>
+			<div slot="header" class="ml-4 flex flex-row gap-2 items-center">
+				<Badge>Beta</Badge>
+				{#if nconfig.autoscaling?.enabled}
+					<Badge color="green">Enabled</Badge>
+				{/if}
+			</div>
+			<AutoscalingConfigEditor
+				on:dirty={() => (dirty = true)}
+				worker_tags={nconfig.worker_tags}
+				bind:config={nconfig.autoscaling}
+			/>
+		</Section>
+		<div class="mt-8" />
+
 		<Section
 			label="Init Script"
 			tooltip="Bash scripts run at start of the workers. More lightweight than having to require the worker images at the cost of being run on every start."
diff --git a/frontend/src/lib/components/flows/content/FlowSettings.svelte b/frontend/src/lib/components/flows/content/FlowSettings.svelte
index c9bdcac771..8883b9cc65 100644
--- a/frontend/src/lib/components/flows/content/FlowSettings.svelte
+++ b/frontend/src/lib/components/flows/content/FlowSettings.svelte
@@ -441,7 +441,7 @@
 					}}
 					options={{
 						right: `Label as high priority`,
-						rightTooltip: `All jobs scheduled by flows labeled as high priority take precedence over the other jobs in the jobs queue. ${
+						rightTooltip: `All jobs scheduled by flows labeled as high priority take precedence over the other jobs in the jobs queue. Higher priority numbers are executed first. ${
 							!$enterpriseLicense ? 'This is a feature only available on enterprise edition.' : ''
 						}`
 					}}
diff --git a/frontend/src/lib/components/worker_group.ts b/frontend/src/lib/components/worker_group.ts
new file mode 100644
index 0000000000..3f61f7346d
--- /dev/null
+++ b/frontend/src/lib/components/worker_group.ts
@@ -0,0 +1,39 @@
+// enabled: bool,
+// min_workers: usize,
+// max_workers: usize,
+// cooldown_seconds: usize,
+// inc_scale_jobs_waiting: usize,
+// full_scale_cooldown_seconds: usize,
+// full_scale_jobs_waiting: usize,
+// dec_scale_occupancy_rate: u8, // occupancy rate of 30s, 5m, 30m to scale down
+// inc_scale_occupancy_rate: u8, // occupancy rate of 30s, 5m to scale up
+// inc_percent: usize,
+// integration: Option<AutoscalingIntegration>,
+
+export type AutoscalingConfig = {
+    enabled: boolean
+    min_workers: number
+    max_workers: number
+    cooldown_seconds?: number
+    inc_scale_num_jobs_waiting?: number
+    full_scale_cooldown_seconds?: number
+    full_scale_jobs_waiting?: number
+    dec_scale_occupancy_rate?: number
+    inc_scale_occupancy_rate?: number
+    inc_num_workers?: number
+    integration?: AutoscalingIntegration
+    custom_tags?: string[]
+}
+
+
+export type AutoscalingIntegration = AutoscaleScript | AutoscaleDryRun
+
+export type AutoscaleScript = {
+    type: 'script'
+    tag?: string
+    path: string
+}
+
+export type AutoscaleDryRun = {
+    type: 'dryrun'
+}
diff --git a/frontend/src/lib/utils.ts b/frontend/src/lib/utils.ts
index c8913a3d31..e2dabd8f3b 100644
--- a/frontend/src/lib/utils.ts
+++ b/frontend/src/lib/utils.ts
@@ -472,7 +472,7 @@ export async function copyToClipboard(value?: string, sendToast = true): Promise
 }
 
 export function pluralize(quantity: number, word: string, customPlural?: string) {
-	if (quantity <= 1) {
+	if (quantity == 1) {
 		return `${quantity} ${word}`
 	} else if (customPlural) {
 		return `${quantity} ${customPlural}}`
@@ -498,7 +498,7 @@ export function isObject(obj: any) {
 
 export function debounce(func: (...args: any[]) => any, wait: number) {
 	let timeout: any
-	return function(...args: any[]) {
+	return function (...args: any[]) {
 		// @ts-ignore
 		const context = this
 		clearTimeout(timeout)
@@ -508,7 +508,7 @@ export function debounce(func: (...args: any[]) => any, wait: number) {
 
 export function throttle<T>(func: (...args: any[]) => T, wait: number) {
 	let timeout: any
-	return function(...args: any[]) {
+	return function (...args: any[]) {
 		if (!timeout) {
 			timeout = setTimeout(() => {
 				timeout = null
diff --git a/frontend/src/routes/(root)/(logged)/workers/+page.svelte b/frontend/src/routes/(root)/(logged)/workers/+page.svelte
index f3a595a561..beab747a51 100644
--- a/frontend/src/routes/(root)/(logged)/workers/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/workers/+page.svelte
@@ -13,17 +13,18 @@
 	import DataTable from '$lib/components/table/DataTable.svelte'
 	import Head from '$lib/components/table/Head.svelte'
 	import Tooltip from '$lib/components/Tooltip.svelte'
-	import WorkspaceGroup from '$lib/components/WorkspaceGroup.svelte'
+	import WorkspaceGroup from '$lib/components/WorkerGroup.svelte'
 	import { WorkerService, type WorkerPing, ConfigService, SettingService } from '$lib/gen'
 	import { enterpriseLicense, superadmin } from '$lib/stores'
 	import { sendUserToast } from '$lib/toast'
 	import { displayDate, groupBy, pluralize, truncate } from '$lib/utils'
-	import { AlertTriangle, CopyIcon, LineChart, List, Plus, Search } from 'lucide-svelte'
+	import { AlertTriangle, LineChart, List, Plus, Search } from 'lucide-svelte'
 	import { getContext, onDestroy, onMount } from 'svelte'
 	import AutoComplete from 'simple-svelte-autocomplete'
 
 	import YAML from 'yaml'
 	import { DEFAULT_TAGS_WORKSPACES_SETTING } from '$lib/consts'
+	import AutoscalingEvents from '$lib/components/AutoscalingEvents.svelte'
 
 	let workers: WorkerPing[] | undefined = undefined
 	let workerGroups: Record<string, any> | undefined = undefined
@@ -326,7 +327,7 @@
 			<p>No workers seem to be available</p>
 		{/if}
 
-		<div class="py-4 w-full flex justify-between"
+		<div class="pt-4 pb-8 w-full flex justify-between items-center"
 			><h4
 				>{groupWorkers?.length} Worker Groups <Tooltip
 					documentationLink="https://www.windmill.dev/docs/core_concepts/worker_groups"
@@ -336,6 +337,7 @@
 				</Tooltip></h4
 			>
 			<div />
+
 			{#if $superadmin}
 				<div class="flex flex-row items-center">
 					<Popup
@@ -344,31 +346,30 @@
 					>
 						<svelte:fragment slot="button">
 							<div class="flex items-center gap-2">
-								<Button
-									size="sm"
-									color="light"
-									startIcon={{ icon: CopyIcon }}
-									on:click={() => {
-										if (!workerGroups) {
-											return sendUserToast('No worker groups found', true)
-										}
-
-										const workersConfig = Object.entries(workerGroups).map(([name, config]) => ({
-											name,
-											...config
-										}))
-										navigator.clipboard.writeText(YAML.stringify(workersConfig))
-										sendUserToast('Worker groups config copied to clipboard as YAML')
-									}}
-								>
-									<span class="hidden md:block">Copy groups config</span>
-								</Button>
 								<Button
 									size="sm"
 									startIcon={{ icon: Plus }}
 									nonCaptureEvent
+									disabled={!$enterpriseLicense}
 									dropdownItems={$enterpriseLicense
 										? [
+												{
+													label: 'Copy groups config as YAML',
+													onClick: () => {
+														if (!workerGroups) {
+															return sendUserToast('No worker groups found', true)
+														}
+
+														const workersConfig = Object.entries(workerGroups).map(
+															([name, config]) => ({
+																name,
+																...config
+															})
+														)
+														navigator.clipboard.writeText(YAML.stringify(workersConfig))
+														sendUserToast('Worker groups config copied to clipboard as YAML')
+													}
+												},
 												{
 													label: 'Import groups config from YAML',
 													onClick: () => {
@@ -378,7 +379,9 @@
 										  ]
 										: undefined}
 								>
-									<span class="hidden md:block">New group config</span>
+									<span class="hidden md:block"
+										>New group config {!$enterpriseLicense ? '(EE)' : ''}</span
+									>
 
 									<Tooltip light>
 										Worker Group configs are propagated to every workers in the worker group
@@ -644,7 +647,8 @@
 				{/if}
 			{/if}
 		</div>
-		<div class="pb-4" />
+		<div class="pb-20" />
+		<AutoscalingEvents worker_group={selectedTab} />
 	{:else}
 		<div class="flex flex-col">
 			{#each new Array(4) as _}

From 23b89d7bcd806b287b5b3cb828cd5e0468983310 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Mon, 28 Oct 2024 08:18:07 +0100
Subject: [PATCH 12/34] allow columnDefs with no field but children in aggrid
 infinite table

---
 .../apps/components/display/dbtable/utils.ts  | 43 ++++++++++---------
 .../table/AppAggridExplorerTable.svelte       | 20 +++++++--
 2 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/frontend/src/lib/components/apps/components/display/dbtable/utils.ts b/frontend/src/lib/components/apps/components/display/dbtable/utils.ts
index 5e9b31890a..53a3ce9001 100644
--- a/frontend/src/lib/components/apps/components/display/dbtable/utils.ts
+++ b/frontend/src/lib/components/apps/components/display/dbtable/utils.ts
@@ -27,28 +27,29 @@ export type ColumnMetadata = {
 export type TableMetadata = ColumnMetadata[]
 
 export type ColumnDef = {
-	minWidth: number
-	hide: boolean
-	flex: number
-	sort: 'asc' | 'desc'
-	sortIndex: number
-	aggFunc: string
-	pivot: boolean
-	pivotIndex: number
-	pinned: 'left' | 'right' | boolean
-	rowGroup: boolean
-	rowGroupIndex: number
-	valueFormatter: string
-	valueParser: string
-	field: string
-	headerName: string
+	minWidth?: number
+	hide?: boolean
+	flex?: number
+	sort?: 'asc' | 'desc'
+	sortIndex?: number
+	aggFunc?: string
+	pivot?: boolean
+	pivotIndex?: number
+	pinned?: 'left' | 'right' | boolean
+	rowGroup?: boolean
+	rowGroupIndex?: number
+	valueFormatter?: string
+	valueParser?: string
+	field?: string
+	headerName?: string
+	children?: ColumnDef[]
 	// DBExplorer
-	ignored: boolean
-	hideInsert: boolean
-	editable: boolean
-	overrideDefaultValue: boolean
-	defaultUserValue: any
-	defaultValueNull: boolean
+	ignored?: boolean
+	hideInsert?: boolean
+	editable?: boolean
+	overrideDefaultValue?: boolean
+	defaultUserValue?: any
+	defaultValueNull?: boolean
 } & ColumnMetadata
 
 export async function loadTableMetaData(
diff --git a/frontend/src/lib/components/apps/components/display/table/AppAggridExplorerTable.svelte b/frontend/src/lib/components/apps/components/display/table/AppAggridExplorerTable.svelte
index 85b056bfcf..3db2f84451 100644
--- a/frontend/src/lib/components/apps/components/display/table/AppAggridExplorerTable.svelte
+++ b/frontend/src/lib/components/apps/components/display/table/AppAggridExplorerTable.svelte
@@ -150,7 +150,7 @@
 					outputs?.inputs.set(inputs, true)
 				},
 				onRemove: (id, rowIndex) => {
-				if (inputs?.[id] == undefined) {
+					if (inputs?.[id] == undefined) {
 						return
 					}
 					delete inputs[id][rowIndex]
@@ -267,10 +267,24 @@
 
 		// Validate each column definition
 		columnDefs.forEach((colDef, index) => {
+			let noField = !colDef.field || typeof colDef.field !== 'string' || colDef.field.trim() === ''
+
 			// Check if 'field' property exists and is a non-empty string
-			if (!colDef.field || typeof colDef.field !== 'string' || colDef.field.trim() === '') {
+			if (noField && !(colDef.children && Array.isArray(colDef.children))) {
 				isValid = false
-				errors.push(`Column at index ${index} is missing a valid 'field' property.`)
+				errors.push(
+					`Column at index ${index} is missing a valid 'field' property nor having any children.`
+				)
+			}
+
+			if (colDef.children && Array.isArray(colDef.children)) {
+				const { isValid: isChildrenValid, errors: childrenErrors } = validateColumnDefs(
+					colDef.children
+				)
+				if (!isChildrenValid) {
+					isValid = false
+					errors.push(...childrenErrors.map((err) => `Error in children at index ${index}: ${err}`))
+				}
 			}
 		})
 

From 4f46663b262bc425262351806f961ba5de69314f Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Mon, 28 Oct 2024 09:38:10 +0100
Subject: [PATCH 13/34] fix: add run immediately popover to run again

---
 frontend/src/lib/components/ArgInfo.svelte    | 22 +++---
 .../src/lib/components/CustomPopover.svelte   |  3 +-
 frontend/src/lib/components/JobArgs.svelte    |  7 +-
 frontend/src/lib/components/job_args.ts       |  9 +++
 .../(root)/(logged)/run/[...run]/+page.svelte | 70 ++++++++++++++++---
 5 files changed, 88 insertions(+), 23 deletions(-)
 create mode 100644 frontend/src/lib/components/job_args.ts

diff --git a/frontend/src/lib/components/ArgInfo.svelte b/frontend/src/lib/components/ArgInfo.svelte
index fb214640bd..dc6f8e153d 100644
--- a/frontend/src/lib/components/ArgInfo.svelte
+++ b/frontend/src/lib/components/ArgInfo.svelte
@@ -75,16 +75,18 @@
 		}}>{value}</button
 	>
 {:else if typeof value !== 'object'}
-	{truncate(JSON.stringify(value), 100)}
-	{#if JSON.stringify(value).length > 100}
-		<button
-			class="text-xs text-blue-500"
-			on:click={() => {
-				jsonViewerContent = value
-				jsonViewer.toggleDrawer()
-			}}>See expanded</button
-		>
-	{/if}
+	<span>
+		{truncate(JSON.stringify(value), 80)}
+		{#if JSON.stringify(value).length > 80}
+			<button
+				class="text-xs text-blue-500"
+				on:click={() => {
+					jsonViewerContent = value
+					jsonViewer.toggleDrawer()
+				}}>See expanded</button
+			>
+		{/if}
+	</span>
 {:else}
 	<div class="relative">
 		{#if JSON.stringify(value).length > 120}
diff --git a/frontend/src/lib/components/CustomPopover.svelte b/frontend/src/lib/components/CustomPopover.svelte
index 8e933049cc..22d58b2813 100644
--- a/frontend/src/lib/components/CustomPopover.svelte
+++ b/frontend/src/lib/components/CustomPopover.svelte
@@ -9,6 +9,7 @@
 	export let disappearTimeout = 100
 	export let appearTimeout = 300
 	export let style: string | undefined = undefined
+	export let noPadding = false
 
 	export let focusEl: HTMLElement | undefined = undefined
 
@@ -73,7 +74,7 @@
 			use:popperContent={popperOptions}
 			on:mouseenter={open}
 			on:mouseleave={close}
-			class="z-[5001] border rounded-lg shadow-lg p-4 bg-surface"
+			class="z-[5001] border rounded-lg shadow-lg {noPadding ? '' : 'p-4'} bg-surface"
 		>
 			<slot name="overlay" />
 		</div>
diff --git a/frontend/src/lib/components/JobArgs.svelte b/frontend/src/lib/components/JobArgs.svelte
index 8f97f08552..69c87e4cae 100644
--- a/frontend/src/lib/components/JobArgs.svelte
+++ b/frontend/src/lib/components/JobArgs.svelte
@@ -12,6 +12,7 @@
 	import Row from './table/Row.svelte'
 	import HighlightTheme from './HighlightTheme.svelte'
 	import { deepEqual } from 'fast-equals'
+	import { isWindmillTooBigObject } from './job_args'
 
 	export let id: string | undefined = undefined
 	export let args: any
@@ -63,7 +64,7 @@ ${Object.entries(args)
 	<div class="relative">
 		<DataTable size="sm">
 			<Head>
-				<tr>
+				<tr class="w-full">
 					<Cell head first>{argLabel ?? 'Arg'}</Cell>
 					<Cell head last>Value</Cell>
 				</tr>
@@ -79,7 +80,7 @@ ${Object.entries(args)
 				</svelte:fragment>
 			</Head>
 
-			<tbody class="divide-y">
+			<tbody class="divide-y w-full">
 				{#if args && Object.keys(args).length > 0}
 					{#each Object.entries(args).sort((a, b) => a[0].localeCompare(b[0])) as [arg, value]}
 						<Row>
@@ -137,7 +138,7 @@ ${Object.entries(args)
 				Copy to clipboard
 			</Button>
 		</svelte:fragment>
-		{#if jsonStr.length > 100000 || (id && workspace && args && typeof args === 'object' && deepEqual( Object.keys(args), ['reason'] ) && args['reason'] == 'WINDMILL_TOO_BIG')}
+		{#if jsonStr.length > 100000 || (id && workspace && args && isWindmillTooBigObject(args))}
 			<div class="text-sm mb-2 text-tertiary">
 				<a
 					download="windmill-args.json"
diff --git a/frontend/src/lib/components/job_args.ts b/frontend/src/lib/components/job_args.ts
new file mode 100644
index 0000000000..ef3377081f
--- /dev/null
+++ b/frontend/src/lib/components/job_args.ts
@@ -0,0 +1,9 @@
+import { deepEqual } from 'fast-equals'
+
+export function isWindmillTooBigObject(obj: any): boolean {
+	return (
+		typeof obj === 'object' &&
+		deepEqual(Object.keys(obj), ['reason']) &&
+		obj['reason'] == 'WINDMILL_TOO_BIG'
+	)
+}
diff --git a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
index f54bde1044..1669b17720 100644
--- a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
@@ -9,7 +9,8 @@
 		type WorkflowStatus,
 		type NewScript,
 		ConcurrencyGroupsService,
-		MetricsService
+		MetricsService,
+		type ScriptArgs
 	} from '$lib/gen'
 	import {
 		canWrite,
@@ -91,6 +92,8 @@
 	import HighlightTheme from '$lib/components/HighlightTheme.svelte'
 	import PreprocessedArgsDisplay from '$lib/components/runs/PreprocessedArgsDisplay.svelte'
 	import ExecutionDuration from '$lib/components/ExecutionDuration.svelte'
+	import CustomPopover from '$lib/components/CustomPopover.svelte'
+	import { isWindmillTooBigObject } from '$lib/components/job_args'
 
 	let job: Job | undefined
 	let jobUpdateLastFetch: Date | undefined
@@ -306,6 +309,46 @@
 	}
 
 	let scheduleEditor: ScheduleEditor
+
+	let runImmediatelyLoading = false
+	async function runImmediately() {
+		runImmediatelyLoading = true
+		try {
+			let args = job?.args as ScriptArgs
+			if (isWindmillTooBigObject(args)) {
+				args = (await JobService.getJobArgs({
+					workspace: $workspaceStore!,
+					id: job?.id!
+				})) as ScriptArgs
+			}
+
+			const commonArgs = {
+				workspace: $workspaceStore!,
+				requestBody: args
+			}
+			if (job?.job_kind == 'script' || job?.job_kind == 'flow') {
+				let id
+
+				if (job?.job_kind == 'script') {
+					id = await JobService.runScriptByHash({
+						...commonArgs,
+						hash: job.script_hash!
+					})
+				} else {
+					id = await JobService.runFlowByPath({
+						...commonArgs,
+						path: job.script_path!
+					})
+				}
+
+				await goto('/run/' + id + '?workspace=' + $workspaceStore)
+			} else {
+				sendUserToast('Cannot run this job immediately', true)
+			}
+		} finally {
+			runImmediatelyLoading = false
+		}
+	}
 </script>
 
 <HighlightTheme />
@@ -595,14 +638,23 @@
 				{/if}
 			{/if}
 			{#if job?.job_kind === 'script' || job?.job_kind === 'flow'}
-				<Button
-					on:click|once={() => {
-						goto(viewHref + `#${computeSharableHash(job?.args)}`)
-					}}
-					color="blue"
-					size="sm"
-					startIcon={{ icon: RefreshCw }}>Run again</Button
-				>
+				<CustomPopover noPadding appearTimeout={0}>
+					<Button
+						on:click|once={() => {
+							goto(viewHref + `#${computeSharableHash(job?.args)}`)
+						}}
+						color="blue"
+						size="sm"
+						startIcon={{ icon: RefreshCw }}>Run again</Button
+					>
+					<svelte:fragment slot="overlay">
+						<div class="flex flex-row gap-2">
+							<Button size="xs" loading={runImmediatelyLoading} on:click={() => runImmediately()}>
+								Run immediately with same args
+							</Button>
+						</div>
+					</svelte:fragment>
+				</CustomPopover>
 			{/if}
 			{#if job?.job_kind === 'script' || job?.job_kind === 'flow'}
 				{#if !$userStore?.operator}

From 4caa704a8f4f0c7573b98ac2a6e8b2757429b3d4 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Mon, 28 Oct 2024 12:09:29 +0100
Subject: [PATCH 14/34] fix cli compilation with crypto

---
 cli/local_encryption.ts | 172 ++++++++++++++++++++--------------------
 1 file changed, 85 insertions(+), 87 deletions(-)

diff --git a/cli/local_encryption.ts b/cli/local_encryption.ts
index 0a70b0742b..8e7a241e52 100644
--- a/cli/local_encryption.ts
+++ b/cli/local_encryption.ts
@@ -3,102 +3,100 @@ import crypto from "node:crypto";
 
 // Helper function to convert strings to Uint8Array (binary)
 function encode(input: string): Uint8Array {
-    return new TextEncoder().encode(input);
-  }
-  
-  // Helper function to convert Uint8Array (binary) to base64
-  function toBase64(arr: Uint8Array): string {
-    return btoa(String.fromCharCode(...arr));
-  }
-  
-  // Helper function to convert base64 to Uint8Array (binary)
-  function fromBase64(base64: string): Uint8Array {
-    return new Uint8Array(
-      atob(base64).split("").map((char) => char.charCodeAt(0))
-    );
-  }
-  
-  // Function to derive a 256-bit key from any input string using SHA-256
-  async function deriveKey(keyString: string): Promise<CryptoKey> {
-    const keyMaterial = encode(keyString);
-    const keyHash = await crypto.subtle.digest("SHA-256", keyMaterial); // Generate SHA-256 hash
-    // Import the hash as a CryptoKey for AES-GCM
-    return crypto.subtle.importKey(
-      "raw",
-      keyHash,
-      { name: "AES-GCM" },
-      false,
-      ["encrypt", "decrypt"]
-    );
-  }
+  return new TextEncoder().encode(input);
+}
 
-  
-  
-  // Encrypt function
-  export async function encrypt(
-    plaintext: string,
-    keyString: string
-  ): Promise<string> {
-    const key = await deriveKey(keyString); // Derive a 256-bit AES key from any input string
-    const iv = crypto.getRandomValues(new Uint8Array(12)); // AES-GCM needs a 12-byte IV
-    const encrypted = await crypto.subtle.encrypt(
-      {
-        name: "AES-GCM",
-        iv,
-        tagLength: 128
-      },
-      key,
-      encode(plaintext) // convert plaintext to binary
-    );
-  
-    // Concatenate IV and encrypted data
-    const combined = new Uint8Array(iv.length + encrypted.byteLength);
-    combined.set(iv, 0); // first part is the IV
-    combined.set(new Uint8Array(encrypted), iv.length); // second part is the ciphertext
-  
-    // Convert to base64 for storage/transmission
-    return toBase64(combined);
-  }
-  
-  // Decrypt function
-  export async function decrypt(
-    combinedCiphertext: string,
-    keyString: string
-  ): Promise<string> {
-    const key = await deriveKey(keyString); // Derive the same 256-bit AES key from the input string
-    const combined = fromBase64(combinedCiphertext); // decode base64 to binary
-    
-    // Split the IV and the ciphertext
-    const iv = combined.slice(0, 12); // First 12 bytes are the IV
-    const ciphertext = combined.slice(12); // The rest is the encrypted data
-    console.log()
+// Helper function to convert Uint8Array (binary) to base64
+function toBase64(arr: Uint8Array): string {
+  return btoa(String.fromCharCode(...arr));
+}
+
+// Helper function to convert base64 to Uint8Array (binary)
+function fromBase64(base64: string): Uint8Array {
+  return new Uint8Array(
+    atob(base64)
+      .split("")
+      .map((char) => char.charCodeAt(0))
+  );
+}
+
+// Function to derive a 256-bit key from any input string using SHA-256
+async function deriveKey(
+  keyString: string
+): Promise<crypto.webcrypto.CryptoKey> {
+  const keyMaterial = encode(keyString);
+  const keyHash = await crypto.subtle.digest("SHA-256", keyMaterial); // Generate SHA-256 hash
+  // Import the hash as a CryptoKey for AES-GCM
+  return crypto.subtle.importKey("raw", keyHash, { name: "AES-GCM" }, false, [
+    "encrypt",
+    "decrypt",
+  ]);
+}
+
+// Encrypt function
+export async function encrypt(
+  plaintext: string,
+  keyString: string
+): Promise<string> {
+  const key = await deriveKey(keyString); // Derive a 256-bit AES key from any input string
+  const iv = crypto.getRandomValues(new Uint8Array(12)); // AES-GCM needs a 12-byte IV
+  const encrypted = await crypto.subtle.encrypt(
+    {
+      name: "AES-GCM",
+      iv,
+      tagLength: 128,
+    },
+    key,
+    encode(plaintext) // convert plaintext to binary
+  );
+
+  // Concatenate IV and encrypted data
+  const combined = new Uint8Array(iv.length + encrypted.byteLength);
+  combined.set(iv, 0); // first part is the IV
+  combined.set(new Uint8Array(encrypted), iv.length); // second part is the ciphertext
+
+  // Convert to base64 for storage/transmission
+  return toBase64(combined);
+}
+
+// Decrypt function
+export async function decrypt(
+  combinedCiphertext: string,
+  keyString: string
+): Promise<string> {
+  const key = await deriveKey(keyString); // Derive the same 256-bit AES key from the input string
+  const combined = fromBase64(combinedCiphertext); // decode base64 to binary
+
+  // Split the IV and the ciphertext
+  const iv = combined.slice(0, 12); // First 12 bytes are the IV
+  const ciphertext = combined.slice(12); // The rest is the encrypted data
+  console.log();
+
+  // log.info({keyString, key, ciphertext})
+  // Perform decryption
+  const decrypted = await crypto.subtle.decrypt(
+    {
+      name: "AES-GCM",
+      iv,
+      tagLength: 128,
+    },
+    key,
+    ciphertext
+  );
+
+  // Convert decrypted data from binary to string
+  return new TextDecoder().decode(decrypted);
+}
 
-    // log.info({keyString, key, ciphertext})
-    // Perform decryption
-    const decrypted = await crypto.subtle.decrypt(
-      {
-        name: "AES-GCM",
-        iv,
-        tagLength: 128
-      },
-      key,
-      ciphertext
-    );
-  
-    // Convert decrypted data from binary to string
-    return new TextDecoder().decode(decrypted);
-  }
-  
 //   // Example usage:
 //   const key = "any-length-key-you-want"; // Now can be any length
 //   const message = "This is a secret message.";
-  
+
 //   encrypt(message, key).then((combinedCiphertext) => {
 //     console.log("Encrypted message:", combinedCiphertext);
-  
+
 //     // Now decrypt it
 //     decrypt(combinedCiphertext, key).then((decryptedMessage) => {
 //       console.log("Decrypted message:", decryptedMessage);
 //     });
 //   });
-  
\ No newline at end of file

From e04b7824c716ae8de704b8ebac14440f31b4257d Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Mon, 28 Oct 2024 12:37:27 +0100
Subject: [PATCH 15/34] improve fullscaleout behavior

---
 backend/ee-repo-ref.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index 07ac755375..67f8651560 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-816abd18b24831f251e11d44d274c8acef89df12
\ No newline at end of file
+ee638ab91623392cdbf6a139f2b54b9b527585ea
\ No newline at end of file

From 614a177b49acd8de965b725170f9ce4d701c7c5d Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Mon, 28 Oct 2024 16:36:18 +0100
Subject: [PATCH 16/34] chore(main): release 1.413.0 (#4591)

* chore(main): release 1.413.0

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  | 13 +++
 backend/Cargo.lock                            | 80 +++++++++----------
 backend/Cargo.toml                            |  4 +-
 backend/windmill-api/openapi.yaml             |  2 +-
 benchmarks/lib.ts                             |  2 +-
 cli/main.ts                                   |  2 +-
 frontend/package-lock.json                    |  4 +-
 frontend/package.json                         |  2 +-
 lsp/Pipfile                                   |  4 +-
 openflow.openapi.yaml                         |  2 +-
 .../WindmillClient/WindmillClient.psd1        |  2 +-
 python-client/wmill/pyproject.toml            |  2 +-
 python-client/wmill_pg/pyproject.toml         |  2 +-
 typescript-client/jsr.json                    |  2 +-
 typescript-client/package.json                |  2 +-
 version.txt                                   |  2 +-
 16 files changed, 70 insertions(+), 57 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90a7dff66d..a4ccc17a69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [1.413.0](https://github.com/windmill-labs/windmill/compare/v1.412.0...v1.413.0) (2024-10-28)
+
+
+### Features
+
+* autoscaling v0 ([#4593](https://github.com/windmill-labs/windmill/issues/4593)) ([fe7d044](https://github.com/windmill-labs/windmill/commit/fe7d044a66e8ec223a337cb704d3e58942dd1502))
+
+
+### Bug Fixes
+
+* add run immediately popover to run again ([e54d253](https://github.com/windmill-labs/windmill/commit/e54d25368541dc6109a0f99022a120d28455f9bd))
+* **docs:** smtp setup documentation link ([#4590](https://github.com/windmill-labs/windmill/issues/4590)) ([bac3205](https://github.com/windmill-labs/windmill/commit/bac32057259d893140d649c9dfec2ca75e395ad4))
+
 ## [1.412.0](https://github.com/windmill-labs/windmill/compare/v1.411.1...v1.412.0) (2024-10-25)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 0d39293912..ab9d105ed4 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -732,9 +732,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "aws-config"
-version = "1.5.8"
+version = "1.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7198e6f03240fdceba36656d8be440297b6b82270325908c7381f37d826a74f6"
+checksum = "2d6448cfb224dd6a9b9ac734f58622dd0d4751f3589f3b777345745f46b2eb14"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -799,9 +799,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.46.0"
+version = "1.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc2faec3205d496c7e57eff685dd944203df7ce16a4116d0281c44021788a7b"
+checksum = "a8776850becacbd3a82a4737a9375ddb5c6832a51379f24443a98e61513f852c"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -821,9 +821,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.47.0"
+version = "1.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c93c241f52bc5e0476e259c953234dab7e2a35ee207ee202e86c0095ec4951dc"
+checksum = "0007b5b8004547133319b6c4e87193eee2a0bcb3e4c18c75d09febe9dab7b383"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -843,9 +843,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.46.0"
+version = "1.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b259429be94a3459fa1b00c5684faee118d74f9577cc50aebadc36e507c63b5f"
+checksum = "9fffaa356e7f1c725908b75136d53207fa714e348f365671df14e95a60530ad3"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -866,9 +866,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sigv4"
-version = "1.2.4"
+version = "1.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc8db6904450bafe7473c6ca9123f88cc11089e41a025408f992db4e22d3be68"
+checksum = "5619742a0d8f253be760bfbb8e8e8368c69e3587e4637af5754e488a611499b1"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-http",
@@ -1179,9 +1179,9 @@ dependencies = [
 
 [[package]]
 name = "bigdecimal"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d712318a27c7150326677b321a5fa91b55f6d9034ffd67f20319e147d40cee"
+checksum = "8f850665a0385e070b64c38d2354e6c104c8479c59868d1e48a0c13ee2c7a1c1"
 dependencies = [
  "autocfg",
  "libm",
@@ -4700,9 +4700,9 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+checksum = "a00419de735aac21d53b0de5ce2c03bd3627277cf471300f27ebc89f7d828047"
 
 [[package]]
 name = "libredox"
@@ -7026,9 +7026,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.37"
+version = "0.38.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
@@ -10394,7 +10394,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "anyhow",
  "axum",
@@ -10436,7 +10436,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10521,7 +10521,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "base64 0.21.7",
  "chrono",
@@ -10539,7 +10539,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "chrono",
  "serde",
@@ -10552,7 +10552,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10567,7 +10567,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10613,7 +10613,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10628,7 +10628,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10650,7 +10650,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10662,7 +10662,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10671,7 +10671,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10683,7 +10683,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10695,7 +10695,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10707,7 +10707,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10718,7 +10718,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10729,7 +10729,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10747,7 +10747,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10764,7 +10764,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10776,7 +10776,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10794,7 +10794,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10815,7 +10815,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -10825,7 +10825,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10858,7 +10858,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -10868,7 +10868,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.412.0"
+version = "1.413.0"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 700810d20a..3488123886 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.412.0"
+version = "1.413.0"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.412.0"
+version = "1.413.0"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index e854bff21d..354c264d3b 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.412.0
+  version: 1.413.0
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index f2a96e160a..9250451916 100644
--- a/benchmarks/lib.ts
+++ b/benchmarks/lib.ts
@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
 import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
 import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
 
-export const VERSION = "v1.412.0";
+export const VERSION = "v1.413.0";
 
 export async function login(email: string, password: string): Promise<string> {
   return await windmill.UserService.login({
diff --git a/cli/main.ts b/cli/main.ts
index b35fe1ddfd..bb96d5a599 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.412.0";
+export const VERSION = "1.413.0";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 0a3c0c0b2e..204c6843ab 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.412.0",
+	"version": "1.413.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.412.0",
+			"version": "1.413.0",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index 472cf8d8e0..dff4ef663c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.412.0",
+	"version": "1.413.0",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index f941cd2765..2ebf42640a 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.412.0"
-wmill_pg = ">=1.412.0"
+wmill = ">=1.413.0"
+wmill_pg = ">=1.413.0"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 12139e1333..d3530ecd0b 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.412.0
+  version: 1.413.0
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 41037e86b0..b63a0ba8b6 100644
--- a/powershell-client/WindmillClient/WindmillClient.psd1
+++ b/powershell-client/WindmillClient/WindmillClient.psd1
@@ -12,7 +12,7 @@
 RootModule = 'WindmillClient.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.412.0'
+ModuleVersion = '1.413.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 0f1406f6ff..e8abef570e 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.412.0"
+version = "1.413.0"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/python-client/wmill_pg/pyproject.toml b/python-client/wmill_pg/pyproject.toml
index 6842abd95e..ff0f94dd72 100644
--- a/python-client/wmill_pg/pyproject.toml
+++ b/python-client/wmill_pg/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill-pg"
-version = "1.412.0"
+version = "1.413.0"
 description = "An extension client for the wmill client library focused on pg"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/typescript-client/jsr.json b/typescript-client/jsr.json
index c14bba4800..356cff8f57 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.412.0",
+  "version": "1.413.0",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./client.ts"]
diff --git a/typescript-client/package.json b/typescript-client/package.json
index fa29cc0a9c..5f16f2a912 100644
--- a/typescript-client/package.json
+++ b/typescript-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "windmill-client",
   "description": "Windmill SDK client for browsers and Node.js",
-  "version": "1.412.0",
+  "version": "1.413.0",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 95cca4d565..7e872ecb2c 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.412.0
+1.413.0

From f9f4d1caf9a34035895c37a9d6a39bcf034c710c Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Mon, 28 Oct 2024 16:58:34 +0100
Subject: [PATCH 17/34] fix(cli): fix wmill instance push --base-url and
 --instance

---
 cli/instance.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/cli/instance.ts b/cli/instance.ts
index bc3f0968b7..dc8b9050b3 100644
--- a/cli/instance.ts
+++ b/cli/instance.ts
@@ -650,7 +650,6 @@ const command = new Command()
   .option("--skip-configs", "Skip pulling configs (worker groups and SMTP)")
   .option("--skip-groups", "Skip pulling instance groups")
   .option("--include-workspaces", "Also pull workspaces")
-
   .action(instancePull as any)
   .command("push")
   .description(
@@ -663,13 +662,9 @@ const command = new Command()
   .option("--skip-groups", "Skip pushing instance groups")
   .option("--include-workspaces", "Also push workspaces")
   .option(
-    "--instance",
+    "--instance <instance:string>",
     "Name of the instance to push to, override the active instance"
   )
-  .option(
-    "--base-url",
-    "If used with --token, will be used as the base url for the instance"
-  )
   .action(instancePush as any)
   .command("whoami")
   .description("Display information about the currently logged-in user")

From c3db5348a4c90916b49b94f595f9720763f7f1d6 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Mon, 28 Oct 2024 17:32:43 +0100
Subject: [PATCH 18/34] chore(main): release 1.413.1 (#4595)

* chore(main): release 1.413.1

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |  7 ++
 backend/Cargo.lock                            | 72 +++++++++----------
 backend/Cargo.toml                            |  4 +-
 backend/windmill-api/openapi.yaml             |  2 +-
 benchmarks/lib.ts                             |  2 +-
 cli/main.ts                                   |  2 +-
 frontend/package-lock.json                    |  4 +-
 frontend/package.json                         |  2 +-
 lsp/Pipfile                                   |  4 +-
 openflow.openapi.yaml                         |  2 +-
 .../WindmillClient/WindmillClient.psd1        |  2 +-
 python-client/wmill/pyproject.toml            |  2 +-
 python-client/wmill_pg/pyproject.toml         |  2 +-
 typescript-client/jsr.json                    |  2 +-
 typescript-client/package.json                |  2 +-
 version.txt                                   |  2 +-
 16 files changed, 60 insertions(+), 53 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4ccc17a69..94a51dbc5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.413.1](https://github.com/windmill-labs/windmill/compare/v1.413.0...v1.413.1) (2024-10-28)
+
+
+### Bug Fixes
+
+* **cli:** fix wmill instance push --base-url and --instance ([8298710](https://github.com/windmill-labs/windmill/commit/82987105a6fd6ec272c170fb094453a0267143be))
+
 ## [1.413.0](https://github.com/windmill-labs/windmill/compare/v1.412.0...v1.413.0) (2024-10-28)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index ab9d105ed4..354da8303f 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -2777,7 +2777,7 @@ checksum = "22a1abc6bd8af41aa2496ceceef94f4277092c781a9495c437327a17659553a2"
 dependencies = [
  "deno_core",
  "deno_native_certs",
- "rustls 0.23.15",
+ "rustls 0.23.16",
  "rustls-pemfile 2.2.0",
  "rustls-tokio-stream",
  "rustls-webpki 0.102.8",
@@ -4265,7 +4265,7 @@ dependencies = [
  "http 1.1.0",
  "hyper 1.5.0",
  "hyper-util",
- "rustls 0.23.15",
+ "rustls 0.23.16",
  "rustls-native-certs 0.8.0",
  "rustls-pki-types",
  "tokio",
@@ -4889,7 +4889,7 @@ dependencies = [
  "base64 0.22.1",
  "gethostname",
  "mail-builder",
- "rustls 0.23.15",
+ "rustls 0.23.16",
  "rustls-pki-types",
  "smtp-proto",
  "tokio",
@@ -6365,7 +6365,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash 2.0.0",
- "rustls 0.23.15",
+ "rustls 0.23.16",
  "socket2 0.5.7",
  "thiserror",
  "tokio",
@@ -6382,7 +6382,7 @@ dependencies = [
  "rand 0.8.5",
  "ring 0.17.8",
  "rustc-hash 2.0.0",
- "rustls 0.23.15",
+ "rustls 0.23.16",
  "slab",
  "thiserror",
  "tinyvec",
@@ -6751,7 +6751,7 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.15",
+ "rustls 0.23.16",
  "rustls-native-certs 0.8.0",
  "rustls-pemfile 2.2.0",
  "rustls-pki-types",
@@ -7051,9 +7051,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.15"
+version = "0.23.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993"
+checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e"
 dependencies = [
  "log",
  "once_cell",
@@ -7133,7 +7133,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22557157d7395bc30727745b365d923f1ecc230c4c80b176545f3f4f08c46e33"
 dependencies = [
  "futures",
- "rustls 0.23.15",
+ "rustls 0.23.16",
  "socket2 0.5.7",
  "tokio",
 ]
@@ -8016,7 +8016,7 @@ dependencies = [
  "once_cell",
  "paste",
  "percent-encoding",
- "rustls 0.23.15",
+ "rustls 0.23.16",
  "rustls-pemfile 2.2.0",
  "serde",
  "serde_json",
@@ -9272,7 +9272,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.15",
+ "rustls 0.23.16",
  "rustls-pki-types",
  "tokio",
 ]
@@ -10007,7 +10007,7 @@ dependencies = [
  "log",
  "native-tls",
  "once_cell",
- "rustls 0.23.15",
+ "rustls 0.23.16",
  "rustls-pki-types",
  "serde",
  "serde_json",
@@ -10394,7 +10394,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "anyhow",
  "axum",
@@ -10436,7 +10436,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10521,7 +10521,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "base64 0.21.7",
  "chrono",
@@ -10539,7 +10539,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "chrono",
  "serde",
@@ -10552,7 +10552,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10567,7 +10567,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10613,7 +10613,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10628,7 +10628,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10650,7 +10650,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10662,7 +10662,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10671,7 +10671,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10683,7 +10683,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10695,7 +10695,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10707,7 +10707,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10718,7 +10718,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10729,7 +10729,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10747,7 +10747,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10764,7 +10764,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10776,7 +10776,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10794,7 +10794,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10815,7 +10815,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -10825,7 +10825,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10858,7 +10858,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -10868,7 +10868,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.413.0"
+version = "1.413.1"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 3488123886..2cb36e5848 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.413.0"
+version = "1.413.1"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.413.0"
+version = "1.413.1"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 354c264d3b..153ce25195 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.413.0
+  version: 1.413.1
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 9250451916..b32ed463a8 100644
--- a/benchmarks/lib.ts
+++ b/benchmarks/lib.ts
@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
 import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
 import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
 
-export const VERSION = "v1.413.0";
+export const VERSION = "v1.413.1";
 
 export async function login(email: string, password: string): Promise<string> {
   return await windmill.UserService.login({
diff --git a/cli/main.ts b/cli/main.ts
index bb96d5a599..2e16c674bf 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.413.0";
+export const VERSION = "1.413.1";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 204c6843ab..e1effe2441 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.413.0",
+	"version": "1.413.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.413.0",
+			"version": "1.413.1",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index dff4ef663c..c4c8919f85 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.413.0",
+	"version": "1.413.1",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 2ebf42640a..c1d30a9809 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.413.0"
-wmill_pg = ">=1.413.0"
+wmill = ">=1.413.1"
+wmill_pg = ">=1.413.1"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index d3530ecd0b..12f06f3fb8 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.413.0
+  version: 1.413.1
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index b63a0ba8b6..7ac704ba13 100644
--- a/powershell-client/WindmillClient/WindmillClient.psd1
+++ b/powershell-client/WindmillClient/WindmillClient.psd1
@@ -12,7 +12,7 @@
 RootModule = 'WindmillClient.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.413.0'
+ModuleVersion = '1.413.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index e8abef570e..5f463a5c73 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.413.0"
+version = "1.413.1"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/python-client/wmill_pg/pyproject.toml b/python-client/wmill_pg/pyproject.toml
index ff0f94dd72..b4d003d336 100644
--- a/python-client/wmill_pg/pyproject.toml
+++ b/python-client/wmill_pg/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill-pg"
-version = "1.413.0"
+version = "1.413.1"
 description = "An extension client for the wmill client library focused on pg"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/typescript-client/jsr.json b/typescript-client/jsr.json
index 356cff8f57..259dae5ec5 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.413.0",
+  "version": "1.413.1",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./client.ts"]
diff --git a/typescript-client/package.json b/typescript-client/package.json
index 5f16f2a912..d6d948bfcb 100644
--- a/typescript-client/package.json
+++ b/typescript-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "windmill-client",
   "description": "Windmill SDK client for browsers and Node.js",
-  "version": "1.413.0",
+  "version": "1.413.1",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 7e872ecb2c..2f2c3b6031 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.413.0
+1.413.1

From 24d11cd1488ba8c6a70710b116231902fb6373d7 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Mon, 28 Oct 2024 17:46:15 +0100
Subject: [PATCH 19/34] fix(cli): fix wmill instance pull  --instance

---
 cli/instance.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cli/instance.ts b/cli/instance.ts
index dc8b9050b3..32117f8e3f 100644
--- a/cli/instance.ts
+++ b/cli/instance.ts
@@ -650,6 +650,10 @@ const command = new Command()
   .option("--skip-configs", "Skip pulling configs (worker groups and SMTP)")
   .option("--skip-groups", "Skip pulling instance groups")
   .option("--include-workspaces", "Also pull workspaces")
+  .option(
+    "--instance <instance:string>",
+    "Name of the instance to push to, override the active instance"
+  )
   .action(instancePull as any)
   .command("push")
   .description(

From ab38215c865a2b619c3a97abd5492a5c2840d156 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 29 Oct 2024 07:29:39 +0100
Subject: [PATCH 20/34] fix(backend): in flows, workspace scripts should use
 their set tags instead of the default one

---
 backend/windmill-api/src/db.rs                | 26 +++++++++----------
 backend/windmill-common/src/flows.rs          | 11 ++++++++
 backend/windmill-worker/src/worker_flow.rs    | 21 ++++++++-------
 .../content/FlowModuleWorkerTagSelect.svelte  |  2 +-
 4 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/backend/windmill-api/src/db.rs b/backend/windmill-api/src/db.rs
index c44b8c18e6..6186b0ada1 100644
--- a/backend/windmill-api/src/db.rs
+++ b/backend/windmill-api/src/db.rs
@@ -173,17 +173,6 @@ pub async fn migrate(db: &DB) -> Result<(), Error> {
     let migrator = db.acquire().await?;
     let mut custom_migrator = CustomMigrator { inner: migrator };
 
-    if let Err(err) = fix_flow_versioning_migration(&mut custom_migrator, db).await {
-        tracing::error!("Could not apply flow versioning fix migration: {err:#}");
-    }
-
-    let db2 = db.clone();
-    let _ = tokio::task::spawn(async move {
-        if let Err(err) = fix_job_completed_index(&db2).await {
-            tracing::error!("Could not apply job completed index fix migration: {err:#}");
-        }
-    });
-
     match sqlx::migrate!("../migrations")
         .run_direct(&mut custom_migrator)
         .await
@@ -199,6 +188,17 @@ pub async fn migrate(db: &DB) -> Result<(), Error> {
         Err(err) => Err(err),
     }?;
 
+    if let Err(err) = fix_flow_versioning_migration(&mut custom_migrator, db).await {
+        tracing::error!("Could not apply flow versioning fix migration: {err:#}");
+    }
+
+    let db2 = db.clone();
+    let _ = tokio::task::spawn(async move {
+        if let Err(err) = fix_job_completed_index(&db2).await {
+            tracing::error!("Could not apply job completed index fix migration: {err:#}");
+        }
+    });
+
     Ok(())
 }
 
@@ -302,7 +302,7 @@ macro_rules! run_windmill_migration {
                     .await?;
                     tracing::info!("Finished applying {migration_job_name} migration");
                 } else {
-                    tracing::info!("migration {migration_job_name} already done");
+                    tracing::debug!("migration {migration_job_name} already done");
                 }
 
                 let _ = sqlx::query("SELECT pg_advisory_unlock(4242)")
@@ -311,7 +311,7 @@ macro_rules! run_windmill_migration {
                 tx.commit().await?;
                 tracing::info!("released lock for {migration_job_name}");
             } else {
-                tracing::info!("migration {migration_job_name} already done");
+                tracing::debug!("migration {migration_job_name} already done");
 
             }
         }
diff --git a/backend/windmill-common/src/flows.rs b/backend/windmill-common/src/flows.rs
index 958e9f13ef..aa9efea9b2 100644
--- a/backend/windmill-common/src/flows.rs
+++ b/backend/windmill-common/src/flows.rs
@@ -101,6 +101,7 @@ pub struct FlowValue {
     #[serde(skip_serializing_if = "Option::is_none")]
     #[serde(default)]
     pub failure_module: Option<Box<FlowModule>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     #[serde(default)]
     pub preprocessor_module: Option<Box<FlowModule>>,
     #[serde(default)]
@@ -423,6 +424,7 @@ pub enum FlowModuleValue {
         path: String,
         #[serde(skip_serializing_if = "Option::is_none")]
         hash: Option<ScriptHash>,
+        #[serde(deserialize_with = "empty_string_as_none")]
         tag_override: Option<String>,
     },
     Flow {
@@ -480,6 +482,14 @@ fn is_none_or_empty(expr: &Option<String>) -> bool {
     expr.is_none() || expr.as_ref().unwrap().is_empty()
 }
 
+fn empty_string_as_none<'de, D>(deserializer: D) -> Result<Option<String>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    let s: Option<String> = Option::deserialize(deserializer)?;
+    Ok(s.filter(|s| !s.is_empty()))
+}
+
 #[derive(Deserialize)]
 struct UntaggedFlowModuleValue {
     #[serde(rename = "type")]
@@ -488,6 +498,7 @@ struct UntaggedFlowModuleValue {
     input_transforms: Option<HashMap<String, InputTransform>>,
     path: Option<String>,
     hash: Option<ScriptHash>,
+    #[serde(deserialize_with = "empty_string_as_none")]
     tag_override: Option<String>,
     iterator: Option<InputTransform>,
     modules: Option<Vec<FlowModule>>,
diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs
index 3f92cfc829..a042d41ce4 100644
--- a/backend/windmill-worker/src/worker_flow.rs
+++ b/backend/windmill-worker/src/worker_flow.rs
@@ -2403,15 +2403,15 @@ async fn push_next_flow_job<R: rsmq_async::RsmqConnection + Send + Sync + Clone>
         }
         tracing::debug!(id = %flow_job.id, root_id = %job_root, "pushing job {i} of {len}");
         let payload_tag = match &job_payloads {
-            ContinuePayload::SingleJob(payload) => payload.clone(),
-            ContinuePayload::BranchAllJobs(payloads) => payloads[i].clone(),
+            ContinuePayload::SingleJob(payload) => payload,
+            ContinuePayload::BranchAllJobs(payloads) => &payloads[i],
             ContinuePayload::ForloopJobs { flow_value, delete_after_use, .. } => {
                 let mut fv = flow_value.clone();
 
                 if let Some(failure_module) = fv.failure_module.as_mut() {
                     failure_module.id_append(&format!("{}-{i}", &status.step.to_string()));
                 }
-                JobPayloadWithTag {
+                &JobPayloadWithTag {
                     payload: JobPayload::RawFlow {
                         value: fv,
                         path: Some(format!("{}/forloop-{i}", flow_job.script_path())),
@@ -2590,13 +2590,17 @@ async fn push_next_flow_job<R: rsmq_async::RsmqConnection + Send + Sync + Clone>
         };
 
         tracing::debug!(id = %flow_job.id, root_id = %job_root, "computed perms for job {i} of {len}");
-
+        let tag = if flow_job.tag == "flow" || flow_job.tag == format!("flow-{}", flow_job.workspace_id) {
+            payload_tag.tag.clone()
+        } else {
+            Some(flow_job.tag.clone())
+        };
         let tx2 = PushIsolationLevel::Transaction(tx);
         let (uuid, mut inner_tx) = push(
             &db,
             tx2,
             &flow_job.workspace_id,
-            payload_tag.payload,
+            payload_tag.payload.clone(),
             push_args,
             &flow_job.created_by,
             &flow_job.email,
@@ -2610,11 +2614,7 @@ async fn push_next_flow_job<R: rsmq_async::RsmqConnection + Send + Sync + Clone>
             continue_on_same_worker,
             err,
             flow_job.visible_to_owner,
-            if flow_job.tag == "flow" || flow_job.tag == format!("flow-{}", flow_job.workspace_id) {
-                payload_tag.tag
-            } else {
-                Some(flow_job.tag.clone())
-            },
+            tag,
             payload_tag.timeout,
             Some(module.id.clone()),
             new_job_priority_override,
@@ -3761,6 +3761,7 @@ async fn script_to_payload(
     module: &FlowModule,
     tag_override: &Option<String>,
 ) -> Result<JobPayloadWithTag, Error> {
+    tracing::error!("{tag_override:?}");
     let (payload, tag, delete_after_use, script_timeout) = if script_hash.is_none() {
         let (jp, tag, delete_after_use, script_timeout) =
             script_path_to_payload(script_path, db, &flow_job.workspace_id, Some(true)).await?;
diff --git a/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte b/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte
index 1e26f35e82..00c528902e 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte
@@ -33,7 +33,7 @@
 					{#if tag}
 						<option value="">reset to default</option>
 					{:else}
-						<option value="" disabled selected>Tag</option>
+						<option value={undefined} disabled selected>Tag</option>
 					{/if}
 					{#each $workerTags ?? [] as tag (tag)}
 						<option value={tag}>{tag}</option>

From b31f62940c0cfa7689d24669491ab3d60d6c9deb Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 29 Oct 2024 07:49:05 +0100
Subject: [PATCH 21/34] fix(frontend): fix script and flow renaming

---
 .../src/lib/components/FlowBuilder.svelte     |  64 +++++-----
 .../src/lib/components/ScriptBuilder.svelte   | 112 ++++++++++--------
 2 files changed, 95 insertions(+), 81 deletions(-)

diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte
index 6da81b66d3..63e1655a77 100644
--- a/frontend/src/lib/components/FlowBuilder.svelte
+++ b/frontend/src/lib/components/FlowBuilder.svelte
@@ -119,13 +119,21 @@
 		if (version === undefined) {
 			return
 		}
-		const flowVersion = await FlowService.getFlowLatestVersion({
-			workspace: $workspaceStore!,
-			path: $pathStore
-		})
-
-		onLatest = version === flowVersion?.id
+		try {
+			if (initialPath && initialPath != '') {
+				const flowVersion = await FlowService.getFlowLatestVersion({
+					workspace: $workspaceStore!,
+					path: initialPath
+				})
 
+				onLatest = version === flowVersion?.id
+			} else {
+				onLatest = true
+			}
+		} catch (err) {
+			console.error('Error comparing versions', err)
+			onLatest = false
+		}
 	}
 
 	const dispatch = createEventDispatcher()
@@ -277,9 +285,8 @@
 	}
 
 	async function handleSaveFlow(deploymentMsg?: string) {
-
-		await compareVersions();
-		if (onLatest) {
+		await compareVersions()
+		if (onLatest || initialPath == '') {
 			// Handle directly
 			await saveFlow(deploymentMsg)
 		} else {
@@ -294,28 +301,27 @@
 			open = true
 		}
 	}
-	async function syncWithDeployed(){
-			const flow = await FlowService.getFlowByPath({
-				workspace: $workspaceStore!,
-				path: $pathStore,
-				withStarredInfo: true
-			})
-			deployedValue = {
-				...flow,
-				starred: undefined,
-				id: undefined,
-				edited_at: undefined,
-				edited_by: undefined,
-				workspace_id: undefined,
-				archived: undefined,
-				same_worker: undefined,
-				visible_to_runner_only: undefined,
-				ws_error_handler_muted: undefined,
-			}
-			deployedBy = flow.edited_by
+	async function syncWithDeployed() {
+		const flow = await FlowService.getFlowByPath({
+			workspace: $workspaceStore!,
+			path: initialPath,
+			withStarredInfo: true
+		})
+		deployedValue = {
+			...flow,
+			starred: undefined,
+			id: undefined,
+			edited_at: undefined,
+			edited_by: undefined,
+			workspace_id: undefined,
+			archived: undefined,
+			same_worker: undefined,
+			visible_to_runner_only: undefined,
+			ws_error_handler_muted: undefined
+		}
+		deployedBy = flow.edited_by
 	}
 
-
 	async function saveFlow(deploymentMsg?: string): Promise<void> {
 		loadingSave = true
 		try {
diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte
index 45a48e66d8..e96fd824ee 100644
--- a/frontend/src/lib/components/ScriptBuilder.svelte
+++ b/frontend/src/lib/components/ScriptBuilder.svelte
@@ -18,9 +18,7 @@
 		encodeState,
 		formatCron,
 		orderedJsonStringify,
-
 		type Value
-
 	} from '$lib/utils'
 	import Path from './Path.svelte'
 	import ScriptEditor from './ScriptEditor.svelte'
@@ -92,7 +90,6 @@
 	let confirmCallback: () => void = () => {} // What happens when user clicks `override` in warning
 	let open: boolean = false // Is confirmation modal open
 
-
 	let metadataOpen =
 		!neverShowMeta &&
 		(showMeta ||
@@ -251,62 +248,74 @@
 		}
 	}
 
-	async function handleEditScript(stay: boolean, deployMsg?: string): Promise<void>{
-			// Fetch latest version and fetch entire script after if needed
-			let actual_parent_hash = (await ScriptService.getScriptLatestVersion({
-				workspace: $workspaceStore!,
-				path: script.path,
-			}))?.script_hash;
+	async function handleEditScript(stay: boolean, deployMsg?: string): Promise<void> {
+		// Fetch latest version and fetch entire script after if needed
+		let actual_parent_hash: string | undefined = undefined
 
-
-			// Usually when we create new script, we put current hash as a parent_hash
-			// But if we specify parent_hash that is already used, than we get error
-			// In order to fix it we make sure that client's understanding of parent_hash 
-			// is aligns with understanding of backend.
-			if (script.parent_hash == actual_parent_hash) {
-				// Handle directly
-				await editScript(stay, actual_parent_hash, deployMsg);
-			} else {
-
-				// Fetch entire script, since we need it to show Diff
-				await syncWithDeployed()
-				
-				// Handle through confirmation modal
-				confirmCallback = async () => {
-					open = false
-					await editScript(stay, actual_parent_hash, deployMsg);
-				}
-				// Open confirmation modal
-				open = true
+		try {
+			if (initialPath && initialPath != '') {
+				actual_parent_hash = (
+					await ScriptService.getScriptLatestVersion({
+						workspace: $workspaceStore!,
+						path: initialPath
+					})
+				)?.script_hash
 			}
+		} catch (error) {
+			//
+		}
+
+		// Usually when we create new script, we put current hash as a parent_hash
+		// But if we specify parent_hash that is already used, than we get error
+		// In order to fix it we make sure that client's understanding of parent_hash
+		// is aligns with understanding of backend.
+		if (actual_parent_hash == undefined || script.parent_hash == actual_parent_hash) {
+			// Handle directly
+			await editScript(stay, script.parent_hash!, deployMsg)
+		} else {
+			// Fetch entire script, since we need it to show Diff
+			await syncWithDeployed()
+
+			// Handle through confirmation modal
+			confirmCallback = async () => {
+				open = false
+				await editScript(stay, actual_parent_hash, deployMsg)
+			}
+			// Open confirmation modal
+			open = true
+		}
 	}
 
-	async function syncWithDeployed(){
-			const latestScript = await ScriptService.getScriptByPath({
-				workspace: $workspaceStore!,
-				path: script.path,
-				withStarredInfo: true
-			});
+	async function syncWithDeployed() {
+		const latestScript = await ScriptService.getScriptByPath({
+			workspace: $workspaceStore!,
+			path: initialPath,
+			withStarredInfo: true
+		})
 
-			deployedValue = {
-				...latestScript,
-				starred: undefined,
-				workspace_id: undefined,
-				archived: undefined,
-				created_at: undefined,
-				created_by: undefined,
-				deleted: undefined,
-				extra_perms: undefined,
-				is_template: undefined,
-				lock: undefined,
-				lock_error_logs: undefined,
-				parent_hashes: undefined,
-			};
+		deployedValue = {
+			...latestScript,
+			starred: undefined,
+			workspace_id: undefined,
+			archived: undefined,
+			created_at: undefined,
+			created_by: undefined,
+			deleted: undefined,
+			extra_perms: undefined,
+			is_template: undefined,
+			lock: undefined,
+			lock_error_logs: undefined,
+			parent_hashes: undefined
+		}
 
-			deployedBy = latestScript.created_by;
+		deployedBy = latestScript.created_by
 	}
 
-	async function editScript(stay: boolean, parentHash: string, deploymentMsg?: string, ): Promise<void> {
+	async function editScript(
+		stay: boolean,
+		parentHash: string,
+		deploymentMsg?: string
+	): Promise<void> {
 		loadingSave = true
 		try {
 			try {
@@ -354,7 +363,6 @@
 				}
 			})
 
-			console.log('initialPath', initialPath)
 			const scheduleExists =
 				initialPath != '' &&
 				(await ScheduleService.existsSchedule({

From e76c565d704cd1407035dae2dde70110cb809524 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 29 Oct 2024 08:09:48 +0100
Subject: [PATCH 22/34] furhter nits

---
 .../src/lib/components/FlowBuilder.svelte     |  4 +--
 .../apps/editor/AppEditorHeader.svelte        | 30 +++++++++++--------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte
index 63e1655a77..b04fbdf8dc 100644
--- a/frontend/src/lib/components/FlowBuilder.svelte
+++ b/frontend/src/lib/components/FlowBuilder.svelte
@@ -132,7 +132,7 @@
 			}
 		} catch (err) {
 			console.error('Error comparing versions', err)
-			onLatest = false
+			onLatest = true
 		}
 	}
 
@@ -286,7 +286,7 @@
 
 	async function handleSaveFlow(deploymentMsg?: string) {
 		await compareVersions()
-		if (onLatest || initialPath == '') {
+		if (onLatest || initialPath == '' || savedFlow?.draft_only) {
 			// Handle directly
 			await saveFlow(deploymentMsg)
 		} else {
diff --git a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
index e3eb07b372..af2f4563df 100644
--- a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
+++ b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
@@ -368,18 +368,17 @@
 	}
 
 	async function handleUpdateApp(npath: string) {
-
 		// We have to make sure there is no updates when we clicked the button
-		await compareVersions();
+		await compareVersions()
 
 		if (onLatest) {
 			// Handle directly
 			await updateApp(npath)
 		} else {
-		  // There is onLatest, but we need more information while deploying 
-		  // We need it to show diff
+			// There is onLatest, but we need more information while deploying
+			// We need it to show diff
 			// Handle through confirmation modal
-			await syncWithDeployed();
+			await syncWithDeployed()
 
 			confirmCallback = async () => {
 				open = false
@@ -628,13 +627,18 @@
 		if (version === undefined) {
 			return
 		}
-		const appVersion = await AppService.getAppLatestVersion({
-			workspace: $workspaceStore!,
-			path: appPath
-		})
-		onLatest = version === appVersion?.version
-
+		try {
+			const appVersion = await AppService.getAppLatestVersion({
+				workspace: $workspaceStore!,
+				path: appPath
+			})
+			onLatest = version === appVersion?.version
+		} catch (e) {
+			console.error('Error comparing versions', e)
+			onLatest = true
+		}
 	}
+
 	$: saveDrawerOpen && compareVersions()
 
 	let selectedJobId: string | undefined = undefined
@@ -764,7 +768,7 @@
 				}
 
 				// deployedValue should be syncronized when we open Diff
-				await syncWithDeployed();
+				await syncWithDeployed()
 
 				diffDrawer?.openDrawer()
 				diffDrawer?.setDiff({
@@ -955,7 +959,7 @@
 						return
 					}
 					// deployedValue should be syncronized when we open Diff
-					await syncWithDeployed();
+					await syncWithDeployed()
 
 					saveDrawerOpen = false
 					diffDrawer?.openDrawer()

From 99400ebbf386450ae49200c1e655a2b0b78ed11d Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 29 Oct 2024 08:15:06 +0100
Subject: [PATCH 23/34] improve test this step for flow tag overide

---
 backend/windmill-worker/src/worker_flow.rs    |  1 -
 .../src/lib/components/ModulePreview.svelte   | 21 +++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs
index a042d41ce4..4dacc91d90 100644
--- a/backend/windmill-worker/src/worker_flow.rs
+++ b/backend/windmill-worker/src/worker_flow.rs
@@ -3761,7 +3761,6 @@ async fn script_to_payload(
     module: &FlowModule,
     tag_override: &Option<String>,
 ) -> Result<JobPayloadWithTag, Error> {
-    tracing::error!("{tag_override:?}");
     let (payload, tag, delete_after_use, script_timeout) = if script_hash.is_none() {
         let (jp, tag, delete_after_use, script_timeout) =
             script_path_to_payload(script_path, db, &flow_job.workspace_id, Some(true)).await?;
diff --git a/frontend/src/lib/components/ModulePreview.svelte b/frontend/src/lib/components/ModulePreview.svelte
index d14cd5e5b0..404caf4041 100644
--- a/frontend/src/lib/components/ModulePreview.svelte
+++ b/frontend/src/lib/components/ModulePreview.svelte
@@ -32,7 +32,7 @@
 		getContext<FlowEditorContext>('FlowEditorContext')
 
 	// Test
-	let scriptProgress = undefined;
+	let scriptProgress = undefined
 	let testJobLoader: TestJobLoader
 	let testIsLoading = false
 	let testJob: Job | undefined = undefined
@@ -54,7 +54,7 @@
 
 	export async function runTest(args: any) {
 		// Not defined if JobProgressBar not loaded
-		if (jobProgressReset) jobProgressReset();
+		if (jobProgressReset) jobProgressReset()
 
 		const val = mod.value
 		// let jobId: string | undefined = undefined
@@ -75,7 +75,7 @@
 				script.content,
 				script.language,
 				args,
-				$flowStore?.tag ?? script.tag
+				$flowStore?.tag ?? val.tag_override ?? script.tag
 			)
 		} else if (val.type == 'flow') {
 			await testJobLoader?.abstractRun(() =>
@@ -103,8 +103,6 @@
 	let forceJson = false
 </script>
 
-
-
 <TestJobLoader
 	toastError={noEditor}
 	on:done={() => jobDone()}
@@ -158,9 +156,14 @@
 				/>
 			</Pane>
 			<Pane size={50} minSize={10} class="text-sm text-tertiary">
-			{#if scriptProgress}
-				<JobProgressBar job={testJob} bind:scriptProgress bind:reset={jobProgressReset} compact={true} />
-			{/if}
+				{#if scriptProgress}
+					<JobProgressBar
+						job={testJob}
+						bind:scriptProgress
+						bind:reset={jobProgressReset}
+						compact={true}
+					/>
+				{/if}
 				{#if testJob != undefined && 'result' in testJob && testJob.result != undefined}
 					<div class="break-words relative h-full p-2">
 						<DisplayResult
@@ -186,7 +189,7 @@
 					<div class="p-2">
 						{#if testIsLoading}
 							{#if !scriptProgress}
-							<Loader2 class="animate-spin" />
+								<Loader2 class="animate-spin" />
 							{/if}
 						{:else}
 							Test to see the result here

From 71f84dee08481419276f6335a635f22ba2d6c1a1 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 29 Oct 2024 08:57:16 +0100
Subject: [PATCH 24/34] handle better empty tag overrides

---
 backend/windmill-common/src/flows.rs             | 11 +----------
 backend/windmill-worker/src/worker_flow.rs       |  5 +++++
 frontend/src/lib/components/ModulePreview.svelte |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/backend/windmill-common/src/flows.rs b/backend/windmill-common/src/flows.rs
index aa9efea9b2..9b66cc65ac 100644
--- a/backend/windmill-common/src/flows.rs
+++ b/backend/windmill-common/src/flows.rs
@@ -424,7 +424,7 @@ pub enum FlowModuleValue {
         path: String,
         #[serde(skip_serializing_if = "Option::is_none")]
         hash: Option<ScriptHash>,
-        #[serde(deserialize_with = "empty_string_as_none")]
+        #[serde(skip_serializing_if = "Option::is_none")]
         tag_override: Option<String>,
     },
     Flow {
@@ -482,14 +482,6 @@ fn is_none_or_empty(expr: &Option<String>) -> bool {
     expr.is_none() || expr.as_ref().unwrap().is_empty()
 }
 
-fn empty_string_as_none<'de, D>(deserializer: D) -> Result<Option<String>, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    let s: Option<String> = Option::deserialize(deserializer)?;
-    Ok(s.filter(|s| !s.is_empty()))
-}
-
 #[derive(Deserialize)]
 struct UntaggedFlowModuleValue {
     #[serde(rename = "type")]
@@ -498,7 +490,6 @@ struct UntaggedFlowModuleValue {
     input_transforms: Option<HashMap<String, InputTransform>>,
     path: Option<String>,
     hash: Option<ScriptHash>,
-    #[serde(deserialize_with = "empty_string_as_none")]
     tag_override: Option<String>,
     iterator: Option<InputTransform>,
     modules: Option<Vec<FlowModule>>,
diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs
index 4dacc91d90..a1a4fd9904 100644
--- a/backend/windmill-worker/src/worker_flow.rs
+++ b/backend/windmill-worker/src/worker_flow.rs
@@ -3761,6 +3761,11 @@ async fn script_to_payload(
     module: &FlowModule,
     tag_override: &Option<String>,
 ) -> Result<JobPayloadWithTag, Error> {
+    let tag_override = if tag_override.as_ref().is_some_and(|x| x.trim().is_empty()) {
+        None
+    } else {
+        tag_override.clone()
+    };
     let (payload, tag, delete_after_use, script_timeout) = if script_hash.is_none() {
         let (jp, tag, delete_after_use, script_timeout) =
             script_path_to_payload(script_path, db, &flow_job.workspace_id, Some(true)).await?;
diff --git a/frontend/src/lib/components/ModulePreview.svelte b/frontend/src/lib/components/ModulePreview.svelte
index 404caf4041..dc6005c92a 100644
--- a/frontend/src/lib/components/ModulePreview.svelte
+++ b/frontend/src/lib/components/ModulePreview.svelte
@@ -75,7 +75,7 @@
 				script.content,
 				script.language,
 				args,
-				$flowStore?.tag ?? val.tag_override ?? script.tag
+				$flowStore?.tag ?? (val.tag_override ? val.tag_override : script.tag)
 			)
 		} else if (val.type == 'flow') {
 			await testJobLoader?.abstractRun(() =>

From 2a136effe7a1e5317b59543bb750803e9302e514 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 29 Oct 2024 09:09:08 +0100
Subject: [PATCH 25/34] nit test serializer

---
 backend/windmill-api/src/flows.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/backend/windmill-api/src/flows.rs b/backend/windmill-api/src/flows.rs
index 3644e04d30..4fc9ce514f 100644
--- a/backend/windmill-api/src/flows.rs
+++ b/backend/windmill-api/src/flows.rs
@@ -544,7 +544,6 @@ async fn get_latest_version(
     Extension(user_db): Extension<UserDB>,
     Path((w_id, path)): Path<(String, StripPath)>,
 ) -> JsonResult<Option<FlowVersion>> {
-
     let path = path.to_path();
     let mut tx = user_db.begin(&authed).await?;
 
@@ -1333,7 +1332,6 @@ mod tests {
                   },
                 "type": "script",
                 "path": "test",
-                "tag_override": Option::<String>::None,
               },
             },
             {
@@ -1377,14 +1375,12 @@ mod tests {
               "input_transforms": {},
               "type": "script",
               "path": "test",
-              "tag_override": Option::<String>::None,
             },
             "stop_after_if": {
                 "expr": "previous.isEmpty()",
                 "skip_if_stopped": false
             }
           },
-          "preprocessor_module": Option::<String>::None
         });
         assert_eq!(dbg!(serde_json::json!(fv)), dbg!(expect));
     }

From fe8c95755deec59a248304c3998b09b06ee15bc8 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Tue, 29 Oct 2024 09:13:48 +0100
Subject: [PATCH 26/34] chore(main): release 1.413.2 (#4598)

* chore(main): release 1.413.2

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |  9 ++
 backend/Cargo.lock                            | 85 ++++++++++---------
 backend/Cargo.toml                            |  4 +-
 backend/windmill-api/openapi.yaml             |  2 +-
 benchmarks/lib.ts                             |  2 +-
 cli/main.ts                                   |  2 +-
 frontend/package-lock.json                    |  4 +-
 frontend/package.json                         |  2 +-
 lsp/Pipfile                                   |  4 +-
 openflow.openapi.yaml                         |  2 +-
 .../WindmillClient/WindmillClient.psd1        |  2 +-
 python-client/wmill/pyproject.toml            |  2 +-
 python-client/wmill_pg/pyproject.toml         |  2 +-
 typescript-client/jsr.json                    |  2 +-
 typescript-client/package.json                |  2 +-
 version.txt                                   |  2 +-
 16 files changed, 69 insertions(+), 59 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94a51dbc5f..856c7b45f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [1.413.2](https://github.com/windmill-labs/windmill/compare/v1.413.1...v1.413.2) (2024-10-29)
+
+
+### Bug Fixes
+
+* **backend:** in flows, workspace scripts should use their set tags instead of the default one ([5b7c6d7](https://github.com/windmill-labs/windmill/commit/5b7c6d7d62dcfd09fec374e781bdf5c5bafe4a9d))
+* **cli:** fix wmill instance pull  --instance ([3c62f5e](https://github.com/windmill-labs/windmill/commit/3c62f5ea83d1da8bd3705468969d56e2fe680751))
+* **frontend:** fix script and flow renaming ([d743e00](https://github.com/windmill-labs/windmill/commit/d743e0056353a4fca445a7089e3afc1fd4e8c219))
+
 ## [1.413.1](https://github.com/windmill-labs/windmill/compare/v1.413.0...v1.413.1) (2024-10-28)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 354da8303f..ce73a7bb66 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -571,7 +571,7 @@ dependencies = [
  "bytes",
  "http 1.1.0",
  "rand 0.8.5",
- "reqwest 0.12.8",
+ "reqwest 0.12.9",
  "serde",
  "serde-aux",
  "serde_json",
@@ -4700,9 +4700,9 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00419de735aac21d53b0de5ce2c03bd3627277cf471300f27ebc89f7d828047"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 
 [[package]]
 name = "libredox"
@@ -5445,7 +5445,7 @@ dependencies = [
  "percent-encoding",
  "quick-xml 0.36.2",
  "rand 0.8.5",
- "reqwest 0.12.8",
+ "reqwest 0.12.9",
  "ring 0.17.8",
  "serde",
  "serde_json",
@@ -6391,10 +6391,11 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b"
+checksum = "e346e016eacfff12233c243718197ca12f148c84e1e84268a896699b41c71780"
 dependencies = [
+ "cfg_aliases",
  "libc",
  "once_cell",
  "socket2 0.5.7",
@@ -6724,9 +6725,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.8"
+version = "0.12.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
 dependencies = [
  "async-compression 0.4.17",
  "base64 0.22.1",
@@ -7414,9 +7415,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
 
 [[package]]
 name = "serde"
-version = "1.0.213"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
 dependencies = [
  "serde_derive",
 ]
@@ -7455,9 +7456,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.213"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9607,7 +9608,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fea6023f9fe4b69267ccd3ed7d203d931c43c5f82dbaa0f07202bc17193a5f43"
 dependencies = [
  "loki-api",
- "reqwest 0.12.8",
+ "reqwest 0.12.9",
  "serde",
  "serde_json",
  "snap",
@@ -10394,7 +10395,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "anyhow",
  "axum",
@@ -10411,7 +10412,7 @@ dependencies = [
  "prometheus",
  "quote",
  "rand 0.8.5",
- "reqwest 0.12.8",
+ "reqwest 0.12.9",
  "rsmq_async",
  "serde",
  "serde_json",
@@ -10436,7 +10437,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10480,7 +10481,7 @@ dependencies = [
  "quick_cache",
  "rand 0.8.5",
  "regex",
- "reqwest 0.12.8",
+ "reqwest 0.12.9",
  "rsa 0.7.2",
  "rsmq_async",
  "rust-embed",
@@ -10521,7 +10522,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "base64 0.21.7",
  "chrono",
@@ -10539,7 +10540,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "chrono",
  "serde",
@@ -10552,7 +10553,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10567,7 +10568,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10594,7 +10595,7 @@ dependencies = [
  "prometheus",
  "rand 0.8.5",
  "regex",
- "reqwest 0.12.8",
+ "reqwest 0.12.9",
  "serde",
  "serde_json",
  "sha2 0.10.8",
@@ -10613,7 +10614,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10628,7 +10629,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10650,7 +10651,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10662,7 +10663,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10671,7 +10672,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10683,7 +10684,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10695,7 +10696,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10707,7 +10708,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10718,7 +10719,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10729,7 +10730,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10747,7 +10748,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10764,7 +10765,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10776,7 +10777,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10794,7 +10795,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10815,7 +10816,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -10825,7 +10826,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10841,7 +10842,7 @@ dependencies = [
  "lazy_static",
  "prometheus",
  "regex",
- "reqwest 0.12.8",
+ "reqwest 0.12.9",
  "rsmq_async",
  "serde",
  "serde_json",
@@ -10858,7 +10859,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -10868,7 +10869,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.413.1"
+version = "1.413.2"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10908,7 +10909,7 @@ dependencies = [
  "prometheus",
  "rand 0.8.5",
  "regex",
- "reqwest 0.12.8",
+ "reqwest 0.12.9",
  "rsmq_async",
  "rust_decimal",
  "serde",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 2cb36e5848..df77adff9e 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.413.1"
+version = "1.413.2"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.413.1"
+version = "1.413.2"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 153ce25195..1fcae0cb9f 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.413.1
+  version: 1.413.2
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index b32ed463a8..05ccd95904 100644
--- a/benchmarks/lib.ts
+++ b/benchmarks/lib.ts
@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
 import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
 import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
 
-export const VERSION = "v1.413.1";
+export const VERSION = "v1.413.2";
 
 export async function login(email: string, password: string): Promise<string> {
   return await windmill.UserService.login({
diff --git a/cli/main.ts b/cli/main.ts
index 2e16c674bf..1c06b24301 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.413.1";
+export const VERSION = "1.413.2";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e1effe2441..6c99fc97a6 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.413.1",
+	"version": "1.413.2",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.413.1",
+			"version": "1.413.2",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index c4c8919f85..2a48b09a4f 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.413.1",
+	"version": "1.413.2",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index c1d30a9809..e7e4828ccd 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.413.1"
-wmill_pg = ">=1.413.1"
+wmill = ">=1.413.2"
+wmill_pg = ">=1.413.2"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 12f06f3fb8..c9808679bf 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.413.1
+  version: 1.413.2
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 7ac704ba13..41dba9e1da 100644
--- a/powershell-client/WindmillClient/WindmillClient.psd1
+++ b/powershell-client/WindmillClient/WindmillClient.psd1
@@ -12,7 +12,7 @@
 RootModule = 'WindmillClient.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.413.1'
+ModuleVersion = '1.413.2'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 5f463a5c73..4c3200022b 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.413.1"
+version = "1.413.2"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/python-client/wmill_pg/pyproject.toml b/python-client/wmill_pg/pyproject.toml
index b4d003d336..d0b7d007e9 100644
--- a/python-client/wmill_pg/pyproject.toml
+++ b/python-client/wmill_pg/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill-pg"
-version = "1.413.1"
+version = "1.413.2"
 description = "An extension client for the wmill client library focused on pg"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/typescript-client/jsr.json b/typescript-client/jsr.json
index 259dae5ec5..2f34a6cb06 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.413.1",
+  "version": "1.413.2",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./client.ts"]
diff --git a/typescript-client/package.json b/typescript-client/package.json
index d6d948bfcb..ed422483f4 100644
--- a/typescript-client/package.json
+++ b/typescript-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "windmill-client",
   "description": "Windmill SDK client for browsers and Node.js",
-  "version": "1.413.1",
+  "version": "1.413.2",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 2f2c3b6031..8e1037d7b9 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.413.1
+1.413.2

From 7fdb524fc694e39a54e06dd5f46d6e270cfe7a41 Mon Sep 17 00:00:00 2001
From: HugoCasa <hugo@casademont.ch>
Date: Tue, 29 Oct 2024 09:26:45 +0100
Subject: [PATCH 27/34] improve key renewal (#4519)

* improve key renewal

* sqlx and fix

* fix build

* improve everything

* nits

* nits

* update ee ref

* nit
---
 ...ee6d098a2758d16ede000809bd9a09660b604.json | 20 -----
 ...b031862e1a18ad9204e02a0194817db26d6a.json} | 12 ++-
 ...cb5537995f2499f6cb8f0f316fb62902d542.json} | 12 ++-
 ...18c321c422705f79e69550bb60f377083bcef.json | 65 +++++++++++++++
 ...0304333536768527525a43bdd45aedffa3c4f.json | 22 -----
 ...e5f544f654d7cddc13acb5d3f4fdc12a8875f.json | 20 -----
 backend/ee-repo-ref.txt                       |  2 +-
 backend/src/ee.rs                             | 12 +--
 backend/src/main.rs                           | 81 ++++++++++++++++---
 backend/src/monitor.rs                        | 47 ++++-------
 backend/windmill-api/openapi.yaml             |  7 ++
 backend/windmill-api/src/ee.rs                |  2 +-
 backend/windmill-api/src/lib.rs               |  8 +-
 backend/windmill-api/src/settings.rs          | 10 ++-
 backend/windmill-common/src/ee.rs             |  7 +-
 backend/windmill-common/src/stats_ee.rs       |  1 -
 backend/windmill-common/src/utils.rs          |  8 ++
 .../lib/components/InstanceSettings.svelte    | 19 ++++-
 .../lib/components/SuperadminSettings.svelte  | 72 ++++++++++++-----
 19 files changed, 276 insertions(+), 151 deletions(-)
 delete mode 100644 backend/.sqlx/query-19f0abd79372698f378cb6deea3ee6d098a2758d16ede000809bd9a09660b604.json
 rename backend/.sqlx/{query-c2060e8cacef6c3b5ce51ed203a2dbafc18d66f2924d1fe518c6728997647db2.json => query-1a4d291c2f239f7b50c116594cebb031862e1a18ad9204e02a0194817db26d6a.json} (75%)
 rename backend/.sqlx/{query-8813665f8adfcab0daefbac2cc6b50e427dfd1c12d12895451affd307dc59c37.json => query-2c14d3a88193f16ad3b8cd590749cb5537995f2499f6cb8f0f316fb62902d542.json} (77%)
 create mode 100644 backend/.sqlx/query-2eec077cc9e27d7ccd160cbaac118c321c422705f79e69550bb60f377083bcef.json
 delete mode 100644 backend/.sqlx/query-6776dc50f184188756ad7fe263b0304333536768527525a43bdd45aedffa3c4f.json
 delete mode 100644 backend/.sqlx/query-9ed77e78e6295c62745ac3ac3b7e5f544f654d7cddc13acb5d3f4fdc12a8875f.json

diff --git a/backend/.sqlx/query-19f0abd79372698f378cb6deea3ee6d098a2758d16ede000809bd9a09660b604.json b/backend/.sqlx/query-19f0abd79372698f378cb6deea3ee6d098a2758d16ede000809bd9a09660b604.json
deleted file mode 100644
index 8796b86902..0000000000
--- a/backend/.sqlx/query-19f0abd79372698f378cb6deea3ee6d098a2758d16ede000809bd9a09660b604.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT created_at FROM metrics WHERE id = 'telemetry' ORDER BY created_at DESC LIMIT 1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "created_at",
-        "type_info": "Timestamptz"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "19f0abd79372698f378cb6deea3ee6d098a2758d16ede000809bd9a09660b604"
-}
diff --git a/backend/.sqlx/query-c2060e8cacef6c3b5ce51ed203a2dbafc18d66f2924d1fe518c6728997647db2.json b/backend/.sqlx/query-1a4d291c2f239f7b50c116594cebb031862e1a18ad9204e02a0194817db26d6a.json
similarity index 75%
rename from backend/.sqlx/query-c2060e8cacef6c3b5ce51ed203a2dbafc18d66f2924d1fe518c6728997647db2.json
rename to backend/.sqlx/query-1a4d291c2f239f7b50c116594cebb031862e1a18ad9204e02a0194817db26d6a.json
index 6a08bbeab3..b8c5b89128 100644
--- a/backend/.sqlx/query-c2060e8cacef6c3b5ce51ed203a2dbafc18d66f2924d1fe518c6728997647db2.json
+++ b/backend/.sqlx/query-1a4d291c2f239f7b50c116594cebb031862e1a18ad9204e02a0194817db26d6a.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT email, login_type::text, verified, super_admin, name, company, username from password ORDER BY super_admin DESC, email LIMIT $1 OFFSET $2",
+  "query": "SELECT email, login_type::text, verified, super_admin, name, company, username, NULL::bool as operator_only FROM password ORDER BY super_admin DESC, email LIMIT $1 OFFSET $2",
   "describe": {
     "columns": [
       {
@@ -37,6 +37,11 @@
         "ordinal": 6,
         "name": "username",
         "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "operator_only",
+        "type_info": "Bool"
       }
     ],
     "parameters": {
@@ -52,8 +57,9 @@
       false,
       true,
       true,
-      true
+      true,
+      null
     ]
   },
-  "hash": "c2060e8cacef6c3b5ce51ed203a2dbafc18d66f2924d1fe518c6728997647db2"
+  "hash": "1a4d291c2f239f7b50c116594cebb031862e1a18ad9204e02a0194817db26d6a"
 }
diff --git a/backend/.sqlx/query-8813665f8adfcab0daefbac2cc6b50e427dfd1c12d12895451affd307dc59c37.json b/backend/.sqlx/query-2c14d3a88193f16ad3b8cd590749cb5537995f2499f6cb8f0f316fb62902d542.json
similarity index 77%
rename from backend/.sqlx/query-8813665f8adfcab0daefbac2cc6b50e427dfd1c12d12895451affd307dc59c37.json
rename to backend/.sqlx/query-2c14d3a88193f16ad3b8cd590749cb5537995f2499f6cb8f0f316fb62902d542.json
index ce8adcd5b7..93017f5aec 100644
--- a/backend/.sqlx/query-8813665f8adfcab0daefbac2cc6b50e427dfd1c12d12895451affd307dc59c37.json
+++ b/backend/.sqlx/query-2c14d3a88193f16ad3b8cd590749cb5537995f2499f6cb8f0f316fb62902d542.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT email, login_type::TEXT, super_admin, verified, name, company, username FROM password WHERE email = $1",
+  "query": "SELECT email, login_type::TEXT, super_admin, verified, name, company, username, NULL::bool as operator_only FROM password WHERE email = $1",
   "describe": {
     "columns": [
       {
@@ -37,6 +37,11 @@
         "ordinal": 6,
         "name": "username",
         "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "operator_only",
+        "type_info": "Bool"
       }
     ],
     "parameters": {
@@ -51,8 +56,9 @@
       false,
       true,
       true,
-      true
+      true,
+      null
     ]
   },
-  "hash": "8813665f8adfcab0daefbac2cc6b50e427dfd1c12d12895451affd307dc59c37"
+  "hash": "2c14d3a88193f16ad3b8cd590749cb5537995f2499f6cb8f0f316fb62902d542"
 }
diff --git a/backend/.sqlx/query-2eec077cc9e27d7ccd160cbaac118c321c422705f79e69550bb60f377083bcef.json b/backend/.sqlx/query-2eec077cc9e27d7ccd160cbaac118c321c422705f79e69550bb60f377083bcef.json
new file mode 100644
index 0000000000..f3eecb9006
--- /dev/null
+++ b/backend/.sqlx/query-2eec077cc9e27d7ccd160cbaac118c321c422705f79e69550bb60f377083bcef.json
@@ -0,0 +1,65 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "WITH active_users AS (SELECT distinct username as email FROM audit WHERE timestamp > NOW() - INTERVAL '1 month' AND (operation = 'users.login' OR operation = 'oauth.login')),\n            authors as (SELECT distinct email FROM usr WHERE usr.operator IS false)\n            SELECT email, email NOT IN (SELECT email FROM authors) as operator_only, login_type::text, verified, super_admin, name, company, username\n            FROM password\n            WHERE email IN (SELECT email FROM active_users)\n            ORDER BY super_admin DESC\n            LIMIT $1 OFFSET $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "email",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "operator_only",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 2,
+        "name": "login_type",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 3,
+        "name": "verified",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 4,
+        "name": "super_admin",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 5,
+        "name": "name",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 6,
+        "name": "company",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "username",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      null,
+      null,
+      false,
+      false,
+      true,
+      true,
+      true
+    ]
+  },
+  "hash": "2eec077cc9e27d7ccd160cbaac118c321c422705f79e69550bb60f377083bcef"
+}
diff --git a/backend/.sqlx/query-6776dc50f184188756ad7fe263b0304333536768527525a43bdd45aedffa3c4f.json b/backend/.sqlx/query-6776dc50f184188756ad7fe263b0304333536768527525a43bdd45aedffa3c4f.json
deleted file mode 100644
index 4187b628b7..0000000000
--- a/backend/.sqlx/query-6776dc50f184188756ad7fe263b0304333536768527525a43bdd45aedffa3c4f.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT pg_try_advisory_xact_lock($1)",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "pg_try_advisory_xact_lock",
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "6776dc50f184188756ad7fe263b0304333536768527525a43bdd45aedffa3c4f"
-}
diff --git a/backend/.sqlx/query-9ed77e78e6295c62745ac3ac3b7e5f544f654d7cddc13acb5d3f4fdc12a8875f.json b/backend/.sqlx/query-9ed77e78e6295c62745ac3ac3b7e5f544f654d7cddc13acb5d3f4fdc12a8875f.json
deleted file mode 100644
index 9c7af05c42..0000000000
--- a/backend/.sqlx/query-9ed77e78e6295c62745ac3ac3b7e5f544f654d7cddc13acb5d3f4fdc12a8875f.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT created_at FROM metrics WHERE id = 'license_key_renewal' ORDER BY created_at DESC LIMIT 1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "created_at",
-        "type_info": "Timestamptz"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "9ed77e78e6295c62745ac3ac3b7e5f544f654d7cddc13acb5d3f4fdc12a8875f"
-}
diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index 67f8651560..2c2cd13f33 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-ee638ab91623392cdbf6a139f2b54b9b527585ea
\ No newline at end of file
+f667fcebdb5a2d1c22c1928d6a316ba57bb43d72
\ No newline at end of file
diff --git a/backend/src/ee.rs b/backend/src/ee.rs
index ef944b984b..91816cd1ba 100644
--- a/backend/src/ee.rs
+++ b/backend/src/ee.rs
@@ -1,16 +1,8 @@
-use anyhow::anyhow;
-#[cfg(feature = "enterprise")]
-use windmill_common::error::{Error, Result};
-
-pub async fn set_license_key(_license_key: String) -> anyhow::Result<()> {
+pub async fn set_license_key(_license_key: String) -> () {
     // Implementation is not open source
-    Err(anyhow!("License cannot be set in Windmill CE"))
 }
 
 #[cfg(feature = "enterprise")]
-pub async fn verify_license_key() -> Result<()> {
+pub async fn verify_license_key() -> () {
     // Implementation is not open source
-    Err(Error::InternalErr(
-        "License always invalid in Windmill CE".to_string(),
-    ))
 }
diff --git a/backend/src/main.rs b/backend/src/main.rs
index f240961734..e0a43b7d56 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -27,7 +27,7 @@ use uuid::Uuid;
 use windmill_api::HTTP_CLIENT;
 
 #[cfg(feature = "enterprise")]
-use windmill_common::ee::schedule_key_renewal;
+use windmill_common::ee::{maybe_renew_license_key_on_start, LICENSE_KEY_ID, LICENSE_KEY_VALID};
 
 use windmill_common::{
     global_settings::{
@@ -307,7 +307,8 @@ async fn windmill_main() -> anyhow::Result<()> {
             Mode::Standalone
         });
 
-    let num_workers = if mode == Mode::Server || mode == Mode::Indexer {
+    #[allow(unused_mut)]
+    let mut num_workers = if mode == Mode::Server || mode == Mode::Indexer {
         0
     } else {
         std::env::var("NUM_WORKERS")
@@ -422,6 +423,50 @@ Windmill Community Edition {GIT_VERSION}
 
     display_config(&ENV_SETTINGS);
 
+    if let Err(e) = reload_base_url_setting(&db).await {
+        tracing::error!("Error loading base url: {:?}", e)
+    }
+
+    if let Err(e) = reload_critical_error_channels_setting(&db).await {
+        tracing::error!("Could loading critical error emails setting: {:?}", e);
+    }
+
+    #[cfg(feature = "enterprise")]
+    {
+        // load the license key and check if it's valid
+        // if not valid and not server mode just quit
+        // if not expired and server mode then force renewal
+        // if key still invalid and num_workers > 0, set to 0
+        if let Err(err) = reload_license_key(&db).await {
+            tracing::error!("Failed to reload license key: {err:#}");
+        }
+        let valid_key = *LICENSE_KEY_VALID.read().await;
+        if !valid_key && !server_mode {
+            panic!("Invalid license key, workers require a valid license key");
+        }
+        if server_mode {
+            // only force renewal if invalid but not empty (= expired)
+            let renewed_now = maybe_renew_license_key_on_start(
+                &HTTP_CLIENT,
+                &db,
+                !valid_key && !LICENSE_KEY_ID.read().await.is_empty(),
+            )
+            .await;
+            if renewed_now {
+                if let Err(err) = reload_license_key(&db).await {
+                    tracing::error!("Failed to reload license key: {err:#}");
+                }
+            }
+            if num_workers > 0 {
+                let valid_key = *LICENSE_KEY_VALID.read().await;
+                if !valid_key {
+                    tracing::warn!("License key invalid, setting num_workers to 0");
+                    num_workers = 0;
+                }
+            }
+        }
+    }
+
     let worker_mode = num_workers > 0;
 
     if server_mode || worker_mode || indexer_mode {
@@ -448,7 +493,16 @@ Windmill Community Edition {GIT_VERSION}
 
         initial_load(&db, killpill_tx.clone(), worker_mode, server_mode, is_agent).await;
 
-        monitor_db(&db, &base_internal_url, rsmq.clone(), server_mode, true).await;
+        monitor_db(
+            &db,
+            &base_internal_url,
+            rsmq.clone(),
+            server_mode,
+            worker_mode,
+            true,
+            killpill_tx.clone(),
+        )
+        .await;
 
         monitor_pool(&db).await;
 
@@ -578,7 +632,9 @@ Windmill Community Edition {GIT_VERSION}
                                 &base_internal_url,
                                 rsmq.clone(),
                                 server_mode,
-                                false
+                                worker_mode,
+                                false,
+                                tx.clone(),
                             )
                             .await;
                         },
@@ -621,7 +677,15 @@ Windmill Community Edition {GIT_VERSION}
                                                 },
                                                 LICENSE_KEY_SETTING => {
                                                     if let Err(e) = reload_license_key(&db).await {
-                                                        tracing::error!(error = %e, "Could not reload license key setting");
+                                                        tracing::error!("Failed to reload license key: {e:#}");
+                                                    }
+                                                    #[cfg(feature = "enterprise")]
+                                                    if worker_mode {
+                                                        let valid_key = *LICENSE_KEY_VALID.read().await;
+                                                        if !valid_key {
+                                                            tracing::error!("Invalid license key, exiting...");
+                                                            tx.send(()).expect("send");
+                                                        }
                                                     }
                                                 },
                                                 DEFAULT_TAGS_PER_WORKSPACE_SETTING => {
@@ -767,15 +831,10 @@ Windmill Community Edition {GIT_VERSION}
             Ok(()) as anyhow::Result<()>
         };
 
-        if mode == Mode::Server || mode == Mode::Standalone {
+        if server_mode {
             schedule_stats(&db, &HTTP_CLIENT).await;
         }
 
-        #[cfg(feature = "enterprise")]
-        if mode == Mode::Server || mode == Mode::Standalone {
-            schedule_key_renewal(&HTTP_CLIENT, &db).await;
-        }
-
         futures::try_join!(
             shutdown_signal,
             workers_f,
diff --git a/backend/src/monitor.rs b/backend/src/monitor.rs
index 17dd833d62..0618cfd8d8 100644
--- a/backend/src/monitor.rs
+++ b/backend/src/monitor.rs
@@ -27,7 +27,7 @@ use windmill_api::{
     DEFAULT_BODY_LIMIT, IS_SECURE, OAUTH_CLIENTS, REQUEST_SIZE_LIMIT, SAML_METADATA, SCIM_TOKEN,
 };
 #[cfg(feature = "enterprise")]
-use windmill_common::ee::{jobs_waiting_alerts, worker_groups_alerts};
+use windmill_common::ee::{jobs_waiting_alerts, worker_groups_alerts, LICENSE_KEY_VALID};
 use windmill_common::{
     auth::JWT_SECRET,
     ee::CriticalErrorChannel,
@@ -76,9 +76,6 @@ use windmill_common::global_settings::OBJECT_STORE_CACHE_CONFIG_SETTING;
 #[cfg(feature = "enterprise")]
 use crate::ee::verify_license_key;
 
-#[cfg(feature = "enterprise")]
-use windmill_common::ee::LICENSE_KEY_VALID;
-
 use crate::ee::set_license_key;
 
 lazy_static::lazy_static! {
@@ -152,18 +149,10 @@ pub async fn initial_load(
         tracing::error!("Error reloading custom tags: {:?}", e)
     }
 
-    if let Err(e) = reload_base_url_setting(db).await {
-        tracing::error!("Error reloading base url: {:?}", e)
-    }
-
     if let Err(e) = reload_hub_base_url_setting(db, server_mode).await {
         tracing::error!("Error reloading hub base url: {:?}", e)
     }
 
-    if let Err(e) = reload_critical_error_channels_setting(&db).await {
-        tracing::error!("Could not reload critical error emails setting: {:?}", e);
-    }
-
     if let Err(e) = reload_jwt_secret_setting(&db).await {
         tracing::error!("Could not reload jwt secret setting: {:?}", e);
     }
@@ -182,11 +171,6 @@ pub async fn initial_load(
         reload_scim_token_setting(&db).await;
     }
 
-    #[cfg(feature = "enterprise")]
-    if let Err(e) = reload_license_key(&db).await {
-        tracing::error!("Error reloading license key: {:?}", e)
-    }
-
     if worker_mode {
         reload_extra_pip_index_url_setting(&db).await;
         reload_pip_index_url_setting(&db).await;
@@ -854,8 +838,10 @@ pub async fn reload_request_size(db: &DB) {
     }
 }
 
-pub async fn reload_license_key(db: &DB) -> error::Result<()> {
-    let q = load_value_from_global_settings(db, LICENSE_KEY_SETTING).await?;
+pub async fn reload_license_key(db: &DB) -> anyhow::Result<()> {
+    let q = load_value_from_global_settings(db, LICENSE_KEY_SETTING)
+        .await
+        .map_err(|err| anyhow::anyhow!("Error reloading license key: {}", err.to_string()))?;
 
     let mut value = std::env::var("LICENSE_KEY")
         .ok()
@@ -873,9 +859,7 @@ pub async fn reload_license_key(db: &DB) -> error::Result<()> {
             tracing::error!("Could not parse LICENSE_KEY found: {:#?}", &q);
         }
     };
-
-    set_license_key(value).await?;
-
+    set_license_key(value).await;
     Ok(())
 }
 
@@ -1014,7 +998,9 @@ pub async fn monitor_db(
     base_internal_url: &str,
     rsmq: Option<MultiplexedRsmq>,
     server_mode: bool,
+    _worker_mode: bool,
     initial_load: bool,
+    _killpill_tx: tokio::sync::broadcast::Sender<()>,
 ) {
     let zombie_jobs_f = async {
         if server_mode && !initial_load {
@@ -1035,15 +1021,14 @@ pub async fn monitor_db(
 
     let verify_license_key_f = async {
         #[cfg(feature = "enterprise")]
-        if let Err(e) = verify_license_key().await {
-            tracing::error!("Error verifying license key: {:?}", e);
-            let mut l = LICENSE_KEY_VALID.write().await;
-            *l = false;
-        } else {
-            let is_valid = LICENSE_KEY_VALID.read().await.clone();
-            if !is_valid {
-                let mut l = LICENSE_KEY_VALID.write().await;
-                *l = true;
+        if !initial_load {
+            verify_license_key().await;
+            if _worker_mode {
+                let valid_key = *LICENSE_KEY_VALID.read().await;
+                if !valid_key {
+                    tracing::error!("Invalid license key, exiting...");
+                    _killpill_tx.send(()).expect("send");
+                }
             }
         }
     };
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 1fcae0cb9f..d8ab6a8696 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1467,6 +1467,11 @@ paths:
       parameters:
         - $ref: "#/components/parameters/Page"
         - $ref: "#/components/parameters/PerPage"
+        - name: active_only
+          in: query
+          description: filter only active users
+          schema:
+            type: boolean
       responses:
         "200":
           description: user
@@ -11791,6 +11796,8 @@ components:
           type: string
         username:
           type: string
+        operator_only:
+          type: boolean
 
       required:
         - email
diff --git a/backend/windmill-api/src/ee.rs b/backend/windmill-api/src/ee.rs
index b20521e8b4..cddb639e95 100644
--- a/backend/windmill-api/src/ee.rs
+++ b/backend/windmill-api/src/ee.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 #[cfg(feature = "enterprise")]
 use tokio::sync::RwLock;
 
-pub async fn validate_license_key(_license_key: String) -> anyhow::Result<String> {
+pub async fn validate_license_key(_license_key: String) -> anyhow::Result<(String, bool)> {
     // Implementation is not open source
     Err(anyhow!("License can't be validated in Windmill CE"))
 }
diff --git a/backend/windmill-api/src/lib.rs b/backend/windmill-api/src/lib.rs
index 45a0ea7196..dc9dbd2529 100644
--- a/backend/windmill-api/src/lib.rs
+++ b/backend/windmill-api/src/lib.rs
@@ -456,9 +456,13 @@ async fn ee_license() -> &'static str {
 
 #[cfg(feature = "enterprise")]
 async fn ee_license() -> String {
-    use windmill_common::ee::LICENSE_KEY_ID;
+    use windmill_common::ee::{LICENSE_KEY_ID, LICENSE_KEY_VALID};
 
-    LICENSE_KEY_ID.read().await.clone()
+    if *LICENSE_KEY_VALID.read().await {
+        LICENSE_KEY_ID.read().await.clone()
+    } else {
+        "".to_string()
+    }
 }
 
 async fn openapi() -> &'static str {
diff --git a/backend/windmill-api/src/settings.rs b/backend/windmill-api/src/settings.rs
index 8a72a5459a..e8c000c788 100644
--- a/backend/windmill-api/src/settings.rs
+++ b/backend/windmill-api/src/settings.rs
@@ -163,8 +163,13 @@ pub async fn test_license_key(
     Json(TestKey { license_key }): Json<TestKey>,
 ) -> error::Result<String> {
     require_super_admin(&db, &authed.email).await?;
-    validate_license_key(license_key).await?;
-    Ok("Sent test email".to_string())
+    let (_, expired) = validate_license_key(license_key).await?;
+
+    if expired {
+        Err(error::Error::BadRequest("Expired license key".to_string()))
+    } else {
+        Ok("Valid license key".to_string())
+    }
 }
 
 pub async fn get_local_settings(
@@ -301,7 +306,6 @@ pub async fn send_stats(Extension(db): Extension<DB>, authed: ApiAuthed) -> Resu
     windmill_common::stats_ee::send_stats(
         &HTTP_CLIENT,
         &db,
-        true,
         windmill_common::stats_ee::SendStatsReason::Manual,
     )
     .await?;
diff --git a/backend/windmill-common/src/ee.rs b/backend/windmill-common/src/ee.rs
index 6df93aca78..e25d36bee1 100644
--- a/backend/windmill-common/src/ee.rs
+++ b/backend/windmill-common/src/ee.rs
@@ -48,8 +48,13 @@ pub async fn send_critical_alert(
 }
 
 #[cfg(feature = "enterprise")]
-pub async fn schedule_key_renewal(_http_client: &reqwest::Client, _db: &crate::db::DB) -> () {
+pub async fn maybe_renew_license_key_on_start(
+    _http_client: &reqwest::Client,
+    _db: &crate::db::DB,
+    force_renew_now: bool,
+) -> bool {
     // Implementation is not open source
+    force_renew_now
 }
 
 #[cfg(feature = "enterprise")]
diff --git a/backend/windmill-common/src/stats_ee.rs b/backend/windmill-common/src/stats_ee.rs
index c6dc9946bf..5d2dc82b82 100644
--- a/backend/windmill-common/src/stats_ee.rs
+++ b/backend/windmill-common/src/stats_ee.rs
@@ -28,7 +28,6 @@ pub enum SendStatsReason {
 pub async fn send_stats(
     _http_client: &reqwest::Client,
     _db: &DB,
-    _skip_job_usage: bool,
     _reason: SendStatsReason,
 ) -> Result<()> {
     // stats details are closed source
diff --git a/backend/windmill-common/src/utils.rs b/backend/windmill-common/src/utils.rs
index d5f9c5c099..3feab853dd 100644
--- a/backend/windmill-common/src/utils.rs
+++ b/backend/windmill-common/src/utils.rs
@@ -206,6 +206,14 @@ pub async fn get_uid<'c, E: sqlx::Executor<'c, Database = Postgres>>(db: E) -> R
     Ok(uid)
 }
 
+pub fn map_string_to_number(s: &str, max_number: u64) -> u64 {
+    use std::collections::hash_map::DefaultHasher;
+    use std::hash::{Hash, Hasher};
+    let mut hasher = DefaultHasher::new();
+    s.hash(&mut hasher);
+    hasher.finish() % (max_number + 1)
+}
+
 #[derive(Serialize, Deserialize, PartialEq, Clone)]
 #[serde(rename_all = "lowercase")]
 pub enum Mode {
diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte
index c924fc8b3d..8709a9f478 100644
--- a/frontend/src/lib/components/InstanceSettings.svelte
+++ b/frontend/src/lib/components/InstanceSettings.svelte
@@ -277,9 +277,7 @@
 						<div class="text-secondary pb-4 text-xs"
 							>Setting SMTP unlocks sending emails upon adding new users to the workspace or the
 							instance or sending critical alerts.
-							<a
-								target="_blank"
-								href="https://www.windmill.dev/docs/advanced/instance_settings#smtp">Learn more</a
+							<a target="_blank" href="https://www.windmill.dev/docs/misc/setup_smtp">Learn more</a
 							></div
 						>
 					{:else if category == 'Registries'}
@@ -653,24 +651,33 @@
 														{@const attemptedAt = new Date(
 															latestKeyRenewalAttempt.attempted_at
 														).toLocaleString()}
+														{@const isTrial =
+															latestKeyRenewalAttempt.result.startsWith('error: trial:')}
 														<div class="relative">
 															<Popover notClickable>
 																<div class="flex flex-row items-center gap-1">
 																	{#if latestKeyRenewalAttempt.result === 'success'}
 																		<BadgeCheck class="text-green-600" size={12} />
 																	{:else}
-																		<BadgeX class="text-red-600" size={12} />
+																		<BadgeX
+																			class={isTrial ? 'text-yellow-600' : 'text-red-600'}
+																			size={12}
+																		/>
 																	{/if}
 																	<span
 																		class={classNames(
 																			'text-xs',
 																			latestKeyRenewalAttempt.result === 'success'
 																				? 'text-green-600'
+																				: isTrial
+																				? 'text-yellow-600'
 																				: 'text-red-600'
 																		)}
 																	>
 																		{latestKeyRenewalAttempt.result === 'success'
 																			? 'Latest key renewal succeeded'
+																			: isTrial
+																			? 'Latest key renewal ignored because in trial'
 																			: 'Latest key renewal failed'}
 																		on {attemptedAt}
 																	</span>
@@ -680,6 +687,10 @@
 																		<span class="text-green-300">
 																			Latest key renewal succeeded on {attemptedAt}
 																		</span>
+																	{:else if isTrial}
+																		<span class="text-yellow-300">
+																			License key cannot be renewed during trial ({attemptedAt})
+																		</span>
 																	{:else}
 																		<span class="text-red-300">
 																			Latest key renewal failed on {attemptedAt}: {latestKeyRenewalAttempt.result.replace(
diff --git a/frontend/src/lib/components/SuperadminSettings.svelte b/frontend/src/lib/components/SuperadminSettings.svelte
index 498c708cec..70033df7a5 100644
--- a/frontend/src/lib/components/SuperadminSettings.svelte
+++ b/frontend/src/lib/components/SuperadminSettings.svelte
@@ -22,11 +22,12 @@
 	import ChangeInstanceUsername from './ChangeInstanceUsername.svelte'
 	import { isCloudHosted } from '$lib/cloud'
 	import InstanceNameEditor from './InstanceNameEditor.svelte'
+	import Toggle from './Toggle.svelte'
 	let drawer: Drawer
 	let filter = ''
 
 	export function openDrawer() {
-		listUsers()
+		listUsers(activeOnly)
 		drawer?.openDrawer?.()
 	}
 
@@ -45,11 +46,14 @@
 	let users: GlobalUserInfo[] = []
 	let filteredUsers: GlobalUserInfo[] = []
 	let deleteConfirmedCallback: (() => void) | undefined = undefined
+	let activeOnly = false
 
-	async function listUsers(): Promise<void> {
-		users = await UserService.listUsersAsSuperAdmin({ perPage: 100000 })
+	async function listUsers(activeOnly: boolean): Promise<void> {
+		users = await UserService.listUsersAsSuperAdmin({ perPage: 100000, activeOnly: activeOnly })
 	}
 
+	$: listUsers(activeOnly)
+
 	let tab: 'users' | string = 'users'
 
 	let nbDisplayed = 50
@@ -70,7 +74,7 @@
 		})
 		getAutomateUsernameCreationSetting()
 		sendUserToast('Automatic username creation enabled')
-		listUsers()
+		listUsers(activeOnly)
 	}
 
 	async function updateName(name: string | undefined, email: string) {
@@ -82,7 +86,7 @@
 				}
 			})
 			sendUserToast('User updated')
-			listUsers()
+			listUsers(activeOnly)
 		} catch (e) {
 			sendUserToast('Error updating user', true)
 		}
@@ -96,7 +100,12 @@
 	f={(x) => x.email + ' ' + x.name + ' ' + x.company}
 />
 
-<Drawer bind:this={drawer} on:open={listUsers} size="1200px" on:close={removeHash}>
+<Drawer
+	bind:this={drawer}
+	on:open={() => listUsers(activeOnly)}
+	size="1200px"
+	on:close={removeHash}
+>
 	<DrawerContent overflow_y={true} title="Instance settings" on:close={closeDrawer}>
 		<div class="flex flex-col h-full w-full">
 			<div>
@@ -130,11 +139,16 @@
 							<div class="h-full">
 								{#if !automateUsernameCreation && !isCloudHosted()}
 									<div class="mb-4">
-										<h3 class="mb-2">
-											Automatic username creation
-										</h3>
+										<h3 class="mb-2"> Automatic username creation </h3>
 										<div class="mb-2">
-											<span class="text-primary text-sm">Automatically create a username for new users based on their email, shared across workspaces. <a target="_blank" href="https://www.windmill.dev/docs/advanced/instance_settings#automatic-username-creation">Learn more</a></span>
+											<span class="text-primary text-sm"
+												>Automatically create a username for new users based on their email, shared
+												across workspaces. <a
+													target="_blank"
+													href="https://www.windmill.dev/docs/advanced/instance_settings#automatic-username-creation"
+													>Learn more</a
+												></span
+											>
 										</div>
 										<Button
 											btnClasses="w-auto"
@@ -164,10 +178,20 @@
 								{/if}
 
 								<div class="py-2 mb-4">
-									<InviteGlobalUser on:new={listUsers} />
+									<InviteGlobalUser on:new={() => listUsers(activeOnly)} />
 								</div>
 
-								<h3>All instance users</h3>
+								<div class="flex flex-row justify-between">
+									<h3>All instance users</h3>
+									<Toggle
+										bind:checked={activeOnly}
+										options={{
+											left: 'Show active users only',
+											leftTooltip:
+												'An active user is a user who has performed at least one action in the last 30 days'
+										}}
+									/>
+								</div>
 								<div class="pb-1" />
 								<div>
 									<input placeholder="Search users" bind:value={filter} class="input mt-1" />
@@ -181,12 +205,15 @@
 											{#if automateUsernameCreation}
 												<th>username</th>
 											{/if}
+											{#if activeOnly}
+												<th>kind</th>
+											{/if}
 											<th />
 											<th />
 										</tr>
 										<tbody slot="body" class="overflow-y-auto w-full h-full max-h-full">
 											{#if filteredUsers && users}
-												{#each filteredUsers.slice(0, nbDisplayed) as { email, super_admin, login_type, name, username } (email)}
+												{#each filteredUsers.slice(0, nbDisplayed) as { email, super_admin, login_type, name, username, operator_only } (email)}
 													<tr class="border">
 														<td>{email}</td>
 														<td>{login_type}</td>
@@ -203,13 +230,22 @@
 																			{email}
 																			isConflict
 																			on:renamed={() => {
-																				listUsers()
+																				listUsers(activeOnly)
 																			}}
 																		/>
 																	{/key}
 																{/if}
 															</td>
 														{/if}
+														{#if activeOnly}
+															<td>
+																{#if operator_only}
+																	Operator only
+																{:else}
+																	Developer
+																{/if}
+															</td>
+														{/if}
 														<td>
 															<ToggleButtonGroup
 																selected={super_admin}
@@ -217,7 +253,7 @@
 																	console.log('BAR')
 																	if (email == $userStore?.email) {
 																		sendUserToast('You cannot demote yourself', true)
-																		listUsers()
+																		listUsers(activeOnly)
 																		return
 																	}
 																	await UserService.globalUserUpdate({
@@ -227,7 +263,7 @@
 																		}
 																	})
 																	sendUserToast('User updated')
-																	listUsers()
+																	listUsers(activeOnly)
 																}}
 															>
 																<ToggleButton value={false} size="xs" label="User" />
@@ -244,7 +280,7 @@
 																		updateName(e.detail, email)
 																	}}
 																	on:renamed={() => {
-																		listUsers()
+																		listUsers(activeOnly)
 																	}}
 																	{automateUsernameCreation}
 																/>
@@ -258,7 +294,7 @@
 																		deleteConfirmedCallback = async () => {
 																			await UserService.globalUserDelete({ email })
 																			sendUserToast(`User ${email} removed`)
-																			listUsers()
+																			listUsers(activeOnly)
 																		}
 																	}}
 																>

From 9c15fdde8a59f2c89c72b0415b88313efe9acbe6 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Tue, 29 Oct 2024 09:34:42 +0100
Subject: [PATCH 28/34] chore(main): release 1.414.0 (#4599)

* chore(main): release 1.414.0

* Apply automatic changes

* Update CHANGELOG.md

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |  4 ++
 backend/Cargo.lock                            | 48 +++++++++----------
 backend/Cargo.toml                            |  4 +-
 backend/windmill-api/openapi.yaml             |  2 +-
 benchmarks/lib.ts                             |  2 +-
 cli/main.ts                                   |  2 +-
 frontend/package-lock.json                    |  4 +-
 frontend/package.json                         |  2 +-
 lsp/Pipfile                                   |  4 +-
 openflow.openapi.yaml                         |  2 +-
 .../WindmillClient/WindmillClient.psd1        |  2 +-
 python-client/wmill/pyproject.toml            |  2 +-
 python-client/wmill_pg/pyproject.toml         |  2 +-
 typescript-client/jsr.json                    |  2 +-
 typescript-client/package.json                |  2 +-
 version.txt                                   |  2 +-
 16 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 856c7b45f6..0302661caa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.414.0](https://github.com/windmill-labs/windmill/compare/v1.413.2...v1.414.0) (2024-10-29)
+
+* Issue with previous release, re-releasing
+
 ## [1.413.2](https://github.com/windmill-labs/windmill/compare/v1.413.1...v1.413.2) (2024-10-29)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index ce73a7bb66..fcd54febb1 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -10395,7 +10395,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "anyhow",
  "axum",
@@ -10437,7 +10437,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10522,7 +10522,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "base64 0.21.7",
  "chrono",
@@ -10540,7 +10540,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "chrono",
  "serde",
@@ -10553,7 +10553,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10568,7 +10568,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10614,7 +10614,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10629,7 +10629,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10651,7 +10651,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10663,7 +10663,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10672,7 +10672,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10684,7 +10684,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10696,7 +10696,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10708,7 +10708,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10719,7 +10719,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10730,7 +10730,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10748,7 +10748,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10765,7 +10765,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10777,7 +10777,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10795,7 +10795,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10816,7 +10816,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -10826,7 +10826,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10859,7 +10859,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -10869,7 +10869,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.413.2"
+version = "1.414.0"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index df77adff9e..5ba836f197 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.413.2"
+version = "1.414.0"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.413.2"
+version = "1.414.0"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index d8ab6a8696..2ce27a2799 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.413.2
+  version: 1.414.0
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 05ccd95904..6578a87ed9 100644
--- a/benchmarks/lib.ts
+++ b/benchmarks/lib.ts
@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
 import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
 import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
 
-export const VERSION = "v1.413.2";
+export const VERSION = "v1.414.0";
 
 export async function login(email: string, password: string): Promise<string> {
   return await windmill.UserService.login({
diff --git a/cli/main.ts b/cli/main.ts
index 1c06b24301..8a633bc383 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.413.2";
+export const VERSION = "1.414.0";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 6c99fc97a6..b859c62981 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.413.2",
+	"version": "1.414.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.413.2",
+			"version": "1.414.0",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index 2a48b09a4f..e85c91b829 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.413.2",
+	"version": "1.414.0",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index e7e4828ccd..0a9b200f43 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.413.2"
-wmill_pg = ">=1.413.2"
+wmill = ">=1.414.0"
+wmill_pg = ">=1.414.0"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index c9808679bf..91dde9a6dc 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.413.2
+  version: 1.414.0
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 41dba9e1da..789f9924c8 100644
--- a/powershell-client/WindmillClient/WindmillClient.psd1
+++ b/powershell-client/WindmillClient/WindmillClient.psd1
@@ -12,7 +12,7 @@
 RootModule = 'WindmillClient.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.413.2'
+ModuleVersion = '1.414.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 4c3200022b..ff81b83dc8 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.413.2"
+version = "1.414.0"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/python-client/wmill_pg/pyproject.toml b/python-client/wmill_pg/pyproject.toml
index d0b7d007e9..d3ad71e5d7 100644
--- a/python-client/wmill_pg/pyproject.toml
+++ b/python-client/wmill_pg/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill-pg"
-version = "1.413.2"
+version = "1.414.0"
 description = "An extension client for the wmill client library focused on pg"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/typescript-client/jsr.json b/typescript-client/jsr.json
index 2f34a6cb06..146ef63def 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.413.2",
+  "version": "1.414.0",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./client.ts"]
diff --git a/typescript-client/package.json b/typescript-client/package.json
index ed422483f4..c1d1d8248b 100644
--- a/typescript-client/package.json
+++ b/typescript-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "windmill-client",
   "description": "Windmill SDK client for browsers and Node.js",
-  "version": "1.413.2",
+  "version": "1.414.0",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 8e1037d7b9..7f67999298 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.413.2
+1.414.0

From 9fbcfc712c981b8a1fee29a1d6b0eed136667e23 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 29 Oct 2024 10:47:06 +0100
Subject: [PATCH 29/34] fix(frontend): new approval steps default to timeout
 1800

---
 .../src/lib/components/flows/map/FlowModuleSchemaMap.svelte     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
index 6b23ba909b..203ac70988 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
@@ -110,7 +110,7 @@
 		}
 
 		if (kind == 'approval') {
-			module.suspend = { required_events: 1 }
+			module.suspend = { required_events: 1, timeout: 1800 }
 		} else if (kind == 'trigger') {
 			module.stop_after_if = {
 				expr: '!result || (Array.isArray(result) && result.length == 0)',

From f795a65276bbc26728f6ba2ae0699fef6d18b1f1 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 29 Oct 2024 12:23:56 +0100
Subject: [PATCH 30/34] fix(frontend): make script and schema scrollable on
 script detail page

---
 .../lib/components/FlowGraphViewerStep.svelte |  6 +-
 .../details/DetailPageDetailPanel.svelte      | 80 +++++++++----------
 .../details/DetailPageLayout.svelte           | 44 +++++-----
 .../scripts/get/[...hash]/+page.svelte        |  6 +-
 4 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/frontend/src/lib/components/FlowGraphViewerStep.svelte b/frontend/src/lib/components/FlowGraphViewerStep.svelte
index b2b7b9d381..fe235c6455 100644
--- a/frontend/src/lib/components/FlowGraphViewerStep.svelte
+++ b/frontend/src/lib/components/FlowGraphViewerStep.svelte
@@ -133,8 +133,10 @@
 						Error handler
 					{:else if stepDetail.id === 'preprocessor'}
 						Preprocessor
-					{:else}
-						Anonymous step
+					{:else if stepDetail.value.type == 'rawscript'}
+						Inline {stepDetail.value.language} script
+					{:else if stepDetail.value.type == 'script'}
+						Workspace script
 					{/if}
 				</span>
 			</div>
diff --git a/frontend/src/lib/components/details/DetailPageDetailPanel.svelte b/frontend/src/lib/components/details/DetailPageDetailPanel.svelte
index 4d56fba8f3..84180d2d5e 100644
--- a/frontend/src/lib/components/details/DetailPageDetailPanel.svelte
+++ b/frontend/src/lib/components/details/DetailPageDetailPanel.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
 	import { Tabs, Tab, TabContent } from '$lib/components/common'
 
-	import { Pane, Splitpanes } from 'svelte-splitpanes'
 	import HighlightTheme from '../HighlightTheme.svelte'
 	import FlowViewerInner from '../FlowViewerInner.svelte'
 	import DetailPageTriggerPanel from './DetailPageTriggerPanel.svelte'
@@ -22,51 +21,48 @@
 
 <HighlightTheme />
 
-<Splitpanes horizontal class="h-full">
-	<Pane size={100}>
-		<Tabs bind:selected>
-			<Tab value="saved_inputs">Saved Inputs</Tab>
-			{#if !isOperator}
-				<Tab value="triggers">Triggers</Tab>
-			{/if}
-			{#if flow_json}
-				<Tab value="raw">Export</Tab>
-			{:else}
-				<Tab value="script">Script</Tab>
-			{/if}
-			{#if selected == 'flow_step'}
-				<Tab value="flow_step">Step</Tab>
-			{/if}
+<Tabs bind:selected>
+	<Tab value="saved_inputs">Saved Inputs</Tab>
+	{#if !isOperator}
+		<Tab value="triggers">Triggers</Tab>
+	{/if}
+	{#if flow_json}
+		<Tab value="raw">Export</Tab>
+	{:else}
+		<Tab value="script">Script</Tab>
+	{/if}
+	{#if selected == 'flow_step'}
+		<Tab value="flow_step">Step</Tab>
+	{/if}
 
-			<svelte:fragment slot="content">
-				<div class="overflow-hidden" style="height:calc(100% - 32px);">
-					<TabContent value="saved_inputs" class="flex flex-col flex-1 h-full">
-						<slot name="save_inputs" />
-					</TabContent>
-					<TabContent value="schema" class="flex flex-col flex-1 h-full">
-						<slot name="schema" />
-					</TabContent>
-					<TabContent value="script" class="flex flex-col flex-1 h-full">
-						<slot name="script" />
-					</TabContent>
-					<TabContent value="triggers" class="flex flex-col flex-1 h-full pt-2">
-						<DetailPageTriggerPanel bind:triggerSelected>
-							<slot slot="webhooks" name="webhooks" />
-							<slot slot="routes" name="routes" />
-							<slot slot="websockets" name="websockets" />
-							<slot slot="emails" name="emails" />
-							<slot slot="schedules" name="schedules" />
-							<slot slot="cli" name="cli" />
-						</DetailPageTriggerPanel>
-					</TabContent>
+	<svelte:fragment slot="content">
+		<div class="h-[calc(100%-32px)]">
+			<div class="h-full overflow-auto">
+				<TabContent value="saved_inputs" class="h-full">
+					<slot name="save_inputs" />
+				</TabContent>
+				<TabContent value="script" class="h-full">
+					<slot name="script" />
+				</TabContent>
+				<TabContent value="triggers" class="h-full pt-2">
+					<DetailPageTriggerPanel bind:triggerSelected>
+						<slot slot="webhooks" name="webhooks" />
+						<slot slot="routes" name="routes" />
+						<slot slot="websockets" name="websockets" />
+						<slot slot="emails" name="emails" />
+						<slot slot="schedules" name="schedules" />
+						<slot slot="cli" name="cli" />
+					</DetailPageTriggerPanel>
+				</TabContent>
+				{#if flow_json}
 					<TabContent value="raw" class="flex flex-col flex-1 h-full overflow-auto p-2">
 						<FlowViewerInner flow={flow_json} />
 					</TabContent>
 					<TabContent value="flow_step" class="flex flex-col flex-1 h-full">
 						<slot name="flow_step" />
 					</TabContent>
-				</div>
-			</svelte:fragment>
-		</Tabs>
-	</Pane>
-</Splitpanes>
+				{/if}
+			</div>
+		</div>
+	</svelte:fragment>
+</Tabs>
diff --git a/frontend/src/lib/components/details/DetailPageLayout.svelte b/frontend/src/lib/components/details/DetailPageLayout.svelte
index ec0a5bda16..f3c58daf54 100644
--- a/frontend/src/lib/components/details/DetailPageLayout.svelte
+++ b/frontend/src/lib/components/details/DetailPageLayout.svelte
@@ -61,7 +61,7 @@
 			</SplitPanesWrapper>
 		</div>
 	{:else}
-		<div class="h-full">
+		<div class="h-full w-full">
 			<slot name="header" />
 			<Tabs bind:selected={mobileTab}>
 				<Tab value="form">Run form</Tab>
@@ -74,27 +74,29 @@
 				{/if}
 
 				<svelte:fragment slot="content">
-					<TabContent value="form" class="flex flex-col flex-1 h-full">
-						<slot name="form" />
-					</TabContent>
+					<div class="h-full">
+						<TabContent value="form" class="flex flex-col flex-1 h-full">
+							<slot name="form" />
+						</TabContent>
 
-					<TabContent value="saved_inputs" class="flex flex-col flex-1 h-full">
-						<slot name="save_inputs" />
-					</TabContent>
-					<TabContent value="triggers" class="flex flex-col flex-1 h-full">
-						<DetailPageTriggerPanel bind:triggerSelected={$selectedTriggerStore}>
-							<slot slot="webhooks" name="webhooks" />
-							<slot slot="routes" name="routes" />
-							<slot slot="script" name="script" />
-							<slot slot="websockets" name="websockets" />
-							<slot slot="emails" name="emails" />
-							<slot slot="schedules" name="schedules" />
-							<slot slot="cli" name="cli" />
-						</DetailPageTriggerPanel>
-					</TabContent>
-					<TabContent value="script" class="flex flex-col flex-1 h-full">
-						<slot name="script" />
-					</TabContent>
+						<TabContent value="saved_inputs" class="flex flex-col flex-1 h-full">
+							<slot name="save_inputs" />
+						</TabContent>
+						<TabContent value="triggers" class="flex flex-col flex-1 h-full">
+							<DetailPageTriggerPanel bind:triggerSelected={$selectedTriggerStore}>
+								<slot slot="webhooks" name="webhooks" />
+								<slot slot="routes" name="routes" />
+								<slot slot="script" name="script" />
+								<slot slot="websockets" name="websockets" />
+								<slot slot="emails" name="emails" />
+								<slot slot="schedules" name="schedules" />
+								<slot slot="cli" name="cli" />
+							</DetailPageTriggerPanel>
+						</TabContent>
+						<TabContent value="script" class="flex flex-col flex-1 h-full">
+							<slot name="script" />
+						</TabContent>
+					</div>
 				</svelte:fragment>
 			</Tabs>
 		</div>
diff --git a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
index 66641c18d3..a0523d77d1 100644
--- a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
@@ -742,7 +742,7 @@
 				</div>
 			</svelte:fragment>
 			<svelte:fragment slot="script">
-				<div>
+				<div class="h-full">
 					<Skeleton {loading} layout={[[20]]} />
 
 					<Tabs selected="code">
@@ -751,7 +751,7 @@
 						<Tab value="schema" size="xs">Schema</Tab>
 						<svelte:fragment slot="content">
 							<TabContent value="code">
-								<div class="p-2 w-full overflow-auto">
+								<div class="p-2 w-full">
 									<HighlightCode
 										language={script.language}
 										code={script.content}
@@ -785,7 +785,7 @@
 								</div>
 							</TabContent>
 							<TabContent value="schema">
-								<div class="p-1 relative">
+								<div class="p-1 relative h-full">
 									<button
 										on:click={() => copyToClipboard(JSON.stringify(script?.schema, null, 4))}
 										class="absolute top-2 right-2"

From fd8f05c51c78a404119490e1f60c71daf213e487 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 29 Oct 2024 12:27:41 +0100
Subject: [PATCH 31/34] fix(apps): enable text selection on aggrid tables by
 default

---
 .../apps/components/display/table/AppAggridExplorerTable.svelte  | 1 +
 .../apps/components/display/table/AppAggridTable.svelte          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/frontend/src/lib/components/apps/components/display/table/AppAggridExplorerTable.svelte b/frontend/src/lib/components/apps/components/display/table/AppAggridExplorerTable.svelte
index 3db2f84451..30e8242797 100644
--- a/frontend/src/lib/components/apps/components/display/table/AppAggridExplorerTable.svelte
+++ b/frontend/src/lib/components/apps/components/display/table/AppAggridExplorerTable.svelte
@@ -324,6 +324,7 @@
 						: false,
 					initialState: state,
 					suppressRowDeselection: true,
+					enableCellTextSelection: true,
 					...(resolvedConfig?.extraConfig ?? {}),
 					onViewportChanged: (e) => {
 						firstRow = e.firstRow
diff --git a/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte b/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
index b6a0909a4d..5e4e84a9f5 100644
--- a/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
+++ b/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
@@ -334,6 +334,7 @@
 						initialState: state,
 						suppressRowDeselection: true,
 						suppressDragLeaveHidesColumns: true,
+						enableCellTextSelection: true,
 						...(resolvedConfig?.extraConfig ?? {}),
 						onStateUpdated: (e) => {
 							state = e?.api?.getState()

From 022b0e0b4d654385c64c82e2d50cc00beaca6599 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 29 Oct 2024 12:40:50 +0100
Subject: [PATCH 32/34] fix(apps): public apps can take full height

---
 frontend/src/lib/components/apps/editor/AppPreview.svelte       | 2 +-
 frontend/src/routes/public/[workspace]/[...secret]/+page.svelte | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/lib/components/apps/editor/AppPreview.svelte b/frontend/src/lib/components/apps/editor/AppPreview.svelte
index 5b84cb5616..09bcb4e50c 100644
--- a/frontend/src/lib/components/apps/editor/AppPreview.svelte
+++ b/frontend/src/lib/components/apps/editor/AppPreview.svelte
@@ -218,7 +218,7 @@
 
 <svelte:window on:hashchange={hashchange} on:resize={resizeWindow} />
 
-<div class="relative h-full grow" bind:clientHeight={appHeight}>
+<div class="relative min-h-full grow" bind:clientHeight={appHeight}>
 	<div id="app-editor-top-level-drawer" />
 	<div id="app-editor-select" />
 
diff --git a/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte b/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte
index 9c4fc9006c..67e8daa181 100644
--- a/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte
+++ b/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte
@@ -137,7 +137,7 @@
 	{#key app}
 		<div
 			class={twMerge(
-				'min-h-screen h-full w-full',
+				'min-h-screen h-full w-full flex',
 				app?.value?.['css']?.['app']?.['viewer']?.class,
 				'wm-app-viewer'
 			)}

From 692b0568fc262aa1561bd78f61aa870c0bdf0354 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Tue, 29 Oct 2024 14:09:38 +0100
Subject: [PATCH 33/34] fix(bun): handle bun lockfile created with windows
 (#4602)

---
 backend/windmill-worker/src/bun_executor.rs | 59 +++++++++++++++------
 1 file changed, 43 insertions(+), 16 deletions(-)

diff --git a/backend/windmill-worker/src/bun_executor.rs b/backend/windmill-worker/src/bun_executor.rs
index 0721918568..4a8c0749bc 100644
--- a/backend/windmill-worker/src/bun_executor.rs
+++ b/backend/windmill-worker/src/bun_executor.rs
@@ -63,8 +63,26 @@ const RELATIVE_BUN_BUILDER: &str = include_str!("../loader_builder.bun.js");
 const NSJAIL_CONFIG_RUN_BUN_CONTENT: &str = include_str!("../nsjail/run.bun.config.proto");
 
 pub const BUN_LOCKB_SPLIT: &str = "\n//bun.lockb\n";
+pub const BUN_LOCKB_SPLIT_WINDOWS: &str = "\r\n//bun.lockb\r\n";
+
 pub const EMPTY_FILE: &str = "<empty>";
 
+fn split_lockfile(lockfile: &str) -> (&str, Option<&str>, bool) {
+    if let Some(index) = lockfile.find(BUN_LOCKB_SPLIT) {
+        // Split using "\n//bun.lockb\n"
+        let (before, after_with_sep) = lockfile.split_at(index);
+        let after = &after_with_sep[BUN_LOCKB_SPLIT.len()..];
+        (before, Some(after), after == EMPTY_FILE)
+    } else if let Some(index) = lockfile.find(BUN_LOCKB_SPLIT_WINDOWS) {
+        // Split using "\r\n//bun.lockb\r\n"
+        let (before, after_with_sep) = lockfile.split_at(index);
+        let after = &after_with_sep[BUN_LOCKB_SPLIT_WINDOWS.len()..];
+        (before, Some(after), after == EMPTY_FILE)
+    } else {
+        (lockfile, None, false)
+    }
+}
+
 pub async fn gen_bun_lockfile(
     mem_peak: &mut i32,
     canceled_by: &mut Option<CanceledBy>,
@@ -180,7 +198,12 @@ pub async fn gen_bun_lockfile(
             file.read_to_string(&mut content).await?;
         }
         if !npm_mode {
+            #[cfg(any(target_os = "linux", target_os = "macos"))]
             content.push_str(BUN_LOCKB_SPLIT);
+
+            #[cfg(target_os = "windows")]
+            content.push_str(BUN_LOCKB_SPLIT_WINDOWS);
+
             {
                 let file = format!("{job_dir}/bun.lockb");
                 if !empty_deps && tokio::fs::metadata(&file).await.is_ok() {
@@ -762,12 +785,15 @@ async fn compute_bundle_local_and_remote_path(
 }
 
 pub async fn prepare_job_dir(reqs: &str, job_dir: &str) -> Result<()> {
-    let splitted = reqs.split(BUN_LOCKB_SPLIT).collect::<Vec<&str>>();
-    let _ = write_file(job_dir, "package.json", &splitted[0])?;
+    let (pkg, lock, empty) = split_lockfile(reqs);
+    let _ = write_file(job_dir, "package.json", pkg)?;
 
-    if splitted[1] != EMPTY_FILE {
-        let _ = write_lockb(splitted[1], job_dir).await?;
+    if !empty {
+        if let Some(lock) = lock {
+            let _ = write_lockb(lock, job_dir).await?;
+        }
     }
+
     Ok(())
 }
 async fn write_lockb(splitted_lockb_2: &str, job_dir: &str) -> Result<()> {
@@ -874,22 +900,23 @@ pub async fn handle_bun_job(
     } else if let Some(codebase) = codebase.as_ref() {
         pull_codebase(&job.workspace_id, codebase, job_dir).await?;
     } else if let Some(reqs) = requirements_o.as_ref() {
-        let splitted = reqs.split(BUN_LOCKB_SPLIT).collect::<Vec<&str>>();
-        if splitted.len() != 2 && !annotation.npm {
+        let (pkg, lock, empty) = split_lockfile(reqs);
+
+        if lock.is_none() && !annotation.npm {
             return Err(error::Error::ExecutionErr(
                 format!("Invalid requirements, expected to find //bun.lockb split pattern in reqs. Found: |{reqs}|")
             ));
         }
 
-        let _ = write_file(job_dir, "package.json", &splitted[0])?;
-        let lockb = if annotation.npm { "" } else { splitted[1] };
-        if lockb != EMPTY_FILE {
+        let _ = write_file(job_dir, "package.json", pkg)?;
+        let lockb = if annotation.npm { "" } else { lock.unwrap() };
+        if !empty {
             let mut skip_install = false;
             let mut create_buntar = false;
             let mut buntar_path = "".to_string();
 
             if !annotation.npm {
-                let _ = write_lockb(&splitted[1], job_dir).await?;
+                let _ = write_lockb(lockb, job_dir).await?;
 
                 let mut sha_path = sha2::Sha256::new();
                 sha_path.update(lockb.as_bytes());
@@ -1561,20 +1588,20 @@ pub async fn start_worker(
     if let Some(codebase) = codebase.as_ref() {
         pull_codebase(w_id, codebase, job_dir).await?;
     } else if let Some(reqs) = requirements_o {
-        let splitted = reqs.split(BUN_LOCKB_SPLIT).collect::<Vec<&str>>();
-        if splitted.len() != 2 {
+        let (pkg, lock, empty) = split_lockfile(&reqs);
+        if lock.is_none() {
             return Err(error::Error::ExecutionErr(
                 format!("Invalid requirements, expected to find //bun.lockb split pattern in reqs. Found: |{reqs}|")
             ));
         }
-        let _ = write_file(job_dir, "package.json", &splitted[0])?;
-        let lockb = splitted[1];
-        if lockb != EMPTY_FILE {
+        let _ = write_file(job_dir, "package.json", pkg)?;
+        let lockb = lock.unwrap();
+        if !empty {
             let _ = write_file_binary(
                 job_dir,
                 "bun.lockb",
                 &base64::engine::general_purpose::STANDARD
-                    .decode(&splitted[1])
+                    .decode(lockb)
                     .map_err(|_| {
                         error::Error::InternalErr("Could not decode bun.lockb".to_string())
                     })?,

From 97b5ccb78c31569bdfabbd3cfa1a3b94c6dae27c Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Tue, 29 Oct 2024 14:18:35 +0100
Subject: [PATCH 34/34] chore(main): release 1.414.1 (#4600)

* chore(main): release 1.414.1

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  | 11 +++++
 backend/Cargo.lock                            | 48 +++++++++----------
 backend/Cargo.toml                            |  4 +-
 backend/windmill-api/openapi.yaml             |  2 +-
 benchmarks/lib.ts                             |  2 +-
 cli/main.ts                                   |  2 +-
 frontend/package-lock.json                    |  4 +-
 frontend/package.json                         |  2 +-
 lsp/Pipfile                                   |  4 +-
 openflow.openapi.yaml                         |  2 +-
 .../WindmillClient/WindmillClient.psd1        |  2 +-
 python-client/wmill/pyproject.toml            |  2 +-
 python-client/wmill_pg/pyproject.toml         |  2 +-
 typescript-client/jsr.json                    |  2 +-
 typescript-client/package.json                |  2 +-
 version.txt                                   |  2 +-
 16 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0302661caa..c4dda9f297 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## [1.414.1](https://github.com/windmill-labs/windmill/compare/v1.414.0...v1.414.1) (2024-10-29)
+
+
+### Bug Fixes
+
+* **apps:** enable text selection on aggrid tables by default ([b0b9180](https://github.com/windmill-labs/windmill/commit/b0b9180fb907c92b95a48ff286eb1dae59bb4981))
+* **apps:** public apps can take full height ([703db7d](https://github.com/windmill-labs/windmill/commit/703db7d4412795b4323a2eefcc39ae3cf43bc748))
+* **bun:** handle bun lockfile created with windows ([#4602](https://github.com/windmill-labs/windmill/issues/4602)) ([dcf5e2f](https://github.com/windmill-labs/windmill/commit/dcf5e2f03f977e241f6785530dad61a70c5bdd79))
+* **frontend:** make script and schema scrollable on script detail page ([6e222b3](https://github.com/windmill-labs/windmill/commit/6e222b3b1a419e5543fdf35420a7413699688b41))
+* **frontend:** new approval steps default to timeout 1800 ([b86de62](https://github.com/windmill-labs/windmill/commit/b86de6280e03e014e8ddf85b2b5f8fd030d0467a))
+
 ## [1.414.0](https://github.com/windmill-labs/windmill/compare/v1.413.2...v1.414.0) (2024-10-29)
 
 * Issue with previous release, re-releasing
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index fcd54febb1..ba671e1b77 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -10395,7 +10395,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "anyhow",
  "axum",
@@ -10437,7 +10437,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10522,7 +10522,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "base64 0.21.7",
  "chrono",
@@ -10540,7 +10540,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "chrono",
  "serde",
@@ -10553,7 +10553,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10568,7 +10568,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10614,7 +10614,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10629,7 +10629,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10651,7 +10651,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10663,7 +10663,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10672,7 +10672,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10684,7 +10684,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10696,7 +10696,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10708,7 +10708,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10719,7 +10719,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10730,7 +10730,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10748,7 +10748,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10765,7 +10765,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10777,7 +10777,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10795,7 +10795,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10816,7 +10816,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -10826,7 +10826,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10859,7 +10859,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -10869,7 +10869,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.414.0"
+version = "1.414.1"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 5ba836f197..cc23b4af6e 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.414.0"
+version = "1.414.1"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.414.0"
+version = "1.414.1"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 2ce27a2799..6175aa3572 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.414.0
+  version: 1.414.1
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 6578a87ed9..0c58ed533d 100644
--- a/benchmarks/lib.ts
+++ b/benchmarks/lib.ts
@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
 import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
 import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
 
-export const VERSION = "v1.414.0";
+export const VERSION = "v1.414.1";
 
 export async function login(email: string, password: string): Promise<string> {
   return await windmill.UserService.login({
diff --git a/cli/main.ts b/cli/main.ts
index 8a633bc383..f23d96fcaa 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.414.0";
+export const VERSION = "1.414.1";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index b859c62981..89cb1179be 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.414.0",
+	"version": "1.414.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.414.0",
+			"version": "1.414.1",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index e85c91b829..3d83a6b5c4 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.414.0",
+	"version": "1.414.1",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 0a9b200f43..33a5b690a0 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.414.0"
-wmill_pg = ">=1.414.0"
+wmill = ">=1.414.1"
+wmill_pg = ">=1.414.1"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 91dde9a6dc..beae57dc15 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.414.0
+  version: 1.414.1
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 789f9924c8..b2a5af5704 100644
--- a/powershell-client/WindmillClient/WindmillClient.psd1
+++ b/powershell-client/WindmillClient/WindmillClient.psd1
@@ -12,7 +12,7 @@
 RootModule = 'WindmillClient.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.414.0'
+ModuleVersion = '1.414.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index ff81b83dc8..5d49404f60 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.414.0"
+version = "1.414.1"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/python-client/wmill_pg/pyproject.toml b/python-client/wmill_pg/pyproject.toml
index d3ad71e5d7..63a9e7b102 100644
--- a/python-client/wmill_pg/pyproject.toml
+++ b/python-client/wmill_pg/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill-pg"
-version = "1.414.0"
+version = "1.414.1"
 description = "An extension client for the wmill client library focused on pg"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/typescript-client/jsr.json b/typescript-client/jsr.json
index 146ef63def..5208ff11f2 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.414.0",
+  "version": "1.414.1",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./client.ts"]
diff --git a/typescript-client/package.json b/typescript-client/package.json
index c1d1d8248b..5f9511d59d 100644
--- a/typescript-client/package.json
+++ b/typescript-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "windmill-client",
   "description": "Windmill SDK client for browsers and Node.js",
-  "version": "1.414.0",
+  "version": "1.414.1",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 7f67999298..3e8272a300 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.414.0
+1.414.1