From 57d59bc90a867b41d374b2b70951527cc3fbe6b8 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Sun, 3 Nov 2024 02:37:19 +0100
Subject: [PATCH 01/80]  feat(cli): instance yaml files inside the instance
 prefix folders (#4627)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(cli): instance yaml files inside the instance folders

* fix: add opt-in for save instance yamls inside prefixed folders

* chore: change baseUrl not needed to opts.baseUrl

* do not reassign global const path

* set prefix from instance

---------

Co-authored-by: Wítallo <15958770+witalloliveira@users.noreply.github.com>
---
 cli/instance.ts |  43 +++++++++-------
 cli/settings.ts | 127 ++++++++++++++++++++++++++++++++----------------
 cli/user.ts     |  72 +++++++++++++++++++--------
 3 files changed, 163 insertions(+), 79 deletions(-)

diff --git a/cli/instance.ts b/cli/instance.ts
index 1e86282d1a..fb495c714f 100644
--- a/cli/instance.ts
+++ b/cli/instance.ts
@@ -184,6 +184,7 @@ export type InstanceSyncOptions = {
   folderPerInstance?: boolean;
   yes?: boolean;
   prefix?: string;
+  prefixSettings?: boolean;
 };
 
 export async function pickInstance(
@@ -265,21 +266,22 @@ async function instancePull(opts: GlobalOptions & InstanceSyncOptions) {
   log.info("Pulling instance-level changes");
   log.info(`remote (${instance.name}) -> local`);
 
+  opts.prefix = opts.prefix ?? instance.prefix;
   let uChanges = 0;
   if (!opts.skipUsers) {
-    uChanges = (await pullInstanceUsers(true)) as number;
+    uChanges = (await pullInstanceUsers(opts, true)) as number;
   }
   let sChanges = 0;
   if (!opts.skipSettings) {
-    sChanges = (await pullInstanceSettings(true)) as number;
+    sChanges = (await pullInstanceSettings(opts, true)) as number;
   }
   let cChanges = 0;
   if (!opts.skipConfigs) {
-    cChanges = (await pullInstanceConfigs(true)) as number;
+    cChanges = (await pullInstanceConfigs(opts, true)) as number;
   }
   let gChanges = 0;
   if (!opts.skipGroups) {
-    gChanges = (await pullInstanceGroups(true)) as number;
+    gChanges = (await pullInstanceGroups(opts, true)) as number;
   }
 
   const totalChanges = uChanges + sChanges + cChanges + gChanges;
@@ -295,16 +297,16 @@ async function instancePull(opts: GlobalOptions & InstanceSyncOptions) {
 
     if (confirm) {
       if (!opts.skipUsers && uChanges > 0) {
-        await pullInstanceUsers();
+        await pullInstanceUsers(opts);
       }
       if (!opts.skipSettings && sChanges > 0) {
-        await pullInstanceSettings();
+        await pullInstanceSettings(opts);
       }
       if (!opts.skipConfigs && cChanges > 0) {
-        await pullInstanceConfigs();
+        await pullInstanceConfigs(opts);
       }
       if (!opts.skipGroups && gChanges > 0) {
-        await pullInstanceGroups();
+        await pullInstanceGroups(opts);
       }
     }
   } else {
@@ -400,19 +402,19 @@ async function instancePush(opts: GlobalOptions & InstanceSyncOptions) {
 
   let uChanges = 0;
   if (!opts.skipUsers) {
-    uChanges = (await pushInstanceUsers(true)) as number;
+    uChanges = (await pushInstanceUsers(opts, true)) as number;
   }
   let sChanges = 0;
   if (!opts.skipSettings) {
-    sChanges = (await pushInstanceSettings(true, opts.baseUrl)) as number;
+    sChanges = (await pushInstanceSettings(opts, true)) as number;
   }
   let cChanges = 0;
   if (!opts.skipConfigs) {
-    cChanges = (await pushInstanceConfigs(true)) as number;
+    cChanges = (await pushInstanceConfigs(opts, true)) as number;
   }
   let gChanges = 0;
   if (!opts.skipGroups) {
-    gChanges = (await pushInstanceGroups(true)) as number;
+    gChanges = (await pushInstanceGroups(opts, true)) as number;
   }
 
   const totalChanges = uChanges + sChanges + cChanges + gChanges;
@@ -428,16 +430,16 @@ async function instancePush(opts: GlobalOptions & InstanceSyncOptions) {
 
     if (confirm) {
       if (!opts.skipUsers && uChanges > 0) {
-        await pushInstanceUsers();
+        await pushInstanceUsers(opts);
       }
       if (!opts.skipSettings && sChanges > 0) {
-        await pushInstanceSettings(false, opts.baseUrl);
+        await pushInstanceSettings(opts);
       }
       if (!opts.skipConfigs && cChanges > 0) {
-        await pushInstanceConfigs();
+        await pushInstanceConfigs(opts);
       }
       if (!opts.skipGroups && gChanges > 0) {
-        await pushInstanceGroups();
+        await pushInstanceGroups(opts);
       }
     }
   } else {
@@ -709,7 +711,10 @@ const command = new Command()
     "--prefix <prefix:string>",
     "Prefix of the local workspaces to pull, used to create the folders when using --include-workspaces"
   )
-
+  .option(
+    "--prefix-settings",
+    "Store instance yamls inside prefixed folders when using --prefix and --folder-per-instance"
+  )
   .action(instancePull as any)
   .command("push")
   .description(
@@ -730,6 +735,10 @@ const command = new Command()
     "--prefix <prefix:string>",
     "Prefix of the local workspaces folders to push"
   )
+  .option(
+    "--prefix-settings",
+    "Store instance yamls inside prefixed folders when using --prefix and --folder-per-instance"
+  )
   .action(instancePush as any)
   .command("whoami")
   .description("Display information about the currently logged-in user")
diff --git a/cli/settings.ts b/cli/settings.ts
index f9dbac1fa6..d5feeca100 100644
--- a/cli/settings.ts
+++ b/cli/settings.ts
@@ -3,8 +3,8 @@ import { Confirm } from "./deps.ts";
 import { colors } from "./deps.ts";
 import { yamlParseFile } from "./deps.ts";
 import { log } from "./deps.ts";
-import { compareInstanceObjects } from "./instance.ts";
-import { isSuperset } from "./types.ts";
+import { compareInstanceObjects, InstanceSyncOptions } from "./instance.ts";
+import { isSuperset, GlobalOptions } from "./types.ts";
 import { deepEqual } from "./utils.ts";
 import * as wmill from "./gen/services.gen.ts";
 import { Config, GlobalSetting } from "./gen/types.gen.ts";
@@ -113,10 +113,10 @@ export async function pushWorkspaceSettings(
         workspace,
         requestBody: localSettings.auto_invite_enabled
           ? {
-            operator: localSettings.auto_invite_as === "operator",
-            invite_all: true,
-            auto_add: localSettings.auto_invite_mode === "add",
-          }
+              operator: localSettings.auto_invite_as === "operator",
+              invite_all: true,
+              auto_add: localSettings.auto_invite_mode === "add",
+            }
           : {},
       });
     } catch (_) {
@@ -128,10 +128,10 @@ export async function pushWorkspaceSettings(
         workspace,
         requestBody: localSettings.auto_invite_enabled
           ? {
-            operator: localSettings.auto_invite_as === "operator",
-            invite_all: false,
-            auto_add: localSettings.auto_invite_mode === "add",
-          }
+              operator: localSettings.auto_invite_as === "operator",
+              invite_all: false,
+              auto_add: localSettings.auto_invite_mode === "add",
+            }
           : {},
       });
     }
@@ -156,7 +156,7 @@ export async function pushWorkspaceSettings(
       settings.error_handler_extra_args
     ) ||
     localSettings.error_handler_muted_on_cancel !==
-    settings.error_handler_muted_on_cancel
+      settings.error_handler_muted_on_cancel
   ) {
     log.debug(`Updating error handler...`);
     await wmill.editErrorHandler({
@@ -262,30 +262,41 @@ export async function pushWorkspaceKey(
 
 const INSTANCE_SETTINGS_PATH = "instance_settings.yaml";
 
-export async function readInstanceSettings() {
+export async function readInstanceSettings(
+  opts: GlobalOptions & InstanceSyncOptions
+) {
   let localSettings: GlobalSetting[] = [];
 
+  let path = INSTANCE_SETTINGS_PATH;
+  if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
+    path = `${opts.prefix}/${INSTANCE_SETTINGS_PATH}`;
+  }
+
   try {
-    localSettings = (await yamlParseFile(INSTANCE_SETTINGS_PATH)) as GlobalSetting[];
+    localSettings = (await yamlParseFile(path)) as GlobalSetting[];
   } catch {
-    log.warn(`No ${INSTANCE_SETTINGS_PATH} found`);
+    log.warn(`No ${path} found`);
   }
   return localSettings;
 }
 
-
 import { decrypt, encrypt } from "./local_encryption.ts";
 
-const SENSITIVE_FIELD: string[] = ["license_key", "jwt_secret"]
+const SENSITIVE_FIELD: string[] = ["license_key", "jwt_secret"];
 
-async function processInstanceSettings(settings: GlobalSetting[], mode: "encode" | "decode"): Promise<GlobalSetting[]> {
+async function processInstanceSettings(
+  settings: GlobalSetting[],
+  mode: "encode" | "decode"
+): Promise<GlobalSetting[]> {
   const encKey = process.env.WMILL_INSTANCE_LOCAL_ENCRYPTION_KEY;
   if (encKey) {
-    const res: GlobalSetting[] = []
+    const res: GlobalSetting[] = [];
 
     for (const s of settings) {
       if (SENSITIVE_FIELD.includes(s.name) && typeof s.value === "string") {
-        res.push(await processField(s, "value", encKey, mode) as GlobalSetting);
+        res.push(
+          (await processField(s, "value", encKey, mode)) as GlobalSetting
+        );
       } else if (s.name == "oauths") {
         if (typeof s.value === "object") {
           const oauths = s.value as { [key: string]: any };
@@ -303,24 +314,40 @@ async function processInstanceSettings(settings: GlobalSetting[], mode: "encode"
     }
     return res;
   } else {
-    log.warn("No encryption key found, skipping encryption. Recommend setting WMILL_INSTANCE_LOCAL_ENCRYPTION_KEY");
+    log.warn(
+      "No encryption key found, skipping encryption. Recommend setting WMILL_INSTANCE_LOCAL_ENCRYPTION_KEY"
+    );
   }
   return settings;
 }
 
-async function processField(obj: { [key: string]: any }, field: string, encKey: string, mode: "encode" | "decode"): Promise<{ [key: string]: any }> {
+async function processField(
+  obj: { [key: string]: any },
+  field: string,
+  encKey: string,
+  mode: "encode" | "decode"
+): Promise<{ [key: string]: any }> {
   return {
     ...obj,
-    [field]: mode === "encode" ? await encrypt(obj[field], encKey) : await decrypt(obj[field], encKey) as any,
-  }
+    [field]:
+      mode === "encode"
+        ? await encrypt(obj[field], encKey)
+        : ((await decrypt(obj[field], encKey)) as any),
+  };
 }
 
-export async function pullInstanceSettings(preview = false) {
+export async function pullInstanceSettings(
+  opts: GlobalOptions & InstanceSyncOptions,
+  preview = false
+) {
   const remoteSettings = await wmill.listGlobalSettings();
 
   if (preview) {
-    const localSettings: GlobalSetting[] = await readInstanceSettings();
-    const processedSettings = await processInstanceSettings(remoteSettings, "encode");
+    const localSettings: GlobalSetting[] = await readInstanceSettings(opts);
+    const processedSettings = await processInstanceSettings(
+      remoteSettings,
+      "encode"
+    );
     return compareInstanceObjects(
       processedSettings,
       localSettings,
@@ -330,7 +357,10 @@ export async function pullInstanceSettings(preview = false) {
   } else {
     log.info("Pulling settings from instance");
 
-    const processedSettings = await processInstanceSettings(remoteSettings, "encode");
+    const processedSettings = await processInstanceSettings(
+      remoteSettings,
+      "encode"
+    );
     await Deno.writeTextFile(
       INSTANCE_SETTINGS_PATH,
       yamlStringify(processedSettings)
@@ -341,19 +371,19 @@ export async function pullInstanceSettings(preview = false) {
 }
 
 export async function pushInstanceSettings(
-  preview: boolean = false,
-  baseUrl?: string
+  opts: GlobalOptions & InstanceSyncOptions,
+  preview: boolean = false
 ) {
   const remoteSettings = await wmill.listGlobalSettings();
-  let localSettings: GlobalSetting[] = await readInstanceSettings();
+  let localSettings: GlobalSetting[] = await readInstanceSettings(opts);
   localSettings = await processInstanceSettings(localSettings, "decode");
 
-  if (baseUrl) {
+  if (opts.baseUrl) {
     localSettings = localSettings.filter((s) => s.name !== "base_url");
     localSettings.push({
       name: "base_url",
       //@ts-ignore
-      value: baseUrl,
+      value: opts.baseUrl,
     });
   }
 
@@ -404,18 +434,30 @@ export async function pushInstanceSettings(
   }
 }
 
-export async function readLocalConfigs() {
+const INSTANCE_CONFIGS_PATH = "instance_configs.yaml";
+
+export async function readLocalConfigs(
+  opts: GlobalOptions & InstanceSyncOptions
+) {
   let localConfigs: Config[] = [];
 
+  let path = INSTANCE_CONFIGS_PATH;
+  if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
+    path = `${opts.prefix}/${INSTANCE_CONFIGS_PATH}`;
+  }
+
   try {
-    localConfigs = (await yamlParseFile("instance_configs.yaml")) as Config[];
+    localConfigs = (await yamlParseFile(path)) as Config[];
   } catch {
-    log.warn("No instance_configs.yaml found");
+    log.warn(`No ${path} found`);
   }
   return localConfigs;
 }
 
-export async function pullInstanceConfigs(preview = false) {
+export async function pullInstanceConfigs(
+  opts: GlobalOptions & InstanceSyncOptions,
+  preview = false
+) {
   const remoteConfigs = (await wmill.listConfigs()).map((x) => {
     return {
       ...x,
@@ -424,7 +466,7 @@ export async function pullInstanceConfigs(preview = false) {
   });
 
   if (preview) {
-    const localConfigs: Config[] = await readLocalConfigs();
+    const localConfigs: Config[] = await readLocalConfigs(opts);
 
     return compareInstanceObjects(
       remoteConfigs,
@@ -436,22 +478,25 @@ export async function pullInstanceConfigs(preview = false) {
     log.info("Pulling configs from instance");
 
     await Deno.writeTextFile(
-      "instance_configs.yaml",
+      INSTANCE_CONFIGS_PATH,
       yamlStringify(remoteConfigs as any)
     );
 
-    log.info(colors.green("Configs written to instance_configs.yaml"));
+    log.info(colors.green(`Configs written to ${INSTANCE_CONFIGS_PATH}`));
   }
 }
 
-export async function pushInstanceConfigs(preview: boolean = false) {
+export async function pushInstanceConfigs(
+  opts: GlobalOptions & InstanceSyncOptions,
+  preview: boolean = false
+) {
   const remoteConfigs = (await wmill.listConfigs()).map((x) => {
     return {
       ...x,
       name: removeWorkerPrefix(x.name),
     };
   });
-  const localConfigs = await readLocalConfigs();
+  const localConfigs = await readLocalConfigs(opts);
 
   if (preview) {
     return compareInstanceObjects(
diff --git a/cli/user.ts b/cli/user.ts
index 2ddeb997c9..c955113600 100644
--- a/cli/user.ts
+++ b/cli/user.ts
@@ -6,7 +6,7 @@ import {
   removeType,
   removePathPrefix,
 } from "./types.ts";
-import { compareInstanceObjects } from "./instance.ts";
+import { compareInstanceObjects, InstanceSyncOptions } from "./instance.ts";
 import {
   colors,
   Command,
@@ -386,47 +386,71 @@ export async function pushGroup(
   }
 }
 
-export async function pullInstanceUsers(preview: boolean = false) {
+const INSTANCE_USERS_PATH = "instance_users.yaml";
+
+export async function pullInstanceUsers(
+  opts: GlobalOptions & InstanceSyncOptions,
+  preview: boolean = false
+) {
   const remoteUsers = await wmill.globalUsersExport();
 
   if (preview) {
-    const localUsers: ExportedUser[] = await readInstanceUsers();
+    const localUsers: ExportedUser[] = await readInstanceUsers(opts);
     return compareInstanceObjects(remoteUsers, localUsers, "email", "user");
   } else {
     log.info("Pulling users from instance...");
     await Deno.writeTextFile(
-      "instance_users.yaml",
+      INSTANCE_USERS_PATH,
       yamlStringify(remoteUsers as any)
     );
-    log.info(colors.green("Users written to instance_users.yaml"));
+    log.info(colors.green(`Users written to ${INSTANCE_USERS_PATH}`));
   }
 }
 
-export async function readInstanceUsers() {
+export async function readInstanceUsers(
+  opts: GlobalOptions & InstanceSyncOptions
+) {
   let localUsers: ExportedUser[] = [];
+
+  let path = INSTANCE_USERS_PATH;
+  if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
+    path = `${opts.prefix}/${INSTANCE_USERS_PATH}`;
+  }
+
   try {
-    localUsers = (await yamlParseFile("instance_users.yaml")) as ExportedUser[];
+    localUsers = (await yamlParseFile(path)) as ExportedUser[];
   } catch {
-    log.warn("No instance_users.yaml file found");
+    log.warn(`No ${path} file found`);
   }
   return localUsers;
 }
 
-export async function readInstanceGroups() {
+const INSTANCE_GROUPS_PATH = "instance_groups.yaml";
+
+export async function readInstanceGroups(
+  opts: GlobalOptions & InstanceSyncOptions
+) {
   let localGroups: InstanceGroup[] = [];
+
+  let path = INSTANCE_GROUPS_PATH;
+  if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
+    path = `${opts.prefix}/${INSTANCE_GROUPS_PATH}`;
+  }
+
   try {
-    localGroups = (await yamlParseFile(
-      "instance_groups.yaml"
-    )) as ExportedInstanceGroup[];
+    localGroups = (await yamlParseFile(path)) as ExportedInstanceGroup[];
   } catch {
-    log.warn("No instance_groups.yaml file found");
+    log.warn(`No ${path} file found`);
   }
   return localGroups;
 }
 
-export async function pushInstanceUsers(preview: boolean = false) {
+export async function pushInstanceUsers(
+  opts: GlobalOptions & InstanceSyncOptions,
+  preview: boolean = false
+) {
   const remoteUsers = await wmill.globalUsersExport();
-  const localUsers: ExportedUser[] = await readInstanceUsers();
+  const localUsers: ExportedUser[] = await readInstanceUsers(opts);
 
   if (preview) {
     return compareInstanceObjects(localUsers, remoteUsers, "email", "user");
@@ -440,27 +464,33 @@ export async function pushInstanceUsers(preview: boolean = false) {
   }
 }
 
-export async function pullInstanceGroups(preview = false) {
+export async function pullInstanceGroups(
+  opts: GlobalOptions & InstanceSyncOptions,
+  preview = false
+) {
   const remoteGroups = await wmill.exportInstanceGroups();
 
   if (preview) {
-    const localGroups = await readInstanceGroups();
+    const localGroups = await readInstanceGroups(opts);
     return compareInstanceObjects(remoteGroups, localGroups, "name", "group");
   } else {
     log.info("Pulling groups from instance...");
 
     await Deno.writeTextFile(
-      "instance_groups.yaml",
+      INSTANCE_GROUPS_PATH,
       yamlStringify(remoteGroups as any)
     );
 
-    log.info(colors.green("Groups written to instance_groups.yaml"));
+    log.info(colors.green(`Groups written to ${INSTANCE_GROUPS_PATH}`));
   }
 }
 
-export async function pushInstanceGroups(preview: boolean = false) {
+export async function pushInstanceGroups(
+  opts: GlobalOptions & InstanceSyncOptions,
+  preview: boolean = false
+) {
   const remoteGroups = await wmill.exportInstanceGroups();
-  const localGroups = await readInstanceGroups();
+  const localGroups = await readInstanceGroups(opts);
 
   if (preview) {
     return compareInstanceObjects(localGroups, remoteGroups, "name", "group");

From ea40331ab78ed6ab00a42c69240a537e4a02484c Mon Sep 17 00:00:00 2001
From: Henri Courdent <122811744+hcourdent@users.noreply.github.com>
Date: Sun, 3 Nov 2024 02:53:40 +0100
Subject: [PATCH 02/80] Deploy UI warning update (#4601)

* Deploy UI warning update

* Harmonization icons

---------

Co-authored-by: Ruben Fiszel <ruben@windmill.dev>
---
 frontend/src/lib/components/DeployWorkspace.svelte        | 2 +-
 frontend/src/lib/components/common/table/AppRow.svelte    | 8 ++++----
 frontend/src/lib/components/common/table/FlowRow.svelte   | 8 ++++----
 frontend/src/lib/components/common/table/RawAppRow.svelte | 4 ++--
 frontend/src/lib/components/common/table/ScriptRow.svelte | 7 ++++---
 .../(root)/(logged)/flows/get/[...path]/+page.svelte      | 4 ++--
 .../(root)/(logged)/scripts/get/[...hash]/+page.svelte    | 4 ++--
 7 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/frontend/src/lib/components/DeployWorkspace.svelte b/frontend/src/lib/components/DeployWorkspace.svelte
index 71af286658..d06d330e1d 100644
--- a/frontend/src/lib/components/DeployWorkspace.svelte
+++ b/frontend/src/lib/components/DeployWorkspace.svelte
@@ -533,7 +533,7 @@
 	>
 {:else if notSet == true}
 	<Alert type="error" title="Staging/Prod deploy not set up"
-		>As an admin, go to "Workspace {'->'} Dev/Staging/Prod"</Alert
+		>As an admin, go to Settings {'->'} Workspace {'->'} Deployment UI</Alert
 	>
 {:else}
 	<Alert type="info" title="Shareable page"
diff --git a/frontend/src/lib/components/common/table/AppRow.svelte b/frontend/src/lib/components/common/table/AppRow.svelte
index 9d1518d230..11e7dfa032 100644
--- a/frontend/src/lib/components/common/table/AppRow.svelte
+++ b/frontend/src/lib/components/common/table/AppRow.svelte
@@ -16,9 +16,9 @@
 		Eye,
 		File,
 		FileJson,
-		FileUp,
+		FolderOpen,
 		GitFork,
-		Globe,
+		ChevronUpSquare,
 		History,
 		Pen,
 		Share,
@@ -162,7 +162,7 @@
 					},
 					{
 						displayName: 'Move/Rename',
-						icon: FileUp,
+						icon: FolderOpen,
 						action: () => {
 							moveDrawer.openDrawer(path, summary, 'app')
 						},
@@ -173,7 +173,7 @@
 						? [
 								{
 									displayName: 'Deploy to staging/prod',
-									icon: Globe,
+									icon: ChevronUpSquare,
 									action: () => {
 										deploymentDrawer.openDrawer(path, 'app')
 									},
diff --git a/frontend/src/lib/components/common/table/FlowRow.svelte b/frontend/src/lib/components/common/table/FlowRow.svelte
index bb66037e25..9b05924405 100644
--- a/frontend/src/lib/components/common/table/FlowRow.svelte
+++ b/frontend/src/lib/components/common/table/FlowRow.svelte
@@ -23,8 +23,8 @@
 		GitFork,
 		Trash,
 		List,
-		FileUp,
-		Globe,
+		FolderOpen,
+		ChevronUpSquare,
 		Calendar,
 		Share,
 		Archive,
@@ -179,7 +179,7 @@
 					},
 					{
 						displayName: 'Move/Rename',
-						icon: FileUp,
+						icon: FolderOpen,
 						action: () => {
 							moveDrawer.openDrawer(path, flow.summary, 'flow')
 						},
@@ -197,7 +197,7 @@
 						? [
 								{
 									displayName: 'Deploy to staging/prod',
-									icon: Globe,
+									icon: ChevronUpSquare,
 									action: () => {
 										deploymentDrawer.openDrawer(path, 'flow')
 									},
diff --git a/frontend/src/lib/components/common/table/RawAppRow.svelte b/frontend/src/lib/components/common/table/RawAppRow.svelte
index 087c29f9bf..07c05a43a6 100644
--- a/frontend/src/lib/components/common/table/RawAppRow.svelte
+++ b/frontend/src/lib/components/common/table/RawAppRow.svelte
@@ -14,7 +14,7 @@
 	import FileInput from '../fileInput/FileInput.svelte'
 	import { goto } from '$lib/navigation'
 	import type DeployWorkspaceDrawer from '$lib/components/DeployWorkspaceDrawer.svelte'
-	import { FileUp, Globe, Pen, Share, Trash } from 'lucide-svelte'
+	import { FolderOpen, Globe, Pen, Share, Trash } from 'lucide-svelte'
 	import { isDeployable } from '$lib/utils_deployable'
 	import { getDeployUiSettings } from '$lib/components/home/deploy_ui'
 
@@ -94,7 +94,7 @@
 				return [
 					{
 						displayName: 'Move/Rename',
-						icon: FileUp,
+						icon: FolderOpen,
 						action: () => {
 							moveDrawer.openDrawer(path, summary, 'raw_app')
 						},
diff --git a/frontend/src/lib/components/common/table/ScriptRow.svelte b/frontend/src/lib/components/common/table/ScriptRow.svelte
index af53bc4387..086091f05c 100644
--- a/frontend/src/lib/components/common/table/ScriptRow.svelte
+++ b/frontend/src/lib/components/common/table/ScriptRow.svelte
@@ -27,7 +27,8 @@
 		Code,
 		Copy,
 		Eye,
-		FileUp,
+		FolderOpen,
+		ChevronUpSquare,
 		GitFork,
 		List,
 		Pen,
@@ -207,7 +208,7 @@
 					},
 					{
 						displayName: 'Move/Rename',
-						icon: FileUp,
+						icon: FolderOpen,
 						action: () => {
 							moveDrawer.openDrawer(script.path, script.summary, 'script')
 						},
@@ -218,7 +219,7 @@
 						? [
 								{
 									displayName: 'Deploy to staging/prod',
-									icon: FileUp,
+									icon: ChevronUpSquare,
 									action: () => {
 										deploymentDrawer.openDrawer(script.path, 'script')
 									},
diff --git a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
index 64b003a8a8..f91f68b7be 100644
--- a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
@@ -27,7 +27,7 @@
 		FolderOpen,
 		Archive,
 		Trash,
-		Server,
+		ChevronUpSquare,
 		Share,
 		Badge,
 		Loader2,
@@ -294,7 +294,7 @@
 			menuItems.push({
 				label: 'Deploy to staging/prod',
 				onclick: () => deploymentDrawer.openDrawer(flow?.path ?? '', 'flow'),
-				Icon: Server
+				Icon: ChevronUpSquare
 			})
 		}
 
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 a0523d77d1..b90ed9d2b3 100644
--- a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
@@ -57,7 +57,7 @@
 		History,
 		Loader2,
 		Pen,
-		Server,
+		ChevronUpSquare,
 		Share,
 		Table2,
 		Trash,
@@ -407,7 +407,7 @@
 		if (isDeployable('script', script?.path ?? '', deployUiSettings)) {
 			menuItems.push({
 				label: 'Deploy to staging/prod',
-				Icon: Server,
+				Icon: ChevronUpSquare,
 				onclick: () => {
 					deploymentDrawer.openDrawer(script?.path ?? '', 'script')
 				}

From 372f5f4335e4b2598701f33a032e035cfcb44bdb Mon Sep 17 00:00:00 2001
From: Henri Courdent <122811744+hcourdent@users.noreply.github.com>
Date: Sun, 3 Nov 2024 02:54:53 +0100
Subject: [PATCH 03/80] Regex Postgres Connection String (#3746)

* Regex Postgres Connection String

* Fix regex

* Fix indentation

* Indentation

---------

Co-authored-by: Ruben Fiszel <ruben@windmill.dev>
---
 frontend/src/lib/components/ApiConnectForm.svelte | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/lib/components/ApiConnectForm.svelte b/frontend/src/lib/components/ApiConnectForm.svelte
index 1155be67ba..680b54850e 100644
--- a/frontend/src/lib/components/ApiConnectForm.svelte
+++ b/frontend/src/lib/components/ApiConnectForm.svelte
@@ -80,9 +80,8 @@
 	let connectionString = ''
 	let validConnectionString = true
 	function parseConnectionString(close: (_: any) => void) {
-		// parse postgres connection string
 		const regex =
-			/postgres:\/\/(?<user>[^:@]+)(?::(?<password>[^@]+))?@(?<host>[^:\/?]+)(?::(?<port>\d+))?\/(?<dbname>[^\?]+)?(?:\?.*sslmode=(?<sslmode>[^&]+))?/
+			/postgres(?:ql)?:\/\/(?<user>[^:@]+)(?::(?<password>[^@]+))?@(?<host>[^:\/?]+)(?::(?<port>\d+))?\/(?<dbname>[^\?]+)?(?:\?.*sslmode=(?<sslmode>[^&]+))?/
 		const match = connectionString.match(regex)
 		if (match) {
 			validConnectionString = true

From a1c0f676ca7360c7db279bb1f708d2659a95f487 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Sun, 3 Nov 2024 03:09:26 +0100
Subject: [PATCH 04/80] chore(main): release 1.417.0 (#4628)

* chore(main): release 1.0.0

* Apply automatic changes

* update

* Apply automatic changes

* Update CHANGELOG.md

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |   4 +
 backend/Cargo.lock                            | 200 +++++++++---------
 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, 121 insertions(+), 117 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 111225c3a2..50172562a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.417.0 (2024-11-03)
+
+*  feat(cli): instance yaml files inside the instance prefix folders (#4627)
+
 ## [1.416.2](https://github.com/windmill-labs/windmill/compare/v1.416.1...v1.416.2) (2024-11-02)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index d12b1b2698..042a40b2b4 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -441,7 +441,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -588,7 +588,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -636,7 +636,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -678,7 +678,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1218,7 +1218,7 @@ dependencies = [
  "regex",
  "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.86",
+ "syn 2.0.87",
  "which 4.4.2",
 ]
 
@@ -1237,7 +1237,7 @@ dependencies = [
  "regex",
  "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1381,7 +1381,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
  "syn_derive",
 ]
 
@@ -1484,7 +1484,7 @@ checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1599,9 +1599,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.33"
+version = "1.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3788d6ac30243803df38a3e9991cf37e41210232916d41a8222ae378f912624"
+checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9"
 dependencies = [
  "jobserver",
  "libc",
@@ -1744,7 +1744,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2124,7 +2124,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2172,7 +2172,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2194,7 +2194,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core 0.20.10",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2715,7 +2715,7 @@ dependencies = [
  "quote",
  "strum 0.25.0",
  "strum_macros 0.25.3",
- "syn 2.0.86",
+ "syn 2.0.87",
  "thiserror",
 ]
 
@@ -2907,7 +2907,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version 0.4.1",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3004,7 +3004,7 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3160,7 +3160,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3180,7 +3180,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3395,7 +3395,7 @@ checksum = "32016f1242eb82af5474752d00fd8ebcd9004bd69b462b1c91de833972d08ed4"
 dependencies = [
  "proc-macro2",
  "swc_macros_common",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3427,7 +3427,7 @@ checksum = "e99b8b3c28ae0e84b604c75f721c21dc77afb3706076af5e8216d15fd1deaae3"
 dependencies = [
  "frunk_proc_macro_helpers",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3439,7 +3439,7 @@ dependencies = [
  "frunk_core",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3451,7 +3451,7 @@ dependencies = [
  "frunk_core",
  "frunk_proc_macro_helpers",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3575,7 +3575,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3828,7 +3828,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -4463,7 +4463,7 @@ dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5113,7 +5113,7 @@ checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5152,7 +5152,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
  "termcolor",
  "thiserror",
 ]
@@ -5562,7 +5562,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5839,7 +5839,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5880,7 +5880,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -6062,7 +6062,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
 dependencies = [
  "proc-macro2",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -6115,7 +6115,7 @@ checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f"
 dependencies = [
  "proc-macro-rules-macros",
  "proc-macro2",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -6127,7 +6127,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -6188,7 +6188,7 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
- "syn 2.0.86",
+ "syn 2.0.87",
  "thiserror",
  "typify",
  "unicode-ident",
@@ -6208,7 +6208,7 @@ dependencies = [
  "serde_json",
  "serde_tokenstream",
  "serde_yaml",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -6251,7 +6251,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -6935,7 +6935,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils",
- "syn 2.0.86",
+ "syn 2.0.87",
  "walkdir",
 ]
 
@@ -7315,7 +7315,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -7462,7 +7462,7 @@ checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -7473,7 +7473,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -7548,7 +7548,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -7603,7 +7603,7 @@ dependencies = [
  "darling 0.20.10",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -7972,7 +7972,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -8043,7 +8043,7 @@ dependencies = [
  "quote",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -8066,7 +8066,7 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.86",
+ "syn 2.0.87",
  "tempfile",
  "tokio",
  "url",
@@ -8218,7 +8218,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -8272,7 +8272,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -8285,7 +8285,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -8393,7 +8393,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -8442,7 +8442,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -8527,7 +8527,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -8634,7 +8634,7 @@ checksum = "63db0adcff29d220c3d151c5b25c0eabe7e32dd936212b84cdaa1392e3130497"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -8645,7 +8645,7 @@ checksum = "f486687bfb7b5c560868f69ed2d458b880cebc9babebcb67e49f31b55c5bf847"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -8668,7 +8668,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -8684,9 +8684,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.86"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8702,7 +8702,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -8728,7 +8728,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -8993,7 +8993,7 @@ checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -9218,7 +9218,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -9545,7 +9545,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -9782,7 +9782,7 @@ dependencies = [
  "regress",
  "schemars",
  "serde_json",
- "syn 2.0.86",
+ "syn 2.0.87",
  "thiserror",
  "unicode-ident",
 ]
@@ -9799,7 +9799,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_tokenstream",
- "syn 2.0.86",
+ "syn 2.0.87",
  "typify-impl",
 ]
 
@@ -10194,7 +10194,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
  "wasm-bindgen-shared",
 ]
 
@@ -10228,7 +10228,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -10261,7 +10261,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -10395,11 +10395,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "anyhow",
  "axum",
- "base64 0.21.7",
+ "base64 0.22.1",
  "chrono",
  "deno_core",
  "dotenv",
@@ -10437,7 +10437,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10448,7 +10448,7 @@ dependencies = [
  "async_zip",
  "axum",
  "base32",
- "base64 0.21.7",
+ "base64 0.22.1",
  "bytes",
  "candle-core",
  "candle-nn",
@@ -10522,9 +10522,9 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "chrono",
  "openapiv3",
  "prettyplease 0.1.25",
@@ -10540,7 +10540,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "chrono",
  "serde",
@@ -10553,7 +10553,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10568,7 +10568,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10614,7 +10614,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10629,7 +10629,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10651,19 +10651,19 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "windmill-parser"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10672,7 +10672,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10684,7 +10684,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10696,7 +10696,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10708,7 +10708,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10719,7 +10719,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10730,7 +10730,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10748,7 +10748,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10758,14 +10758,14 @@ dependencies = [
  "quote",
  "regex",
  "serde_json",
- "syn 2.0.86",
+ "syn 2.0.87",
  "toml 0.7.8",
  "windmill-parser",
 ]
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10777,7 +10777,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10795,7 +10795,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10816,7 +10816,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -10826,7 +10826,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10859,7 +10859,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -10869,11 +10869,11 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.416.2"
+version = "1.417.0"
 dependencies = [
  "anyhow",
  "async-recursion",
- "base64 0.21.7",
+ "base64 0.22.1",
  "bit-vec",
  "bytes",
  "chrono",
@@ -11235,7 +11235,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
  "synstructure",
 ]
 
@@ -11257,7 +11257,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -11277,7 +11277,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
  "synstructure",
 ]
 
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 1c0abc299c..c8f69c7a01 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.416.2"
+version = "1.417.0"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.416.2"
+version = "1.417.0"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index eebb8fd0a9..79e53b1c4c 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.416.2
+  version: 1.417.0
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 3a229dc1e8..21accf330f 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.416.2";
+export const VERSION = "v1.417.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 562c3fde45..5e9ff5922b 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.416.2";
+export const VERSION = "1.417.0";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 028ac3e356..737328a229 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.416.2",
+	"version": "1.417.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.416.2",
+			"version": "1.417.0",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index 9c4f3a2a7d..82f52d8286 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.416.2",
+	"version": "1.417.0",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index c76b2cb3a0..668fff61d5 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.416.2"
-wmill_pg = ">=1.416.2"
+wmill = ">=1.417.0"
+wmill_pg = ">=1.417.0"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index c2d1c0e9bd..c8f247c20b 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.416.2
+  version: 1.417.0
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index bbf1ca823e..71290da659 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.416.2'
+ModuleVersion = '1.417.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 7c7b08b1c4..fb55a7f4d7 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.416.2"
+version = "1.417.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 cc280a1fe6..1712551627 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.416.2"
+version = "1.417.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 4441b9c599..21ac695a0f 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.416.2",
+  "version": "1.417.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 ab8403f63d..4aaf4c3381 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.416.2",
+  "version": "1.417.0",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 049bcd7227..b3fc470a5d 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.416.2
+1.417.0

From e92a338432d2732e6be74c3604b9fa95239e1ca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?W=C3=ADtallo?=
 <15958770+witalloliveira@users.noreply.github.com>
Date: Mon, 4 Nov 2024 13:12:51 -0300
Subject: [PATCH 05/80] fix: missing opts for pull and push instance configs
 (#4630)

---
 cli/instance.ts      |  4 +--
 cli/settings.ts      | 62 ++++++++++++++++++++++++--------------------
 cli/user.ts          | 62 +++++++++++++++++++++++++-------------------
 cli/worker_groups.ts |  8 +++---
 4 files changed, 76 insertions(+), 60 deletions(-)

diff --git a/cli/instance.ts b/cli/instance.ts
index fb495c714f..f1a31f9702 100644
--- a/cli/instance.ts
+++ b/cli/instance.ts
@@ -261,7 +261,7 @@ export async function pickInstance(
 
   return instance;
 }
-async function instancePull(opts: GlobalOptions & InstanceSyncOptions) {
+async function instancePull(opts: InstanceSyncOptions) {
   const instance = await pickInstance(opts, true);
   log.info("Pulling instance-level changes");
   log.info(`remote (${instance.name}) -> local`);
@@ -393,7 +393,7 @@ async function instancePull(opts: GlobalOptions & InstanceSyncOptions) {
   }
 }
 
-async function instancePush(opts: GlobalOptions & InstanceSyncOptions) {
+async function instancePush(opts: InstanceSyncOptions) {
   let instances = await allInstances();
   const instance = await pickInstance(opts, true);
 
diff --git a/cli/settings.ts b/cli/settings.ts
index d5feeca100..e938cd364e 100644
--- a/cli/settings.ts
+++ b/cli/settings.ts
@@ -33,6 +33,22 @@ export interface SimplifiedSettings {
   name: string;
 }
 
+const INSTANCE_SETTINGS_PATH = "instance_settings.yaml";
+let instanceSettingsPath = INSTANCE_SETTINGS_PATH;
+async function checkInstanceSettingsPath(opts: InstanceSyncOptions) {
+  if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
+    instanceSettingsPath = `${opts.prefix}/${INSTANCE_SETTINGS_PATH}`;
+  }
+}
+
+const INSTANCE_CONFIGS_PATH = "instance_configs.yaml";
+let instanceConfigsPath = INSTANCE_CONFIGS_PATH;
+async function checkInstanceConfigPath(opts: InstanceSyncOptions) {
+  if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
+    instanceConfigsPath = `${opts.prefix}/${INSTANCE_CONFIGS_PATH}`;
+  }
+}
+
 export async function pushWorkspaceSettings(
   workspace: string,
   _path: string,
@@ -260,22 +276,15 @@ export async function pushWorkspaceKey(
   }
 }
 
-const INSTANCE_SETTINGS_PATH = "instance_settings.yaml";
-
-export async function readInstanceSettings(
-  opts: GlobalOptions & InstanceSyncOptions
-) {
+export async function readInstanceSettings(opts: InstanceSyncOptions) {
   let localSettings: GlobalSetting[] = [];
 
-  let path = INSTANCE_SETTINGS_PATH;
-  if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
-    path = `${opts.prefix}/${INSTANCE_SETTINGS_PATH}`;
-  }
+  await checkInstanceSettingsPath(opts);
 
   try {
-    localSettings = (await yamlParseFile(path)) as GlobalSetting[];
+    localSettings = (await yamlParseFile(instanceSettingsPath)) as GlobalSetting[];
   } catch {
-    log.warn(`No ${path} found`);
+    log.warn(`No ${instanceSettingsPath} found`);
   }
   return localSettings;
 }
@@ -337,11 +346,13 @@ async function processField(
 }
 
 export async function pullInstanceSettings(
-  opts: GlobalOptions & InstanceSyncOptions,
+  opts: InstanceSyncOptions,
   preview = false
 ) {
   const remoteSettings = await wmill.listGlobalSettings();
 
+  await checkInstanceSettingsPath(opts);
+
   if (preview) {
     const localSettings: GlobalSetting[] = await readInstanceSettings(opts);
     const processedSettings = await processInstanceSettings(
@@ -362,16 +373,16 @@ export async function pullInstanceSettings(
       "encode"
     );
     await Deno.writeTextFile(
-      INSTANCE_SETTINGS_PATH,
+      instanceSettingsPath,
       yamlStringify(processedSettings)
     );
 
-    log.info(colors.green(`Settings written to ${INSTANCE_SETTINGS_PATH}`));
+    log.info(colors.green(`Settings written to ${instanceSettingsPath}`));
   }
 }
 
 export async function pushInstanceSettings(
-  opts: GlobalOptions & InstanceSyncOptions,
+  opts: InstanceSyncOptions,
   preview: boolean = false
 ) {
   const remoteSettings = await wmill.listGlobalSettings();
@@ -434,28 +445,23 @@ export async function pushInstanceSettings(
   }
 }
 
-const INSTANCE_CONFIGS_PATH = "instance_configs.yaml";
-
 export async function readLocalConfigs(
-  opts: GlobalOptions & InstanceSyncOptions
+  opts: InstanceSyncOptions
 ) {
   let localConfigs: Config[] = [];
 
-  let path = INSTANCE_CONFIGS_PATH;
-  if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
-    path = `${opts.prefix}/${INSTANCE_CONFIGS_PATH}`;
-  }
+  await checkInstanceConfigPath(opts);
 
   try {
-    localConfigs = (await yamlParseFile(path)) as Config[];
+    localConfigs = (await yamlParseFile(instanceConfigsPath)) as Config[];
   } catch {
-    log.warn(`No ${path} found`);
+    log.warn(`No ${instanceConfigsPath} found`);
   }
   return localConfigs;
 }
 
 export async function pullInstanceConfigs(
-  opts: GlobalOptions & InstanceSyncOptions,
+  opts: InstanceSyncOptions,
   preview = false
 ) {
   const remoteConfigs = (await wmill.listConfigs()).map((x) => {
@@ -478,16 +484,16 @@ export async function pullInstanceConfigs(
     log.info("Pulling configs from instance");
 
     await Deno.writeTextFile(
-      INSTANCE_CONFIGS_PATH,
+      instanceConfigsPath,
       yamlStringify(remoteConfigs as any)
     );
 
-    log.info(colors.green(`Configs written to ${INSTANCE_CONFIGS_PATH}`));
+    log.info(colors.green(`Configs written to ${instanceConfigsPath}`));
   }
 }
 
 export async function pushInstanceConfigs(
-  opts: GlobalOptions & InstanceSyncOptions,
+  opts: InstanceSyncOptions,
   preview: boolean = false
 ) {
   const remoteConfigs = (await wmill.listConfigs()).map((x) => {
diff --git a/cli/user.ts b/cli/user.ts
index c955113600..6f37dd76a5 100644
--- a/cli/user.ts
+++ b/cli/user.ts
@@ -23,6 +23,22 @@ import {
   InstanceGroup,
 } from "./gen/types.gen.ts";
 
+const INSTANCE_USERS_PATH = "instance_users.yaml";
+let instanceUsersPath = INSTANCE_USERS_PATH;
+async function checkInstanceUsersPath(opts: InstanceSyncOptions) {
+  if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
+    instanceUsersPath = `${opts.prefix}/${INSTANCE_USERS_PATH}`;
+  }
+}
+
+const INSTANCE_GROUPS_PATH = "instance_groups.yaml";
+let instanceGroupsPath = INSTANCE_GROUPS_PATH;
+async function checkInstanceGroupsPath(opts: InstanceSyncOptions) {
+  if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
+    instanceGroupsPath = `${opts.prefix}/${INSTANCE_GROUPS_PATH}`;
+  }
+}
+
 async function list(opts: GlobalOptions) {
   await requireLogin(opts);
 
@@ -386,67 +402,59 @@ export async function pushGroup(
   }
 }
 
-const INSTANCE_USERS_PATH = "instance_users.yaml";
-
 export async function pullInstanceUsers(
-  opts: GlobalOptions & InstanceSyncOptions,
+  opts: InstanceSyncOptions,
   preview: boolean = false
 ) {
   const remoteUsers = await wmill.globalUsersExport();
 
+  await checkInstanceUsersPath(opts);
+
   if (preview) {
     const localUsers: ExportedUser[] = await readInstanceUsers(opts);
     return compareInstanceObjects(remoteUsers, localUsers, "email", "user");
   } else {
     log.info("Pulling users from instance...");
     await Deno.writeTextFile(
-      INSTANCE_USERS_PATH,
+      instanceUsersPath,
       yamlStringify(remoteUsers as any)
     );
-    log.info(colors.green(`Users written to ${INSTANCE_USERS_PATH}`));
+    log.info(colors.green(`Users written to ${instanceUsersPath}`));
   }
 }
 
 export async function readInstanceUsers(
-  opts: GlobalOptions & InstanceSyncOptions
+  opts: InstanceSyncOptions
 ) {
   let localUsers: ExportedUser[] = [];
 
-  let path = INSTANCE_USERS_PATH;
-  if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
-    path = `${opts.prefix}/${INSTANCE_USERS_PATH}`;
-  }
+  await checkInstanceUsersPath(opts);
 
   try {
-    localUsers = (await yamlParseFile(path)) as ExportedUser[];
+    localUsers = (await yamlParseFile(instanceUsersPath)) as ExportedUser[];
   } catch {
-    log.warn(`No ${path} file found`);
+    log.warn(`No ${instanceUsersPath} file found`);
   }
   return localUsers;
 }
 
-const INSTANCE_GROUPS_PATH = "instance_groups.yaml";
-
 export async function readInstanceGroups(
-  opts: GlobalOptions & InstanceSyncOptions
+  opts: InstanceSyncOptions
 ) {
   let localGroups: InstanceGroup[] = [];
 
-  let path = INSTANCE_GROUPS_PATH;
-  if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
-    path = `${opts.prefix}/${INSTANCE_GROUPS_PATH}`;
-  }
+  await checkInstanceGroupsPath(opts);
 
   try {
-    localGroups = (await yamlParseFile(path)) as ExportedInstanceGroup[];
+    localGroups = (await yamlParseFile(instanceGroupsPath)) as ExportedInstanceGroup[];
   } catch {
-    log.warn(`No ${path} file found`);
+    log.warn(`No ${instanceGroupsPath} file found`);
   }
   return localGroups;
 }
 
 export async function pushInstanceUsers(
-  opts: GlobalOptions & InstanceSyncOptions,
+  opts: InstanceSyncOptions,
   preview: boolean = false
 ) {
   const remoteUsers = await wmill.globalUsersExport();
@@ -465,11 +473,13 @@ export async function pushInstanceUsers(
 }
 
 export async function pullInstanceGroups(
-  opts: GlobalOptions & InstanceSyncOptions,
+  opts: InstanceSyncOptions,
   preview = false
 ) {
   const remoteGroups = await wmill.exportInstanceGroups();
 
+  await checkInstanceGroupsPath(opts);
+
   if (preview) {
     const localGroups = await readInstanceGroups(opts);
     return compareInstanceObjects(remoteGroups, localGroups, "name", "group");
@@ -477,16 +487,16 @@ export async function pullInstanceGroups(
     log.info("Pulling groups from instance...");
 
     await Deno.writeTextFile(
-      INSTANCE_GROUPS_PATH,
+      instanceGroupsPath,
       yamlStringify(remoteGroups as any)
     );
 
-    log.info(colors.green(`Groups written to ${INSTANCE_GROUPS_PATH}`));
+    log.info(colors.green(`Groups written to ${instanceGroupsPath}`));
   }
 }
 
 export async function pushInstanceGroups(
-  opts: GlobalOptions & InstanceSyncOptions,
+  opts: InstanceSyncOptions,
   preview: boolean = false
 ) {
   const remoteGroups = await wmill.exportInstanceGroups();
diff --git a/cli/worker_groups.ts b/cli/worker_groups.ts
index bd1eb6f56f..17ff13ec40 100644
--- a/cli/worker_groups.ts
+++ b/cli/worker_groups.ts
@@ -56,7 +56,7 @@ export async function displayWorkerGroups(opts: void) {
 async function pullWorkerGroups(opts: InstanceSyncOptions) {
   await pickInstance(opts, true);
 
-  const totalChanges =  await pullInstanceConfigs(true) ?? 0;
+  const totalChanges =  await pullInstanceConfigs(opts, true) ?? 0;
 
   if (totalChanges === 0) {
     log.info("No changes to apply");
@@ -72,14 +72,14 @@ async function pullWorkerGroups(opts: InstanceSyncOptions) {
   }
 
   if (confirm) {
-    await pullInstanceConfigs(false);
+    await pullInstanceConfigs(opts, false);
   }
 }
 
 async function pushWorkerGroups(opts: InstanceSyncOptions) {
   await pickInstance(opts, true);
 
-  const totalChanges = await pushInstanceConfigs(true) ?? 0;
+  const totalChanges = await pushInstanceConfigs(opts, true) ?? 0;
 
   if (totalChanges === 0) {
     log.info("No changes to apply");
@@ -95,7 +95,7 @@ async function pushWorkerGroups(opts: InstanceSyncOptions) {
   }
 
   if (confirm) {
-    await pushInstanceConfigs(false);
+    await pushInstanceConfigs(opts, false);
   }
 }
 

From 021ed5a38b13990d6873c078499b93e7cdd735d9 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Mon, 4 Nov 2024 17:17:22 +0100
Subject: [PATCH 06/80] chore(main): release 1.417.1 (#4629)

* chore(main): release 1.417.1

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |   7 +
 backend/Cargo.lock                            | 278 +++++++++++++++---
 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, 264 insertions(+), 55 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50172562a1..4a61842cf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.417.1](https://github.com/windmill-labs/windmill/compare/v1.417.0...v1.417.1) (2024-11-04)
+
+
+### Bug Fixes
+
+* missing opts for pull and push instance configs ([#4630](https://github.com/windmill-labs/windmill/issues/4630)) ([e92a338](https://github.com/windmill-labs/windmill/commit/e92a338432d2732e6be74c3604b9fa95239e1ca3))
+
 ## 1.417.0 (2024-11-03)
 
 *  feat(cli): instance yaml files inside the instance prefix folders (#4627)
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 042a40b2b4..3900d14378 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -2984,6 +2984,17 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "dlopen2"
 version = "0.7.0"
@@ -4345,6 +4356,124 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -4363,12 +4492,23 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -4456,11 +4596,11 @@ checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[package]]
 name = "is-macro"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2069faacbe981460232f880d26bf3c7634e322d49053aa48c27e3ae642f728f1"
+checksum = "1d57a3e447e24c22647738e4607f1df1e0ec6f72e16182c4cd199f647cdfb0e4"
 dependencies = [
- "Inflector",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
  "syn 2.0.87",
@@ -4761,6 +4901,12 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -8978,18 +9124,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.66"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede"
+checksum = "3b3c6efbfc763e64eb85c11c25320f0737cb7364c4b6336db90aa9ebe27a0bbd"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.66"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5"
+checksum = "b607164372e89797d78b8e23a6d67d5d1038c1c65efd52e1389ef8b77caba2a6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9127,6 +9273,16 @@ dependencies = [
  "crunchy",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.8.0"
@@ -10018,12 +10174,12 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
 dependencies = [
  "form_urlencoded",
- "idna 0.5.0",
+ "idna 1.0.3",
  "percent-encoding",
  "serde",
 ]
@@ -10052,12 +10208,24 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
 [[package]]
 name = "utf8-ranges"
 version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba"
 
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -10395,7 +10563,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "anyhow",
  "axum",
@@ -10437,7 +10605,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10522,7 +10690,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -10540,7 +10708,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "chrono",
  "serde",
@@ -10553,7 +10721,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10568,7 +10736,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10614,7 +10782,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10629,7 +10797,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10651,7 +10819,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10663,7 +10831,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10672,7 +10840,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10684,7 +10852,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10696,7 +10864,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10708,7 +10876,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10719,7 +10887,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10730,7 +10898,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10748,7 +10916,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10765,7 +10933,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10777,7 +10945,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10795,7 +10963,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10816,7 +10984,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -10826,7 +10994,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10859,7 +11027,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -10869,7 +11037,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.417.0"
+version = "1.417.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -11165,6 +11333,18 @@ version = "0.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -11287,6 +11467,28 @@ version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "zip"
 version = "0.6.6"
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index c8f69c7a01..f20693a6ea 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.417.0"
+version = "1.417.1"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.417.0"
+version = "1.417.1"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 79e53b1c4c..87736e6c5b 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.417.0
+  version: 1.417.1
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 21accf330f..6df3e64e5e 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.417.0";
+export const VERSION = "v1.417.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 5e9ff5922b..17db7b3b0b 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.417.0";
+export const VERSION = "1.417.1";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 737328a229..7682ea08a9 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.417.0",
+	"version": "1.417.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.417.0",
+			"version": "1.417.1",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index 82f52d8286..519d91d675 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.417.0",
+	"version": "1.417.1",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 668fff61d5..04411c3a06 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.417.0"
-wmill_pg = ">=1.417.0"
+wmill = ">=1.417.1"
+wmill_pg = ">=1.417.1"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index c8f247c20b..f3235b8a3d 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.417.0
+  version: 1.417.1
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 71290da659..4afb53ac42 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.417.0'
+ModuleVersion = '1.417.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index fb55a7f4d7..3a719a0909 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.417.0"
+version = "1.417.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 1712551627..3bbf15d780 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.417.0"
+version = "1.417.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 21ac695a0f..c2bcf76076 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.417.0",
+  "version": "1.417.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 4aaf4c3381..330bc6890a 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.417.0",
+  "version": "1.417.1",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index b3fc470a5d..eb20d7f0d1 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.417.0
+1.417.1

From 00748f43feab4f28f0dd2682e3dc8ccc15a5f49f Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Mon, 4 Nov 2024 17:45:42 +0100
Subject: [PATCH 07/80] fix(cli): improve pulling instance with
 folderPerInstance

---
 cli/instance.ts | 10 +++++++++-
 cli/user.ts     | 22 ++++++++++------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/cli/instance.ts b/cli/instance.ts
index f1a31f9702..d271f5627e 100644
--- a/cli/instance.ts
+++ b/cli/instance.ts
@@ -286,6 +286,8 @@ async function instancePull(opts: InstanceSyncOptions) {
 
   const totalChanges = uChanges + sChanges + cChanges + gChanges;
 
+  const rootDir = Deno.cwd();
+
   if (totalChanges > 0) {
     let confirm = true;
     if (opts.yes !== true) {
@@ -296,6 +298,13 @@ async function instancePull(opts: InstanceSyncOptions) {
     }
 
     if (confirm) {
+      if (uChanges > 0) {
+        if (opts.folderPerInstance && opts.prefixSettings) {
+          await Deno.mkdir(path.join(rootDir, opts.prefix), {
+            recursive: true,
+          });
+        }
+      }
       if (!opts.skipUsers && uChanges > 0) {
         await pullInstanceUsers(opts);
       }
@@ -315,7 +324,6 @@ async function instancePull(opts: InstanceSyncOptions) {
 
   if (opts.includeWorkspaces) {
     log.info("\nPulling all workspaces");
-    const rootDir = Deno.cwd();
     const localWorkspaces = await getLocalWorkspaces(
       rootDir,
       instance.prefix,
diff --git a/cli/user.ts b/cli/user.ts
index 6f37dd76a5..fcd979222b 100644
--- a/cli/user.ts
+++ b/cli/user.ts
@@ -25,7 +25,7 @@ import {
 
 const INSTANCE_USERS_PATH = "instance_users.yaml";
 let instanceUsersPath = INSTANCE_USERS_PATH;
-async function checkInstanceUsersPath(opts: InstanceSyncOptions) {
+function checkInstanceUsersPath(opts: InstanceSyncOptions) {
   if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
     instanceUsersPath = `${opts.prefix}/${INSTANCE_USERS_PATH}`;
   }
@@ -33,7 +33,7 @@ async function checkInstanceUsersPath(opts: InstanceSyncOptions) {
 
 const INSTANCE_GROUPS_PATH = "instance_groups.yaml";
 let instanceGroupsPath = INSTANCE_GROUPS_PATH;
-async function checkInstanceGroupsPath(opts: InstanceSyncOptions) {
+function checkInstanceGroupsPath(opts: InstanceSyncOptions) {
   if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
     instanceGroupsPath = `${opts.prefix}/${INSTANCE_GROUPS_PATH}`;
   }
@@ -408,7 +408,7 @@ export async function pullInstanceUsers(
 ) {
   const remoteUsers = await wmill.globalUsersExport();
 
-  await checkInstanceUsersPath(opts);
+  checkInstanceUsersPath(opts);
 
   if (preview) {
     const localUsers: ExportedUser[] = await readInstanceUsers(opts);
@@ -423,9 +423,7 @@ export async function pullInstanceUsers(
   }
 }
 
-export async function readInstanceUsers(
-  opts: InstanceSyncOptions
-) {
+export async function readInstanceUsers(opts: InstanceSyncOptions) {
   let localUsers: ExportedUser[] = [];
 
   await checkInstanceUsersPath(opts);
@@ -438,15 +436,15 @@ export async function readInstanceUsers(
   return localUsers;
 }
 
-export async function readInstanceGroups(
-  opts: InstanceSyncOptions
-) {
+export async function readInstanceGroups(opts: InstanceSyncOptions) {
   let localGroups: InstanceGroup[] = [];
 
-  await checkInstanceGroupsPath(opts);
+  checkInstanceGroupsPath(opts);
 
   try {
-    localGroups = (await yamlParseFile(instanceGroupsPath)) as ExportedInstanceGroup[];
+    localGroups = (await yamlParseFile(
+      instanceGroupsPath
+    )) as ExportedInstanceGroup[];
   } catch {
     log.warn(`No ${instanceGroupsPath} file found`);
   }
@@ -478,7 +476,7 @@ export async function pullInstanceGroups(
 ) {
   const remoteGroups = await wmill.exportInstanceGroups();
 
-  await checkInstanceGroupsPath(opts);
+  checkInstanceGroupsPath(opts);
 
   if (preview) {
     const localGroups = await readInstanceGroups(opts);

From e87a86062694a720b44e8fea021af737df7f6ce7 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Mon, 4 Nov 2024 17:51:04 +0100
Subject: [PATCH 08/80] chore(main): release 1.417.2 (#4633)

* chore(main): release 1.417.2

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |  7 +++
 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, 48 insertions(+), 41 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a61842cf6..bf488aa816 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.417.2](https://github.com/windmill-labs/windmill/compare/v1.417.1...v1.417.2) (2024-11-04)
+
+
+### Bug Fixes
+
+* **cli:** improve pulling instance with folderPerInstance ([00748f4](https://github.com/windmill-labs/windmill/commit/00748f43feab4f28f0dd2682e3dc8ccc15a5f49f))
+
 ## [1.417.1](https://github.com/windmill-labs/windmill/compare/v1.417.0...v1.417.1) (2024-11-04)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 3900d14378..4b9b38ea07 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -10563,7 +10563,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "anyhow",
  "axum",
@@ -10605,7 +10605,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10690,7 +10690,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -10708,7 +10708,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "chrono",
  "serde",
@@ -10721,7 +10721,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10736,7 +10736,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10782,7 +10782,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10797,7 +10797,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10819,7 +10819,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10831,7 +10831,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10840,7 +10840,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10852,7 +10852,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10864,7 +10864,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10876,7 +10876,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10887,7 +10887,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10898,7 +10898,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10916,7 +10916,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10933,7 +10933,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10945,7 +10945,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10963,7 +10963,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10984,7 +10984,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -10994,7 +10994,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -11027,7 +11027,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -11037,7 +11037,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.417.1"
+version = "1.417.2"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index f20693a6ea..c61d8a69d7 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.417.1"
+version = "1.417.2"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.417.1"
+version = "1.417.2"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 87736e6c5b..70e9784210 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.417.1
+  version: 1.417.2
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 6df3e64e5e..cb981a3e41 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.417.1";
+export const VERSION = "v1.417.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 17db7b3b0b..7005442b98 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.417.1";
+export const VERSION = "1.417.2";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 7682ea08a9..c77d286871 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.417.1",
+	"version": "1.417.2",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.417.1",
+			"version": "1.417.2",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index 519d91d675..9ce269d708 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.417.1",
+	"version": "1.417.2",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 04411c3a06..23cf2b8083 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.417.1"
-wmill_pg = ">=1.417.1"
+wmill = ">=1.417.2"
+wmill_pg = ">=1.417.2"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index f3235b8a3d..92290c2fa2 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.417.1
+  version: 1.417.2
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 4afb53ac42..b86ea90b03 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.417.1'
+ModuleVersion = '1.417.2'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 3a719a0909..10b7fdf8ab 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.417.1"
+version = "1.417.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 3bbf15d780..41da973c05 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.417.1"
+version = "1.417.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 c2bcf76076..0ae539e849 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.417.1",
+  "version": "1.417.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 330bc6890a..b41e179b5a 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.417.1",
+  "version": "1.417.2",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index eb20d7f0d1..786c69cec3 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.417.1
+1.417.2

From 1e7909e95931e1e121cb3767bad093239254935d Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Mon, 4 Nov 2024 20:31:07 +0100
Subject: [PATCH 09/80] fix(cli): improve pulling instance with
 folderPerInstance

---
 cli/instance.ts  | 16 ++++++++++------
 cli/workspace.ts |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/cli/instance.ts b/cli/instance.ts
index d271f5627e..e80db19700 100644
--- a/cli/instance.ts
+++ b/cli/instance.ts
@@ -575,13 +575,14 @@ async function getLocalWorkspaces(
   }
   if (folderPerInstance) {
     for await (const dir of Deno.readDir(rootDir + "/" + localPrefix)) {
-      const dirName = dir.name;
-      localWorkspaces.push({
-        dir: localPrefix + "/" + dirName,
-        id: dirName,
-      });
+      if (dir.isDirectory) {
+        const dirName = dir.name;
+        localWorkspaces.push({
+          dir: localPrefix + "/" + dirName,
+          id: dirName,
+        });
+      }
     }
-    log.info(localWorkspaces);
   } else {
     for await (const dir of Deno.readDir(rootDir)) {
       const dirName = dir.name;
@@ -593,6 +594,9 @@ async function getLocalWorkspaces(
       }
     }
   }
+  log.info(
+    "Local workspaces found: " + localWorkspaces.map((x) => x.id).join(", ")
+  );
   return localWorkspaces;
 }
 
diff --git a/cli/workspace.ts b/cli/workspace.ts
index 4338e21cfe..cd0ff31ee9 100644
--- a/cli/workspace.ts
+++ b/cli/workspace.ts
@@ -285,8 +285,8 @@ export async function removeWorkspace(
     }
     return;
   }
-  if (silent) {
-    log.info(colors.yellow(`Replacing existing workspace ${name}`));
+  if (!silent) {
+    log.info(colors.yellow(`Removing existing workspace ${name}`));
   }
 
   await Deno.writeTextFile(

From b245edc2ddaed41ee0de2f1885248badf3379cf3 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Mon, 4 Nov 2024 20:49:56 +0100
Subject: [PATCH 10/80] chore(main): release 1.417.3 (#4647)

* chore(main): release 1.417.3

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |  7 ++
 backend/Cargo.lock                            | 68 +++++++++----------
 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, 58 insertions(+), 51 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf488aa816..769d59d283 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.417.3](https://github.com/windmill-labs/windmill/compare/v1.417.2...v1.417.3) (2024-11-04)
+
+
+### Bug Fixes
+
+* **cli:** improve pulling instance with folderPerInstance ([1e7909e](https://github.com/windmill-labs/windmill/commit/1e7909e95931e1e121cb3767bad093239254935d))
+
 ## [1.417.2](https://github.com/windmill-labs/windmill/compare/v1.417.1...v1.417.2) (2024-11-04)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 4b9b38ea07..fb38b7b773 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -117,9 +117,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.17"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -3987,9 +3987,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -4535,7 +4535,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.1",
  "serde",
 ]
 
@@ -4942,7 +4942,7 @@ version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "hashbrown 0.15.0",
+ "hashbrown 0.15.1",
 ]
 
 [[package]]
@@ -9124,18 +9124,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.67"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3c6efbfc763e64eb85c11c25320f0737cb7364c4b6336db90aa9ebe27a0bbd"
+checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.67"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b607164372e89797d78b8e23a6d67d5d1038c1c65efd52e1389ef8b77caba2a6"
+checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10563,7 +10563,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "anyhow",
  "axum",
@@ -10605,7 +10605,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10690,7 +10690,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -10708,7 +10708,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "chrono",
  "serde",
@@ -10721,7 +10721,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10736,7 +10736,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10782,7 +10782,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10797,7 +10797,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10819,7 +10819,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10831,7 +10831,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10840,7 +10840,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10852,7 +10852,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10864,7 +10864,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10876,7 +10876,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10887,7 +10887,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10898,7 +10898,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10916,7 +10916,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10933,7 +10933,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10945,7 +10945,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10963,7 +10963,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10984,7 +10984,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -10994,7 +10994,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -11027,7 +11027,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -11037,7 +11037,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.417.2"
+version = "1.417.3"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index c61d8a69d7..2ae0de9786 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.417.2"
+version = "1.417.3"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.417.2"
+version = "1.417.3"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 70e9784210..cde1339c1c 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.417.2
+  version: 1.417.3
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index cb981a3e41..8e6bdf9725 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.417.2";
+export const VERSION = "v1.417.3";
 
 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 7005442b98..9a5b682df7 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.417.2";
+export const VERSION = "1.417.3";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index c77d286871..f43c1ac214 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.417.2",
+	"version": "1.417.3",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.417.2",
+			"version": "1.417.3",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index 9ce269d708..0c22355ecc 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.417.2",
+	"version": "1.417.3",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 23cf2b8083..c92dd2f3cb 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.417.2"
-wmill_pg = ">=1.417.2"
+wmill = ">=1.417.3"
+wmill_pg = ">=1.417.3"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 92290c2fa2..2521b4193e 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.417.2
+  version: 1.417.3
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index b86ea90b03..e45b054a4e 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.417.2'
+ModuleVersion = '1.417.3'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 10b7fdf8ab..ab8e8d3275 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.417.2"
+version = "1.417.3"
 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 41da973c05..5414909bd7 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.417.2"
+version = "1.417.3"
 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 0ae539e849..5e8ff6c1d2 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.417.2",
+  "version": "1.417.3",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./client.ts"]
diff --git a/typescript-client/package.json b/typescript-client/package.json
index b41e179b5a..5abc6f1f3f 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.417.2",
+  "version": "1.417.3",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 786c69cec3..e047a7c0be 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.417.2
+1.417.3

From 22ab51e9914376b47827f0be66708deef3a37767 Mon Sep 17 00:00:00 2001
From: Guilhem <guilhemlemouel@gmail.com>
Date: Mon, 4 Nov 2024 23:18:09 +0100
Subject: [PATCH 11/80] feat(frontend): improve and simplify scheduled poll
 flows (#4560)

---
 backend/tests/worker.rs                       |   8 +
 backend/windmill-api/src/flows.rs             |   3 +
 backend/windmill-common/src/flows.rs          |   7 +
 backend/windmill-queue/src/jobs.rs            |   1 +
 .../windmill-worker/src/worker_lockfiles.rs   |   3 +
 frontend/package.json                         |   5 +
 frontend/src/lib/components/Dev.svelte        |   5 +-
 .../src/lib/components/FlowBuilder.svelte     |  17 +-
 .../components/FlowStatusViewerInner.svelte   |   1 +
 .../lib/components/RunPageSchedules.svelte    | 164 +++++---------
 .../src/lib/components/ScriptBuilder.svelte   |   6 +-
 frontend/src/lib/components/Toggle.svelte     |   6 +-
 .../lib/components/copilot/MetadataGen.svelte |   2 +-
 .../details/DetailPageDetailPanel.svelte      |   6 +-
 .../details/DetailPageLayout.svelte           |  12 +-
 .../details/DetailPageTriggerPanel.svelte     | 116 +++++-----
 .../flows/content/FlowPathViewer.svelte       |   9 +-
 .../lib/components/flows/flowStateUtils.ts    |  13 +-
 .../flows/map/FlowModuleSchemaItem.svelte     |  11 +-
 .../flows/map/FlowModuleSchemaMap.svelte      |  22 +-
 .../flows/map/InsertModuleButton.svelte       |  22 +-
 .../lib/components/flows/map/MapItem.svelte   |   3 +
 .../components/flows/map/VirtualItem.svelte   |  47 +---
 .../flows/map/VirtualItemWrapper.svelte       |  45 ++++
 .../src/lib/components/flows/scheduleUtils.ts | 110 +++++++++-
 .../lib/components/graph/FlowGraphV2.svelte   | 207 ++++++++++++++----
 .../src/lib/components/graph/graphBuilder.ts  |  96 +++++---
 .../graph/renderers/edges/BaseEdge.svelte     |  39 ----
 .../renderers/nodes/ForLoopEndNode.svelte     |  38 +++-
 .../renderers/nodes/ForLoopStartNode.svelte   |   3 +-
 .../graph/renderers/nodes/InputNode.svelte    |   3 +-
 .../graph/renderers/nodes/TriggersNode.svelte | 113 +++++++++-
 .../renderers/triggers/TriggerButton.svelte   |   2 +-
 .../renderers/triggers/TriggersBadge.svelte   | 107 +++------
 .../renderers/triggers/TriggersWrapper.svelte |  54 +++--
 .../components/icons/SchedulePollIcon.svelte  |  36 +++
 frontend/src/lib/components/icons/index.ts    |   2 +
 frontend/src/lib/components/triggers.ts       |  26 ++-
 .../triggers/ScheduledPollPanel.svelte        |  41 ++++
 .../components/triggers/TriggersEditor.svelte | 128 ++++++-----
 frontend/src/routes/flows/dev/+page.svelte    |   5 +-
 frontend/static/create_action.png             | Bin 0 -> 40254 bytes
 frontend/static/script-picker.png             | Bin 0 -> 12652 bytes
 frontend/static/trigger_button.png            | Bin 17525 -> 0 bytes
 frontend/tailwind.config.cjs                  |   3 +-
 openflow.openapi.yaml                         |   4 +
 46 files changed, 1011 insertions(+), 540 deletions(-)
 create mode 100644 frontend/src/lib/components/flows/map/VirtualItemWrapper.svelte
 create mode 100644 frontend/src/lib/components/icons/SchedulePollIcon.svelte
 create mode 100644 frontend/src/lib/components/triggers/ScheduledPollPanel.svelte
 create mode 100644 frontend/static/create_action.png
 create mode 100644 frontend/static/script-picker.png
 delete mode 100644 frontend/static/trigger_button.png

diff --git a/backend/tests/worker.rs b/backend/tests/worker.rs
index a93c6eef1d..69482f3922 100644
--- a/backend/tests/worker.rs
+++ b/backend/tests/worker.rs
@@ -1112,6 +1112,7 @@ async fn test_deno_flow(db: Pool<Postgres>) {
                         custom_concurrency_key: None,
                         concurrent_limit: None,
                         concurrency_time_window_s: None,
+                        is_trigger: None,
                     }
                     .into(),
                     stop_after_if: Default::default(),
@@ -1153,6 +1154,7 @@ async fn test_deno_flow(db: Pool<Postgres>) {
                                 custom_concurrency_key: None,
                                 concurrent_limit: None,
                                 concurrency_time_window_s: None,
+                                is_trigger: None,
                             }
                             .into(),
                             stop_after_if: Default::default(),
@@ -1276,6 +1278,8 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                         custom_concurrency_key: None,
                         concurrent_limit: None,
                         concurrency_time_window_s: None,
+                        is_trigger: None,
+
                     }.into(),
                     stop_after_if: Default::default(),
                     stop_after_all_iters_if: Default::default(),
@@ -1327,6 +1331,7 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                                     custom_concurrency_key: None,
                                     concurrent_limit: None,
                                     concurrency_time_window_s: None,
+                                    is_trigger: None,
                                 }.into(),
                                 stop_after_if: Default::default(),
                                 stop_after_all_iters_if: Default::default(),
@@ -1364,6 +1369,8 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                                     custom_concurrency_key: None,
                                     concurrent_limit: None,
                                     concurrency_time_window_s: None,
+                                    is_trigger: None,
+
                                 }.into(),
                                 stop_after_if: Default::default(),
                                 stop_after_all_iters_if: Default::default(),
@@ -1424,6 +1431,7 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                         custom_concurrency_key: None,
                         concurrent_limit: None,
                         concurrency_time_window_s: None,
+                        is_trigger: None,
                     }.into(),
                     stop_after_if: Default::default(),
                     stop_after_all_iters_if: Default::default(),
diff --git a/backend/windmill-api/src/flows.rs b/backend/windmill-api/src/flows.rs
index 4fc9ce514f..f02f91dc41 100644
--- a/backend/windmill-api/src/flows.rs
+++ b/backend/windmill-api/src/flows.rs
@@ -1209,6 +1209,7 @@ mod tests {
                         .into(),
                         hash: None,
                         tag_override: None,
+                        is_trigger: None,
                     }),
                     stop_after_if: None,
                     stop_after_all_iters_if: None,
@@ -1236,6 +1237,7 @@ mod tests {
                         custom_concurrency_key: None,
                         concurrent_limit: None,
                         concurrency_time_window_s: None,
+                        is_trigger: None,
                     }),
                     stop_after_if: Some(StopAfterIf {
                         expr: "foo = 'bar'".to_string(),
@@ -1290,6 +1292,7 @@ mod tests {
                     input_transforms: HashMap::new(),
                     hash: None,
                     tag_override: None,
+                    is_trigger: None,
                 }
                 .into(),
                 stop_after_if: Some(StopAfterIf {
diff --git a/backend/windmill-common/src/flows.rs b/backend/windmill-common/src/flows.rs
index 9b66cc65ac..d357a5ec72 100644
--- a/backend/windmill-common/src/flows.rs
+++ b/backend/windmill-common/src/flows.rs
@@ -426,6 +426,8 @@ pub enum FlowModuleValue {
         hash: Option<ScriptHash>,
         #[serde(skip_serializing_if = "Option::is_none")]
         tag_override: Option<String>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        is_trigger: Option<bool>,
     },
     Flow {
         #[serde(default)]
@@ -474,6 +476,8 @@ pub enum FlowModuleValue {
         concurrent_limit: Option<i32>,
         #[serde(skip_serializing_if = "Option::is_none")]
         concurrency_time_window_s: Option<i32>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        is_trigger: Option<bool>,
     },
     Identity,
 }
@@ -505,6 +509,7 @@ struct UntaggedFlowModuleValue {
     custom_concurrency_key: Option<String>,
     concurrent_limit: Option<i32>,
     concurrency_time_window_s: Option<i32>,
+    is_trigger: Option<bool>,
 }
 
 impl<'de> Deserialize<'de> for FlowModuleValue {
@@ -522,6 +527,7 @@ impl<'de> Deserialize<'de> for FlowModuleValue {
                     .ok_or_else(|| serde::de::Error::missing_field("path"))?,
                 hash: untagged.hash,
                 tag_override: untagged.tag_override,
+                is_trigger: untagged.is_trigger,
             }),
             "flow" => Ok(FlowModuleValue::Flow {
                 input_transforms: untagged.input_transforms.unwrap_or_default(),
@@ -574,6 +580,7 @@ impl<'de> Deserialize<'de> for FlowModuleValue {
                 custom_concurrency_key: untagged.custom_concurrency_key,
                 concurrent_limit: untagged.concurrent_limit,
                 concurrency_time_window_s: untagged.concurrency_time_window_s,
+                is_trigger: untagged.is_trigger,
             }),
             "identity" => Ok(FlowModuleValue::Identity),
             other => Err(serde::de::Error::unknown_variant(
diff --git a/backend/windmill-queue/src/jobs.rs b/backend/windmill-queue/src/jobs.rs
index c0235c9b26..9b94c0f198 100644
--- a/backend/windmill-queue/src/jobs.rs
+++ b/backend/windmill-queue/src/jobs.rs
@@ -3522,6 +3522,7 @@ pub async fn push<'c, 'd, R: rsmq_async::RsmqConnection + Send + 'c>(
                             path: path.clone(),
                             hash: Some(hash),
                             tag_override: tag_override,
+                            is_trigger: None,
                         },
                     ),
                     stop_after_if: None,
diff --git a/backend/windmill-worker/src/worker_lockfiles.rs b/backend/windmill-worker/src/worker_lockfiles.rs
index f71c73f618..6c88294126 100644
--- a/backend/windmill-worker/src/worker_lockfiles.rs
+++ b/backend/windmill-worker/src/worker_lockfiles.rs
@@ -735,6 +735,7 @@ async fn lock_modules<'c>(
             custom_concurrency_key,
             concurrent_limit,
             concurrency_time_window_s,
+            is_trigger,
         } = e.get_value()?
         else {
             match e.get_value()? {
@@ -970,6 +971,7 @@ async fn lock_modules<'c>(
                     custom_concurrency_key,
                     concurrent_limit,
                     concurrency_time_window_s,
+                    is_trigger,
                 });
                 new_flow_modules.push(e);
                 continue;
@@ -992,6 +994,7 @@ async fn lock_modules<'c>(
                     custom_concurrency_key,
                     concurrent_limit,
                     concurrency_time_window_s,
+                    is_trigger,
                 });
                 new_flow_modules.push(e);
                 continue;
diff --git a/frontend/package.json b/frontend/package.json
index 0c22355ecc..a15b2e575c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -182,6 +182,11 @@
 			"svelte": "./package/components/icons/WindmillIcon2.svelte",
 			"default": "./package/components/icons/WindmillIcon2.svelte"
 		},
+		"./components/icons/SchedulePollIcon.svelte": {
+			"types": "./package/components/icons/SchedulePollIcon.d.ts",
+			"svelte": "./package/components/icons/SchedulePollIcon.svelte",
+			"default": "./package/components/icons/SchedulePollIcon.svelte"
+		},
 		"./components/IconedResourceType.svelte": {
 			"types": "./package/components/IconedResourceType.svelte.d.ts",
 			"svelte": "./package/components/IconedResourceType.svelte",
diff --git a/frontend/src/lib/components/Dev.svelte b/frontend/src/lib/components/Dev.svelte
index 5e3b52d867..bde2bd265f 100644
--- a/frontend/src/lib/components/Dev.svelte
+++ b/frontend/src/lib/components/Dev.svelte
@@ -476,7 +476,7 @@
 	const testStepStore = writable<Record<string, any>>({})
 	const selectedIdStore = writable('settings-metadata')
 	const selectedTriggerStore = writable<
-		'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets'
+		'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets' | 'scheduledPoll'
 	>('webhooks')
 
 	const primaryScheduleStore = writable<ScheduleTrigger | undefined | false>(undefined)
@@ -484,7 +484,8 @@
 	setContext<TriggerContext>('TriggerContext', {
 		primarySchedule: primaryScheduleStore,
 		selectedTrigger: selectedTriggerStore,
-		triggersCount: triggersCount
+		triggersCount: triggersCount,
+		simplifiedPoll: writable(false)
 	})
 	setContext<FlowEditorContext>('FlowEditorContext', {
 		selectedId: selectedIdStore,
diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte
index b04fbdf8dc..f51b7e8bc8 100644
--- a/frontend/src/lib/components/FlowBuilder.svelte
+++ b/frontend/src/lib/components/FlowBuilder.svelte
@@ -144,7 +144,7 @@
 			? { schedule_count: 1, primary_schedule: { schedule: savedPrimarySchedule.cron } }
 			: undefined
 	)
-
+	const simplifiedPoll = writable(false)
 	export function setPrimarySchedule(schedule: ScheduleTrigger | undefined | false) {
 		primaryScheduleStore.set(schedule)
 		loadTriggers()
@@ -468,7 +468,7 @@
 
 	const selectedIdStore = writable<string>(selectedId ?? 'settings-metadata')
 	const selectedTriggerStore = writable<
-		'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets'
+		'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets' | 'scheduledPoll'
 	>('webhooks')
 
 	export function getSelectedId() {
@@ -490,7 +490,14 @@
 	}
 
 	function selectTrigger(
-		selectedTrigger: 'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets'
+		selectedTrigger:
+			| 'webhooks'
+			| 'emails'
+			| 'schedules'
+			| 'cli'
+			| 'routes'
+			| 'websockets'
+			| 'scheduledPoll'
 	) {
 		selectedTriggerStore.set(selectedTrigger)
 	}
@@ -517,7 +524,8 @@
 	setContext<TriggerContext>('TriggerContext', {
 		selectedTrigger: selectedTriggerStore,
 		primarySchedule: primaryScheduleStore,
-		triggersCount
+		triggersCount,
+		simplifiedPoll
 	})
 
 	async function loadTriggers() {
@@ -876,7 +884,6 @@
 			await tick()
 			select(module.id)
 			await tick()
-			await tick()
 			focusCopilot()
 
 			let isFirstInLoop = false
diff --git a/frontend/src/lib/components/FlowStatusViewerInner.svelte b/frontend/src/lib/components/FlowStatusViewerInner.svelte
index e881dad539..ec6982a5df 100644
--- a/frontend/src/lib/components/FlowStatusViewerInner.svelte
+++ b/frontend/src/lib/components/FlowStatusViewerInner.svelte
@@ -1008,6 +1008,7 @@
 							modules={job.raw_flow?.modules ?? []}
 							failureModule={job.raw_flow?.failure_module}
 							preprocessorModule={job.raw_flow?.preprocessor_module}
+							allowSimplifiedPoll={false}
 						/>
 					</div>
 					<div
diff --git a/frontend/src/lib/components/RunPageSchedules.svelte b/frontend/src/lib/components/RunPageSchedules.svelte
index 45e081bcbc..e7d5e68f79 100644
--- a/frontend/src/lib/components/RunPageSchedules.svelte
+++ b/frontend/src/lib/components/RunPageSchedules.svelte
@@ -12,6 +12,8 @@
 	import SchemaForm from './SchemaForm.svelte'
 	import { emptyString, sendUserToast } from '$lib/utils'
 	import Toggle from './Toggle.svelte'
+	import { loadSchedules, saveSchedule } from './flows/scheduleUtils'
+	import { type Writable, writable } from 'svelte/store'
 
 	export let schema: any
 	export let isFlow: boolean
@@ -22,103 +24,33 @@
 	const { primarySchedule, triggersCount } = getContext<TriggerContext>('TriggerContext')
 
 	let scheduleEditor: ScheduleEditor
+	let schedules: Writable<Schedule[] | undefined> = writable(undefined)
+	let initialPrimarySchedule: Writable<ScheduleTrigger | false | undefined> = writable(undefined)
 
-	$: loadSchedules(false) || path
-
-	let schedules: Schedule[] | undefined = undefined
-	let initialPrimarySchedule: ScheduleTrigger | false | undefined = undefined
-	async function loadSchedules(forceRefresh: boolean) {
-		if (!path || path == '') {
-			schedules = []
-			if ($primarySchedule == undefined) {
-				$primarySchedule = false
-			}
-			initialPrimarySchedule = structuredClone($primarySchedule)
-			return
-		}
-		try {
-			const allSchedules = await ScheduleService.listSchedules({
-				workspace: $workspaceStore ?? '',
-				path: path,
-				isFlow
-			})
-			const primary = allSchedules.find((s) => s.path == path)
-			let remotePrimarySchedule = primary
-				? {
-						summary: primary.summary,
-						args: primary.args ?? {},
-						cron: primary.schedule,
-						timezone: primary.timezone,
-						enabled: primary.enabled
-				  }
-				: false
-			if ($primarySchedule == undefined || forceRefresh) {
-				$primarySchedule = remotePrimarySchedule
-			}
-			initialPrimarySchedule = structuredClone(remotePrimarySchedule)
-
-			$triggersCount = {
-				...($triggersCount ?? {}),
-				schedule_count: allSchedules.length,
-				primary_schedule: $primarySchedule ? { schedule: $primarySchedule.cron } : undefined
-			}
-			schedules = allSchedules.filter((s) => s.path != path)
-		} catch (e) {
-			console.error('impossible to load schedules', e)
-		}
+	async function updateSchedules(forceRefresh: boolean) {
+		loadSchedules(
+			forceRefresh,
+			path,
+			isFlow,
+			schedules,
+			primarySchedule,
+			initialPrimarySchedule,
+			$workspaceStore ?? '',
+			triggersCount
+		)
 	}
 
+	$: updateSchedules(false) || path
+
 	async function save() {
-		const scheduleExists =
-			path != '' &&
-			!newItem &&
-			(await ScheduleService.existsSchedule({
-				workspace: $workspaceStore!,
-				path
-			}))
-		if (scheduleExists) {
-			console.log('primary schedule exists')
-			if ($primarySchedule) {
-				await ScheduleService.updateSchedule({
-					workspace: $workspaceStore!,
-					path,
-					requestBody: {
-						summary: $primarySchedule.summary,
-						args: $primarySchedule.args,
-						schedule: $primarySchedule.cron,
-						timezone: $primarySchedule.timezone
-					}
-				})
-				sendUserToast(`Primary schedule updated`)
-			} else {
-				await ScheduleService.deleteSchedule({ workspace: $workspaceStore!, path })
-				sendUserToast(`Primary schedule deleted`)
-			}
-		} else {
-			if ($primarySchedule) {
-				await ScheduleService.createSchedule({
-					workspace: $workspaceStore!,
-					requestBody: {
-						path,
-						script_path: path,
-						is_flow: isFlow,
-						summary: $primarySchedule.summary,
-						args: $primarySchedule.args,
-						schedule: $primarySchedule.cron,
-						timezone: $primarySchedule.timezone,
-						enabled: $primarySchedule.enabled
-					}
-				})
-				sendUserToast(`Primary schedule created`)
-			}
-		}
-		loadSchedules(true)
+		await saveSchedule(path, newItem, $workspaceStore ?? '', primarySchedule, isFlow)
+		updateSchedules(true)
 	}
 </script>
 
 <ScheduleEditor
 	on:update={() => {
-		loadSchedules(true)
+		updateSchedules(true)
 	}}
 	bind:this={scheduleEditor}
 />
@@ -204,7 +136,7 @@
 			<p class="text-xs text-tertiary mt-10">Define a schedule frequency first</p>
 		{/if}
 
-		{#if initialPrimarySchedule != false}
+		{#if $initialPrimarySchedule != false}
 			<div class="flex">
 				<Button size="xs" color="light" on:click={() => scheduleEditor?.openEdit(path, isFlow)}
 					>Advanced</Button
@@ -213,29 +145,31 @@
 		{/if}
 	{:else}
 		<div class="flex flex-row gap-4 mt-2">
-			<Button
-				on:click={() => {
-					$primarySchedule = {
-						summary: '',
-						args: {},
-						cron: '0 0 */1 * * *',
-						timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
-						enabled: true
-					}
-					$triggersCount = {
-						...($triggersCount ?? {}),
-						schedule_count: ($triggersCount?.schedule_count ?? 0) + 1,
-						primary_schedule: { schedule: $primarySchedule.cron }
-					}
-				}}
-				variant="contained"
-				color="dark"
-				size="md"
-				startIcon={{ icon: Calendar }}
-			>
-				Set Primary Schedule
-			</Button>
-			{#if initialPrimarySchedule != undefined && initialPrimarySchedule != false && !newItem}
+			<div class="flex items-center">
+				<Button
+					on:click={() => {
+						$primarySchedule = {
+							summary: '',
+							args: {},
+							cron: '0 0 */1 * * *',
+							timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+							enabled: true
+						}
+						$triggersCount = {
+							...($triggersCount ?? {}),
+							schedule_count: ($triggersCount?.schedule_count ?? 0) + 1,
+							primary_schedule: { schedule: $primarySchedule.cron }
+						}
+					}}
+					variant="contained"
+					color="dark"
+					size="md"
+					startIcon={{ icon: Calendar }}
+				>
+					Set Primary Schedule
+				</Button>
+			</div>
+			{#if $initialPrimarySchedule != undefined && $initialPrimarySchedule != false && !newItem}
 				<Button on:click={save} color="dark" size="md" startIcon={{ icon: Save }}>
 					Apply changes now
 				</Button>
@@ -274,12 +208,12 @@
 		{/if}
 
 		<Label label="Other schedules">
-			{#if schedules}
-				{#if schedules?.length == 0 || schedules == undefined}
+			{#if $schedules}
+				{#if $schedules.length == 0 || $schedules == undefined}
 					<div class="text-xs text-tertiary"> No other schedules </div>
 				{:else}
 					<div class="flex flex-col divide-y">
-						{#each schedules as schedule (schedule.path)}
+						{#each $schedules as schedule (schedule.path)}
 							<div class="grid grid-cols-6 text-xs items-center py-2">
 								<div class="col-span-3 truncate">{schedule.path}</div>
 								<div class="col-span-2 flex flex-row gap-4 flex-nowrap">
diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte
index 8c2af724ff..54b9a5b09b 100644
--- a/frontend/src/lib/components/ScriptBuilder.svelte
+++ b/frontend/src/lib/components/ScriptBuilder.svelte
@@ -106,8 +106,9 @@
 			? { schedule_count: 1, primary_schedule: { schedule: savedPrimarySchedule.cron } }
 			: undefined
 	)
+	const simplifiedPoll = writable(false)
 	const selectedTriggerStore = writable<
-		'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets'
+		'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets' | 'scheduledPoll'
 	>('webhooks')
 
 	export function setPrimarySchedule(schedule: ScheduleTrigger | undefined | false) {
@@ -138,7 +139,8 @@
 	setContext<TriggerContext>('TriggerContext', {
 		selectedTrigger: selectedTriggerStore,
 		primarySchedule: primaryScheduleStore,
-		triggersCount
+		triggersCount,
+		simplifiedPoll
 	})
 
 	const enterpriseLangs = ['bigquery', 'snowflake', 'mssql']
diff --git a/frontend/src/lib/components/Toggle.svelte b/frontend/src/lib/components/Toggle.svelte
index 0e29889c94..2702657a8d 100644
--- a/frontend/src/lib/components/Toggle.svelte
+++ b/frontend/src/lib/components/Toggle.svelte
@@ -20,7 +20,7 @@
 	export let lightMode: boolean = false
 	export let eeOnly: boolean = false
 
-	export let size: 'sm' | 'xs' = 'sm'
+	export let size: 'sm' | 'xs' | '2xs' = 'sm'
 
 	const dispatch = createEventDispatcher()
 	const bothOptions = Boolean(options.left) && Boolean(options.right)
@@ -39,7 +39,7 @@
 			class={twMerge(
 				'mr-2 font-medium duration-50 select-none',
 				bothOptions || textDisabled ? (checked ? 'text-disabled' : 'text-primary') : 'text-primary',
-				size === 'xs' ? 'text-xs' : 'text-sm',
+				size === 'xs' ? 'text-xs' : size === '2xs' ? 'text-[0.5rem]' : 'text-sm',
 				textClass
 			)}
 			style={textStyle}
@@ -76,6 +76,8 @@
 					: 'peer-checked:bg-nord-950 dark:peer-checked:bg-nord-400',
 				size === 'sm'
 					? 'w-11 h-6 after:top-0.5 after:left-[2px] after:h-5 after:w-5'
+					: size === '2xs'
+					? 'w-5 h-3 after:top-0.5 after:left-[2px] after:h-2 after:w-2'
 					: 'w-7 h-4 after:top-0.5 after:left-[2px] after:h-3 after:w-3'
 			)}
 		/>
diff --git a/frontend/src/lib/components/copilot/MetadataGen.svelte b/frontend/src/lib/components/copilot/MetadataGen.svelte
index 5e0c8702b0..a714967e47 100644
--- a/frontend/src/lib/components/copilot/MetadataGen.svelte
+++ b/frontend/src/lib/components/copilot/MetadataGen.svelte
@@ -265,7 +265,7 @@ Generate a description for the flow below:
 	</div>
 	{#if elementType === 'textarea'}
 		<div>
-			<div class="flex flex-row-reverse text-2xs text-tertiary -mt-4">GH Markdown</div>
+			<div class="flex flex-row-reverse !text-3xs text-tertiary -mt-4">GH Markdown</div>
 			<textarea
 				bind:this={el}
 				bind:value={content}
diff --git a/frontend/src/lib/components/details/DetailPageDetailPanel.svelte b/frontend/src/lib/components/details/DetailPageDetailPanel.svelte
index 84180d2d5e..7d998aa21a 100644
--- a/frontend/src/lib/components/details/DetailPageDetailPanel.svelte
+++ b/frontend/src/lib/components/details/DetailPageDetailPanel.svelte
@@ -11,8 +11,10 @@
 		| 'schedules'
 		| 'cli'
 		| 'routes'
-		| 'websockets' = 'webhooks'
+		| 'websockets'
+		| 'scheduledPoll' = 'webhooks'
 	export let flow_json: any | undefined = undefined
+	export let simplfiedPoll: boolean = false
 
 	export let isOperator: boolean = false
 
@@ -45,7 +47,7 @@
 					<slot name="script" />
 				</TabContent>
 				<TabContent value="triggers" class="h-full pt-2">
-					<DetailPageTriggerPanel bind:triggerSelected>
+					<DetailPageTriggerPanel {simplfiedPoll} bind:triggerSelected>
 						<slot slot="webhooks" name="webhooks" />
 						<slot slot="routes" name="routes" />
 						<slot slot="websockets" name="websockets" />
diff --git a/frontend/src/lib/components/details/DetailPageLayout.svelte b/frontend/src/lib/components/details/DetailPageLayout.svelte
index f3c58daf54..2fb070cbce 100644
--- a/frontend/src/lib/components/details/DetailPageLayout.svelte
+++ b/frontend/src/lib/components/details/DetailPageLayout.svelte
@@ -20,13 +20,15 @@
 
 	const primaryScheduleStore = writable<ScheduleTrigger | undefined | false>(undefined)
 	const selectedTriggerStore = writable<
-		'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets'
+		'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets' | 'scheduledPoll'
 	>('webhooks')
 
+	const simplifiedPoll = writable(false)
 	setContext<TriggerContext>('TriggerContext', {
 		selectedTrigger: selectedTriggerStore,
 		primarySchedule: primaryScheduleStore,
-		triggersCount
+		triggersCount,
+		simplifiedPoll
 	})
 </script>
 
@@ -41,6 +43,7 @@
 					</Pane>
 					<Pane size={35} minSize={15}>
 						<DetailPageDetailPanel
+							simplfiedPoll={$simplifiedPoll}
 							bind:triggerSelected={$selectedTriggerStore}
 							bind:selected
 							{isOperator}
@@ -83,7 +86,10 @@
 							<slot name="save_inputs" />
 						</TabContent>
 						<TabContent value="triggers" class="flex flex-col flex-1 h-full">
-							<DetailPageTriggerPanel bind:triggerSelected={$selectedTriggerStore}>
+							<DetailPageTriggerPanel
+								simplfiedPoll={$simplifiedPoll}
+								bind:triggerSelected={$selectedTriggerStore}
+							>
 								<slot slot="webhooks" name="webhooks" />
 								<slot slot="routes" name="routes" />
 								<slot slot="script" name="script" />
diff --git a/frontend/src/lib/components/details/DetailPageTriggerPanel.svelte b/frontend/src/lib/components/details/DetailPageTriggerPanel.svelte
index d09a92ae81..144cd1d865 100644
--- a/frontend/src/lib/components/details/DetailPageTriggerPanel.svelte
+++ b/frontend/src/lib/components/details/DetailPageTriggerPanel.svelte
@@ -10,64 +10,70 @@
 		| 'schedules'
 		| 'cli'
 		| 'routes'
-		| 'websockets' = 'webhooks'
+		| 'websockets'
+		| 'scheduledPoll' = 'webhooks'
+	export let simplfiedPoll: boolean = false
 </script>
 
 <HighlightTheme />
 
-<Tabs bind:selected={triggerSelected}>
-	<Tab value="webhooks">
-		<span class="flex flex-row gap-2 items-center text-xs">
-			<Webhook size={12} />
-			Webhooks
-		</span>
-	</Tab>
-	<Tab value="schedules">
-		<span class="flex flex-row gap-2 items-center text-xs">
-			<CalendarCheck2 size={12} />
-			Schedules
-		</span>
-	</Tab>
-	<Tab value="routes">
-		<span class="flex flex-row gap-2 items-center text-xs">
-			<Route size={12} />
-			HTTP
-		</span>
-	</Tab>
-	<Tab value="websockets">
-		<span class="flex flex-row gap-2 items-center text-xs">
-			<Unplug size={12} />
-			Websockets
-		</span>
-	</Tab>
-	<Tab value="emails">
-		<span class="flex flex-row gap-2 items-center text-xs">
-			<MailIcon size={12} />
-			Email
-		</span>
-	</Tab>
-	<Tab value="cli">
-		<span class="flex flex-row gap-2 items-center text-xs">
-			<Terminal size={12} />
-			CLI
-		</span>
-	</Tab>
-</Tabs>
+{#if !simplfiedPoll}
+	<Tabs bind:selected={triggerSelected}>
+		<Tab value="webhooks">
+			<span class="flex flex-row gap-2 items-center text-xs">
+				<Webhook size={12} />
+				Webhooks
+			</span>
+		</Tab>
+		<Tab value="schedules">
+			<span class="flex flex-row gap-2 items-center text-xs">
+				<CalendarCheck2 size={12} />
+				Schedules
+			</span>
+		</Tab>
+		<Tab value="routes">
+			<span class="flex flex-row gap-2 items-center text-xs">
+				<Route size={12} />
+				HTTP
+			</span>
+		</Tab>
+		<Tab value="websockets">
+			<span class="flex flex-row gap-2 items-center text-xs">
+				<Unplug size={12} />
+				Websockets
+			</span>
+		</Tab>
+		<Tab value="emails">
+			<span class="flex flex-row gap-2 items-center text-xs">
+				<MailIcon size={12} />
+				Email
+			</span>
+		</Tab>
+		<Tab value="cli">
+			<span class="flex flex-row gap-2 items-center text-xs">
+				<Terminal size={12} />
+				CLI
+			</span>
+		</Tab>
+	</Tabs>
 
-<div class="h-[calc(100%-32px)]">
-	<div class="h-full overflow-auto">
-		{#if triggerSelected === 'webhooks'}
-			<slot name="webhooks" />
-		{:else if triggerSelected === 'routes'}
-			<slot name="routes" />
-		{:else if triggerSelected === 'emails'}
-			<slot name="emails" />
-		{:else if triggerSelected === 'schedules'}
-			<slot name="schedules" />
-		{:else if triggerSelected === 'websockets'}
-			<slot name="websockets" />
-		{:else if triggerSelected === 'cli'}
-			<slot name="cli" />
-		{/if}
+	<div class="h-[calc(100%-32px)]">
+		<div class="h-full overflow-auto">
+			{#if triggerSelected === 'webhooks'}
+				<slot name="webhooks" />
+			{:else if triggerSelected === 'routes'}
+				<slot name="routes" />
+			{:else if triggerSelected === 'emails'}
+				<slot name="emails" />
+			{:else if triggerSelected === 'schedules'}
+				<slot name="schedules" />
+			{:else if triggerSelected === 'websockets'}
+				<slot name="websockets" />
+			{:else if triggerSelected === 'cli'}
+				<slot name="cli" />
+			{/if}
+		</div>
 	</div>
-</div>
+{:else}
+	<slot name="schedules" />
+{/if}
diff --git a/frontend/src/lib/components/flows/content/FlowPathViewer.svelte b/frontend/src/lib/components/flows/content/FlowPathViewer.svelte
index a55ad17c47..40af045bdf 100644
--- a/frontend/src/lib/components/flows/content/FlowPathViewer.svelte
+++ b/frontend/src/lib/components/flows/content/FlowPathViewer.svelte
@@ -12,15 +12,16 @@
 
 	let flow: Flow | undefined = undefined
 
-	const selectedTriggerStore = writable<'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes'>(
-		'webhooks'
-	)
+	const selectedTriggerStore = writable<
+		'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'scheduledPoll'
+	>('webhooks')
 	const primaryScheduleStore = writable<ScheduleTrigger | undefined | false>(undefined)
 	const triggersCount = writable<TriggersCount | undefined>(undefined)
 	setContext<TriggerContext>('TriggerContext', {
 		primarySchedule: primaryScheduleStore,
 		selectedTrigger: selectedTriggerStore,
-		triggersCount: triggersCount
+		triggersCount: triggersCount,
+		simplifiedPoll: writable(false)
 	})
 
 	async function loadFlow(path: string) {
diff --git a/frontend/src/lib/components/flows/flowStateUtils.ts b/frontend/src/lib/components/flows/flowStateUtils.ts
index 5a856fb297..6465065145 100644
--- a/frontend/src/lib/components/flows/flowStateUtils.ts
+++ b/frontend/src/lib/components/flows/flowStateUtils.ts
@@ -45,11 +45,12 @@ export async function pickScript(
 	path: string,
 	summary: string,
 	id: string,
-	hash?: string
+	hash?: string,
+	kind?: string
 ): Promise<[FlowModule & { value: PathScript }, FlowModuleState]> {
 	const flowModule: FlowModule & { value: PathScript } = {
 		id,
-		value: { type: 'script', path, hash, input_transforms: {} },
+		value: { type: 'script', path, hash, input_transforms: {}, is_trigger: kind === 'trigger' },
 		summary
 	}
 
@@ -82,7 +83,13 @@ export async function createInlineScriptModule(
 	const flowModule: FlowModule = {
 		id,
 		summary,
-		value: { type: 'rawscript', content: code, language, input_transforms: {} }
+		value: {
+			type: 'rawscript',
+			content: code,
+			language,
+			input_transforms: {},
+			is_trigger: kind === 'trigger'
+		}
 	}
 
 	return [flowModule, await loadFlowModuleState(flowModule)]
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
index d93d85366d..229194a48c 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
@@ -46,6 +46,7 @@
 	export let concurrency: boolean = false
 	export let retries: number | undefined = undefined
 	export let warningMessage: string | undefined = undefined
+	export let isTrigger: boolean = false
 
 	const { flowInputsStore } = getContext<{ flowInputsStore: Writable<FlowInput | undefined> }>(
 		'FlowGraphContext'
@@ -131,7 +132,7 @@
 <!-- svelte-ignore a11y-no-static-element-interactions -->
 <div
 	class={classNames(
-		'w-full module flex rounded-sm cursor-pointer',
+		'w-full module flex rounded-sm cursor-pointer max-w-full',
 		selected ? 'outline outline-offset-0  outline-2  outline-slate-500 dark:outline-gray-400' : '',
 		'flex relative',
 		$copilotCurrentStepStore === id ? 'z-[901]' : ''
@@ -139,7 +140,7 @@
 	style="width: 275px; height: 34px; background-color: {bgColor};"
 	on:mouseenter={() => (hover = true)}
 	on:mouseleave={() => (hover = false)}
-	on:click
+	on:click|preventDefault|stopPropagation
 >
 	<div class="absolute text-sm right-12 -bottom-3 flex flex-row gap-1 z-10">
 		{#if retry}
@@ -185,7 +186,11 @@
 				>
 					<Square size={12} />
 				</div>
-				<svelte:fragment slot="text">Early stop/break</svelte:fragment>
+				<svelte:fragment slot="text"
+					>{isTrigger
+						? 'Stop early if there are no new events'
+						: 'Early stop/break'}</svelte:fragment
+				>
 			</Popover>
 		{/if}
 		{#if skip}
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
index 203ac70988..a9895086cd 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
@@ -33,6 +33,7 @@
 	import { tutorialInProgress } from '$lib/tutorialUtils'
 	import FlowGraphV2 from '$lib/components/graph/FlowGraphV2.svelte'
 	import { replaceId } from '../flowStore'
+	import { setScheduledPollSchedule, type TriggerContext } from '$lib/components/triggers'
 
 	export let modules: FlowModule[] | undefined
 	export let sidebarSize: number | undefined = undefined
@@ -47,7 +48,7 @@
 
 	const { selectedId, moving, history, flowStateStore, flowStore, flowInputsStore, pathStore } =
 		getContext<FlowEditorContext>('FlowEditorContext')
-
+	const { primarySchedule, triggersCount } = getContext<TriggerContext>('TriggerContext')
 	async function insertNewModuleAtIndex(
 		modules: FlowModule[],
 		index: number,
@@ -74,10 +75,17 @@
 		push(history, $flowStore)
 		var module = emptyModule($flowStateStore, $flowStore, kind == 'flow')
 		var state = emptyFlowModuleState()
+		$flowStateStore[module.id] = state
 		if (wsFlow) {
 			;[module, state] = await pickFlow(wsFlow.path, wsFlow.summary, module.id)
 		} else if (wsScript) {
-			;[module, state] = await pickScript(wsScript.path, wsScript.summary, module.id, wsScript.hash)
+			;[module, state] = await pickScript(
+				wsScript.path,
+				wsScript.summary,
+				module.id,
+				wsScript.hash,
+				kind
+			)
 		} else if (kind == 'forloop') {
 			;[module, state] = await createLoop(
 				module.id,
@@ -89,10 +97,7 @@
 			;[module, state] = await createBranches(module.id)
 		} else if (kind == 'branchall') {
 			;[module, state] = await createBranchAll(module.id)
-		}
-		$flowStateStore[module.id] = state
-
-		if (inlineScript) {
+		} else if (inlineScript) {
 			const { language, kind, subkind } = inlineScript
 			;[module, state] = await createInlineScriptModule(
 				language,
@@ -108,6 +113,7 @@
 				module.summary = 'Approval'
 			}
 		}
+		$flowStateStore[module.id] = state
 
 		if (kind == 'approval') {
 			module.suspend = { required_events: 1, timeout: 1800 }
@@ -116,6 +122,9 @@
 				expr: '!result || (Array.isArray(result) && result.length == 0)',
 				skip_if_stopped: true
 			}
+		} else if (kind == 'end') {
+			module.summary = 'Terminate flow'
+			module.stop_after_if = { skip_if_stopped: false, expr: 'true' }
 		}
 
 		if (!modules) return [module]
@@ -403,6 +412,7 @@
 										undefined
 									)
 									setExpr(detail.modules[index + 1], `results.${id}`)
+									setScheduledPollSchedule(primarySchedule, triggersCount)
 								}
 							}
 						}
diff --git a/frontend/src/lib/components/flows/map/InsertModuleButton.svelte b/frontend/src/lib/components/flows/map/InsertModuleButton.svelte
index 1544972c4b..b2f4b1b461 100644
--- a/frontend/src/lib/components/flows/map/InsertModuleButton.svelte
+++ b/frontend/src/lib/components/flows/map/InsertModuleButton.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { createEventDispatcher, getContext } from 'svelte'
-	import { Cross, Zap } from 'lucide-svelte'
+	import { Cross } from 'lucide-svelte'
 	import StepGenQuick from '$lib/components/copilot/StepGenQuick.svelte'
 	import FlowInputsQuick from '../content/FlowInputsQuick.svelte'
 	import type { FlowModule } from '$lib/gen'
@@ -11,6 +11,7 @@
 	import TopLevelNode from '../pickers/TopLevelNode.svelte'
 	import PopupV2 from '$lib/components/common/popup/PopupV2.svelte'
 	import { flip, offset } from 'svelte-floating-ui/dom'
+	import { SchedulePollIcon } from '$lib/components/icons'
 
 	// import type { Writable } from 'svelte/store'
 
@@ -22,6 +23,7 @@
 	export let disableAi = false
 	export let kind: 'script' | 'trigger' | 'preprocessor' | 'failure' = 'script'
 	export let allowTrigger = true
+	export let iconSize = 12
 
 	type Alignment = 'start' | 'end' | 'center'
 	type Side = 'top' | 'bottom'
@@ -70,22 +72,22 @@ shouldUsePortal={true} -->
 			id={`flow-editor-add-step-${index}`}
 			type="button"
 			class={twMerge(
-				'w-5 h-5 flex items-center justify-center',
-				'outline-[1px] outline dark:outline-gray-500 outline-gray-300',
-				'text-secondary',
-				'bg-surface focus:outline-none hover:bg-surface-hover rounded'
+				'w-[17.5px] h-[17.5px] flex items-center justify-center outline-[1px] outline dark:outline-gray-500 outline-gray-300 text-secondary bg-surface focus:outline-none hover:bg-surface-hover rounded',
+				$$props.class
 			)}
-			on:pointerdown|preventDefault|stopPropagation={pointerdown}
+			on:pointerdown|preventDefault|stopPropagation={() => {
+				dispatch('open')
+				pointerdown()
+			}}
 			on:pointerup={pointerup}
 		>
 			{#if kind === 'trigger'}
-				<Zap size={12} />
+				<SchedulePollIcon size={14} />
 			{:else}
-				<Cross size={12} />
+				<Cross size={iconSize} />
 			{/if}
 		</button>
 	</svelte:fragment>
-	<!-- FOO -->
 	<div
 		id="flow-editor-insert-module"
 		class="flex flex-col h-[400px] {small ? 'w-[450px]' : 'w-[650px]'}  pt-1 pr-1 pl-1 gap-1.5"
@@ -109,7 +111,7 @@ shouldUsePortal={true} -->
 		</div>
 
 		<div class="flex flex-row grow min-h-0">
-			{#if kind === 'script' || kind == 'trigger'}
+			{#if kind === 'script'}
 				<div class="flex-none flex flex-col text-xs text-primary">
 					<TopLevelNode
 						label="Action"
diff --git a/frontend/src/lib/components/flows/map/MapItem.svelte b/frontend/src/lib/components/flows/map/MapItem.svelte
index 5114758357..cd65b3daf8 100644
--- a/frontend/src/lib/components/flows/map/MapItem.svelte
+++ b/frontend/src/lib/components/flows/map/MapItem.svelte
@@ -11,6 +11,7 @@
 	import { msToSec } from '$lib/utils'
 	import BarsStaggered from '$lib/components/icons/BarsStaggered.svelte'
 	import FlowJobsMenu from './FlowJobsMenu.svelte'
+	import { isTriggerStep } from '$lib/components/graph/graphBuilder'
 
 	export let mod: FlowModule
 	export let insertable: boolean
@@ -19,6 +20,7 @@
 	export let modules: FlowModule[]
 	export let moving: string | undefined = undefined
 	export let duration_ms: number | undefined = undefined
+	export let isTrigger: boolean = false
 
 	export let retries: number | undefined = undefined
 	export let flowJobs:
@@ -173,6 +175,7 @@
 						(mod.value.type === 'rawscript'
 							? `Inline ${prettyLanguage(mod.value.language)}`
 							: 'To be defined')}
+					isTrigger={isTriggerStep(mod)}
 				>
 					<div slot="icon">
 						{#if mod.value.type === 'rawscript'}
diff --git a/frontend/src/lib/components/flows/map/VirtualItem.svelte b/frontend/src/lib/components/flows/map/VirtualItem.svelte
index c69e743d7f..e09f84b0de 100644
--- a/frontend/src/lib/components/flows/map/VirtualItem.svelte
+++ b/frontend/src/lib/components/flows/map/VirtualItem.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 	import { Badge } from '$lib/components/common'
-	import type { FlowModule } from '$lib/gen'
-	import { classNames } from '$lib/utils'
-	import { createEventDispatcher, getContext } from 'svelte'
+
+	import { getContext } from 'svelte'
 	import type { FlowCopilotContext } from '$lib/components/copilot/flow'
+	import VirtualItemWrapper from './VirtualItemWrapper.svelte'
 
 	export let label: string | undefined = undefined
 	export let bgColor: string = ''
@@ -15,41 +15,18 @@
 	export let hideId: boolean = false
 	export let preLabel: string | undefined = undefined
 
-	const dispatch = createEventDispatcher<{
-		insert: {
-			script?: { path: string; summary: string; hash: string | undefined }
-			detail: 'script' | 'forloop' | 'branchone' | 'branchall' | 'trigger' | 'move'
-			modules: FlowModule[]
-			index: number
-		}
-		select: string
-	}>()
-
 	const { currentStepStore: copilotCurrentStepStore } =
 		getContext<FlowCopilotContext | undefined>('FlowCopilotContext') || {}
 </script>
 
-<!-- svelte-ignore a11y-click-events-have-key-events -->
-<!-- svelte-ignore a11y-no-static-element-interactions -->
-<div
-	class={classNames(
-		'w-full flex relative overflow-hidden rounded-sm',
-		selectable ? 'cursor-pointer' : '',
-		selected ? 'outline outline-offset-1 outline-2  outline-gray-600' : '',
-		label === 'Input' && $copilotCurrentStepStore === 'Input' ? 'z-[901]' : ''
-	)}
-	style="width: 275px; max-height: 34px; background-color: {bgColor} !important;"
-	on:click={() => {
-		if (selectable) {
-			if (id) {
-				dispatch('select', id)
-			} else {
-				dispatch('select', label || label || '')
-			}
-		}
-	}}
-	title={(label ? label + ' ' : '') + (label ?? '')}
-	id={`flow-editor-virtual-${encodeURIComponent(label || label || '')}`}
+<VirtualItemWrapper
+	{label}
+	{bgColor}
+	{selected}
+	{selectable}
+	{id}
+	onTop={label === 'Input' && $copilotCurrentStepStore === 'Input'}
+	on:select
 >
 	<div
 		style={borderColor ? `border-color: ${borderColor};` : 'border: 0'}
@@ -76,4 +53,4 @@
 			{/if}
 		</div>
 	</div>
-</div>
+</VirtualItemWrapper>
diff --git a/frontend/src/lib/components/flows/map/VirtualItemWrapper.svelte b/frontend/src/lib/components/flows/map/VirtualItemWrapper.svelte
new file mode 100644
index 0000000000..4160bebf94
--- /dev/null
+++ b/frontend/src/lib/components/flows/map/VirtualItemWrapper.svelte
@@ -0,0 +1,45 @@
+<script lang="ts">
+	import type { FlowModule } from '$lib/gen'
+	import { classNames } from '$lib/utils'
+	import { createEventDispatcher } from 'svelte'
+
+	export let label: string | undefined
+	export let selectable: boolean
+	export let selected: boolean
+	export let id: string | undefined
+	export let onTop: boolean = false
+	export let bgColor: string
+
+	const dispatch = createEventDispatcher<{
+		insert: {
+			script?: { path: string; summary: string; hash: string | undefined }
+			detail: 'script' | 'forloop' | 'branchone' | 'branchall' | 'trigger' | 'move'
+			modules: FlowModule[]
+			index: number
+		}
+		select: string
+	}>()
+</script>
+
+<!-- svelte-ignore a11y-click-events-have-key-events -->
+<!-- svelte-ignore a11y-no-static-element-interactions -->
+<div
+	class={classNames(
+		'w-full flex relative overflow-hidden rounded-sm',
+		selectable ? 'cursor-pointer' : '',
+		selected ? 'outline outline-offset-1 outline-2  outline-gray-600 dark:outline-gray-400' : '',
+		onTop ? 'z-[901]' : ''
+	)}
+	style="width: 275px; max-height: 34px; background-color: {bgColor} !important;"
+	on:click={() => {
+		if (selectable) {
+			if (id) {
+				dispatch('select', id)
+			} else {
+				dispatch('select', label || label || '')
+			}
+		}
+	}}
+	title={label ? label + ' ' : ''}
+	id={`flow-editor-virtual-${encodeURIComponent(label || label || '')}`}><slot /></div
+>
diff --git a/frontend/src/lib/components/flows/scheduleUtils.ts b/frontend/src/lib/components/flows/scheduleUtils.ts
index ef1f2b1fde..d68ed215e6 100644
--- a/frontend/src/lib/components/flows/scheduleUtils.ts
+++ b/frontend/src/lib/components/flows/scheduleUtils.ts
@@ -1,5 +1,8 @@
-import { ScheduleService } from '$lib/gen'
+import { ScheduleService, type Schedule, type TriggersCount } from '$lib/gen'
 import type { ScheduleTrigger } from '../triggers'
+import type { Writable } from 'svelte/store'
+import { get } from 'svelte/store'
+import { sendUserToast } from '$lib/utils'
 
 // Load the schedule of a flow given its path and the workspace
 export async function loadFlowSchedule(path: string, workspace: string): Promise<ScheduleTrigger> {
@@ -25,3 +28,108 @@ export async function loadFlowSchedule(path: string, workspace: string): Promise
 		args: schedule.args ?? {}
 	}
 }
+
+export async function loadSchedules(
+	forceRefresh: boolean,
+	path: string,
+	isFlow: boolean,
+	schedules: Writable<Schedule[] | undefined>,
+	primarySchedule: Writable<ScheduleTrigger | false | undefined>,
+	initialPrimarySchedule: Writable<ScheduleTrigger | false | undefined>,
+	workspace: string,
+	triggersCount: Writable<TriggersCount | undefined>
+) {
+	console.log('loading schedules for path', path)
+	if (!path || path == '') {
+		schedules.set([])
+		primarySchedule.update((ps) => (ps === undefined ? false : ps))
+		initialPrimarySchedule.set(structuredClone(get(primarySchedule)))
+		return
+	}
+	console.log('loading schedules for path', path)
+	try {
+		const allSchedules = await ScheduleService.listSchedules({
+			workspace,
+			path: path,
+			isFlow
+		})
+		const primary = allSchedules.find((s) => s.path == path)
+		let remotePrimarySchedule: ScheduleTrigger | false | undefined = primary
+			? {
+					summary: primary.summary,
+					args: primary.args ?? {},
+					cron: primary.schedule,
+					timezone: primary.timezone,
+					enabled: primary.enabled
+			  }
+			: false
+		primarySchedule.update((ps) => (ps === undefined || forceRefresh ? remotePrimarySchedule : ps))
+		initialPrimarySchedule.set(structuredClone(remotePrimarySchedule))
+
+		triggersCount.update((tc) => {
+			const primary = get(primarySchedule)
+			return {
+				...(tc ?? {}),
+				schedule_count: allSchedules.length,
+				primary_schedule: primary ? { schedule: primary.cron } : undefined
+			}
+		})
+		schedules.set(allSchedules.filter((s) => s.path != path))
+	} catch (e) {
+		console.error('impossible to load schedules', e)
+	}
+}
+
+export async function saveSchedule(
+	path: string,
+	newItem: boolean,
+	workspace: string,
+	primarySchedule: Writable<ScheduleTrigger | false | undefined>,
+	isFlow: boolean
+) {
+	const scheduleExists =
+		path != '' &&
+		!newItem &&
+		(await ScheduleService.existsSchedule({
+			workspace,
+			path
+		}))
+	if (scheduleExists) {
+		console.log('primary schedule exists')
+		const primary = get(primarySchedule)
+		if (primary) {
+			await ScheduleService.updateSchedule({
+				workspace,
+				path,
+				requestBody: {
+					summary: primary.summary,
+					args: primary.args,
+					schedule: primary.cron,
+					timezone: primary.timezone
+				}
+			})
+			sendUserToast(`Primary schedule updated`)
+		} else {
+			await ScheduleService.deleteSchedule({ workspace, path })
+			sendUserToast(`Primary schedule deleted`)
+		}
+	} else {
+		const primary = get(primarySchedule)
+		if (primary) {
+			await ScheduleService.createSchedule({
+				workspace,
+				requestBody: {
+					path,
+					script_path: path,
+					is_flow: isFlow,
+					summary: primary.summary,
+					args: primary.args,
+					schedule: primary.cron,
+					timezone: primary.timezone,
+					enabled: primary.enabled
+				}
+			})
+			sendUserToast(`Primary schedule created`)
+		}
+	}
+}
diff --git a/frontend/src/lib/components/graph/FlowGraphV2.svelte b/frontend/src/lib/components/graph/FlowGraphV2.svelte
index e7a48ac84f..caf28e43ce 100644
--- a/frontend/src/lib/components/graph/FlowGraphV2.svelte
+++ b/frontend/src/lib/components/graph/FlowGraphV2.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 	import { type FlowModule } from '../../gen'
 	import { NODE, type GraphModuleState } from '.'
-	import { createEventDispatcher, onMount, setContext } from 'svelte'
+	import { createEventDispatcher, getContext, onDestroy, onMount, setContext } from 'svelte'
 
-	import { writable, type Writable } from 'svelte/store'
+	import { get, writable, type Writable } from 'svelte/store'
 	import '@xyflow/svelte/dist/style.css'
 	import type { FlowInput } from '../flows/types'
 	import {
@@ -15,7 +15,7 @@
 		ControlButton,
 		type Viewport
 	} from '@xyflow/svelte'
-	import graphBuilder from './graphBuilder'
+	import { graphBuilder, isTriggerStep, type SimplifiableFlow } from './graphBuilder'
 	import ModuleNode from './renderers/nodes/ModuleNode.svelte'
 	import InputNode from './renderers/nodes/InputNode.svelte'
 	import BranchAllStart from './renderers/nodes/BranchAllStart.svelte'
@@ -38,6 +38,8 @@
 	import Button from '../common/button/Button.svelte'
 	import FlowYamlEditor from '../flows/header/FlowYamlEditor.svelte'
 	import BranchOneEndNode from './renderers/nodes/branchOneEndNode.svelte'
+	import type { TriggerContext } from '../triggers'
+
 	export let success: boolean | undefined = undefined
 	export let modules: FlowModule[] | undefined = []
 	export let failureModule: FlowModule | undefined = undefined
@@ -72,11 +74,46 @@
 		useDataflow: Writable<boolean | undefined>
 	}>('FlowGraphContext', { selectedId, flowInputsStore, useDataflow })
 
+	const triggerContext = getContext<TriggerContext>('TriggerContext')
+
 	const dispatch = createEventDispatcher()
 
 	let fullWidth = 0
 	let width = 0
 
+	export let allowSimplifiedPoll: boolean = true
+
+	let simplifiableFlow: SimplifiableFlow | undefined = undefined
+
+	if (triggerContext && allowSimplifiedPoll) {
+		if (isSimplifiable(modules)) {
+			triggerContext?.simplifiedPoll?.set(true)
+		}
+		triggerContext?.simplifiedPoll.subscribe((value) => {
+			computeSimplifiableFlow(modules ?? [], value ?? false)
+		})
+	}
+
+	function computeSimplifiableFlow(modules: FlowModule[], simplifiedFlow: boolean) {
+		const isSimplif = isSimplifiable(modules)
+		simplifiableFlow = isSimplif ? { simplifiedFlow } : undefined
+	}
+
+	onDestroy(() => {
+		if (isSimplifiable(modules)) {
+			triggerContext?.simplifiedPoll?.set(undefined)
+		}
+	})
+
+	function onModulesChange(modules: FlowModule[]) {
+		computeSimplifiableFlow(
+			modules,
+			triggerContext?.simplifiedPoll ? get(triggerContext.simplifiedPoll) ?? false : false
+		)
+	}
+
+	$: allowSimplifiedPoll && onModulesChange(modules ?? [])
+
 	function layoutNodes(nodes: Node[]): Node[] {
 		let seenId: string[] = []
 		for (const n of nodes) {
@@ -129,6 +166,44 @@
 		return newNodes
 	}
 
+	let eventHandler = {
+		deleteBranch: (detail, label) => {
+			$selectedId = label
+			dispatch('deleteBranch', detail)
+		},
+		insert: (detail) => {
+			dispatch('insert', detail)
+		},
+		select: (modId) => {
+			if (!notSelectable) {
+				if ($selectedId != modId) {
+					$selectedId = modId
+				}
+				dispatch('select', modId)
+			}
+		},
+		changeId: (detail) => {
+			dispatch('changeId', detail)
+		},
+		delete: (detail, label) => {
+			$selectedId = label
+
+			dispatch('delete', detail)
+		},
+		newBranch: (module) => {
+			dispatch('newBranch', { module })
+		},
+		move: (module, modules) => {
+			dispatch('move', { module, modules })
+		},
+		selectedIteration: (detail, moduleId) => {
+			dispatch('selectedIteration', { ...detail, moduleId: moduleId })
+		},
+		simplifyFlow: (detail) => {
+			triggerContext?.simplifiedPoll.set(detail)
+		}
+	}
+
 	$: graph = graphBuilder(
 		modules,
 		{
@@ -141,50 +216,13 @@
 		},
 		failureModule,
 		preprocessorModule,
-		{
-			deleteBranch: (detail, label) => {
-				$selectedId = label
-
-				dispatch('deleteBranch', detail)
-			},
-			insert: (detail) => {
-				dispatch('insert', detail)
-			},
-			select: (modId) => {
-				if (!notSelectable) {
-					if ($selectedId != modId) {
-						$selectedId = modId
-					}
-					dispatch('select', modId)
-				}
-			},
-			changeId: (detail) => {
-				dispatch('changeId', detail)
-			},
-			delete: (detail, label) => {
-				$selectedId = label
-
-				dispatch('delete', detail)
-			},
-			newBranch: (module) => {
-				dispatch('newBranch', { module })
-			},
-			move: (module, modules) => {
-				dispatch('move', { module, modules })
-			},
-			selectedIteration: (detail, moduleId) => {
-				dispatch('selectedIteration', { ...detail, moduleId: moduleId })
-			}
-		},
+		eventHandler,
 		success,
 		$useDataflow,
 		$selectedId,
 		moving,
-		triggerNode
-			? {
-					path
-			  }
-			: undefined
+		simplifiableFlow,
+		triggerNode ? path : undefined
 	)
 
 	const nodes = writable<Node[]>([])
@@ -192,18 +230,93 @@
 
 	let height = 0
 
+	// function removeInputNode(nodes, edges, id) {
+	// 	const inputNode = nodes.find((node) => node.id === id)
+	// 	if (!inputNode) return { nodes, edges }
+
+	// 	// Find edges connected to the input node
+	// 	const connectedEdges = edges.filter((edge) => edge.source === id || edge.target === id)
+
+	// 	// Remove the input node
+	// 	let updatedNodes = nodes.filter((node) => node.id !== id)
+
+	// 	// Remove edges connected to the input node
+	// 	let updatedEdges = edges.filter((edge) => edge.source !== id && edge.target !== id)
+
+	// 	// Create new edges from the input node's parent to its children
+	// 	const inputEdges = connectedEdges.filter((edge) => edge.target === id)
+	// 	const outputEdges = connectedEdges.filter((edge) => edge.source === id)
+
+	// 	inputEdges.forEach((inputEdge) => {
+	// 		outputEdges.forEach((outputEdge) => {
+	// 			const newEdge = {
+	// 				id: `edge:${inputEdge.source}->${outputEdge.target}`,
+	// 				source: inputEdge.source,
+	// 				target: outputEdge.target,
+	// 				type: 'empty',
+	// 				data: {
+	// 					...outputEdge.data,
+	// 					sourceId: inputEdge.source,
+	// 					targetId: outputEdge.target
+	// 				}
+	// 			}
+	// 			updatedEdges.push(newEdge)
+	// 		})
+	// 	})
+
+	// 	// Update parent ids of the nodes
+	// 	updatedNodes = updatedNodes.map((node) => {
+	// 		if (node.data && node.data.parentIds && node.data.parentIds.includes(id)) {
+	// 			const updatedParentIds = node.data.parentIds.filter((parentId) => parentId !== id)
+	// 			if (inputNode.data && inputNode.data.parentIds) {
+	// 				updatedParentIds.push(...inputNode.data.parentIds)
+	// 			}
+	// 			return {
+	// 				...node,
+	// 				data: {
+	// 					...node.data,
+	// 					parentIds: [...new Set(updatedParentIds)] // Remove duplicates
+	// 				}
+	// 			}
+	// 		}
+	// 		return node
+	// 	})
+
+	// 	return { nodes: updatedNodes, edges: updatedEdges }
+	// }
+
+	// function processGraph(graph, simplifiable) {
+	// 	let newGraph = { nodes: graph.nodes, edges: graph.edges }
+	// 	newGraph = removeInputNode(newGraph.nodes, newGraph.edges, 'Input')
+	// 	newGraph = removeInputNode(newGraph.nodes, newGraph.edges, simplifiable.forLoopNode.id)
+	// 	newGraph = removeInputNode(newGraph.nodes, newGraph.edges, simplifiable.triggerNode.id)
+	// 	return newGraph
+	// }
+
+	function isSimplifiable(modules: FlowModule[] | undefined): boolean {
+		if (!modules || modules?.length !== 2) {
+			return false
+		}
+		if (isTriggerStep(modules?.[0])) {
+			let secondValue = modules?.[1].value
+			return secondValue.type == 'forloopflow'
+		}
+
+		return false
+	}
+
 	function updateStores() {
 		if (graph.error) {
 			return
 		}
+		let newGraph = graph
 
-		$nodes = layoutNodes(graph?.nodes)
-		$edges = graph.edges
-
+		$nodes = layoutNodes(newGraph.nodes)
+		$edges = newGraph.edges
 		height = Math.max(...$nodes.map((n) => n.position.y + NODE.height + 40), minHeight)
 	}
 
-	$: graph && updateStores()
+	$: (graph || allowSimplifiedPoll) && updateStores()
 
 	const nodeTypes = {
 		input2: InputNode,
diff --git a/frontend/src/lib/components/graph/graphBuilder.ts b/frontend/src/lib/components/graph/graphBuilder.ts
index e63d6c2c51..d010c7ae33 100644
--- a/frontend/src/lib/components/graph/graphBuilder.ts
+++ b/frontend/src/lib/components/graph/graphBuilder.ts
@@ -14,9 +14,19 @@ export type GraphEventHandlers = {
 	move: (module: FlowModule, modules: FlowModule[]) => void
 	selectedIteration: (detail, moduleId: string) => void
 	changeId: (newId: string) => void
+	simplifyFlow: (detail: boolean) => void
 }
 
-export default function graphBuilder(
+export type SimplifiableFlow = { simplifiedFlow: boolean }
+
+export function isTriggerStep(module: FlowModule | undefined): boolean {
+	return (
+		module?.value != undefined &&
+		(module.value.type === 'script' || module.value.type === 'rawscript') &&
+		module.value.is_trigger === true
+	)
+}
+export function graphBuilder(
 	modules: FlowModule[] | undefined,
 	extra: Record<string, any>,
 	failureModule: FlowModule | undefined,
@@ -26,9 +36,12 @@ export default function graphBuilder(
 	useDataflow: boolean | undefined,
 	selectedId: string | undefined,
 	moving: string | undefined,
-	triggerProps?: {
-		path?: string
-	}
+	simplifiableFlow: SimplifiableFlow | undefined,
+	flowPathForTriggerNode: string | undefined
+	// triggerProps?: {
+	// 	path?: string
+	// 	flowIsSimplifiable?: boolean
+	// }
 ): {
 	nodes: Node[]
 	edges: Edge[]
@@ -102,6 +115,7 @@ export default function graphBuilder(
 			sourceId: string,
 			targetId: string,
 			options?: {
+				disableInsert?: boolean
 				customId?: string
 				type?: string
 				subModules?: FlowModule[]
@@ -129,17 +143,18 @@ export default function graphBuilder(
 				target: targetId,
 				type: options?.type ?? 'edge',
 				data: {
-					insertable: extra.insertable,
 					modules: options?.subModules ?? modules,
 					sourceId,
 					targetId,
 					moving,
 					eventHandlers,
+					simplifiedTriggerView: simplifiableFlow?.simplifiedFlow,
 					disableMoveIds: options?.disableMoveIds,
 					enableTrigger: sourceId === 'Input',
 					// If the index is -1, it means that the target module is not in the modules array, so we set it to the length of the array
 					index: index >= 0 ? index : mods?.length ?? 0,
-					...extra
+					...extra,
+					insertable: extra.insertable && !options?.disableInsert
 				}
 			})
 		}
@@ -156,15 +171,19 @@ export default function graphBuilder(
 			}
 		}
 
-		if (extra.path && triggerProps != undefined) {
-			const triggerNode: Node = {
+		let triggerNode: Node | undefined = undefined
+		if (flowPathForTriggerNode) {
+			triggerNode = {
 				id: 'Trigger',
 				position: { x: -1, y: -1 },
 				type: 'trigger',
 				data: {
-					path: triggerProps?.path,
+					simplifiableFlow: simplifiableFlow,
+					path: flowPathForTriggerNode,
 					newFlow: extra.newFlow,
-					eventHandlers: eventHandlers
+					eventHandlers: eventHandlers,
+					modules: modules,
+					isEditor: extra.insertable
 				}
 			}
 			nodes.push(triggerNode)
@@ -191,13 +210,16 @@ export default function graphBuilder(
 			type: 'result'
 		}
 
-		nodes.push(inputNode)
-		nodes.push(resultNode)
+		if (simplifiableFlow?.simplifiedFlow !== true) {
+			nodes.push(inputNode)
+			nodes.push(resultNode)
+		}
 
 		function processModules(
 			modules: FlowModule[],
 			beforeNode: Node,
-			nextNode: Node,
+			nextNode: Node | undefined,
+			simplifiedTriggerView: boolean,
 			currentOffset = 0,
 			disableMoveIds: string[] = [],
 			parentIndex?: string,
@@ -206,10 +228,12 @@ export default function graphBuilder(
 			let previousId: string | undefined = undefined
 
 			if (modules.length === 0) {
-				addEdge(beforeNode.id, nextNode.id, {
-					subModules: modules,
-					disableMoveIds
-				})
+				if (nextNode) {
+					addEdge(beforeNode.id, nextNode.id, {
+						subModules: modules,
+						disableMoveIds
+					})
+				}
 			} else {
 				modules.forEach((module, index) => {
 					const localDisableMoveIds = [...disableMoveIds, module.id]
@@ -295,6 +319,7 @@ export default function graphBuilder(
 									branch.modules,
 									startNode,
 									endNode,
+									false,
 									currentOffset,
 									localDisableMoveIds,
 									parentIndex ? `${parentIndex}-${index}-${branchIndex}` : `${index}-${branchIndex}`
@@ -304,7 +329,9 @@ export default function graphBuilder(
 
 						previousId = endNode.id
 					} else if (module.value.type === 'forloopflow') {
-						addNode(module, currentOffset, 'module', modules)
+						if (!simplifiedTriggerView) {
+							addNode(module, currentOffset, 'module', modules)
+						}
 
 						const startNode = {
 							id: `${module.id}-start`,
@@ -313,6 +340,7 @@ export default function graphBuilder(
 								id: module.id,
 								module: module,
 								modules: modules,
+								simplifiedTriggerView,
 								eventHandlers: eventHandlers,
 								...extra
 							},
@@ -320,9 +348,15 @@ export default function graphBuilder(
 							type: 'forLoopStart'
 						}
 
-						addEdge(module.id, startNode.id, {
-							type: 'empty'
-						})
+						if (!simplifiedTriggerView) {
+							addEdge(module.id, startNode.id, {
+								type: 'empty'
+							})
+						} else if (previousId) {
+							addEdge(previousId, startNode.id, {
+								type: 'empty'
+							})
+						}
 
 						const endNode = {
 							id: `${module.id}-end`,
@@ -332,6 +366,7 @@ export default function graphBuilder(
 								module: module,
 								modules: modules,
 								eventHandlers: eventHandlers,
+								simplifiedTriggerView,
 								...extra
 							},
 							position: { x: -1, y: -1 },
@@ -347,6 +382,7 @@ export default function graphBuilder(
 							module.value.modules,
 							startNode,
 							endNode,
+							false,
 							currentOffset + 25,
 							localDisableMoveIds,
 							parentIndex
@@ -390,6 +426,7 @@ export default function graphBuilder(
 							module.value.modules,
 							startNode,
 							endNode,
+							false,
 							currentOffset + 25,
 							localDisableMoveIds,
 							parentIndex
@@ -435,6 +472,7 @@ export default function graphBuilder(
 							module.value.default,
 							defaultBranch,
 							endNode,
+							false,
 							currentOffset,
 							localDisableMoveIds,
 							parentIndex ? `${parentIndex}-${index}` : index.toString(),
@@ -468,6 +506,7 @@ export default function graphBuilder(
 								branch.modules,
 								startNode,
 								endNode,
+								false,
 								currentOffset,
 								localDisableMoveIds,
 								parentIndex ? `${parentIndex}-${index}` : index.toString(),
@@ -480,30 +519,31 @@ export default function graphBuilder(
 						addNode(module, currentOffset, 'module', modules)
 
 						previousId = module.id
-
-
 					}
 
 					if (index === 0) {
 						addEdge(beforeNode.id, module.id, {
 							subModules: modules,
-							disableMoveIds
+							disableMoveIds,
+							disableInsert: simplifiedTriggerView
 						})
 					}
 
-					if (index === modules.length - 1 && previousId) {
+					if (index === modules.length - 1 && previousId && nextNode) {
 						addEdge(previousId, nextNode.id, {
 							subModules: modules,
 							disableMoveIds
 						})
 					}
 				})
-
-
 			}
 		}
 
-		processModules(modules, inputNode, resultNode)
+		if (simplifiableFlow?.simplifiedFlow === true && triggerNode) {
+			processModules(modules, triggerNode, undefined, true)
+		} else {
+			processModules(modules, inputNode, resultNode, false)
+		}
 
 		if (failureModule) {
 			let toAdd: Record<string, string> = {}
diff --git a/frontend/src/lib/components/graph/renderers/edges/BaseEdge.svelte b/frontend/src/lib/components/graph/renderers/edges/BaseEdge.svelte
index 8dbe9d3ad5..4843742040 100644
--- a/frontend/src/lib/components/graph/renderers/edges/BaseEdge.svelte
+++ b/frontend/src/lib/components/graph/renderers/edges/BaseEdge.svelte
@@ -86,45 +86,6 @@
 				}}
 			/>
 		</div>
-		{#if data.enableTrigger}
-			<div
-				class="edgeButtonContainer nodrag nopan"
-				style:transform="translate(100%, 50%) translate({sourceX}px,{sourceY + 2}px)"
-			>
-				<InsertModuleButton
-					disableAi={data.disableAi}
-					on:new={(e) => {
-						// console.log('new', e)
-						data?.eventHandlers.insert({
-							modules: data.modules,
-							index: data.index,
-							kind: e.detail.kind,
-							inlineScript: e.detail.inlineScript
-						})
-					}}
-					on:pickScript={(e) => {
-						// console.log('pickScript', e)
-						data?.eventHandlers.insert({
-							modules: data.modules,
-							index: data.index,
-							script: e.detail,
-							kind: e.detail.kind
-						})
-					}}
-					on:pickFlow={(e) => {
-						// console.log('pickFlow', e)
-						data?.eventHandlers.insert({
-							modules: data.modules,
-							index: data.index,
-							flow: e.detail
-						})
-					}}
-					kind="trigger"
-					index={data?.index ?? 0}
-					modules={data?.modules ?? []}
-				/>
-			</div>
-		{/if}
 	{/if}
 
 	{#if data?.moving}
diff --git a/frontend/src/lib/components/graph/renderers/nodes/ForLoopEndNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/ForLoopEndNode.svelte
index d38367dbec..42b250dcbe 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/ForLoopEndNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/ForLoopEndNode.svelte
@@ -11,19 +11,35 @@
 		insertable: boolean
 		flowModuleStates: Record<string, GraphModuleState> | undefined
 		eventHandlers: GraphEventHandlers
+		simplifiedTriggerView: boolean
 	}
 </script>
 
 <NodeWrapper offset={data.offset} let:darkMode>
-	<VirtualItem
-		label={'Collect result of each iteration'}
-		selectable={true}
-		selected={false}
-		id={data.id}
-		bgColor={getStateColor(undefined, darkMode)}
-		borderColor={getStateColor(data.flowModuleStates?.[data.id]?.type, darkMode)}
-		on:select={(e) => {
-			data?.eventHandlers?.select(e.detail)
-		}}
-	/>
+	{#if data.simplifiedTriggerView}
+		<VirtualItem
+			label={'Each event is processed'}
+			selectable={false}
+			selected={false}
+			id={data.id}
+			hideId
+			bgColor={getStateColor(undefined, darkMode)}
+			borderColor={getStateColor(data.flowModuleStates?.[data.id]?.type, darkMode)}
+			on:select={(e) => {
+				data?.eventHandlers?.select(e.detail)
+			}}
+		/>
+	{:else}
+		<VirtualItem
+			label={'Collect result of each iteration'}
+			selectable={true}
+			selected={false}
+			id={data.id}
+			bgColor={getStateColor(undefined, darkMode)}
+			borderColor={getStateColor(data.flowModuleStates?.[data.id]?.type, darkMode)}
+			on:select={(e) => {
+				data?.eventHandlers?.select(e.detail)
+			}}
+		/>
+	{/if}
 </NodeWrapper>
diff --git a/frontend/src/lib/components/graph/renderers/nodes/ForLoopStartNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/ForLoopStartNode.svelte
index 4623342dd4..48d2c6a091 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/ForLoopStartNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/ForLoopStartNode.svelte
@@ -12,12 +12,13 @@
 		modules: FlowModule[]
 		flowModuleStates: Record<string, GraphModuleState> | undefined
 		eventHandlers: GraphEventHandlers
+		simplifiedTriggerView: boolean
 	}
 </script>
 
 <NodeWrapper let:darkMode offset={data.offset}>
 	<VirtualItem
-		label={'Do one iteration'}
+		label={data.simplifiedTriggerView ? 'For each new event' : 'Do one iteration'}
 		selectable={false}
 		selected={false}
 		id={data.id}
diff --git a/frontend/src/lib/components/graph/renderers/nodes/InputNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/InputNode.svelte
index 869fb8c00b..7fe4f499cc 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/InputNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/InputNode.svelte
@@ -15,7 +15,6 @@
 		moving: string | undefined
 		eventHandlers: GraphEventHandlers
 		index: number
-		enableTrigger: boolean
 		disableAi: boolean
 		disableMoveIds: string[]
 	}
@@ -50,6 +49,8 @@
 						detail: 'preprocessor'
 					})
 				}}
+				class="w-[14px] h-[14px]"
+				iconSize={10}
 			/>
 		</div>
 	{/if}
diff --git a/frontend/src/lib/components/graph/renderers/nodes/TriggersNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/TriggersNode.svelte
index 868c2cc26d..5f10bbc16b 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/TriggersNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/TriggersNode.svelte
@@ -1,9 +1,14 @@
 <script lang="ts">
 	import NodeWrapper from './NodeWrapper.svelte'
 	import TriggersWrapper from '../triggers/TriggersWrapper.svelte'
-	import { type GraphEventHandlers } from '../../graphBuilder'
+	import { type GraphEventHandlers, type SimplifiableFlow } from '../../graphBuilder'
+	import type { FlowModule } from '$lib/gen'
 	import { getContext } from 'svelte'
 	import type { Writable } from 'svelte/store'
+	import { Maximize2, Minimize2, Calendar } from 'lucide-svelte'
+	import { getStateColor } from '../../util'
+	import { setScheduledPollSchedule, type TriggerContext } from '$lib/components/triggers'
+	import VirtualItemWrapper from '$lib/components/flows/map/VirtualItemWrapper.svelte'
 
 	export let data: {
 		path: string
@@ -11,21 +16,107 @@
 		newFlow: boolean
 		extra_perms: Record<string, any>
 		eventHandlers: GraphEventHandlers
+		modules: FlowModule[]
+		index: number
+		disableAi: boolean
+		simplifiableFlow: SimplifiableFlow
 	}
 
 	const { selectedId } = getContext<{
 		selectedId: Writable<string | undefined>
 	}>('FlowGraphContext')
+
+	const { primarySchedule, triggersCount, selectedTrigger } =
+		getContext<TriggerContext>('TriggerContext')
 </script>
 
-<NodeWrapper wrapperClass="shadow-none">
-	<TriggersWrapper
-		path={data.path}
-		on:select={() => {
-			data?.eventHandlers?.select('triggers')
-		}}
-		isFlow={true}
-		selected={$selectedId == 'triggers'}
-		newItem={data.newFlow}
-	/>
+<NodeWrapper wrapperClass="shadow-md" let:darkMode>
+	{#if data.simplifiableFlow?.simplifiedFlow != true}
+		<TriggersWrapper
+			disableAi={data.disableAi}
+			isEditor={data.isEditor}
+			path={data.path}
+			bgColor={getStateColor(undefined, darkMode)}
+			on:new={(e) => {
+				data?.eventHandlers.insert({
+					modules: data.modules,
+					index: 0,
+					kind: 'trigger',
+					inlineScript: e.detail.inlineScript
+				})
+				data?.eventHandlers?.simplifyFlow(true)
+			}}
+			on:pickScript={(e) => {
+				data?.eventHandlers.insert({
+					modules: data.modules,
+					index: 0,
+					kind: 'trigger',
+					script: e.detail
+				})
+				data?.eventHandlers?.simplifyFlow(true)
+			}}
+			on:openScheduledPoll={(e) => {
+				$selectedTrigger = 'scheduledPoll'
+			}}
+			on:select={(e) => {
+				data?.eventHandlers?.select('triggers')
+			}}
+			on:delete={(e) => {
+				data.eventHandlers.delete(e, '')
+			}}
+			selected={$selectedId == 'triggers'}
+			newItem={data.newFlow}
+			modules={data.modules}
+		/>
+	{:else}
+		<VirtualItemWrapper
+			label="Check for new events"
+			selectable={true}
+			selected={$selectedId == 'triggers'}
+			id={'triggers'}
+			bgColor={getStateColor(undefined, darkMode)}
+			on:select={(e) => {
+				data?.eventHandlers?.select(e.detail)
+			}}
+		>
+			{#if $primarySchedule || ($primarySchedule == undefined && $triggersCount?.primary_schedule?.schedule)}
+				<div class="text-2xs text-primary p-2 flex gap-2 items-center">
+					<Calendar size={12} />
+					<div>
+						Schedule every {$primarySchedule?.cron ?? $triggersCount?.primary_schedule?.schedule}
+						{$primarySchedule?.enabled ||
+						($primarySchedule == undefined && $triggersCount?.primary_schedule?.schedule)
+							? ''
+							: ' (disabled)'}
+					</div>
+				</div>
+			{:else}
+				<button
+					class="px-2 py-1 hover:bg-surface-inverse w-full hover:text-primary-inverse"
+					on:click={() => {
+						setScheduledPollSchedule(primarySchedule, triggersCount)
+					}}
+				>
+					Set primary schedule
+				</button>
+			{/if}
+		</VirtualItemWrapper>
+	{/if}
+	{#if data.simplifiableFlow != undefined}
+		<button
+			class="absolute -top-[10px] -right-[10px] rounded-full h-[20px] w-[20px] trash center-center text-secondary
+outline-[1px] outline dark:outline-gray-500 outline-gray-300 bg-surface duration-150 hover:bg-nord-950 hover:text-white"
+			on:click|preventDefault|stopPropagation={() =>
+				data?.eventHandlers?.simplifyFlow(!data.simplifiableFlow?.simplifiedFlow)}
+			title={data.simplifiableFlow?.simplifiedFlow
+				? 'Expand to full flow view'
+				: 'Simplify flow view for scheduled poll'}
+		>
+			{#if data.simplifiableFlow?.simplifiedFlow}
+				<Maximize2 size={12} strokeWidth={2} />
+			{:else}
+				<Minimize2 size={12} strokeWidth={2} />
+			{/if}
+		</button>
+	{/if}
 </NodeWrapper>
diff --git a/frontend/src/lib/components/graph/renderers/triggers/TriggerButton.svelte b/frontend/src/lib/components/graph/renderers/triggers/TriggerButton.svelte
index 7f052670b2..ef82a1b17d 100644
--- a/frontend/src/lib/components/graph/renderers/triggers/TriggerButton.svelte
+++ b/frontend/src/lib/components/graph/renderers/triggers/TriggerButton.svelte
@@ -7,7 +7,7 @@
 <button
 	on:click
 	class={twMerge(
-		'hover:bg-surface-hover rounded-md border text-xs w-6 h-6 relative center-center cursor-pointer bg-surface',
+		'hover:bg-surface-hover rounded-md border text-xs w-[23px] h-[23px] relative center-center cursor-pointer bg-surface',
 		selected ? 'outline-1 outline-tertiary outline' : 'outline-0'
 	)}
 >
diff --git a/frontend/src/lib/components/graph/renderers/triggers/TriggersBadge.svelte b/frontend/src/lib/components/graph/renderers/triggers/TriggersBadge.svelte
index ae4be3a994..ace322ad65 100644
--- a/frontend/src/lib/components/graph/renderers/triggers/TriggersBadge.svelte
+++ b/frontend/src/lib/components/graph/renderers/triggers/TriggersBadge.svelte
@@ -18,6 +18,8 @@
 	export let isFlow: boolean
 	export let selected: boolean
 	export let showOnlyWithCount: boolean
+	export let triggersToDisplay: ('webhooks' | 'schedules' | 'routes' | 'websockets' | 'emails')[] =
+		['webhooks', 'schedules', 'routes', 'websockets', 'emails']
 	const dispatch = createEventDispatcher()
 
 	onMount(() => {
@@ -39,84 +41,31 @@
 			})
 		}
 	}
+
+	const triggerTypeConfig = {
+		webhooks: { icon: Webhook, countKey: 'webhook_count' },
+		schedules: { icon: Calendar, countKey: 'schedule_count' },
+		routes: { icon: Route, countKey: 'http_routes_count' },
+		websockets: { icon: Unplug, countKey: 'websocket_count' },
+		emails: { icon: Mail, countKey: 'email_count' }
+	}
 </script>
 
-{#if !showOnlyWithCount || ($triggersCount?.webhook_count ?? 0) > 0}
-	<Popover>
-		<svelte:fragment slot="text">Webhooks</svelte:fragment>
-		<TriggerButton
-			on:click={() => {
-				$selectedTrigger = 'webhooks'
-				dispatch('select')
-			}}
-			selected={selected && $selectedTrigger === 'webhooks'}
-		>
-			<TriggerCount count={$triggersCount?.webhook_count} />
-			<Webhook size={12} />
-		</TriggerButton>
-	</Popover>
-{/if}
-
-{#if !showOnlyWithCount || ($triggersCount?.schedule_count ?? 0) > 0}
-	<Popover>
-		<svelte:fragment slot="text">Schedules</svelte:fragment>
-		<TriggerButton
-			on:click={() => {
-				$selectedTrigger = 'schedules'
-				dispatch('select')
-			}}
-			selected={selected && $selectedTrigger === 'schedules'}
-		>
-			<TriggerCount count={$triggersCount?.schedule_count} />
-			<Calendar size={12} />
-		</TriggerButton>
-	</Popover>
-{/if}
-
-{#if !showOnlyWithCount || ($triggersCount?.http_routes_count ?? 0) > 0}
-	<Popover>
-		<svelte:fragment slot="text">HTTP Routes</svelte:fragment>
-		<TriggerButton
-			on:click={() => {
-				$selectedTrigger = 'routes'
-				dispatch('select')
-			}}
-			selected={selected && $selectedTrigger === 'routes'}
-		>
-			<TriggerCount count={$triggersCount?.http_routes_count} />
-			<Route size={12} />
-		</TriggerButton>
-	</Popover>
-{/if}
-
-{#if !showOnlyWithCount || ($triggersCount?.websocket_count ?? 0) > 0}
-	<Popover>
-		<svelte:fragment slot="text">Websockets</svelte:fragment>
-		<TriggerButton
-			on:click={() => {
-				$selectedTrigger = 'websockets'
-				dispatch('select')
-			}}
-			selected={selected && $selectedTrigger === 'websockets'}
-		>
-			<TriggerCount count={$triggersCount?.websocket_count} />
-			<Unplug size={12} />
-		</TriggerButton>
-	</Popover>
-{/if}
-
-{#if !showOnlyWithCount || ($triggersCount?.email_count ?? 0) > 0}
-	<Popover>
-		<svelte:fragment slot="text">Emails</svelte:fragment>
-		<TriggerButton
-			on:click={() => {
-				$selectedTrigger = 'emails'
-				dispatch('select')
-			}}
-			selected={selected && $selectedTrigger === 'emails'}
-		>
-			<TriggerCount count={$triggersCount?.email_count} />
-			<Mail size={12} />
-		</TriggerButton>
-	</Popover>
-{/if}
+{#each triggersToDisplay as type}
+	{@const { icon, countKey } = triggerTypeConfig[type]}
+	{#if !showOnlyWithCount || ($triggersCount?.[countKey] ?? 0) > 0}
+		<Popover>
+			<svelte:fragment slot="text">{type.charAt(0).toUpperCase() + type.slice(1)}</svelte:fragment>
+			<TriggerButton
+				on:click={() => {
+					$selectedTrigger = type
+					dispatch('select')
+				}}
+				selected={selected && $selectedTrigger === type}
+			>
+				<TriggerCount count={$triggersCount?.[countKey]} />
+				<svelte:component this={icon} size={12} />
+			</TriggerButton>
+		</Popover>
+	{/if}
+{/each}
diff --git a/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte b/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte
index 4f8bbc5f14..2beb967b08 100644
--- a/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte
+++ b/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte
@@ -4,29 +4,51 @@
 	import { createEventDispatcher } from 'svelte'
 
 	import TriggersBadge from './TriggersBadge.svelte'
+	import InsertModuleButton from '$lib/components/flows/map/InsertModuleButton.svelte'
+	import type { FlowModule } from '$lib/gen'
+	import { twMerge } from 'tailwind-merge'
 
 	export let path: string
 	export let newItem: boolean
-	export let isFlow: boolean
 	export let selected: boolean
+	export let isEditor: boolean = false
+	export let disableAi: boolean = false
+	export let modules: FlowModule[] = []
+	export let bgColor: string
 
 	const dispatch = createEventDispatcher()
 </script>
 
 <div style={`width: ${NODE.width}px;`}>
-	<div class="flex flex-row mx-auto w-min">
-		<button
-			class="flex flex-row gap-2 px-2 border p-1 rounded-md bg-surface shadow-md items-center {selected
-				? 'outline outline-offset-1 outline-1  outline-slate-900 dark:bg-white/5 dark:outline-slate-800/60 dark:border-gray-400'
-				: ''}"
-			on:click={() => {
-				dispatch('select')
-			}}
-		>
-			<div class="flex flex-col">
-				<div class="flex flex-row items-center text-2xs font-normal"> Triggers </div>
-			</div>
-			<TriggersBadge showOnlyWithCount={false} {path} {newItem} {isFlow} {selected} on:select />
-		</button>
-	</div>
+	<button
+		style="background-color: {bgColor} !important;"
+		class="flex w-full flex-row gap-2 px-2 p-1 items-center {selected
+			? 'outline  outline-2  outline-gray-600 rounded-sm dark:bg-white/5 dark:outline-gray-400'
+			: ''}"
+		on:click={() => {
+			dispatch('select')
+		}}
+	>
+		<div class="flex flex-col mr-1 ml-1">
+			<div class="flex flex-row items-center text-2xs font-normal"> Triggers </div>
+		</div>
+		<TriggersBadge showOnlyWithCount={false} {path} {newItem} isFlow {selected} on:select />
+		{#if isEditor}
+			<InsertModuleButton
+				{disableAi}
+				on:new
+				on:pickScript
+				on:select
+				on:open={() => {
+					dispatch('openScheduledPoll')
+				}}
+				kind="trigger"
+				index={0}
+				{modules}
+				class={twMerge(
+					'hover:bg-surface-hover rounded-md border text-xs w-[23px] h-[23px] relative center-center cursor-pointer bg-surface outline-0'
+				)}
+			/>
+		{/if}
+	</button>
 </div>
diff --git a/frontend/src/lib/components/icons/SchedulePollIcon.svelte b/frontend/src/lib/components/icons/SchedulePollIcon.svelte
new file mode 100644
index 0000000000..df8f258106
--- /dev/null
+++ b/frontend/src/lib/components/icons/SchedulePollIcon.svelte
@@ -0,0 +1,36 @@
+<script>
+	// You can pass props for flexibility (e.g., size, color)
+	export let size = 24
+</script>
+
+<svg
+	width={size}
+	height={size}
+	viewBox="0 0 24 24"
+	fill="none"
+	xmlns="http://www.w3.org/2000/svg"
+	stroke="currentColor"
+	stroke-width="1.5"
+	stroke-linecap="round"
+	stroke-linejoin="round"
+>
+	<path d="M4.96046 2.04913L6.96046 2.04913" />
+	<path d="M5.96046 8.94553L4.96046 7.94553" />
+	<path d="M13.1611 13.8974L17.2173 13.8974" />
+	<path
+		d="M20.4622 12.2749V9.84124C20.4622 9.62608 20.3767 9.41975 20.2246 9.26761C20.0725 9.11547 19.8661 9.03001 19.651 9.03001H18.0285C17.8134 9.03001 17.607 9.11547 17.4549 9.26761C17.3028 9.41975 17.2173 9.62608 17.2173 9.84124V12.2749"
+	/>
+	<path
+		d="M20.8678 22.0097C21.1906 22.0097 21.5001 21.8632 21.7283 21.6024C21.9565 21.3415 22.0847 20.9878 22.0847 20.619V17.9412C22.0847 16.9747 20.8678 15.8816 20.8678 14.5834V12.9703C20.8678 12.7858 20.8037 12.609 20.6896 12.4786C20.5755 12.3482 20.4208 12.2749 20.2594 12.2749H17.8257C17.6644 12.2749 17.5096 12.3482 17.3955 12.4786C17.2814 12.609 17.2173 12.7858 17.2173 12.9703V20.619C17.2173 20.9878 17.3455 21.3415 17.5737 21.6024C17.8019 21.8632 18.1114 22.0097 18.4341 22.0097H20.8678Z"
+	/>
+	<path d="M22.0847 18.7648H8.29377" />
+	<path
+		d="M9.51061 22.0097C9.18789 22.0097 8.87838 21.8632 8.65018 21.6024C8.42197 21.3415 8.29377 20.9878 8.29377 20.619V17.9412C8.29377 16.9747 9.51061 15.8816 9.51061 14.5834V12.9703C9.51061 12.7858 9.57472 12.609 9.68882 12.4786C9.80292 12.3482 9.95767 12.2749 10.119 12.2749H12.5527C12.7141 12.2749 12.8688 12.3482 12.9829 12.4786C13.097 12.609 13.1611 12.7858 13.1611 12.9703V20.619C13.1611 20.9878 13.0329 21.3415 12.8047 21.6024C12.5765 21.8632 12.267 22.0097 11.9443 22.0097H9.51061Z"
+	/>
+	<path
+		d="M13.1611 12.2749V9.84124C13.1611 9.62608 13.0757 9.41975 12.9235 9.26761C12.7714 9.11547 12.5651 9.03001 12.3499 9.03001H10.7275C10.5123 9.03001 10.306 9.11547 10.1538 9.26761C10.0017 9.41975 9.91622 9.62608 9.91622 9.84124V12.2749"
+	/>
+	<path
+		d="M8.78889 6.11711C8.30848 5.63669 7.71362 5.28656 7.0604 5.09974C6.40719 4.91291 5.71715 4.89555 5.05536 5.04928C4.39358 5.20301 3.78186 5.52278 3.27789 5.97842C2.77392 6.43406 2.39431 7.01056 2.17486 7.65355C1.95542 8.29654 1.90337 8.98483 2.02362 9.65351C2.14387 10.3222 2.43246 10.9492 2.86217 11.4755C3.29188 12.0017 3.84856 12.4098 4.47969 12.6614C5.11083 12.9129 5.79563 12.9995 6.46951 12.913"
+	/>
+</svg>
diff --git a/frontend/src/lib/components/icons/index.ts b/frontend/src/lib/components/icons/index.ts
index da7e21ea91..e1db41c53e 100644
--- a/frontend/src/lib/components/icons/index.ts
+++ b/frontend/src/lib/components/icons/index.ts
@@ -19,6 +19,7 @@ import Slack from './Slack.svelte'
 import TogglIcon from './TogglIcon.svelte'
 import WindmillIcon from './WindmillIcon.svelte'
 import WindmillIcon2 from './WindmillIcon2.svelte'
+import SchedulePollIcon from './SchedulePollIcon.svelte'
 import MailchimpIcon from './MailchimpIcon.svelte'
 import SendgridIcon from './SendgridIcon.svelte'
 import SendflakeIcon from './SendflakeIcon.svelte'
@@ -215,6 +216,7 @@ export {
 	TogglIcon,
 	WindmillIcon,
 	WindmillIcon2,
+	SchedulePollIcon,
 	MailchimpIcon,
 	SendgridIcon,
 	LinkedinIcon,
diff --git a/frontend/src/lib/components/triggers.ts b/frontend/src/lib/components/triggers.ts
index a7a7735160..4c06603f20 100644
--- a/frontend/src/lib/components/triggers.ts
+++ b/frontend/src/lib/components/triggers.ts
@@ -10,7 +10,31 @@ export type ScheduleTrigger = {
 }
 
 export type TriggerContext = {
-	selectedTrigger: Writable<'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets'>
+	selectedTrigger: Writable<
+		'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets' | 'scheduledPoll'
+	>
 	primarySchedule: Writable<ScheduleTrigger | undefined | false>
 	triggersCount: Writable<TriggersCount | undefined>
+	simplifiedPoll: Writable<boolean | undefined>
+}
+
+export function setScheduledPollSchedule(
+	primarySchedule: Writable<ScheduleTrigger | undefined | false>,
+	triggersCount: Writable<TriggersCount | undefined>
+) {
+	const cron = '0 */5 * * * *'
+	primarySchedule.set({
+		enabled: true,
+		summary: 'Check for new events every 5 minutes',
+		cron: cron,
+		timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+		args: {}
+	})
+	triggersCount.update((triggersCount) => {
+		return {
+			...(triggersCount ?? {}),
+			schedule_count: (triggersCount?.schedule_count ?? 0) + 1,
+			primary_schedule: { schedule: cron }
+		}
+	})
 }
diff --git a/frontend/src/lib/components/triggers/ScheduledPollPanel.svelte b/frontend/src/lib/components/triggers/ScheduledPollPanel.svelte
new file mode 100644
index 0000000000..b373d75302
--- /dev/null
+++ b/frontend/src/lib/components/triggers/ScheduledPollPanel.svelte
@@ -0,0 +1,41 @@
+<script lang="ts">
+	import Alert from '$lib/components/common/alert/Alert.svelte'
+	import Label from '$lib/components/Label.svelte'
+	import { base } from '$lib/base'
+
+	$: console.log('dbg base', base)
+</script>
+
+<div class="flex flex-col w-full gap-4 text-sm">
+	<Alert
+		title="Scheduled Poll"
+		size="xs"
+		documentationLink="https://www.windmill.dev/docs/flows/flow_trigger"
+	>
+		Sheduled Poll is a trigger that polls an external API at a given interval. It is useful for
+		triggering jobs based on the change of external states. Under the hood, it is a script triggered
+		by a schedule, and returning a list of the changed states so we can iterate over them.
+	</Alert>
+
+	<Label label="Setting a scheduled poll" primary>
+		<ul class="pt-4 space-y-2 text-sm">
+			<li>
+				1. Chose a trigger script using the script picker that will poll for new events regularly <img
+					class="shadow-lg rounded"
+					alt="script picker"
+					src="{base}/script-picker.png"
+					width="400"
+				/>
+			</li>
+
+			<li>
+				2. Add logic to process each new event <img
+					class="shadow-lg rounded"
+					alt="create action"
+					src="{base}/create_action.png"
+					width="500"
+				/>
+			</li>
+		</ul>
+	</Label>
+</div>
diff --git a/frontend/src/lib/components/triggers/TriggersEditor.svelte b/frontend/src/lib/components/triggers/TriggersEditor.svelte
index e442624ed8..0c6b2ebe78 100644
--- a/frontend/src/lib/components/triggers/TriggersEditor.svelte
+++ b/frontend/src/lib/components/triggers/TriggersEditor.svelte
@@ -11,6 +11,7 @@
 	import { getContext } from 'svelte'
 	import type { TriggerContext } from '$lib/components/triggers'
 	import WebsocketTriggersPanel from './WebsocketTriggersPanel.svelte'
+	import ScheduledPollPanel from './ScheduledPollPanel.svelte'
 
 	export let noEditor: boolean
 	export let newItem = false
@@ -19,67 +20,88 @@
 	export let schema: any
 	export let isFlow: boolean
 
-	const { selectedTrigger } = getContext<TriggerContext>('TriggerContext')
+	const { selectedTrigger, simplifiedPoll } = getContext<TriggerContext>('TriggerContext')
 </script>
 
 <FlowCard {noEditor} title="Triggers">
 	<div class="pt-4">
-		<Tabs bind:selected={$selectedTrigger}>
-			<Tab value="webhooks" selectedClass="text-primary font-semibold">Webhooks</Tab>
-			<Tab value="schedules" selectedClass="text-primary text-sm font-semibold">Schedules</Tab>
-			<Tab value="routes" selectedClass="text-primary text-sm font-semibold">Routes</Tab>
-			<Tab value="websockets" selectedClass="text-primary text-sm font-semibold">Websockets</Tab>
-			<Tab value="emails" selectedClass="text-primary text-sm font-semibold">Email</Tab>
+		{#if !$simplifiedPoll}
+			<Tabs bind:selected={$selectedTrigger}>
+				<Tab value="webhooks" selectedClass="text-primary font-semibold">Webhooks</Tab>
+				<Tab value="schedules" selectedClass="text-primary text-sm font-semibold">Schedules</Tab>
+				<Tab value="routes" selectedClass="text-primary text-sm font-semibold">Routes</Tab>
+				<Tab value="websockets" selectedClass="text-primary text-sm font-semibold">Websockets</Tab>
+				<Tab value="emails" selectedClass="text-primary text-sm font-semibold">Email</Tab>
+				<Tab value="scheduledPoll" selectedClass="text-primary text-sm font-semibold"
+					>Scheduled Poll</Tab
+				>
 
-			<svelte:fragment slot="content">
-				{#if $selectedTrigger === 'webhooks'}
-					<div class="p-4">
-						<WebhooksPanel
-							scopes={isFlow ? [`run:flow/${currentPath}`] : [`run:script/${currentPath}`]}
-							path={currentPath}
-							{isFlow}
-							args={{}}
-							token=""
-							{newItem}
-						/>
-					</div>
-				{/if}
+				<svelte:fragment slot="content">
+					{#if $selectedTrigger === 'webhooks'}
+						<div class="p-4">
+							<WebhooksPanel
+								scopes={isFlow ? [`run:flow/${currentPath}`] : [`run:script/${currentPath}`]}
+								path={currentPath}
+								{isFlow}
+								args={{}}
+								token=""
+								{newItem}
+							/>
+						</div>
+					{/if}
 
-				{#if $selectedTrigger === 'emails'}
-					<div class="p-4">
-						<EmailTriggerPanel
-							token=""
-							scopes={isFlow ? [`run:flow/${currentPath}`] : [`run:script/${currentPath}`]}
-							path={currentPath}
-							{isFlow}
-						/>
-					</div>
-				{/if}
+					{#if $selectedTrigger === 'emails'}
+						<div class="p-4">
+							<EmailTriggerPanel
+								token=""
+								scopes={isFlow ? [`run:flow/${currentPath}`] : [`run:script/${currentPath}`]}
+								path={currentPath}
+								{isFlow}
+							/>
+						</div>
+					{/if}
 
-				{#if $selectedTrigger === 'routes'}
-					<div class="p-4">
-						<RoutesPanel {newItem} path={currentPath} {isFlow} />
-					</div>
-				{/if}
+					{#if $selectedTrigger === 'routes'}
+						<div class="p-4">
+							<RoutesPanel {newItem} path={currentPath} {isFlow} />
+						</div>
+					{/if}
 
-				{#if $selectedTrigger === 'websockets'}
-					<div class="p-4">
-						<WebsocketTriggersPanel {newItem} path={currentPath} {isFlow} />
-					</div>
-				{/if}
+					{#if $selectedTrigger === 'websockets'}
+						<div class="p-4">
+							<WebsocketTriggersPanel {newItem} path={currentPath} {isFlow} />
+						</div>
+					{/if}
 
-				{#if $selectedTrigger === 'schedules'}
-					<div class="p-2">
-						<RunPageSchedules
-							{schema}
-							{isFlow}
-							path={initialPath}
-							{newItem}
-							can_write={canWrite(currentPath, {}, $userStore)}
-						/>
-					</div>
-				{/if}
-			</svelte:fragment>
-		</Tabs>
+					{#if $selectedTrigger === 'schedules'}
+						<div class="p-4">
+							<RunPageSchedules
+								{schema}
+								{isFlow}
+								path={initialPath}
+								{newItem}
+								can_write={canWrite(currentPath, {}, $userStore)}
+							/>
+						</div>
+					{/if}
+
+					{#if $selectedTrigger === 'scheduledPoll'}
+						<div class="p-4">
+							<ScheduledPollPanel />
+						</div>
+					{/if}
+				</svelte:fragment>
+			</Tabs>
+		{:else}
+			<div class="px-4 pb-2">
+				<RunPageSchedules
+					{schema}
+					{isFlow}
+					path={initialPath}
+					{newItem}
+					can_write={canWrite(currentPath, {}, $userStore)}
+				/>
+			</div>
+		{/if}
 	</div>
 </FlowCard>
diff --git a/frontend/src/routes/flows/dev/+page.svelte b/frontend/src/routes/flows/dev/+page.svelte
index 2db4421e8a..fa984f0fd4 100644
--- a/frontend/src/routes/flows/dev/+page.svelte
+++ b/frontend/src/routes/flows/dev/+page.svelte
@@ -74,12 +74,13 @@
 	const primaryScheduleStore = writable<ScheduleTrigger | undefined | false>(undefined)
 	const triggersCount = writable<TriggersCount | undefined>(undefined)
 	const selectedTriggerStore = writable<
-		'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets'
+		'webhooks' | 'emails' | 'schedules' | 'cli' | 'routes' | 'websockets' | 'scheduledPoll'
 	>('webhooks')
 	setContext<TriggerContext>('TriggerContext', {
 		primarySchedule: primaryScheduleStore,
 		selectedTrigger: selectedTriggerStore,
-		triggersCount: triggersCount
+		triggersCount: triggersCount,
+		simplifiedPoll: writable(false)
 	})
 
 	setContext<FlowEditorContext>('FlowEditorContext', {
diff --git a/frontend/static/create_action.png b/frontend/static/create_action.png
new file mode 100644
index 0000000000000000000000000000000000000000..97229c29e999beb2d598658df817f52e16b156de
GIT binary patch
literal 40254
zcmeFYXIzs(*YF9VV4<jpNLK+-0qKMmP*D&O5NU>vNGBjQK!AWKSV8F>>C%y26N-xT
z9(qC#A%sXv2qDSF`+47I_uKBizuix}ACgI~T$7pW%$aj$&iT*#r-r&5XZg=EF)?xI
zJ$mqriRr`u;}v<Dm2pLzm-?MioO$&K<j2Hxj{Dz>nJGQ<3gaTP-!t9&OqD}|SjLx=
zF82)XF){s!J9q4Giis(6T<^g>(;#O20$Zrn<V??wE=uwT_uPB@R=f6TD8Y;<C6t&v
znS9@_1#6$gIs5GKIiaVIL4}F!BzDO+OxK`<C9&9*c5pjJbu397^z3Dic5=9#=KY%W
zB!3|~!7m3ItN&n^(GJtyN0q7sIN>tmBhxkUGmQ6$>eGz=Gu=IT(wR|QJ#j*TQJiOv
z<YN@?B0AU^#e=){{~qr8Raq8Bap8O_Go#w+|I5`LU0~cEv>vFh?U<klXnf?SU#nXG
z*s5&KdcoN{usL4r){J<`t={#-+a)Ep;=g7W0ZxDW_vcsdC@CsF4hxH#$k=<NsM6T*
zj!`X2kz6@E@F-<qfW221^T_jGug_a3icKMrdI=>r)yKw725&7yqy0_pA#eLWi!WBF
zuc#O_&k-2Z(++gZ&rS!AAWhPny#oW2IffrS`A>CT%O{H!r6qE?Qzqib%O5i{J^56w
z&atk(QdB7}E}j|h$drO+v2K)ZT9%ZQ)OWU)<n_J5u=+t`3kojgT;xEjFfnbA+;N+Q
zH8r!ghK~*7+vb_&RlL9XC$VlFcQzAEy}Eqg277TVb8xK1dt|GtOPYL9`S*n1?8=mr
z7TrzGn9r)o)xG*swUDRo`gcemRdf!r-B2OSKQL!G_cEfyT2xN9T#(U9<L$E2Fo)pk
z5>{TWK?1URYXmcaK~6nAN<W%?#QyJLMr7Qanj0EWw!-pauqsR0yuzy7s>1#H0KW6|
z|1^mn&2}oTDQ8BiKCc37c&O%rQtqXk+WGu%q>p%nIJ#9kjI6{$6r|Mmm9mKJHp!O}
z*S5~X{;RvAxhsjni&FyND@z+5IQc^v?q%+OnzApTcI!PSp-8(2>v|<@F!ql_^1~Fp
z6po$u4r>hELgaS0+!AtWZq@02-teO0n3CJ0UT4;{unxQP)x=QanV|;p@0YkqrxB-H
zGF5f`zda*%-k)XY;Rdh&tb0~~k;`A)wmCb*YGn9^RI9bJjJ}&2=x5Jn&4#>Ea4}Nn
zIJfIx=T8-{-79Y0HZ-~MIZ5mIs0W^drrN_b4z|jOHJ8(3E^(q({5ItANNnw(yz|R~
zbIa#={wWXTNpB;{s$FP0N@0r}v)0SqGjrBYG1IB0-xaEQ-snG?xUQtAJhQjIZ>nd2
zPZL_DIgqy$3=_YKe#j3mzmsq$!#9~{C+eRBU)a`?BHH%%v)v%4Is0`5TM+)qwVs2Y
zdIcf><Bu8@=k~HUxVB@f%QKz){`Y!*`ei^P!g}DRU-}m0u3f%jVUhF6x}OE_@TKv|
zhfMtap4|^pb^%?`x+2b)g+JRG%!ecW7ZwnitGj|o$nTP#-cen_E3YzQvv)EC;4-7W
z$%7#CpIrZ@^SfX#!rk5lCD41v&BPtwIccqg?M0~!^`NIN`_Qn<sRHSig@yGGEkVVM
z>3zQYs34}f0S@BNIMdIVgpX0k_sE9!b6nmCb)(8wav%uqTjAfROsHwL7QBAhJA^7w
zpR}eNFVAQvoBMu7I#J`quNoeYH4Nf70Z1YtGviigcx_W=XVu(rk)>G*nbyyI>&COb
zAvO*=%EA9EW7bmL9f0Dts;=jB6KE5+iEq}9iG^<e0&F=6sTo33TCMT{vc*MW=a%)W
z*qmo&85-pxE&=6ib$9hl9NMh(NhTF^ss}*aAD3Q*kGy1v=S8;Uj7dG%({*E@J49Nl
zOvgKwP*T!53OUqaX1Y6|Z%8x+TUlBb{wM*BjT5bZEi}1hNZB?2w%x{7ms9&ce@4xm
z9v?rs^Y)(>z6(}+q*K%AYXt(;_E2yW*V=iK&CCKSfWs5mA2x#fyx!j#hA|@inz)jI
zrGa>3QKfD4pKsNqxgWLGnSVBwdqGz6nGK&Vakn6LCik|a!WT-4ehZ{3D4g7h`7bSh
z_UxJXEmhF0rInLQu+ub!<JLgqJ<!|R#6SphQ(NBSbSq2o!8beX6|$n+P3vux@G8R~
zThJUi--=<0P4)c}6p>ROC2#5J#7QNu7Qid0*q7os0JwHVjjK=K(OXqRV+V!-r$#q8
zi4}`|oI5!QE_523Y9P#myM1+Z_#ISZFEDKST||8L_L(BJZJz?<r|hDND{3C!_)`-^
z-`V}guv9h0n}|twbEiuhxGva$B-<-WiwyhP9e@Bx1Tgjd&d2{)kgSP1e?5JYpnao<
zMQ~NLGe^IA;8slv+v-dGK=Y!j@c(KkF+JPCFkA1wq9REL8r|Ta;-IRoZo<m`=kiZ2
zq6ouXgiA^TO{~`uMZb0CvPY*!ZvJ|BYC$t3IyO3&?NAliZwa~~CBgYmxi_Zj#>%54
z0ZNL~EX-5h^EX)7)*me`T4Oma%__f_H{?6q#Dj`BM1TBqTXzw~z`<L+y<^kUS1Y6|
z8fL9+Y$R20Os}u6KMJvQFV3!NZvJHmsZcn?7KlBLi5(x6Rq2q~`TLnMzD?iqU0%Li
zo9;D8&q&|;6k#^0L`;m2m%{S#F`Sl{;jMV*6LsSax%kWcUl`s-a^myn5O*T5YG^Sf
zE9;j^|Cvw!1ho9Y&?~PvIoVkt+sfd)mz>%1WfSSjiud7)p9enq3&f{w^Z&;ur7&~?
z-wQt5&G25!$~+h(^0JBXWuI0&eT!;cDW>;0P_MM)esMabIQ@ffbS!+y_soAe%}TfJ
z$wevt=qRuL!J?2)z>lpysVUM{*QRXf9#B-$97AK6U_QL50Iyl8fPesEn`9%)BPp+1
zed1b*T}p~=h*<+znum$$bu&ZJ;8r2VPT+k1Vk0e^tAw__Y|n*;1>v>ZM_zSne^j|H
z`$L~Si%-17m6RW=X6-zjEe@>6h2Og@1G<d^cqVcPDC-9pd}bFhzn-rfm#D}6yZ_zS
z?n3o;^16E9%2h2bJ3}q}%lG00n5>0)g{7#f>WnX{*+mcX3Pl*XroEbIVtD@NWsc&#
z^|0$X($8<IL$)UD?%v{mc9TuGDQBy8n0>~I&`!!Nx2-jgRXsY*r{w<9G;XHG>Ek@H
z7%|gt5r*;QQ*f?px3;npjRVpKghg^PG9+Dc0@D3|ZBBZuwv#Y@iM<J{-=c^q?UP9)
zk>30`&07Hn2fKwb*&e#Q(*l!ble??q!+P5tk-p}<S~A}xM&ct~_i@7OV`KQ;oEVXW
z_S|dGy<{*k`0?Wph2LGj?<a!i9<O=B5Iv?%IF?E~^ZKracWwJ)9=>&Fwu{s3ahpXf
z9Ldslw>+jQQ`+tY%kicvNy%8&naU4{EN`D37@{mFx=Kc>{+`GHsy8ms0Jmh&La)Mp
zZJ!0fUnH@^JYuZ_*4E<FlW*A6yY5`%zCYEw6-Ii0B&VNJS%+!a(U_Haxjo<9Uzr1q
zPfD6u>u7UZxlG{)rKK%gOl{qziIRh8E=2SnnQU0>R>kI~JE-Z^durpm4)$*d>{Mj%
z=aPc&y(TyMreuz4$l4jVtJ;pD+m1Ffe3$il`t&4(r<UY88vy{N{xB|0ss5A-#iX<V
z;N?_{3TtTy+7D5D*2~q*O!97TuU?Js8o!&XYxNWYT)H;*r2hDWB>c|ZHdhaiBrUX0
zij0)UpG;N9mbzxELEF5yV`F32GXUO6u=#*0>#&2yyl~qJOB93-+hVow(fe8u+#Tp%
zimA@#8nFGuApq!4xuYSo<tGJdna_?BQh#h6Zh}2xqvYjXTW{93$Ysr7x*}asjdr97
zjl9zETmNU1q^fG?8A4CswGB0cQ!Dhv#hr%f8jv0esc|6mGJpKAI*GlvZ>XVvWMblF
zvchDn8)eH+CavrKS3%!D_l$w)kL&Fl2p@^eSD!#P2+)H&b6&N%`&uTQntS^u12w$o
zn10rT3#EFr?KQ^<%FRbRVSLTalYv~~hk;?4w#W`^D*@{Cr>uiN^z6TH*Gv$vUJF9E
zMwuHu>W>NZ!;~yz*I#{R#JGdS&Zv{`*!(czp0^vEh`ZGezkClMm4D6Rhc&3C<Zduz
z`tjZoN5;$Ecqe)AY~uH95}DWbM_luy25m!>tJds=nX&P$Mk>~D<^@r>M4L-h_T|Ud
ztOo|D6}}>aEWuZEl{WZD@?&oMT0h^H-eJTUOhbBQu^zX?pJ|_b{K2+z<1q;l*MDrJ
zS*wL`D#bG%cuP3P+Zzq5rUPkp97`=1d}zTgv+sqU7&btoghMxsTOF#dh0v+Qg_Ue3
zj-TFb<k)tN;Ww{1em{=Eg;4Mid~_r&<M5Ds*xz0B4Aas5d7*uPQ=eEfIYp}xW7FI&
zu~GTwL*H#^aMv3jp{|;-K4M{t^(uwD5~ub4Ff-uBytguJL+Op{L1k@&H`*bkOd&m;
z-)RmBu5s+)++%}FZ}wor0$A+3qdz~hGGTaWk9VU}V;{^5oJJE+jgl=#wk<2c`N1$6
zX*^+0=;$d6zIO89ZnvId|2o||1Rl_D4r&Z+w=uVg%cMM5h9O+1+EZ-97a*XrESiI)
zs6zMFuD5q@@Xp$ln5C{rSQ9ntnfGw8-DMeDXBm&v<JI4pcMn%$<Cm95ps|_lrtW>K
z9UayU9w`K0$Qvgmx3M6TEMSK%lEV?){fv<IxSBiJ1+UP}I_A2Cr*H+*nq6j-&)AS?
zlt0{X;tv>VFM^}L#bvS0Z|F<n1kgxM<CT4Ero;UjR?meiE%ZqGEH0oq8%lE$NDf%R
z)|oh#nXxn7cMx2+eQL8Hd@+Vo=pr#(R5!Ld7Zf${rK{@;DNT!RLeWK@S>#+`Qo&Df
z8~nX<mU7Hr>Ms`Ya6QgF0Z@(==@8}AdSJ*t3SWNS=+&-49XJ=5(yRr1y3=)TD5>k(
zscRy|1nraqp}m-St!YlaXIH9y&Tmz=(($-f_%=rCY;X>)lKwet2vqC*=b>Hu)4a(^
z(pc6obgwGhn<VD?<q+>(3CO*ny6Q*UX;3%#i*l2pAFbm&tNjNu0BG|K_haYsu~&6;
z8YTTPiuc5Jng2dp#r@lOZrkctKPryY(EU{dI;$o|S~5AIN6l0+8ye9^+>hDqI#)G|
zycUo~7A`(%<{X8W?;Jm4TkAq_?6T?!@Xs^1>WOVYL$M8b<xeplk$;Pa4=TKEuL}UY
z;?=j?<{Ei*-M+LP=A9EC-!eYyf_*mpH-1)E<aj|{nr~Kf(x#@?&y(`=Opl0ToXbr~
zNzy`5|Eoa=!YMglb`vu<M-q7=Nii8Dk-vfv!q6>j#GIkp&U01TVSaaIRcCyH$yVot
z<wE#axm8GYF~Suo#Pp7bswSI)y<=-4HJ<$vi05e}kwfk}+=CN#Lu);DCrk{#)a{Qr
z*t@^cy6UHO)YL5^7bC3L)U~xvUFWe&*;(lcXtL48jM&t5vI%YuSEUYD4!)U7Fj9ke
zulS#gL{O=A%&>PtxGC>Mt8ltR^Pz`b4K=k>@$RNErBm@FZ3&5(hL51?0E9yI98v_;
zrQgaqr7n8Xsoy->Q)}c4_RU&v!i|$B?eY3y%e@#i4IMi>?cU-W`?S@bsgrg4hu+m~
z$D24}N40&6wV^%Dbvsm*k~ywEuM2p+9<GRH7&@)s-3K!XW@WQwO$tRu98g5sx-!Rr
z`(XNkG2xVDo$GrI@CndgOcnSf9lCW3T3r@<k-P61A!zG}k4+N2cBVEsxS7~iQ!}=m
z#wTkZaVd?%jvkH~nsz7N)u8U5V|D<!og%^6=#rSsfb>rS0A<EVWH3fzDglBCwMTvh
zsLc~+ao+kSezlpe=0}a=Qgfj{{PR^+q{?E1!w1a2acS5GrfBIiZAhD@LL;}s14~_w
zba$dNyuSJwT$$-P`Q26b<a2oFTNx=_B+#;c)TVLPQDy3lz(QdeOg3N&JBT<2#cXE!
zJzWYf>Via&S(NPW#sXhZc?i+JJ*wKpV+2DZgs%7JGA|7wP>wkkWhuHs!KqJjG=I^`
z<HDu{q66N1J+sooYFeW>ukJ8Y^1?`o*)?Y7=IEMDZJ<qzyQk4?25D?z7`l<mHq%kA
zsc43J8abn7FBm@E3GbI2^a_=b@>ny`HA~ZQ%L9uX{?X6@WGe1!{9P3F9i)e;ugZHo
zM^=|<$6+JAdW&9s?^i;Ziq-d(;QBObC05F7jc~G-{YL=;p}4V5=dkxTHWHKS8<kfv
zF@%1ROs#21@KmMm``_JMTASy{EUcWeW`i$VDRyOLLpP;DT6X7B0#E184lSF0EjGY4
z<yx*SC=`&I$?NEV>9TwTj5iZzUL0*T4ty}X`OQC!Pct;Nf)n@KF*x{bMJ4X{)O!g*
zQHi(H5%?jJ$cI{zHWu~uvjAW&07S1in%_za!c{=l79d*eWbY@kR1^%_4~FL)knUUQ
z_zMZRCYu3Hizr3f0y=1f)_qx)cVNbB;=Ocv`bVOXhTQ(UE2F+TL)F7m+Hm6JxiwNF
zZN}WcUg$pEl|~pX_Owsa1eY?_jsAPOFYTv$(DV*b_`g-6JfE^>D#4}V<T^)RJsXqT
z^K<~gM0Nh;gndXB{jbF={A+sr?P0{>2P%lJGL$+hoEpGxSsbtu?;Wc2Z5a@_b%mm9
zG<RZODF=YT<Y2Jclebs7jWlqr1W46UkvCxP?}ctBbQtOD9R0Y_mSeysOa{2qW=R&(
zZ2Jj^aWv)5a%JAG^b#~6LWf{zQZ;a@gVOF%sW@pge40b;e%B|y@l^u7sfYCi@QZ<D
zT!@Wq*pLWqv6RzHm!l^}I3%KtyxvL#R#?{0HatG0yxP`4uXS^M_9}QY+oFbE>x^QJ
zY0rVB#uAyVg%BW?{Ajv~p{gyzal@2lg`oo%{;j&xb3}fyb$sSiDD8H%D1VM`EpPut
z;~&(CH2E=!o>40y{5?FCBU8ghp#G&;^nSa^H8RO^PU)tRVkEKa+;BbfGnQJfeb@eO
zZX=)z>HZ)J&?2`)TBpY335@f<Lj-ls1X>^E(3hQCBmGA$5I5PXP-snhQ0)@0LF<#q
znc5;?U;X+XC3>bi-c334fVzn=(>kV2%3~HtYh;Yw*C@_eBc`iJV~1^VOKS5ruU5QE
zc37`D*WA`UbFlLKhTa^nP8|O=OzK~pNVM6*hi_#Pu_C`0=O&GHg`8u&$0E4BTs44)
z64SXc!W-uXLh9OK9hNSo?;n?q<p#!yK(~x{X%s*3nt{X%pTrrK3qS|$p8K5Jy%Y9D
zOS>rmx^0NQ1zO(-NLY#ymWtCjDri5Rart=S_u|4!W$Vn_Ip)-?+f~GG>bOW&ehDc`
z>tUWuZvf!<w=FX8%hO152h}BJ;UR3J^WS{-H;RDSdx61Uhc8Rjq|{&M2Umf!?Cg;v
zmke#aD3p>i?=P;dl+n+C<B4rKV}s9w*?UFK0@HBFAY?1DDEG)KMQVp#qF6w7)=IE?
zVEy0#(tw=v2+t%hjDE>TPIk9?f(r786*9Qry{b(o+fC$axQf${aN%R{wm}2b8n^~*
z8FIHk_#|c?l|azC1nyU(P3MP6-!+spV#H=`cq{3@;<|++`1=|W!S5?>;<8T*#h_|G
z83bl&ZvN?ZqEnsIfKL~uL^+v&Z#(8c*4@tM`CU77_*zP~Q=6;Jve~y@#@gL}lCNh-
zmEx~D;0<VF73uke&5fBG(|V_yu61{5Lqr<i&R*1-P`_N*|E+UAH~*DND+)K*%z41`
zL7~oWW{9}3t+rjJ?IOee&`K+Ffer+FqZs0^5-va7STUL#wwaSZW~qhoke(uLZ?hsg
zgs=yKYT1yRj=!U;lsR|H!euPmCRlH{XxLY9s^Lmu8Go`1$n`>Q8_1~6`z0hRUjL0B
zuH+c~T0Zw-s<utjg*$a><@bdEvaV0F=Yy#AaLlf^!6;CnmXvi1)`T|{NIxK%TRFWh
z+ZmOr;*{XU5{ESHTu`u^M>aA1^yd0s8s6#tA<y{e$Qv#bsRaeZVfi5KQ%o;-BAdB3
zM6y^0Doue{kqbh$k0DWNu#OzXR;P34_QGHhQ{+?YPes`uhz3oZgc;fsF(M%WV$3dz
zk*^e=W1n~(vH2#T9YuwvEfniUqCaOhF#L9Lw#8Irn1L&D0XwUi+o>;^-lC}jEP41#
z8=N$<gjm{t`7Vm~8jKcJll92)5S#U`l-6!Bl#&++poA2EnzAQMdm}cAzYgzG1R;b<
z_8=o#AN45Nucp;J;26o1@*qGfD|v2aI!#$=xASeT^TNdWQthRMy(%{Ru*YC_v@1(3
zB7aa=6c~`=iiXvNL;4NIY#v7^{Son|)-&CO{mktRdjc^t%+}DmgE+=9*ZR1L<mXq^
zhn3H5r^`c)UiScy?ym|=lF^k!WeD^zP=CMG8`_6zOUVwkrEBiRVW6D5R`Ae5LU7#a
zO>J)?v>n)<oV}|i$C9N5?C4KpTIp`iwsq$?3OS#auIguL3M}WOpLGomK8zyw9kciu
z4x0<7-0?;?joR*2UIA26ecET@xR^G=7~cL~m`!_KT}YSV_lDCkvAL9iTAAsnPsnmN
z5u!fVG<i{b*egT`=^m5{Vs9P)ZY&y_QvY`KohaAGqaSL1dEUYLkiK_cb5k1qDMNpZ
zE;%oAWl7~La3^mKLb1J=NuS30((*|sp{3<%$GC=klbamnEpupe>ZmAwx_5K4ta9Ur
z+dQ=lt(N{?n5mepNmXq;Huv|D(5s?Od28{&GKjgFlJh{eOW~Y={$=P<if(FvQu?j$
z+CF-e-ySZOj~GEbE}nJUzlRCKe?9{iUKj}=y-!26@B~lSzXLVNcmU`%Ox9{0Ja@VX
z_|Y3qZovED2kxmZZM+jQBw%Mx_Y1l=sL><ZUQBL&i5p*<?mCd++Kq);nF)oMcNk<e
zJaYN>AXp5rOF%Q=i7oK^up92Q*)Jhr3ouAWP4-7EK{T=ZIHWirPXH)u?3UD~;CND!
zeqa$J$F7uMZ)TPhx`<yu4lB<3M77=rG$Df#Rc;Qyfp$%=ejKmP3T(Me_Ko1G>5y;v
z){IaXZ)7v?M#ph1V?#d3x?<1oYZts`U?=l~zQM{boOye?Uk2etk%=0lADU3+Va+Rd
zf~lVy3)NNb>Gp8jw)h9f%qgWV9QLDUa*O?wRbuF#(Q0m;L*LFg?6<3R=f4fNF$yr&
z`WP2=Lt{i3onjko6M}2s-`^7svZr*08)=Zst9&c-T~Cgq?265n(_Cy57f^C<sMvxl
zQ?#uc&EzTA#^0HM-#593>W?b?O?fL6%evJ-Hs&E;a$>LN?Ni%#eS7re_Ngj3nnTP(
zfVGVUc)GfmWNA_y&Dqjop_^i6B$JMAUcA*&|8VWAZq6=M!)G~&ndzs@2|t-s6^AyN
zzwUpV$Wx88vbBsIsQN^_q4O(D7Nl3e8@>V^&{SZFVQKyQ5p#G4O>TtsS$Plsh}4s;
zuWBb2dB2nAFddDJYn8xchNa7VqvB9(YaHA^1Jdg6H+kVhn(;)$%<Ui9HOHK{Cp2*i
zLn^;WdyGYNTpMMZt>JZx=Zr7KI^>&`%52Eu2&s@@#3g23ZJ&FL7op4ZAe6?e7)B<?
zf&vYQKT|)Tj>|NBB=5Yn@uiAX$Z+)-HTD^BBYo2Fd_Ke5H4SUp*ca=Xt6lcKw}dit
z%er05ot(t!H^oz&>6=H`o%2Jb6laGFZG%S>4B<<4p&KqG-RTDfh5Z@=%17#;XU{I~
zYR;;yJ>jTa5u-05)mKgS$eSUDl^~iGecyt@S9XSxkug?cV%jOQ1E8FsaRq4CE(?9X
zj|Kj@an;QwGqijAF!**68xbqU4FfnB^-N7>n@KFPj(2<;x8mZvsM7MrkZAm)bu2cm
zd^k5DapTtXlnl*xqILrR{!TZfvTcC3%T{sn1@M%ll++hS$U$vUO~^3-cez&XZ?6lH
zx~VcA;=4h~lnu`mx+az?YyeyR8q=4lDl(m87rw>;_1)OGpfsrj|M3BO^iRLsWdk_B
zn|uv<6CnTo_Fk|i>A1gP3OH|yRXc}HmCJYX77QJs1;#~d_naZ+oT*Vzd>X!jvy+2f
zra8jG3DjodrL8`18-AY$Dcg&6?HkdL3!+?Q5L+I*7PUU5czHF+tRdu;Cpjx0`tMw3
zx*LjP1nrhj8p*8fI!UfcXtm!XChvs;?{SSBk&R$i|Lw5Ui8aweFtyT7M)Y-+5maDT
z-$Kgu2;b7XrFY|J+fqhHS1#L^tbldiP&|7qkmFiW{Pic^<zcmG8d5w^ZC&VI#nlG>
zpm}58t}{JvGOsLsw9}X~->EyhDI){<CdBg~=GJ(}me!rJl>r6Aq`C=HGQ&fI7aQUf
zay^ir+<eFMdU^?7RQ*3|pZCK_>+KI}8i&iq<#CwRI!D3Kr>nOsIkk&OQ+&6hrbO{_
z@Wta=ZNukdAWNr7?ANTNt^0$*GkoL4MoDFGzh({c#9l+d&m8zrGbVGXY?GMC$PnC;
zUT~0!!Py16#<dJRA~E8%GhgtC$f9m>!wj{DhMMFi!zvl32wIO4V>Jm4n6K)a)xjFJ
zWbES`(Fx$f!Z9S0+?W?xR8a6|=o`QT`2;Jiw%c);o8N!=^$QcZ!OaH&R+OOrzCb-E
zv!sIb#e&KHa^ccg$~a4HApUkEHRmY(Ytb&T7=K31GCDexgMTJVP`(_cZek5F8!}@o
z8|{GJH)qdPcGqDidRlUydMfw%Ur*omr{vJR=3MqktI258`M|NSLt_W9lt#AJZ}zW>
zqf6!l)NBsJNYEop!200RTJh+7TyA*dY(9GCj0V%s%K0r6nZ!o5LWrExgBTBI3sJ?+
z{<t4yV9^7cyv&uAtTJ2jzV%}?qVnWj4(+Ar<c~TKRwv#6*%`xcY;TAY?=H@M#P6qz
zRMX)Lmy?q!=|CF;PNx#PoFErQ5boer5Lfv}rikgD#ayP)I_U=_+l@zexHJym5sp@3
z)gLcMnlpAw;m85L6HIsO80pPWMm+2`m*zeq0_Xp(HCvFk8IT1-ff&EKFw#DUQdV&J
zMNEF2nzf-i{v|Wh)vpJXC>oQ$h|t6PJ*-9s2K5!^J~1(0Mfr?~<lTGA7hz->(vr2t
z#l%$SSfs^BTl~KPCoqzbnNJ?DF)_(SJbCSUa8w!}pLw0pR@mo%UqkGN9_c41iYYUg
zjl1Yksl2q4?{soJEuCD79&4MF)zvjT^2lJ^y?++mJ<=!dz?U`ZLb<LXd0SGFarK2j
zI|F_AKSe7>syr834Ax=C?}2Pg-vIx2@rwUND&zmJ#>njcKf<^CFG}+N$723JjK%yX
zSI!}XG{CC#1LgR2T(I&RH8)*m{wHWN;#L-b1ZH(s$ymv~#{M_xa_v8$L8n{r2)5Gk
zbM2Elr=Jr4Aw0so8YiG-jV$VN-Ka6AvbB~B?-U3sgLjgO4u@p7(|40R3Kjmtv@nR1
zw<SNA_a()}e-Te!{h|2ZWXoqwc#}cUBx>0u8)h>*JMTO2mF;ai!OBlF9%CEYZHp|a
zQrBisJrzHG%-r$N(P_CF{`4PLAXhb`KI9V;f_c4BSHiu@AY<xMl-LoJ&f_nnaa>k)
zIVnfYsqMcxn2^S<a;xA2jvDtt9Z;)7#@0>AMynSLJNZ@6=g*T{w+B-CO8NPojWjQ<
z#;W+kptOnFs@Vj3z~k;3zxHS+`kb0}S)Z9RIo;}y@=npz2|q`ZgmMr9qzS6N-v_Z^
zFl~41YHBsO->h<O%re84?)yRBIwfs`dEC6*cz&kXo*Cdz=9RL%<%f~^2c`}6Ju#}q
zu&}N^vN#p9u7p$W>w4Ia4}c0JCyiSzAp7pYc8W02)CDgq5Rt3DS5MDbU(Vz#D~8cd
zM|MGh*xcTyebX5M{tsE%4A_Am+$t(1>2jT?vDJ@_{W|d==q(7ET+h)>dR@}{Oup`^
z^AjOSN1fz95t&kqO#Hi-2eSsm`88iX$jG;?-RuY;cIRxZ@FHek%EJlNy(<@kmsBW@
zm5^fa2j5jDt%Uf!yj6hx{E03@sh(BiIo+SLNBO|u?7o`*Usqr56!jpC83b3ZZk)SQ
zb3xNnhEVg8GPmAKNlV*^)JPvPA*x_&f_6|H$Qx%DmF9w%n@C0-mRe3B%pb)_&>VxT
zVNw&F1e|!t5Np$@>@hT*q^t-CVeu<%MDy?DGj64;^gFHb)HyIDXQ*$q_bGmKWJD~h
zzBqTKMN$zERJ?6yFw@GyeE}MxEUS>B#^5tpv3!R1URx6@mt}0$&h@)whJ;R!%I=4>
z+hD0FckHCICZ{(z21?r1WduWPhfg_oF-W3~8z4SDVjJq@da~gY_V`sHvz1RKaS8cx
zDzeLA2Z8N&7OwP~S_@#ey0hZ4?y%>H3&{+)1Mv8<ub!b{^2Ef1UVuRbd!N9S$(15Q
zKAFaaU4{2Z1|Rj(D9g;u#$)&(NZQ9|#IDU@p8Fp%w;B`|RZ5H=fBwv5g<~L%@Act0
zH8O4UUq_f#L22>X**6RZrJsS!M1SP{4;)8Y=@)12$HVb_9_PmM*^I_Xz5PP=!%79)
zc(EG`_ar1s80<+(Z7ts!DcjL_#!w$|2xTivN@`mgJZ$uw^1^yB5WnOGq_PRfFkeVC
zHh^#s7LLDSn!?PqVP#-&{lLJ>%}Y7y=^lWAkQr>s`Kh%$bT576oUT9inl<a@l}t$i
z9RF5i;B4Mkby?k`*XGS09=NTwNY$`f_6;HSOQ)IcW{#f0l;RX`l7^R)SSjXv2&B%}
zXr0D0LwESTIGv~i)EA_kw0SQ3C@>k{P@I_fvUjL25oKy-BC)oXMD+FAX3}%mT5Cdj
zBNkc-aH|(HJQmj17)u@HirW?wb-yO%4*8EE7R}-^61^5+WNA%oPurYnaAQ)ko{#ap
zs<;0K@`n`iT$g~GiK1PRW9YGMe$radxqi+tqa)NlP;HkDlfGG5%yVDc&-+tmF8GS!
z^P!=kL}r$nQ#)~t<ss8M?%C)I!}YhrypM#bJnLM$1~2mPeCmP8q(2*cYW%+&@U5ZX
zE0&-kA(gvdu7nhbN3k$!ZP?6y7`1~Yt81ejO-vReBP`vJn$8>pAy@6eVNvYL*IHUR
zStm+sIE9M;n-KE1voE5aV2aSp&vy_z8&>7!7CCO@p)xe^C_&zYxw6codZ~HrjWsxJ
z#J!qzb7-X3xU|fpprvSt_*jwws_AwwG9i9;12~!P3XbHiTzuF>D$RFEyu>s6rHp6k
z_wO4s45??!D~#c#Lis~XOrAZ7F#K8|mI6eT=Kh$8UU_ViHKfGc+Nn`lQbK*`&#IM`
z_{Jxho0kDtMyQM=--U(%36ng;z^wTPMoIw(&m6mIvo{6!@wYC9>434XTswy3uc?Xx
z4ZckOLk)jMKG^*9iP*mW(rMPjs?)y2!}ZJW=o@aH?(#gFm)*eNTDIL=;O6fDvo%JN
zfDaIoT2NG!_9gT7ofLiR3$Il#vi$=)e=337Uv>FaqfxZG9m5L6hSj90YIc>2*BOz;
zXATaz1Ppkt;o(8k>(?i0lhWK}2=mS3o{<fw8HVJd{{55A94#?IfvN1m8q>7nF@2fd
zB7=<Unl~gR^@r4OQj8j6Yinza)Op-FqNf#>Q~i$9<!=19g!J?bCkio3{zcIHt2=+G
zEbpAojK|ACwynusyl{INkyjneQ1*dZ=fN5WP}u&c?ihN3(vklR1e%$N=}kcdHLwdk
zJ3kpF5_EVbm^|5tUqc`7O2~(-zGBWZHU^1Xgb~!{j8vdVfAW$N`jQwY9LDtHj>Cz)
z^}!4$9I}FeUcIoAj^+~asyg?utly;Aus%g!U!QcPk`e_#hod2{v|TcNHs2ewt&?*?
zw_Dp5_ry;+pL|~9UuZfx@rbslk){&v*#VX`FDF*y<lK4g855ibll6IUM3XEleTm(j
zB<^Y|6wO{Z$MmgHeBvHVB=m1&CIl5s+zqGTd6i`;7AXgEJN9F5evFM=QOPtk0B3D6
zkRIEi-rnS{*PTMbQ)zM%h#(Z7FCi*!wsR#;ZP}jrn0l~HDa^}zTx66brbXE?V{RPG
z2Acei6A~9t1}FIqsl2bww7(uk*H11_R425cZQ*O{IemXF)Oj*Oqi1+h>v@9*)0O1C
z=2iIA{J&q~<%Os)jUZau!l@y*BqbAqUM(2WtGWXO7?6$!Y{v>pUgeIHhkZBv+U_%b
zjWWkQ0#bY5AyY-qy(+iE7_$Jqc>6k$nVACsl(@y&s6OemAg<z#(ujQI;Zas$NU`{y
zVP*Mpt+c)-d}aL|>0DtYyi?Pw`?oYR__~3C0rAI?#?l5AlAP3EI*BVNEmd1Qa<#SU
znVoL|$ApE2wLjXwDi)?mr<hGmq%U-ry^Lv;M>Bk(*R44x<yoXx^)Pqro@Qpr^X^f;
z^6TvwS39GJd$!sO5|?ZMnQLQcQ4AEkKa_5Uek!sHRGU&_`>ewqY8PfFU?A?hw7k|p
zQksB{9yqRT)?b(^v_Il+G4z^gY1hZ==WgtIqK%yqQ8sI>c+4ozk|t%)N?$vi^{c7b
z)SuY^0es7a*l;9K-NW-kP;2%+<@7q8as>}Le@s;$UeX$U&`xf2G(up2JHYFT)S&*r
ziN55|JkPAg#qMh8H~FM`xVyh3@2)j`(D0m=og3aV{i+}@|8jS=m$=)PBssXfayIgh
zpA7s?oaRnjd+0Elezg(3V+3mRFQf+lUDRmaYsk<>$uvzprN5)%;PgIsZehU|AK%U1
zp1x+6tm}4&Wj10<RTx>&WJmMH;tzgBVd&<m;H5%9;f%N8MBcTxyHOtSTi(OuyS71O
z19kRAD!r|u8#+?GyVz~i*G4{fqEhCMh*(M(^?sVFqkBxx{B8`QkFmgfIk0iTmn?3V
ztWFQlIWsqh2kVLiS6ln^T8Q!U-=UEXYj?-WyxESKhaVZG><y7$XNGpk1r8Y1x8^;A
z`whx$tzk_h`i8?p1O8wpKF9XMsiMO!Pfc$&F8GF}*j6bJ4qCOEI=u=uT#gB?UI+Ek
zrzpQZBT@`9fKab(@*Dx*X-#8x8Jzv>+Y10r{v0<{MG8MJy+a|!;dh0h`?>4t<ah#Y
z=%5(36qKeG{CYmH2gr=;=#>x@x1;n0E6*<+RK>j9ZW}(4tV;?BrR-J(1P#aXNKW;!
zaB1DaA=!k>WZk;1?14hf9)E~=<bp+I#E1m<MTfv<kM`dt#D1+c)Y4PyCWqI7mo^F3
z*W)y4nW0DIizQWMBp@N1c(Gjxqg`vO!CReMf?oO>BXZNO{cmQ(SFl$*RRr!tC)vOf
z_rHOLybycBa~|cDa{Ydb%oNsn+V43+KSCsE!WMqi=l$mz+fXv_42^~krLZ)UBI&2*
zF-7R(UI<x>PSd}O(=iH-I}M)Pl@BJ4K70mOc%`iYRCve<bpIsia~xDVBzEq+(Z$NH
za!tncMT=Mq$#wrAz$vqG83!VG@*d`#TFZeEox!IKO}mwXrqIVd5!L1Uwa9POIH>T4
z!$UTa@cY@}#H5IC1&<+Hi8;s100viM;&T620HUp4`?<MOYhb@L?6`HFKH}&gVh6tM
z3qbGk+C^-YBaZQQ$^&c`t%?sc_tC|xv$$|vEBL8x<tKjC0bArSh%%s^Mj0)J_e%&u
zAEemHJTD-HtU6?)d8nM4d(nmVmY)N={u$2c^GN>OK8)`}y3vTd37)n9h7qbc+m2_|
zm8Gcr(N=12oDOI)duv9{qB4mA0?KJ53WoEVe#P^8!|=oL3@21ij-E@X^Xu{kwNo)p
zW{#!A7USS5z>~maLjq+_Alw_Bz@40h2|MoPUF&tRJxgwyLWNq;f(hLW^aLC7mzdeS
zi>Fh9J8ToeTn7Kz*tUuN4cqvQ%M+Ij)q))b_XI2@81Ww68BSL<XvwSRo?Oa46uvN<
z&voYug{IcX5Yp!Z>0M-h*=n}BrXuw6Mc3JTVsGALVyobA+sk*XUAc}0<X*fHQq?XS
zFboLZS^o9R%1UzMQJJ;nB#_qBZJ^{^P|{aS*paj3Xva>$c28wdiCNcTGD_|4-Ghhj
z&fMqTMxEvJ7xZpBfO9;2Ea@g840$u43>(qchy0l%gu6zqEf-4O*EDD8^!9Ea7xpZw
zn+^JNkD^Cgymw<-D%m9mHptp*VVmPv_L6a$g78<6zjSf{o3OUXLaOCi=#1JG<EMx1
z^QF<T*P+4l(_ek(M|J-k`sBYXB#Y9H`>QfY)h5c`GdJQgHp!<j*<J+5@{Vr$t35j?
zC~8!19mAQ^J4Ybj5eYuL2R#TGg-@--s@~5A@Pr?%tBd>zuXPCwYBN6)k`Tmzwyj{4
zbKK#UYZNV7Ar(}1q(ymO?5jELdG&!lph4b%iN0QF_jO79mpr|8cn#}f`vaY05<C&G
zhvUt1Aqj@P@PhS0DH1u-HItNk;Z+v!)@NR{!5q9=UJ_C!GxXCIg78FOLQ`45Vn~fN
z)hd#Bivhnf)o$b8H|WlXV-TTQBCxF`--#u*ImSkPofbl3QQm-iohT0<?$-ZMpy1D9
zj138$xDYeV;u)a*_kA(&9(kwOR*`46TZ|DNC&=;7XSowPB3TB6vm6J04=7Ts38|&E
ztfAC}wiN=YZ*U4qv=p?5Te*ntCY<_s0`3teLKBc?tQsy>e>w_Q6PRq_bk^DNesEJ)
zF!0-!g5QTW5>2D_+TWV?ZTge?ki?mD@yYR<Wp_wFN$*CIWoEAB410KY>pu?c{q7TG
zprmSsth}92#A>8Ih~(heC3=*tH6=)#J}+}I(0yxIi$34r^wQb6?-QTG)|Fo^WgzHD
zUa99-PaDL1Xx-sOC)Cx|eHYo=#1S3^Hy5}6Q-CCbZSZ?SgO4+BEp3O0p4>Dl1JT2)
z+xa0Y!w8qa3eNhJo>;zHF@kM5^T%^qb5}+BJiOs9R!oTv;h}3?wPB5J;*fMQOGtN>
zhO{6fVY4m+J9hem@d>0rqRrjvLn^m0#65z(Z;cCJ?XSbH8{dZG=?oe|`7V$;U$(9k
z+Yq@v!T`2m3nVQ8CX`~Qii#}G1#3D+TyRN$>EeW+#66_g1_a#;v&GYqUkdM;&S@OC
zlZRr6)>V+(ABQ$1gM(S{(fXq!*OaFNe@P?SkfczTOF37uZdkZ|F#-WVA8Mm9#xJ}?
z<U&)AQKp4Sm7=r?=2_v@x(^#oh+5}{#<h*;ggXQVQ|{88+t75_`2I~k^rUmz7gDdw
z$F)3}9D%<J9O+4tTJ%w~-H#bGdl*s^H^k~(I2^oVF-)SCbB7fa750h7X?nnHYn{XH
zcC=Gtp<B)2nh5xgZlI$v)|H!WyD{$g2m<>m-fupGP6*Bk^{N_=uzQ~Btvh;#^Jh-5
zWFNm_fY9V-gRsS7s7#r86$#%t@_D>+Ecp&F=@Q3*jfJ)Kgu?>%J>f#GG^lzodR5s3
zh$Mb2gZU=1_mS#$Cy>hh6#)3sxxq4vEiqZqO0k#v(PJ}oP0E1Dq@a>}A_G`kuti>7
z7#U&c1N5^xck*PPS+;B$tQrxFwNRhebX$Ht*LbBb8H{J!whp3U;fw=mx5r79aO<vr
zusU!`E8UK^3=;Cnkq!TZA2qYI;edQw2*zaI$f|!~27N~#B_Z(Vs$w&@q~^5n&k113
z(eP0g61vA0No3^^rJ;hoD+x8QtGG?vsgL`%Mt`C0Tv|tBi^{<2!I?GKC$eVu0Xrng
zYw;vkSkS};{NzDNLJy^@#&Ng62i}iEo@!u`wyQ^Gd(<PfUaI=D`*OrS?glF=GU1L6
zJAjQb^9r(|&!Km1+i$dB*aMy4(J(7<Zr=SMY-9QC*|j&l{fHfLyXQpGf~3rWjqMus
z$wVg#{*r1)om0}>+3p<KY^E8O4Ij_SYl22lu|6HN+JfSPf75V?+NbHehcE6URjTV$
z9xq*hSC`k+niPI72xDpU_rq}NoO)r?Wu7`YR;UjS2=0hrZm@i2VIlGHvh>9_0H3a=
zA<ds#k4dIM2N8vfQ89uh5(d?5WdES@5_46?@?LQF2Mg;<N@+@`dBu(fJQr@PNtN1%
zv_c^i_IFnLjs1VVl>{Hefh}(6|D~_A1>%pskV?M0!tjGu4YTH_1IBiADYK?1<<`Mr
zEsQCeiVEr3Q+0!OeZrcwtQ`nKL#krZKP(}(p+Bvt;dZgAHDTI42!qu(E3sb~c~&vj
zy{cDSXXH9#>3Eue_T*$eT-aVHxD$av=Aev{ya@Au<A;8~HqQirQSQQsZbJb&)&<{L
zlbdU-rjPKW2cC-wcQO3c7z&|u_La5c5T#{RTog^Amh#vru5|pIV=nZPKg(UNa(|uQ
zX>Q1NA@#t%*KhkhjVSL?mov$zsS#vG*Ky}qLdX&Hf$J&lnn4Wex`zcJKC5uDrmWmn
zxl%gC02fHv*5*=JHn`8`OkK%qANaQqrGl*FEMG_0-T$_lI3z?aXPci4ic$3AbUx=4
zl-hgRyb8<}DSG|M^KaJx44WbXDdu@l<_SCQ*K#sy@RY`%Pfci1c^^&WP|phn<D~;#
zCvE1$>slB`+_*v`K`|zNN1x)<H@`#}pCGRPM~W?-ek07aPXfp$t><8k<N>y{&pcF{
z5W2R}FAxG#*<k(PqL*oG<?|Ir0A*BIlf&<PzBUAdlZB4%BitW_6W>m4MH?Czkc7{D
z6>@OYA>BMFGJv&{gA+RcvNfprr>ga&8jEhR#^9L&_e>dKJcW&sz#Bs8hAg#1Ka24u
z{C)LCwnCQ_eRYgBdjDAgo9DNy5OvQQOz!Et*4yYP=ch)umX<DyL~O64FOQ5|3C|oV
zl5H#uhLCS_bf|USyLoV}G@x?@;mkO0z+)H)Fl@zXIeRHqWeJ$7YU~_}ZvA0vx%O>k
z-F=v7MQ9_mQV$*DwirjzknekhoLFkp_fXcVdv)C4x1*}(2UMqJl9f(<uKQ6uEIIS$
zz|~n~B8pb0J2Ugt&vnff>eCY^0@j6MrD+6(^ng5Bt!k$g2A$m3N`QGr)x<U)lk*CR
zA$X^$&&6Rb295Wu5zvKHNolZ%&D!G4==eD+-~sS@T^tI1by)Lah|xmCJo}#a(~m;8
zSl;QL5lJ1b-H$7cKE-h!r_D}YJq?hW|9QqSOt;xvvGsLvda3zMT9RB0r`x)zTfn>8
zoa4pESc8Ncu?aO?m^sa17!^+%1N8_7r!p|+A&SUMhXy7p4nNHQJo?f)1c!Urk2s>n
z0%X<0CM{2CZY@sd;2Cpx6yDFv*k-AUyUr6TL-3y=VGbbOcTI<qm^s2ALQPmBImjqo
zB|Nig5?ho58x}sE;bRk$onv*bu&%N~jBb6ka<0<qm~*U><~3BGz<f-Z{pyie8Fd7Q
zS{jALoyNbFNItrQ>xA`W${QCMirjwtkmZTbPjMp}BsX-oQ-^ukxJ!6H2BqM0d<9zB
z9;eoCdy^3M*EqE&_P_?&d;b2YrU6~fjj9TJYH@Vn%Q}uiW~W|w(hVPbbt!Z)yL;#j
z?+p#NvhLOQ+1WmL7v$%&n6PaBF5?ASNS066kC-{X1!`sMTGrP~`}V(Hg>C+L5R>9}
zlo7y=c|}w#bC7ij(&qRBINqYjqsn142ar}7>TJLJ@=rMi!7M8H_wshwP^#uk<FQ&>
zrb2lZ{iYxVDkEdn@c1&c#|3%t4RE`eF`{|-HckO!v-9w&?Yh0<{vQ$sU-BGSz|YMy
zkc7)uZ7-ybt~ehGJtt;p&5!1WE&q_Pt4=ugCU4Ts1yI(&ypcLUW1N^?1t1V6U1_Tv
znf!_($ApAyguNauw76aC7Sy-D0#@&+1L37t(~A+uwcUxsn`=|3<SIK_7@7PT(Fo@4
z%=~(}E}gQ$Jv`ITZ_laf8W`7RTjyVH*V9hYTAo`RiQ?(@d2Im-KD?C%O^7wB@E2Tp
z+Fmt#Vju4jel5k8yz-8F?ogi;do{n}QE#shJvi*B8RgOQbXI>mbeju!{PGXSt%dXB
zAY}w43b&R8!LZI3Nk3IPdKc2E&e}-RJR*?^T5~2~Wbczq+R^rwogo9<3-~=`58VT9
z68=D)s|>#DIVZ+S05R>s*I+6BD|S8JRZqT{!&kpKp0-S9`N)1wYvG1^gZa7hRj$2v
z<J6DdX?w<%8Gg@gEt8=lx$y7!$mFP(xn$8Y2c&A3)+M1<bC)v{b9AS!8Tyk~6K?s9
zgqwSxbp^L~)b=Mc2yNbyxiam$$ys&l)lpnueAeU2X+E&!65iFlhuI4QArUXk0Yq6`
zr?;+<Pc_FiOB)0k(Ae)*Ea)O(H1Z)u_|p0ll^?<SC6_qxLEq+S6ucwEdv4}HlVs|n
zBo)IyTcvI*V`(`vek&$G+a(eLXm4<HZPiivwSKTqnIhaTc0)!~C0MFxhaWV2M1(|U
zi9eglu<}Oe!-KZnYKAq(w=gwcRA+T~mC5Mv(9nlX)%x91GiNHCw%Z6@E3;GUiFMD#
zVI`{&juLrTFdBY*os6>~%|(&?wXt1$!(aHuZ_Me%Tuuw1XH$fKkjBw$LZa%^ooslQ
zsC*N?oOYwdfiN|j;J*a)0G~-g>m{CgnFOy_?1En$%cczbdr+ZqkW|8-v<(bn3qlaU
zYGYS5NXK&ukt6fLduu&tZ*T0F1JR#&_W;q8odl)PC|<yuN|)C-hQ5?%DwdS(nBwe0
zU%dC6F?FjPuFH2Ux9L1B_RjmH^S%moC2-IzrPts_hpKiCwj4a9ICB*9o18EFf#%Rg
zjIlVn-K(}6K_7@vGk&0>qw{CxL;$41aB*iPhyL5#Er8!1cxwFVk#sHl0)E#!6ck9P
ztmcslLp0J4P+v%tb#c1};8bVbv*6VwHda%l(Wh5W7f^6pm&~AJV`eDp{?%WPV%67Q
zso#qpb4xe-`#`zf?RoFhW?C^_0zjKpa2uj$2cfcGV?ASBvchW~tT3qO-h3lXZx+Uh
z8kuSdSW7mx^E+_##HH9+qw-oo&0|C{o)F7@A`1I_BUd?yh=%BNIC7p&Uy>6SpYhcA
zoa7{FK9>_vbDka*KuR{R&C)a7M{{MZ+b;Ob$>5vD7!%+Q2;M@inHkxkFYM-A3?+Z)
z2#n(i=N89CzvHy9csB3jD2fscpMM^FkVYK-1w(2TveC>e<l~r^xuqGo8FAH?Ys>fX
zmZ%lS*QL_g*+Ych!72KPVR#;obH&A+;G_4xbA-y25|iu0r<KAs#hP)kR;#7nww^2z
z<|ayyY=eJId9F!3Lll@7><2{k2nGsPqn|YI837=vm&6Mbv^U=7t?bYi)4kKHgP#96
zJMnJmmv4Vn`0W_si?q9{bYqEqrZUD!5Pu3TV69!a8eJYSH4=46bkvv|epFb?BFya`
z{ri<@?wb`2yFOuI-c6u8nluax4TvG2f>C}$8Xzy~piCYuw2p9W)M(A?JKzdj+@1nZ
zpO3YhJS;BKp=;&`Q&&&(7%q%|t7Tb#bH&i0s&##{ziTL>7|MCfbvcvoh3^*@s--Na
zrYk|G=QNFW06k2b=`Wx=A6j7nFKsOlJ++4FosgV_D9$Sr#Op2#YU5C?7~%czh>z~+
z<VML0T{UW(hdaJQ7S4LU?u(f3Y)sj{L#C>$8>1(FN={`$(1h&KUkiAnmCKE!+l})(
z!#yn9#BmS!jfJJ{RzmW&Z1{1IDskEo&p3b_4pR2o$`%c+YFa*fZ=XSR7W?j3^xvs*
zXi^AwE1lwp@5eFX0J|C0r16H2V|aCZ&=1Qjes`z_)Ft&6aN4Ui7|+Nab3dzj;#B^9
zd`ULh)+mP_?@b#q*FRYNiGu|iOvFth*((OHkn@skXWV%Ldtz<IW|6mlJ=FG`>qU*A
zW<F;$Oq;W2jRiloor>PU8LBDH57pQ-@ID8m#$;@QAr03K6v5K7pav`XL3u9WOGgy!
z7U_GBsjKl-Q#0!+AK*=u36}yGnvom2ZzzMdXdrC119_8*;@doQD^}T`q#VB%)I(8@
z?iX_m60*}7<^Xne5ks&Jsid|pUV1T5NEF~pmUR#h)&IRYS%yCY#6>mdObgG7gcCBZ
z(Pane<zdm4eD{*<!G$9zCw!rX*w5)oHRGTB1ZGc#B7^uxbsV{X=+?6j(WKMdPjwy<
zHn3CBg9FuYHcEik)*5`%D)vFtBr5uUqwOu@qUxf*@1aEr6%lEaQo4~wvFH*IX=Lbb
z7*bM{?gk~KyJ08+VQ3@=7`j7hkbd@D|NC=)?&p49Kd&w?=A3=b-e;e)*Iw(pe#^wS
z@$p>?J86UAyFAYC{3TA_&NP*AK8kim!}|N*k=}T&xjof|eF-l3a2wIWDJ<NX;rHqV
zDZl4zkzN160H5owOKZFp+$s6n@!(88LB6-ZzPiWS+2qcUXnLtHvl7nqX=%$eI?(5`
z_vN$^TVCV#`_53!uM`}*mZZ3jB=1Ij<d11+?`2g~XbUCx6-3y6cb+`Px){0-z+iHJ
zN{Ky?%UaQyyt#49b9A`4#otp}=WkLqMTW0w+mL4~qSYt+a@FppR!WTEcw<<z{S&v9
zpxuPz7@owsZ=}@ZVpgwwE4r(m9z-lL@vsetM)@OQ;j32}Ugxhp=EV|<G$XFw-X88d
zByBw{@jK9?^(_BjYg>AGgu1El*8y%p3HQIBos>S!AnEeRy+eXm_Pw^3{A4*G$Fx`L
zLvs>unY+ZV3*Oo>^8C=+_-hNcxzmn=+6GaaI&#qM+Ff+kQ;DZ$E1^bwhSILTdX$p|
zlx&+;J;l(62_?C%*uh}OEA}y%j#4?O%I$J1m>#*$!0qNoyPiP&fWeh18Pzj^E88!7
zi44$xWB8_QbV1y9=P7I}?AohMO?)_-up?Xvl4ZAf@TDX?=5C|IPdf&-I3TnVij!>d
zMcqX)=QL~zquIkil9Ow(DtH}`1MjJxdIYB>3<ThbblRh+)v#@xrQ?=O7_O&I>#mV0
ziv-Xx+WfZdAtI}$I`+_w(bW9I#A!m`h}H(qdmx+;$~aTXV{WLXTVu8X8##T&j(>g|
zX#wJclqDS`bQ>{wEQx=F8(y!6TJkfmU#q!HSpH9Bbpy)>7kVs+VN@LC0!&lvUJ-iw
z`j<Wd9LssQ4H97jqJGmF`j1aey!kimO-&nDNC&IPxXDSOy6z1BDGl+KeXsnOz@cLk
z;Ak+G1@}O>!oYCY^tp>&F#G*`4SM-YpoGo$viAv0gq>X-NMJ-~=T(X^h{>P7bg@ad
z7DiP2ENfCPtT#&;kWAU(kDD??@XCR)F|~kB6C!>ns7PLK1VAsRqP+nE39sb};QGoH
zI|}^+#k-pc0;zsUxi*jF0yZVbSY?YxppGxAs)`{?%4PU#kMRP2(b_Q<;6OYBYmLnj
z0kuZIj6b+;RBrNZRc`V9xEWSZOUh(z%Q$v7R8m$x(X+L&icOjE#DW+qI|~pA&gis<
zLkIap5#O#~@XMz5vXI>LWB=PeXwyxS`t8;Lw#ySXvuqH^&KLeC-NQciJn2>6DtN*O
zzUL?BWLNZ_R%xc{adj8Hc{?X87hG!ic!sk(f-PY{M?z<oDv5$qj~y?-G50?T<W>)*
zSwj`UKkr7vie^Exj1u&@7U_?85cBW(Ai4G%2Z}D<RF&w~?uJuQQ>E9rAeB;O1yY}b
zv3$r7M_0hpbZJUPC2U$xG<ft)d3t6op#<sHr?c<NawoAgVJk%x3zF4j&F}k(&T~b3
zy0WHP9=OSuj}Okp&%HwFXR3;)W%xr)?+q}eDE?uH)#y&`UotR65AnZT70EvN_q=~v
zJGpYdU-qy&?F_x1u%>xLI^x=d-0D2;QiC_iK_It;Y?f|q7LQvAO&#^dcK1%UI!5H=
zy1-d$3JSFME{0+&y}GEhKV_7;o3EoouhD1%+=>E2`_efEO951cW&%KvOo!48`S0A7
zi$wES(MQ=vh12RiAsEcqY0}pko@vAf%t@Bc_=G1~H-bigHWx%Z9M0V})DaoO?rNI)
z&sNFDg#!MCtl}uV8Nm@wzlNSC-7D5IJ(pLOk4+w9d8g!>;8klLzf)>x?*@31I{Z}<
z9$0%1A}P9)iBUq&&)$=nXFE8hG&Gj=Tg*LX8IzN9&PpHkg1FtnsP1l4K!<D)i#n&(
zntr2GWm<kqnpnI;B<sk0h7QBYcD6G_Q$LfTUY%Q$(!)ycmD4p1>IZ;?cV2j6vU<;S
zQzLR_=jvF}W^nJ`{?*C3w5>y_@i`eJ)b2=9`^nXaFx<H^YrUbv;P3Uy)pY9T*cjam
zmEs#<U=?|nQ25ABPbRcu`TiYaCpTTyo;>!I6}k)SsJ`Af(_XG&Zy1P;pW~tql_<&=
zv#%D_Y6D0BFY~i!+QV)$N5Q8zTthBg1N2;4(#+GVEzw(i=$yAWP8)1htVFEIH{#?b
z$^z(1scEO)(rP7d5qDzOJ5^RVU#wu@ov(xz5phznbq4dAvKdEe@{NdL%h=inP4A1g
z2Aqj6PFGDL2@$(P6yF<(-YMg*@sK6`L#+gwCOS>8TGW)&Qo`+b4>gi-F1V*|<KEYH
zl&idw0TN)A7bN~4Iz1_IUIs2ODa(<VkDJqzGd8ZjT-rKF__o02WN%)3dVs&ml(<i2
z@H%Df4&+)*U2R9f+NQ)-R*of!0bQ=&9pSg-5NcV4ihQ4VPjv`)EsM?R=P<{76vwE(
zwCmZ`!r|PT8$3VP0*g&_W<){)OSjx>1>=@)#I&F7>{ZZL+%G?@H3e!7X(TZQnnJnd
zVKvkDXd)%pxn({<{{HUkzk8LKU0NC~ch~s-HkAHQx&2y;K#yKm13fGE;f=clGUgtO
z0L=EVNJwn9l!x}wwalle6#rKV8PT?8##Xkr(ZSs;z5OPYSic@p5L}&9Zb;f`g^1HU
z=D>O3Y4btk?M1fNURz%!l3%o&PD@*uT`+3H@yIdPdY!AFtn5fL&422}zb!^pubu1}
z=u001(8rv09H%5z{>y->bz533CAXg=LLWl>1BKm(8KyNfxisR(V=|>a_$76q3X;n6
z^$*Lbg#w|0!(!y7W~*QCrtJ>A*nLRz9E%~&zX50WLtT^GeuAnEBXhDU;a!=3Nb*$l
zhqHB<3~mePS>DV}Q}Tc#MD?AJkq9?87~I<hJo%qLdtto??~nwl-XnF_Nm+6CGP5Bs
z&vd%pLZ|J>1>YBO{<wn=oizzd!qJq=+rb%r9e@wRK0@yz3H$#h1K+ZQ0o*wJa-|W4
zn0L$|bqJ06rnG^)O5)P$A%na!`n&MLwffunIsUYs>SI4DQ6>Yp=OQJbJeW#zO0T|*
zeQ^jTWsms^_e$`V{6%<(kAAtYm2?^y|490QbKU80RYsG6t(r>cktU^pc@)GFd@Rv_
z%>Iet|DuhE!y2};csDrMn-Cm~KV9)Dp8@{-leO05glw@>LbOA>|G!s;_`_x4RDz=!
zb~E+bK(+$!fYDbaLjnbFQ7{Hy^g%wHP;MakbM+C3g*<rhAQU;rVl`Pz@hh?ed*~5z
zTi7=K!#c;0s(#4Q9e+ycR$;GSJg_WHMMdHgN(Uw>-zXv>a%5wp=b6{R?JpXQ){Wm9
ziyOhgq?m&fV`83s>hTP|nW;C5{WCssd#Ur+!H=CYeD(J5uHj-tb-Rw9YXZ6SrNe;7
zsW-k1{#}Yb*M#2l6KaJT5$!ysR1Qi?%Fow!lcjTq(;ZMW5H!jAMyLHmCgkC7KQ0Bf
zQQBjO)UNh~5K#$7k++#rb|cX*UTl89`bv*6Q;?Ry1qAb01e7b*H*PE~EupJh#A<M{
z+V0u^PFP<tx%1x&e%DR2>?0#NIXO_Z;ZkQ&j;eMJJ`bb#Xfv;^$<?G_Us|@Gs;cU|
z@tl@ehV<``LLw%7%r%x>o1k5X@n{C=UAqhckMD#c$spB0%YK+1{N~tTvXpbcXTKnA
zVPO%SE3fqq`Z^bUo5{gYJIIn=rarg$OhhaCYSyNt(sJB#x{?{)bA$)^MTcow$av)z
zrNj*X>||{T(quJEW7HH|00J2SW=kjxF9?s%XbIOLxzGtDym9C^D_B}RDx!qkr3I%3
zMx~0W0F@OcaMjU2Q%?~IoQVUebsP6SgIi+)*Cu3S<X6vA%w!87Agz^3v}G3@U&{sI
zT~-JrP{t5HN+l*X7P?c<%Lg_^Vk^2bG65VqjS50`Gsa;9HlPijZX^7t@{c+?(6R0T
zHBC)Z-wD@nqfU7ypr!<Y*n{K&CUJ?o_H&Klqq8f?B1)_xlp>aaM2~o+LH+~}j$f!v
z&y;?ndado;8nvqut0bkQalHwYSDpdF#0RXjf8f632U3OQrw92^E}l^fe;1i!5;C|T
ze!sxo`Q1G>l$N+#{{4FgEL{Hf?W5eBoGG*@4&*;r?8(ofqS$b1Az4Mm@KdV92P7j4
zx=+9az=nkSf}V%IbaAP%o^BRoc&_e%@AnHBsD4Vr_XKOLr&(%z+C`*%%j1aH6P!KM
zuo$>NzDU*`f#-ID?F}tU9DL@(4Af~ZA4DP2m!K1E`aefB!#Q)+^Z<gxCG3_3SS4AK
z<>xrky5Lu7;h!ZXHRS7keR3!lK!m9oe|DPB632oZV|2_m-khAARN7b-#3k+vNqJm*
zC@K#{Wxtlm$zm{wiHX4l#1k09ECK;xVOgLVQu%3}%K>IaqM)P{-SId`O`uvu?NJN~
zpgF-{9W$hx!g|o@Y9AYAK7LGTnQUZ2y-)qBI4%-^gNwzmhUtWG{amG$R)aNC)6(po
zGk6XvVPPRNICxl)iZ8$xZz-;<?5nl<7g-z~9sT(A>(_aQ;_r01&cPTYVD2MQ;Ljvd
zGrY1=Z;6H>3B1iR!4LYPvSkKVK?2RO1m-3x64p$g&B0|{_nyWAl`vSkX7Zie`0^Od
zq+H$r2FNipIO<nuZLN@w&Ae^lV0ieh_h3K6Er>Tpv5ohqv0IRYv<mAh2O^s1D#66;
z(K~6@pzVwYAXAYhomNG8e0<#XNnBwe8|oP=Yma7{pfs>}>40|P27xnvJ7;R097wm{
z7ajV8>|*(_ejAdtj=6LC5#F?#rQ%PbVvJTMP-tJdQ74md<N^^y!XI4rN=02g)*4x>
z*yp@uQz!g9HLME#oS*PE#F-n@r%wX|1C<~ra=M|)o5O6^fsWVsIROE-v@ihR0bCh&
zG{K3)W_dC4keGN-^eY1-Ya3YVci&P`Q$vsPI4fbNwkQ|Od+PPi-joE_j|;rG(lmud
zMZ)bKRkXoM%*@R4va%Hq$caZRaPc5_G2{5FVrz?Sy4)w0R!=53-|RQY)MGM}jsOHT
zX5zcAyCNde#h{2ao6(sW<FZkq@My*mWFJ3-0rT20g(f6uBJ)%+@1v5eZ1l*FxBLf$
zkewGXfP?%@cP#AL|1?<~TA7oZn+lnGQlwRu;9@nI+UHaRfxKh{H}|<0pna75`Le32
z(N{ozL$A_(<bFX(2^mECEts|Mqyd!~9QlYvy?Q1s!<JQAyVf~*rxHwg$R(I%4E~$e
zejr6I+8;+^%%V)EPG6`PWls747vc^c1w;GhJ4!O(IbVt~zBn2Lz32)X2RUynV9Uo3
zX|tLtzn{!w)J!}q>T?uE&fYcG-R=j$Y#;xvtgZI_DTrkj5z)4^vV=}o#(&GgVps%M
zgkbUU@$a<zi7Gki>7^I{k*i8Y6G6UUX4HnX%+boTSZni%#kGlIeO5@+Ps}zdiVsk1
zOF3Vb9GPXoe6gOdehp!`hiS?P3Z_TB1MvThj;a+*={<u)nPbifJ;Yy~xhL?a(Peul
zZUz$d4)aHeQQj0MN5`E|N~_7?AtHwVWc^er#cZqVb$it`G@z`)SinyK?*0`spx)nn
zqcP>Sn=OAmlk^8y`ZM@EK)wr^yvwGQ=-jo9AGJZ^LGEL;Zik<B2E#}o9Gr76;whzH
zVvZAq4rjfn?JG8F@S3#6@^gO++H{^7&X(Er(4OY{-+x%Re6e<eS?8kj@>sxM-(U{=
z=;&Cvvbs8hSZ(UVgDg>EuE5;TkkO{At<4O%JA~;8SMOkN<+_W@2{z;aBMrC_Q(Vm9
z&=8YTQxhZ!7AcG(>qg~{wQ_tzL3A4tgAZn`^b(?@ZHII|e#HIHO9B~&%F1R)F@h=b
zKW$XzteC*&M>`%&Lzc9{z<T$(GlaB?6%uNO*~R~VRC_&>?j<8R0jxXMw;FRD*!Ime
z@Dn(R`ZNFAZv^Jp{Ke<N4=pUAAD)6gHjT!_GV^y*%L=~hF?7!h5sCJw+q2xF#;Am5
zDVyVua4eApz?upBzr53WwcqzMesw|!v$Nq(c`Xq8?;kY&gS4TNzzcTzcqmXAy(17?
z&-|3B=bbqV4{JFIJ2M0#P4Cz=$4i+4T3|8{a^hzLxh0{z6-hvX^~)3URV$~ldW^#A
zS28Wpl{iU~5!|&`cXhSVds|sxq#(v$Y<mB$#eT3HFr-<-{UjF9%+AOOwkr&I_325)
zpLm;gljYBSbWPd%54hBxvS1Qv9vLq?5}8t9J7H&&V>DIyZdy=AI{fDle~}kKG_`o3
zUy&laKhS*3JU@EQ>~cLi9duHgI&HvsRWLly4=m<8eG&Yahm|3}vHykdf0vr$O;*3v
zPx!4Fb4Q9CYh;+lzk~ldPyO(l8+R>m+4uMv78STy#0MKnW*$~Z9WL?6Ql2k{wdSfb
z3$AH1T08&SCWY<P{NygUDd#)j9R+Q@EZ)On1vmYF=`V-Uev9!>>hSjmKfr*g3I6j0
zB$jP3+O=Ml7Ng2}3ojz5cwa_{px?b%7r*@bWAx7~$5_5%^wnu5CrEw)-<}PAgjR8k
zM$yD87Zea_#df0bsx^$RuBnlAbrtfbq<yb7`8!3>YIpTnEUTR7n_$QW&<bQ=A)?p6
ze}Fz%?!M)>SK~Qu>9Micv$IO?b7T38>)Cw>Etsvx4In?}Y+eur@@$OnVeHYos+SrX
z8nPPDniZno(ap2|OLDh;#hujEe@G}RDG9L-N%^m?HbGDK=G4@5nUb}&M=486IMv`q
zFH=%ebIQx5)y77@`&i3(2gJq4%gR|6649lxT37(*MQKUNIEPb^hgXZoECW#SOBfvP
zNwh_B;RT(kwwm&+J1NM@@=}ZU!cLlNY6L5h&6zuCG?W5QxmUb_oaZl_>#@nvNg}tV
z+b1*U5;e88Gl+r$izUYf0C-6h{rnl1vPJdm=_49f3Bnqm*Pc>~3Bogz>gNr0)z!}K
zrNGpv5+87F+4*~EV>3EC%0V2i2;ZinqV__d#!s+AwZQv%6%!mtVc@Aa?|mv`@ImEc
ziR8)x&Pw%|((SXiH|wqc;&(Rz+xJ5;>UZLLhOag-mv?Opnl@fen`Kg}w)lWgrufm$
z*Gl`v7{Bc!g@vYtW`5{s&KID{*1j8XDixDx;H^$YMTKpf%Hxoh=F&}(^YiJkt-~CT
z`&u#uw0-?6cIi-GUmQqp{}>^DIUGuTXQt@9o7%}_d`l3`uR;a#__qa;MO`YLgO5Zq
z+&eH9=oHCN(c}GMkk$R{UWVIz^Vwm?*Rpd--&_>x`eL8mEaMul_qX+a{#DmWYc0x2
z^+4rpgcOckY$$C#sAJjj=s=bEoE?#19bFU9MKjAMOe0#GH}hlC(-}vG_qV$!3}Qw0
zeHLJLYy;Mh(!CBH99QmzoORUsNC{sZx}gsP371!NP|Zv$PC_aBS7xpC)A|!Uuw7;N
zWbUL>^VvkxVa%DHN^8?9i^t~b<gTb%MN@}<KJ}xq{?os!+?o5xsicdMo<krzh%Y{r
z?t7KLe^}!CPa|KL&Ck8N+!1n~dvm$Y>w&<<yD2XgFloMNf9nWjQfsqC)5ck5uTG;`
zu{%CiSMzyY7+jA$=3pm&=5}-B<FU25E;gH|(So$SNfo#G>}vl(vq-ZvT59gvP2FXF
zd{Ky4+ZVoEN@Ao9EGI<O5S+<v&MA{vH@jG`N&gys>f0L@UxfWRNpteXWj|o8MoV6+
zSexwJ1JT#FN_W(JE)sIsPT;ia8!0)ycr>}5B)m`7u$YIMfjXH#)%w_OOLV>?Cod0R
zg3b1v>*|k99k98m$3dzg(37@+NPu@XQ~aHegJ<}x)m<NO!%wUi+Wf&@*P45~z4*k%
z<#DDu=`Uv**WdnnJ}oMHXOlRt$CRub>{qmBUW>*J7kd|8kv29qWRMa0>u%=6`KRw5
z4eByCvICsFy0L&EYrp?yg`YaCI>u#*u;<NH{ko#Y2X+%V_M9GCSX`RVOm7~a7?1!c
z+>O2=kJqSlGD`-`qG#JD1K2L-(4MVRljuqmj&;qM3Yl(q1TC$jTdNc?jjte<YNpOW
zMoXmEVjS7()TfBJ=4RdLdWR~&WUrGc{H6vw@BIqy=D%TJ!}aICM2I`B?xkry=g%Ag
zBt5+?WHWCZ5QD#VWjb`*YoPT?-qjjq<Vz>z^DWJJ$-yz$qnPU`_=I|3@A%C#R1H$o
zyeFI*xp=kplyPe%HbOXaT(<VMf!*gD*L^20z1j|Vh`Gp66Oy{WLt_7Mm3=koN8~N{
z9XYa6dZ2cRTF*jVQRaQe$az=@w5y<6eMq(kE<~rqGe^V2yS_@0FBx^p?YQj@%bgTz
zSb0maGPB}&?d$ZfpSOn`?X1d>O8lmPpRNQ^7$ihWp8wJZ=54)K`+Ij~UepN>S=h-%
z8NdGroYtlR8}>f7X|HSf1g^S7CnqQ9%I|x$8K)IJnYG&m=UZCvr@-#e^O2}=o%5_R
zTJpF#zYwtgP?6?@-gFE*Q#$t0ObLIi$9mF4Wz06y)%BY1kM(mJ_l4^iXyHGr{_eO&
zAP#s~ig^1D{|7WHlBsEC2ZgH@gQ!aETorLcyC=!-y6ttfFjSjBHk_y;5<FzyJZ%*7
zOcP$&nN?-6OTL{lsu@Us_1Ds1`}G$>H6TQmb-8z1hrGRxt==p4FY8LN{t^A52Y1WL
zccr=~UVq!gr>iZhTD*=`Ly&FT!&~2jS6Y+g%Fl;<=@Ykot{G9gR3tSTFW5VzZl+0R
zblxcBNuJK~=l%&)D8aRxt$(&4D3x|mu`kG~n8u)`d*FhyIXgRB6YS}=vpxIaJzqEP
zqpZY(CGcnOc;WOykSyx@IufQZ_0f#JDBkHtDAfG5r#`W}B1?aMZe3l^<pn%sx4|~e
zYd?j3AUHVRPW!ES67Q#!{fhGp3eJzlWvN0gVfzO&9~V)gRpu3Db0gt+dWi|#q{Tek
zXq~#x!dV^D4WIIx&+^P9#vtc&MP+|aEUiAE%+>_X#_g`nPaiY`a3AwUo1)v9z8H+_
z$#n1L>IpIZvG=!=l+ay&mwmq3qo_q3=%DrrZ2z5a*5}b9Xoa2Bc~ScWu{@$6=8TiN
zI@?E^&D~125$bmS_gsSbVB3z1<0-&h;b0X`0K2yrZm1Bkxzn~z_(h39>%5ybEF$0{
zPS8ZxwYLkN3HA~6hbIE{u0k9aQYb%voD~7}aS|cRKkw8Vj^2NBsjK(>`fDU_^nA?9
zm!Y-!!0howQTp7OlKV-^TFMDp7iSR&d1iGk3piW2{N1MT)wXRsn29pd?)3b53j1fY
z>pw`intpHY$o4>Qf-Qec@}TR^AUX)@OJQ)#jDixo%b|YY%hs4|-bU@t*e+NbrWvzU
z%E{zb5wy+weqrU=#!t}H`cdIJhmTrCaJNiR=+n+HdIM?MbD#N2msE+#07<hH`=V-Z
zlR5*PFDa)7AT{7Ejn7~GR{io%5t7ZF`Z0@neQE0wNqjS3K0|Q7cMvhGF<;>M)odeg
z79#1TxK^(2gglsH$R8hY*_I)|wSjJg5zn__^u*;m-**)?@6uU@6oe9l2uScK>kzpn
z#P_0i#h^g_keZEx%X0sVt+nN`25hqIG_YW?GbD(X^YN_N;v-?9<L48AnDI^o>0CKg
zq8H87m)JTjgtdeI?u*v^*<-wj_wjYs)228F5wv0^zoQ<T;+UrIyAp2#G35l}5sXu)
zqodQt1y&@i3m_<s@2m72!okx~Khd=sQ>z?vTx5zTs45x)WDE7yk4UMCUABk@`hmLj
znZt!yUps>#jEszoWbN?#2p62v%E}`YFWAZXJ<5t7OSP>R+Sz?puzT~q<VbU=+D&9s
z^^!{Mq^$^uaR+$}m~3*;-tOP@o?zQ-x$!ZNj2zL|ziDeW?vg_a-P<J!xh@l#)iK(=
zZ8qs!o|DtEjkU9LRC<c^^Em8XH&L#&vm@>2H&d$nVfhp2h0e6?0Cz`N@KkN&7qXsY
z;$-s5KeIkS90zf`HGtA=Aj}pwZejJ?8jOo`Zm~(+wBH<spNen7%43K8xFz;T8CG>Q
ziE8nX@YOc@Xc?osqk@md2Uem&s4It&8HXP2y3qY~^uh=}`pw_p*dsKL;x{P_=aY{z
zXgAw3(PmbtpAlGkaF|=j!}~X@%5r;Nzas?)e14?7IyzfD3r7@Z#@2S2=V~B1B1E_B
zwc)d5N$GU!n`3!1ZOx_wqA-=EN@xbs<p;-1z}0(oC#U=brv<+@ALA0&*2}(aS8d_c
zu!`E({prFew+o{Xx<4gl1X&mzlVgy-9a+tYWlk-_l#7(xJ^Kwb&6~`>2C9psiCcWu
z^*NgaRUsmr7XzWhcKPX^F*~gQ>%gg7OOmFgNjhocSQo4d-qhJuKE6m5o8<549oN#k
z$20R<;5e)0bpAqRq6B3aVlx&X7C&ao>$1fJE2XAF_OGu3#Xm-SXVbEdDc&C|>gvQ3
zJ_`mnTcVpB5>tTvJO`@YLOesl>vFIP7gAX_IGtZcmn0SBst?SS-3I*ciqtZvo?Gv5
zm8d(DMt<aoZNBif^iI+w%_TT*2w+2A6Ts8$FGp%csl@x*gNd_ILrJ_Dr&%)NBK#G2
zWBT)FM^ZIaYh9HiKB%`jIKwGd-5O|NgjipY&&_^|)TI7IlnBN#jX{~=JdO4vYADZg
zJJuQAIDA;{)o?q(o=Ej)T5*zk8TLh`%;t#n5^Ax*DI`c~cvsg7ZWY9Fhs!_?!l>IB
z{NiTpv9$Tmzx!A&9j0!S+uoAIQbUp##=kFSVf!+N%T{*fWUrscTIb}}DkrCBj5q{-
z(`$0=UE(2V6Dcd$*I>Q41vDF_Zan@d{c>DZZ2kJY;<dq8Z5Y$Ob)cw~(NFuIi-$9r
zb4<cF=cI=R&C1xe)HafL%pQbJqTG8jlrzL1XVJUo)y?b>N&UPG$^9C96Fku>Q*5@?
z;wBZ9nY4eV48*T$^>D>H#B$R1Xx&G|$TH!lDlLEJ4m|Z1QETd|+K>P9>TGB^&zPgi
zZSp+bd(z#e`wBJVL2kuUx4A1j)blz~(}R^>vRtvv=R-mB6;`O^BRFBX^33#3^<fdg
zKZ(C>zPk!eAF;+&8Ae;Keu{RNlN~#6eWIm(8BmI@_d#!BH=IPe1((p#Ioe-XZEf5E
z!aJe61LHiU@vF$2LpKBFlXqmJjgHcv?9NAn)@Pg~><@*=uAT2w5f9E7XJ>ZNy3O0z
zP2#NFzKzp^H(|I_t@k{0^4sPZ_8z}?_a8rG4c?R4_AiSM5+9_VSl6}`Gdf+K*q#3F
z2>QCqw^hAS20sr@uTb5@a>v8Nqs{nqe*6r+Kf9SbAy-EtF-cZ7Ngm|0%+-2*j&v<k
zbPIA|$QbS<$^vp|msPv&aM97g;7=vR`0Q+SY>B#u<DrZe&Os5GUMCufi2a+t6gnb*
zEYjBTG+xBx=W@dWvX?RP+KC1po%jtZjE|oaRO5~L<(7FM_HFAv30RrymuD?Mm=-NU
z_OjA*S17R#4kzzn1hOxDFrv&rh9a7&`y1ulq9?8Xpzp^+i+RZIBMHkKyZdD8*Ln`^
zXX_w3P?L_<>G6c4tcijg7xBzO(*6QXH<IUu24{aefoLzS>r}f0+EXu^vEKa7S2~I;
zn>URIxuq9fkuM{niJ92g`XT2Ej%t(Fgrj%8rgIId;@5KS4rLPr>z(W((9Z{4w4i3|
zzXefOwIzlje4X!~+cjUax+VzvisGQo*3-!ylLa?2yp|l`nd+b4{3<Uy^F`H;854}1
z7L36RPSO!Fn%s=CN?XZ8=E_4wvGr-*6Be#~(LkV9spEU5##8mY>V3gS#*)hm6$LJ7
zRuaF5c=`LLuRd>j=27d3dVBudR}k*=`4><GHE6Zy51@55he=NmKglP6ix~iwx*scX
z!>1!dTRN!AHzCiOC(Fz}leJ}94L0pJ;T`nMUDq^r?Y8vUuyNVKfD1%%<|8tvBHV`M
z*luQ`yvjPU06p<e(=?A*<$8?gR3JUNthiWV3#fVe=Seh<ysxP-(=PIyo}T7&HqT~a
zeM_&qZE3X&n@9+5o)z!qe)Ql7Q%|T>9^`_nsj6CpU~_O$ZCQQ#!rZ7O-MYTDMb#^W
z<^6m3u|(~Q35v4(V>b)8*Fia{sLa_}U99t$g+*Nv)ERMUE0j{Rm$1U+MzNdH6pZP*
zCJ`EaH)$ErL_oHHzk(`BRv!3A{(r1=g>f7H=b#}=MgWHvB=o<MAAVE!0`Me&BgpB$
zGAz6-5041_McSXUKQ_X6eNsLQJi}eXO-xAR0H=5>@_&)X4sa~SH3Kf7Fh@K@|GQ|D
z32fki3laEg&hka$RW9yAYmF&)gD%$Os!5)@1#tR!zr+9*2#em~wC^5WW!Drc-g~Qk
zPCIWrj)@Y@f}EP>V&Ya}K#0<*L2=f`R#s@eq{Op9ai)J&$SFM(IX~$%N<ZN7o7MFW
z1oF;=R;HMB((`i}0^cz4N}K;(47+TMf<?o4I+II{?9%9VOw5i=Mo+gAJ-@$*|3=ul
zD*?Wa-ZSJ(%&%Qb@<b%m^$U}1YH6lTqgvhB=gM`5J(9@N;ceYr3LukV?BG&Ad>t#y
z)TDdeF49Yp(lRa%)B71kbEiGIE$yfC>d~Fn#*SL%n&j>NK4hMj`3I%iaZ|l7>5Y|T
zqcrylfEL29dy>PVSkq42`yOgBE&5d<H>)J1-yVZ8T-l);u`f0=)f0R?MHV;5RagCG
zddsQFx+qvXwrlLmB4Ho8!WNqsJebdRNzd(|(-#5iiW6*AS3}fkdh^T0x-YH}-r;RD
zLzjiWYwe~lDTWgkTjr`(*U?O7>Z)j5^NJEGSBfu+eY+ZKuC@le$+w6h(o2p(tqWJZ
z7gfS|$gG{MM+sN^%MFh{q?5o~>h30y#g+AO$j;-O&1P&jTl^1G0n5rnl*x<yWbP!l
z2M=#yEJHZW$JDMy`zVCHJZ4ss?~S!aA~_h_z(PJG;(LWiug(kft4~8Wu@Z?pa@&6r
z111fHX{n^Kk(C}r)+o44Ffly~2+7{|`$hi9QHJJ{;yn~ii~BSK=lYj$SnxmFQ}M8X
z>*2A_Bzt#UV#!kU2BC@h;~f!f>vtx(41z?;Z=RrQv9XRbCMGm5LbwD4YnES#L9+fg
zLt%e*BKG!3x8+M)n&Ic7{`TzY`5x-HSY5c)WpFGbEspu*=%{6nqN1{L-Esl8^mDB7
z<-6mit@NJ?8;gPOmf>d~4V%DMVWzLu6j6FUQuSVSBfeN!dh+sLukvNs`zr)`fymtG
z<A3-BP}I$nz*Wgh;o!Ekr%(RB_{4Bq@eN;2etx$C^DXIbfBz45f=bLt`(6^6Y|`*f
zLvPv4&fkbJnx!w7gYO2UzgyZ`Mo$2x6+NZs>S_TjKXV;nJ=#P2z;YTK;HxdYQjv5s
zgiZrC4+Bh)Gc%~}mi{bXZ)j)$YAm>6OPPUDV}>D~4C<eLOa@U3c1k^m?M*nWI)_l%
z1hhs=cN7-?tiI6%v64eOEWc2+^Ea8P@V!SOLZ92xLet{8U)t9S6V&L~OOrz0S{3Pl
zDAcYLD@Z{+JH?XD-*G5=|LrRErJ<6^y>9bbVRb(2yKl6ol}3D-@kwYH3Z8-J=^P8b
za2s%n5Blbs^hrWg&G~OM<80Y$62FFp+=lGbJVMF8Hhj~h!p{DfN;)cC46$SH2*UO;
zV)j`O>HL!_AueqGCqKCF`O!=Kb3<w>yEN42g!(c<m~hv4@gT2C02-pMXPXcg_u$!Y
zdJaewrm~;k&uW3X-)jRpJFC$@-l*u|NAZ}0r}Vt)yMVk<LcYAW`su{0zP`Sk0*gwM
z9JAjO;dzbCs-AP9?cscm_5myF)wdwW4}t6Y*B3<=rW-f?Y~p?iM$~>+jxwzfT#ifJ
zKEx!qh7fWrfH}s0NXQhCZbuUP>fn0I-?WoK-S+t>oNP+zNK9-@N=q}A?G&!HbKxPK
zCm)d<&CwNb3h$|}D3Fz_OPHxhBp~jK6;H=+BK59p)L1J+<C+XzaK#iw%&|d+V?k$z
zha{R947QrD`j}amP~I+i5-1%o$q#!k@%SY2HG+w`6J%p=Gd~o+RH~XiH;Dz(-rY1h
z78&o~b3=yJG4<BYMToyeP`Ad++ZdgVDL=$0SO9q7SK#WG`|NP9_l0RbhOm~mG9Yrv
z1p0IQ>7(|<1a5B0ql-x8gcc1gEwj$b!8Kv`zYNKuHkH3pt}f@z^v32}%^;zHU>Cp9
zbJ@A%r!Z}W@qLeUFxOU!18yO?VaVB`Yr!3Ht#Pa;c=-%xxayx4KE$v@r%8XJ1Zl`k
z@n8*6ZK2Ne><eu)CSK=<n?Jr1l*t`E*W`xG?D<B?{HZ(QA;b?O<Z}PLj!tS^{BD9H
zS)7xj6Ek<Kw{eUMb?rO5cS=ez$JOt9`}^b4b`;oVAjbDG$E%#}$rThARwRz`H)fwT
zeEq0{%qfMBWVps_z0===P{s+XK>iC+Gx!S#*8N8BLPtkuEPZWlETTclL%tjygVC|E
zoH{`vL3tOK^!Jm0-YMF&ynnAL59&ESctDg;{r>tDRw(hM6)uGEW#{1<XRhm?ub4<S
zRSGv?v2(aB#NK%Nls-rTIBSVDJ7?A7M&}EqDzBhGQwXoW?-vLI7AB^SZP5ZUX{QSh
zi<4tN+1A%%iA?hude!b`PFOl=Yd6F_IJL<lfOL(JL+<wUArR2{w?{Tznw^e1R#pnZ
zP~T5)h^ykwN(A;xf8K{|Sb-QB1Br&#WM5%?QO@`8YJkPaE&n;CFXh^AzeyVQ^|r}X
zw@q!nh?^nF4>QPyI&kZUGGcfF(-Tn){IlN}v)H-QK!VJ(A-(eF%I7MpHQlgS@Vl;<
zh5T12ap{$l)7Snhd;j`5+Y2WnBmZyIQf~^awsy*Ga2y?Tq()Z9%ZsV8K)c=;I^gPq
zlT+1x<=|94hL+OmR(`~aLqJkKnHaA%a|9HUFeiY5T>Qs0{}bgumQf53uXM30C`L{g
z`lOhbIWaewOu+e}fPlg}9q)Y+NB3?r^EqOhLke<Cj+v>9#KgpvHrqneHAS;9MOe{G
z&yOjDh^wM7aB)mr^c-t<c@C^H@87@wSBmKEjsE=N$16>_GGwJq2#0QUzwl0~l9_~4
z_XEoA`d-M=U2ux=2N#$4f~R(gg@x#YPy!N~r=7v^?_8B?<HnDDQoD4V*7|mRTY!j8
zwoH#Jd`*l3!TXku1M**`#k&En`}3S&SDjm1JLslot6vJfO7gC*sE9`gQ)Ar7@@5o#
z%mk#?p&K=<CJ-R2Ke{K=CkVu&_Ar6&Hy~;y2ZFO?ac=KGOzHGv;>tQ{!qQT9Omy<I
z3PVJ~F8XqY-V5PosQ>9xY?|+g8x%3I3*xWAV6eT5a~rhf>h{4G)O99%F%A*WArrhJ
zuj&w;lh-}5@lc69_~s||=B5R@xg`7^C*&7BW&opu&piR?WLwxLx)j73X!)E@)H#%h
z^5auk*<NhO2FMDBY(UA$<11U7LnN|>0Oes+)Qfi(P}9r-7CjKB_S0W*t?T7dmz@Z!
zjL6*?zQ+v!k)$KtFM{ndJ+HSH-)7$Vm;87ga_oj_>IEk!XXP9+vp7*gS4|~~`}J!X
z<27lx;bL%vQ%+Elph_8#k4bn-=bPPWLnK0wC58Ebl9sD$*|7_1tm?sslhe|k1j*da
zG2gf=`=tWs>~j#6=pZUic3D){ZTGbG8M{{5w!MVRAlAk{=F1trwY6okonV8-e~5u1
zRDiiu=m=`Q9TVu(?Uk=z%k=E_URUKK)p>%`aE4L9J(5NJ=e-v2aOGkV9BwLjb-jKa
zBm7kPoZ8I2-n`S133F4e;HCh>Q~al(s15@Q?Te;ID+f3Z`q6BbRo^eg(kkjyTG(at
zCRrE3%96sc8x-$%N~3_%6rO?};PMThJ$n{5jdLdYBgZ7vdR~{U^<r#}&u8Z+Nu4r{
zRG!R5*QGK=$c~Xds8lIIugUiw@;|MxnybtM?)1;(B&^Iq*5?JBxNmcF^FH^W)V9gl
zSo-Po-Qs*h(I?%@q;vP|=j?9&ky_Z=5}tX9%5~$d1M7U49`ujlc075!(9`V~-f}ou
zbicItih*j}X({ya!%g#tWUSxf@$MwbL7^^fHlo&PB=i*hgb0cZH_NsYQIezLWcA$o
zpDO?Bc5rJ1YbqU<-?UELNhG3FW9VY;a;4gK&m#*DOtEJA^Bi#v_iEn+vl9dDKL#KW
zB2Q6A!KG#t7GCg_VhvGl#Oy#HhXwHm4{9Mlx8b#r-TV{4Qoy&54dIIb3FD0L1V4{}
z(e_&ea|}I7i}^NycVuQ87#B}F-x4Jj7hg+ly>`1TxI!b-gB5B9<``jFUgMjIQXRYe
zDotQU@L3+;0#$gjvVN$@4DveD{6{!Ml~>0!8+DpauiCVN1ti+2^DFe7Q8r1y<6E4w
zQBFj(1en}REG8yeWsj?K;?dD1%G)Jb<<f7yJ+gi2RLM~Jf3~IaQAbh3<Lb>bZtglM
ztBbA;-XF}YtU7mF?7=jY76;G&-6PCr%J_`U!WK=FrTJc$sWT*g*axH~U_#N4H{AP*
zv`Wb8n#M^;g>82p_2v~4K|-;CD{+>6u2v5W3kZIxI4pyQlf&d04~7I_M4<+@b;W>`
zaos&UW=|wykB*5kmK6YH>j2-w60SH9lQH3I`s~lDM&l)9I1vo-QViW}onx0JpmHk4
zR~(jm<ZNw?BZ`V2H<ZGG5ZpGCgp}6#9X<W=%$JgW|9+W@0SeL9Djq7Ih%8S7<Q9+-
zQ<^F-=Hr*(C)Wh)q3;qXNC(>1!n8fu7jLy2`iLrlRXLdnRD6y3?N}+{UzJxoA2|GR
zlhj$n#UuWI9~`Fi2B2@_bP4?T#W;#Uj2$CA$Zf~Y8GGHPt)yqG=L6Z0zhuW{u#HQw
zO{`3Z0_LVSr<aTn;p5CAxr;Y}vpHci^`t@}aY#g3HIW)}P6ftF_a_K*52T9A^n}w(
zCBP@|-oA~GyvJHSZUnGR-pPz?#1BL+A|FwJxC5#1Q{{sk!#FuhDqVpq)#Kk^qnOl5
z-#4E(6fFv#VJJCZ8`|KxVU|lNcWI>vqDN8VtUpvY95>7#dHQ9JRTU$$jkFUfAjViX
zR9G9QAO*-#N2iF;8)wIP@|LoUx$MDRK<hG-$Bzr;Y*`>(zYxw;DNy74eE>ApaM}38
zL|<top93>9V#?tY?#PHriWpB%@ap-wr_SbhucBvat-kqdZ5{LKnE@=H{{<h^`pn_O
zBrR9$Wfh^HzYY%Di`q-qN?<`cKB?15x8^b$o4dS!+xhe<$6W}-6Ek~Sb0iR{!m!}C
zV>nj;WO)W&j;ol6<KfX!<06Cy5W!I;UlEYkOvyiWw`$NS+@6cMm61BR)Ff_f{{tee
z3?}YIBAct$)Y13v*)bb$h;0Ar!4ISq@9#TzF2s)S5<FF6E2MyI$kH4WWT7mqtYQlb
zEuDIq1C9t}zl%9daGhNtw9$t;Uq7zMx7x+BD=Edtw9E1_j4>a)ELykYwu}!!S)esW
zYdYZjzp1eNGBBv|{(BA0<eMgDZf<3OGcu1@1Zl_|@!vVz9b&Jo?j^k@zp=SJ6Lz>9
zEBrskx1Z13{B}*Mq(z5d!u~$OfdeIWgcfa+#-S5Hj65;(qE%gWanoS1*XYvFmnwyn
z)_}Q;dmvVEbyH1~%y(HWl4kZPnd0lK@`HGI04-Kl{(mlV!0)*_6D6|C0!$3ozxvQ~
z(O(P?GVBeEY3bI{;RVWjPsCDzz-E>kShtVa6%{j##`yR~@gRQlz>*y<tFHAt*Nlz%
zw|)mQEcWj!PL_d%&B3>@sJMQBx%$nw1Kj339`I~1Y#^bh@*QwS|95$E<Fb(HT~O!T
z&vw<3a9G2eI*G6c06oIEW+d1GqS-^(PTn$K1!`(<Lm<+2a`H+E{X}-SqYR4f-E_yc
zq*ZR)rFrn^atyf>XnJ?xiR8`!_(92Vf_$Wj51?>jsubYF%wZr2{;P+(2-5B;$wN@$
z^&X=`$}z04l#msrVE*P-%S_COQ7$f+Ju<d+sl(qSwx-)?syiCAvA}WP9%mXVdvamU
zv$3TD%AeBK4oh+&X)i;AGcySL+vB18r6dy|GwZIrwS2H}=5UI?y{8wADUxzUk8*ky
zblNx!`K4F%VHGl?A<!ZD-p>p6{^*yyzzBo<x=Wqd%QY21C$SN!33_oCae3+!VlyD!
zv0Y=d`jP~R@hJ7Ap;ckYZ1gWT=G%5!<JX9LY;5*O>OjN4J};!*uk2F@mUVAYGjc6N
zSl3{IRH!A_SoQL^En;Kz+mA7D)(Y8<>=4~?4;2u6Jf}Ro^ZDdu(DcoQx~4R^qL_J?
zw16iQPZP6w=tE(4MsR|j?GTZbe`mkL0)2BMH&4|Qa480olPwHA1*r&>SO^6HAn?!s
zmoWF2@LHms7yJ08nxOs(aO43i{a15B!oz2rm^!uRFT)_-CZ~J1J=UfvzQb>1S!vk8
zN;;}F?{!2AG6<?x*4Gi6`RN=Rv;fCAM5Ow11H6F`1Xdc3W6B7JwE+%vIJG=9g$XT&
zf@*S_5QdK+*E$(|OSG%aE&iNJZTMZC3-EC3z||&7^|--{f2&`w-1CGA1mELdcr<_&
z^5;+bI@>vX>I5L@!oG7?1<;y)gXY%O=qnh%#S$(E&M7_SVPwH@u%No<lX+G#R-IvA
ziQ~VY)buns$$-#=ot}g2pU70e-+ZGHc?s}r7S;@VA|t>J0<<-h@GZSdJ&oJ!2sSPN
zSEFw(_UdpUe(;xuZ*+$PIxze2k{ZRsey*G1osGhgMp$cMp<E$b5wxw1rgvaq*BQ_0
z0!>@{Qqr&uvPl9gE+CVl8>1eRTb?DYD@z+WU}I%fv#*_-n;YWIb#r0yS3yp0&z^pF
zcUDi|i0z*UA1I2nV=?{S(lTY=$<op~u2OGR?Y#ig3P`CG{DQokoc&|%Yx~pgSV9?q
zk0QHgnUB}6&o9p<JEm)_5*zHQh-g1Pa@0mM&8`;?A*ZI8fC0?RDd8Q7*t~)FA>0sq
zb4?&q?HylLrKosbY3;;3>zw#LLscU4=*69jsc%HRL-Y?$V3?9whkE3rv$IS=L3o%F
zxFdxilcq21HYIR;zuV4`y3z&M$Fl|xkF`@K*212Rebd*kbN?hwvIBJMu<A~JHoV=7
zYt@yOlP^;Y#thlv#O6P*$(2t8luiqim|Fs#t`vYn)6Rp)py$U07`AGoD^Wkz4Rtk4
z5%oTXFh7LOF$(}C758N7=*s_%%9r(h??Na%GOwJpFrNtcq9lIsd^5~tdjc^w)XV_N
z*%H_L9B)K}c*45eViY#YB~tt_(Cct>9eqd&_l=JW+}!oqJ4=KPrjhQfBDfmf<te1^
zG}-(w(rN~790I?&Iz?#>ieKFUdzgEFb&<6ReI<3E-i3kpI5`G9mrN7mHuMM~<&OT^
zieB|Yr)=9@mhAJZr3%?3WM1ziq7O&j(%;jN`Zwfzz>e$z6b8X>OuWH9HF!FN-bX>m
zc4leYMU$$M>%5Nw`Y&|xeu*&3bJDA<Y#LE_y{Kh6=czgmv$JhG0<r9mgJP!&WPKrl
zdV|XY^D!MAUKeL#nfsGmjVkDAv*3OB(YmjtLDBb0wgnLu<&39h=^ll|m5YI}ow#SQ
zE7j`C0@U2EAJc28W)sZ7pWdP1BCOZHIOKl5uaGQYVf?$tV!`|JzzloBEqD8pGC%zZ
z0ZqNZ?;cPu8hIF@eRDa<JI64*e*nsi5K{gX>~H<IWCaSukzz}p3Xp9nOP)O!ISlRW
zz+d3hsr~&aQp#$QH>7l|hu$rY#$I{@itA_2<hvXrZx=_mLex@B&QkKIx^a3mBt)}N
z^3pz|Mck<4IrS@1nYUB!=bIEcrKP2vHZ?Uam4@w4o^er8@lA;z5C7nE+v~ydjfyY*
zA$q^Nhb5|i-Yw6>q&lQKQtJ8-K2-4ZM<jH)dtfaRR<w^^TYCtqp{9FB94w2uNk?C2
zw=NI*%0X2iY9FC6Q0WD0pP7+SZ_T%|O<&2Cc{=NXLgI3J$hDd9ErA@}e_c-AFO~yH
z*JkeFq%><7-1JyaR}KWn1Hvh$zrP>7%Cqmi_x5Oa6<7^qzfg7S*T?H%3>45PyM&UY
z!byEtQRn*3BQe)Fg)|<0^s7vnL>pkI@eObvZ~F)OUL&MT>dwB+zF2Oa93Mxn(n=Qp
zvXy@Qsbtz*yT!AlrTB%{-s~AIC^d#P_d#SBxBU3HIto!hZE~J|<_o{r;h)2u&PG?3
zO5MPYpIMk&@01fkp-nq(Fu!SgSyI)3`LRzf$v_AWD)bSb0N`?yIycVw)-&}Doy!1I
z+<}b_S@*594Fe$hS>2p#ez8s~uc5bA;~=-b@k?i!AB0FUugPt*zeB$Bc0xZT_sSzS
z8?#!)zCPrxq0Vn#JOxByg2$R0=Rc>(N&O1r8sLohK*H;fT)jPeREc~)bMr61btW9!
z_gvg+qO^{B{QT_c?pJzV<0J^%^tkDy3<h(OY!qJ~Y_#C2K_$146MntTf1Vr9u64$i
z|M7+BRduX2RLL!f+n_=&!|PB4hV)ffby(})#ESHue}DDR3;tVwLhk4FNQRJ2Wy$B3
z%R}n5$Zb&=CVWj@>89BkG-HRB%(E0k?io*n&9RrkEy^Z`b9{$uS{SLQ-tAp(O9;K&
zfQf*DdJ0f4P*^habnaC0xFwO0C3L%V6O?(K-pasF^I)0HbU|Cteh$$rPKS<%WsJ>a
zXU>t$53#bcBGHk`Lh)UEWOt=fPQP&I)OG~#5YTzODm`np3(;L$MQF{0e;HGj(guYQ
zElAg3O9kuJPe-7hi$Pke@&=+q^QSZP28<<ZEtlv7<j&B?flIWo1i{rR$!wF*!?~t~
zzynYv@<pC<>XXg9`wjLZ_hG4?#})Z2!OzIV=DufRsTHMwWhsex^L$=1qg7fnX-HXW
z64ali)0rb3e_7$v$pZ5MYNb>6C@cGeLo`w20Hj-~=*g%}JUMf@N)>TRAzsS#sZ~ix
zf)ozjtc&f%WM2Ml!s2AerV~TFFHu*Eu~G5a$59r%%sdrm5WYDygC`IY|GlZdK%rr3
zRRfJp`^Cw%-WCOCaFqKpt&WJ#P_flT5)^2If7=&C`Q9)ZFzcL3(s(Ug^O>0YYb$H^
z9&y8sGmmVl4xE2y6C@Y<z*|rskHm5^V@FTDI}Un&Kd*YxY_!bcv3pVnZ6QSEB5PB_
zhm}{PkGwEN%CsM*vei-<p^0crC0p+?zMZ;gy&8m}#fBxQ%bE}KuHdvY51rQy_R+hX
zqbT~hg|X8*P@(<Et}Dbf9nTLWy)&|S8M3L0eV$>v4F4mQ5kk9j(NL2+j$3ojRrvC>
zw1F>+d9hsP$VO06hwGU1C;q*BVYl@NK96lsK^sb(CUw3z4p-s*^#H)#yYj20zSlaM
zCAyyq4O2~eB52pnBgnTv&DK|g0OUmtHQo^yWFE)Al}lbt$^ZRMe}-I{neZty>Yt@_
z&4&PlG#Ois%S#mEXiZn=z5tEY2hTZbXU&q2oMfy@x7_thvMv%P11Wo2_hC~RR>NaM
zT--xP(|`p?hGww%-t<W1^)(LeP3W6^&ex|13x1t{@{&Ctbu%CD*co0owW{4}6tM3T
z(0od1I3E(sZlhuUd3^q-FzjJ9l`Se$TR7rW%>4Li)xD^M1fWPJ(qm1e5cNhKYgd7^
zcp22bvcyi!&y~>;Lkm9Mp?90JlH3<Gotv^a6{RtThp2G1tUS@_C33yNiTuZf35}af
z@hImy#ZCWBg1+1V-+h}_v678eOCh+@k(D;#=?53INPcQ~w64c>kk(EkpWS@EtAqx<
z7thdSUKaJc{7j#)eTVa=AJoRayjXfy>!9|zi_}f@J{pwgtX@CA@&=+nUXxbtbf$C{
zkxlzGun>@E<W;vhPm6NY_h=}4>v^~$i-v=W>vpCAj?&V2-uY+ZD6g@jCJ_K*dYx{u
zdr^xt`dCEWV7NeG7Jc7k8?aExSfg4}K7EFhZJ7<EJf`qId5JpOy2Vb`6In-11R2)A
zHT{K4OaK<thiF$DjlZP*Ghd5X>k9IMM4y%dG%G|s;4@j$WSPN!lRiu?fb`=igD0kt
zc-!-F+(|4WwyYU4%AH{u(qlZ+5}x2YDecZ_M!DqMDkbDSbg;OB!+{!q!>izM_%^BJ
z6j@TdCdCy_724ltjhNGuM?brc`GqiDn*H_v0rWNO1*6>OLkf0+Jn0*Y+dCm!W(D!`
z#4spywYG3N9%ujiYAeF$B&CM7+e~sLDqyFesG5F`5OK{Vv>lFyS}|+2MymL0U*yXK
zL2W4PC2s)2_k`iEsI!dqVn<i4T3HEhy2p-c9#uwKn#m+y{*_G0iDYEyP=3$`<z%_f
zg8xNw)YX?Oy+0>CBIXqX$Y50~bmPX0;OmyF#%PzZaH;LTUYsSnJ$M^#{7|_Iv+V8O
z8mTk=ke*__NqDr&SuTa!2RG+{^~<BdYMVEfhzT3Gi~gi~F13H7J^_H{oAu1nfe`!#
z2R6U)=e_wz=VPy*k|wKw;vz%#bIt2D_2oKWxSm}eb-^$G(dSgVdczj})CQ|Kvq(w2
z)}M%Y@$oI&aKde3wRZ2gMRSP53=1G2_994g^Crgf^=h3G_eJM!4bM%~-fwm<DAUsB
z)UKSJEVQpj1$Y0i`laW|!S`)P320w;WP7j72|B)eN;P}vNH9Z8IH!2?b=!v-RFVE^
zgBT{XMZ1~=+Iw$M%~roGC0`4FeD1GN?{j(LvyB20jxXomw#w`>PT1FZ93?18Xv(Zb
zzonaB^jwEc$~DnFrIw2~xVa>$V$G|csu~d)dA}j}Zu{K1Q?YJp-qObHk)Wr^)IEu6
z;@9l6TN%C*=Dri?IFRNMSaN(}M`Szu;M}PMy`7BGY@DM=O5ZwrSLIJ;yF#L8M%WK&
z3~T$AWWU4v*4dNBly-1eu?nGg5q<TxG4xl#nx#v1kw2UJ@hwp0G-3jDIk#$R6Vxuq
zoC#Y9B$?wZX&E?A`Kq9yri1^7z-j%At_tN-<&}6PlQ_0c3%JZ|oT}O?Ani6Ve|++_
z^@-c{ZYKKwY3<CTp>F#>PDqO}xz+7KjEWRDxh+|TEagc;DN?qZEM*^zG#DbfD@*om
zLc+*a$lA;h#UutZ$k@s{mLZI>jG6ge-S=~T&+_}7^ZT9WJoC@@pYQiN-#O>{e$I7W
z@7L%34(x+K=_iI#BA_=b3}&%yZszjPlfj3@pb%6J@aJqPFR@aC#+H>=t+RG9=OlKv
zpZGM8SFS^^kt3z)uF><aBP^O9`09<bR^pgje_@Xy9F0v|d!OGXIYyrynX8m9lJt&)
zA(QMnn2;@@+P5Z}levRJbPweH?6+|ato%fsh2BX2MS|~znx{?Arb8{`@mI9Wj)y5f
z!&~xv5e1tIIe0$Z56!hbr!|n2>Zg!PeUL9`r;VntwN1AdTcbc55sj7jNyO~xRc944
zp9GiHDas7o@?Q><%v|iQ45PO)NA;CtQq@_w@#l`0X6V1!&*F=fL^bU<T}Rq>R(DC>
zx>5Zk<FdK?{lmPLI`jAD%kvE-9{371xu!}w`9u_&n^2wCoeVI+XQ>@~y?h{}kxyn(
zB*w_8&+3w<2HUF|V0*Am$BJ1@H1vO3M#F}^(L<HHOgG-HqVV>c@e!N2#%jdO-HDY~
z5vFGdYfYa)pZNASXeCqX=m=$WwAAe=ZRr`}AP++e{M#ar=RPngL)4i>T_!e?j|kcn
zjQ7s|>aJOB!N{+WeB(^Pir~9EFslOElbvm#wI-v13Gw3ACoC5T>PFzPIH?Z=DdTxo
z2#Dr*lgeh<vlM;0wTAg!;CD8{H?o6~VLoiVRB5gH6}+0U^gD54olntkP>a#KzScT6
z2(0vuKcKwiVE5v#QWSg}etl8zyB>3OY+q1p`xEAy)}X{k39&D(-+=S1t#uKUF-1oL
zOXTe}*J?i)$KiA4*ivNad8q#GUxjtm{lm%8yNs9D@3Hm7a$c<ib2$&iF=`<jw32id
zWrTH)+s3_TQDW{ml%UyVi!U71bss-cbNM{0bgONgwB5s#uXsO%d%72*=PH2Ws4R$l
zcY60VSGe`0z2E#FIA$#U@^8z9ZSQbub2#CY0!B;}pCI*HD}}lt`F^}=xC*NKMI@r&
z-fA*)?5o7_2dH?{MCqC4r3p1^*3c6T9qR()Ti1abn_|_wUz{mVHM|BddCX^03p`JS
zd<2Ic#5ZAV&7|~-8%Ngk@5?NHI#Nb=^Eu)Fs_qJWaMzc1`<R3$8~T_My_2do>Tv3Q
zex9zm?z82$z0q1}dv7{aF*YqsTl{IA$2jUYbk$%BsNS=p7|L9+WYt^AJ$LC;X0W5?
zY;MPV=BIDtPFQByv+;OAjEVecQ}fx+oBMhCWK;^B5S*{>v0sAA&?<myjOgqDx#EAK
zouX@rRS6TU@>1uCwPu5dkbyDcej}Y(1eULw!5#%+u0#?#phj<lu`cC1WL8MlDG<D=
z-742WEeUFSzrFN4boN71>+Qus9|WD`o1BAY3vO$fq~XhwajjJ@Aw@xgJ|bJCc0G%J
zTNULu8=Knb9C%q)7Ha$h%)EmzxZmvooRMc5j?&DPkx+tXQnam>f$Lbkaj5`mb;dRv
z-r?HubeZBhhu$rH_kGd}`AAFZes{sZt)lR8fS|sJL9F1Q#KbC`;WD13e}^IcsA<4E
z6Pz@yOp6V1KlR|n%u8fKv{FVrzjNAP+~Wqnl8RDR`7O`AAivV39~O@gB|Kdn$z+9O
zPIPaMvs?66@_e~v-b`JU-fgM=4%+LmR?srr#f#=)9#CT!khVySjO=uUitcVEG^ioP
z#-*mF#`~=q^iaP-UY*U$>_b=7gC5xts7t^2K(o(H88o$l`X4@}J~uu6C2PGFYVBc0
zCJHfDb*M&-!&18xYtr^fjXp;jSlIV%>h+kTo1U<+Dixwt1Wp~q`gwqB$tCp*31E2}
zmq=gf@W@k2O`X0iDci5se|svn8$rTBslRQg3(=G}tO_+f(TirHshF&N1GWT&VW*>&
z6w#&cMNyq5k|UotY!*}}ZQ|*OUVR~l%yq|IZW{pS5X+LumZn$y-FL`ue2wGnU!-*(
z8DGHa52AC&in`J-g@!)FWCegkfc+Myneg-EDv7(rAo003i{iGLJd<p2FA3tZ17Glt
zZVLFuKXS(Dp5wLfMUEP~lq9B{er>%Wif`|ifJUdV)$4YXW7xj<)HBb~$d>ikoM*jx
z5geU2kE<868@Vk}+Q@|f%(?bZOX`IJ<1gB-e~CktS2j~8zgO;0u|&1K_B}k@QCv*T
z+mJawCPOAgM3<^Au0&S4?nvBMnMkqJ_nOF1Mj?@Pe)~Ggm&`+F2I`k~@(F=<;?J4F
z?9gv>Pi6>Q)M%X%mTU<hmNw3>!rfj~Wi^))rjEELULJ4ZMcT9<DORnt4%Dp>6@(%3
z&9iA)^H)r-_4T<iLabr+h#3i@D#2?9GdMU%&5{e&Ljc%yLChjK^%`k!jPz2;VsVci
zmcXJSi@IKMPll<7;Psg8YP>avRmrg3U&$ap6RPH7q<+HWM=wyF$F=z-ub$5iJEoLv
z;|2ed#C<b+L=oyY?#kJOd|NOKY*lZcmpzU%M0pVcXWWV<Lh9Le^7eh!D&Z>~FmzDo
zoEEKxy%cjq7(<a8HIJ_GAXQu6FaWu>XYXmLbqJ7$c>!&rG&a*~EL=TxOA$l0oBt(P
z%ps@%Fujv1t{<;Sax_MDr`GrCZXA^7kLmHeoT=3#tyg-CF`xgc+~z)8ewy|)d~>YB
zW;pn>FI{nPrJLIv_?+8pi&k^~Jmm>1!$+)U@WuL(`3$P?3y5ttjN<|;!F8+~Ex~(-
z*lQ2xb|MDfWRkSlw?lV-_n?ys^bZ!becblz#2~2`s~4CW$Y{AyuRFa%R~&a8{5jfJ
z?XLKkQhFh&EZA06%n#mI@TpDV%5~Hl*MCupsqwbN;GTWRSm%14l>m=Ubh;2D>*dRy
ziU{IqdfL1Fq942d0C|xD<U`00ZesNY%Ghe`_2@2Tb~gNm3PqI$8-#Ib%~Bs-5{iw6
zhc~Bt$0z;Ji$6{9I<}HZPrzxa+9?<L$<7)?zsa9GV(a}A^mq2@8eYJD`^M0L*y|KJ
zdpx|Q|2A>ku}5nvHIn2RUrIw>_})O!DbK|xT21kK32f!qhB+j_nV$2HfeC8C*rEN!
z6MX{{jia`qE00|h;QbLl-#NCYUU;C`x;jqspkBZ0+Y+Z}X6+rRjyoV=>kUCI<$-%l
z5ba|}{1CTYlNb-S3S@Dp@#V=v$@C^e#KY}eHZ+0)*D+{jvXG$<=0l1It~#L?zhA&`
zd>s))TY6@9K}5z6H;ZQ)x!*+D^RXoyVF62QVNhZcH|FGN;_f_OuXd&O3Vs3}y|%Sc
z+K8Llr7h#?&er29x|bxpynIqVp5+u6ZN91~eIu$wb5z5;(o}-O7dq~uzXQuf<j*zU
zqWIw0I)70ZBOUlpH0$0{bh~+dkdF`bn3Is6kul=HXfm|2SEpFC^phDapNfGs5_#~c
z^0hn0eeeU+;=(9%kNkt0r59wWo2=yeCT@<CgNMOE2h*VA5cXzSOBf7P5-hwvBzMMa
z9kV#+WMy?IU{9WZ;y~ST2ipgV{oiPw3P4f6>emz8W`r6k6n|xb%DHr@J_k)2yQ&_9
zl|uMh*3vJqD!djKmQ-U$)<qTqnx0ah7bqDU#|r<xqdNx9zf0({C&re4rxC^F`?y6-
zH)V-wvKQTr%}8(Q$4~#BF2oOn!bn>zP_pqNnIe#WMWAvV`T^hkO$TvY@)qEUc@G*^
zzXrF9#C4jlYz<?y?;YkjH1R|EFFNt^@XtT}-~a%j2Y$!@n?eTSO5_ii4+vHKK)VD|
z%N~HN{PW;EJSIP^9{&Cq!`B(v2m~u0nkDu}lYILHLnx}ZENb|}0T6lUBDBqq>Ys`l
zw%czf4g{<6V<j>Yxbfs?|3ojVwu%>kFtvog(aSm|;7(ZopXs@YCbrxP4HR+aK!dWp
z8paH~5KT1OQ2ogbi%YSyhr1OcHVBamYH4#ZgX=jq%A^Bx$Y#0IL^(hJ%p!6cMn;pp
zdv4v@K;+bBb@|Ndh}7e%=3W|PuP0e90ktowQz!O@W#tCHQwF3(nN{PSBx{>2o7Imf
z)4jNGH>JI32pFG@=q1V>K2a+T`P?+wI2P4vWBaMDPBx(V=7$+%mc#Lj{l$wOIh7P2
zeEw2sZgbldoS|dOIu8cFVK1dz%bkW0l{3)(7HbdP{WM69VhXaNxgzD8*&+Wnyv+Ze
zme#WLAApx53Cobr5!Y{z)O&LddUkyuUmjiyL?zdho<i-Z{bB=Ye$sw&hN%#!TVIuF
z9s^7e1O9Fd=VOHo7V6?`uG$NgTL?}hv{Ss4#PJF>vZ2uFKvd;=v0MC5<@DK=s0d|(
z@=SiZ&>wDak(Q`&|D7z{fO|Krvc(L+>I4~vB6dI&6npW>`^=M%v$B2y!=mwUt|imH
zTCu{~N!T%ZEXWf~&HN<E$*+Wbg_;$abE`+c%j2)8w}&*(U3uxjzrblZ8szVU&B^Uu
zLMS)uRs4*+rtQ>#+*bG;#TN4x03m(*{uNLDt37-?S;XE=Sh$<1Kc1gEz2-2bnR`@G
z0Zg!W{~t>?a35HsYigZham0@OV(k$7zk9d=50ZZbkN?%Q?cJ1m+`Z!jwX0xa`<sY)
z|4AAP@z3M3IPa*?nLt6Cbe!v%m4LM1nycXZlDX0z{U={M;Ko0{-E!2OBE<c=)Of2S
zjVyJy7Bcu756^4CN_fop>+5dsRgGwv12r{k=lAt6XY-K<#T0>i2W>CPyICes=E1lR
z@sY}f8eG;IVBBdwF>XtSRhue;<*DYwAmMsv&oOaKFDq);37eL72*ShDB*`m|D)8eA
zJXPKcKKMt+E&@@QM+O{#fXhEtp#M=MfN1}J)RwPY-rKK3a23zSM!;Y^7tdRmR2n%y
F_%9OJAu|8~

literal 0
HcmV?d00001

diff --git a/frontend/static/script-picker.png b/frontend/static/script-picker.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec8c47e6ccc7abff0aa051831419a7472a4c6816
GIT binary patch
literal 12652
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

literal 0
HcmV?d00001

diff --git a/frontend/static/trigger_button.png b/frontend/static/trigger_button.png
deleted file mode 100644
index efcc26919433ef6268f18d16029af0f6ca75e98a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17525
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

diff --git a/frontend/tailwind.config.cjs b/frontend/tailwind.config.cjs
index 74ca853a17..ae2ea2b67f 100644
--- a/frontend/tailwind.config.cjs
+++ b/frontend/tailwind.config.cjs
@@ -463,7 +463,8 @@ const config = {
 				height: 'height'
 			},
 			fontSize: {
-				'2xs': '0.7rem'
+				'2xs': '0.7rem',
+				'3xs': '0.65rem'
 			},
 			screens: {
 				fhd: '1900px',
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 2521b4193e..a5a6b57030 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -269,6 +269,8 @@ components:
           type: number
         custom_concurrency_key:
           type: string
+        is_trigger:
+          type: boolean
       required:
         - type
         - content
@@ -292,6 +294,8 @@ components:
             - script
         tag_override:
           type: string
+        is_trigger:
+          type: boolean
       required:
         - type
         - path

From 693b7a4fd4da0e2b14cb6c8ea19537aa600225be Mon Sep 17 00:00:00 2001
From: Alexander Petric <alpetric@users.noreply.github.com>
Date: Mon, 4 Nov 2024 17:35:27 -0500
Subject: [PATCH 12/80] feat(oauth): add snowflake oauth support (#4622)

* feat(oauth): add snowflake oauth support

* fixes

* fix keypair auth

* avoid loop when changing settings

* including account id doc link in the settings ui

---------

Co-authored-by: Ruben Fiszel <ruben@windmill.dev>
---
 backend/oauth_connect.json                    |   5 +-
 .../windmill-worker/src/snowflake_executor.rs | 108 ++++++++++++------
 .../src/lib/components/AppConnectInner.svelte |   8 ++
 .../lib/components/InstanceSettings.svelte    |  51 ++++++++-
 4 files changed, 132 insertions(+), 40 deletions(-)

diff --git a/backend/oauth_connect.json b/backend/oauth_connect.json
index 994d9999fd..0608f0d3c4 100644
--- a/backend/oauth_connect.json
+++ b/backend/oauth_connect.json
@@ -171,5 +171,6 @@
       "user-library-modify",
       "user-library-read"
     ]
-  }
-}
\ No newline at end of file
+  },
+  "snowflake_oauth": {}
+}
diff --git a/backend/windmill-worker/src/snowflake_executor.rs b/backend/windmill-worker/src/snowflake_executor.rs
index f89b29832a..9f8d3e12fd 100644
--- a/backend/windmill-worker/src/snowflake_executor.rs
+++ b/backend/windmill-worker/src/snowflake_executor.rs
@@ -32,9 +32,9 @@ struct Claims {
 #[derive(Deserialize)]
 struct SnowflakeDatabase {
     account_identifier: String,
-    public_key: String,
-    private_key: String,
-    username: String,
+    public_key: Option<String>,
+    private_key: Option<String>,
+    username: Option<String>,
     database: Option<String>,
     schema: Option<String>,
     warehouse: Option<String>,
@@ -119,6 +119,7 @@ fn do_snowflake_inner<'a>(
     mut body: serde_json::Map<String, Value>,
     account_identifier: &'a str,
     token: &'a str,
+    token_is_keypair: bool,
     column_order: Option<&'a mut Option<Vec<String>>>,
     skip_collect: bool,
 ) -> windmill_common::error::Result<BoxFuture<'a, windmill_common::error::Result<Box<RawValue>>>> {
@@ -144,16 +145,19 @@ fn do_snowflake_inner<'a>(
     }
 
     let result_f = async move {
-        let result = HTTP_CLIENT
+        let mut request = HTTP_CLIENT
             .post(format!(
                 "https://{}.snowflakecomputing.com/api/v2/statements/",
                 account_identifier.to_uppercase()
             ))
             .bearer_auth(token)
-            .header("X-Snowflake-Authorization-Token-Type", "KEYPAIR_JWT")
-            .json(&body)
-            .send()
-            .await;
+            .json(&body);
+
+        if token_is_keypair {
+            request = request.header("X-Snowflake-Authorization-Token-Type", "KEYPAIR_JWT");
+        }
+
+        let result = request.send().await;
 
         if skip_collect {
             handle_snowflake_result(result).await?;
@@ -189,11 +193,17 @@ fn do_snowflake_inner<'a>(
                         account_identifier.to_uppercase(),
                         response.statementHandle
                     );
-                    let response = HTTP_CLIENT
+                    let mut request = HTTP_CLIENT
                         .get(url)
                         .bearer_auth(token)
-                        .header("X-Snowflake-Authorization-Token-Type", "KEYPAIR_JWT")
-                        .query(&[("partition", idx.to_string())])
+                        .query(&[("partition", idx.to_string())]);
+
+                    if token_is_keypair {
+                        request =
+                            request.header("X-Snowflake-Authorization-Token-Type", "KEYPAIR_JWT");
+                    }
+
+                    let response = request
                         .send()
                         .await
                         .parse_snowflake_response::<SnowflakeDataOnlyResponse>()
@@ -258,7 +268,7 @@ pub async fn do_snowflake(
         snowflake_args.get("database").cloned()
     };
 
-    let database = if let Some(db) = db_arg {
+    let database = if let Some(ref db) = db_arg {
         serde_json::from_value::<SnowflakeDatabase>(db.clone())
             .map_err(|e| Error::ExecutionErr(e.to_string()))?
     } else {
@@ -267,37 +277,59 @@ pub async fn do_snowflake(
 
     let annotations = windmill_common::worker::SqlAnnotations::parse(query);
 
-    let qualified_username = format!(
-        "{}.{}",
-        database.account_identifier.split('.').next().unwrap_or(""), // get first part of account identifier
-        database.username
-    )
-    .to_uppercase();
+    // Check if the token is present in db_arg and use it if available
+    let (token, token_is_keypair) = if let Some(token) = db_arg
+        .as_ref()
+        .and_then(|db| db.get("token"))
+        .and_then(|t| t.as_str())
+        .filter(|t| !t.is_empty())
+    {
+        tracing::debug!("Using oauth token from db_arg");
+        (token.to_string(), false)
+    } else {
+        tracing::debug!("Generating new oauth token");
 
-    let public_key = pem::parse(database.public_key.as_bytes()).map_err(|e| {
-        Error::ExecutionErr(format!("Failed to parse public key: {}", e.to_string()))
-    })?;
-    let mut public_key_hash = Sha256::new();
-    public_key_hash.update(public_key.contents());
+        let qualified_username = format!(
+            "{}.{}",
+            database.account_identifier.split('.').next().unwrap_or(""),
+            database.username.as_deref().unwrap_or("")
+        )
+        .to_uppercase();
 
-    let public_key_fp = engine::general_purpose::STANDARD.encode(public_key_hash.finalize());
+        let public_key = match database.public_key.as_deref() {
+            Some(key) => pem::parse(key.as_bytes()).map_err(|e| {
+                Error::ExecutionErr(format!("Failed to parse public key: {}", e.to_string()))
+            })?,
+            None => return Err(Error::ExecutionErr("Public key is missing".to_string())),
+        };
+        let mut public_key_hash = Sha256::new();
+        public_key_hash.update(public_key.contents());
 
-    let iss = format!("{}.SHA256:{}", qualified_username, public_key_fp);
+        let public_key_fp = engine::general_purpose::STANDARD.encode(public_key_hash.finalize());
 
-    let claims = Claims {
-        iss: iss,
-        sub: qualified_username,
-        iat: chrono::Utc::now().timestamp(),
-        exp: (chrono::Utc::now() + chrono::Duration::try_hours(1).unwrap()).timestamp(),
+        let iss = format!("{}.SHA256:{}", qualified_username, public_key_fp);
+
+        let claims = Claims {
+            iss: iss,
+            sub: qualified_username,
+            iat: chrono::Utc::now().timestamp(),
+            exp: (chrono::Utc::now() + chrono::Duration::try_hours(1).unwrap()).timestamp(),
+        };
+
+        let private_key = match database.private_key.as_deref() {
+            Some(key) => EncodingKey::from_rsa_pem(key.as_bytes()).map_err(|e| {
+                Error::ExecutionErr(format!("Failed to parse private key: {}", e.to_string()))
+            })?,
+            None => return Err(Error::ExecutionErr("Private key is missing".to_string())),
+        };
+
+        (
+            encode(&Header::new(Algorithm::RS256), &claims, &private_key)
+                .map_err(|e| Error::ExecutionErr(e.to_string()))?,
+            true,
+        )
     };
 
-    let private_key = EncodingKey::from_rsa_pem(database.private_key.as_bytes()).map_err(|e| {
-        Error::ExecutionErr(format!("Failed to parse private key: {}", e.to_string()))
-    })?;
-
-    let token = encode(&Header::new(Algorithm::RS256), &claims, &private_key)
-        .map_err(|e| Error::ExecutionErr(e.to_string()))?;
-
     tracing::debug!("Snowflake token: {}", token);
 
     let mut body = serde_json::Map::new();
@@ -344,6 +376,7 @@ pub async fn do_snowflake(
                     body.clone(),
                     &database.account_identifier,
                     &token,
+                    token_is_keypair,
                     None,
                     annotations.return_last_result && i < queries.len() - 1,
                 )
@@ -371,6 +404,7 @@ pub async fn do_snowflake(
             body.clone(),
             &database.account_identifier,
             &token,
+            token_is_keypair,
             Some(column_order),
             false,
         )?
diff --git a/frontend/src/lib/components/AppConnectInner.svelte b/frontend/src/lib/components/AppConnectInner.svelte
index e568589b49..8ea77cc12d 100644
--- a/frontend/src/lib/components/AppConnectInner.svelte
+++ b/frontend/src/lib/components/AppConnectInner.svelte
@@ -250,6 +250,14 @@
 				throw Error(`Resource at path ${path} already exists. Delete it or pick another path`)
 			}
 
+
+			if (resourceType == 'snowflake_oauth') {
+				const account_identifier = extra_params.find(([key, _]) => key == 'account_identifier')
+				if (account_identifier) {
+					args['account_identifier'] = account_identifier[1]
+				}
+			}
+			
 			let account: number | undefined = undefined
 			if (valueToken?.expires_in != undefined) {
 				account = Number(
diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte
index e5f4bb0b4d..9cdd9f165f 100644
--- a/frontend/src/lib/components/InstanceSettings.svelte
+++ b/frontend/src/lib/components/InstanceSettings.svelte
@@ -108,9 +108,24 @@
 		loading = false
 
 		latestKeyRenewalAttempt = await SettingService.getLatestKeyRenewalAttempt()
+
+		// populate snowflake account identifier from db
+		const account_identifier =
+			oauths?.snowflake_oauth?.connect_config?.extra_params?.account_identifier
+		if (account_identifier) {
+			snowflakeAccountIdentifier = account_identifier
+		}
 	}
 
 	export async function saveSettings() {
+		if (
+			oauths?.snowflake_oauth &&
+			oauths?.snowflake_oauth?.connect_config?.extra_params?.account_identifier !==
+				snowflakeAccountIdentifier
+		) {
+			setupSnowflakeUrls()
+		}
+
 		let shouldReloadPage = false
 		if (values) {
 			const allSettings = Object.values(settings).flatMap((x) => Object.entries(x))
@@ -217,7 +232,8 @@
 		'linkedin',
 		'quickbooks',
 		'visma',
-		'spotify'
+		'spotify',
+		'snowflake_oauth'
 	]
 
 	let oauth_name = undefined
@@ -269,6 +285,23 @@
 		}
 		return true
 	}
+
+	let snowflakeAccountIdentifier = ''
+
+	function setupSnowflakeUrls() {
+		// strip all whitespaces from account identifier
+		snowflakeAccountIdentifier = snowflakeAccountIdentifier.replace(/\s/g, '')
+
+		const connect_config = {
+			scopes: [],
+			auth_url: `https://${snowflakeAccountIdentifier}.snowflakecomputing.com/oauth/authorize`,
+			token_url: `https://${snowflakeAccountIdentifier}.snowflakecomputing.com/oauth/token-request`,
+			req_body_auth: false,
+			extra_params: { account_identifier: snowflakeAccountIdentifier },
+			extra_params_callback: {}
+		}
+		oauths['snowflake_oauth'].connect_config = connect_config
+	}
 </script>
 
 <div class="pb-8">
@@ -513,6 +546,22 @@
 													{#if !windmillBuiltins.includes(k) && k != 'slack'}
 														<CustomOauth bind:connect_config={oauths[k]['connect_config']} />
 													{/if}
+													{#if k == 'snowflake_oauth'}
+														<label class="block pb-2">
+															<span class="text-primary font-semibold text-sm"
+																><a
+																	href="https://docs.snowflake.com/en/user-guide/admin-account-identifier#using-an-account-name-as-an-identifier"
+																	target="_blank">Snowflake Account Identifier</a
+																></span
+															>
+															<input
+																type="text"
+																placeholder="<orgname>-<account_name>"
+																required={true}
+																bind:value={snowflakeAccountIdentifier}
+															/>
+														</label>
+													{/if}
 												</div>
 											</div>
 										{/if}

From 09156b65c2a0f0ac59fce1dede2b68b790323c49 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 5 Nov 2024 00:17:59 +0100
Subject: [PATCH 13/80] fix(prometheus): improve queue_count when tags have no
 more jobs

---
 backend/src/monitor.rs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/backend/src/monitor.rs b/backend/src/monitor.rs
index 0618cfd8d8..b6cbd55330 100644
--- a/backend/src/monitor.rs
+++ b/backend/src/monitor.rs
@@ -111,6 +111,9 @@ lazy_static::lazy_static! {
         "Number of jobs in the queue",
         &["tag"]
     ).unwrap();
+
+    static ref QUEUE_COUNT_TAGS: Arc<RwLock<Vec<String>>> = Arc::new(RwLock::new(Vec::new()));
+
 }
 
 pub async fn initial_load(
@@ -1089,12 +1092,23 @@ pub async fn expose_queue_metrics(db: &Pool<Postgres>) {
     if metrics_enabled || save_metrics {
         let queue_counts = windmill_common::queue::get_queue_counts(db).await;
 
+        if metrics_enabled {
+            for q in QUEUE_COUNT_TAGS.read().await.iter() {
+                if queue_counts.get(q).is_none() {
+                    (*QUEUE_COUNT).with_label_values(&[q]).set(0);
+                }
+            }
+        }
+
+        let mut tags_to_watch = vec![];
         for q in queue_counts {
             let count = q.1;
             let tag = q.0;
+
             if metrics_enabled {
                 let metric = (*QUEUE_COUNT).with_label_values(&[&tag]);
                 metric.set(count as i64);
+                tags_to_watch.push(tag.to_string());
             }
 
             // save queue_count and delay metrics per tag
@@ -1119,6 +1133,10 @@ pub async fn expose_queue_metrics(db: &Pool<Postgres>) {
                 }
             }
         }
+        if metrics_enabled {
+            let mut w = QUEUE_COUNT_TAGS.write().await;
+            *w = tags_to_watch;
+        }
     }
 
     // clean queue metrics older than 14 days

From c578ecd1f903de74d9a0b3d9f85bd8b845ec88c2 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Tue, 5 Nov 2024 01:23:22 +0100
Subject: [PATCH 14/80] chore(main): release 1.418.0 (#4648)

* chore(main): release 1.418.0

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  | 13 +++++
 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, 54 insertions(+), 41 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 769d59d283..08f7c83c7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [1.418.0](https://github.com/windmill-labs/windmill/compare/v1.417.3...v1.418.0) (2024-11-04)
+
+
+### Features
+
+* **frontend:** improve and simplify scheduled poll flows ([#4560](https://github.com/windmill-labs/windmill/issues/4560)) ([22ab51e](https://github.com/windmill-labs/windmill/commit/22ab51e9914376b47827f0be66708deef3a37767))
+* **oauth:** add snowflake oauth support ([#4622](https://github.com/windmill-labs/windmill/issues/4622)) ([693b7a4](https://github.com/windmill-labs/windmill/commit/693b7a4fd4da0e2b14cb6c8ea19537aa600225be))
+
+
+### Bug Fixes
+
+* **prometheus:** improve queue_count when tags have no more jobs ([09156b6](https://github.com/windmill-labs/windmill/commit/09156b65c2a0f0ac59fce1dede2b68b790323c49))
+
 ## [1.417.3](https://github.com/windmill-labs/windmill/compare/v1.417.2...v1.417.3) (2024-11-04)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index fb38b7b773..1c2f6b1fc2 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -10563,7 +10563,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "anyhow",
  "axum",
@@ -10605,7 +10605,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10690,7 +10690,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -10708,7 +10708,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "chrono",
  "serde",
@@ -10721,7 +10721,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10736,7 +10736,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10782,7 +10782,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10797,7 +10797,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10819,7 +10819,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10831,7 +10831,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10840,7 +10840,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10852,7 +10852,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10864,7 +10864,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10876,7 +10876,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10887,7 +10887,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10898,7 +10898,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10916,7 +10916,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10933,7 +10933,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10945,7 +10945,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10963,7 +10963,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10984,7 +10984,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -10994,7 +10994,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -11027,7 +11027,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -11037,7 +11037,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.417.3"
+version = "1.418.0"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 2ae0de9786..b0d6e47120 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.417.3"
+version = "1.418.0"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.417.3"
+version = "1.418.0"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index cde1339c1c..fc39c5abf8 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.417.3
+  version: 1.418.0
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 8e6bdf9725..961d105aa1 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.417.3";
+export const VERSION = "v1.418.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 9a5b682df7..92039f51f8 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.417.3";
+export const VERSION = "1.418.0";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index f43c1ac214..0fde010091 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.417.3",
+	"version": "1.418.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.417.3",
+			"version": "1.418.0",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index a15b2e575c..de2a4b629b 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.417.3",
+	"version": "1.418.0",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index c92dd2f3cb..8e529f4349 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.417.3"
-wmill_pg = ">=1.417.3"
+wmill = ">=1.418.0"
+wmill_pg = ">=1.418.0"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index a5a6b57030..a96d3ac217 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.417.3
+  version: 1.418.0
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index e45b054a4e..f530a19563 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.417.3'
+ModuleVersion = '1.418.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index ab8e8d3275..651786ca82 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.417.3"
+version = "1.418.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 5414909bd7..85e436d451 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.417.3"
+version = "1.418.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 5e8ff6c1d2..58d900b091 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.417.3",
+  "version": "1.418.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 5abc6f1f3f..5767d560c9 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.417.3",
+  "version": "1.418.0",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index e047a7c0be..0a0c0912c6 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.417.3
+1.418.0

From 8e27392afacbb725aaf9f9f892ab8a6171b59ce5 Mon Sep 17 00:00:00 2001
From: Guilhem <guilhemlemouel@gmail.com>
Date: Tue, 5 Nov 2024 08:58:29 +0100
Subject: [PATCH 15/80] feat: show path in flow script picker (#4574)

* Add popover with path to flow modules

* Add path to items in the flow picker

* fix virtual item display issue

* fix min size

* open popover on keyboard selection

---------

Co-authored-by: Guilhem <guilhem@mbp-de-windmill.home>
Co-authored-by: Ruben Fiszel <ruben@windmill.dev>
---
 frontend/src/lib/components/Popover.svelte    |  9 ++-
 .../flows/content/FlowInputsQuick.svelte      |  3 +
 .../flows/map/FlowModuleSchemaItem.svelte     | 20 ++++-
 .../flows/map/InsertModuleButton.svelte       | 14 +++-
 .../lib/components/flows/map/MapItem.svelte   |  1 +
 .../components/flows/map/VirtualItem.svelte   | 17 +++--
 .../flows/pickers/PickHubScriptQuick.svelte   | 72 ++++++++++++------
 .../pickers/WorkspaceScriptPickerQuick.svelte | 75 ++++++++++++-------
 8 files changed, 146 insertions(+), 65 deletions(-)

diff --git a/frontend/src/lib/components/Popover.svelte b/frontend/src/lib/components/Popover.svelte
index c7fed6ce71..28180d553a 100644
--- a/frontend/src/lib/components/Popover.svelte
+++ b/frontend/src/lib/components/Popover.svelte
@@ -2,6 +2,7 @@
 	import { createPopperActions, type PopperOptions } from 'svelte-popperjs'
 	import type { PopoverPlacement } from './Popover.model'
 	import Portal from '$lib/components/Portal.svelte'
+	import { twMerge } from 'tailwind-merge'
 
 	import { ExternalLink } from 'lucide-svelte'
 
@@ -13,6 +14,7 @@
 	export let appearTimeout = 300
 	export let documentationLink: string | undefined = undefined
 	export let style: string | undefined = undefined
+	export let forceOpen = false
 
 	const [popperRef, popperContent] = createPopperActions({ placement })
 
@@ -47,6 +49,8 @@
 		inTimeout = undefined
 		timeout = setTimeout(() => (showTooltip = false), disappearTimeout)
 	}
+
+	$: forceOpen ? open() : close()
 </script>
 
 {#if notClickable}
@@ -73,7 +77,10 @@
 			use:popperContent={popperOptions}
 			on:mouseenter={open}
 			on:mouseleave={close}
-			class="z-[5001] py-2 px-3 rounded-md text-sm font-normal !text-gray-300 bg-gray-800 whitespace-normal text-left {popupClass}"
+			class={twMerge(
+				'z-[5001] py-2 px-3 rounded-md text-sm font-normal !text-gray-300 bg-gray-800 whitespace-normal text-left',
+				popupClass
+			)}
 		>
 			<div class="max-w-sm break-words">
 				<slot name="text" />
diff --git a/frontend/src/lib/components/flows/content/FlowInputsQuick.svelte b/frontend/src/lib/components/flows/content/FlowInputsQuick.svelte
index 9cbee5ca21..bf61ab6433 100644
--- a/frontend/src/lib/components/flows/content/FlowInputsQuick.svelte
+++ b/frontend/src/lib/components/flows/content/FlowInputsQuick.svelte
@@ -41,6 +41,7 @@
 	export let kind: 'trigger' | 'script' | 'preprocessor' | 'failure' | 'approval'
 	export let selectedKind: 'script' | 'flow' | 'approval' | 'trigger' | 'preprocessor' | 'failure' =
 		kind
+	export let displayPath = false
 
 	let lang: FlowCopilotModule['lang'] = undefined
 	let selectedCompletion: FlowCopilotModule['selectedCompletion'] = undefined
@@ -424,6 +425,7 @@
 				selected={selectedByKeyboard - inlineScripts?.length - aiLength - topLevelNodes.length}
 				on:pickScript
 				on:pickFlow
+				{displayPath}
 			/>
 		{/if}
 
@@ -446,6 +448,7 @@
 						topLevelNodes.length}
 					on:pickScript
 					bind:loading
+					{displayPath}
 				/>
 			{/if}
 		{/if}
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
index 229194a48c..d8c3ff63fb 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
@@ -41,6 +41,7 @@
 	export let bold: boolean = false
 	export let id: string | undefined = undefined
 	export let label: string
+	export let path: string = ''
 	export let modType: string | undefined = undefined
 	export let bgColor: string = ''
 	export let concurrency: boolean = false
@@ -248,11 +249,22 @@
 				<slot name="icon" />
 			</div>
 		{/if}
-		<div
-			class="absolute left-1/2 transform -translate-x-1/2 text-center truncate"
-			class:font-bold={bold}
-			style="max-width: calc(100% - {marginLeft}px)">{label}</div
+
+		<Popover
+			class="absolute left-1/2 transform -translate-x-1/2 center-center"
+			style="max-width: calc(100% - {marginLeft}px)"
 		>
+			<div class="text-center truncate {bold ? '!font-bold' : 'font-normal'}">
+				{label}
+			</div>
+			<svelte:fragment slot="text">
+				<div>
+					<div>{label}</div>
+					{#if path != ''}<div>{path}</div>{/if}
+				</div>
+			</svelte:fragment>
+		</Popover>
+
 		<div class="flex items-center space-x-2 relative max-w-[25%]" bind:clientWidth={idBadgeWidth}>
 			{#if id && id !== 'preprocessor' && !id.startsWith('failure')}
 				<Badge color="indigo" wrapperClass="max-w-full" baseClass="max-w-full truncate" title={id}>
diff --git a/frontend/src/lib/components/flows/map/InsertModuleButton.svelte b/frontend/src/lib/components/flows/map/InsertModuleButton.svelte
index b2f4b1b461..edb35040b8 100644
--- a/frontend/src/lib/components/flows/map/InsertModuleButton.svelte
+++ b/frontend/src/lib/components/flows/map/InsertModuleButton.svelte
@@ -46,6 +46,11 @@
 	let small = false
 	let open = false
 
+	let width = 0
+	let height = 0
+
+	$: displayPath = width > 650 || height > 400
+
 	$: small = kind === 'preprocessor' || kind === 'failure'
 </script>
 
@@ -90,11 +95,17 @@ shouldUsePortal={true} -->
 	</svelte:fragment>
 	<div
 		id="flow-editor-insert-module"
-		class="flex flex-col h-[400px] {small ? 'w-[450px]' : 'w-[650px]'}  pt-1 pr-1 pl-1 gap-1.5"
+		class="flex flex-col h-[400px] {small
+			? 'w-[450px]'
+			: 'w-[650px]'} pt-1 pr-1 pl-1 gap-1.5 resize overflow-auto {small
+			? 'min-w-[450px]'
+			: 'min-w-[650px]'} min-h-[400px]"
 		on:wheel={(e) => {
 			e.stopPropagation()
 		}}
 		role="none"
+		bind:clientWidth={width}
+		bind:clientHeight={height}
 	>
 		<div class="flex flex-row items-center gap-2">
 			<StepGenQuick
@@ -203,6 +214,7 @@ shouldUsePortal={true} -->
 				on:pickFlow
 				{preFilter}
 				{small}
+				{displayPath}
 			/>
 		</div>
 	</div>
diff --git a/frontend/src/lib/components/flows/map/MapItem.svelte b/frontend/src/lib/components/flows/map/MapItem.svelte
index cd65b3daf8..ebd4ffdb9b 100644
--- a/frontend/src/lib/components/flows/map/MapItem.svelte
+++ b/frontend/src/lib/components/flows/map/MapItem.svelte
@@ -175,6 +175,7 @@
 						(mod.value.type === 'rawscript'
 							? `Inline ${prettyLanguage(mod.value.language)}`
 							: 'To be defined')}
+					path={`path` in mod.value && mod.summary ? mod.value.path : ''}
 					isTrigger={isTriggerStep(mod)}
 				>
 					<div slot="icon">
diff --git a/frontend/src/lib/components/flows/map/VirtualItem.svelte b/frontend/src/lib/components/flows/map/VirtualItem.svelte
index e09f84b0de..4b476709ac 100644
--- a/frontend/src/lib/components/flows/map/VirtualItem.svelte
+++ b/frontend/src/lib/components/flows/map/VirtualItem.svelte
@@ -30,7 +30,7 @@
 >
 	<div
 		style={borderColor ? `border-color: ${borderColor};` : 'border: 0'}
-		class="flex gap-1 justify-between {center
+		class="flex flex-row gap-1 justify-between {center
 			? 'items-center'
 			: 'items-baseline'} w-full overflow-hidden rounded-sm border p-2 text-2xs module text-primary border-gray-400 dark:border-gray-600"
 	>
@@ -38,8 +38,7 @@
 			<slot name="icon" />
 			<span class="mr-2" />
 		{/if}
-		<div />
-		<div class="flex flex-col w-full">
+		<div class="flex flex-col flex-grow shrink-0 max-w-full min-w-0">
 			{#if label}
 				<div class="truncate text-center">{label}</div>
 			{/if}
@@ -47,10 +46,12 @@
 				<div class="truncate text-2xs text-center"><pre>{preLabel}</pre></div>
 			{/if}
 		</div>
-		<div class="flex items-center space-x-2">
-			{#if id && !hideId}
-				<Badge color="indigo">{id}</Badge>
-			{/if}
-		</div>
+		{#if id && !hideId}
+			<div class="flex items-center shrink min-w-0">
+				<Badge color="indigo" wrapperClass="w-full" baseClass="max-w-full" title={id}>
+					<span class="max-w-full text-2xs truncate">{id}</span>
+				</Badge>
+			</div>
+		{/if}
 	</div>
 </VirtualItemWrapper>
diff --git a/frontend/src/lib/components/flows/pickers/PickHubScriptQuick.svelte b/frontend/src/lib/components/flows/pickers/PickHubScriptQuick.svelte
index 122e4a3125..77632dae8b 100644
--- a/frontend/src/lib/components/flows/pickers/PickHubScriptQuick.svelte
+++ b/frontend/src/lib/components/flows/pickers/PickHubScriptQuick.svelte
@@ -5,6 +5,7 @@
 	import { APP_TO_ICON_COMPONENT } from '$lib/components/icons'
 	import { IntegrationService, ScriptService, type HubScriptKind } from '$lib/gen'
 	import { Circle } from 'lucide-svelte'
+	import Popover from '$lib/components/Popover.svelte'
 
 	export let kind: HubScriptKind & string = 'script'
 	export let filter = ''
@@ -25,6 +26,7 @@
 		app: string
 		kind: HubScriptKind
 	}[] = []
+	export let displayPath = false
 
 	export let apps: string[] = []
 	let allApps: string[] = []
@@ -138,32 +140,56 @@
 	<ul>
 		{#each items as item, index (item.path)}
 			<li class="w-full">
-				<button
-					class="px-3 py-2 gap-2 flex flex-row w-full hover:bg-surface-hover transition-all items-center rounded-md {index ===
-					selected
-						? 'bg-surface-hover'
-						: ''}"
-					on:click={() => dispatch('pickScript', item)}
-				>
-					<div class={classNames('flex justify-center items-center')}>
-						{#if item['app'] in APP_TO_ICON_COMPONENT}
-							<svelte:component this={APP_TO_ICON_COMPONENT[item['app']]} height={14} width={14} />
-						{:else}
-							<div
-								class="w-[14px] h-[14px] text-gray-400 flex flex-row items-center justify-center"
+				<Popover class="w-full" placement="right" forceOpen={index === selected}>
+					<svelte:fragment slot="text">
+						<div class="flex flex-col">
+							<div class="text-left text-xs font-normal leading-tight py-0"
+								>{item.summary ?? ''}</div
 							>
-								<Circle size="12" />
+							<div class="text-left text-2xs font-normal">
+								{item.path ?? ''}
 							</div>
-						{/if}
-					</div>
+						</div>
+					</svelte:fragment>
+					<button
+						class="px-3 py-2 gap-2 flex flex-row w-full hover:bg-surface-hover transition-all items-center rounded-md {index ===
+						selected
+							? 'bg-surface-hover'
+							: ''}"
+						on:click={() => dispatch('pickScript', item)}
+					>
+						<div class={classNames('flex justify-center items-center')}>
+							{#if item['app'] in APP_TO_ICON_COMPONENT}
+								<svelte:component
+									this={APP_TO_ICON_COMPONENT[item['app']]}
+									height={14}
+									width={14}
+								/>
+							{:else}
+								<div
+									class="w-[14px] h-[14px] text-gray-400 flex flex-row items-center justify-center"
+								>
+									<Circle size="12" />
+								</div>
+							{/if}
+						</div>
 
-					<span class="grow truncate text-left text-2xs text-primary font-normal">
-						{item.summary ?? ''}
-					</span>
-					{#if index === selected}
-						<kbd class="!text-xs">&crarr;</kbd>
-					{/if}
-				</button>
+						<div class="flex flex-col grow min-w-0">
+							<div
+								class="grow truncate text-left text-2xs text-primary font-normal leading-tight py-0.5"
+								>{item.summary ?? ''}</div
+							>
+							{#if displayPath && item.path}
+								<div class="grow truncate text-left text-2xs text-secondary font-[220]">
+									{item.path}
+								</div>
+							{/if}
+						</div>
+						{#if index === selected}
+							<kbd class="!text-xs">&crarr;</kbd>
+						{/if}
+					</button>
+				</Popover>
 			</li>
 		{/each}
 	</ul>
diff --git a/frontend/src/lib/components/flows/pickers/WorkspaceScriptPickerQuick.svelte b/frontend/src/lib/components/flows/pickers/WorkspaceScriptPickerQuick.svelte
index 21da7ecb04..b9b0cdd721 100644
--- a/frontend/src/lib/components/flows/pickers/WorkspaceScriptPickerQuick.svelte
+++ b/frontend/src/lib/components/flows/pickers/WorkspaceScriptPickerQuick.svelte
@@ -7,11 +7,13 @@
 	import { emptyString } from '$lib/utils'
 	import { Code2 } from 'lucide-svelte'
 	import BarsStaggered from '$lib/components/icons/BarsStaggered.svelte'
+	import Popover from '$lib/components/Popover.svelte'
 
 	export let kind: 'script' | 'trigger' | 'approval' | 'failure' | 'flow' | 'preprocessor' =
 		'script'
 	export let isTemplate: boolean | undefined = undefined
 	export let selected: number | undefined = undefined
+	export let displayPath = false
 
 	type Item = {
 		path: string
@@ -105,35 +107,52 @@
 	<ul>
 		{#each filteredWithOwner ?? [] as { path, hash, summary, marked }, index}
 			<li class="w-full">
-				<button
-					class="px-3 py-2 gap-2 flex flex-row w-full hover:bg-surface-hover transition-all items-center rounded-md {index ===
-					selected
-						? 'bg-surface-hover'
-						: ''}"
-					on:click={() => {
-						if (kind == 'flow') {
-							dispatch('pickFlow', { path: path })
-						} else {
-							dispatch('pickScript', { path: path, hash: lockHash ? hash : undefined, kind })
-						}
-					}}
-				>
-					{#if kind == 'flow'}
-						<BarsStaggered size={14} class="shrink-0" />
-					{:else}
-						<Code2 size={14} />
-					{/if}
-					<span class="grow min-w-0 truncate text-left text-2xs text-primary font-normal">
-						{#if marked}
-							{@html marked}
-						{:else}
-							{!summary || summary.length == 0 ? path : summary}
-						{/if}</span
+				<Popover class="w-full " placement="right" forceOpen={index === selected}>
+					<svelte:fragment slot="text">
+						<div class="flex flex-col">
+							<div class="text-left text-xs font-normal leading-tight py-0">{summary ?? ''}</div>
+							<div class="text-left text-2xs font-normal">
+								{path ?? ''}
+							</div>
+						</div>
+					</svelte:fragment>
+					<button
+						class="px-3 py-2 gap-2 flex flex-row w-full hover:bg-surface-hover transition-all items-center rounded-md {index ===
+						selected
+							? 'bg-surface-hover'
+							: ''}"
+						on:click={() => {
+							if (kind == 'flow') {
+								dispatch('pickFlow', { path: path })
+							} else {
+								dispatch('pickScript', { path: path, hash: lockHash ? hash : undefined, kind })
+							}
+						}}
 					>
-					{#if index === selected}
-						<kbd class="!text-xs">&crarr;</kbd>
-					{/if}
-				</button>
+						{#if kind == 'flow'}
+							<BarsStaggered size={14} class="shrink-0" />
+						{:else}
+							<Code2 size={14} />
+						{/if}
+						<div class="flex flex-col grow min-w-0">
+							<div class="grow min-w-0 truncate text-left text-2xs text-primary font-normal">
+								{#if marked}
+									{@html marked}
+								{:else}
+									{!summary || summary.length == 0 ? path : summary}
+								{/if}
+							</div>
+							{#if displayPath && path}
+								<div class="grow min-w-0 truncate text-left text-2xs text-secondary font-[220]">
+									{path}
+								</div>
+							{/if}
+						</div>
+						{#if index === selected}
+							<kbd class="!text-xs">&crarr;</kbd>
+						{/if}
+					</button>
+				</Popover>
 			</li>
 		{/each}
 	</ul>

From 77735d859cfee9204f67a8e4f9885228d657a41d Mon Sep 17 00:00:00 2001
From: wendrul <53628737+wendrul@users.noreply.github.com>
Date: Tue, 5 Nov 2024 09:14:51 +0100
Subject: [PATCH 16/80] feat: Add full-text search on windmill service logs
 (#4576)

* Add service_log indexer file (ee)

* Rename to completed_run

* rename to service_logs

* Update lib.rs

* Make indexing of logs and simple frontend

* Add common ee file

* Update lib.rs

* Make log search global to fix openapi unused path param

* Prepare sqlx

* Show last indexed also when no jobs are found

* Adapt feature flags to service logs indexer

* Update api and main

* Build service log search page

* scope query to the min and max time

* Migrate modal, bug fixes

* Remove unused import

* Make the service logs page take the full screen

* improve quick access menu to service_logs, fix date stuff, hide 0 matches

---------

Co-authored-by: Ruben Fiszel <ruben@windmill.dev>
---
 ...7f5033b9c9afc344d9c3e385ba20a3ad2197a.json |   2 +-
 ...7a886242277cd50555f20b2e22e13942d2a3a.json |  65 +++
 ...0b5a152784826cb8fb4381c1ffe228cb7feb6.json |  64 +++
 backend/ee-repo-ref.txt                       |   2 +-
 backend/src/main.rs                           |  48 +-
 backend/windmill-api/openapi.yaml             | 110 ++++
 backend/windmill-api/src/indexer_ee.rs        |   4 +
 backend/windmill-api/src/lib.rs               |  19 +-
 .../windmill-indexer/src/completed_runs_ee.rs |  21 +
 backend/windmill-indexer/src/indexer_ee.rs    |  21 -
 backend/windmill-indexer/src/lib.rs           |   2 +
 .../windmill-indexer/src/service_logs_ee.rs   |  21 +
 frontend/package-lock.json                    |  10 +-
 frontend/package.json                         |   2 +-
 .../lib/components/LogSnippetViewer.svelte    |  38 ++
 frontend/src/lib/components/LogViewer.svelte  |   2 +-
 .../lib/components/ServiceLogsInner.svelte    | 500 +++++++++++++-----
 .../src/lib/components/multiselect/utils.ts   |   6 +-
 .../components/runs/ManuelDatePicker.svelte   |  19 +-
 .../search/GlobalSearchModal.svelte           | 105 ++--
 .../components/sidebar/SidebarContent.svelte  |  25 +-
 .../(root)/(logged)/service_logs/+page.js     |   5 +
 .../(root)/(logged)/service_logs/+page.svelte |  71 +++
 23 files changed, 924 insertions(+), 238 deletions(-)
 create mode 100644 backend/.sqlx/query-b5c839baab25c4dcdd503d380cf7a886242277cd50555f20b2e22e13942d2a3a.json
 create mode 100644 backend/.sqlx/query-dd967c5983fa0ff05e2b320ad0e0b5a152784826cb8fb4381c1ffe228cb7feb6.json
 create mode 100644 backend/windmill-indexer/src/completed_runs_ee.rs
 create mode 100644 backend/windmill-indexer/src/service_logs_ee.rs
 create mode 100644 frontend/src/lib/components/LogSnippetViewer.svelte
 create mode 100644 frontend/src/routes/(root)/(logged)/service_logs/+page.js
 create mode 100644 frontend/src/routes/(root)/(logged)/service_logs/+page.svelte

diff --git a/backend/.sqlx/query-661f472ff3860983322162420457f5033b9c9afc344d9c3e385ba20a3ad2197a.json b/backend/.sqlx/query-661f472ff3860983322162420457f5033b9c9afc344d9c3e385ba20a3ad2197a.json
index 75b8108281..1fa370e682 100644
--- a/backend/.sqlx/query-661f472ff3860983322162420457f5033b9c9afc344d9c3e385ba20a3ad2197a.json
+++ b/backend/.sqlx/query-661f472ff3860983322162420457f5033b9c9afc344d9c3e385ba20a3ad2197a.json
@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "?column?",
+        "name": "bool",
         "type_info": "Bool"
       }
     ],
diff --git a/backend/.sqlx/query-b5c839baab25c4dcdd503d380cf7a886242277cd50555f20b2e22e13942d2a3a.json b/backend/.sqlx/query-b5c839baab25c4dcdd503d380cf7a886242277cd50555f20b2e22e13942d2a3a.json
new file mode 100644
index 0000000000..ba9f3814e8
--- /dev/null
+++ b/backend/.sqlx/query-b5c839baab25c4dcdd503d380cf7a886242277cd50555f20b2e22e13942d2a3a.json
@@ -0,0 +1,65 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT\n                        hostname,\n                        mode::text,\n                        worker_group,\n                        log_ts,\n                        file_path,\n                        ok_lines,\n                        err_lines,\n                        json_fmt\n                    FROM log_file\n                    WHERE log_ts > $1\n                    ORDER BY log_ts ASC LIMIT $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "hostname",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "mode",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "worker_group",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "log_ts",
+        "type_info": "Timestamp"
+      },
+      {
+        "ordinal": 4,
+        "name": "file_path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 5,
+        "name": "ok_lines",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 6,
+        "name": "err_lines",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 7,
+        "name": "json_fmt",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Timestamp",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      null,
+      true,
+      false,
+      false,
+      true,
+      true,
+      true
+    ]
+  },
+  "hash": "b5c839baab25c4dcdd503d380cf7a886242277cd50555f20b2e22e13942d2a3a"
+}
diff --git a/backend/.sqlx/query-dd967c5983fa0ff05e2b320ad0e0b5a152784826cb8fb4381c1ffe228cb7feb6.json b/backend/.sqlx/query-dd967c5983fa0ff05e2b320ad0e0b5a152784826cb8fb4381c1ffe228cb7feb6.json
new file mode 100644
index 0000000000..b64db838d3
--- /dev/null
+++ b/backend/.sqlx/query-dd967c5983fa0ff05e2b320ad0e0b5a152784826cb8fb4381c1ffe228cb7feb6.json
@@ -0,0 +1,64 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT\n                        hostname,\n                        mode::text,\n                        worker_group,\n                        log_ts,\n                        file_path,\n                        ok_lines,\n                        err_lines,\n                        json_fmt\n                    FROM log_file\n                    ORDER BY log_ts ASC LIMIT $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "hostname",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "mode",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "worker_group",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "log_ts",
+        "type_info": "Timestamp"
+      },
+      {
+        "ordinal": 4,
+        "name": "file_path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 5,
+        "name": "ok_lines",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 6,
+        "name": "err_lines",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 7,
+        "name": "json_fmt",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      null,
+      true,
+      false,
+      false,
+      true,
+      true,
+      true
+    ]
+  },
+  "hash": "dd967c5983fa0ff05e2b320ad0e0b5a152784826cb8fb4381c1ffe228cb7feb6"
+}
diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index e7dd9365ec..2104f8ba8c 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-f136a2f499e0fe7c10c54c79488851980d796eb2
\ No newline at end of file
+01f384348341c87c5a0b32c4be7c699975ee7d6d
\ No newline at end of file
diff --git a/backend/src/main.rs b/backend/src/main.rs
index 11d12f9dab..61ee657d2c 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -531,7 +531,7 @@ Windmill Community Edition {GIT_VERSION}
 
         #[cfg(feature = "tantivy")]
         let (index_reader, index_writer) = if should_index_jobs {
-            let (r, w) = windmill_indexer::indexer_ee::init_index(&db).await?;
+            let (r, w) = windmill_indexer::completed_runs_ee::init_index(&db).await?;
             (Some(r), Some(w))
         } else {
             (None, None)
@@ -543,26 +543,61 @@ Windmill Community Edition {GIT_VERSION}
             let index_writer2 = index_writer.clone();
             async {
                 if let Some(index_writer) = index_writer2 {
-                    windmill_indexer::indexer_ee::run_indexer(db.clone(), index_writer, indexer_rx)
-                        .await;
+                    windmill_indexer::completed_runs_ee::run_indexer(
+                        db.clone(),
+                        index_writer,
+                        indexer_rx,
+                    )
+                    .await;
+                }
+                Ok(())
+            }
+        };
+
+        #[cfg(all(feature = "tantivy", feature = "parquet"))]
+        let (log_index_reader, log_index_writer) = if should_index_jobs {
+            let (r, w) = windmill_indexer::service_logs_ee::init_index(&db).await?;
+            (Some(r), Some(w))
+        } else {
+            (None, None)
+        };
+
+        #[cfg(all(feature = "tantivy", feature = "parquet"))]
+        let log_indexer_f = {
+            let log_indexer_rx = killpill_rx.resubscribe();
+            let log_index_writer2 = log_index_writer.clone();
+            async {
+                if let Some(log_index_writer) = log_index_writer2 {
+                    windmill_indexer::service_logs_ee::run_indexer(
+                        db.clone(),
+                        log_index_writer,
+                        log_indexer_rx,
+                    )
+                    .await;
                 }
                 Ok(())
             }
         };
 
         #[cfg(not(feature = "tantivy"))]
-        let (index_reader, index_writer) = (None, None);
+        let index_reader = None;
 
         #[cfg(not(feature = "tantivy"))]
         let indexer_f = async { Ok(()) as anyhow::Result<()> };
 
+        #[cfg(not(all(feature = "tantivy", feature = "parquet")))]
+        let log_index_reader = None;
+
+        #[cfg(not(all(feature = "tantivy", feature = "parquet")))]
+        let log_indexer_f = async { Ok(()) as anyhow::Result<()> };
+
         let server_f = async {
             if !is_agent {
                 windmill_api::run_server(
                     db.clone(),
                     rsmq2,
                     index_reader,
-                    index_writer,
+                    log_index_reader,
                     addr,
                     server_killpill_rx,
                     base_internal_tx,
@@ -842,7 +877,8 @@ Windmill Community Edition {GIT_VERSION}
             monitor_f,
             server_f,
             metrics_f,
-            indexer_f
+            indexer_f,
+            log_indexer_f
         )?;
     } else {
         tracing::info!("Nothing to do, exiting.");
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index fc39c5abf8..0949843665 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -9546,6 +9546,109 @@ paths:
                     items:
                       $ref: "#/components/schemas/JobSearchHit"
 
+  /srch/index/search/service_logs:
+    get:
+      summary: Search through service logs with a string query
+      operationId: searchLogsIndex
+      tags:
+        - indexSearch
+      parameters:
+        - name: search_query
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: mode
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: worker_group
+          in: query
+          required: false
+          schema:
+            type: string
+        - name: hostname
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: min_ts
+          in: query
+          required: false
+          schema:
+            type: string
+            format: date-time
+        - name: max_ts
+          in: query
+          required: false
+          schema:
+            type: string
+            format: date-time
+      responses:
+        "200":
+          description: search results
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  query_parse_errors:
+                    description: a list of the terms that couldn't be parsed (and thus ignored)
+                    type: array
+                    items:
+                      type: string
+                  hits:
+                    description: log files that matched the query
+                    type: array
+                    items:
+                      $ref: "#/components/schemas/LogSearchHit"
+
+  /srch/index/search/count_service_logs:
+    get:
+      summary: Search and count the log line hits on every provided host
+      operationId: countSearchLogsIndex
+      tags:
+        - indexSearch
+      parameters:
+        - name: search_query
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: hosts
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: min_ts
+          in: query
+          required: false
+          schema:
+            type: string
+            format: date-time
+        - name: max_ts
+          in: query
+          required: false
+          schema:
+            type: string
+            format: date-time
+      responses:
+        "200":
+          description: search results
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  query_parse_errors:
+                    description: a list of the terms that couldn't be parsed (and thus ignored)
+                    type: array
+                    items:
+                      type: string
+                  count_per_host:
+                    description: count of log lines that matched the query per hostname
+                    type: object
 
 components:
   securitySchemes:
@@ -12500,6 +12603,12 @@ components:
         dancer:
           type: string
 
+    LogSearchHit:
+      type: object
+      properties:
+        dancer:
+          type: string
+
     AutoscalingEvent:
       type: object
       properties:
@@ -12517,3 +12626,4 @@ components:
         applied_at:
           type: string
           format: date-time
+
diff --git a/backend/windmill-api/src/indexer_ee.rs b/backend/windmill-api/src/indexer_ee.rs
index 61a946bb84..2ccca92c27 100644
--- a/backend/windmill-api/src/indexer_ee.rs
+++ b/backend/windmill-api/src/indexer_ee.rs
@@ -3,3 +3,7 @@ use axum::Router;
 pub fn workspaced_service() -> Router {
     Router::new()
 }
+
+pub fn global_service() -> Router {
+    Router::new()
+}
diff --git a/backend/windmill-api/src/lib.rs b/backend/windmill-api/src/lib.rs
index 3ea78ffd6d..5a7f7fcded 100644
--- a/backend/windmill-api/src/lib.rs
+++ b/backend/windmill-api/src/lib.rs
@@ -154,18 +154,18 @@ pub async fn add_webhook_allowed_origin(
 type IndexReader = ();
 
 #[cfg(not(feature = "tantivy"))]
-type IndexWriter = ();
+type ServiceLogIndexReader = ();
 
 #[cfg(feature = "tantivy")]
-type IndexReader = windmill_indexer::indexer_ee::IndexReader;
+type IndexReader = windmill_indexer::completed_runs_ee::IndexReader;
 #[cfg(feature = "tantivy")]
-type IndexWriter = windmill_indexer::indexer_ee::IndexWriter;
+type ServiceLogIndexReader = windmill_indexer::service_logs_ee::ServiceLogIndexReader;
 
 pub async fn run_server(
     db: DB,
     rsmq: Option<rsmq_async::MultiplexedRsmq>,
-    index_reader: Option<IndexReader>,
-    index_writer: Option<IndexWriter>,
+    job_index_reader: Option<IndexReader>,
+    log_index_reader: Option<ServiceLogIndexReader>,
     addr: SocketAddr,
     mut rx: tokio::sync::broadcast::Receiver<()>,
     port_tx: tokio::sync::oneshot::Sender<String>,
@@ -205,8 +205,9 @@ pub async fn run_server(
         .layer(Extension(rsmq.clone()))
         .layer(Extension(user_db.clone()))
         .layer(Extension(auth_cache.clone()))
-        .layer(Extension(index_reader))
-        .layer(Extension(index_writer))
+        .layer(Extension(job_index_reader))
+        .layer(Extension(log_index_reader))
+        // .layer(Extension(index_writer))
         .layer(CookieManagerLayer::new())
         .layer(Extension(WebhookShared::new(rx.resubscribe(), db.clone())))
         .layer(DefaultBodyLimit::max(
@@ -322,6 +323,10 @@ pub async fn run_server(
                     "/srch/w/:workspace_id/index",
                     indexer_ee::workspaced_service(),
                 )
+                .nest(
+                    "/srch/index",
+                    indexer_ee::global_service(),
+                )
                 .nest("/oidc", oidc_ee::global_service())
                 .nest(
                     "/saml",
diff --git a/backend/windmill-indexer/src/completed_runs_ee.rs b/backend/windmill-indexer/src/completed_runs_ee.rs
new file mode 100644
index 0000000000..79bcbcff77
--- /dev/null
+++ b/backend/windmill-indexer/src/completed_runs_ee.rs
@@ -0,0 +1,21 @@
+use sqlx::{Pool, Postgres};
+use windmill_common::error::Error;
+use anyhow::anyhow;
+
+#[derive(Clone)]
+pub struct IndexReader;
+
+#[derive(Clone)]
+pub struct IndexWriter;
+
+pub async fn init_index() -> Result<(IndexReader, IndexWriter), Error> {
+    Err(anyhow!("Cannot initialize index: not in EE").into())
+}
+
+pub async fn run_indexer(
+    _db: Pool<Postgres>,
+    mut _index_writer: IndexWriter,
+    mut _killpill_rx: tokio::sync::broadcast::Receiver<()>,
+) {
+    tracing::error!("Cannot run indexer: not in EE");
+}
diff --git a/backend/windmill-indexer/src/indexer_ee.rs b/backend/windmill-indexer/src/indexer_ee.rs
index da92ff0ef8..e69de29bb2 100644
--- a/backend/windmill-indexer/src/indexer_ee.rs
+++ b/backend/windmill-indexer/src/indexer_ee.rs
@@ -1,21 +0,0 @@
-use anyhow::anyhow;
-use sqlx::{Pool, Postgres};
-use windmill_common::error::Error;
-
-#[derive(Clone)]
-pub struct IndexReader;
-
-#[derive(Clone)]
-pub struct IndexWriter;
-
-pub async fn init_index() -> Result<(IndexReader, IndexWriter), Error> {
-    Err(anyhow!("Cannot initialize index: not in EE").into())
-}
-
-pub async fn run_indexer(
-    _db: Pool<Postgres>,
-    mut _index_writer: IndexWriter,
-    mut _killpill_rx: tokio::sync::broadcast::Receiver<()>,
-) {
-    tracing::error!("Cannot run indexer: not in EE");
-}
diff --git a/backend/windmill-indexer/src/lib.rs b/backend/windmill-indexer/src/lib.rs
index c1bf4eea0c..14c6e7906d 100644
--- a/backend/windmill-indexer/src/lib.rs
+++ b/backend/windmill-indexer/src/lib.rs
@@ -1 +1,3 @@
+pub mod completed_runs_ee;
+pub mod service_logs_ee;
 pub mod indexer_ee;
diff --git a/backend/windmill-indexer/src/service_logs_ee.rs b/backend/windmill-indexer/src/service_logs_ee.rs
new file mode 100644
index 0000000000..79bcbcff77
--- /dev/null
+++ b/backend/windmill-indexer/src/service_logs_ee.rs
@@ -0,0 +1,21 @@
+use sqlx::{Pool, Postgres};
+use windmill_common::error::Error;
+use anyhow::anyhow;
+
+#[derive(Clone)]
+pub struct IndexReader;
+
+#[derive(Clone)]
+pub struct IndexWriter;
+
+pub async fn init_index() -> Result<(IndexReader, IndexWriter), Error> {
+    Err(anyhow!("Cannot initialize index: not in EE").into())
+}
+
+pub async fn run_indexer(
+    _db: Pool<Postgres>,
+    mut _index_writer: IndexWriter,
+    mut _killpill_rx: tokio::sync::broadcast::Receiver<()>,
+) {
+    tracing::error!("Cannot run indexer: not in EE");
+}
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 0fde010091..a5c5e883d1 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -43,7 +43,7 @@
 				"graphql": "^16.7.1",
 				"hash-sum": "^2.0.0",
 				"highlight.js": "^11.8.0",
-				"lucide-svelte": "^0.293.0",
+				"lucide-svelte": "^0.399.0",
 				"minimatch": "^10.0.1",
 				"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~8.0.2",
 				"monaco-editor-wrapper": "^5.5.2",
@@ -8607,11 +8607,11 @@
 			"optional": true
 		},
 		"node_modules/lucide-svelte": {
-			"version": "0.293.0",
-			"resolved": "https://registry.npmjs.org/lucide-svelte/-/lucide-svelte-0.293.0.tgz",
-			"integrity": "sha512-nQ6QO6anjjiVoipw3dNptzI6NWuiArlhysVtRpoAWICSQVMR3ybwVf6piUUqbjGe+RfGufLzCl93C/yhsS+p4w==",
+			"version": "0.399.0",
+			"resolved": "https://registry.npmjs.org/lucide-svelte/-/lucide-svelte-0.399.0.tgz",
+			"integrity": "sha512-NQ8AxNMKbIJsx7HV//gnAsIY1wJfb3rbXSK2S/ZDjIldvAEdzGngpUT8T8Q8zHYUuii0bavAmVARN8giR4vvpA==",
 			"peerDependencies": {
-				"svelte": ">=3 <5"
+				"svelte": "^3 || ^4 || ^5.0.0-next.42"
 			}
 		},
 		"node_modules/magic-string": {
diff --git a/frontend/package.json b/frontend/package.json
index de2a4b629b..1716d5546a 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -116,7 +116,7 @@
 		"graphql": "^16.7.1",
 		"hash-sum": "^2.0.0",
 		"highlight.js": "^11.8.0",
-		"lucide-svelte": "^0.293.0",
+		"lucide-svelte": "^0.399.0",
 		"minimatch": "^10.0.1",
 		"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~8.0.2",
 		"monaco-editor-wrapper": "^5.5.2",
diff --git a/frontend/src/lib/components/LogSnippetViewer.svelte b/frontend/src/lib/components/LogSnippetViewer.svelte
new file mode 100644
index 0000000000..693522ed33
--- /dev/null
+++ b/frontend/src/lib/components/LogSnippetViewer.svelte
@@ -0,0 +1,38 @@
+<script lang="ts">
+	import AnsiUp from 'ansi_up'
+
+	export let content: string
+	export let highlighted: any[]
+
+	const ansi_up = new AnsiUp()
+	ansi_up.use_classes = true
+
+	function highlightSnippet(snippet: string) {
+		const opener = '!-!-!_H_START_WMILL_!-!-!'
+		const closer = '!-!-!_H_ENDER_WMILL_!-!-!'
+
+		let offset = 0
+		let ret = snippet
+		for (const range of highlighted) {
+			ret = ret.slice(0, range.start + offset) + opener + ret.slice(range.start + offset)
+			offset += opener.length
+			ret = ret.slice(0, range.end + offset) + closer + ret.slice(range.end + offset)
+			offset += closer.length
+		}
+
+		let html = ansi_up.ansi_to_html(ret)
+		let html2 = html
+			.replaceAll(opener, '<span class="bg-amber-400 text-black">')
+			.replaceAll(closer, '</span>')
+		return html2
+	}
+
+	let html = highlightSnippet(content)
+</script>
+
+<button on:click class="font-light !m-0 !p-0">
+<pre
+	class="bg-surface-secondary hover:bg-surface px-2 py-1 text-secondary text-xs w-[100%] whitespace-pre border min-w-full text-start" >
+{@html html}
+</pre>
+</button>
diff --git a/frontend/src/lib/components/LogViewer.svelte b/frontend/src/lib/components/LogViewer.svelte
index de78eefc52..d04b7f9c56 100644
--- a/frontend/src/lib/components/LogViewer.svelte
+++ b/frontend/src/lib/components/LogViewer.svelte
@@ -245,7 +245,7 @@
 					: 'top-2'}  left-36">mem peak: {(mem / 1024).toPrecision(4)}MB</span
 			>
 		{/if}
-		<pre class="whitespace-pre-wrap break-words {small ? '!text-2xs' : '!text-xs'} w-full p-2"
+		<pre class="whitespace-pre break-words {small ? '!text-2xs' : '!text-xs'} w-full p-2"
 			>{#if content}{@const len =
 					(content?.length ?? 0) +
 					(loadedFromObjectStore?.length ?? 0)}{#if downloadStartUrl}<button on:click={getStoreLogs}
diff --git a/frontend/src/lib/components/ServiceLogsInner.svelte b/frontend/src/lib/components/ServiceLogsInner.svelte
index b3c9d778fc..6bccebc5d6 100644
--- a/frontend/src/lib/components/ServiceLogsInner.svelte
+++ b/frontend/src/lib/components/ServiceLogsInner.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { ServiceLogsService } from '$lib/gen'
+	import { IndexSearchService, ServiceLogsService } from '$lib/gen'
 	import { Pane, Splitpanes } from 'svelte-splitpanes'
 
 	import ManuelDatePicker from './runs/ManuelDatePicker.svelte'
@@ -7,9 +7,18 @@
 	import LogViewer from './LogViewer.svelte'
 	import Toggle from './Toggle.svelte'
 	import { sendUserToast } from '$lib/toast'
-	import { onDestroy } from 'svelte'
+	import { onDestroy, tick } from 'svelte'
 	import { Loader2 } from 'lucide-svelte'
-	import { truncateRev } from '$lib/utils'
+	import { copyToClipboard, truncateRev } from '$lib/utils'
+	import LogSnippetViewer from './LogSnippetViewer.svelte'
+	import { Button, Drawer, DrawerContent } from './common'
+	import ClipboardCopy from 'lucide-svelte/icons/clipboard-copy'
+	import AnsiUp from 'ansi_up'
+	import { scroll_into_view_if_needed_polyfill } from './multiselect/utils'
+	import SplitPanesWrapper from './splitPanes/SplitPanesWrapper.svelte'
+
+	export let searchTerm: string
+	export let queryParseErrors: string[] = []
 
 	let minTs: undefined | string = undefined
 	let maxTs: undefined | string = undefined
@@ -132,8 +141,9 @@
 				if (upToIsLatest && selected) {
 					upTo = getLatestUpTo(selected)
 				}
-				if (autoRefresh && !maxTsManual) {
+				if (autoRefresh && searchTerm === '' && !maxTsManual) {
 					timeout = setTimeout(() => {
+						if (searchTerm !== '') return
 						let minMax = manualPicker?.computeMinMax()
 						if (minMax) {
 							maxTsManual = minMax?.maxTs
@@ -267,11 +277,129 @@
 			return log
 		}
 	}
+
+	let logs: any
+
+	let debounceTimeout: NodeJS.Timeout | undefined = undefined
+	const debouncePeriod: number = 400
+	let loadingLogs = false
+	let loadingLogCounts = false
+
+	let countsPerHost: any
+
+	async function searchLogs(
+		searchTerm: string,
+		selected: [string, string, string] | undefined,
+		minTs: string | undefined,
+		maxTs: string | undefined,
+		allLogs: ByMode | undefined
+	) {
+		if (searchTerm.trim() === '') {
+			debounceTimeout && clearTimeout(debounceTimeout)
+			logs = undefined
+			countsPerHost = undefined
+			loadingLogs = false
+			loadingLogCounts = false
+			return
+		}
+		timeout && clearTimeout(timeout)
+
+		loadingLogCounts = true
+		loadingLogs = true
+		debounceTimeout && clearTimeout(debounceTimeout)
+		debounceTimeout = setTimeout(async () => {
+			if (allLogs) {
+				const hostnames: string[] = []
+				Object.entries(allLogs).forEach(([mode, wgs]) => {
+					Object.entries(wgs).forEach(([wg, keys]) => {
+						Object.entries(keys).forEach(([key, _log_files]) => {
+							hostnames.push(`${mode},${wg},${key}`)
+						})
+					})
+				})
+				const countLogsResponse = await IndexSearchService.countSearchLogsIndex({
+					searchQuery: searchTerm,
+					hosts: hostnames.join(','),
+					minTs,
+					maxTs
+				})
+				countsPerHost = countLogsResponse.count_per_host
+				queryParseErrors = countLogsResponse.query_parse_errors ?? []
+				loadingLogCounts = false
+			}
+
+			if (selected) {
+				logs = await IndexSearchService.searchLogsIndex({
+					searchQuery: searchTerm,
+					mode: selected[0],
+					workerGroup: selected[1] != '' ? selected[1] : undefined,
+					hostname: selected[2],
+					minTs,
+					maxTs
+				})
+			}
+
+			loadingLogs = false
+		}, debouncePeriod)
+	}
+
+	const ansi_up = new AnsiUp()
+	ansi_up.use_classes = true
+
+	let logDrawer: Drawer
+	let logDrawerOpen: boolean
+	let content: string = ''
+	let hitLineNumber: number | undefined = undefined
+
+	async function seeLogContext(
+		lineNumber: number,
+		path: string,
+		hostname: string,
+		jsonFmt: boolean
+	) {
+		const res = await ServiceLogsService.getLogFile({ path: `${hostname}/${path}` })
+
+		content = processLogWithJsonFmt(ansi_up.ansi_to_html(res), jsonFmt)
+		hitLineNumber = lineNumber
+		logDrawerOpen = true
+
+		await tick()
+		let el = document.getElementById(`log-line-${lineNumber}`)
+		if (el) scroll_into_view_if_needed_polyfill(el, false)
+	}
+
+	$: searchLogs(searchTerm, selected, minTsManual, maxTsManual, allLogs)
 </script>
 
-<div class="w-full h-[70vh]" on:scroll|preventDefault>
+<Drawer bind:this={logDrawer} bind:open={logDrawerOpen} size="1400px">
+	<DrawerContent title="See context" on:close={logDrawer.closeDrawer}>
+		<svelte:fragment slot="actions">
+			<Button
+				on:click={() => copyToClipboard(content)}
+				color="light"
+				size="xs"
+				startIcon={{
+					icon: ClipboardCopy
+				}}
+			>
+				Copy to clipboard
+			</Button>
+		</svelte:fragment>
+		<div class="w-fit">
+			<pre
+				class="bg-surface-secondary text-secondary text-xs w-full p-2 whitespace-pre border rounded-md"
+				>...<br />{#each content.split('\n') as line, index}<div
+						id={`log-line-${index}`}
+						class={index === hitLineNumber ? 'bg-yellow-200 bg-opacity-20' : ''}>{@html line}</div
+					>{/each}...</pre
+			>
+		</div>
+	</DrawerContent>
+</Drawer>
+
+<SplitPanesWrapper class="hidden md:block">
 	<Splitpanes>
-		<Pane size={40} minSize={20}>
+		<Pane size={30} minSize={25}>
 			<div class="p-1">
 				<div
 					class="flex flex-col lg:flex-row gap-y-1 justify-between w-full relative pb-4 gap-x-0.5"
@@ -290,7 +418,17 @@
 								: 'min datetime'}
 							disabled
 						/>
-						<CalendarPicker label="min datetime" date={minTs} />
+						<CalendarPicker
+							label="min datetime"
+							date={minTsManual}
+							on:change={({ detail }) => {
+								minTs = undefined
+								maxTs = undefined
+								allLogs = undefined
+								minTsManual = detail
+								getAllLogs(minTsManual, maxTsManual)
+							}}
+						/>
 					</div>
 					<ManuelDatePicker
 						bind:minTs={minTsManual}
@@ -304,7 +442,7 @@
 							getAllLogs(minTsManual, maxTsManual)
 						}}
 						serviceLogsChoices
-						loadText="Last 1000 logfiles"
+						loadText={searchTerm === '' ? 'Last 1000 logfiles' : 'All time'}
 					/>
 					<div class="flex relative">
 						<input
@@ -319,7 +457,17 @@
 								: 'max datetime'}
 							disabled
 						/>
-						<CalendarPicker label="max datetime" date={maxTs} />
+						<CalendarPicker
+							label="max datetime"
+							date={maxTsManual}
+							on:change={({ detail }) => {
+								minTs = undefined
+								maxTs = undefined
+								allLogs = undefined
+								maxTsManual = detail
+								getAllLogs(minTsManual, maxTsManual)
+							}}
+						/>
 					</div>
 				</div>
 				<div class="flex w-full flex-row-reverse pb-4 -mt-2 gap-2"
@@ -335,6 +483,7 @@
 					<Toggle
 						size="xs"
 						bind:checked={autoRefresh}
+						disabled={searchTerm != ''}
 						on:change={(e) => {
 							if (e.detail) {
 								getAllLogs(maxTs, undefined)
@@ -353,27 +502,29 @@
 					{@const minTsN = new Date(minTs).getTime()}
 					{@const maxTsN = new Date(maxTs).getTime()}
 					{@const diff = maxTsN - minTsN}
-					<div class="flex w-full text-2xs text-tertiary pb-6">
-						<div style="width: 60px;" />
+					{#if searchTerm === ''}
+						<div class="flex w-full text-2xs text-tertiary pb-6">
+							<div style="width: 60px;" />
 
-						<div class="flex justify-between w-full"
-							><div
-								>{new Date(minTs).toLocaleTimeString([], {
-									day: '2-digit',
-									month: '2-digit',
-									hour: '2-digit',
-									minute: '2-digit'
-								})}</div
-							><div
-								>{new Date(maxTs).toLocaleTimeString([], {
-									day: '2-digit',
-									month: '2-digit',
-									hour: '2-digit',
-									minute: '2-digit'
-								})}</div
-							></div
-						>
-					</div>
+							<div class="flex justify-between w-full"
+								><div
+									>{new Date(minTs).toLocaleTimeString([], {
+										day: '2-digit',
+										month: '2-digit',
+										hour: '2-digit',
+										minute: '2-digit'
+									})}</div
+								><div
+									>{new Date(maxTs).toLocaleTimeString([], {
+										day: '2-digit',
+										month: '2-digit',
+										hour: '2-digit',
+										minute: '2-digit'
+									})}</div
+								></div
+							>
+						</div>
+					{/if}
 					{#each Object.entries(allLogs) as [mode, o1]}
 						<div class="w-full pb-8">
 							<h2 class="pb-2 text-2xl">{mode}s</h2>
@@ -383,11 +534,21 @@
 										<h4 class="pt-4">{wg}</h4>
 									{/if}
 									<div class="divide-y flex flex-col">
-										{#each Object.entries(o2) as [hn, files]}
+										{#each Object.entries(o2).filter(([hn, files]) => {
+											if (selected && selected[0] === mode && selected[1] === wg && selected[2] === hn) {
+												return true
+											}
+											const hostKey = `${mode},${wg},${hn}`
+											if (countsPerHost && countsPerHost[hostKey] && countsPerHost[hostKey].count === 0) {
+												return false
+											}
+											return true
+										}) as [hn, files]}
+											{@const hostKey = `${mode},${wg},${hn}`}
 											<!-- svelte-ignore a11y-click-events-have-key-events -->
 											<!-- svelte-ignore a11y-no-static-element-interactions -->
 											<div
-												class="w-full flex items-baseline rounded px-1 hover:bg-surface-hover cursor-pointer {selected &&
+												class="w-full flex items-baseline justify-between rounded px-1 hover:bg-surface-hover cursor-pointer {selected &&
 												selected[0] == mode &&
 												selected[1] == wg &&
 												selected[2] == hn
@@ -405,22 +566,31 @@
 													title={hn}
 													style="width: 90px;">{truncateRev(hn, 8)}</div
 												>
-												<div class="relative grow h-8 mr-2">
-													{#each files as file}
-														{@const okHeight = 100.0 * ((file.ok_lines * 1.0) / (max_lines ?? 1))}
-														{@const errHeight = 100.0 * ((file.err_lines * 1.0) / (max_lines ?? 1))}
-														<div
-															class=" w-2 bg-red-400 absolute"
-															style="left: {((file.ts - minTsN) / diff) *
-																100}%; height: {errHeight}%; bottom: {okHeight}%;"
-														/>
-														<div
-															class="w-2 bg-surface-secondary-inverse absolute bottom-0"
-															style="left: {((file.ts - minTsN) / diff) *
-																100}%; height: {okHeight}%"
-														/>
-													{/each}
-												</div>
+												{#if loadingLogCounts}
+													<Loader2 size={15} class="animate-spin" />
+												{:else if countsPerHost}
+													<div class="text-tertiary text-xs">
+														{countsPerHost[hostKey]?.count} matches
+													</div>
+												{:else}
+													<div class="relative grow h-8 mr-2">
+														{#each files as file}
+															{@const okHeight = 100.0 * ((file.ok_lines * 1.0) / (max_lines ?? 1))}
+															{@const errHeight =
+																100.0 * ((file.err_lines * 1.0) / (max_lines ?? 1))}
+															<div
+																class=" w-2 bg-red-400 absolute"
+																style="left: {((file.ts - minTsN) / diff) *
+																	100}%; height: {errHeight}%; bottom: {okHeight}%;"
+															/>
+															<div
+																class="w-2 bg-surface-secondary-inverse absolute bottom-0"
+																style="left: {((file.ts - minTsN) / diff) *
+																	100}%; height: {okHeight}%"
+															/>
+														{/each}
+													</div>
+												{/if}
 											</div>
 										{/each}
 									</div>
@@ -431,126 +601,162 @@
 				{/if}
 			</div>
 		</Pane>
-		<Pane size={60} minSize={20}
+		<Pane size={70} minSize={25}
 			><div class="relative h-full flex flex-col gap-1"
 				><div class="w-full bg-surface-primary-inverse text-tertiary text-xs text-center"
 					>1 min delay: logs are compacted before being available</div
 				>
 				{#if selected}
 					<div class="grow overflow-auto" id="logviewer">
-						{#each getLogs(selected, upTo) as file}
-							<div
-								style="min-height: {logsContent[file.file_path]
-									? 10
-									: (file.ok_lines + file.err_lines) / 20}px;"
-							>
-								<div class="bg-surface-primary-inverse text-sm font-semibold px-1"
-									>{new Date(file.ts).toLocaleTimeString([], {
-										day: '2-digit',
-										month: '2-digit',
-										hour: '2-digit',
-										minute: '2-digit'
-									})}</div
-								>
-								{#if logsContent[file.file_path] == undefined}
-									<div
-										class="animate-skeleton dark:bg-frost-900/50 [animation-delay:1000ms] h-full w-full"
+						{#if loadingLogs}
+							<div class="flex w-full justify-center items-center h-48">
+								<div class="text-tertiary text-center">
+									<Loader2 size={34} class="animate-spin" />
+								</div>
+							</div>
+						{:else if logs != undefined}
+							<div class="flex flex-col min-w-full w-fit">
+								{#each logs.hits as { snippet_fragment, snippet_highlighted, document }}
+									<LogSnippetViewer
+										content={snippet_fragment || document.logs[0]}
+										highlighted={snippet_highlighted}
+										on:click={() => {
+											let logLineNumber = document.line_number[0]
+											let logFile = document.file_name[0]
+											let host = document.host[0]
+											let jsonFmt = document.json_fmt[0]
+											seeLogContext(logLineNumber, logFile, host, jsonFmt)
+										}}
 									/>
-								{:else if logsContent[file.file_path]}
-									{#if logsContent[file.file_path].error}
-										{#if logsContent[file.file_path].error?.startsWith('Not Found')}
-											<div class="text-xs pb-4 pt-2 text-secondary"
-												>Log file is missing. Log files require a shared log volume to be mounted
-												across servers and workers or to use the EE S3/object storage integration
-												for logs. To avoid mounting a shared volume, set the EE object store logs in
-												the instance settings</div
+								{/each}
+								{#if logs.hits.length === 0}
+									<div class="text-center py-20 text-bold text-xl text-tertiary"> No logs </div>
+								{/if}
+								{#if logs.hits.length === 30}
+									<div class="pl-6 py-6 text-sm text-secondary">
+										Older matches were truncated from this search, try refining your filters to get
+										more precise results.
+									</div>
+								{/if}
+								<div class="py-20" />
+							</div>
+						{:else}
+							{#each getLogs(selected, upTo) as file}
+								<div
+									style="min-height: {logsContent[file.file_path]
+										? 10
+										: (file.ok_lines + file.err_lines) / 20}px;"
+								>
+									<div class="bg-surface-primary-inverse text-sm font-semibold px-1"
+										>{new Date(file.ts).toLocaleTimeString([], {
+											day: '2-digit',
+											month: '2-digit',
+											hour: '2-digit',
+											minute: '2-digit'
+										})}</div
+									>
+									{#if logsContent[file.file_path] == undefined}
+										<div
+											class="animate-skeleton dark:bg-frost-900/50 [animation-delay:1000ms] h-full w-full"
+										/>
+									{:else if logsContent[file.file_path]}
+										{#if logsContent[file.file_path].error}
+											{#if logsContent[file.file_path].error?.startsWith('Not Found')}
+												<div class="text-xs pb-4 pt-2 text-secondary"
+													>Log file is missing. Log files require a shared log volume to be mounted
+													across servers and workers or to use the EE S3/object storage integration
+													for logs. To avoid mounting a shared volume, set the EE object store logs
+													in the instance settings</div
+												>
+											{:else}
+												<div class="text-xs text-red-400 pb-4"
+													>{logsContent[file.file_path].error}</div
+												>
+											{/if}
+										{:else if logsContent[file.file_path].content}
+											<!-- svelte-ignore a11y-click-events-have-key-events -->
+											<!-- svelte-ignore a11y-no-static-element-interactions -->
+											<div on:click|preventDefault class="pr-2"
+												><LogViewer
+													noAutoScroll
+													noMaxH
+													isLoading={false}
+													tag={undefined}
+													content={processLogWithJsonFmt(
+														logsContent[file.file_path].content,
+														file.json_fmt
+													)}
+												/></div
 											>
 										{:else}
-											<div class="text-xs text-red-400 pb-4"
-												>{logsContent[file.file_path].error}</div
-											>
+											<div>No logs</div>
 										{/if}
-									{:else if logsContent[file.file_path].content}
-										<!-- svelte-ignore a11y-click-events-have-key-events -->
-										<!-- svelte-ignore a11y-no-static-element-interactions -->
-										<div on:click|preventDefault
-											><LogViewer
-												noAutoScroll
-												noMaxH
-												isLoading={false}
-												tag={undefined}
-												content={processLogWithJsonFmt(
-													logsContent[file.file_path].content,
-													file.json_fmt
-												)}
-											/></div
-										>
-									{:else}
-										<div>No logs</div>
 									{/if}
+								</div>
+							{/each}
+						{/if}
+					</div>
+					{#if searchTerm == ''}
+						<div class="flex w-full items-center gap-4">
+							<div class="text-tertiary px-1 text-2xs">Last 5 log files up to:</div>
+							<div class="flex grow text-xs justify-center px-2 items-center gap-2">
+								{#if upTo}
+									<button
+										on:click={() => {
+											if (upTo) {
+												upToIsLatest = false
+												upTo = new Date(new Date(upTo).getTime() - 5 * 60 * 1000).toISOString()
+											}
+										}}>{'<'} 5m</button
+									>
+								{:else}
+									<div />
+								{/if}
+
+								<div class="flex gap-1 relative items-center"
+									><div class="flex gap-1 relative">
+										<input
+											type="text"
+											value={upTo
+												? new Date(upTo).toLocaleTimeString([], {
+														day: '2-digit',
+														month: '2-digit',
+														hour: '2-digit',
+														minute: '2-digit'
+												  })
+												: ''}
+											disabled
+										/><CalendarPicker bind:date={upTo} label="Logs up to" /></div
+									></div
+								>
+								{#if upTo}
+									<button
+										on:click={() => {
+											if (upTo) {
+												upToIsLatest = false
+												upTo = new Date(new Date(upTo).getTime() + 5 * 60 * 1000).toISOString()
+											}
+										}}>5m {'>'}</button
+									>
+								{:else}
+									<div />
 								{/if}
 							</div>
-						{/each}
-					</div>
-					<div class="flex w-full items-center gap-4">
-						<div class="text-tertiary px-1 text-2xs">Last 5 log files up to:</div>
-						<div class="flex grow text-xs justify-center px-2 items-center gap-2">
-							{#if upTo}
+							<div>
 								<button
+									class="text-xs"
 									on:click={() => {
-										if (upTo) {
-											upToIsLatest = false
-											upTo = new Date(new Date(upTo).getTime() - 5 * 60 * 1000).toISOString()
-										}
-									}}>{'<'} 5m</button
+										upTo = new Date().toISOString()
+										upToIsLatest = true
+									}}>now</button
 								>
-							{:else}
-								<div />
-							{/if}
-
-							<div class="flex gap-1 relative items-center"
-								><div class="flex gap-1 relative">
-									<input
-										type="text"
-										value={upTo
-											? new Date(upTo).toLocaleTimeString([], {
-													day: '2-digit',
-													month: '2-digit',
-													hour: '2-digit',
-													minute: '2-digit'
-											  })
-											: ''}
-										disabled
-									/><CalendarPicker bind:date={upTo} label="Logs up to" /></div
-								></div
-							>
-							{#if upTo}
-								<button
-									on:click={() => {
-										if (upTo) {
-											upToIsLatest = false
-											upTo = new Date(new Date(upTo).getTime() + 5 * 60 * 1000).toISOString()
-										}
-									}}>5m {'>'}</button
-								>
-							{:else}
-								<div />
-							{/if}
+							</div>
 						</div>
-						<div>
-							<button
-								class="text-xs"
-								on:click={() => {
-									upTo = new Date().toISOString()
-									upToIsLatest = true
-								}}>now</button
-							>
-						</div>
-					</div>
+					{/if}
 				{:else}
 					<div class="flex justify-center items-center pt-8">Select a host to see its logs</div>
 				{/if}</div
 			></Pane
 		>
 	</Splitpanes>
-</div>
+</SplitPanesWrapper>
diff --git a/frontend/src/lib/components/multiselect/utils.ts b/frontend/src/lib/components/multiselect/utils.ts
index 2c1c093276..a9bcfcaa69 100644
--- a/frontend/src/lib/components/multiselect/utils.ts
+++ b/frontend/src/lib/components/multiselect/utils.ts
@@ -53,7 +53,11 @@ export function scroll_into_view_if_needed_polyfill(elem: Element, centerIfNeede
 			})
 		}
 		observer.disconnect()
-	})
+	}, {
+  root: null, // or specify a scrolling parent if needed
+  rootMargin: '0px 1000px', // Essentially making horizontal checks irrelevant
+  threshold: 0.1 // Adjust threshold to control when observer should trigger
+})
 	observer.observe(elem)
 
 	return observer // return for testing
diff --git a/frontend/src/lib/components/runs/ManuelDatePicker.svelte b/frontend/src/lib/components/runs/ManuelDatePicker.svelte
index f729089635..84a4f12a9f 100644
--- a/frontend/src/lib/components/runs/ManuelDatePicker.svelte
+++ b/frontend/src/lib/components/runs/ManuelDatePicker.svelte
@@ -24,16 +24,10 @@
 		return { minTs, maxTs }
 	}
 
-	const manualDates: {
+	const fixedManualDates: {
 		label: string
 		computeMinMax: () => { minTs: string; maxTs: string | undefined } | undefined
 	}[] = [
-		{
-			label: loadText ?? 'Last 1000 runs',
-			computeMinMax: () => {
-				return undefined
-			}
-		},
 		...(!serviceLogsChoices
 			? [
 					{
@@ -68,6 +62,17 @@
 		}
 	]
 
+	$: manualDates = [
+		{
+			label: loadText ?? 'Last 1000 runs',
+			computeMinMax: () => {
+				return undefined
+			}
+		},
+		...fixedManualDates
+
+	]
+
 	const dispatch = createEventDispatcher()
 </script>
 
diff --git a/frontend/src/lib/components/search/GlobalSearchModal.svelte b/frontend/src/lib/components/search/GlobalSearchModal.svelte
index c1e74e9074..021d82acfc 100644
--- a/frontend/src/lib/components/search/GlobalSearchModal.svelte
+++ b/frontend/src/lib/components/search/GlobalSearchModal.svelte
@@ -39,7 +39,7 @@
 	import { scroll_into_view_if_needed_polyfill } from '../multiselect/utils'
 	import { Alert } from '../common'
 	import Popover from '../Popover.svelte'
-	import ServiceLogsInner from '../ServiceLogsInner.svelte'
+	import Logs from 'lucide-svelte/icons/logs'
 
 	let open: boolean = false
 
@@ -78,13 +78,6 @@
 			action: () => switchMode('content'),
 			shortcutKey: CONTENT_SEARCH_PREFIX,
 			icon: SearchCode
-		},
-		{
-			search_id: 'switchto:log-search',
-			label: 'Search Windmill logs',
-			action: () => switchMode('logs'),
-			shortcutKey: LOGS_PREFIX,
-			icon: Search
 		}
 	]
 	let defaultMenuItems: quickMenuItem[] = [
@@ -108,7 +101,14 @@
 			action: () => gotoPage('/schedules'),
 			icon: CalendarIcon
 		},
-		...switchModeItems
+		...switchModeItems,
+		{
+			search_id: 'nav:service_logs',
+			label: 'Explore windmill service logs',
+			action: () => gotoPage('/service_logs'),
+			shortcutKey: LOGS_PREFIX,
+			icon: Logs
+		}
 	]
 
 	let itemMap = {
@@ -483,7 +483,7 @@
 	}
 
 	function maxModalWidth(tab: SearchMode) {
-		if (tab === 'runs' || tab === 'logs') {
+		if (tab === 'runs') {
 			return 'max-w-7xl'
 		} else {
 			return 'max-w-4xl'
@@ -491,7 +491,7 @@
 	}
 
 	function maxModalHeight(tab: SearchMode) {
-		if (tab === 'runs' || tab === 'logs') {
+		if (tab === 'runs') {
 			return ''
 		} else if (tab === 'content') {
 			return 'max-h-[70vh]'
@@ -614,12 +614,19 @@
 								<Alert title="Service logs are only available to superadmins" type="warning">
 									Service logs are only available to superadmins
 								</Alert>
-							{:else if searchTerm.length == 1}
-								<ServiceLogsInner />
 							{:else}
-								<Alert title="Not yet supported" type="info">
-									Full-text search across Windmill logs is not yet supported
-								</Alert>
+								<QuickMenuItem
+									on:select={() =>
+										gotoPage(
+											`/service_logs?query=${encodeURIComponent(removePrefix(searchTerm, '!'))}`
+										)}
+									id="goto_service_logs_search"
+									hovered={true}
+									label={searchTerm === '!'
+										? 'Explore Windmill service logs'
+										: `Search '${removePrefix(searchTerm, '!')}' in Windmill's service logs`}
+									icon={searchTerm === '!' ? Logs : Search}
+								/>
 							{/if}
 						</div>
 					{:else if tab === 'runs'}
@@ -680,40 +687,40 @@
 										</QuickMenuItem>
 									{/each}
 								</div>
-								{#if selectedItem === undefined}
-									Select a result to preview
-								{:else}
-									<div class="w-8/12 max-h-[70vh]">
+								<div class="w-8/12 max-h-[70vh]">
+									{#if selectedItem === undefined}
+										Select a result to preview
+									{:else}
 										<div class="h-[95%] overflow-y-scroll">
 											<JobPreview
 												id={selectedItem?.document?.id[0]}
 												workspace={selectedWorkspace}
 											/>
 										</div>
-										<div class="flex flex-row pt-3 pl-4 items-center text-xs text-secondary">
-											{#if indexMetadata.indexed_until}
-												<span class="px-2">
-												Most recent indexed job was created <TimeAgo
+									{/if}
+									<div class="flex flex-row pt-3 pl-4 items-center text-xs text-secondary">
+										{#if indexMetadata.indexed_until}
+											<span class="px-2">
+												Most recently indexed job was created <TimeAgo
 													agoOnlyIfRecent
 													date={indexMetadata.indexed_until || ''}
 												/>
-												</span>
-											{/if}
-											{#if indexMetadata.lost_lock_ownership}
-												<Popover notClickable placement="top">
-													<AlertTriangle size={16} class="text-gray-500" />
-													<svelte:fragment slot="text">
-														The current indexer is no longer indexing new jobs. This is most likely
-														because of an ongoing deployment and indexing will resume once it's
-														complete.
-													</svelte:fragment>
-												</Popover>
-											{/if}
-										</div>
+											</span>
+										{/if}
+										{#if indexMetadata.lost_lock_ownership}
+											<Popover notClickable placement="top">
+												<AlertTriangle size={16} class="text-gray-500" />
+												<svelte:fragment slot="text">
+													The current indexer is no longer indexing new jobs. This is most likely
+													because of an ongoing deployment and indexing will resume once it's
+													complete.
+												</svelte:fragment>
+											</Popover>
+										{/if}
 									</div>
-								{/if}
+								</div>
 							{:else}
-								<div class="flex w-full justify-center items-center h-48">
+								<div class="flex flex-col w-full justify-center items-center h-48">
 									<div class="text-tertiary text-center">
 										{#if searchTerm === RUNS_PREFIX}
 											<div class="text-2xl font-bold">Enter your search terms</div>
@@ -735,6 +742,26 @@
 											</Alert>
 										{/if}
 									</div>
+									<div class="flex flex-row pt-10 text-xs text-secondary">
+										{#if indexMetadata.indexed_until}
+											<span class="px-2">
+												Most recently indexed job was created <TimeAgo
+													agoOnlyIfRecent
+													date={indexMetadata.indexed_until}
+												/>
+											</span>
+										{/if}
+										{#if indexMetadata.lost_lock_ownership}
+											<Popover notClickable placement="top">
+												<AlertTriangle size={16} class="text-gray-500" />
+												<svelte:fragment slot="text">
+													The current indexer is no longer indexing new jobs. This is most likely
+													because of an ongoing deployment and indexing will resume once it's
+													complete.
+												</svelte:fragment>
+											</Popover>
+										{/if}
+									</div>
 								</div>
 							{/if}
 						</div>
diff --git a/frontend/src/lib/components/sidebar/SidebarContent.svelte b/frontend/src/lib/components/sidebar/SidebarContent.svelte
index 833272f6be..3d45f895ff 100644
--- a/frontend/src/lib/components/sidebar/SidebarContent.svelte
+++ b/frontend/src/lib/components/sidebar/SidebarContent.svelte
@@ -9,6 +9,7 @@
 		Calendar,
 		DollarSign,
 		Eye,
+		Logs,
 		FolderCog,
 		FolderOpen,
 		Github,
@@ -167,7 +168,29 @@
 			],
 			disabled: $userStore?.operator
 		},
-		{ label: 'Audit Logs', href: `${base}/audit_logs`, icon: Eye, disabled: $userStore?.operator }
+		!$superadmin
+			? {
+					label: 'Audit Logs',
+					href: `${base}/audit_logs`,
+					icon: Eye,
+					disabled: $userStore?.operator
+			  }
+			: {
+					label: 'Logs',
+					icon: Logs,
+					subItems: [
+						{
+							label: 'Audit Logs',
+							href: `${base}/audit_logs`,
+							icon: Eye
+						},
+						{
+							label: 'Service Logs',
+							href: `${base}/service_logs`,
+							icon: Logs
+						}
+					]
+			  }
 	]
 
 	let hasNewChangelogs = false
diff --git a/frontend/src/routes/(root)/(logged)/service_logs/+page.js b/frontend/src/routes/(root)/(logged)/service_logs/+page.js
new file mode 100644
index 0000000000..ad158a76be
--- /dev/null
+++ b/frontend/src/routes/(root)/(logged)/service_logs/+page.js
@@ -0,0 +1,5 @@
+export function load() {
+	return {
+		stuff: { title: 'Service Logs' }
+	}
+}
diff --git a/frontend/src/routes/(root)/(logged)/service_logs/+page.svelte b/frontend/src/routes/(root)/(logged)/service_logs/+page.svelte
new file mode 100644
index 0000000000..7dc9cb4580
--- /dev/null
+++ b/frontend/src/routes/(root)/(logged)/service_logs/+page.svelte
@@ -0,0 +1,71 @@
+<script lang="ts">
+	import { page } from '$app/stores'
+	import { Alert } from '$lib/components/common'
+	import Popover from '$lib/components/Popover.svelte'
+	import ServiceLogsInner from '$lib/components/ServiceLogsInner.svelte'
+	import Tooltip from '$lib/components/Tooltip.svelte'
+	import { superadmin } from '$lib/stores'
+	import { Search, AlertTriangle } from 'lucide-svelte'
+
+	let searchTerm = $page.url.searchParams.get('query') ?? ''
+	let queryParseErrors: string[] | undefined = undefined
+</script>
+
+<div class="w-full h-screen">
+	<div class="px-2">
+		<div class="flex items-center space-x-2 flex-row justify-between">
+			<div class="flex flex-row flex-wrap justify-between py-2 my-4 px-4 gap-1 items-center">
+				<h1 class="!text-2xl font-semibold leading-6 tracking-tight">Service logs</h1>
+				<Tooltip >
+					Explore and search Windmill service logs from within Windmill!
+				</Tooltip>
+			</div>
+		</div>
+	</div>
+
+	{#if !$superadmin}
+		<Alert title="Service logs are only available to superadmins" type="warning">
+			Service logs are only available to superadmins
+		</Alert>
+	{:else}
+		<div class="m-1 px-2 flex flex-row gap-1 items-center border-2 rounded-lg">
+			<Search size="16" />
+			<input
+				id="quickSearchInput"
+				type="text"
+				class="quick-search-input !bg-surface"
+				bind:value={searchTerm}
+				autocomplete="off"
+				autofocus
+			/>
+			{#if searchTerm !== '' && queryParseErrors && queryParseErrors.length > 0}
+				<Popover notClickable placement="bottom-start">
+					<AlertTriangle size={16} class="text-yellow-500" />
+					<svelte:fragment slot="text">
+						Some of your search terms have been ignored because one or more parse errors:<br /><br
+						/>
+						<ul>
+							{#each queryParseErrors as msg}
+								<li>- {msg}</li>
+							{/each}
+						</ul>
+					</svelte:fragment>
+				</Popover>
+			{/if}
+		</div>
+
+		<ServiceLogsInner {searchTerm} bind:queryParseErrors />
+	{/if}
+</div>
+
+<style>
+	.quick-search-input {
+		outline: none;
+		border: none !important;
+		box-shadow: none !important;
+	}
+
+	.quick-search-input:focus-visible {
+		outline: none !important;
+	}
+</style>

From 4dda0fb8cd8262ad3a2ab2b9d27e7043ac3bb891 Mon Sep 17 00:00:00 2001
From: HugoCasa <hugo@casademont.ch>
Date: Tue, 5 Nov 2024 11:54:08 +0100
Subject: [PATCH 17/80] feat: websocket authentication (#4635)

* feat: websocket authentication

* npm check, sqlx and preprocessor template

* better run job

* nit
---
 ...6fcb0b7a54ed4218fa3cf23cc929d009d50f.json} |   6 +-
 ...d373b18b6577198df7545c94bd19be3446775.json | 108 ---
 ...81a50a832e65c8c9632e2e12cd9c2747f2fc7.json |  98 ---
 ...4b2e3ecb30aae6510d1fcd08493b07c8b0952.json |  16 +
 ...1b50a15ec8bd349f1081af54da5dc2f5e3021.json | 101 ---
 .../20241030150214_ws_auth.down.sql           |   2 +
 .../migrations/20241030150214_ws_auth.up.sql  |   2 +
 backend/windmill-api/openapi.yaml             |  50 ++
 backend/windmill-api/src/users.rs             |   3 +-
 .../windmill-api/src/websocket_triggers.rs    | 636 +++++++++++++-----
 .../src/lib/components/ScriptPicker.svelte    |   4 +-
 .../details/EmailTriggerPanel.svelte          |  10 +-
 .../WebsocketTriggerEditorInner.svelte        | 360 +++++++++-
 frontend/src/lib/script_helpers.ts            |  10 +
 .../(logged)/websocket_triggers/+page.svelte  |  86 +--
 15 files changed, 948 insertions(+), 544 deletions(-)
 rename backend/.sqlx/{query-acbf74cf3302bfcf7615285070d3f8958932bb8a2dda715f1b9152ab44442780.json => query-0b94bd4c98a11ca1b7e5e34dd1ee6fcb0b7a54ed4218fa3cf23cc929d009d50f.json} (50%)
 delete mode 100644 backend/.sqlx/query-4e9668a46bad9e82baa51422946d373b18b6577198df7545c94bd19be3446775.json
 delete mode 100644 backend/.sqlx/query-5303cb9dd5903aa4791ef8e5e5881a50a832e65c8c9632e2e12cd9c2747f2fc7.json
 create mode 100644 backend/.sqlx/query-cd33a9d63f4706a7e3b1e23cd0a4b2e3ecb30aae6510d1fcd08493b07c8b0952.json
 delete mode 100644 backend/.sqlx/query-f2baee15e6d1fecd6d2d7b39fda1b50a15ec8bd349f1081af54da5dc2f5e3021.json
 create mode 100644 backend/migrations/20241030150214_ws_auth.down.sql
 create mode 100644 backend/migrations/20241030150214_ws_auth.up.sql

diff --git a/backend/.sqlx/query-acbf74cf3302bfcf7615285070d3f8958932bb8a2dda715f1b9152ab44442780.json b/backend/.sqlx/query-0b94bd4c98a11ca1b7e5e34dd1ee6fcb0b7a54ed4218fa3cf23cc929d009d50f.json
similarity index 50%
rename from backend/.sqlx/query-acbf74cf3302bfcf7615285070d3f8958932bb8a2dda715f1b9152ab44442780.json
rename to backend/.sqlx/query-0b94bd4c98a11ca1b7e5e34dd1ee6fcb0b7a54ed4218fa3cf23cc929d009d50f.json
index eef46ce41d..75288e80ae 100644
--- a/backend/.sqlx/query-acbf74cf3302bfcf7615285070d3f8958932bb8a2dda715f1b9152ab44442780.json
+++ b/backend/.sqlx/query-0b94bd4c98a11ca1b7e5e34dd1ee6fcb0b7a54ed4218fa3cf23cc929d009d50f.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "UPDATE websocket_trigger SET url = $1, script_path = $2, path = $3, is_flow = $4, filters = $5, edited_by = $6, email = $7, edited_at = now(), server_id = NULL, last_server_ping = NULL, error = NULL\n            WHERE workspace_id = $8 AND path = $9",
+  "query": "UPDATE websocket_trigger SET url = $1, script_path = $2, path = $3, is_flow = $4, filters = $5, initial_messages = $6, url_runnable_args = $7, edited_by = $8, email = $9, edited_at = now(), server_id = NULL, last_server_ping = NULL, error = NULL\n            WHERE workspace_id = $10 AND path = $11",
   "describe": {
     "columns": [],
     "parameters": {
@@ -10,6 +10,8 @@
         "Varchar",
         "Bool",
         "JsonbArray",
+        "JsonbArray",
+        "Jsonb",
         "Varchar",
         "Varchar",
         "Text",
@@ -18,5 +20,5 @@
     },
     "nullable": []
   },
-  "hash": "acbf74cf3302bfcf7615285070d3f8958932bb8a2dda715f1b9152ab44442780"
+  "hash": "0b94bd4c98a11ca1b7e5e34dd1ee6fcb0b7a54ed4218fa3cf23cc929d009d50f"
 }
diff --git a/backend/.sqlx/query-4e9668a46bad9e82baa51422946d373b18b6577198df7545c94bd19be3446775.json b/backend/.sqlx/query-4e9668a46bad9e82baa51422946d373b18b6577198df7545c94bd19be3446775.json
deleted file mode 100644
index 2f96d31ecb..0000000000
--- a/backend/.sqlx/query-4e9668a46bad9e82baa51422946d373b18b6577198df7545c94bd19be3446775.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO websocket_trigger (workspace_id, path, url, script_path, is_flow, enabled, filters, edited_by, email, edited_at) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, now()) RETURNING *",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
-        "name": "url",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 2,
-        "name": "script_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 3,
-        "name": "is_flow",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 4,
-        "name": "workspace_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 5,
-        "name": "edited_by",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 6,
-        "name": "email",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 7,
-        "name": "edited_at",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 8,
-        "name": "extra_perms",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 9,
-        "name": "server_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 10,
-        "name": "last_server_ping",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 11,
-        "name": "error",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 12,
-        "name": "enabled",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 13,
-        "name": "filters",
-        "type_info": "JsonbArray"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Varchar",
-        "Varchar",
-        "Varchar",
-        "Bool",
-        "Bool",
-        "JsonbArray",
-        "Varchar",
-        "Varchar"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      false,
-      false
-    ]
-  },
-  "hash": "4e9668a46bad9e82baa51422946d373b18b6577198df7545c94bd19be3446775"
-}
diff --git a/backend/.sqlx/query-5303cb9dd5903aa4791ef8e5e5881a50a832e65c8c9632e2e12cd9c2747f2fc7.json b/backend/.sqlx/query-5303cb9dd5903aa4791ef8e5e5881a50a832e65c8c9632e2e12cd9c2747f2fc7.json
deleted file mode 100644
index a95b00b8c8..0000000000
--- a/backend/.sqlx/query-5303cb9dd5903aa4791ef8e5e5881a50a832e65c8c9632e2e12cd9c2747f2fc7.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT *\n            FROM websocket_trigger\n            WHERE enabled IS TRUE AND (server_id IS NULL OR last_server_ping IS NULL OR last_server_ping < now() - interval '15 seconds')",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
-        "name": "url",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 2,
-        "name": "script_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 3,
-        "name": "is_flow",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 4,
-        "name": "workspace_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 5,
-        "name": "edited_by",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 6,
-        "name": "email",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 7,
-        "name": "edited_at",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 8,
-        "name": "extra_perms",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 9,
-        "name": "server_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 10,
-        "name": "last_server_ping",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 11,
-        "name": "error",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 12,
-        "name": "enabled",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 13,
-        "name": "filters",
-        "type_info": "JsonbArray"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      false,
-      false
-    ]
-  },
-  "hash": "5303cb9dd5903aa4791ef8e5e5881a50a832e65c8c9632e2e12cd9c2747f2fc7"
-}
diff --git a/backend/.sqlx/query-cd33a9d63f4706a7e3b1e23cd0a4b2e3ecb30aae6510d1fcd08493b07c8b0952.json b/backend/.sqlx/query-cd33a9d63f4706a7e3b1e23cd0a4b2e3ecb30aae6510d1fcd08493b07c8b0952.json
new file mode 100644
index 0000000000..36b1323980
--- /dev/null
+++ b/backend/.sqlx/query-cd33a9d63f4706a7e3b1e23cd0a4b2e3ecb30aae6510d1fcd08493b07c8b0952.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE websocket_trigger SET enabled = FALSE, error = $1, server_id = NULL, last_server_ping = NULL WHERE workspace_id = $2 AND path = $3",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "cd33a9d63f4706a7e3b1e23cd0a4b2e3ecb30aae6510d1fcd08493b07c8b0952"
+}
diff --git a/backend/.sqlx/query-f2baee15e6d1fecd6d2d7b39fda1b50a15ec8bd349f1081af54da5dc2f5e3021.json b/backend/.sqlx/query-f2baee15e6d1fecd6d2d7b39fda1b50a15ec8bd349f1081af54da5dc2f5e3021.json
deleted file mode 100644
index 2e75b4e74b..0000000000
--- a/backend/.sqlx/query-f2baee15e6d1fecd6d2d7b39fda1b50a15ec8bd349f1081af54da5dc2f5e3021.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT *\n          FROM websocket_trigger\n          WHERE workspace_id = $1 AND path = $2",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
-        "name": "url",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 2,
-        "name": "script_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 3,
-        "name": "is_flow",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 4,
-        "name": "workspace_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 5,
-        "name": "edited_by",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 6,
-        "name": "email",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 7,
-        "name": "edited_at",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 8,
-        "name": "extra_perms",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 9,
-        "name": "server_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 10,
-        "name": "last_server_ping",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 11,
-        "name": "error",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 12,
-        "name": "enabled",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 13,
-        "name": "filters",
-        "type_info": "JsonbArray"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      false,
-      false
-    ]
-  },
-  "hash": "f2baee15e6d1fecd6d2d7b39fda1b50a15ec8bd349f1081af54da5dc2f5e3021"
-}
diff --git a/backend/migrations/20241030150214_ws_auth.down.sql b/backend/migrations/20241030150214_ws_auth.down.sql
new file mode 100644
index 0000000000..6fed6a173b
--- /dev/null
+++ b/backend/migrations/20241030150214_ws_auth.down.sql
@@ -0,0 +1,2 @@
+-- Add down migration script here
+ALTER TABLE websocket_trigger DROP COLUMN initial_messages, DROP COLUMN url_runnable_args;
\ No newline at end of file
diff --git a/backend/migrations/20241030150214_ws_auth.up.sql b/backend/migrations/20241030150214_ws_auth.up.sql
new file mode 100644
index 0000000000..ddefe851e5
--- /dev/null
+++ b/backend/migrations/20241030150214_ws_auth.up.sql
@@ -0,0 +1,2 @@
+-- Add up migration script here
+ALTER TABLE websocket_trigger ADD COLUMN initial_messages JSONB[] DEFAULT '{}', ADD COLUMN url_runnable_args JSONB DEFAULT '{}';
\ No newline at end of file
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 0949843665..2c5a8cec85 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -11625,6 +11625,12 @@ components:
             required:
               - key
               - value
+        initial_messages:
+          type: array
+          items:
+            $ref: "#/components/schemas/WebsocketTriggerInitialMessage"
+        url_runnable_args:
+          $ref: "#/components/schemas/ScriptArgs"
         
       required:
         - path
@@ -11638,6 +11644,8 @@ components:
         - workspace_id
         - enabled
         - filters
+        - initial_messages
+        - url_runnable_args
 
     NewWebsocketTrigger:
       type: object
@@ -11663,6 +11671,12 @@ components:
             required:
               - key
               - value
+        initial_messages:
+          type: array
+          items:
+            $ref: "#/components/schemas/WebsocketTriggerInitialMessage"
+        url_runnable_args:
+          $ref: "#/components/schemas/ScriptArgs"
         
       required:
         - path
@@ -11670,6 +11684,8 @@ components:
         - url
         - is_flow
         - filters
+        - initial_messages
+        - url_runnable_args
 
     EditWebsocketTrigger:
       type: object
@@ -11693,6 +11709,12 @@ components:
             required:
               - key
               - value
+        initial_messages:
+          type: array
+          items:
+            $ref: "#/components/schemas/WebsocketTriggerInitialMessage"
+        url_runnable_args:
+          $ref: "#/components/schemas/ScriptArgs"
               
       required:
         - path
@@ -11700,6 +11722,34 @@ components:
         - url
         - is_flow
         - filters
+        - initial_messages
+        - url_runnable_args
+
+    WebsocketTriggerInitialMessage:
+      anyOf:
+        - type: object
+          properties:
+            raw_message: 
+              type: string
+          required:
+            - raw_message
+        - type: object
+          properties:
+            runnable_result:
+              type: object
+              properties:
+                path: 
+                  type: string
+                args:
+                  $ref: "#/components/schemas/ScriptArgs"
+                is_flow:
+                  type: boolean
+              required:
+                - path
+                - args
+                - is_flow
+          required: 
+            - runnable_result
 
     Group:
       type: object
diff --git a/backend/windmill-api/src/users.rs b/backend/windmill-api/src/users.rs
index c9a812c4a0..005dfad342 100644
--- a/backend/windmill-api/src/users.rs
+++ b/backend/windmill-api/src/users.rs
@@ -129,7 +129,8 @@ fn username_override_from_label(label: Option<String>) -> Option<String> {
         Some(label)
             if label.starts_with("webhook-")
                 || label.starts_with("http-")
-                || label.starts_with("email-") =>
+                || label.starts_with("email-")
+                || label.starts_with("ws-") =>
         {
             Some(label)
         }
diff --git a/backend/windmill-api/src/websocket_triggers.rs b/backend/windmill-api/src/websocket_triggers.rs
index b94ed85461..e10cd94c78 100644
--- a/backend/windmill-api/src/websocket_triggers.rs
+++ b/backend/windmill-api/src/websocket_triggers.rs
@@ -1,9 +1,10 @@
+use anyhow::Context;
 use axum::{
     extract::{Path, Query},
     routing::{delete, get, post},
     Extension, Json, Router,
 };
-use futures::StreamExt;
+use futures::{stream::SplitSink, SinkExt, StreamExt};
 use http::StatusCode;
 use itertools::Itertools;
 use rand::seq::SliceRandom;
@@ -11,16 +12,20 @@ use serde::{
     de::{self, MapAccess, Visitor},
     Deserialize, Deserializer, Serialize,
 };
-use serde_json::Value;
+use serde_json::{value::RawValue, Value};
 use sql_builder::{bind::Bind, SqlBuilder};
 use sqlx::prelude::FromRow;
 use std::{collections::HashMap, fmt};
-use tokio_tungstenite::connect_async;
+use tokio::net::TcpStream;
+use tokio_tungstenite::{connect_async, tungstenite::Message, MaybeTlsStream, WebSocketStream};
+use uuid::Uuid;
 use windmill_audit::{audit_ee::audit_log, ActionKind};
 use windmill_common::{
     db::UserDB,
-    error::{self, JsonResult},
-    utils::{not_found_if_none, paginate, require_admin, Pagination, StripPath},
+    error::{self, to_anyhow, JsonResult},
+    utils::{
+        not_found_if_none, paginate, report_critical_error, require_admin, Pagination, StripPath,
+    },
     worker::{to_raw_value, CLOUD_HOSTED},
     INSTANCE_NAME,
 };
@@ -28,9 +33,7 @@ use windmill_queue::PushArgsOwned;
 
 use crate::{
     db::{ApiAuthed, DB},
-    jobs::{
-        run_wait_result_flow_by_path_internal, run_wait_result_script_by_path_internal, RunJobQuery,
-    },
+    jobs::{run_flow_by_path_inner, run_script_by_path_inner, RunJobQuery},
     users::fetch_api_authed,
 };
 
@@ -52,7 +55,29 @@ struct NewWebsocketTrigger {
     script_path: String,
     is_flow: bool,
     enabled: Option<bool>,
-    filters: Vec<serde_json::Value>,
+    filters: Vec<Box<RawValue>>,
+    initial_messages: Vec<Box<RawValue>>,
+    url_runnable_args: Box<RawValue>,
+}
+
+#[derive(Deserialize)]
+struct JsonFilter {
+    key: String,
+    value: serde_json::Value,
+}
+
+#[derive(Deserialize)]
+#[serde(untagged)]
+enum Filter {
+    JsonFilter(JsonFilter),
+}
+
+#[derive(Deserialize)]
+enum InitialMessage {
+    #[serde(rename = "raw_message")]
+    RawMessage(String),
+    #[serde(rename = "runnable_result")]
+    RunnableResult { path: String, args: Box<RawValue>, is_flow: bool },
 }
 
 #[derive(FromRow, Serialize, Clone)]
@@ -70,7 +95,9 @@ pub struct WebsocketTrigger {
     extra_perms: serde_json::Value,
     error: Option<String>,
     enabled: bool,
-    filters: Vec<serde_json::Value>,
+    filters: Vec<sqlx::types::Json<Box<RawValue>>>,
+    initial_messages: Vec<sqlx::types::Json<Box<RawValue>>>,
+    url_runnable_args: sqlx::types::Json<Box<RawValue>>,
 }
 
 #[derive(Deserialize)]
@@ -79,7 +106,9 @@ struct EditWebsocketTrigger {
     url: String,
     script_path: String,
     is_flow: bool,
-    filters: Vec<serde_json::Value>,
+    filters: Vec<Box<RawValue>>,
+    initial_messages: Vec<Box<RawValue>>,
+    url_runnable_args: Box<RawValue>,
 }
 
 #[derive(Deserialize)]
@@ -133,14 +162,13 @@ async fn get_websocket_trigger(
 ) -> error::JsonResult<WebsocketTrigger> {
     let mut tx = user_db.begin(&authed).await?;
     let path = path.to_path();
-    let trigger = sqlx::query_as!(
-        WebsocketTrigger,
+    let trigger = sqlx::query_as::<_, WebsocketTrigger>(
         r#"SELECT *
           FROM websocket_trigger
           WHERE workspace_id = $1 AND path = $2"#,
-        w_id,
-        path,
     )
+    .bind(w_id)
+    .bind(path)
     .fetch_optional(&mut *tx)
     .await?;
     tx.commit().await?;
@@ -164,19 +192,27 @@ async fn create_websocket_trigger(
     require_admin(authed.is_admin, &authed.username)?;
 
     let mut tx = user_db.begin(&authed).await?;
-    sqlx::query_as!(
-        WebsocketTrigger,
-      "INSERT INTO websocket_trigger (workspace_id, path, url, script_path, is_flow, enabled, filters, edited_by, email, edited_at) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, now()) RETURNING *",
-      w_id,
-      ct.path,
-      ct.url,
-      ct.script_path,
-      ct.is_flow,
-      ct.enabled.unwrap_or(true),
-      &ct.filters,
-      &authed.username,
-      &authed.email
+
+    let filters = ct.filters.into_iter().map(sqlx::types::Json).collect_vec();
+    let initial_messages = ct
+        .initial_messages
+        .into_iter()
+        .map(sqlx::types::Json)
+        .collect_vec();
+    sqlx::query_as::<_, WebsocketTrigger>(
+      "INSERT INTO websocket_trigger (workspace_id, path, url, script_path, is_flow, enabled, filters, initial_messages, url_runnable_args, edited_by, email, edited_at) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, now()) RETURNING *",
     )
+    .bind(&w_id)
+    .bind(&ct.path)
+    .bind(ct.url)
+    .bind(ct.script_path)
+    .bind(ct.is_flow)
+    .bind(ct.enabled.unwrap_or(true))
+    .bind(filters.as_slice())
+    .bind(initial_messages.as_slice())
+    .bind(sqlx::types::Json(ct.url_runnable_args))
+    .bind(&authed.username)
+    .bind(&authed.email)
     .fetch_one(&mut *tx).await?;
 
     audit_log(
@@ -204,15 +240,24 @@ async fn update_websocket_trigger(
     let path = path.to_path();
     let mut tx = user_db.begin(&authed).await?;
 
+    let filters = ct.filters.into_iter().map(sqlx::types::Json).collect_vec();
+    let initial_messages = ct
+        .initial_messages
+        .into_iter()
+        .map(sqlx::types::Json)
+        .collect_vec();
+
     // important to update server_id, last_server_ping and error to NULL to stop current websocket listener
     sqlx::query!(
-        "UPDATE websocket_trigger SET url = $1, script_path = $2, path = $3, is_flow = $4, filters = $5, edited_by = $6, email = $7, edited_at = now(), server_id = NULL, last_server_ping = NULL, error = NULL
-            WHERE workspace_id = $8 AND path = $9",
+        "UPDATE websocket_trigger SET url = $1, script_path = $2, path = $3, is_flow = $4, filters = $5, initial_messages = $6, url_runnable_args = $7, edited_by = $8, email = $9, edited_at = now(), server_id = NULL, last_server_ping = NULL, error = NULL
+            WHERE workspace_id = $10 AND path = $11",
         ct.url,
         ct.script_path,
         ct.path,
         ct.is_flow,
-        &ct.filters,
+        filters.as_slice() as &[sqlx::types::Json<Box<RawValue>>],
+        initial_messages.as_slice() as &[sqlx::types::Json<Box<RawValue>>],
+        sqlx::types::Json(ct.url_runnable_args) as sqlx::types::Json<Box<RawValue>>,
         &authed.username,
         &authed.email,
         w_id,
@@ -335,8 +380,7 @@ async fn listen_to_unlistened_websockets(
     rsmq: &Option<rsmq_async::MultiplexedRsmq>,
     killpill_rx: &tokio::sync::broadcast::Receiver<()>,
 ) -> () {
-    match sqlx::query_as!(
-        WebsocketTrigger,
+    match sqlx::query_as::<_, WebsocketTrigger>(
         r#"SELECT *
             FROM websocket_trigger
             WHERE enabled IS TRUE AND (server_id IS NULL OR last_server_ping IS NULL OR last_server_ping < now() - interval '15 seconds')"#
@@ -422,8 +466,6 @@ impl<'de, 'a> Visitor<'de> for SupersetVisitor<'a> {
             if key == self.key {
                 // Deserialize the value for the key and check if it's a superset
                 let json_value: Value = map.next_value()?;
-                tracing::info!("json_value: {:?}", json_value);
-                tracing::info!("value_to_check: {:?}", self.value_to_check);
                 return Ok(is_superset(&json_value, self.value_to_check));
             } else {
                 // Skip the value if it's not the one we're interested in
@@ -470,149 +512,429 @@ where
     deserializer.deserialize_map(SupersetVisitor { key, value_to_check })
 }
 
+async fn wait_runnable_result(
+    path: String,
+    is_flow: bool,
+    args: &Box<RawValue>,
+    ws_trigger: &WebsocketTrigger,
+    username_override: String,
+    db: &DB,
+    rsmq: Option<rsmq_async::MultiplexedRsmq>,
+) -> error::Result<String> {
+    let user_db = UserDB::new(db.clone());
+    let authed = fetch_api_authed(
+        ws_trigger.edited_by.clone(),
+        ws_trigger.email.clone(),
+        &ws_trigger.workspace_id,
+        &db,
+        username_override,
+    )
+    .await?;
+
+    let args = serde_json::from_str::<Option<HashMap<String, Box<RawValue>>>>(args.get())
+        .map_err(|e| error::Error::BadRequest(format!("invalid json: {}", e)))?
+        .unwrap_or_else(HashMap::new);
+
+    let label_prefix = Some(format!("ws-{}-", ws_trigger.path));
+    let (_, job_id) = if is_flow {
+        run_flow_by_path_inner(
+            authed,
+            db.clone(),
+            user_db,
+            rsmq.clone(),
+            ws_trigger.workspace_id.clone(),
+            StripPath(path.clone()),
+            RunJobQuery::default(),
+            PushArgsOwned { args, extra: None },
+            label_prefix,
+        )
+        .await?
+    } else {
+        run_script_by_path_inner(
+            authed,
+            db.clone(),
+            user_db,
+            rsmq.clone(),
+            ws_trigger.workspace_id.clone(),
+            StripPath(path.clone()),
+            RunJobQuery::default(),
+            PushArgsOwned { args, extra: None },
+            label_prefix,
+        )
+        .await?
+    };
+
+    let start_time = tokio::time::Instant::now();
+
+    loop {
+        if start_time.elapsed() > tokio::time::Duration::from_secs(300) {
+            return Err(anyhow::anyhow!(
+                "Timed out after 5m waiting for runnable {path} (is_flow: {is_flow}) to complete",
+            )
+            .into());
+        }
+
+        #[derive(sqlx::FromRow)]
+        struct RawResult {
+            result: Option<sqlx::types::Json<Box<RawValue>>>,
+            success: bool,
+        }
+
+        let result = sqlx::query_as::<_, RawResult>(
+            "SELECT result, success FROM completed_job WHERE id = $1 AND workspace_id = $2",
+        )
+        .bind(Uuid::parse_str(&job_id).unwrap())
+        .bind(&ws_trigger.workspace_id)
+        .fetch_optional(db)
+        .await;
+
+        match result {
+            Ok(Some(r)) => {
+                if !r.success {
+                    return Err(anyhow::anyhow!(
+                        "Runnable {path} (is_flow: {is_flow}) failed: {:?}",
+                        r.result
+                    )
+                    .into());
+                } else {
+                    return Ok(r.result.map(|r| r.get().to_owned()).unwrap_or_default());
+                }
+            }
+            Ok(None) => {
+                // not yet done, wait for 5s and check again
+                tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
+            }
+            Err(err) => {
+                return Err(anyhow::anyhow!(
+                    "Error fetching job result for runnable {path} (is_flow: {is_flow}): {err}",
+                )
+                .into());
+            }
+        }
+    }
+}
+
+async fn send_initial_messages(
+    ws_trigger: &WebsocketTrigger,
+    mut writer: SplitSink<WebSocketStream<MaybeTlsStream<TcpStream>>, Message>,
+    db: &DB,
+    rsmq: Option<rsmq_async::MultiplexedRsmq>,
+) -> error::Result<()> {
+    let initial_messages: Vec<InitialMessage> = ws_trigger
+        .initial_messages
+        .iter()
+        .filter_map(|m| serde_json::from_str(m.get()).ok())
+        .collect_vec();
+
+    for start_message in initial_messages {
+        match start_message {
+            InitialMessage::RawMessage(msg) => {
+                let msg = if msg.starts_with("\"") && msg.ends_with("\"") {
+                    msg[1..msg.len() - 1].to_string()
+                } else {
+                    msg
+                };
+                tracing::info!(
+                    "Sending raw message initial message to websocket {}: {}",
+                    ws_trigger.url,
+                    msg
+                );
+                writer
+                    .send(tokio_tungstenite::tungstenite::Message::Text(msg))
+                    .await
+                    .map_err(to_anyhow)
+                    .with_context(|| "failed to send raw message")?;
+            }
+            InitialMessage::RunnableResult { path, is_flow, args } => {
+                tracing::info!(
+                    "Running runnable {path} (is_flow: {is_flow}) for initial message to websocket {}",
+                    ws_trigger.url,
+                );
+
+                let result = wait_runnable_result(
+                    path.clone(),
+                    is_flow,
+                    &args,
+                    ws_trigger,
+                    "init".to_string(),
+                    db,
+                    rsmq.clone(),
+                )
+                .await?;
+
+                tracing::info!(
+                    "Sending runnable {path} (is_flow: {is_flow}) result to websocket {}",
+                    ws_trigger.url
+                );
+
+                let result = if result.starts_with("\"") && result.ends_with("\"") {
+                    result[1..result.len() - 1].to_string()
+                } else {
+                    result
+                };
+
+                writer
+                    .send(tokio_tungstenite::tungstenite::Message::Text(result))
+                    .await
+                    .map_err(to_anyhow)
+                    .with_context(|| {
+                        format!("Failed to send runnable {path} (is_flow: {is_flow}) result")
+                    })?;
+            }
+        }
+    }
+
+    Ok(())
+}
+
+async fn get_url_from_runnable(
+    path: &str,
+    is_flow: bool,
+    ws_trigger: &WebsocketTrigger,
+    db: &DB,
+    rsmq: Option<rsmq_async::MultiplexedRsmq>,
+) -> error::Result<String> {
+    tracing::info!("Running runnable {path} (is_flow: {is_flow}) to get websocket URL",);
+
+    let result = wait_runnable_result(
+        path.to_string(),
+        is_flow,
+        &ws_trigger.url_runnable_args.0,
+        ws_trigger,
+        "url".to_string(),
+        db,
+        rsmq,
+    )
+    .await?;
+
+    if result.starts_with("\"") && result.ends_with("\"") {
+        Ok(result[1..result.len() - 1].to_string())
+    } else {
+        Err(anyhow::anyhow!("Runnable {path} (is_flow: {is_flow}) did not return a string").into())
+    }
+}
+
+async fn update_ping(db: &DB, ws_trigger: &WebsocketTrigger, error: Option<&str>) -> Option<()> {
+    match sqlx::query_scalar!(
+        "UPDATE websocket_trigger SET last_server_ping = now(), error = $1 WHERE workspace_id = $2 AND path = $3 AND server_id = $4 AND enabled IS TRUE RETURNING 1",
+        error,
+        ws_trigger.workspace_id,
+        ws_trigger.path,
+        *INSTANCE_NAME
+    ).fetch_optional(db).await {
+        Ok(updated) => {
+            if updated.flatten().is_none() {
+                tracing::info!("Websocket {} changed, disabled, or deleted, stopping...", ws_trigger.url); 
+                return None;
+            }
+        },
+        Err(err) => {
+            tracing::warn!("Error updating ping of websocket {}: {:?}", ws_trigger.url, err);
+        }
+    };
+
+    Some(())
+}
+
+async fn loop_ping(db: &DB, ws_trigger: &WebsocketTrigger, error: Option<&str>) -> () {
+    loop {
+        if let None = update_ping(db, ws_trigger, error).await {
+            return;
+        }
+        tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
+    }
+}
+
+async fn disable_with_error(db: &DB, ws_trigger: &WebsocketTrigger, error: String) {
+    match sqlx::query!(
+        "UPDATE websocket_trigger SET enabled = FALSE, error = $1, server_id = NULL, last_server_ping = NULL WHERE workspace_id = $2 AND path = $3",
+        error,
+        ws_trigger.workspace_id,
+        ws_trigger.path,
+    )
+    .execute(db).await {
+        Ok(_) => {
+            report_critical_error(format!("Disabling websocket {} because of error: {}", ws_trigger.url, error), db.clone()).await;
+        },
+        Err(disable_err) => {
+            report_critical_error(
+                format!("Could not disable websocket {} with err {}, disabling because of error {}", ws_trigger.path, disable_err, error), 
+                db.clone()
+            ).await;
+        }
+    }
+}
+
 async fn listen_to_websocket(
     ws_trigger: WebsocketTrigger,
     db: DB,
     rsmq: Option<rsmq_async::MultiplexedRsmq>,
     mut killpill_rx: tokio::sync::broadcast::Receiver<()>,
 ) -> () {
-    async fn update_ping(db: DB, ws_trigger: &WebsocketTrigger, error: Option<&str>) -> Option<()> {
-        match sqlx::query_scalar!(
-            "UPDATE websocket_trigger SET last_server_ping = now(), error = $1 WHERE workspace_id = $2 AND path = $3 AND server_id = $4 AND enabled IS TRUE RETURNING 1",
-            error,
-            ws_trigger.workspace_id,
-            ws_trigger.path,
-            *INSTANCE_NAME
-        ).fetch_optional(&db).await {
-            Ok(updated) => {
-                if updated.flatten().is_none() {
-                    tracing::info!("Websocket {} changed, disabled, or deleted, stopping...", ws_trigger.url); 
-                    return None;
-                }
-            },
-            Err(err) => {
-                tracing::warn!("Error updating ping of websocket {}: {:?}", ws_trigger.url, err);
-            }
-        };
-
-        Some(())
-    }
+    update_ping(&db, &ws_trigger, Some("Connecting...")).await;
 
     let url = ws_trigger.url.as_str();
 
-    #[derive(Deserialize)]
-    struct JsonFilter {
-        key: String,
-        value: serde_json::Value,
-    }
-
-    #[derive(Deserialize)]
-    #[serde(untagged)]
-    enum Filter {
-        JsonFilter(JsonFilter),
-    }
     let filters: Vec<Filter> = ws_trigger
         .filters
         .iter()
-        .filter_map(|m| serde_json::from_value(m.clone()).ok())
+        .filter_map(|m| serde_json::from_str(m.get()).ok())
         .collect_vec();
 
     loop {
+        let connect_url = if url.starts_with("$") {
+            if url.starts_with("$flow:") || url.starts_with("$script:") {
+                let path = url.splitn(2, ':').nth(1).unwrap();
+                tokio::select! {
+                    biased;
+                    _ = killpill_rx.recv() => {
+                        return;
+                    },
+                    _ = loop_ping(&db, &ws_trigger, Some(
+                        "Waiting on runnable to return websocket URL..."
+                    )) => {
+                        return;
+                    },
+                    url_result = get_url_from_runnable(path, url.starts_with("$flow:"), &ws_trigger, &db, rsmq.clone()) => match url_result {
+                        Ok(url) => url,
+                        Err(err) => {
+                            disable_with_error(
+                                &db,
+                                &ws_trigger,
+                                format!(
+                                    "Error getting websocket URL from runnable after 5 tries: {:?}",
+                                    err
+                                ),
+                            )
+                            .await;
+                            return;
+                        }
+                    },
+                }
+            } else {
+                disable_with_error(
+                    &db,
+                    &ws_trigger,
+                    format!("Invalid websocket runnable path: {}", url),
+                )
+                .await;
+                return;
+            }
+        } else {
+            url.to_string()
+        };
+
         tokio::select! {
             biased;
             _ = killpill_rx.recv() => {
                 return;
             },
-            connection = connect_async(url) => {
+            _ = loop_ping(&db, &ws_trigger, Some("Connecting...")) => {
+                return;
+            },
+            connection = connect_async(connect_url) => {
                 match connection {
                     Ok((ws_stream, _)) => {
                         tracing::info!("Listening to websocket {}", url);
-                        if let None = update_ping(db.clone(), &ws_trigger, None).await {
+                        if let None = update_ping(&db, &ws_trigger, None).await {
                             return;
                         }
+                        let (writer, mut reader) = ws_stream.split();
                         let mut last_ping = tokio::time::Instant::now();
-                        let (_, mut read) = ws_stream.split();
-                        loop {
-                            tokio::select! {
-                                biased;
-                                _ = killpill_rx.recv() => {
-                                    return;
+
+                        tokio::select! {
+                            biased;
+                            _ = killpill_rx.recv() => {
+                                return;
+                            }
+                            _ = async {
+                                if let Err(err) = send_initial_messages(&ws_trigger, writer, &db, rsmq.clone()).await {
+                                    disable_with_error(&db, &ws_trigger, format!("Error sending initial messages: {:?}", err)).await;
+                                } else {
+                                    // if initial messages sent successfully, wait forever
+                                    futures::future::pending::<()>().await;
                                 }
-                                msg = read.next() => {
-                                    if let Some(msg) = msg {
-                                        if last_ping.elapsed() > tokio::time::Duration::from_secs(5) {
-                                            if let None = update_ping(db.clone(), &ws_trigger, None).await {
+                            } => {
+                                // was disabled => exit
+                                return;
+                            },
+                            _ = async {
+                                loop {
+                                    tokio::select! {
+                                        biased;
+                                        msg = reader.next() => {
+                                            if let Some(msg) = msg {
+                                                if last_ping.elapsed() > tokio::time::Duration::from_secs(5) {
+                                                    if let None = update_ping(&db, &ws_trigger, None).await {
+                                                        return;
+                                                    }
+                                                    last_ping = tokio::time::Instant::now();
+                                                }
+                                                match msg {
+                                                    Ok(msg) => {
+                                                        match msg {
+                                                            tokio_tungstenite::tungstenite::Message::Text(text) => {
+                                                                let mut should_handle = true;
+                                                                for filter in &filters {
+                                                                    match filter {
+                                                                        Filter::JsonFilter(JsonFilter { key, value }) => {
+                                                                            let mut deserializer = serde_json::Deserializer::from_str(text.as_str());
+                                                                            should_handle = match is_value_superset(&mut deserializer, key, &value) {
+                                                                                Ok(filter_match) => {
+                                                                                    filter_match
+                                                                                },
+                                                                                Err(err) => {
+                                                                                    tracing::warn!("Error deserializing filter for websocket {}: {:?}", url, err);
+                                                                                    false
+                                                                                }
+                                                                            };
+                                                                        }
+                                                                    }
+                                                                    if !should_handle {
+                                                                        break;
+                                                                    }
+                                                                }
+                                                                if should_handle {
+                                                                    if let Err(err) = run_job(&db, rsmq.clone(), &ws_trigger, text).await {
+                                                                        report_critical_error(format!("Failed to trigger job from websocket {}: {:?}", ws_trigger.url, err), db.clone()).await;
+                                                                    };
+                                                                }
+                                                            },
+                                                            _ => {}
+                                                        }
+                                                    },
+                                                    Err(err) => {
+                                                        tracing::error!("Error reading from websocket {}: {:?}", url, err);
+                                                    }
+                                                }
+                                            } else {
+                                                tracing::error!("Websocket {} closed", url);
+                                                if let None =
+                                                    update_ping(&db, &ws_trigger, Some("Websocket closed")).await
+                                                {
+                                                    return;
+                                                }
+                                                tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
+                                                break;
+                                            }
+                                        },
+                                        _ = tokio::time::sleep(tokio::time::Duration::from_secs(5)) => {
+                                            if let None = update_ping(&db, &ws_trigger, None).await {
                                                 return;
                                             }
                                             last_ping = tokio::time::Instant::now();
-                                        }
-                                        match msg {
-                                            Ok(msg) => {
-                                                match msg {
-                                                    tokio_tungstenite::tungstenite::Message::Text(text) => {
-                                                        let mut should_handle = true;
-                                                        for filter in &filters {
-                                                            match filter {
-                                                                Filter::JsonFilter(JsonFilter { key, value }) => {
-                                                                    let mut deserializer = serde_json::Deserializer::from_str(text.as_str());
-                                                                    should_handle = match is_value_superset(&mut deserializer, key, &value) {
-                                                                        Ok(filter_match) => {
-                                                                            filter_match
-                                                                        },
-                                                                        Err(err) => {
-                                                                            tracing::warn!("Error deserializing filter for websocket {}: {:?}", url, err);
-                                                                            false
-                                                                        }
-                                                                    };
-                                                                }
-                                                            }
-                                                            if !should_handle {
-                                                                break;
-                                                            }
-                                                        }
-                                                        if should_handle {
-                                                            let db_ = db.clone();
-                                                            let rsmq_ = rsmq.clone();
-                                                            let ws_trigger_ = ws_trigger.clone();
-                                                            tokio::spawn(async move {
-                                                                let url = ws_trigger_.url.clone();
-                                                                if let Err(err) = run_job(db_, rsmq_, ws_trigger_, text).await {
-                                                                    tracing::error!("Error running job on websocket {}: {:?}", url, err);
-                                                                };
-                                                            });
-                                                        }
-                                                    },
-                                                    _ => {}
-                                                }
-                                            },
-                                            Err(err) => {
-                                                tracing::error!("Error reading from websocket {}: {:?}", url, err);
-                                            }
-                                        }
-                                    } else {
-                                        tracing::error!("Websocket {} closed", url);
-                                        if let None =
-                                            update_ping(db.clone(), &ws_trigger, Some("Websocket closed")).await
-                                        {
-                                            return;
-                                        }
-                                        tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
-                                        break;
+                                        },
                                     }
-                                },
-                                _ = tokio::time::sleep(tokio::time::Duration::from_secs(5)) => {
-                                    if let None = update_ping(db.clone(), &ws_trigger, None).await {
-                                        return;
-                                    }
-                                    last_ping = tokio::time::Instant::now();
-                                },
+                                }
+                            } => {
+                                return;
                             }
-                        }
+                        };
                     }
                     Err(err) => {
                         tracing::error!("Error connecting to websocket {}: {:?}", url, err);
                         if let None =
-                            update_ping(db.clone(), &ws_trigger, Some(err.to_string().as_str())).await
+                            update_ping(&db, &ws_trigger, Some(err.to_string().as_str())).await
                         {
                             return;
                         }
@@ -625,16 +947,18 @@ async fn listen_to_websocket(
 }
 
 async fn run_job(
-    db: DB,
+    db: &DB,
     rsmq: Option<rsmq_async::MultiplexedRsmq>,
-    trigger: WebsocketTrigger,
+    trigger: &WebsocketTrigger,
     msg: String,
 ) -> anyhow::Result<()> {
     let args = PushArgsOwned {
         args: HashMap::from([("msg".to_string(), to_raw_value(&msg))]),
         extra: Some(HashMap::from([(
             "wm_trigger".to_string(),
-            to_raw_value(&serde_json::json!({"kind": "websocket"})),
+            to_raw_value(
+                &serde_json::json!({"kind": "websocket", "websocket": { "url": trigger.url }}),
+            ),
         )])),
     };
     let label_prefix = Some(format!("ws-{}-", trigger.path));
@@ -643,7 +967,7 @@ async fn run_job(
         trigger.edited_by.clone(),
         trigger.email.clone(),
         &trigger.workspace_id,
-        &db,
+        db,
         "anonymous".to_string(),
     )
     .await?;
@@ -653,27 +977,27 @@ async fn run_job(
     let run_query = RunJobQuery::default();
 
     if trigger.is_flow {
-        run_wait_result_flow_by_path_internal(
-            db,
-            run_query,
-            StripPath(trigger.script_path.to_owned()),
+        run_flow_by_path_inner(
             authed,
-            rsmq,
+            db.clone(),
             user_db,
-            args,
+            rsmq,
             trigger.workspace_id.clone(),
+            StripPath(trigger.script_path.to_owned()),
+            run_query,
+            args,
             label_prefix,
         )
         .await?;
     } else {
-        run_wait_result_script_by_path_internal(
-            db,
-            run_query,
-            StripPath(trigger.script_path.to_owned()),
+        run_script_by_path_inner(
             authed,
-            rsmq,
+            db.clone(),
             user_db,
+            rsmq,
             trigger.workspace_id.clone(),
+            StripPath(trigger.script_path.to_owned()),
+            run_query,
             args,
             label_prefix,
         )
diff --git a/frontend/src/lib/components/ScriptPicker.svelte b/frontend/src/lib/components/ScriptPicker.svelte
index 53a856c047..f9c117bab3 100644
--- a/frontend/src/lib/components/ScriptPicker.svelte
+++ b/frontend/src/lib/components/ScriptPicker.svelte
@@ -95,11 +95,11 @@
 			value={items?.find((x) => x.value == initialPath)}
 			class="grow shrink max-w-full"
 			on:change={() => {
-				dispatch('select', { path: scriptPath })
+				dispatch('select', { path: scriptPath, itemKind })
 			}}
 			on:input={(ev) => {
 				if (!ev.detail) {
-					dispatch('select', { path: undefined })
+					dispatch('select', { path: undefined, itemKind })
 				}
 			}}
 			bind:justValue={scriptPath}
diff --git a/frontend/src/lib/components/details/EmailTriggerPanel.svelte b/frontend/src/lib/components/details/EmailTriggerPanel.svelte
index 578ef02e4c..fca824946f 100644
--- a/frontend/src/lib/components/details/EmailTriggerPanel.svelte
+++ b/frontend/src/lib/components/details/EmailTriggerPanel.svelte
@@ -39,7 +39,13 @@
 
 	let requestType: 'hash' | 'path' = 'path'
 
-	function emailAddress() {
+	function emailAddress(
+		requestType: 'hash' | 'path',
+		path: string,
+		hash: string | undefined,
+		isFlow: boolean,
+		token: string
+	) {
 		const pathOrHash = requestType === 'hash' ? hash : path.replaceAll('/', '.')
 		const plainPrefix = `${$workspaceStore}+${
 			(requestType === 'hash' ? 'hash.' : isFlow ? 'flow.' : '') + pathOrHash
@@ -54,7 +60,7 @@
 
 	export let email: string = ''
 
-	$: email = emailAddress()
+	$: email = emailAddress(requestType, path, hash, isFlow, token)
 
 	let triggerTokens: TriggerTokens | undefined = undefined
 </script>
diff --git a/frontend/src/lib/components/triggers/WebsocketTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/WebsocketTriggerEditorInner.svelte
index 39f9ce3cae..0ee30613fc 100644
--- a/frontend/src/lib/components/triggers/WebsocketTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/WebsocketTriggerEditorInner.svelte
@@ -5,9 +5,17 @@
 	import Path from '$lib/components/Path.svelte'
 	import Required from '$lib/components/Required.svelte'
 	import ScriptPicker from '$lib/components/ScriptPicker.svelte'
-	import { WebsocketTriggerService } from '$lib/gen'
+	import {
+		FlowService,
+		ScriptService,
+		WebsocketTriggerService,
+		type Flow,
+		type Script,
+		type ScriptArgs,
+		type WebsocketTriggerInitialMessage
+	} from '$lib/gen'
 	import { usedTriggerKinds, userStore, workspaceStore } from '$lib/stores'
-	import { canWrite, emptyString, sendUserToast } from '$lib/utils'
+	import { canWrite, emptySchema, emptyString, sendUserToast } from '$lib/utils'
 	import { createEventDispatcher } from 'svelte'
 	import Section from '$lib/components/Section.svelte'
 	import { Loader2, Save, X, Plus } from 'lucide-svelte'
@@ -15,6 +23,9 @@
 	import Toggle from '../Toggle.svelte'
 	import { fade } from 'svelte/transition'
 	import JsonEditor from '../apps/editor/settingsPanel/inputEditor/JsonEditor.svelte'
+	import type { Schema } from '$lib/common'
+	import ToggleButtonGroup from '../common/toggleButton-v2/ToggleButtonGroup.svelte'
+	import ToggleButton from '../common/toggleButton-v2/ToggleButton.svelte'
 
 	let drawer: Drawer
 	let is_flow: boolean = false
@@ -34,6 +45,8 @@
 		key: string
 		value: any
 	}[] = []
+	let initial_messages: WebsocketTriggerInitialMessage[] = []
+	let url_runnable_args: Record<string, any> = {}
 	let dirtyPath = false
 	let can_write = true
 	let drawerLoading = true
@@ -74,6 +87,8 @@
 			path = ''
 			initialPath = ''
 			filters = []
+			initial_messages = []
+			url_runnable_args = {}
 			dirtyPath = false
 		} finally {
 			drawerLoading = false
@@ -93,10 +108,81 @@
 		url = s.url
 		enabled = s.enabled
 		filters = s.filters
+		initial_messages = s.initial_messages
+		url_runnable_args = s.url_runnable_args
 
 		can_write = canWrite(s.path, s.extra_perms, $userStore)
 	}
 
+	let initialMessageRunnableSchemas: Record<string, Schema> = {}
+	async function loadInitialMessageRunnableSchemas(
+		initialMessageRunnables: {
+			path: string
+			is_flow: boolean
+		}[]
+	) {
+		for (const { path, is_flow } of initialMessageRunnables) {
+			if (!path) {
+				continue
+			}
+			try {
+				let schema: Schema | undefined = emptySchema()
+				let scriptOrFlow: Script | Flow = is_flow
+					? await FlowService.getFlowByPath({ workspace: $workspaceStore!, path })
+					: await ScriptService.getScriptByPath({ workspace: $workspaceStore!, path })
+				schema = scriptOrFlow.schema as Schema
+				if (schema && schema.properties) {
+					initialMessageRunnableSchemas[(is_flow ? 'flow/' : '') + path] = schema
+				}
+			} catch (err) {
+				sendUserToast(
+					`Could not query runnable schema for ${is_flow ? 'flow' : 'script'} ${path}: ${err}`,
+					true
+				)
+			}
+		}
+	}
+	$: initialMessageRunnables = initial_messages
+		.map((v) => ('runnable_result' in v ? v.runnable_result : undefined))
+		.filter((v): v is { path: string; is_flow: boolean; args: ScriptArgs } => !!v)
+	$: loadInitialMessageRunnableSchemas(initialMessageRunnables)
+
+	let urlRunnableSchema: Schema | undefined = emptySchema()
+	async function loadUrlRunnableSchema(url: string) {
+		if (url.startsWith('$')) {
+			const path = url.split(':')[1]
+			if (path && path.length > 0) {
+				try {
+					let scriptOrFlow: Script | Flow = url.startsWith('$flow:')
+						? await FlowService.getFlowByPath({
+								workspace: $workspaceStore!,
+								path: url.split(':')[1]
+						  })
+						: await ScriptService.getScriptByPath({
+								workspace: $workspaceStore!,
+								path: url.split(':')[1]
+						  })
+					urlRunnableSchema = scriptOrFlow.schema as Schema
+				} catch (err) {
+					sendUserToast(
+						`Could not query runnable schema for ${url.startsWith('$flow:') ? 'flow' : 'script'} ${
+							url.split(':')[1]
+						}: ${err}`,
+						true
+					)
+				}
+			}
+		}
+	}
+	$: loadUrlRunnableSchema(url)
+
+	$: invalidInitialMessages = initial_messages.some((v) => {
+		if ('runnable_result' in v) {
+			return !v.runnable_result.path
+		}
+		return false
+	})
+
 	async function updateTrigger(): Promise<void> {
 		if (edit) {
 			await WebsocketTriggerService.updateWebsocketTrigger({
@@ -107,7 +193,9 @@
 					script_path,
 					is_flow,
 					url,
-					filters
+					filters,
+					initial_messages,
+					url_runnable_args
 				}
 			})
 			sendUserToast(`Route ${path} updated`)
@@ -120,7 +208,9 @@
 					is_flow,
 					url,
 					enabled: true,
-					filters
+					filters,
+					initial_messages,
+					url_runnable_args
 				}
 			})
 			sendUserToast(`Route ${path} created`)
@@ -139,7 +229,12 @@
 			clearTimeout(validateTimeout)
 		}
 		validateTimeout = setTimeout(() => {
-			if (/^(ws:|wss:)\/\/[^\s]+$/.test(url) === false) {
+			console.log('validating ' + url)
+			if (url.startsWith('$')) {
+				if (/^(\$script|\$flow):[^\s]+$/.test(url) === false) {
+					urlError = 'Invalid runnable path'
+				}
+			} else if (/^(ws:|wss:)\/\/[^\s]+$/.test(url) === false) {
 				urlError = 'Invalid websocket URL'
 			}
 			validateTimeout = undefined
@@ -148,7 +243,7 @@
 	$: validateUrl(url)
 </script>
 
-<Drawer size="700px" bind:this={drawer}>
+<Drawer size="800px" bind:this={drawer}>
 	<DrawerContent
 		title={edit
 			? can_write
@@ -180,7 +275,11 @@
 				{/if}
 				<Button
 					startIcon={{ icon: Save }}
-					disabled={pathError != '' || urlError != '' || emptyString(script_path) || !can_write}
+					disabled={pathError != '' ||
+						urlError != '' ||
+						invalidInitialMessages ||
+						emptyString(script_path) ||
+						!can_write}
 					on:click={updateTrigger}
 				>
 					Save
@@ -214,31 +313,90 @@
 				</div>
 
 				<Section label="Websocket">
-					<div class="flex flex-col w-full gap-4">
-						<label class="block grow w-full">
-							<div class="text-secondary text-sm flex items-center gap-1 w-full justify-between">
-								<div>
-									URL
-									<Required required={true} />
+					<div class="mb-2">
+						<ToggleButtonGroup
+							selected={url.startsWith('$') ? 'runnable' : 'static'}
+							on:selected={(ev) => {
+								url = ev.detail === 'runnable' ? '$script:' : ''
+								url_runnable_args = {}
+							}}
+						>
+							<ToggleButton value="static" label="Static URL" />
+							<ToggleButton value="runnable" label="Runnable result as URL" />
+						</ToggleButtonGroup>
+					</div>
+					{#if url.startsWith('$')}
+						<div class="flex flex-col w-full gap-4">
+							<div class="block grow w-full">
+								<div class="text-secondary text-sm flex items-center gap-1 w-full justify-between">
+									<div>
+										Runnable
+										<Required required={true} />
+									</div>
+								</div>
+								<ScriptPicker
+									allowFlow={true}
+									itemKind={url.startsWith('$flow:') ? 'flow' : 'script'}
+									initialPath={url.split(':')[1] ?? ''}
+									on:select={(ev) => {
+										dirtyUrl = true
+										const { path, itemKind } = ev.detail
+										url = `$${itemKind}:${path ?? ''}`
+									}}
+								/>
+								<div class="text-red-600 dark:text-red-400 text-2xs mt-1.5">
+									{dirtyUrl ? urlError : ''}
 								</div>
 							</div>
-							<input
-								type="text"
-								autocomplete="off"
-								bind:value={url}
-								disabled={!can_write}
-								on:input={() => {
-									dirtyUrl = true
-								}}
-								class={urlError === ''
-									? ''
-									: 'border border-red-700 bg-red-100 border-opacity-30 focus:border-red-700 focus:border-opacity-30 focus-visible:ring-red-700 focus-visible:ring-opacity-25 focus-visible:border-red-700'}
-							/>
-							<div class="text-red-600 dark:text-red-400 text-2xs mt-1.5">
-								{dirtyUrl ? urlError : ''}
-							</div>
-						</label>
-					</div>
+						</div>
+
+						{#if url.split(':')[1]?.length > 0}
+							{#if urlRunnableSchema}
+								<p class="font-semibold text-sm mt-4 mb-2">Arguments</p>
+								{#await import('$lib/components/SchemaForm.svelte')}
+									<Loader2 class="animate-spin mt-2" />
+								{:then Module}
+									<Module.default
+										schema={urlRunnableSchema}
+										bind:args={url_runnable_args}
+										shouldHideNoInputs
+										class="text-xs"
+									/>
+								{/await}
+								{#if urlRunnableSchema.properties && Object.keys(urlRunnableSchema.properties).length === 0}
+									<div class="text-xs texg-gray-700">This runnable takes no arguments</div>
+								{/if}
+							{:else}
+								<Loader2 class="animate-spin mt-2" />
+							{/if}
+						{/if}
+					{:else}
+						<div class="flex flex-col w-full gap-4">
+							<label class="block grow w-full">
+								<div class="text-secondary text-sm flex items-center gap-1 w-full justify-between">
+									<div>
+										URL
+										<Required required={true} />
+									</div>
+								</div>
+								<input
+									type="text"
+									autocomplete="off"
+									bind:value={url}
+									disabled={!can_write}
+									on:input={() => {
+										dirtyUrl = true
+									}}
+									class={urlError === ''
+										? ''
+										: 'border border-red-700 bg-red-100 border-opacity-30 focus:border-red-700 focus:border-opacity-30 focus-visible:ring-red-700 focus-visible:ring-opacity-25 focus-visible:border-red-700'}
+								/>
+								<div class="text-red-600 dark:text-red-400 text-2xs mt-1.5">
+									{dirtyUrl ? urlError : ''}
+								</div>
+							</label>
+						</div>
+					{/if}
 				</Section>
 
 				<Section label="Runnable">
@@ -258,6 +416,144 @@
 					</div>
 				</Section>
 
+				<Section label="Initial messages">
+					<p class="text-xs mb-1 text-tertiary">
+						Initial messages are sent at the beginning of the connection. They are sent in order.<br
+						/>
+						Raw messages and runnable results are supported.
+					</p>
+					<div class="flex flex-col gap-4 mt-1">
+						{#each initial_messages as v, i}
+							<div class="flex w-full gap-2 items-center">
+								<div class="w-full flex flex-col gap-2 border p-2 rounded-md">
+									<div class="flex flex-row gap-2 w-full">
+										<label class="flex flex-col w-full">
+											<div class="text-secondary text-sm">Type</div>
+											<select
+												class="w-20"
+												on:change={(e) => {
+													if (e.target?.['value'] === 'raw_message') {
+														initial_messages[i] = {
+															raw_message: '""'
+														}
+													} else {
+														initial_messages[i] = {
+															runnable_result: {
+																path: '',
+																args: {},
+																is_flow: false
+															}
+														}
+													}
+												}}
+												value={'runnable_result' in v ? 'runnable_result' : 'raw_message'}
+											>
+												<option value="raw_message">Raw message</option>
+												<option value="runnable_result">Runnable result</option>
+											</select>
+										</label>
+									</div>
+									{#if 'raw_message' in v}
+										<div class="flex flex-col w-full">
+											<div class="text-secondary text-sm">
+												Raw JSON message (if a string, wrapping quotes will be discarded)
+											</div>
+											<JsonEditor
+												on:change={(ev) => {
+													const { code } = ev.detail
+													v = {
+														raw_message: code
+													}
+												}}
+												code={v.raw_message}
+											/>
+										</div>
+									{:else if 'runnable_result' in v}
+										<div class="flex flex-col w-full">
+											<div class="text-secondary text-sm">Runnable</div>
+											<ScriptPicker
+												allowFlow={true}
+												itemKind={v.runnable_result?.is_flow ? 'flow' : 'script'}
+												initialPath={v.runnable_result?.path ?? ''}
+												on:select={(ev) => {
+													const { path, itemKind } = ev.detail
+													v = {
+														runnable_result: {
+															path: path ?? '',
+															args: {},
+															is_flow: itemKind === 'flow'
+														}
+													}
+												}}
+											/>
+
+											{#if v.runnable_result?.path}
+												{@const schema =
+													initialMessageRunnableSchemas[
+														v.runnable_result.is_flow
+															? 'flow/' + v.runnable_result.path
+															: v.runnable_result.path
+													]}
+												{#if schema}
+													<p class="font-semibold text-sm mt-4 mb-2">Arguments</p>
+													{#await import('$lib/components/SchemaForm.svelte')}
+														<Loader2 class="animate-spin mt-2" />
+													{:then Module}
+														<Module.default
+															{schema}
+															bind:args={v.runnable_result.args}
+															shouldHideNoInputs
+															class="text-xs"
+														/>
+													{/await}
+													{#if schema && schema.properties && Object.keys(schema.properties).length === 0}
+														<div class="text-xs texg-gray-700">This runnable takes no arguments</div
+														>
+													{/if}
+												{:else}
+													<Loader2 class="animate-spin mt-2" />
+												{/if}
+											{/if}
+										</div>
+									{:else}
+										Unknown type
+									{/if}
+								</div>
+								<button
+									transition:fade|local={{ duration: 100 }}
+									class="rounded-full p-1 bg-surface-secondary duration-200 hover:bg-surface-hover"
+									aria-label="Clear"
+									on:click={() => {
+										initial_messages = initial_messages.filter((_, index) => index !== i)
+									}}
+								>
+									<X size={14} />
+								</button>
+							</div>
+						{/each}
+
+						<div class="flex items-baseline">
+							<Button
+								variant="border"
+								color="light"
+								size="xs"
+								btnClasses="mt-1"
+								on:click={() => {
+									if (initial_messages == undefined || !Array.isArray(initial_messages)) {
+										initial_messages = []
+									}
+									initial_messages = initial_messages.concat({
+										raw_message: '""'
+									})
+								}}
+								startIcon={{ icon: Plus }}
+							>
+								Add item
+							</Button>
+						</div>
+					</div>
+				</Section>
+
 				<Section label="Filters">
 					<p class="text-xs mb-1 text-tertiary">
 						Filters will limit the execution of the trigger to only messages that match all
@@ -266,8 +562,8 @@
 					</p>
 					<div class="flex flex-col gap-4 mt-1">
 						{#each filters as v, i}
-							<div class="flex w-full gap-4 items-center">
-								<div class="w-full flex flex-col gap-2">
+							<div class="flex w-full gap-2 items-center">
+								<div class="w-full flex flex-col gap-2 border p-2 rounded-md">
 									<div class="flex flex-row gap-2 w-full">
 										<label class="flex flex-col w-full">
 											<div class="text-secondary text-sm">Type</div>
diff --git a/frontend/src/lib/script_helpers.ts b/frontend/src/lib/script_helpers.ts
index a4bd376c34..702e60310d 100644
--- a/frontend/src/lib/script_helpers.ts
+++ b/frontend/src/lib/script_helpers.ts
@@ -522,6 +522,9 @@ export async function preprocessor(
 			params: Record<string, string>
 			query: Record<string, string>
 			headers: Record<string, string>
+		},
+		websocket?: {
+			url: string // The websocket url
 		}
 	},
 	/* your other args */ 
@@ -543,6 +546,9 @@ export async function preprocessor(
 			params: Record<string, string>
 			query: Record<string, string>
 			headers: Record<string, string>
+		},
+		websocket?: {
+			url: string // The websocket url
 		}
 	},
 	/* your other args */ 
@@ -590,9 +596,13 @@ class Http(TypedDict):
 	query: dict[str, str]
 	headers: dict[str, str]
 
+class Websocket(TypedDict):
+	url: str # The websocket url
+
 class WmTrigger(TypedDict):
     kind: Literal["http", "email", "webhook", "websocket"]
     http: Http | None
+		websocket: Websocket | None
 
 def preprocessor(
 	wm_trigger: WmTrigger,
diff --git a/frontend/src/routes/(root)/(logged)/websocket_triggers/+page.svelte b/frontend/src/routes/(root)/(logged)/websocket_triggers/+page.svelte
index 49a8ec6e52..4105052d34 100644
--- a/frontend/src/routes/(root)/(logged)/websocket_triggers/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/websocket_triggers/+page.svelte
@@ -45,20 +45,22 @@
 		loading = false
 	}
 
-	let status: {
-		[path: string]: { error: string | undefined; last_server_ping: string | undefined }
-	} = {}
-
 	let interval = setInterval(async () => {
 		try {
-			status = (
-				await WebsocketTriggerService.listWebsocketTriggers({
-					workspace: $workspaceStore!
-				})
-			).reduce((acc, x) => {
-				acc[x.path] = x
-				return acc
-			}, {})
+			const newTriggers = await WebsocketTriggerService.listWebsocketTriggers({
+				workspace: $workspaceStore!
+			})
+			for (let i = 0; i < triggers.length; i++) {
+				const newTrigger = newTriggers.find((x) => x.path === triggers[i].path)
+				if (newTrigger) {
+					triggers[i] = {
+						...triggers[i],
+						error: newTrigger.error,
+						last_server_ping: newTrigger.last_server_ping,
+						enabled: newTrigger.enabled
+					}
+				}
+			}
 		} catch (err) {
 			console.error(err)
 		}
@@ -258,7 +260,7 @@
 			<div class="border rounded-md divide-y">
 				{#each items.slice(0, nbDisplayed) as { path, edited_by, edited_at, script_path, url, is_flow, extra_perms, canWrite, marked, error, last_server_ping, enabled } (path)}
 					{@const href = `${is_flow ? '/flows/get' : '/scripts/get'}/${script_path}`}
-					{@const wsStatus = status[path] ?? { error, last_server_ping }}
+					{@const ping = last_server_ping ? new Date(last_server_ping) : undefined}
 
 					<div
 						class="hover:bg-surface-hover w-full items-center px-4 py-2 gap-4 first-of-type:!border-t-0
@@ -278,7 +280,11 @@
 											{@html marked}
 										</span>
 									{:else}
-										{url}
+										{url.startsWith('$script:')
+											? 'URL: ' + url.replace('$script:', 'result of script ')
+											: url.startsWith('$flow:')
+											? 'URL: ' + url.replace('$flow:', 'result of flow ')
+											: url}
 									{/if}
 								</div>
 								<div class="text-secondary text-xs truncate text-left font-light">
@@ -294,34 +300,30 @@
 							</div>
 
 							<div class="w-10">
-								{#if enabled}
-									{@const ping = wsStatus.last_server_ping
-										? new Date(wsStatus.last_server_ping)
-										: undefined}
-									{#if !ping || ping.getTime() < new Date().getTime() - 15 * 1000 || wsStatus.error}
-										<Popover notClickable>
-											<span class="flex h-4 w-4">
-												<Circle
-													class="text-red-600 animate-ping absolute inline-flex fill-current"
-													size={12}
-												/>
-												<Circle class="text-red-600 relative inline-flex fill-current" size={12} />
-											</span>
-											<div slot="text">
-												Websocket is not connected{wsStatus.error ? ': ' + wsStatus.error : ''}
-											</div>
-										</Popover>
-									{:else}
-										<Popover notClickable>
-											<span class="flex h-4 w-4">
-												<Circle
-													class="text-green-600 relative inline-flex fill-current"
-													size={12}
-												/>
-											</span>
-											<div slot="text"> Websocket is connected </div>
-										</Popover>
-									{/if}
+								{#if (enabled && (!ping || ping.getTime() < new Date().getTime() - 15 * 1000 || error)) || (!enabled && error)}
+									<Popover notClickable>
+										<span class="flex h-4 w-4">
+											<Circle
+												class="text-red-600 animate-ping absolute inline-flex fill-current"
+												size={12}
+											/>
+											<Circle class="text-red-600 relative inline-flex fill-current" size={12} />
+										</span>
+										<div slot="text">
+											{#if enabled}
+												Websocket is not connected{error ? ': ' + error : ''}
+											{:else}
+												Websocket was disabled because of an error: {error}
+											{/if}
+										</div>
+									</Popover>
+								{:else if enabled}
+									<Popover notClickable>
+										<span class="flex h-4 w-4">
+											<Circle class="text-green-600 relative inline-flex fill-current" size={12} />
+										</span>
+										<div slot="text"> Websocket is connected </div>
+									</Popover>
 								{/if}
 							</div>
 

From 8d8156bd0773da3ddec81c46ad5fda114ecd3dda Mon Sep 17 00:00:00 2001
From: Faton Ramadani <faton.ramadani14@gmail.com>
Date: Tue, 5 Nov 2024 14:21:14 +0100
Subject: [PATCH 18/80] fix(frontend): arg input json handling when the value
 is not of the same type as schema (#4479)

* fix(frontend): Fix ArgInput when the value is not of the same type as the input

* fix(frontend): remove console

* Update ArgInput.svelte

---------

Co-authored-by: Ruben Fiszel <ruben@windmill.dev>
---
 frontend/src/lib/components/ArgInput.svelte | 44 +++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/frontend/src/lib/components/ArgInput.svelte b/frontend/src/lib/components/ArgInput.svelte
index 80537e4d44..bbaf166e0d 100644
--- a/frontend/src/lib/components/ArgInput.svelte
+++ b/frontend/src/lib/components/ArgInput.svelte
@@ -128,8 +128,10 @@
 	let s3FilePicker: S3FilePicker
 	let s3FileUploadRawMode: false
 	let isListJson = false
+	let hasIsListJsonChanged = false
 
 	let el: HTMLTextAreaElement | undefined = undefined
+
 	let inputCat = computeInputCat(type, format, itemsType?.type, enum_, contentEncoding)
 
 	$: inputCat = computeInputCat(type, format, itemsType?.type, enum_, contentEncoding)
@@ -170,6 +172,43 @@
 
 	$: computeDefaultValue(value, inputCat, defaultValue, nullable)
 
+	let lastValue: any = undefined
+
+	// By setting isListJson to true, we can render inputs even if the value is not an array of the correct type
+	// This avoids the issue of the input being rendered as a string with value: [object Object], or as a number with value: NaN
+	function checkArrayValueType() {
+		try {
+			if (Array.isArray(value) && value.length > 0) {
+				const firstItem = value?.[0]
+				const type = itemsType?.type
+
+				switch (type) {
+					case 'string':
+						if (typeof firstItem !== 'string') {
+							isListJson = true
+						}
+						break
+					case 'number':
+						if (typeof firstItem !== 'number') {
+							isListJson = true
+						}
+						break
+				}
+			}
+		} catch (e) {
+			console.error(e)
+		}
+
+		lastValue = value
+	}
+
+	$: !isListJson &&
+		inputCat === 'list' &&
+		value != lastValue &&
+		itemsType?.type &&
+		!hasIsListJsonChanged &&
+		checkArrayValueType()
+
 	$: defaultValue != undefined && handleDefaultValueChange()
 
 	let oldDefaultValue = defaultValue
@@ -518,6 +557,11 @@
 					<div class="mt-2 mr-4">
 						<Toggle
 							on:change={(e) => {
+								// Once the user has changed the input type, we should not change it back automatically
+								if (!hasIsListJsonChanged) {
+									hasIsListJsonChanged = true
+								}
+
 								evalValueToRaw()
 								isListJson = !isListJson
 							}}

From 323912c73c18d3bb6d136f2e6458389270364a0e Mon Sep 17 00:00:00 2001
From: Guilhem <guilhemlemouel@gmail.com>
Date: Tue, 5 Nov 2024 20:58:16 +0100
Subject: [PATCH 19/80] fix(frontend): improve flow prop picker design

* improve input picker

* Put back colors for types

* Add full path to popover

* Copy instead of toast if no input selected

* Add popover and copy to value

* Add shadow en transition when selecting input

* Add border and transition when selecting input

* revert unwanted changes

* hide scrollbar when not hovering

* Add connexion animated border effect

* fix display

* fix proppicker display

* Remove badge

* Change animated button gradient

* revert scrollbar on hover

* clean design

* clean design

* clean design

* clean design

* clean design

* clean design

* clean design

* improve search

---------

Co-authored-by: Ruben Fiszel <ruben@rubenfiszel.com>
---
 .../lib/components/InputTransformForm.svelte  | 280 ++++++++++--------
 .../InputTransformSchemaForm.svelte           |  32 +-
 .../contextPanel/ComponentOutputViewer.svelte |  14 +-
 .../common/button/AnimatedButton.svelte       |  93 ++++++
 .../clearableInput/ClearableInput.svelte      |   4 +-
 .../flows/content/FlowModuleComponent.svelte  |   3 +-
 .../flows/propPicker/PropPickerWrapper.svelte |  92 +++---
 .../propertyPicker/ObjectViewer.svelte        | 116 +++++---
 .../propertyPicker/PropPicker.svelte          | 218 +++++++-------
 .../propertyPicker/PropPickerResult.svelte    |  20 +-
 .../lib/components/propertyPicker/utils.ts    |  57 ++--
 11 files changed, 547 insertions(+), 382 deletions(-)
 create mode 100644 frontend/src/lib/components/common/button/AnimatedButton.svelte

diff --git a/frontend/src/lib/components/InputTransformForm.svelte b/frontend/src/lib/components/InputTransformForm.svelte
index 64530dd3ba..706d00b7ae 100644
--- a/frontend/src/lib/components/InputTransformForm.svelte
+++ b/frontend/src/lib/components/InputTransformForm.svelte
@@ -9,9 +9,11 @@
 	import type { PropPickerWrapperContext } from './flows/propPicker/PropPickerWrapper.svelte'
 	import { codeToStaticTemplate, getDefaultExpr } from './flows/utils'
 	import SimpleEditor from './SimpleEditor.svelte'
-	import { Button } from './common'
+	import { Button } from '$lib/components/common'
+	import AnimatedButton from '$lib/components/common/button/AnimatedButton.svelte'
 	import ToggleButtonGroup from '$lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte'
 	import ToggleButton from '$lib/components/common/toggleButton-v2/ToggleButton.svelte'
+	import { fade } from 'svelte/transition'
 
 	import type VariableEditor from './VariableEditor.svelte'
 	import type ItemPicker from './ItemPicker.svelte'
@@ -23,7 +25,7 @@
 	import type { FlowCopilotContext } from './copilot/flow'
 	import StepInputGen from './copilot/StepInputGen.svelte'
 	import type { PickableProperties } from './flows/previousResults'
-
+	import { twMerge } from 'tailwind-merge'
 	export let schema: Schema | { properties?: Record<string, any>; required?: string[] }
 	export let arg: InputTransform | any
 	export let argName: string
@@ -186,11 +188,22 @@
 	let stepInputGen: StepInputGen | undefined = undefined
 
 	loadResourceTypes()
+
+	$: connecting =
+		$propPickerConfig?.propName == argName && $propPickerConfig?.insertionMode == 'connect'
 </script>
 
 {#if arg != undefined}
-	<div class={$$props.class}>
-		<div class="flex flex-row justify-between gap-1 pb-1">
+	<div
+		class={twMerge(
+			'pl-2 pt-2 pb-2 ml-2 relative hover:bg-surface hover:shadow-md transition-all duration-200',
+			$propPickerConfig?.propName == argName
+				? 'bg-surface border-l-4 border-blue-500 shadow-md rounded-l-md z-2000'
+				: 'hover:rounded-md',
+			$$props.class
+		)}
+	>
+		<div class="flex flex-row justify-between gap-1 pb-1 px-2">
 			<div class="flex flex-wrap grow">
 				<FieldHeader
 					label={argName}
@@ -322,147 +335,172 @@
 						</ToggleButtonGroup>
 					</div>
 
-					<Button
-						title="Connect to another node's output"
-						variant="border"
-						color="light"
-						size="xs2"
-						on:click={() => {
-							focusProp(argName, 'connect', (path) => {
-								connectProperty(path)
-								dispatch('change', { argName })
-								return true
-							})
-						}}
-						id="flow-editor-plug"
+					<AnimatedButton
+						animate={connecting}
+						baseRadius="6px"
+						animationDuration="2s"
+						marginWidth="2px"
 					>
-						<Plug size={16} /> &rightarrow;
-					</Button>
+						<Button
+							variant="border"
+							color="light"
+							size="xs2"
+							btnClasses={connecting ? 'text-blue-500' : 'text-primary'}
+							on:click={() => {
+								focusProp(argName, 'connect', (path) => {
+									connectProperty(path)
+									dispatch('change', { argName })
+									return true
+								})
+							}}
+						>
+							<Plug size={16} /> &rightarrow;
+						</Button>
+					</AnimatedButton>
 				</div>
 			{/if}
 		</div>
 
 		<div class="max-w-xs" />
 		<!-- svelte-ignore a11y-no-static-element-interactions -->
-		<div
-			class="relative {$propPickerConfig?.propName == argName
-				? 'outline outline-offset-1 outline-1 outline-blue-500 rounded-md'
-				: ''}"
-			on:keyup={stepInputGen?.onKeyUp}
-		>
-			{#if $propPickerConfig?.propName == argName && $propPickerConfig?.insertionMode == 'connect'}
+		<div class="relative" on:keyup={stepInputGen?.onKeyUp}>
+			<!-- {#if $propPickerConfig?.propName == argName && $propPickerConfig?.insertionMode == 'connect'}
 				<span
 					class={'text-white  z-50 px-1 text-2xs py-0.5 font-bold rounded-t-sm w-fit absolute top-0 right-0 bg-blue-500'}
 				>
 					Connect input &rightarrow;
 				</span>
-			{/if}
+			{/if} -->
 			<!-- {inputCat}
 			{propertyType} -->
-			{#if isStaticTemplate(inputCat) && propertyType == 'static' && !noDynamicToggle}
-				{#if argName && schema?.properties?.[argName]?.description}
-					<div class="text-xs italic pb-1 text-secondary">
-						<pre class="font-main">{schema.properties[argName].description}</pre>
-					</div>
-				{/if}
-				<div class="mt-2 min-h-[28px]">
-					{#if arg}
-						<TemplateEditor
-							bind:this={monacoTemplate}
-							{extraLib}
+			<div class="relative flex flex-row items-top gap-2 justify-between">
+				<div class="min-w-0 grow">
+					{#if isStaticTemplate(inputCat) && propertyType == 'static' && !noDynamicToggle}
+						{#if argName && schema?.properties?.[argName]?.description}
+							<div class="text-xs italic pb-1 text-secondary">
+								<pre class="font-main">{schema.properties[argName].description}</pre>
+							</div>
+						{/if}
+						<div class="mt-2 min-h-[28px]">
+							{#if arg}
+								<TemplateEditor
+									bind:this={monacoTemplate}
+									{extraLib}
+									on:focus={onFocus}
+									on:blur={() => {
+										focused = false
+									}}
+									bind:code={arg.value}
+									fontSize={14}
+									on:change={() => {
+										dispatch('change', { argName })
+									}}
+								/>
+							{/if}
+						</div>
+					{:else if (propertyType === undefined || propertyType == 'static') && schema?.properties?.[argName]}
+						<ArgInput
+							{resourceTypes}
+							noMargin
+							compact
+							bind:this={argInput}
 							on:focus={onFocus}
 							on:blur={() => {
 								focused = false
 							}}
-							bind:code={arg.value}
-							fontSize={14}
+							shouldDispatchChanges
 							on:change={() => {
 								dispatch('change', { argName })
 							}}
+							label={argName}
+							bind:editor={monaco}
+							bind:description={schema.properties[argName].description}
+							bind:value={arg.value}
+							type={schema.properties[argName].type}
+							oneOf={schema.properties[argName].oneOf}
+							required={schema.required?.includes(argName)}
+							bind:pattern={schema.properties[argName].pattern}
+							bind:valid={inputCheck}
+							defaultValue={schema.properties[argName].default}
+							bind:enum_={schema.properties[argName].enum}
+							bind:format={schema.properties[argName].format}
+							contentEncoding={schema.properties[argName].contentEncoding}
+							bind:itemsType={schema.properties[argName].items}
+							properties={schema.properties[argName].properties}
+							nestedRequired={schema.properties[argName].required}
+							displayHeader={false}
+							extra={argExtra}
+							{variableEditor}
+							{itemPicker}
+							bind:pickForField
+							showSchemaExplorer
+							nullable={schema.properties[argName].nullable}
+							bind:title={schema.properties[argName].title}
+							bind:placeholder={schema.properties[argName].placeholder}
 						/>
+					{:else if arg.expr != undefined}
+						<div class="border mt-2">
+							<SimpleEditor
+								bind:this={monaco}
+								bind:code={arg.expr}
+								on:change={() => {
+									dispatch('change', { argName })
+								}}
+								{extraLib}
+								lang="javascript"
+								shouldBindKey={false}
+								on:focus={() => {
+									focused = true
+									focusProp(argName, 'insert', (path) => {
+										monaco?.insertAtCursor(path)
+										return false
+									})
+								}}
+								on:change={() => {
+									dispatch('change', { argName })
+								}}
+								on:blur={() => {
+									focused = false
+								}}
+								autoHeight
+							/>
+						</div>
+						<DynamicInputHelpBox />
+						<div class="mb-2" />
+					{:else}
+						Not recognized input type {argName} ({arg.expr}, {propertyType})
+						<div class="flex mt-2">
+							<Button
+								variant="border"
+								size="xs"
+								on:click={() => {
+									arg.expr = ''
+								}}>Set expr to empty string</Button
+							></div
+						>
 					{/if}
 				</div>
-			{:else if (propertyType === undefined || propertyType == 'static') && schema?.properties?.[argName]}
-				<ArgInput
-					{resourceTypes}
-					noMargin
-					compact
-					bind:this={argInput}
-					on:focus={onFocus}
-					on:blur={() => {
-						focused = false
-					}}
-					shouldDispatchChanges
-					on:change={() => {
-						dispatch('change', { argName })
-					}}
-					label={argName}
-					bind:editor={monaco}
-					bind:description={schema.properties[argName].description}
-					bind:value={arg.value}
-					type={schema.properties[argName].type}
-					oneOf={schema.properties[argName].oneOf}
-					required={schema.required?.includes(argName)}
-					bind:pattern={schema.properties[argName].pattern}
-					bind:valid={inputCheck}
-					defaultValue={schema.properties[argName].default}
-					bind:enum_={schema.properties[argName].enum}
-					bind:format={schema.properties[argName].format}
-					contentEncoding={schema.properties[argName].contentEncoding}
-					bind:itemsType={schema.properties[argName].items}
-					properties={schema.properties[argName].properties}
-					nestedRequired={schema.properties[argName].required}
-					displayHeader={false}
-					extra={argExtra}
-					{variableEditor}
-					{itemPicker}
-					bind:pickForField
-					showSchemaExplorer
-					nullable={schema.properties[argName].nullable}
-					bind:title={schema.properties[argName].title}
-					bind:placeholder={schema.properties[argName].placeholder}
-				/>
-			{:else if arg.expr != undefined}
-				<div class="border mt-2">
-					<SimpleEditor
-						bind:this={monaco}
-						bind:code={arg.expr}
-						on:change={() => {
-							dispatch('change', { argName })
-						}}
-						{extraLib}
-						lang="javascript"
-						shouldBindKey={false}
-						on:focus={() => {
-							focused = true
-							focusProp(argName, 'insert', (path) => {
-								monaco?.insertAtCursor(path)
-								return false
-							})
-						}}
-						on:change={() => {
-							dispatch('change', { argName })
-						}}
-						on:blur={() => {
-							focused = false
-						}}
-						autoHeight
-					/>
-				</div>
-				<DynamicInputHelpBox />
-				<div class="mb-2" />
-			{:else}
-				Not recognized input type {argName} ({arg.expr}, {propertyType})
-				<div class="flex mt-2">
-					<Button
-						variant="border"
-						size="xs"
-						on:click={() => {
-							arg.expr = ''
-						}}>Set expr to empty string</Button
-					></div
-				>
-			{/if}
+
+				{#if $propPickerConfig?.propName == argName}
+					<div class="text-blue-500 mt-2" in:fade={{ duration: 200 }}>
+						<svg
+							xmlns="http://www.w3.org/2000/svg"
+							width="14"
+							height="24"
+							viewBox="0 0 24 24"
+							fill="currentColor"
+							stroke="currentColor"
+							stroke-width="2"
+							stroke-linecap="round"
+							stroke-linejoin="round"
+						>
+							<polyline points="24 24 12 12 24 0" />
+						</svg>
+					</div>
+				{:else}
+					<div class="w-0" />
+				{/if}
+			</div>
 		</div>
 	</div>
 {/if}
diff --git a/frontend/src/lib/components/InputTransformSchemaForm.svelte b/frontend/src/lib/components/InputTransformSchemaForm.svelte
index 488797c6db..e9a0f4899d 100644
--- a/frontend/src/lib/components/InputTransformSchemaForm.svelte
+++ b/frontend/src/lib/components/InputTransformSchemaForm.svelte
@@ -67,24 +67,26 @@
 
 <div class="w-full {clazz}">
 	{#if enableAi}
-		<StepInputsGen
-			{pickableProperties}
-			argNames={keys
-				? keys.filter(
-						(argName) =>
-							Object.keys(schema.properties ?? {}).includes(argName) &&
-							Object.keys(args ?? {}).includes(argName) &&
-							((args[argName].type === 'static' && !args[argName].value) ||
-								(args[argName].type === 'javascript' && !args[argName].expr))
-				  )
-				: []}
-			{schema}
-		/>
+		<div class="px-0.5 pt-0.5">
+			<StepInputsGen
+				{pickableProperties}
+				argNames={keys
+					? keys.filter(
+							(argName) =>
+								Object.keys(schema.properties ?? {}).includes(argName) &&
+								Object.keys(args ?? {}).includes(argName) &&
+								((args[argName].type === 'static' && !args[argName].value) ||
+									(args[argName].type === 'javascript' && !args[argName].expr))
+					  )
+					: []}
+				{schema}
+			/>
+		</div>
 	{/if}
 	{#if keys.length > 0}
 		{#each keys as argName (argName)}
 			{#if (!filter || filter.includes(argName)) && Object.keys(schema.properties ?? {}).includes(argName)}
-				<div class="z-10 pt-4">
+				<div class="z-10 pt-2 relative">
 					<InputTransformForm
 						{previousModuleId}
 						bind:arg={args[argName]}
@@ -128,7 +130,7 @@
 >
 	<div
 		slot="submission"
-		class="flex flex-row-reverse w-full bg-surface border-t border-gray-200 rounded-bl-lg rounded-br-lg"
+		class="flex flex-row-reverse w-full border-t border-gray-200 rounded-bl-lg rounded-br-lg"
 	>
 		<Button
 			variant="border"
diff --git a/frontend/src/lib/components/apps/editor/contextPanel/ComponentOutputViewer.svelte b/frontend/src/lib/components/apps/editor/contextPanel/ComponentOutputViewer.svelte
index 77d6ff3b82..7d4e985a69 100644
--- a/frontend/src/lib/components/apps/editor/contextPanel/ComponentOutputViewer.svelte
+++ b/frontend/src/lib/components/apps/editor/contextPanel/ComponentOutputViewer.svelte
@@ -41,12 +41,14 @@
 
 {#if object != undefined && Object.keys(object).length > 0}
 	{#if $hasResult[componentId] || $search == ''}
-		<ObjectViewer
-			json={filtered}
-			on:select
-			topBrackets={false}
-			pureViewer={!$connectingInput.opened}
-		/>
+		<div class="pl-2">
+			<ObjectViewer
+				json={filtered}
+				on:select
+				topBrackets={false}
+				pureViewer={!$connectingInput.opened}
+			/>
+		</div>
 	{:else if $search.length > 0}
 		<div class="text-xs pl-2 text-tertiary">No results</div>
 	{:else}
diff --git a/frontend/src/lib/components/common/button/AnimatedButton.svelte b/frontend/src/lib/components/common/button/AnimatedButton.svelte
new file mode 100644
index 0000000000..438b43dc0a
--- /dev/null
+++ b/frontend/src/lib/components/common/button/AnimatedButton.svelte
@@ -0,0 +1,93 @@
+<script lang="ts">
+	import { twMerge } from 'tailwind-merge'
+	import DarkModeObserver from '$lib/components/DarkModeObserver.svelte'
+	export let marginWidth = '2px'
+	export let animationDuration = '2s'
+	export let baseRadius = '4px'
+	export let animate = true
+	export let wrapperClasses = ''
+	export let ringColor = 'transparent'
+	export let darkMode = false
+
+	const gradientColors = {
+		light: ['#d6e5ff', '#0073ff', '#5aa2fa', '#0272fa', '#d6e5ff'],
+		dark: ['#0469db', '#15498a', '#031ea3', '#0073ff', '#0469db']
+	}
+
+	let clientWidth = 0
+	let clientHeight = 0
+
+	$: circleRadius = Math.ceil(
+		Math.sqrt(clientWidth * clientWidth + clientHeight * clientHeight) / 2
+	)
+
+	$: gradientString = `from 0deg, ${gradientColors[darkMode ? 'dark' : 'light'].join(', ')}`
+</script>
+
+<DarkModeObserver bind:darkMode />
+
+<div
+	class={twMerge('gradient-button', wrapperClasses)}
+	style="--margin-width: {marginWidth}; --animation-duration: {animationDuration}; --base-radius: {baseRadius}; --circle-radius: {circleRadius}; --ring-color: {ringColor}; --gradient: {gradientString}"
+	class:animate
+	bind:clientWidth
+	bind:clientHeight
+>
+	<slot />
+</div>
+
+<style>
+	.gradient-button {
+		position: relative;
+		font-size: inherit;
+		border: none;
+		border-radius: calc(var(--base-radius) + var(--margin-width, 2px));
+		color: currentColor;
+		background: inherit;
+		z-index: 1;
+		overflow: hidden;
+		padding: var(--margin-width, 2px);
+	}
+
+	/* Circular gradient */
+	.gradient-button::before {
+		content: '';
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		width: calc(var(--circle-radius, 300px) * 2px);
+		height: calc(var(--circle-radius, 300px) * 2px);
+		background: var(--ring-color, transparent);
+		border-radius: 50%;
+		z-index: -1;
+		animation: none;
+	}
+
+	.gradient-button.animate::before {
+		background: conic-gradient(var(--gradient));
+		animation: rotate var(--animation-duration, 2s) linear infinite;
+	}
+
+	/* inner background */
+	.gradient-button::after {
+		content: '';
+		position: absolute;
+		top: var(--margin-width, 2px);
+		right: var(--margin-width, 2px);
+		bottom: var(--margin-width, 2px);
+		left: var(--margin-width, 2px);
+		background: inherit;
+		border-radius: var(--base-radius);
+		z-index: -1;
+	}
+
+	@keyframes rotate {
+		from {
+			transform: translate(-50%, -50%) rotate(0deg);
+		}
+		to {
+			transform: translate(-50%, -50%) rotate(360deg);
+		}
+	}
+</style>
diff --git a/frontend/src/lib/components/common/clearableInput/ClearableInput.svelte b/frontend/src/lib/components/common/clearableInput/ClearableInput.svelte
index d225fe6c0f..35bb9bce3d 100644
--- a/frontend/src/lib/components/common/clearableInput/ClearableInput.svelte
+++ b/frontend/src/lib/components/common/clearableInput/ClearableInput.svelte
@@ -60,8 +60,8 @@
 	{#if value && isHovered}
 		<button
 			transition:fade|local={{ duration: 80 }}
-			class="absolute z-10 top-[9.5px] right-2 rounded-full p-0.5 text-white bg-gray-300
-			duration-200 hover:bg-gray-600 focus:bg-gray-600 {buttonClass}"
+			class="absolute z-10 top-[9.5px] right-2 rounded-full p-0.5 text-primary bg-surface-secondary
+			duration-200 hover:bg-surface-hovr focus:bg-surface-hover {buttonClass}"
 			aria-label="Clear"
 			on:click|preventDefault|stopPropagation={clear}
 		>
diff --git a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
index c73336df14..35a8585af1 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
@@ -378,10 +378,11 @@
 							class={advancedSelected === 'runtime' ? 'h-[calc(100%-68px)]' : 'h-[calc(100%-34px)]'}
 						>
 							{#if selected === 'inputs' && (flowModule.value.type == 'rawscript' || flowModule.value.type == 'script' || flowModule.value.type == 'flow')}
-								<div class="h-full overflow-auto px-2" id="flow-editor-step-input">
+								<div class="h-full overflow-auto px-2 bg-surface" id="flow-editor-step-input">
 									<PropPickerWrapper
 										pickableProperties={stepPropPicker.pickableProperties}
 										error={failureModule}
+										noPadding
 									>
 										<InputTransformSchemaForm
 											bind:this={inputTransformSchemaForm}
diff --git a/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte b/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte
index 56f19eda7f..cbf9e058e5 100644
--- a/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte
+++ b/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte
@@ -19,12 +19,13 @@
 <script lang="ts">
 	import PropPicker from '$lib/components/propertyPicker/PropPicker.svelte'
 	import PropPickerResult from '$lib/components/propertyPicker/PropPickerResult.svelte'
-	import { clickOutside, sendUserToast } from '$lib/utils'
+	import { clickOutside } from '$lib/utils'
 	import { createEventDispatcher, setContext } from 'svelte'
 	import { Pane, Splitpanes } from 'svelte-splitpanes'
 	import { writable, type Writable } from 'svelte/store'
 	import type { PickableProperties } from '../previousResults'
 	import { twMerge } from 'tailwind-merge'
+	import AnimatedButton from '$lib/components/common/button/AnimatedButton.svelte'
 
 	export let pickableProperties: PickableProperties | undefined
 	export let result: any = undefined
@@ -58,51 +59,70 @@
 	use:clickOutside
 	on:click_outside={() => propPickerConfig.set(undefined)}
 >
-	<Splitpanes>
+	<Splitpanes class={$propPickerConfig ? 'splitpanes-remove-splitter' : ''}>
 		<Pane
 			minSize={20}
 			size={60}
-			class={twMerge('relative !transition-none', noPadding ? '' : 'p-2')}
+			class={twMerge('relative !transition-none ', noPadding ? '' : 'p-2')}
 		>
 			<slot />
 		</Pane>
 		<Pane
 			minSize={20}
 			size={40}
-			class="pt-2 relative !transition-none {$propPickerConfig ? 'border-2 border-blue-500' : ''}"
+			class="!transition-none z-1000 {$propPickerConfig ? 'ml-[-1px]' : ''}"
 		>
-			{#if result}
-				<PropPickerResult
-					{result}
-					{extraResults}
-					{flow_input}
-					on:select={({ detail }) => {
-						if (!notSelectable && !$propPickerConfig) {
-							sendUserToast('Set cursor within an input or click on the plug first', true)
-						}
-						dispatch('select', detail)
-						if ($propPickerConfig?.onSelect(detail)) {
-							propPickerConfig.set(undefined)
-						}
-					}}
-				/>
-			{:else if pickableProperties}
-				<PropPicker
-					{displayContext}
-					{error}
-					{pickableProperties}
-					{notSelectable}
-					on:select={({ detail }) => {
-						if (!notSelectable && !$propPickerConfig) {
-							sendUserToast('Set cursor within an input or click on the plug first', true)
-						}
-						dispatch('select', detail)
-						if ($propPickerConfig?.onSelect(detail)) {
-							propPickerConfig.set(undefined)
-						}
-					}}
-				/>
-			{/if}
+			<AnimatedButton
+				animate={$propPickerConfig?.insertionMode == 'connect'}
+				baseRadius="4px"
+				wrapperClasses="h-full w-full pt-2 !bg-surface"
+				marginWidth="3px"
+				ringColor={$propPickerConfig?.insertionMode == 'insert' ||
+				$propPickerConfig?.insertionMode == 'append'
+					? '#3b82f6'
+					: 'transparent'}
+				animationDuration="4s"
+			>
+				{#if result}
+					<PropPickerResult
+						{result}
+						{extraResults}
+						{flow_input}
+						allowCopy={!notSelectable && !$propPickerConfig}
+						on:select={({ detail }) => {
+							dispatch('select', detail)
+							if ($propPickerConfig?.onSelect(detail)) {
+								propPickerConfig.set(undefined)
+							}
+						}}
+					/>
+				{:else if pickableProperties}
+					<PropPicker
+						{displayContext}
+						{error}
+						{pickableProperties}
+						{notSelectable}
+						allowCopy={!notSelectable && !$propPickerConfig}
+						on:select={({ detail }) => {
+							dispatch('select', detail)
+							if ($propPickerConfig?.onSelect(detail)) {
+								propPickerConfig.set(undefined)
+							}
+						}}
+					/>
+				{/if}
+			</AnimatedButton>
 		</Pane>
 	</Splitpanes>
 </div>
+
+<style>
+	:global(.splitpanes-remove-splitter > .splitpanes__pane) {
+		background-color: inherit !important;
+	}
+	:global(.splitpanes-remove-splitter > .splitpanes__splitter) {
+		background-color: transparent !important;
+		width: 0 !important;
+		border: none !important;
+	}
+</style>
diff --git a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
index b0ed460636..7d288f9e92 100644
--- a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
+++ b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
@@ -1,13 +1,11 @@
 <script lang="ts">
-	import { copyToClipboard, pluralize, truncate } from '$lib/utils'
+	import { copyToClipboard, truncate } from '$lib/utils'
 
 	import { createEventDispatcher } from 'svelte'
-	import { Badge } from '../common'
 	import { computeKey } from './utils'
-	import WarningMessage from './WarningMessage.svelte'
 	import { NEVER_TESTED_THIS_FAR } from '../flows/models'
 	import Portal from '$lib/components/Portal.svelte'
-
+	import { Button } from '$lib/components/common'
 	import { Download, PanelRightOpen } from 'lucide-svelte'
 	import S3FilePicker from '../S3FilePicker.svelte'
 	import { workspaceStore } from '$lib/stores'
@@ -19,9 +17,9 @@
 	export let collapsed = (level != 0 && level % 3 == 0) || Array.isArray(json)
 	export let rawKey = false
 	export let topBrackets = false
-	export let topLevelNode = false
 	export let allowCopy = true
 	export let collapseLevel: number | undefined = undefined
+	export let prefix = ''
 
 	let s3FileViewer: S3FilePicker
 
@@ -50,12 +48,21 @@
 
 	const dispatch = createEventDispatcher()
 
-	function selectProp(key: string, value: any | undefined = undefined) {
-		if (pureViewer && allowCopy) {
-			const valueToCopy = value !== undefined ? value : computeKey(key, isArray, currentPath)
-			copyToClipboard(valueToCopy)
+	function computeFullKey(key: string, rawKey: boolean) {
+		if (rawKey) {
+			return `${prefix}('${key}')`
 		}
-		dispatch('select', rawKey ? key : computeKey(key, isArray, currentPath))
+		const keyToSelect = computeKey(key, isArray, currentPath)
+		const separator = !prefix || keyToSelect.startsWith('[') ? '' : '.'
+		return prefix + separator + keyToSelect
+	}
+
+	function selectProp(key: string, value: any | undefined = undefined) {
+		const fullKey = computeFullKey(key, rawKey)
+		if (pureViewer && allowCopy) {
+			copyToClipboard(fullKey)
+		}
+		dispatch('select', fullKey)
 	}
 
 	$: keyLimit = isArray ? 1 : 100
@@ -66,40 +73,44 @@
 <Portal name="object-viewer">
 	<S3FilePicker bind:this={s3FileViewer} readOnlyMode={true} />
 </Portal>
-
 {#if keys.length > 0}
 	{#if !fullyCollapsed}
 		<span>
 			{#if level != 0 && keys.length > 1}
 				<!-- svelte-ignore a11y-click-events-have-key-events -->
 				<!-- svelte-ignore a11y-no-static-element-interactions -->
-				<span class="cursor-pointer border hover:bg-surface-hover px-1 rounded" on:click={collapse}>
-					-
-				</span>
+				<Button
+					color="light"
+					size="xs2"
+					variant="border"
+					on:click={collapse}
+					wrapperClasses="inline-flex w-fit h-4"
+					btnClasses="font-semibold text-primary rounded-[0.275rem]">-</Button
+				>
 			{/if}
 			{#if level == 0 && topBrackets}<span class="h-0">{openBracket}</span>{/if}
-			<ul class={`w-full pl-2 ${level === 0 ? 'border-none' : 'border-l border-dotted'}`}>
+			<ul class={`w-full ${level === 0 ? 'border-none' : 'pl-2 border-l border-dotted'}`}>
 				{#each keys.length > keyLimit ? keys.slice(0, keyLimit) : keys as key, index (key)}
 					<li>
-						<button on:click={() => selectProp(key)} class="whitespace-nowrap">
-							{#if topLevelNode}
-								<Badge baseClass="border border-blue-600" color="indigo">{key}</Badge>
-							{:else}
-								<span
-									class="key {pureViewer
-										? 'cursor-auto'
-										: 'border '} font-semibold rounded px-1 hover:bg-surface-hover text-2xs text-secondary"
-								>
-									{!isArray ? key : index}</span
-								>
-							{/if}:
-						</button>
-
+						<div class="inline-flex items-baseline">
+							<Button
+								on:click={() => selectProp(key)}
+								size="xs2"
+								color="light"
+								variant="border"
+								wrapperClasses="inline-flex p-0 whitespace-nowrap w-fit"
+								btnClasses="font-mono h-4 text-2xs font-thin px-1 rounded-[0.275rem]"
+								title={computeFullKey(key, rawKey)}
+							>
+								<span class={pureViewer ? 'cursor-auto' : ''}>{!isArray ? key : index} </span>
+							</Button>
+							<span class="text-2xs text-tertiary">:</span>
+						</div>
 						{#if getTypeAsString(json[key]) === 'object'}
 							<svelte:self
 								json={json[key]}
 								level={level + 1}
-								currentPath={computeKey(key, isArray, currentPath)}
+								currentPath={computeFullKey(key, rawKey)}
 								{pureViewer}
 								{allowCopy}
 								on:select
@@ -110,21 +121,25 @@
 							<button
 								class="val text-left {pureViewer
 									? 'cursor-auto'
-									: ''} rounded px-1 hover:bg-blue-100 dark:hover:bg-blue-100/10 {getTypeAsString(
-									json[key]
-								)}"
-								on:click={() => selectProp(key, json[key])}
+									: ''} rounded px-1 {getTypeAsString(json[key])}"
+								on:click={() => {
+									selectProp(key, json[key])
+								}}
+								title={computeFullKey(key, rawKey)}
+								disabled={false}
 							>
 								{#if json[key] === NEVER_TESTED_THIS_FAR}
-									<WarningMessage />
+									<span class="text-2xs text-tertiary font-normal">
+										Test the flow to see a value
+									</span>
 								{:else if json[key] == undefined}
 									<span class="text-2xs">undefined</span>
 								{:else if json[key] == null}
 									<span class="text-2xs">null</span>
 								{:else if typeof json[key] == 'string'}
-									<span title={json[key]} class="text-2xs">"{truncate(json[key], 200)}"</span>
+									<span class="text-2xs">"{truncate(json[key], 200)}"</span>
 								{:else}
-									<span title={JSON.stringify(json[key])} class="text-2xs">
+									<span class="text-2xs">
 										{truncate(JSON.stringify(json[key]), 200)}
 									</span>
 								{/if}
@@ -134,7 +149,7 @@
 				{/each}
 				{#if keys.length > keyLimit}
 					{@const increment = Math.min(100, keys.length - keyLimit)}
-					<button on:click={() => (keyLimit += increment)} class="text-xs py-2 text-blue-600">
+					<button on:click={() => (keyLimit += increment)} class="text-2xs px-2 text-secondary">
 						{keyLimit}/{keys.length}: Load {increment} more...
 					</button>
 				{/if}
@@ -167,24 +182,27 @@
 
 	<!-- svelte-ignore a11y-click-events-have-key-events -->
 	<!-- svelte-ignore a11y-no-static-element-interactions -->
-	<span
-		class="border border-blue-600 rounded px-1 cursor-pointer hover:bg-gray-200"
-		class:hidden={!fullyCollapsed}
-		on:click={collapse}
-	>
-		{openBracket}{collapsedSymbol}{closeBracket}
-	</span>
+
 	{#if fullyCollapsed}
-		<span class="text-tertiary text-xs">
-			{pluralize(Object.keys(json).length, Array.isArray(json) ? 'item' : 'key')}
-		</span>
+		<div class="inline-flex relative">
+			<Button
+				color="light"
+				size="xs2"
+				variant="border"
+				on:click={collapse}
+				wrapperClasses="inline-flex w-fit h-4"
+				btnClasses="font-normal  rounded-[0.275rem] h-4 p-1"
+			>
+				{openBracket}{collapsedSymbol}{closeBracket}
+			</Button>
+		</div>
 	{/if}
 {:else if topBrackets}
 	<span class="text-primary">{openBracket}{closeBracket}</span>
 {:else if json == undefined}
 	<span class="text-tertiary text-2xs ml-2">undefined</span>
 {:else}
-	<span class="text-tertiary text-2xs ml-2">No items ([])</span>
+	<span class="text-tertiary text-2xs ml-2">No items</span>
 {/if}
 
 <style lang="postcss">
diff --git a/frontend/src/lib/components/propertyPicker/PropPicker.svelte b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
index 60bcb0fdea..a4c3d2fe28 100644
--- a/frontend/src/lib/components/propertyPicker/PropPicker.svelte
+++ b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
@@ -2,9 +2,8 @@
 	import { ResourceService, VariableService } from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
 	import { getContext } from 'svelte'
-	import { Badge, Button } from '../common'
+	import { Button } from '../common'
 	import type { PropPickerWrapperContext } from '../flows/propPicker/PropPickerWrapper.svelte'
-	import { createEventDispatcher } from 'svelte'
 
 	import ObjectViewer from './ObjectViewer.svelte'
 	import { keepByKey } from './utils'
@@ -15,33 +14,45 @@
 	export let displayContext = true
 	export let notSelectable: boolean
 	export let error: boolean = false
+	export let allowCopy = false
 
 	$: previousId = pickableProperties?.previousId
 	let variables: Record<string, string> = {}
 	let resources: Record<string, any> = {}
 	let displayVariable = false
 	let displayResources = false
-
-	const dispatch = createEventDispatcher()
+	let allResultsCollapsed = true
 
 	const EMPTY_STRING = ''
 	let search = ''
 
 	const { propPickerConfig } = getContext<PropPickerWrapperContext>('PropPickerWrapper')
 
-	$: flowInputsFiltered =
-		search === EMPTY_STRING
-			? pickableProperties.flow_input
-			: keepByKey(pickableProperties.flow_input, search)
+	let flowInputsFiltered = pickableProperties.flow_input
+	let resultByIdFiltered = pickableProperties.priorIds
 
-	$: resultByIdFiltered =
-		search === EMPTY_STRING
-			? pickableProperties.priorIds
-			: keepByKey(pickableProperties.priorIds, search)
+	let timeout: NodeJS.Timeout
+	function onSearch(search: string) {
+		clearTimeout(timeout)
+		setTimeout(() => {
+			flowInputsFiltered =
+				search === EMPTY_STRING
+					? pickableProperties.flow_input
+					: keepByKey(pickableProperties.flow_input, search)
+
+			resultByIdFiltered =
+				search === EMPTY_STRING
+					? pickableProperties.priorIds
+					: keepByKey(pickableProperties.priorIds, search)
+
+			console.log(resultByIdFiltered, search)
+		}, 50)
+	}
 
 	$: suggestedPropsFiltered = $propPickerConfig
 		? keepByKey(pickableProperties.priorIds, $propPickerConfig.propName)
 		: undefined
+	$: search != undefined && onSearch(search)
 
 	async function loadVariables() {
 		variables = Object.fromEntries(
@@ -64,50 +75,29 @@
 	}
 </script>
 
-<div class="flex flex-col h-full">
-	<div class="px-2">
-		{#if !notSelectable}
-			<div class="flex flex-row space-x-1">
-				{#if $propPickerConfig}
-					<Badge large color="blue">
-						{`Selected: ${$propPickerConfig?.propName}`}
-					</Badge>
-					<Badge large color="blue">
-						{`Mode: ${$propPickerConfig?.insertionMode}`}
-					</Badge>
-				{:else}
-					<Badge large color="blue">&leftarrow; Edit or connect an input</Badge>
-				{/if}
-			</div>
-		{/if}
-		<ClearableInput bind:value={search} placeholder="Search prop..." wrapperClass="py-2" />
+<div class="flex flex-col h-full rounded overflow-hidden">
+	<div class="px-2 py-2">
+		<ClearableInput bind:value={search} placeholder="Search prop..." />
 	</div>
-	<div
-		class="overflow-y-auto px-2 pt-2 grow"
-		class:bg-surface-secondary={!$propPickerConfig && !notSelectable}
-	>
+	<div class="overflow-y-auto px-2 pt-2 grow">
 		<div class="flex justify-between items-center space-x-1">
-			<span class="font-bold text-sm">Flow Input</span>
+			<span class="font-normal text-sm text-secondary">Flow Input</span>
 			<div class="flex space-x-2 items-center" />
 		</div>
 		<div class="overflow-y-auto mb-2">
 			<ObjectViewer
-				allowCopy={false}
+				{allowCopy}
 				pureViewer={!$propPickerConfig}
 				json={flowInputsFiltered}
-				on:select={(e) => {
-					dispatch(
-						'select',
-						e.detail?.startsWith('[') ? `flow_input${e.detail}` : `flow_input.${e.detail}`
-					)
-				}}
+				prefix="flow_input"
+				on:select
 			/>
 		</div>
 		{#if error}
-			<span class="font-bold text-sm">Error</span>
+			<span class="font-normal text-sm text-secondary">Error</span>
 			<div class="overflow-y-auto mb-2">
 				<ObjectViewer
-					allowCopy={false}
+					{allowCopy}
 					pureViewer={!$propPickerConfig}
 					json={{
 						error: {
@@ -122,158 +112,178 @@
 			</div>
 			{#if Object.keys(pickableProperties.priorIds).length > 0}
 				{#if suggestedPropsFiltered && Object.keys(suggestedPropsFiltered).length > 0}
-					<span class="font-bold text-sm">Suggested Results</span>
+					<span class="font-normal text-sm text-secondary">Suggested Results</span>
 					<div class="overflow-y-auto mb-2">
 						<ObjectViewer
-							allowCopy={false}
-							topLevelNode
+							{allowCopy}
 							pureViewer={!$propPickerConfig}
 							collapsed={false}
 							json={suggestedPropsFiltered}
-							on:select={(e) => {
-								dispatch('select', `results.${e.detail}`)
-							}}
+							prefix="results"
+							on:select
 						/>
 					</div>
 				{/if}
-				<span class="font-bold text-sm">All Results</span>
+				<span class="font-normal text-sm text-secondary">All Results</span>
 				<div class="overflow-y-auto mb-2">
 					<ObjectViewer
-						allowCopy={false}
-						topLevelNode
+						{allowCopy}
 						pureViewer={!$propPickerConfig}
 						collapsed={true}
 						json={resultByIdFiltered}
-						on:select={(e) => {
-							dispatch('select', `results.${e.detail}`)
-						}}
+						prefix="results"
+						on:select
 					/>
 				</div>
 			{/if}
 		{:else}
 			{#if previousId}
-				<span class="font-bold text-sm">Previous Result</span>
+				<span class="font-normal text-sm text-secondary">Previous Result</span>
 				<div class="overflow-y-auto mb-2">
 					<ObjectViewer
-						allowCopy={false}
-						topLevelNode
+						{allowCopy}
 						pureViewer={!$propPickerConfig}
 						json={Object.fromEntries(
 							Object.entries(resultByIdFiltered).filter(([k, v]) => k == previousId)
 						)}
-						on:select={(e) => {
-							dispatch('select', `results.${e.detail}`)
-						}}
+						prefix="results"
+						on:select
 					/>
 				</div>
 			{/if}
 			{#if pickableProperties.hasResume}
-				<span class="font-bold text-sm">Resume payloads</span>
+				<span class="font-normal text-sm text-secondary">Resume payloads</span>
 				<div class="overflow-y-auto mb-2">
 					<ObjectViewer
-						allowCopy={false}
-						topLevelNode
+						{allowCopy}
 						pureViewer={!$propPickerConfig}
 						json={{
 							resume: 'The resume payload',
 							resumes: 'All resume payloads from all approvers',
 							approvers: 'The list of approvers'
 						}}
-						on:select={(e) => {
-							dispatch('select', `${e.detail}`)
-						}}
+						on:select
 					/>
 				</div>
 			{/if}
 			{#if Object.keys(pickableProperties.priorIds).length > 0}
 				{#if suggestedPropsFiltered && Object.keys(suggestedPropsFiltered).length > 0}
-					<span class="font-bold text-sm">Suggested Results</span>
+					<span class="font-normal text-sm text-secondary">Suggested Results</span>
 					<div class="overflow-y-auto mb-2">
 						<ObjectViewer
-							allowCopy={false}
-							topLevelNode
+							{allowCopy}
 							pureViewer={!$propPickerConfig}
 							collapsed={false}
 							json={suggestedPropsFiltered}
-							on:select={(e) => {
-								dispatch('select', `results.${e.detail}`)
-							}}
+							prefix="results"
+							on:select
 						/>
 					</div>
 				{/if}
-				<span class="font-bold text-sm">All Results</span>
 				<div class="overflow-y-auto mb-2">
+					<span class="font-normal text-sm text-secondary">All Results</span>
+					{#if !allResultsCollapsed}
+						<Button
+							color="light"
+							size="xs2"
+							variant="contained"
+							on:click={() => {
+								allResultsCollapsed = true
+							}}
+							wrapperClasses="inline-flex w-fit h-4"
+							btnClasses="font-normal text-primary rounded-[0.275rem]">-</Button
+						>
+					{/if}
+
 					<ObjectViewer
-						allowCopy={false}
-						topLevelNode
+						{allowCopy}
 						pureViewer={!$propPickerConfig}
-						collapsed={true}
+						bind:collapsed={allResultsCollapsed}
 						json={resultByIdFiltered}
-						on:select={(e) => {
-							dispatch('select', `results.${e.detail}`)
-						}}
+						prefix="results"
+						on:select
 					/>
 				</div>
 			{/if}
 		{/if}
 
 		{#if displayContext}
-			<span class="font-bold text-sm">Variables </span>
 			<div class="overflow-y-auto mb-2">
+				<span class="font-normal text-sm text-secondary">Variables:</span>
+
 				{#if displayVariable}
-					<div class="flex">
-						<Button
-							color="light"
-							size="xs"
-							variant="border"
-							on:click={() => {
-								displayVariable = false
-							}}>-</Button
-						>
-					</div>
+					<Button
+						color="light"
+						size="xs2"
+						variant="border"
+						on:click={() => {
+							displayVariable = false
+						}}
+						wrapperClasses="inline-flex w-fit h-4"
+						btnClasses="font-normal text-primary rounded-[0.275rem]">-</Button
+					>
+
 					<ObjectViewer
-						allowCopy={false}
+						{allowCopy}
 						pureViewer={!$propPickerConfig}
 						rawKey={true}
 						json={variables}
-						on:select={(e) => dispatch('select', `variable('${e.detail}')`)}
+						prefix="variable"
+						on:select
 					/>
 				{:else}
-					<button
-						class="border border-blue-600 key font-normal rounded hover:bg-blue-100 px-1"
+					<Button
+						color="light"
+						size="xs2"
+						variant="border"
 						on:click={async () => {
 							await loadVariables()
 							displayVariable = true
-						}}>{'{...}'}</button
+						}}
+						wrapperClasses="inline-flex w-fit h-4"
+						btnClasses="font-normal rounded-[0.275rem] p-1"
 					>
+						{'{...}'}
+					</Button>
 				{/if}
 			</div>
-			<span class="font-bold text-sm">Resources</span>
+
 			<div class="overflow-y-auto mb-2">
+				<span class="font-normal text-sm text-secondary">Resources:</span>
+
 				{#if displayResources}
 					<Button
 						color="light"
+						size="xs2"
 						variant="border"
-						size="xs"
 						on:click={() => {
 							displayResources = false
-						}}>-</Button
+						}}
+						wrapperClasses="inline-flex w-fit h-4"
+						btnClasses="font-normal text-primary rounded-[0.275rem]">-</Button
 					>
 					<ObjectViewer
-						allowCopy={false}
+						{allowCopy}
 						pureViewer={!$propPickerConfig}
 						rawKey={true}
 						json={resources}
-						on:select={(e) => dispatch('select', `resource('${e.detail}')`)}
+						prefix="resource"
+						on:select
 					/>
 				{:else}
-					<button
-						class="border border-blue-600 px-1 key font-normal rounded hover:bg-blue-100"
+					<Button
+						color="light"
+						size="xs2"
+						variant="border"
 						on:click={async () => {
 							await loadResources()
 							displayResources = true
-						}}>{'{...}'}</button
+						}}
+						wrapperClasses="inline-flex w-fit h-4"
+						btnClasses="font-normal rounded-[0.275rem] p-1"
 					>
+						{'{...}'}
+					</Button>
 				{/if}
 			</div>
 		{/if}
diff --git a/frontend/src/lib/components/propertyPicker/PropPickerResult.svelte b/frontend/src/lib/components/propertyPicker/PropPickerResult.svelte
index adf9d76aec..cbb2f9c33c 100644
--- a/frontend/src/lib/components/propertyPicker/PropPickerResult.svelte
+++ b/frontend/src/lib/components/propertyPicker/PropPickerResult.svelte
@@ -1,31 +1,21 @@
 <script lang="ts">
-	import { createEventDispatcher } from 'svelte'
 	import ObjectViewer from './ObjectViewer.svelte'
 
+	export let allowCopy = false
 	export let result: any
 	export let extraResults: any = undefined
 	export let flow_input: any = undefined
-
-	const dispatch = createEventDispatcher()
 </script>
 
 <div class="w-full px-2">
-	<span class="font-bold text-sm">Result</span>
+	<span class="font-normal text-sm text-secondary">Result</span>
 	<div class="overflow-y-auto mb-2 w-full">
-		<ObjectViewer
-			allowCopy={false}
-			json={{ result, ...(extraResults ? extraResults : {}) }}
-			on:select
-		/>
+		<ObjectViewer {allowCopy} json={{ result, ...(extraResults ? extraResults : {}) }} on:select />
 	</div>
 	{#if flow_input}
-		<span class="font-bold text-sm">Flow Input</span>
+		<span class="font-normal text-sm text-secondary">Flow Input</span>
 		<div class="overflow-y-auto w-full">
-			<ObjectViewer
-				allowCopy={false}
-				json={flow_input}
-				on:select={(e) => dispatch('select', `flow_input.${e.detail}`)}
-			/>
+			<ObjectViewer {allowCopy} json={flow_input} prefix="flow_input" on:select />
 		</div>
 	{/if}
 </div>
diff --git a/frontend/src/lib/components/propertyPicker/utils.ts b/frontend/src/lib/components/propertyPicker/utils.ts
index 129bfdf671..27515b4190 100644
--- a/frontend/src/lib/components/propertyPicker/utils.ts
+++ b/frontend/src/lib/components/propertyPicker/utils.ts
@@ -1,44 +1,35 @@
-function filterByKey(obj: Object, key: string): Object {
-	if (Object(obj) !== obj) {
-		return obj
+function filterByKey(obj: Object, key: string): any {
+	if (typeof obj !== 'object' || obj === null) {
+		return undefined
 	} else if (Array.isArray(obj)) {
-		return obj.map((o) => filterByKey(o, key))
-	} else {
-		return Object.fromEntries(
-			Object.entries(obj)
-				.filter(([k, v]) => !k.includes(key))
-				.map(([k, v]) => [k, filterByKey(v, key)])
-		)
-	}
-}
-
-function diff(target: Object, source: Object): Object {
-	if (Array.isArray(target)) {
-		return target
-	}
-
-	const result = {}
-
-	Object.keys(target ?? {}).forEach((key: string) => {
-		if (typeof source[key] === 'object') {
-			const difference = diff(target[key], source[key])
-
-			if (Object.keys(difference).length > 0) {
-				result[key] = difference
-			}
-		} else if (source[key] !== target[key]) {
-			result[key] = target[key]
+		let a = obj
+			.map((k, o) =>
+				typeof o == 'object' ? filterByKey(o, key) : String(k - 1).includes(key) ? o : undefined
+			)
+			.filter((v) => v !== undefined)
+		if (a.length === 0) {
+			return undefined
+		} else {
+			return a
 		}
-	})
-
-	return result
+	} else {
+		let o = Object.fromEntries(
+			Object.entries(obj)
+				.map(([k, v]) => (k.includes(key) ? [k, v] : [k, filterByKey(v, key)]))
+				.filter(([k, v]) => v !== undefined)
+		)
+		if (Object.keys(o).length === 0) {
+			return undefined
+		}
+		return o
+	}
 }
 
 export function keepByKey(json: Object | undefined, key: string): Object {
 	if (!json) {
 		return {}
 	}
-	return diff(json, filterByKey(json, key))
+	return filterByKey(json, key) ?? {}
 }
 
 // https://stackoverflow.com/questions/23377217/way-to-test-if-a-string-is-valid-identifier-name-in-javascript

From 0c91646572cd90b738242ee96e649a0e5949ae90 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 6 Nov 2024 00:00:04 +0100
Subject: [PATCH 20/80] improve object viewer value copying behavior

---
 .../propertyPicker/ObjectViewer.svelte           | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
index 7d288f9e92..aaea69e58a 100644
--- a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
+++ b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
@@ -57,10 +57,14 @@
 		return prefix + separator + keyToSelect
 	}
 
-	function selectProp(key: string, value: any | undefined = undefined) {
+	function selectProp(key: string, value: any | undefined, clickedValue: boolean) {
 		const fullKey = computeFullKey(key, rawKey)
-		if (pureViewer && allowCopy) {
-			copyToClipboard(fullKey)
+		if (allowCopy) {
+			if (pureViewer && clickedValue) {
+				copyToClipboard(typeof value == 'string' ? value : JSON.stringify(value))
+			} else {
+				copyToClipboard(fullKey)
+			}
 		}
 		dispatch('select', fullKey)
 	}
@@ -94,7 +98,7 @@
 					<li>
 						<div class="inline-flex items-baseline">
 							<Button
-								on:click={() => selectProp(key)}
+								on:click={() => selectProp(key, undefined, false)}
 								size="xs2"
 								color="light"
 								variant="border"
@@ -123,9 +127,9 @@
 									? 'cursor-auto'
 									: ''} rounded px-1 {getTypeAsString(json[key])}"
 								on:click={() => {
-									selectProp(key, json[key])
+									selectProp(key, json[key], true)
 								}}
-								title={computeFullKey(key, rawKey)}
+								title={JSON.stringify(json[key])}
 								disabled={false}
 							>
 								{#if json[key] === NEVER_TESTED_THIS_FAR}

From 789b4f6442b356751e4176f9226adbb9e20898ee Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 6 Nov 2024 00:38:37 +0100
Subject: [PATCH 21/80] bump deno to 2.0.4 and bun to 1.1.34

---
 Dockerfile              | 4 ++--
 docker/DockerfileSlim   | 2 +-
 docker/DockerfileSlimEe | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8683aa9738..cff245d3e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -175,9 +175,9 @@ RUN /usr/local/bin/python3 -m pip install pip-tools
 COPY --from=builder /frontend/build /static_frontend
 COPY --from=builder /windmill/target/release/windmill ${APP}/windmill
 
-COPY --from=denoland/deno:2.0.2 --chmod=755 /usr/bin/deno /usr/bin/deno
+COPY --from=denoland/deno:2.0.4 --chmod=755 /usr/bin/deno /usr/bin/deno
 
-COPY --from=oven/bun:1.1.32 /usr/local/bin/bun /usr/bin/bun
+COPY --from=oven/bun:1.1.34 /usr/local/bin/bun /usr/bin/bun
 
 COPY --from=php:8.3.7-cli /usr/local/bin/php /usr/bin/php
 COPY --from=composer:2.7.6 /usr/bin/composer /usr/bin/composer
diff --git a/docker/DockerfileSlim b/docker/DockerfileSlim
index 16c2361a0d..a1b5daca43 100644
--- a/docker/DockerfileSlim
+++ b/docker/DockerfileSlim
@@ -20,7 +20,7 @@ RUN /usr/local/bin/python3 -m pip install pip-tools
 # Install UV
 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
 
-COPY --from=oven/bun:1.1.32 /usr/local/bin/bun /usr/bin/bun
+COPY --from=oven/bun:1.1.34 /usr/local/bin/bun /usr/bin/bun
 
 # add the docker client to call docker from a worker if enabled
 COPY --from=docker:dind /usr/local/bin/docker /usr/local/bin/
diff --git a/docker/DockerfileSlimEe b/docker/DockerfileSlimEe
index 65c6b55a19..94cc160cae 100644
--- a/docker/DockerfileSlimEe
+++ b/docker/DockerfileSlimEe
@@ -19,7 +19,7 @@ RUN /usr/local/bin/python3 -m pip install pip-tools
 # Install UV
 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
 
-COPY --from=oven/bun:1.1.32 /usr/local/bin/bun /usr/bin/bun
+COPY --from=oven/bun:1.1.34 /usr/local/bin/bun /usr/bin/bun
 
 # add the docker client to call docker from a worker if enabled
 COPY --from=docker:dind /usr/local/bin/docker /usr/local/bin/

From 65f67ab160e8891b86bffb5a1ed199b91de2a295 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 6 Nov 2024 01:22:05 +0100
Subject: [PATCH 22/80] small nit on user resource input

---
 frontend/src/lib/components/LightweightResourcePicker.svelte | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/lib/components/LightweightResourcePicker.svelte b/frontend/src/lib/components/LightweightResourcePicker.svelte
index 21954ac1ca..65db78cbe4 100644
--- a/frontend/src/lib/components/LightweightResourcePicker.svelte
+++ b/frontend/src/lib/components/LightweightResourcePicker.svelte
@@ -202,6 +202,7 @@
 								path: valueSelect.label
 							})
 							await loadResources(resourceType)
+							value = undefined
 							valueSelect = undefined
 						}
 					}}
@@ -216,6 +217,7 @@
 					btnClasses="w-8 px-0.5 py-1.5"
 					size="sm"
 					on:click={() => {
+						refreshCount += 1
 						open = true
 						drawer?.openDrawer?.()
 					}}

From 36d56e6f383a9db1004be06d2cb1a97e6746985b Mon Sep 17 00:00:00 2001
From: Guilhem <guilhemlemouel@gmail.com>
Date: Wed, 6 Nov 2024 15:35:21 +0100
Subject: [PATCH 23/80]  improve object viewer alignment #4654

* cleaning ui

* fix array alignment
---
 .../flows/propPicker/PropPickerWrapper.svelte |  1 -
 .../propertyPicker/ObjectViewer.svelte        | 10 ++++----
 .../propertyPicker/PropPicker.svelte          | 23 +++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte b/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte
index cbf9e058e5..c180463f36 100644
--- a/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte
+++ b/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte
@@ -101,7 +101,6 @@
 						{displayContext}
 						{error}
 						{pickableProperties}
-						{notSelectable}
 						allowCopy={!notSelectable && !$propPickerConfig}
 						on:select={({ detail }) => {
 							dispatch('select', detail)
diff --git a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
index aaea69e58a..034689bdec 100644
--- a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
+++ b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
@@ -83,13 +83,15 @@
 			{#if level != 0 && keys.length > 1}
 				<!-- svelte-ignore a11y-click-events-have-key-events -->
 				<!-- svelte-ignore a11y-no-static-element-interactions -->
+
 				<Button
 					color="light"
 					size="xs2"
 					variant="border"
 					on:click={collapse}
-					wrapperClasses="inline-flex w-fit h-4"
-					btnClasses="font-semibold text-primary rounded-[0.275rem]">-</Button
+					wrapperClasses="inline-flex w-fit"
+					btnClasses="font-mono h-4 text-2xs px-1 font-thin text-primary rounded-[0.275rem]"
+					>-</Button
 				>
 			{/if}
 			{#if level == 0 && topBrackets}<span class="h-0">{openBracket}</span>{/if}
@@ -194,8 +196,8 @@
 				size="xs2"
 				variant="border"
 				on:click={collapse}
-				wrapperClasses="inline-flex w-fit h-4"
-				btnClasses="font-normal  rounded-[0.275rem] h-4 p-1"
+				wrapperClasses="inline-flex w-fit"
+				btnClasses="font-normal h-4 text-2xs px-1 text-primary rounded-[0.275rem]"
 			>
 				{openBracket}{collapsedSymbol}{closeBracket}
 			</Button>
diff --git a/frontend/src/lib/components/propertyPicker/PropPicker.svelte b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
index a4c3d2fe28..0e27cab996 100644
--- a/frontend/src/lib/components/propertyPicker/PropPicker.svelte
+++ b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
@@ -12,7 +12,6 @@
 
 	export let pickableProperties: PickableProperties
 	export let displayContext = true
-	export let notSelectable: boolean
 	export let error: boolean = false
 	export let allowCopy = false
 
@@ -186,12 +185,12 @@
 						<Button
 							color="light"
 							size="xs2"
-							variant="contained"
+							variant="border"
 							on:click={() => {
 								allResultsCollapsed = true
 							}}
-							wrapperClasses="inline-flex w-fit h-4"
-							btnClasses="font-normal text-primary rounded-[0.275rem]">-</Button
+							wrapperClasses="inline-flex whitespace-nowrap w-fit"
+							btnClasses="font-mono h-4 text-2xs font-thin px-1 rounded-[0.275rem]">-</Button
 						>
 					{/if}
 
@@ -219,8 +218,8 @@
 						on:click={() => {
 							displayVariable = false
 						}}
-						wrapperClasses="inline-flex w-fit h-4"
-						btnClasses="font-normal text-primary rounded-[0.275rem]">-</Button
+						wrapperClasses="inline-flex whitespace-nowrap w-fit"
+						btnClasses="font-mono h-4 text-2xs font-thin px-1 rounded-[0.275rem]">-</Button
 					>
 
 					<ObjectViewer
@@ -240,8 +239,8 @@
 							await loadVariables()
 							displayVariable = true
 						}}
-						wrapperClasses="inline-flex w-fit h-4"
-						btnClasses="font-normal rounded-[0.275rem] p-1"
+						wrapperClasses="inline-flex w-fit"
+						btnClasses="font-normal text-2xs rounded-[0.275rem] h-4 px-1"
 					>
 						{'{...}'}
 					</Button>
@@ -259,8 +258,8 @@
 						on:click={() => {
 							displayResources = false
 						}}
-						wrapperClasses="inline-flex w-fit h-4"
-						btnClasses="font-normal text-primary rounded-[0.275rem]">-</Button
+						wrapperClasses="inline-flex whitespace-nowrap w-fit"
+						btnClasses="font-mono h-4 text-2xs font-thin px-1 rounded-[0.275rem]">-</Button
 					>
 					<ObjectViewer
 						{allowCopy}
@@ -279,8 +278,8 @@
 							await loadResources()
 							displayResources = true
 						}}
-						wrapperClasses="inline-flex w-fit h-4"
-						btnClasses="font-normal rounded-[0.275rem] p-1"
+						wrapperClasses="inline-flex whitespace-nowrap w-fit"
+						btnClasses="font-normal text-2xs rounded-[0.275rem] h-4 px-1"
 					>
 						{'{...}'}
 					</Button>

From 7578cebaf92e729a26fd665e4b6f8357d34f59eb Mon Sep 17 00:00:00 2001
From: HugoCasa <hugo@casademont.ch>
Date: Wed, 6 Nov 2024 16:26:23 +0100
Subject: [PATCH 24/80] fix: display logs in native mode when script fails
 (#4655)

* fix: display logs in native mode when script fails

* oups

* oups
---
 backend/windmill-worker/src/bun_executor.rs | 11 ++----
 backend/windmill-worker/src/js_eval.rs      | 39 ++++++++++++---------
 backend/windmill-worker/src/worker.rs       | 11 +++---
 3 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/backend/windmill-worker/src/bun_executor.rs b/backend/windmill-worker/src/bun_executor.rs
index 5b7c2a06c0..a7d92874e1 100644
--- a/backend/windmill-worker/src/bun_executor.rs
+++ b/backend/windmill-worker/src/bun_executor.rs
@@ -1304,6 +1304,8 @@ try {{
                 job.args.as_ref()
             };
 
+            append_logs(&job.id, &job.workspace_id, format!("{init_logs}\n"), db).await;
+
             let result = crate::js_eval::eval_fetch_timeout(
                 env_code,
                 inner_content.clone(),
@@ -1324,14 +1326,7 @@ try {{
                 "Executed native code in {}ms",
                 started_at.elapsed().as_millis()
             );
-            append_logs(
-                &job.id,
-                &job.workspace_id,
-                format!("{}\n{}", init_logs, result.1),
-                db,
-            )
-            .await;
-            return Ok(result.0);
+            return Ok(result);
         }
     }
     append_logs(&job.id, &job.workspace_id, init_logs, db).await;
diff --git a/backend/windmill-worker/src/js_eval.rs b/backend/windmill-worker/src/js_eval.rs
index da4eda39ef..48fb688b34 100644
--- a/backend/windmill-worker/src/js_eval.rs
+++ b/backend/windmill-worker/src/js_eval.rs
@@ -774,7 +774,9 @@ pub async fn eval_fetch_timeout(
     w_id: &str,
     load_client: bool,
     occupation_metrics: &mut OccupancyMetrics,
-) -> anyhow::Result<(Box<RawValue>, String)> {
+) -> anyhow::Result<Box<RawValue>> {
+    use windmill_queue::append_logs;
+
     let (sender, mut receiver) = oneshot::channel::<IsolateHandle>();
 
     let parsed_args = windmill_parser_ts::parse_deno_signature(&ts_expr, true, None)?.args;
@@ -805,6 +807,8 @@ pub async fn eval_fetch_timeout(
         ));
     }
 
+    let db_ = db.clone();
+    let w_id_ = w_id.to_string();
     let result_f = tokio::task::spawn_blocking(move || {
         let ops = vec![op_get_static_args(), op_log()];
         let ext = Extension { name: "windmill", ops: ops.into(), ..Default::default() };
@@ -892,28 +896,31 @@ pub async fn eval_fetch_timeout(
             .build()?;
 
         let future = async {
-            tokio::select! {
+            let r = tokio::select! {
                 r = eval_fetch(&mut js_runtime, &js_expr, Some(env_code), load_client) => Ok(r),
                 _ = memory_limit_rx.recv() => Err(Error::ExecutionErr("Memory limit reached, killing isolate".to_string()))
-            }
+            };
+
+            append_logs(
+                &job_id,
+                w_id_.as_str(),
+                format!(
+                    "{extra_logs}{}",
+                    js_runtime.op_state().borrow().borrow::<LogString>().s
+                ),
+                db_,
+            )
+            .await;
+
+            r
         };
         let r = runtime.block_on(future)?;
         // tracing::info!("total: {:?}", instant.elapsed());
 
-        (r as anyhow::Result<Box<RawValue>>).map(|x| {
-            (
-                x,
-                js_runtime
-                    .op_state()
-                    .borrow()
-                    .borrow::<LogString>()
-                    .s
-                    .clone(),
-            )
-        })
+        r
     });
 
-    let (res, logs) = run_future_with_polling_update_job_poller(
+    let res = run_future_with_polling_update_job_poller(
         job_id,
         job_timeout,
         db,
@@ -932,7 +939,7 @@ pub async fn eval_fetch_timeout(
         e
     })?;
     *mem_peak = (res.get().len() / 1000) as i32;
-    Ok((res, format!("{extra_logs}{logs}")))
+    Ok(res)
 }
 
 #[cfg(feature = "deno_core")]
diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index f4d78bf0ef..1b7dcfa970 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -1703,7 +1703,7 @@ async fn do_nativets(
     canceled_by: &mut Option<CanceledBy>,
     worker_name: &str,
     occupancy_metrics: &mut OccupancyMetrics,
-) -> windmill_common::error::Result<(Box<RawValue>, String)> {
+) -> windmill_common::error::Result<Box<RawValue>> {
     let args = build_args_map(job, client, db).await?.map(Json);
     let job_args = if args.is_some() {
         args.as_ref()
@@ -1711,7 +1711,7 @@ async fn do_nativets(
         job.args.as_ref()
     };
 
-    let result = eval_fetch_timeout(
+    Ok(eval_fetch_timeout(
         env_code,
         code.clone(),
         transpile_ts(code)?,
@@ -1726,8 +1726,7 @@ async fn do_nativets(
         true,
         occupancy_metrics,
     )
-    .await?;
-    Ok((result.0, result.1))
+    .await?)
 }
 
 #[derive(Deserialize, Serialize, Default)]
@@ -2356,7 +2355,8 @@ async fn handle_code_execution_job(
                 .map(|(k, v)| format!("const {} = '{}';\nprocess.env['{}'] = '{}';\n", k, v, k, v))
                 .collect::<Vec<String>>()
                 .join("\n"));
-        let (result, ts_logs) = do_nativets(
+
+        let result = do_nativets(
             job,
             &client,
             env_code,
@@ -2368,7 +2368,6 @@ async fn handle_code_execution_job(
             occupancy_metrics,
         )
         .await?;
-        append_logs(&job.id, &job.workspace_id, ts_logs, db).await;
         return Ok(result);
     }
 

From 7c0d9901e09c5519b2d9805b01ea832c03227653 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 6 Nov 2024 16:34:09 +0100
Subject: [PATCH 25/80] fix main

---
 backend/windmill-worker/src/js_eval.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/windmill-worker/src/js_eval.rs b/backend/windmill-worker/src/js_eval.rs
index 48fb688b34..45ee1cefd2 100644
--- a/backend/windmill-worker/src/js_eval.rs
+++ b/backend/windmill-worker/src/js_eval.rs
@@ -754,9 +754,9 @@ pub async fn eval_fetch_timeout(
     _w_id: &str,
     _load_client: bool,
     _occupation_metrics: &mut OccupancyMetrics,
-) -> anyhow::Result<(Box<RawValue>, String)> {
+) -> anyhow::Result<Box<RawValue>> {
     use serde_json::value::to_raw_value;
-    Ok((to_raw_value("require deno_core").unwrap(), "".to_string()))
+    Ok(to_raw_value("require deno_core").unwrap())
 }
 
 #[cfg(feature = "deno_core")]

From ad50d2fd69f97e20365c4da25ee8eba6fd6bc6cd Mon Sep 17 00:00:00 2001
From: HugoCasa <hugo@casademont.ch>
Date: Wed, 6 Nov 2024 16:58:24 +0100
Subject: [PATCH 26/80] allow no tls for instance settings smtp (#4656)

* allow no tls for instance settings smtp

* update ee ref
---
 backend/ee-repo-ref.txt                         |  2 +-
 backend/windmill-api/openapi.yaml               |  3 +++
 backend/windmill-common/src/server.rs           |  7 +++++++
 .../src/lib/components/InstanceSettings.svelte  | 17 ++++++++++++++++-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index 2104f8ba8c..9923d56e66 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-01f384348341c87c5a0b32c4be7c699975ee7d6d
\ No newline at end of file
+aedaf655693cb9bab59fcf79a48c60aad6822668
\ No newline at end of file
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 2c5a8cec85..3b0d784bd7 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -724,6 +724,8 @@ paths:
                       type: string
                     tls_implicit:
                       type: boolean
+                    disable_tls:
+                      type: boolean
                   required:
                     - host
                     - username
@@ -731,6 +733,7 @@ paths:
                     - port
                     - from
                     - tls_implicit
+                    - disable_tls
               required:
                 - to
                 - smtp
diff --git a/backend/windmill-common/src/server.rs b/backend/windmill-common/src/server.rs
index 9fb39ad18b..b0c768a86f 100644
--- a/backend/windmill-common/src/server.rs
+++ b/backend/windmill-common/src/server.rs
@@ -10,6 +10,7 @@ pub struct Smtp {
     pub port: u16,
     pub from: String,
     pub tls_implicit: Option<bool>,
+    pub disable_tls: Option<bool>,
 }
 
 #[derive(Serialize, Deserialize, PartialEq)]
@@ -20,6 +21,7 @@ pub struct SmtpConfigOpt {
     pub smtp_port: Option<u16>,
     pub smtp_from: Option<String>,
     pub smtp_tls_implicit: Option<bool>,
+    pub smtp_disable_tls: Option<bool>,
 }
 
 pub async fn load_smtp_config(db: &DB) -> error::Result<Option<Smtp>> {
@@ -39,6 +41,7 @@ pub async fn load_smtp_config(db: &DB) -> error::Result<Option<Smtp>> {
             username,
             password,
             tls_implicit: config.smtp_tls_implicit,
+            disable_tls: config.smtp_disable_tls,
             port: config.smtp_port.unwrap_or(587),
             from: config
                 .smtp_from
@@ -60,6 +63,9 @@ pub async fn load_smtp_config(db: &DB) -> error::Result<Option<Smtp>> {
                 tls_implicit: std::env::var("SMTP_TLS_IMPLICIT")
                     .ok()
                     .and_then(|p| p.parse().ok()),
+                disable_tls: std::env::var("SMTP_DISABLE_TLS")
+                    .ok()
+                    .and_then(|p| p.parse().ok()),
                 port: std::env::var("SMTP_PORT")
                     .ok()
                     .and_then(|p| p.parse().ok())
@@ -87,6 +93,7 @@ impl Default for SmtpConfigOpt {
             smtp_port: None,
             smtp_tls_implicit: None,
             smtp_username: None,
+            smtp_disable_tls: None,
         }
     }
 }
diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte
index 9cdd9f165f..f9b2c90151 100644
--- a/frontend/src/lib/components/InstanceSettings.svelte
+++ b/frontend/src/lib/components/InstanceSettings.svelte
@@ -1014,12 +1014,26 @@
 														</div>
 														<div>
 															<Toggle
+																disabled={values[setting.key].smtp_disable_tls}
 																id="smtp_tls_implicit"
 																bind:checked={values[setting.key].smtp_tls_implicit}
 																options={{ right: 'Implicit TLS' }}
 																label="Implicit TLS"
 															/>
 														</div>
+														<div>
+															<Toggle
+																id="smtp_disable_tls"
+																bind:checked={values[setting.key].smtp_disable_tls}
+																on:change={() => {
+																	if (values[setting.key].smtp_disable_tls) {
+																		values[setting.key].smtp_tls_implicit = false
+																	}
+																}}
+																options={{ right: 'Disable TLS' }}
+																label="Disable TLS"
+															/>
+														</div>
 													{/if}
 												</div>
 											{:else if setting.fieldType == 'object_store_config'}
@@ -1082,7 +1096,8 @@
 												password: smtp['smtp_password'],
 												port: smtp['smtp_port'],
 												from: smtp['smtp_from'],
-												tls_implicit: smtp['smtp_tls_implicit']
+												tls_implicit: smtp['smtp_tls_implicit'],
+												disable_tls: smtp['smtp_disable_tls']
 											}
 										}
 									})

From 771d740701902166f8b4e3f77aa9c5579237cb15 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 6 Nov 2024 19:18:26 +0100
Subject: [PATCH 27/80] fix: clarify error messages when job timeout or
 cancelled with more details

---
 backend/windmill-worker/src/common.rs       |  8 ++--
 backend/windmill-worker/src/handle_child.rs | 50 ++++++++++++++++-----
 2 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/backend/windmill-worker/src/common.rs b/backend/windmill-worker/src/common.rs
index e22f9be54c..80269f7777 100644
--- a/backend/windmill-worker/src/common.rs
+++ b/backend/windmill-worker/src/common.rs
@@ -562,7 +562,7 @@ pub async fn resolve_job_timeout(
     _w_id: &str,
     _job_id: Uuid,
     custom_timeout_secs: Option<i32>,
-) -> (Duration, Option<String>) {
+) -> (Duration, Option<String>, bool) {
     let mut warn_msg: Option<String> = None;
     #[cfg(feature = "cloud")]
     let cloud_premium_workspace = *CLOUD_HOSTED
@@ -587,12 +587,12 @@ pub async fn resolve_job_timeout(
         Some(timeout_secs)
             if Duration::from_secs(timeout_secs as u64) < global_max_timeout_duration =>
         {
-            (Duration::from_secs(timeout_secs as u64), warn_msg)
+            (Duration::from_secs(timeout_secs as u64), warn_msg, true)
         }
         Some(timeout_secs) => {
             warn_msg = Some(format!("WARNING: Custom job timeout of {timeout_secs} seconds was greater than the maximum timeout. It will be ignored and the max timeout will be used instead"));
             tracing::warn!(warn_msg);
-            (global_max_timeout_duration, warn_msg)
+            (global_max_timeout_duration, warn_msg, false)
         }
         None => {
             // fallback to default timeout or max if not set
@@ -610,7 +610,7 @@ pub async fn resolve_job_timeout(
                     global_max_timeout_duration
                 }
             };
-            (default_timeout, warn_msg)
+            (default_timeout, warn_msg, false)
         }
     }
 }
diff --git a/backend/windmill-worker/src/handle_child.rs b/backend/windmill-worker/src/handle_child.rs
index 6e7520daf8..6846e9dfee 100644
--- a/backend/windmill-worker/src/handle_child.rs
+++ b/backend/windmill-worker/src/handle_child.rs
@@ -143,15 +143,40 @@ pub async fn handle_child(
         occupancy_metrics,
     );
 
-    #[derive(PartialEq, Debug)]
     enum KillReason {
         TooManyLogs,
-        Timeout,
-        Cancelled,
+        Timeout { is_job_specific: bool },
+        Cancelled(Option<CanceledBy>),
         AlreadyCompleted,
     }
 
-    let (timeout_duration, timeout_warn_msg) =
+    impl std::fmt::Debug for KillReason {
+        fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+            match self {
+                KillReason::TooManyLogs => f.write_str("too many logs (max size: 2MB)"),
+                KillReason::Timeout { is_job_specific } => f.write_str(if *is_job_specific {
+                    "timeout after exceeding job-specific duration limit"
+                } else {
+                    "timeout after exceeding instance-wide job duration limit"
+                }),
+                KillReason::Cancelled(canceled_by) => {
+                    let mut reason = "cancelled".to_string();
+                    if let Some(canceled_by) = canceled_by {
+                        if let Some(by) = canceled_by.username.as_ref() {
+                            reason.push_str(&format!(" by {}", by));
+                        }
+                        if let Some(rsn) = canceled_by.reason.as_ref() {
+                            reason.push_str(&format!(" (reason: {})", rsn));
+                        }
+                    }
+                    f.write_str(&reason)
+                }
+                KillReason::AlreadyCompleted => f.write_str("already completed"),
+            }
+        }
+    }
+
+    let (timeout_duration, timeout_warn_msg, is_job_specific) =
         resolve_job_timeout(&db, w_id, job_id, custom_timeout).await;
     if let Some(msg) = timeout_warn_msg {
         append_logs(&job_id, w_id, msg.as_str(), db).await;
@@ -165,9 +190,9 @@ pub async fn handle_child(
             biased;
             result = child.wait() => return result.map(Ok),
             Ok(()) = too_many_logs.changed() => KillReason::TooManyLogs,
-            _ = sleep(timeout_duration) => KillReason::Timeout,
+            _ = sleep(timeout_duration) => KillReason::Timeout { is_job_specific },
             ex = update_job, if job_id != Uuid::nil() => match ex {
-                UpdateJobPollingExit::Done => KillReason::Cancelled,
+                UpdateJobPollingExit::Done(canceled_by) => KillReason::Cancelled(canceled_by),
                 UpdateJobPollingExit::AlreadyCompleted => KillReason::AlreadyCompleted,
             },
         };
@@ -175,7 +200,7 @@ pub async fn handle_child(
         drop(tx);
 
         let set_reason = async {
-            if kill_reason == KillReason::Timeout {
+            if matches!(kill_reason, KillReason::Timeout { .. }) {
                 if let Err(err) = sqlx::query(
                     r#"
                        UPDATE queue
@@ -402,7 +427,7 @@ pub async fn handle_child(
                 Err(Error::AlreadyCompleted("Job already completed".to_string()))
             }
             _ => Err(Error::ExecutionErr(format!(
-                "job process killed because {kill_reason:#?}"
+                "job process terminated due to {kill_reason:#?}"
             ))),
         },
         Err(err) => Err(Error::ExecutionErr(format!("job process io error: {err}"))),
@@ -505,7 +530,10 @@ where
         })?,
         ex = update_job, if job_id != Uuid::nil() => {
             match ex {
-                UpdateJobPollingExit::Done => Err(Error::ExecutionErr("Job cancelled".to_string())).map_err(to_anyhow)?,
+                UpdateJobPollingExit::Done(canceled_by) => {
+                    let (by, reason) = canceled_by.as_ref().map_or(("unknown".to_string(), "unknown".to_string()), |x| (x.username.clone().unwrap_or("".to_string()), x.reason.clone().unwrap_or("".to_string())));
+                    Err(Error::ExecutionErr(format!("Job cancelled by {by} (reason: {reason})",))).map_err(to_anyhow)?
+                },
                 UpdateJobPollingExit::AlreadyCompleted => Err(Error::AlreadyCompleted("Job already completed".to_string())).map_err(to_anyhow)?,
             }
         }
@@ -515,7 +543,7 @@ where
 }
 
 pub enum UpdateJobPollingExit {
-    Done,
+    Done(Option<CanceledBy>),
     AlreadyCompleted,
 }
 
@@ -640,7 +668,7 @@ where
     }
     tracing::info!("job {job_id} finished");
 
-    UpdateJobPollingExit::Done
+    UpdateJobPollingExit::Done(canceled_by_ref.clone())
 }
 
 /// takes stdout and stderr from Child, panics if either are not present

From 0f29f0f19075c01667acadf8a7a2cadeb88c2fcf Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 6 Nov 2024 19:52:15 +0100
Subject: [PATCH 28/80] nits

---
 frontend/src/lib/components/instanceSettings.ts           | 2 +-
 .../src/lib/components/triggers/TriggersEditor.svelte     | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/lib/components/instanceSettings.ts b/frontend/src/lib/components/instanceSettings.ts
index 8e38dc3816..016b5eef78 100644
--- a/frontend/src/lib/components/instanceSettings.ts
+++ b/frontend/src/lib/components/instanceSettings.ts
@@ -274,7 +274,7 @@ export const settings: Record<string, Setting[]> = {
 			label: 'Keep job directories',
 			key: 'keep_job_dir',
 			fieldType: 'boolean',
-			description: 'Keep Job directories after execution at /tmp/windmill/<worker>/<job_id>',
+			description: 'Keep Job directories after execution at /tmp/windmill/WORKER/JOB_ID',
 			storage: 'setting'
 		},
 		{
diff --git a/frontend/src/lib/components/triggers/TriggersEditor.svelte b/frontend/src/lib/components/triggers/TriggersEditor.svelte
index 0c6b2ebe78..5e0cebef7a 100644
--- a/frontend/src/lib/components/triggers/TriggersEditor.svelte
+++ b/frontend/src/lib/components/triggers/TriggersEditor.svelte
@@ -32,9 +32,11 @@
 				<Tab value="routes" selectedClass="text-primary text-sm font-semibold">Routes</Tab>
 				<Tab value="websockets" selectedClass="text-primary text-sm font-semibold">Websockets</Tab>
 				<Tab value="emails" selectedClass="text-primary text-sm font-semibold">Email</Tab>
-				<Tab value="scheduledPoll" selectedClass="text-primary text-sm font-semibold"
-					>Scheduled Poll</Tab
-				>
+				{#if isFlow}
+					<Tab value="scheduledPoll" selectedClass="text-primary text-sm font-semibold"
+						>Scheduled Poll</Tab
+					>
+				{/if}
 
 				<svelte:fragment slot="content">
 					{#if $selectedTrigger === 'webhooks'}

From 9a8dcc9a250caefa0b7c9523e1321599b7471c8b Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 6 Nov 2024 20:24:03 +0100
Subject: [PATCH 29/80] fix(cli): improve handling of deleted items on windows

---
 cli/sync.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/cli/sync.ts b/cli/sync.ts
index 342dda3162..f0ec3dce2c 100644
--- a/cli/sync.ts
+++ b/cli/sync.ts
@@ -1398,11 +1398,12 @@ export async function push(opts: GlobalOptions & SyncOptions) {
           log.info(`Deleting ${typ} ${change.path}`);
         }
         const workspaceId = workspace.workspaceId;
+        const target = change.path.replaceAll(SEP, "/");
         switch (typ) {
           case "script": {
             const script = await wmill.getScriptByPath({
               workspace: workspaceId,
-              path: removeExtensionToPath(change.path),
+              path: removeExtensionToPath(target),
             });
             await wmill.archiveScriptByHash({
               workspace: workspaceId,
@@ -1419,37 +1420,37 @@ export async function push(opts: GlobalOptions & SyncOptions) {
           case "resource":
             await wmill.deleteResource({
               workspace: workspaceId,
-              path: removeSuffix(change.path, ".resource.json"),
+              path: removeSuffix(target, ".resource.json"),
             });
             break;
           case "resource-type":
             await wmill.deleteResourceType({
               workspace: workspaceId,
-              path: removeSuffix(change.path, ".resource-type.json"),
+              path: removeSuffix(target, ".resource-type.json"),
             });
             break;
           case "flow":
             await wmill.deleteFlowByPath({
               workspace: workspaceId,
-              path: removeSuffix(change.path, ".flow/flow.json"),
+              path: removeSuffix(target, ".flow/flow.json"),
             });
             break;
           case "app":
             await wmill.deleteApp({
               workspace: workspaceId,
-              path: removeSuffix(change.path, ".app/app.json"),
+              path: removeSuffix(target, ".app/app.json"),
             });
             break;
           case "schedule":
             await wmill.deleteSchedule({
               workspace: workspaceId,
-              path: removeSuffix(change.path, ".schedule.json"),
+              path: removeSuffix(target, ".schedule.json"),
             });
             break;
           case "variable":
             await wmill.deleteVariable({
               workspace: workspaceId,
-              path: removeSuffix(change.path, ".variable.json"),
+              path: removeSuffix(target, ".variable.json"),
             });
             break;
           case "user": {

From 43b8a5ade3ec5ac709ee3408cd13f5cac92c51fe Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Wed, 6 Nov 2024 20:29:19 +0100
Subject: [PATCH 30/80] chore(main): release 1.419.0 (#4649)

* chore(main): release 1.419.0

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  | 18 ++++
 backend/Cargo.lock                            | 82 +++++++++----------
 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, 76 insertions(+), 58 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08f7c83c7c..4ffa8c6630 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## [1.419.0](https://github.com/windmill-labs/windmill/compare/v1.418.0...v1.419.0) (2024-11-06)
+
+
+### Features
+
+* Add full-text search on windmill service logs ([#4576](https://github.com/windmill-labs/windmill/issues/4576)) ([77735d8](https://github.com/windmill-labs/windmill/commit/77735d859cfee9204f67a8e4f9885228d657a41d))
+* show path in flow script picker ([#4574](https://github.com/windmill-labs/windmill/issues/4574)) ([8e27392](https://github.com/windmill-labs/windmill/commit/8e27392afacbb725aaf9f9f892ab8a6171b59ce5))
+* websocket authentication ([#4635](https://github.com/windmill-labs/windmill/issues/4635)) ([4dda0fb](https://github.com/windmill-labs/windmill/commit/4dda0fb8cd8262ad3a2ab2b9d27e7043ac3bb891))
+
+
+### Bug Fixes
+
+* clarify error messages when job timeout or cancelled with more details ([771d740](https://github.com/windmill-labs/windmill/commit/771d740701902166f8b4e3f77aa9c5579237cb15))
+* **cli:** improve handling of deleted items on windows ([9a8dcc9](https://github.com/windmill-labs/windmill/commit/9a8dcc9a250caefa0b7c9523e1321599b7471c8b))
+* display logs in native mode when script fails ([#4655](https://github.com/windmill-labs/windmill/issues/4655)) ([7578ceb](https://github.com/windmill-labs/windmill/commit/7578cebaf92e729a26fd665e4b6f8357d34f59eb))
+* **frontend:** arg input json handling when the value is not of the same type as schema ([#4479](https://github.com/windmill-labs/windmill/issues/4479)) ([8d8156b](https://github.com/windmill-labs/windmill/commit/8d8156bd0773da3ddec81c46ad5fda114ecd3dda))
+* **frontend:** improve flow prop picker design ([323912c](https://github.com/windmill-labs/windmill/commit/323912c73c18d3bb6d136f2e6458389270364a0e))
+
 ## [1.418.0](https://github.com/windmill-labs/windmill/compare/v1.417.3...v1.418.0) (2024-11-04)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 1c2f6b1fc2..116bdc3899 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -166,9 +166,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.92"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
 
 [[package]]
 name = "arc-swap"
@@ -966,9 +966,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime-api"
-version = "1.7.2"
+version = "1.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e086682a53d3aa241192aa110fa8dfce98f2f5ac2ead0de84d41582c7e8fdb96"
+checksum = "92165296a47a812b267b4f41032ff8069ab7ff783696d217f0994a0d7ab585cd"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-types",
@@ -983,9 +983,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-types"
-version = "1.2.8"
+version = "1.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07c9cdc179e6afbf5d391ab08c85eac817b51c87e1892a5edb5f7bbdc64314b4"
+checksum = "4fbd94a32b3a7d55d3806fe27d98d3ad393050439dd05eb53ece36ec5e3d3510"
 dependencies = [
  "base64-simd 0.8.0",
  "bytes",
@@ -1599,9 +1599,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.34"
+version = "1.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9"
+checksum = "baee610e9452a8f6f0a1b6194ec09ff9e2d85dea54432acdae41aa0761c95d70"
 dependencies = [
  "jobserver",
  "libc",
@@ -2554,7 +2554,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "serde",
- "sourcemap 9.0.0",
+ "sourcemap 9.0.1",
  "swc_atoms",
  "swc_common",
  "swc_config",
@@ -6537,9 +6537,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e346e016eacfff12233c243718197ca12f148c84e1e84268a896699b41c71780"
+checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da"
 dependencies = [
  "cfg_aliases",
  "libc",
@@ -7173,9 +7173,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.38"
+version = "0.38.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
+checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
@@ -8016,9 +8016,9 @@ dependencies = [
 
 [[package]]
 name = "sourcemap"
-version = "9.0.0"
+version = "9.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dab08a862c70980b8e23698b507e272317ae52a608a164a844111f5372374f1f"
+checksum = "86721155737d89818020dc35713595c6e7b21016073c101e6590c47ca58c2d16"
 dependencies = [
  "base64-simd 0.7.0",
  "bitvec",
@@ -8506,7 +8506,7 @@ dependencies = [
  "rustc-hash 1.1.0",
  "serde",
  "siphasher",
- "sourcemap 9.0.0",
+ "sourcemap 9.0.1",
  "swc_allocator",
  "swc_atoms",
  "swc_eq_ignore_macros",
@@ -8570,7 +8570,7 @@ dependencies = [
  "num-bigint",
  "once_cell",
  "serde",
- "sourcemap 9.0.0",
+ "sourcemap 9.0.1",
  "swc_allocator",
  "swc_atoms",
  "swc_common",
@@ -10563,7 +10563,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "anyhow",
  "axum",
@@ -10605,7 +10605,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10690,7 +10690,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -10708,7 +10708,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "chrono",
  "serde",
@@ -10721,7 +10721,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10736,7 +10736,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10782,7 +10782,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10797,7 +10797,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10819,7 +10819,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10831,7 +10831,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10840,7 +10840,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10852,7 +10852,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10864,7 +10864,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10876,7 +10876,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10887,7 +10887,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10898,7 +10898,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10916,7 +10916,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10933,7 +10933,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10945,7 +10945,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10963,7 +10963,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10984,7 +10984,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -10994,7 +10994,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -11027,7 +11027,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -11037,7 +11037,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.418.0"
+version = "1.419.0"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index b0d6e47120..c444778502 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.418.0"
+version = "1.419.0"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.418.0"
+version = "1.419.0"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 3b0d784bd7..67e52eb9fa 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.418.0
+  version: 1.419.0
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 961d105aa1..85484f8915 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.418.0";
+export const VERSION = "v1.419.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 92039f51f8..87dba5b461 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.418.0";
+export const VERSION = "1.419.0";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index a5c5e883d1..49ea5ca116 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.418.0",
+	"version": "1.419.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.418.0",
+			"version": "1.419.0",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index 1716d5546a..48dca74fed 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.418.0",
+	"version": "1.419.0",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 8e529f4349..49652909b5 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.418.0"
-wmill_pg = ">=1.418.0"
+wmill = ">=1.419.0"
+wmill_pg = ">=1.419.0"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index a96d3ac217..57864131bf 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.418.0
+  version: 1.419.0
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index f530a19563..e73338005f 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.418.0'
+ModuleVersion = '1.419.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 651786ca82..e07c0b6b25 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.418.0"
+version = "1.419.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 85e436d451..72688f686a 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.418.0"
+version = "1.419.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 58d900b091..396c44c06b 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.418.0",
+  "version": "1.419.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 5767d560c9..8e0b78b11d 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.418.0",
+  "version": "1.419.0",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 0a0c0912c6..c3911f1102 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.418.0
+1.419.0

From e9b7dca20387e775fa50aaecd832890251582cf9 Mon Sep 17 00:00:00 2001
From: Guilhem <guilhemlemouel@gmail.com>
Date: Thu, 7 Nov 2024 07:55:01 +0100
Subject: [PATCH 31/80] feat(frontend): detect expr in flow input transform +
 filter right panel based on expr (#4651)

---
 .../lib/components/InputTransformForm.svelte  | 117 +++++-
 .../src/lib/components/SimpleEditor.svelte    |   9 +
 .../flows/content/FlowConstants.svelte        |   2 +
 .../lib/components/flows/previousResults.ts   |  37 ++
 .../flows/propPicker/PropPickerWrapper.svelte |   6 +
 .../propertyPicker/PropPicker.svelte          | 341 ++++++++++++------
 6 files changed, 383 insertions(+), 129 deletions(-)

diff --git a/frontend/src/lib/components/InputTransformForm.svelte b/frontend/src/lib/components/InputTransformForm.svelte
index 706d00b7ae..7dc11e9229 100644
--- a/frontend/src/lib/components/InputTransformForm.svelte
+++ b/frontend/src/lib/components/InputTransformForm.svelte
@@ -1,3 +1,12 @@
+<script context="module">
+	const dynamicTemplateRegexPairs = buildPrefixRegex([
+		'flow_input',
+		'results',
+		'resource',
+		'variable'
+	])
+</script>
+
 <script lang="ts">
 	import type { Schema } from '$lib/common'
 	import type { InputCat } from '$lib/utils'
@@ -13,8 +22,9 @@
 	import AnimatedButton from '$lib/components/common/button/AnimatedButton.svelte'
 	import ToggleButtonGroup from '$lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte'
 	import ToggleButton from '$lib/components/common/toggleButton-v2/ToggleButton.svelte'
+	import { tick } from 'svelte'
 	import { fade } from 'svelte/transition'
-
+	import { buildPrefixRegex } from './flows/previousResults'
 	import type VariableEditor from './VariableEditor.svelte'
 	import type ItemPicker from './ItemPicker.svelte'
 	import type { InputTransform } from '$lib/gen'
@@ -43,6 +53,7 @@
 	let monaco: SimpleEditor | undefined = undefined
 	let monacoTemplate: TemplateEditor | undefined = undefined
 	let argInput: ArgInput | undefined = undefined
+	let focusedPrev = false
 
 	const dispatch = createEventDispatcher()
 
@@ -59,6 +70,9 @@
 	const { shouldUpdatePropertyType, exprsToSet } =
 		getContext<FlowCopilotContext | undefined>('FlowCopilotContext') || {}
 
+	const { inputMatches, focusProp, propPickerConfig } =
+		getContext<PropPickerWrapperContext>('PropPickerWrapper')
+
 	function setExpr() {
 		const newArg = $exprsToSet?.[argName]
 		if (newArg) {
@@ -133,6 +147,50 @@
 		}
 	}
 
+	let codeInjectionDetected = false
+
+	function checkCodeInjection(rawValue: string) {
+		if (!arg || !rawValue || rawValue.length < 3 || !dynamicTemplateRegexPairs) {
+			return undefined
+		}
+		if (rawValue.trim() !== rawValue) {
+			return undefined
+		}
+		const matches = dynamicTemplateRegexPairs.filter(({ regex }) => regex.test(rawValue))
+		if (matches.length > 0) {
+			return matches.map((m) => ({ word: m.word, value: rawValue }))
+		}
+		return undefined
+	}
+
+	async function setJavaScriptExpr(rawValue: string) {
+		arg = {
+			type: 'javascript',
+			expr: rawValue
+		}
+		propertyType = 'javascript'
+		monaco?.setCode('')
+		monaco?.insertAtCursor(rawValue)
+		await tick()
+		monaco?.focus()
+		await tick()
+		monaco?.setCursorToEnd()
+	}
+
+	function handleKeyUp(e: KeyboardEvent) {
+		if (
+			e.key === 'Tab' &&
+			isStaticTemplate(inputCat) &&
+			propertyType == 'static' &&
+			!noDynamicToggle &&
+			codeInjectionDetected
+		) {
+			setJavaScriptExpr(arg.value)
+		} else {
+			stepInputGen?.onKeyUp?.(e)
+		}
+	}
+
 	function isStaticTemplate(inputCat: InputCat) {
 		return inputCat === 'string' || inputCat === 'sql' || inputCat == 'yaml'
 	}
@@ -166,9 +224,24 @@
 		}
 	}
 
-	const { focusProp, propPickerConfig } = getContext<PropPickerWrapperContext>('PropPickerWrapper')
+	$: updateStaticInput(inputCat, propertyType, arg)
 
-	$: isStaticTemplate(inputCat) && propertyType == 'static' && setPropertyType(arg?.value)
+	function updateStaticInput(
+		inputCat: InputCat,
+		propertyType: 'static' | 'javascript',
+		arg: InputTransform | any
+	) {
+		if (!isStaticTemplate(inputCat)) {
+			return
+		}
+		if (propertyType == 'static') {
+			setPropertyType(arg?.value)
+			codeInjectionDetected = checkCodeInjection(arg?.value) != undefined
+		} else if (propertyType == 'javascript' && focused) {
+			setPropertyType(arg?.expr)
+			$inputMatches = checkCodeInjection(arg?.expr)
+		}
+	}
 
 	function setDefaultCode() {
 		if (!arg?.value) {
@@ -176,6 +249,14 @@
 		}
 	}
 
+	function updateFocused(newFocused: boolean) {
+		if (focusedPrev && !newFocused) {
+			$inputMatches = undefined
+		}
+		focusedPrev = focused
+	}
+	$: updateFocused(focused)
+
 	$: schema?.properties?.[argName].default && setDefaultCode()
 
 	let resourceTypes: string[] | undefined = undefined
@@ -325,13 +406,27 @@
 								<ToggleButton small label="Static" value="static" />
 							{/if}
 
-							<ToggleButton
-								small
-								light
-								tooltip="JavaScript expression ('flow_input' or 'results')."
-								value="javascript"
-								icon={FunctionSquare}
-							/>
+							{#if codeInjectionDetected && propertyType == 'static'}
+								<Button
+									size="xs2"
+									color="light"
+									btnClasses="font-normal text-xs w-fit bg-green-100 text-green-800 hover:bg-green-100 dark:text-green-300 dark:bg-green-700 dark:hover:bg-green-600"
+									on:click={() => setJavaScriptExpr(arg.value)}
+								>
+									<span class="font-normal whitespace-nowrap flex gap-2 items-center"
+										><FunctionSquare size={14} /> detected -
+										<span class="font-bold">TAB</span>
+									</span>
+								</Button>
+							{:else}
+								<ToggleButton
+									small
+									light
+									tooltip="JavaScript expression ('flow_input' or 'results')."
+									value="javascript"
+									icon={FunctionSquare}
+								/>
+							{/if}
 						</ToggleButtonGroup>
 					</div>
 
@@ -363,7 +458,7 @@
 
 		<div class="max-w-xs" />
 		<!-- svelte-ignore a11y-no-static-element-interactions -->
-		<div class="relative" on:keyup={stepInputGen?.onKeyUp}>
+		<div class="relative" on:keyup={handleKeyUp}>
 			<!-- {#if $propPickerConfig?.propName == argName && $propPickerConfig?.insertionMode == 'connect'}
 				<span
 					class={'text-white  z-50 px-1 text-2xs py-0.5 font-bold rounded-t-sm w-fit absolute top-0 right-0 bg-blue-500'}
diff --git a/frontend/src/lib/components/SimpleEditor.svelte b/frontend/src/lib/components/SimpleEditor.svelte
index b96cbaa361..ae60b315c9 100644
--- a/frontend/src/lib/components/SimpleEditor.svelte
+++ b/frontend/src/lib/components/SimpleEditor.svelte
@@ -405,6 +405,15 @@
 			editor && editor.dispose()
 		} catch (err) {}
 	})
+
+	export function setCursorToEnd(): void {
+		if (editor) {
+			const lastLine = editor.getModel()?.getLineCount() ?? 1
+			const lastColumn = editor.getModel()?.getLineMaxColumn(lastLine) ?? 1
+			editor.setPosition({ lineNumber: lastLine, column: lastColumn })
+			editor.focus()
+		}
+	}
 </script>
 
 <EditorTheme />
diff --git a/frontend/src/lib/components/flows/content/FlowConstants.svelte b/frontend/src/lib/components/flows/content/FlowConstants.svelte
index df0688f177..76859bbcff 100644
--- a/frontend/src/lib/components/flows/content/FlowConstants.svelte
+++ b/frontend/src/lib/components/flows/content/FlowConstants.svelte
@@ -77,6 +77,8 @@
 		.filter(([i, f, m]) => f.length > 0)
 
 	setContext<PropPickerWrapperContext>('PropPickerWrapper', {
+		inputMatches: writable(undefined),
+		filteredPickableProperties: writable(undefined),
 		focusProp: () => {},
 		propPickerConfig: writable(undefined),
 		clearFocus: () => {}
diff --git a/frontend/src/lib/components/flows/previousResults.ts b/frontend/src/lib/components/flows/previousResults.ts
index 94c028af23..e922c55978 100644
--- a/frontend/src/lib/components/flows/previousResults.ts
+++ b/frontend/src/lib/components/flows/previousResults.ts
@@ -260,3 +260,40 @@ declare const approvers: string
 }
 `
 }
+
+export function buildPrefixRegex(words: string[]): Array<{ regex: RegExp; word: string }> {
+	return words.map((word) => {
+		const prefixes: string[] = []
+		for (let i = 1; i <= word.length; i++) {
+			prefixes.push(word.slice(0, i) + '$')
+		}
+		prefixes.push(word + '\\.')
+		prefixes.push(word + '\\[')
+
+		return {
+			regex: new RegExp(`^(${prefixes.join('|')}).*`),
+			word
+		}
+	})
+}
+
+export function filterNestedObject(obj: any, nestedKeys: string[]) {
+	if (nestedKeys.length === 0) return {}
+	if (nestedKeys.length === 1) {
+		if (nestedKeys[0] === '') {
+			return obj
+		}
+		const regexes = buildPrefixRegex(Object.keys(obj))
+		const matches = regexes.filter(({ regex }) => regex.test(nestedKeys[0]))
+		return Object.fromEntries(
+			Object.entries(obj).filter(([key]) => matches.some(({ word }) => word === key))
+		)
+	}
+	const [key, ...rest] = nestedKeys
+	if (obj && typeof obj === 'object' && key in obj) {
+		const result = {}
+		result[key] = filterNestedObject(obj[key], rest)
+		return result
+	}
+	return {}
+}
diff --git a/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte b/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte
index c180463f36..7ff05d9b4f 100644
--- a/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte
+++ b/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte
@@ -11,6 +11,8 @@
 
 	export type PropPickerWrapperContext = {
 		propPickerConfig: Writable<PropPickerConfig | undefined>
+		inputMatches: Writable<{ word: string; value: string }[] | undefined>
+		filteredPickableProperties: Writable<PickableProperties | undefined>
 		focusProp: (propName: string, insertionMode: InsertionMode, onSelect: SelectCallback) => void
 		clearFocus: () => void
 	}
@@ -37,10 +39,14 @@
 	export let noPadding: boolean = false
 
 	const propPickerConfig = writable<PropPickerConfig | undefined>(undefined)
+	const filteredPickableProperties = writable<PickableProperties | undefined>(undefined)
+	const inputMatches = writable<{ word: string; value: string }[] | undefined>(undefined)
 	const dispatch = createEventDispatcher()
 
 	setContext<PropPickerWrapperContext>('PropPickerWrapper', {
 		propPickerConfig,
+		inputMatches,
+		filteredPickableProperties,
 		focusProp: (propName, insertionMode, onSelect) => {
 			propPickerConfig.set({
 				propName,
diff --git a/frontend/src/lib/components/propertyPicker/PropPicker.svelte b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
index 0e27cab996..e4d598d793 100644
--- a/frontend/src/lib/components/propertyPicker/PropPicker.svelte
+++ b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
@@ -9,6 +9,7 @@
 	import { keepByKey } from './utils'
 	import type { PickableProperties } from '../flows/previousResults'
 	import ClearableInput from '../common/clearableInput/ClearableInput.svelte'
+	import { filterNestedObject } from '../flows/previousResults'
 
 	export let pickableProperties: PickableProperties
 	export let displayContext = true
@@ -20,18 +21,31 @@
 	let resources: Record<string, any> = {}
 	let displayVariable = false
 	let displayResources = false
+
 	let allResultsCollapsed = true
+	let collapsableInitialState:
+		| {
+				allResultsCollapsed: boolean
+				displayVariable: boolean
+				displayResources: boolean
+		  }
+		| undefined
+
+	let filterActive = false
 
 	const EMPTY_STRING = ''
 	let search = ''
 
-	const { propPickerConfig } = getContext<PropPickerWrapperContext>('PropPickerWrapper')
+	const { propPickerConfig, filteredPickableProperties, inputMatches } =
+		getContext<PropPickerWrapperContext>('PropPickerWrapper')
 
+	$filteredPickableProperties = { ...pickableProperties }
 	let flowInputsFiltered = pickableProperties.flow_input
 	let resultByIdFiltered = pickableProperties.priorIds
 
 	let timeout: NodeJS.Timeout
 	function onSearch(search: string) {
+		filterActive = false
 		clearTimeout(timeout)
 		setTimeout(() => {
 			flowInputsFiltered =
@@ -72,29 +86,124 @@
 			).map((resource) => [resource.path, resource.description ?? ''])
 		)
 	}
+
+	async function filterPickableProperties() {
+		if (!filterActive) {
+			return
+		}
+
+		if (!$inputMatches?.some((match) => match.word === 'flow_input')) {
+			flowInputsFiltered = []
+		}
+		if (!$inputMatches?.some((match) => match.word === 'results')) {
+			resultByIdFiltered = []
+		}
+		if ($inputMatches?.length == 1) {
+			if ($inputMatches[0].word === 'flow_input') {
+				flowInputsFiltered = pickableProperties.flow_input
+				let [, ...nestedKeys] = $inputMatches[0].value.split('.')
+				let filtered = filterNestedObject(flowInputsFiltered, nestedKeys)
+				if (Object.keys(filtered).length > 0) {
+					flowInputsFiltered = filtered
+				}
+			} else if ($inputMatches[0].word === 'results') {
+				resultByIdFiltered = pickableProperties.priorIds
+				let [, ...nestedKeys] = $inputMatches[0].value.split('.')
+				let filtered = filterNestedObject(resultByIdFiltered, nestedKeys)
+				if (Object.keys(filtered).length > 0) {
+					resultByIdFiltered = filtered
+				}
+			}
+		}
+
+		if ($filteredPickableProperties) {
+			resultByIdFiltered && ($filteredPickableProperties.priorIds = resultByIdFiltered)
+			flowInputsFiltered && ($filteredPickableProperties.flow_input = flowInputsFiltered)
+		}
+	}
+
+	async function updateCollapsable() {
+		if (!$inputMatches || $inputMatches.length !== 1) {
+			resetCollapsable()
+			return
+		}
+
+		if (!collapsableInitialState) {
+			collapsableInitialState = { allResultsCollapsed, displayVariable, displayResources }
+		}
+
+		if ($inputMatches[0].word === 'variable') {
+			await loadVariables()
+			displayVariable = true
+			return
+		}
+		if ($inputMatches[0].word === 'resource') {
+			await loadResources()
+			displayResources = true
+			return
+		}
+		if ($inputMatches[0].word === 'results') {
+			allResultsCollapsed = false
+			return
+		}
+	}
+
+	function resetCollapsable() {
+		if (!collapsableInitialState) {
+			return
+		}
+		;({ allResultsCollapsed, displayVariable, displayResources } = collapsableInitialState)
+		collapsableInitialState = undefined
+	}
+
+	async function updateFilterActive() {
+		const prev = filterActive
+
+		filterActive = Boolean(
+			$inputMatches &&
+				$inputMatches?.length > 0 &&
+				$propPickerConfig?.insertionMode === 'insert' &&
+				search === EMPTY_STRING
+		)
+
+		if (prev && !filterActive) {
+			flowInputsFiltered = pickableProperties.flow_input
+			resultByIdFiltered = pickableProperties.priorIds
+		}
+	}
+
+	async function updateState() {
+		await updateFilterActive()
+		await filterPickableProperties()
+		await updateCollapsable()
+	}
+
+	$: search, $inputMatches, $propPickerConfig, updateState()
 </script>
 
 <div class="flex flex-col h-full rounded overflow-hidden">
 	<div class="px-2 py-2">
 		<ClearableInput bind:value={search} placeholder="Search prop..." />
 	</div>
-	<div class="overflow-y-auto px-2 pt-2 grow">
-		<div class="flex justify-between items-center space-x-1">
-			<span class="font-normal text-sm text-secondary">Flow Input</span>
-			<div class="flex space-x-2 items-center" />
-		</div>
-		<div class="overflow-y-auto mb-2">
-			<ObjectViewer
-				{allowCopy}
-				pureViewer={!$propPickerConfig}
-				json={flowInputsFiltered}
-				prefix="flow_input"
-				on:select
-			/>
-		</div>
+	<div class="overflow-y-auto px-2 pt-2 grow" class:bg-surface-secondary={!$propPickerConfig}>
+		{#if flowInputsFiltered && (Object.keys(flowInputsFiltered).length > 0 || !filterActive)}
+			<div class="flex justify-between items-center space-x-1">
+				<span class="font-normal text-sm text-secondary">Flow Input</span>
+				<div class="flex space-x-2 items-center" />
+			</div>
+			<div class="overflow-y-auto pb-2">
+				<ObjectViewer
+					{allowCopy}
+					pureViewer={!$propPickerConfig}
+					json={flowInputsFiltered}
+					prefix="flow_input"
+					on:select
+				/>
+			</div>
+		{/if}
 		{#if error}
 			<span class="font-normal text-sm text-secondary">Error</span>
-			<div class="overflow-y-auto mb-2">
+			<div class="overflow-y-auto pb-2">
 				<ObjectViewer
 					{allowCopy}
 					pureViewer={!$propPickerConfig}
@@ -112,7 +221,7 @@
 			{#if Object.keys(pickableProperties.priorIds).length > 0}
 				{#if suggestedPropsFiltered && Object.keys(suggestedPropsFiltered).length > 0}
 					<span class="font-normal text-sm text-secondary">Suggested Results</span>
-					<div class="overflow-y-auto mb-2">
+					<div class="overflow-y-auto pb-2">
 						<ObjectViewer
 							{allowCopy}
 							pureViewer={!$propPickerConfig}
@@ -124,11 +233,11 @@
 					</div>
 				{/if}
 				<span class="font-normal text-sm text-secondary">All Results</span>
-				<div class="overflow-y-auto mb-2">
+				<div class="overflow-y-auto pb-2">
 					<ObjectViewer
 						{allowCopy}
 						pureViewer={!$propPickerConfig}
-						collapsed={true}
+						collapseLevel={allResultsCollapsed ? 1 : undefined}
 						json={resultByIdFiltered}
 						prefix="results"
 						on:select
@@ -136,9 +245,12 @@
 				</div>
 			{/if}
 		{:else}
-			{#if previousId}
+			{@const json = Object.fromEntries(
+				Object.entries(resultByIdFiltered).filter(([k, v]) => k == previousId)
+			)}
+			{#if previousId && Object.keys(json).length > 0}
 				<span class="font-normal text-sm text-secondary">Previous Result</span>
-				<div class="overflow-y-auto mb-2">
+				<div class="overflow-y-auto pb-2">
 					<ObjectViewer
 						{allowCopy}
 						pureViewer={!$propPickerConfig}
@@ -152,7 +264,7 @@
 			{/if}
 			{#if pickableProperties.hasResume}
 				<span class="font-normal text-sm text-secondary">Resume payloads</span>
-				<div class="overflow-y-auto mb-2">
+				<div class="overflow-y-auto pb-2">
 					<ObjectViewer
 						{allowCopy}
 						pureViewer={!$propPickerConfig}
@@ -166,9 +278,9 @@
 				</div>
 			{/if}
 			{#if Object.keys(pickableProperties.priorIds).length > 0}
-				{#if suggestedPropsFiltered && Object.keys(suggestedPropsFiltered).length > 0}
+				{#if !filterActive && suggestedPropsFiltered && Object.keys(suggestedPropsFiltered).length > 0}
 					<span class="font-normal text-sm text-secondary">Suggested Results</span>
-					<div class="overflow-y-auto mb-2">
+					<div class="overflow-y-auto pb-2">
 						<ObjectViewer
 							{allowCopy}
 							pureViewer={!$propPickerConfig}
@@ -179,112 +291,105 @@
 						/>
 					</div>
 				{/if}
-				<div class="overflow-y-auto mb-2">
-					<span class="font-normal text-sm text-secondary">All Results</span>
-					{#if !allResultsCollapsed}
+				{#if Object.keys(resultByIdFiltered).length > 0}
+					<div class="overflow-y-auto pb-2">
+						<span class="font-normal text-sm text-secondary">All Results</span>
+
+						<ObjectViewer
+							{allowCopy}
+							pureViewer={!$propPickerConfig}
+							collapseLevel={allResultsCollapsed ? 1 : undefined}
+							json={resultByIdFiltered}
+							prefix="results"
+							on:select
+						/>
+					</div>
+				{/if}
+			{/if}
+		{/if}
+
+		{#if displayContext}
+			{#if !filterActive || $inputMatches?.some((match) => match.word === 'variable')}
+				<div class="overflow-y-auto pb-2">
+					<span class="font-normal text-sm text-secondary">Variables:</span>
+
+					{#if displayVariable}
 						<Button
 							color="light"
 							size="xs2"
 							variant="border"
 							on:click={() => {
-								allResultsCollapsed = true
+								displayVariable = false
 							}}
 							wrapperClasses="inline-flex whitespace-nowrap w-fit"
 							btnClasses="font-mono h-4 text-2xs font-thin px-1 rounded-[0.275rem]">-</Button
 						>
-					{/if}
 
-					<ObjectViewer
-						{allowCopy}
-						pureViewer={!$propPickerConfig}
-						bind:collapsed={allResultsCollapsed}
-						json={resultByIdFiltered}
-						prefix="results"
-						on:select
-					/>
+						<ObjectViewer
+							{allowCopy}
+							pureViewer={!$propPickerConfig}
+							rawKey={true}
+							json={variables}
+							prefix="variable"
+							on:select
+						/>
+					{:else}
+						<Button
+							color="light"
+							size="xs2"
+							variant="border"
+							on:click={async () => {
+								await loadVariables()
+								displayVariable = true
+							}}
+							wrapperClasses="inline-flex w-fit"
+							btnClasses="font-normal text-2xs rounded-[0.275rem] h-4 px-1"
+						>
+							{'{...}'}
+						</Button>
+					{/if}
+				</div>
+			{/if}
+			{#if !filterActive || $inputMatches?.some((match) => match.word === 'resource')}
+				<div class="overflow-y-auto pb-2">
+					<span class="font-normal text-sm text-secondary">Resources:</span>
+
+					{#if displayResources}
+						<Button
+							color="light"
+							size="xs2"
+							variant="border"
+							on:click={() => {
+								displayResources = false
+							}}
+							wrapperClasses="inline-flex whitespace-nowrap w-fit"
+							btnClasses="font-mono h-4 text-2xs font-thin px-1 rounded-[0.275rem]">-</Button
+						>
+						<ObjectViewer
+							{allowCopy}
+							pureViewer={!$propPickerConfig}
+							rawKey={true}
+							json={resources}
+							prefix="resource"
+							on:select
+						/>
+					{:else}
+						<Button
+							color="light"
+							size="xs2"
+							variant="border"
+							on:click={async () => {
+								await loadResources()
+								displayResources = true
+							}}
+							wrapperClasses="inline-flex whitespace-nowrap w-fit"
+							btnClasses="font-normal text-2xs rounded-[0.275rem] h-4 px-1"
+						>
+							{'{...}'}
+						</Button>
+					{/if}
 				</div>
 			{/if}
 		{/if}
-
-		{#if displayContext}
-			<div class="overflow-y-auto mb-2">
-				<span class="font-normal text-sm text-secondary">Variables:</span>
-
-				{#if displayVariable}
-					<Button
-						color="light"
-						size="xs2"
-						variant="border"
-						on:click={() => {
-							displayVariable = false
-						}}
-						wrapperClasses="inline-flex whitespace-nowrap w-fit"
-						btnClasses="font-mono h-4 text-2xs font-thin px-1 rounded-[0.275rem]">-</Button
-					>
-
-					<ObjectViewer
-						{allowCopy}
-						pureViewer={!$propPickerConfig}
-						rawKey={true}
-						json={variables}
-						prefix="variable"
-						on:select
-					/>
-				{:else}
-					<Button
-						color="light"
-						size="xs2"
-						variant="border"
-						on:click={async () => {
-							await loadVariables()
-							displayVariable = true
-						}}
-						wrapperClasses="inline-flex w-fit"
-						btnClasses="font-normal text-2xs rounded-[0.275rem] h-4 px-1"
-					>
-						{'{...}'}
-					</Button>
-				{/if}
-			</div>
-
-			<div class="overflow-y-auto mb-2">
-				<span class="font-normal text-sm text-secondary">Resources:</span>
-
-				{#if displayResources}
-					<Button
-						color="light"
-						size="xs2"
-						variant="border"
-						on:click={() => {
-							displayResources = false
-						}}
-						wrapperClasses="inline-flex whitespace-nowrap w-fit"
-						btnClasses="font-mono h-4 text-2xs font-thin px-1 rounded-[0.275rem]">-</Button
-					>
-					<ObjectViewer
-						{allowCopy}
-						pureViewer={!$propPickerConfig}
-						rawKey={true}
-						json={resources}
-						prefix="resource"
-						on:select
-					/>
-				{:else}
-					<Button
-						color="light"
-						size="xs2"
-						variant="border"
-						on:click={async () => {
-							await loadResources()
-							displayResources = true
-						}}
-						wrapperClasses="inline-flex whitespace-nowrap w-fit"
-						btnClasses="font-normal text-2xs rounded-[0.275rem] h-4 px-1"
-					>
-						{'{...}'}
-					</Button>
-				{/if}
-			</div>
-		{/if}
 	</div>
 </div>

From f767d92ec72905370835d42aa91a3ab551a37ae5 Mon Sep 17 00:00:00 2001
From: Lucas Abel <22837557+uael@users.noreply.github.com>
Date: Thu, 7 Nov 2024 12:23:19 +0100
Subject: [PATCH 32/80] add flake.nix and package `windmill` backend (#4660)

---
 backend/Cargo.lock                        |  34 +++++-
 backend/Cargo.toml                        |   2 +-
 backend/windmill-api/src/static_assets.rs |   2 +-
 flake.lock                                |  95 +++++++++++++++
 flake.nix                                 | 136 ++++++++++++++++++++++
 5 files changed, 265 insertions(+), 4 deletions(-)
 create mode 100644 flake.lock
 create mode 100644 flake.nix

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 116bdc3899..a28c70fc4c 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -2942,13 +2942,22 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "dirs"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
+dependencies = [
+ "dirs-sys 0.3.7",
+]
+
 [[package]]
 name = "dirs"
 version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
- "dirs-sys",
+ "dirs-sys 0.4.1",
 ]
 
 [[package]]
@@ -2961,6 +2970,17 @@ dependencies = [
  "dirs-sys-next",
 ]
 
+[[package]]
+name = "dirs-sys"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
 [[package]]
 name = "dirs-sys"
 version = "0.4.1"
@@ -4041,7 +4061,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732"
 dependencies = [
- "dirs",
+ "dirs 5.0.1",
  "indicatif",
  "log",
  "native-tls",
@@ -7081,6 +7101,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils",
+ "shellexpand",
  "syn 2.0.87",
  "walkdir",
 ]
@@ -7815,6 +7836,15 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "shellexpand"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4"
+dependencies = [
+ "dirs 4.0.0",
+]
+
 [[package]]
 name = "shlex"
 version = "1.3.0"
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index c444778502..26251822fb 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -154,7 +154,7 @@ tracing-appender = "^0"
 prometheus = { version = "^0", default-features = false }
 cookie = { version = "0.17.0" }
 phf = { version = "0.11", features = ["macros"] }
-rust-embed = "^6"
+rust-embed = { version = "^6", features = ["interpolate-folder-path"] }
 mime_guess = "^2"
 hex = "^0"
 sql-builder = "^3"
diff --git a/backend/windmill-api/src/static_assets.rs b/backend/windmill-api/src/static_assets.rs
index 783732b1c0..0423727e68 100644
--- a/backend/windmill-api/src/static_assets.rs
+++ b/backend/windmill-api/src/static_assets.rs
@@ -23,7 +23,7 @@ pub async fn static_handler(OriginalUri(original_uri): OriginalUri) -> StaticFil
 }
 
 #[derive(RustEmbed)]
-#[folder = "../../frontend/build/"]
+#[folder = "${FRONTEND_BUILD_DIR:-../../frontend/build/}"]
 struct Asset;
 pub struct StaticFile(Uri);
 
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000000..5ad4516f5c
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,95 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1730785428,
+        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1728538411,
+        "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1730946479,
+        "narHash": "sha256-AxGJ3BRc44o3RBcfXxZqjVYftVtJ2sl+/WEjiLUmXRY=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "7fba269fe89ffad47206e0afba233d337c04cf08",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000000..d6fbd0fdf2
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,136 @@
+{
+  inputs = {
+    nixpkgs.url = "nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    rust-overlay.url = "github:oxalica/rust-overlay";
+  };
+
+  outputs = { self, nixpkgs, flake-utils, rust-overlay }:
+    flake-utils.lib.eachDefaultSystem (system:
+    let
+      pkgs = import nixpkgs {
+        inherit system;
+        overlays = [ (import rust-overlay) ];
+      };
+      buildInputs = with pkgs; [
+        openssl.dev libxml2.dev xmlsec.dev libxslt.dev
+        rust-bin.beta.latest.default nodejs go
+        xcaddy sqlx-cli pkg-config
+      ];
+      environment = {
+        NODE_ENV = "development";
+        NODE_OPTIONS = "--max-old-space-size=16384";
+        DATABASE_URL = "postgres://postgres:changeme@127.0.0.1:5432/";
+        PKG_CONFIG_PATH = pkgs.lib.makeSearchPath "lib/pkgconfig" (with pkgs; [
+          openssl.dev
+          libxml2.dev
+          xmlsec.dev
+          libxslt.dev
+        ]);
+      };
+      rustcTarget = pkgs.hostPlatform.rust.rustcTarget;
+      fetch_librusty_v8 = { version, shas }: pkgs.fetchurl {
+        name = "librusty_v8-${version}";
+        url = "https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_release_${rustcTarget}.a.gz";
+        sha256 = shas.${system};
+      };
+    in {
+      devShell = pkgs.mkShell {
+        inherit (environment) NODE_ENV NODE_OPTIONS DATABASE_URL PKG_CONFIG_PATH;
+        buildInputs = buildInputs;
+        packages = [
+          (pkgs.writeScriptBin "wm-caddy" ''
+            cd ./frontend
+            xcaddy build $* \
+              --with github.com/mholt/caddy-l4@145ec36251a44286f05a10d231d8bfb3a8192e09 \
+              --with github.com/RussellLuo/caddy-ext/layer4@ab1e18cfe426012af351a68463937ae2e934a2a1
+          '')
+          (pkgs.writeScriptBin "wm-build" ''
+            cd ./frontend
+            echo $(pwd)
+            npm install
+            npm run ${if pkgs.stdenv.isDarwin then "generate-backend-client-mac" else "generate-backend-client"}
+            npm run build $*
+          '')
+          (pkgs.writeScriptBin "wm-migrate" ''
+            cd ./backend
+            sqlx database reset
+            sqlx database create
+            sqlx migrate run
+          '')
+          (pkgs.writeScriptBin "wm-setup" ''
+            wm-build
+            wm-caddy
+            wm-migrate
+          '')
+          (pkgs.writeScriptBin "wm" ''
+            cd ./frontend
+            npm run dev $*
+          '')
+        ];
+      };
+      packages.windmill-client = pkgs.stdenv.mkDerivation {
+        pname = "windmill-client";
+        version = (pkgs.lib.strings.trim (builtins.readFile ./version.txt));
+
+        src = ./.;
+        buildInputs = with pkgs; [ nodejs go ];
+
+        buildPhase = ''
+          export HOME=$(pwd)
+          npm config set strict-ssl false
+          cd frontend
+          npm install --verbose
+          npm run generate-backend-client-mac
+          NODE_OPTIONS="--max-old-space-size=8192" npm run build
+        '';
+
+        installPhase = ''
+          mkdir -p $out/build
+          cp -r build $out/build
+        '';
+      };
+      packages.windmill = pkgs.rustPlatform.buildRustPackage {
+        inherit (environment) DATABASE_URL PKG_CONFIG_PATH;
+
+        pname = "windmill";
+        version = (pkgs.lib.strings.trim (builtins.readFile ./version.txt));
+
+        src = ./.;
+        nativeBuildInputs = buildInputs ++ [ self.packages.${system}.windmill-client ];
+
+        cargoRoot = "backend";
+        cargoLock = {
+          lockFile = ./backend/Cargo.lock;
+          outputHashes = {
+            "php-parser-rs-0.1.3" = "sha256-ZeI3KgUPmtjlRfq6eAYveqt8Ay35gwj6B9iOQRjQa9A=";
+            "progenitor-0.3.0" = "sha256-F6XRZFVIN6/HfcM8yI/PyNke45FL7jbcznIiqj22eIQ=";
+            "rustpython-ast-0.3.1" = "sha256-q9N+z3F6YICQuUMp3a10OS792tCq0GiSSlkcaLxi3Gs=";
+            "tiberius-0.12.2" = "sha256-s/S0K3hE+JNCrNVxoSCSs4myLHvukBYTwk2A5vZ7Ae8=";
+            "tinyvector-0.1.0" = "sha256-NYGhofU4rh+2IAM+zwe04YQdXY8Aa4gTmn2V2HtzRfI=";
+          };
+        };
+
+        buildFeatures = [ "enterprise" ];
+        doCheck = false;
+        preBuild = ''
+          export HOME=$(pwd)
+          npm config set strict-ssl false
+          cd backend
+          sqlx database create
+          sqlx migrate run
+        '';
+
+        FRONTEND_BUILD_DIR = "${self.packages.${system}.windmill-client}/build";
+        RUSTY_V8_ARCHIVE = (fetch_librusty_v8 {
+          version = "130.0.1";
+          shas = {
+            x86_64-linux = pkgs.lib.fakeHash;
+            aarch64-linux = pkgs.lib.fakeHash;
+            x86_64-darwin = pkgs.lib.fakeHash;
+            aarch64-darwin = "sha256-d1QTLt8gOUFxACes4oyIYgDF/srLOEk+5p5Oj1ECajQ=";
+          };
+        });
+      };
+    });
+}

From ceaf56c21ee2e548bc93859f9e0303e53b25b241 Mon Sep 17 00:00:00 2001
From: Guilhem <guilhemlemouel@gmail.com>
Date: Thu, 7 Nov 2024 15:50:18 +0100
Subject: [PATCH 33/80] feat(frontend): nodes from flow can be connected
 directly in expr input through a plug icon (#4652)

* Add flow prop picker

* fix unwanted copy

* cleaning

* Fix unset context

* move button and always display input

* fix unwanted proppicker display

* update

* update

* clean all

* clean all

---------

Co-authored-by: Ruben Fiszel <ruben@rubenfiszel.com>
---
 frontend/src/lib/components/Dev.svelte        |  7 +-
 .../src/lib/components/FlowPlugConnect.svelte | 19 +++++
 .../lib/components/InputTransformForm.svelte  | 36 +++------
 .../src/lib/components/SimpleEditor.svelte    |  1 +
 .../lib/components/common/popup/Popup.svelte  |  4 +-
 .../lib/components/flows/FlowEditor.svelte    | 10 ++-
 .../content/BranchPredicateEditor.svelte      |  2 +
 .../flows/content/FlowConstants.svelte        |  1 -
 .../components/flows/content/FlowLoop.svelte  | 59 +++++++++++---
 .../flows/map/FlowModuleSchemaItem.svelte     | 22 ++++++
 .../flows/map/FlowModuleSchemaMap.svelte      |  6 ++
 .../components/flows/map/VirtualItem.svelte   | 14 ++++
 .../flows/map/VirtualItemWrapper.svelte       |  2 +-
 .../flows/propPicker/FlowPropPicker.svelte    | 76 +++++++++++++++++++
 .../flows/propPicker/PropPickerWrapper.svelte | 71 ++++++++++++-----
 .../renderers/nodes/ForLoopStartNode.svelte   | 14 ++++
 .../graph/renderers/nodes/InputNode.svelte    | 18 +++++
 .../graph/renderers/nodes/NodeWrapper.svelte  | 14 +++-
 frontend/src/lib/components/prop_picker.ts    | 15 ++++
 .../propertyPicker/ObjectViewer.svelte        | 44 +++++------
 .../propertyPicker/PropPicker.svelte          | 28 ++++---
 .../triggers/ScheduledPollPanel.svelte        |  2 -
 frontend/src/lib/utils.ts                     | 38 ++++++++--
 frontend/src/routes/flows/dev/+page.svelte    |  7 +-
 24 files changed, 407 insertions(+), 103 deletions(-)
 create mode 100644 frontend/src/lib/components/FlowPlugConnect.svelte
 create mode 100644 frontend/src/lib/components/flows/propPicker/FlowPropPicker.svelte
 create mode 100644 frontend/src/lib/components/prop_picker.ts

diff --git a/frontend/src/lib/components/Dev.svelte b/frontend/src/lib/components/Dev.svelte
index bde2bd265f..5438c7edd4 100644
--- a/frontend/src/lib/components/Dev.svelte
+++ b/frontend/src/lib/components/Dev.svelte
@@ -49,6 +49,8 @@
 	} from '$lib/relative_imports'
 	import Tooltip from './Tooltip.svelte'
 	import type { ScheduleTrigger, TriggerContext } from './triggers'
+	import type { FlowPropPickerConfig, PropPickerContext } from './prop_picker'
+	import type { PickableProperties } from './flows/previousResults'
 	$: token = $page.url.searchParams.get('wm_token') ?? undefined
 	$: workspace = $page.url.searchParams.get('workspace') ?? undefined
 	$: themeDarkRaw = $page.url.searchParams.get('activeColorTheme')
@@ -503,7 +505,10 @@
 		customUi: {},
 		insertButtonOpen: writable(false)
 	})
-
+	setContext<PropPickerContext>('PropPickerContext', {
+		flowPropPickerConfig: writable<FlowPropPickerConfig | undefined>(undefined),
+		pickablePropertiesFiltered: writable<PickableProperties | undefined>(undefined)
+	})
 	$: updateFlow($flowStore)
 
 	let lastSent: OpenFlow | undefined = undefined
diff --git a/frontend/src/lib/components/FlowPlugConnect.svelte b/frontend/src/lib/components/FlowPlugConnect.svelte
new file mode 100644
index 0000000000..2bd993b92a
--- /dev/null
+++ b/frontend/src/lib/components/FlowPlugConnect.svelte
@@ -0,0 +1,19 @@
+<script lang="ts">
+	import { Plug } from 'lucide-svelte'
+	import { Button } from './common'
+	import AnimatedButton from './common/button/AnimatedButton.svelte'
+
+	export let connecting: boolean
+</script>
+
+<AnimatedButton animate={connecting} baseRadius="6px" animationDuration="2s" marginWidth="2px">
+	<Button
+		variant="border"
+		color="light"
+		size="xs2"
+		btnClasses={connecting ? 'text-blue-500' : 'text-primary'}
+		on:click
+	>
+		<Plug size={16} /> &rightarrow;
+	</Button>
+</AnimatedButton>
diff --git a/frontend/src/lib/components/InputTransformForm.svelte b/frontend/src/lib/components/InputTransformForm.svelte
index 7dc11e9229..07a7ee534d 100644
--- a/frontend/src/lib/components/InputTransformForm.svelte
+++ b/frontend/src/lib/components/InputTransformForm.svelte
@@ -19,7 +19,6 @@
 	import { codeToStaticTemplate, getDefaultExpr } from './flows/utils'
 	import SimpleEditor from './SimpleEditor.svelte'
 	import { Button } from '$lib/components/common'
-	import AnimatedButton from '$lib/components/common/button/AnimatedButton.svelte'
 	import ToggleButtonGroup from '$lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte'
 	import ToggleButton from '$lib/components/common/toggleButton-v2/ToggleButton.svelte'
 	import { tick } from 'svelte'
@@ -30,12 +29,13 @@
 	import type { InputTransform } from '$lib/gen'
 	import TemplateEditor from './TemplateEditor.svelte'
 	import { setInputCat as computeInputCat, isCodeInjection } from '$lib/utils'
-	import { FunctionSquare, Plug } from 'lucide-svelte'
+	import { FunctionSquare } from 'lucide-svelte'
 	import { getResourceTypes } from './resourceTypesStore'
 	import type { FlowCopilotContext } from './copilot/flow'
 	import StepInputGen from './copilot/StepInputGen.svelte'
 	import type { PickableProperties } from './flows/previousResults'
 	import { twMerge } from 'tailwind-merge'
+	import FlowPlugConnect from './FlowPlugConnect.svelte'
 	export let schema: Schema | { properties?: Record<string, any>; required?: string[] }
 	export let arg: InputTransform | any
 	export let argName: string
@@ -430,28 +430,16 @@
 						</ToggleButtonGroup>
 					</div>
 
-					<AnimatedButton
-						animate={connecting}
-						baseRadius="6px"
-						animationDuration="2s"
-						marginWidth="2px"
-					>
-						<Button
-							variant="border"
-							color="light"
-							size="xs2"
-							btnClasses={connecting ? 'text-blue-500' : 'text-primary'}
-							on:click={() => {
-								focusProp(argName, 'connect', (path) => {
-									connectProperty(path)
-									dispatch('change', { argName })
-									return true
-								})
-							}}
-						>
-							<Plug size={16} /> &rightarrow;
-						</Button>
-					</AnimatedButton>
+					<FlowPlugConnect
+						{connecting}
+						on:click={() => {
+							focusProp(argName, 'connect', (path) => {
+								connectProperty(path)
+								dispatch('change', { argName })
+								return true
+							})
+						}}
+					/>
 				</div>
 			{/if}
 		</div>
diff --git a/frontend/src/lib/components/SimpleEditor.svelte b/frontend/src/lib/components/SimpleEditor.svelte
index ae60b315c9..86ec070f86 100644
--- a/frontend/src/lib/components/SimpleEditor.svelte
+++ b/frontend/src/lib/components/SimpleEditor.svelte
@@ -241,6 +241,7 @@
 
 		editor.onDidFocusEditorText(() => {
 			dispatch('focus')
+			loadExtraLib()
 
 			editor.addCommand(KeyMod.CtrlCmd | KeyCode.KeyS, function () {
 				code = getCode()
diff --git a/frontend/src/lib/components/common/popup/Popup.svelte b/frontend/src/lib/components/common/popup/Popup.svelte
index eb5c15189f..aac6b4c2c8 100644
--- a/frontend/src/lib/components/common/popup/Popup.svelte
+++ b/frontend/src/lib/components/common/popup/Popup.svelte
@@ -19,9 +19,9 @@
 </script>
 
 <Popover on:close class="leading-none">
-	<PopoverButton>
+	<PopoverButton let:open>
 		<div use:floatingRef>
-			<slot name="button" />
+			<slot name="button" {open} />
 		</div>
 	</PopoverButton>
 	<ConditionalPortal condition={shouldUsePortal} {target}>
diff --git a/frontend/src/lib/components/flows/FlowEditor.svelte b/frontend/src/lib/components/flows/FlowEditor.svelte
index 01fb16db41..842c5df04d 100644
--- a/frontend/src/lib/components/flows/FlowEditor.svelte
+++ b/frontend/src/lib/components/flows/FlowEditor.svelte
@@ -4,11 +4,14 @@
 	import FlowModuleSchemaMap from './map/FlowModuleSchemaMap.svelte'
 	import WindmillIcon from '../icons/WindmillIcon.svelte'
 	import { Skeleton } from '../common'
-	import { getContext } from 'svelte'
+	import { getContext, setContext } from 'svelte'
 	import type { FlowEditorContext } from './types'
 	import type { FlowCopilotContext } from '../copilot/flow'
 	import { classNames } from '$lib/utils'
 
+	import { writable } from 'svelte/store'
+	import type { PropPickerContext, FlowPropPickerConfig } from '$lib/components/prop_picker'
+	import type { PickableProperties } from '$lib/components/flows/previousResults'
 	const { flowStore } = getContext<FlowEditorContext>('FlowEditorContext')
 
 	export let loading: boolean
@@ -24,6 +27,11 @@
 
 	const { currentStepStore: copilotCurrentStepStore } =
 		getContext<FlowCopilotContext>('FlowCopilotContext')
+
+	setContext<PropPickerContext>('PropPickerContext', {
+		flowPropPickerConfig: writable<FlowPropPickerConfig | undefined>(undefined),
+		pickablePropertiesFiltered: writable<PickableProperties | undefined>(undefined)
+	})
 </script>
 
 <div
diff --git a/frontend/src/lib/components/flows/content/BranchPredicateEditor.svelte b/frontend/src/lib/components/flows/content/BranchPredicateEditor.svelte
index 34156d128e..7e304e3d0f 100644
--- a/frontend/src/lib/components/flows/content/BranchPredicateEditor.svelte
+++ b/frontend/src/lib/components/flows/content/BranchPredicateEditor.svelte
@@ -37,12 +37,14 @@
 
 {#if open}
 	<PropPickerWrapper
+		alwaysOn
 		notSelectable
 		pickableProperties={stepPropPicker.pickableProperties}
 		on:select={({ detail }) => {
 			editor?.insertAtCursor(detail)
 			editor?.focus()
 		}}
+		paneClass="max-h-[320px] overflow-auto"
 	>
 		<div class="border border-gray-400">
 			<SimpleEditor
diff --git a/frontend/src/lib/components/flows/content/FlowConstants.svelte b/frontend/src/lib/components/flows/content/FlowConstants.svelte
index 76859bbcff..c0084d89bc 100644
--- a/frontend/src/lib/components/flows/content/FlowConstants.svelte
+++ b/frontend/src/lib/components/flows/content/FlowConstants.svelte
@@ -78,7 +78,6 @@
 
 	setContext<PropPickerWrapperContext>('PropPickerWrapper', {
 		inputMatches: writable(undefined),
-		filteredPickableProperties: writable(undefined),
 		focusProp: () => {},
 		propPickerConfig: writable(undefined),
 		clearFocus: () => {}
diff --git a/frontend/src/lib/components/flows/content/FlowLoop.svelte b/frontend/src/lib/components/flows/content/FlowLoop.svelte
index 6180d2f0fd..1d7a695ace 100644
--- a/frontend/src/lib/components/flows/content/FlowLoop.svelte
+++ b/frontend/src/lib/components/flows/content/FlowLoop.svelte
@@ -5,7 +5,7 @@
 	import Toggle from '$lib/components/Toggle.svelte'
 	import SimpleEditor from '$lib/components/SimpleEditor.svelte'
 	import Tooltip from '$lib/components/Tooltip.svelte'
-	import PropPickerWrapper from '../propPicker/PropPickerWrapper.svelte'
+
 	import FlowModuleEarlyStop from './FlowModuleEarlyStop.svelte'
 	import FlowModuleSuspend from './FlowModuleSuspend.svelte'
 	// import FlowRetries from './FlowRetries.svelte'
@@ -22,6 +22,10 @@
 	import FlowModuleDeleteAfterUse from './FlowModuleDeleteAfterUse.svelte'
 	import IteratorGen from '$lib/components/copilot/IteratorGen.svelte'
 	import FlowModuleSkip from './FlowModuleSkip.svelte'
+	import FlowPlugConnect from '$lib/components/FlowPlugConnect.svelte'
+
+	import PropPickerWrapper, { CONNECT } from '../propPicker/PropPickerWrapper.svelte'
+	import type { PropPickerContext } from '$lib/components/prop_picker'
 
 	const { previewArgs, flowStateStore, flowStore } =
 		getContext<FlowEditorContext>('FlowEditorContext')
@@ -35,6 +39,9 @@
 	let editor: SimpleEditor | undefined = undefined
 	let selected: string = 'early-stop'
 
+	const { flowPropPickerConfig } = getContext<PropPickerContext>('PropPickerContext')
+	flowPropPickerConfig.set(undefined)
+
 	$: stepPropPicker = getStepPropPicker(
 		$flowStateStore,
 		parentModule,
@@ -53,6 +60,17 @@
 	let iteratorGen: IteratorGen | undefined = undefined
 
 	$: previewIterationArgs = $flowStateStore[mod.id]?.previewArgs ?? {}
+
+	function setExpr(code: string) {
+		if (mod.value.type === 'forloopflow') {
+			mod.value.iterator = {
+				type: 'javascript',
+				expr: code
+			}
+		}
+		editor?.setCode('')
+		editor?.insertAtCursor(code)
+	}
 </script>
 
 <Drawer bind:open={previewOpen} alwaysOpen size="75%">
@@ -112,7 +130,8 @@
 								}}
 							/>
 						</div>
-						<div>
+						<div
+							>``
 							<div class="mb-2 text-sm font-bold">Run in parallel</div>
 							<Toggle
 								bind:checked={mod.value.parallel}
@@ -142,6 +161,27 @@
 								over. Example : ["banana", "apple", flow_input.my_fruit].
 							</Tooltip>
 						</div>
+						<FlowPlugConnect
+							connecting={$flowPropPickerConfig?.insertionMode == CONNECT}
+							on:click={() => {
+								const config = {
+									insertionMode: CONNECT,
+									onSelect: (code) => {
+										setExpr(code)
+										return true
+									},
+									clearFocus: () => {
+										flowPropPickerConfig.set(undefined)
+									}
+								}
+								flowPropPickerConfig.set({
+									...config,
+									clearFocus: () => {
+										flowPropPickerConfig.set(undefined)
+									}
+								})
+							}}
+						/>
 						{#if enableAi}
 							<IteratorGen
 								bind:this={iteratorGen}
@@ -151,14 +191,7 @@
 									editor?.setSuggestion(e.detail)
 								}}
 								on:setExpr={(e) => {
-									if (mod.value.type === 'forloopflow') {
-										mod.value.iterator = {
-											type: 'javascript',
-											expr: e.detail
-										}
-									}
-									editor?.setCode('')
-									editor?.insertAtCursor(e.detail)
+									setExpr(e.detail)
 								}}
 								pickableProperties={stepPropPicker.pickableProperties}
 							/>
@@ -173,9 +206,15 @@
 							on:keyup={iteratorGen?.onKeyUp}
 						>
 							<PropPickerWrapper
+								alwaysOn
 								notSelectable
 								pickableProperties={stepPropPicker.pickableProperties}
 								on:select={({ detail }) => {
+									if ($flowPropPickerConfig?.insertionMode == CONNECT) {
+										setExpr(detail)
+										flowPropPickerConfig.set(undefined)
+										return
+									}
 									editor?.insertAtCursor(detail)
 									editor?.focus()
 								}}
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
index d8c3ff63fb..ccf9c1696b 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
@@ -29,6 +29,8 @@
 	import { getDependeeAndDependentComponents } from '../flowExplorer'
 	import { replaceId } from '../flowStore'
 
+	import FlowPropPicker from '$lib/components/flows/propPicker/FlowPropPicker.svelte'
+	import type { PropPickerContext } from '$lib/components/prop_picker'
 	export let selected: boolean = false
 	export let deletable: boolean = false
 	export let retry: boolean = false
@@ -48,17 +50,25 @@
 	export let retries: number | undefined = undefined
 	export let warningMessage: string | undefined = undefined
 	export let isTrigger: boolean = false
+	let pickableIds: Record<string, any> | undefined = undefined
 
 	const { flowInputsStore } = getContext<{ flowInputsStore: Writable<FlowInput | undefined> }>(
 		'FlowGraphContext'
 	)
 
 	const flowEditorContext = getContext<FlowEditorContext>('FlowEditorContext')
+
 	const dispatch = createEventDispatcher()
 
 	const { currentStepStore: copilotCurrentStepStore } =
 		getContext<FlowCopilotContext | undefined>('FlowCopilotContext') || {}
 
+	const propPickerContext = getContext<PropPickerContext>('PropPickerContext')
+	const flowPropPickerConfig = propPickerContext?.flowPropPickerConfig
+	const pickablePropertiesFiltered = propPickerContext?.pickablePropertiesFiltered
+
+	$: pickableIds = $pickablePropertiesFiltered?.priorIds
+
 	let editId = false
 
 	let newId: string = id ?? ''
@@ -283,6 +293,18 @@ hover:border-blue-700 hover:!visible {hover ? '' : '!hidden'}"
 			{/if}
 		</div>
 	</div>
+
+	{#if id && $flowPropPickerConfig && pickableIds && Object.keys(pickableIds).includes(id)}
+		<div class="absolute -bottom-[14px] right-[21px] translate-x-[50%] center-center">
+			<FlowPropPicker
+				json={{
+					[id]: pickableIds[id]
+				}}
+				prefix={'results'}
+			/>
+		</div>
+	{/if}
+
 	{#if deletable}
 		<button
 			class="absolute -top-[10px] -right-[10px] rounded-full h-[20px] w-[20px] trash center-center text-secondary
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
index a9895086cd..28167493cf 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
@@ -34,6 +34,7 @@
 	import FlowGraphV2 from '$lib/components/graph/FlowGraphV2.svelte'
 	import { replaceId } from '../flowStore'
 	import { setScheduledPollSchedule, type TriggerContext } from '$lib/components/triggers'
+	import type { PropPickerContext } from '$lib/components/prop_picker'
 
 	export let modules: FlowModule[] | undefined
 	export let sidebarSize: number | undefined = undefined
@@ -49,6 +50,8 @@
 	const { selectedId, moving, history, flowStateStore, flowStore, flowInputsStore, pathStore } =
 		getContext<FlowEditorContext>('FlowEditorContext')
 	const { primarySchedule, triggersCount } = getContext<TriggerContext>('TriggerContext')
+
+	const { flowPropPickerConfig } = getContext<PropPickerContext>('PropPickerContext')
 	async function insertNewModuleAtIndex(
 		modules: FlowModule[],
 		index: number,
@@ -432,6 +435,9 @@
 					$flowStore = $flowStore
 				}
 			}}
+			on:select={async ({ detail }) => {
+				flowPropPickerConfig.set(undefined)
+			}}
 			on:changeId={({ detail }) => {
 				let { id, newId, deps } = detail
 				dfs($flowStore.value.modules, (mod) => {
diff --git a/frontend/src/lib/components/flows/map/VirtualItem.svelte b/frontend/src/lib/components/flows/map/VirtualItem.svelte
index 4b476709ac..a2e022e9ef 100644
--- a/frontend/src/lib/components/flows/map/VirtualItem.svelte
+++ b/frontend/src/lib/components/flows/map/VirtualItem.svelte
@@ -4,6 +4,8 @@
 	import { getContext } from 'svelte'
 	import type { FlowCopilotContext } from '$lib/components/copilot/flow'
 	import VirtualItemWrapper from './VirtualItemWrapper.svelte'
+	import type { PropPickerContext } from '$lib/components/prop_picker'
+	import FlowPropPicker from '$lib/components/flows/propPicker/FlowPropPicker.svelte'
 
 	export let label: string | undefined = undefined
 	export let bgColor: string = ''
@@ -14,9 +16,15 @@
 	export let borderColor: string | undefined = undefined
 	export let hideId: boolean = false
 	export let preLabel: string | undefined = undefined
+	export let inputJson: Object | undefined = undefined
+	export let prefix = ''
+	export let alwaysPluggable: boolean = false
 
 	const { currentStepStore: copilotCurrentStepStore } =
 		getContext<FlowCopilotContext | undefined>('FlowCopilotContext') || {}
+
+	const propPickerContext = getContext<PropPickerContext>('PropPickerContext')
+	const flowPropPickerConfig = propPickerContext?.flowPropPickerConfig
 </script>
 
 <VirtualItemWrapper
@@ -54,4 +62,10 @@
 			</div>
 		{/if}
 	</div>
+
+	{#if inputJson && $flowPropPickerConfig && (Object.keys(inputJson).length > 0 || alwaysPluggable)}
+		<div class="absolute -bottom-[14px] right-[21px] translate-x-[50%] center-center">
+			<FlowPropPicker json={inputJson} {prefix} />
+		</div>
+	{/if}
 </VirtualItemWrapper>
diff --git a/frontend/src/lib/components/flows/map/VirtualItemWrapper.svelte b/frontend/src/lib/components/flows/map/VirtualItemWrapper.svelte
index 4160bebf94..75d807b78a 100644
--- a/frontend/src/lib/components/flows/map/VirtualItemWrapper.svelte
+++ b/frontend/src/lib/components/flows/map/VirtualItemWrapper.svelte
@@ -25,7 +25,7 @@
 <!-- svelte-ignore a11y-no-static-element-interactions -->
 <div
 	class={classNames(
-		'w-full flex relative overflow-hidden rounded-sm',
+		'w-full flex relative rounded-sm',
 		selectable ? 'cursor-pointer' : '',
 		selected ? 'outline outline-offset-1 outline-2  outline-gray-600 dark:outline-gray-400' : '',
 		onTop ? 'z-[901]' : ''
diff --git a/frontend/src/lib/components/flows/propPicker/FlowPropPicker.svelte b/frontend/src/lib/components/flows/propPicker/FlowPropPicker.svelte
new file mode 100644
index 0000000000..5aa096470c
--- /dev/null
+++ b/frontend/src/lib/components/flows/propPicker/FlowPropPicker.svelte
@@ -0,0 +1,76 @@
+<script lang="ts">
+	import ObjectViewer from '$lib/components/propertyPicker/ObjectViewer.svelte'
+	import AnimatedButton from '$lib/components/common/button/AnimatedButton.svelte'
+	import { Popup } from '$lib/components/common'
+	import { Plug } from 'lucide-svelte'
+	import { twMerge } from 'tailwind-merge'
+	import type { PropPickerContext } from '$lib/components/prop_picker'
+	import { getContext } from 'svelte'
+	import Popover from '$lib/components/Popover.svelte'
+	import { tick } from 'svelte'
+
+	export let json = {}
+	export let prefix = ''
+
+	let isConnecting = false
+
+	const { flowPropPickerConfig } = getContext<PropPickerContext>('PropPickerContext')
+
+	async function updateConnecting() {
+		await tick()
+		isConnecting = $flowPropPickerConfig?.insertionMode === 'connect'
+	}
+
+	$: $flowPropPickerConfig, updateConnecting()
+</script>
+
+<button
+	on:click|preventDefault|stopPropagation={(e) => {
+		e.preventDefault()
+		e.stopPropagation()
+	}}
+	on:keydown|preventDefault|stopPropagation
+	data-prop-picker
+>
+	<AnimatedButton
+		animate={isConnecting}
+		wrapperClasses="h-[20px] w-[20px] "
+		baseRadius="9999px"
+		marginWidth="1px"
+	>
+		<Popup floatingConfig={{ strategy: 'fixed', placement: 'bottom-start' }}>
+			<svelte:fragment slot="button" let:open>
+				<Popover disablePopup={open}>
+					<svelte:fragment slot="text">node outputs</svelte:fragment>
+					<button
+						class={twMerge(
+							'rounded-full center-center h-[18px] w-[18px]',
+							isConnecting
+								? 'bg-surface text-blue-500'
+								: 'outline-[1px] outline dark:outline-gray-500 outline-gray-300 duration-150 bg-blue-500 hover:bg-blue-700 text-white'
+						)}
+					>
+						<Plug size={12} strokeWidth={2} />
+					</button>
+				</Popover>
+			</svelte:fragment>
+			<div data-prop-picker>
+				<ObjectViewer
+					{json}
+					topBrackets={false}
+					pureViewer={false}
+					{prefix}
+					on:select={({ detail }) => {
+						if ($flowPropPickerConfig?.onSelect(detail)) {
+							$flowPropPickerConfig?.clearFocus()
+							// console.log('BAR')
+						} else {
+							// console.log('FOO')
+						}
+					}}
+					allowCopy={!$flowPropPickerConfig}
+				/>
+			</div>
+		</Popup>
+	</AnimatedButton>
+</button>
diff --git a/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte b/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte
index 7ff05d9b4f..cd3a55fb8a 100644
--- a/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte
+++ b/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte
@@ -1,19 +1,22 @@
 <script context="module" lang="ts">
-	type InsertionMode = 'append' | 'connect' | 'insert'
-
 	type SelectCallback = (path: string) => boolean
 
-	type PropPickerConfig = {
-		insertionMode: InsertionMode
-		propName: string
+	export const CONNECT = 'connect' as const
+	export type PropPickerConfig = {
+		propName?: string
 		onSelect: SelectCallback
+		clearFocus: () => void
+		insertionMode: 'append' | 'connect' | 'insert'
 	}
 
 	export type PropPickerWrapperContext = {
 		propPickerConfig: Writable<PropPickerConfig | undefined>
 		inputMatches: Writable<{ word: string; value: string }[] | undefined>
-		filteredPickableProperties: Writable<PickableProperties | undefined>
-		focusProp: (propName: string, insertionMode: InsertionMode, onSelect: SelectCallback) => void
+		focusProp: (
+			propName: string,
+			insertionMode: 'append' | 'connect' | 'insert',
+			onSelect: SelectCallback
+		) => void
 		clearFocus: () => void
 	}
 </script>
@@ -22,12 +25,13 @@
 	import PropPicker from '$lib/components/propertyPicker/PropPicker.svelte'
 	import PropPickerResult from '$lib/components/propertyPicker/PropPickerResult.svelte'
 	import { clickOutside } from '$lib/utils'
-	import { createEventDispatcher, setContext } from 'svelte'
+	import { createEventDispatcher, getContext, setContext } from 'svelte'
 	import { Pane, Splitpanes } from 'svelte-splitpanes'
 	import { writable, type Writable } from 'svelte/store'
 	import type { PickableProperties } from '../previousResults'
 	import { twMerge } from 'tailwind-merge'
 	import AnimatedButton from '$lib/components/common/button/AnimatedButton.svelte'
+	import type { PropPickerContext } from '$lib/components/prop_picker'
 
 	export let pickableProperties: PickableProperties | undefined
 	export let result: any = undefined
@@ -37,33 +41,61 @@
 	export let displayContext = true
 	export let notSelectable = false
 	export let noPadding: boolean = false
+	export let alwaysOn: boolean = false
+	export let paneClass: string = ''
+
+	const propPickerConfig: Writable<PropPickerConfig | undefined> = writable<
+		PropPickerConfig | undefined
+	>(undefined)
 
-	const propPickerConfig = writable<PropPickerConfig | undefined>(undefined)
-	const filteredPickableProperties = writable<PickableProperties | undefined>(undefined)
 	const inputMatches = writable<{ word: string; value: string }[] | undefined>(undefined)
 	const dispatch = createEventDispatcher()
 
+	const { flowPropPickerConfig } = getContext<PropPickerContext>('PropPickerContext')
+	flowPropPickerConfig.set(undefined)
 	setContext<PropPickerWrapperContext>('PropPickerWrapper', {
 		propPickerConfig,
 		inputMatches,
-		filteredPickableProperties,
 		focusProp: (propName, insertionMode, onSelect) => {
-			propPickerConfig.set({
+			const config = {
 				propName,
 				insertionMode,
-				onSelect
+				onSelect,
+				clearFocus: () => {
+					propPickerConfig.set(undefined)
+					flowPropPickerConfig.set(undefined)
+				}
+			}
+			propPickerConfig.set(config)
+			flowPropPickerConfig.set({
+				...config,
+				clearFocus: () => {
+					propPickerConfig.set(undefined)
+					flowPropPickerConfig.set(undefined)
+				}
 			})
 		},
 		clearFocus: () => {
+			flowPropPickerConfig.set(undefined)
 			propPickerConfig.set(undefined)
 		}
 	})
+
+	async function getPropPickerElements(): Promise<HTMLElement[]> {
+		return Array.from(
+			document.querySelectorAll('[data-prop-picker], [data-prop-picker] *')
+		) as HTMLElement[]
+	}
 </script>
 
 <div
 	class="h-full w-full"
-	use:clickOutside
-	on:click_outside={() => propPickerConfig.set(undefined)}
+	data-prop-picker-root
+	use:clickOutside={{ capture: true, exclude: getPropPickerElements }}
+	on:click_outside={() => {
+		propPickerConfig.set(undefined)
+		flowPropPickerConfig.set(undefined)
+	}}
 >
 	<Splitpanes class={$propPickerConfig ? 'splitpanes-remove-splitter' : ''}>
 		<Pane
@@ -76,12 +108,12 @@
 		<Pane
 			minSize={20}
 			size={40}
-			class="!transition-none z-1000 {$propPickerConfig ? 'ml-[-1px]' : ''}"
+			class="!transition-none z-1000 {$propPickerConfig ? 'ml-[-1px]' : ''} {paneClass}"
 		>
 			<AnimatedButton
 				animate={$propPickerConfig?.insertionMode == 'connect'}
 				baseRadius="4px"
-				wrapperClasses="h-full w-full pt-2 !bg-surface"
+				wrapperClasses="h-full w-full pt-2 !bg-surface "
 				marginWidth="3px"
 				ringColor={$propPickerConfig?.insertionMode == 'insert' ||
 				$propPickerConfig?.insertionMode == 'append'
@@ -98,12 +130,13 @@
 						on:select={({ detail }) => {
 							dispatch('select', detail)
 							if ($propPickerConfig?.onSelect(detail)) {
-								propPickerConfig.set(undefined)
+								$propPickerConfig?.clearFocus()
 							}
 						}}
 					/>
 				{:else if pickableProperties}
 					<PropPicker
+						{alwaysOn}
 						{displayContext}
 						{error}
 						{pickableProperties}
@@ -111,7 +144,7 @@
 						on:select={({ detail }) => {
 							dispatch('select', detail)
 							if ($propPickerConfig?.onSelect(detail)) {
-								propPickerConfig.set(undefined)
+								$propPickerConfig?.clearFocus()
 							}
 						}}
 					/>
diff --git a/frontend/src/lib/components/graph/renderers/nodes/ForLoopStartNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/ForLoopStartNode.svelte
index 48d2c6a091..8f3d12c070 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/ForLoopStartNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/ForLoopStartNode.svelte
@@ -5,6 +5,8 @@
 	import { getStateColor } from '../../util'
 	import type { GraphModuleState } from '../../model'
 	import type { GraphEventHandlers } from '../../graphBuilder'
+	import { getContext } from 'svelte'
+	import type { PropPickerContext } from '$lib/components/prop_picker'
 
 	export let data: {
 		offset: number
@@ -14,6 +16,16 @@
 		eventHandlers: GraphEventHandlers
 		simplifiedTriggerView: boolean
 	}
+
+	const propPickerContext = getContext<PropPickerContext>('PropPickerContext')
+	const pickablePropertiesFiltered = propPickerContext?.pickablePropertiesFiltered
+
+	$: filteredInput = filterIterFromInput($pickablePropertiesFiltered?.flow_input)
+
+	function filterIterFromInput(inputJson: Record<string, any> | undefined): Record<string, any> {
+		if (!inputJson || typeof inputJson !== 'object' || !inputJson.iter) return {}
+		return { iter: inputJson.iter }
+	}
 </script>
 
 <NodeWrapper let:darkMode offset={data.offset}>
@@ -28,5 +40,7 @@
 		on:select={(e) => {
 			data?.eventHandlers?.select(e.detail)
 		}}
+		inputJson={filteredInput}
+		prefix="flow_input"
 	/>
 </NodeWrapper>
diff --git a/frontend/src/lib/components/graph/renderers/nodes/InputNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/InputNode.svelte
index 7fe4f499cc..30eb352800 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/InputNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/InputNode.svelte
@@ -7,6 +7,7 @@
 	import { getContext } from 'svelte'
 	import type { Writable } from 'svelte/store'
 	import InsertModuleButton from '$lib/components/flows/map/InsertModuleButton.svelte'
+	import type { PropPickerContext } from '$lib/components/prop_picker'
 
 	export let data: {
 		hasPreprocessor: boolean
@@ -22,6 +23,20 @@
 	const { selectedId } = getContext<{
 		selectedId: Writable<string | undefined>
 	}>('FlowGraphContext')
+
+	const propPickerContext = getContext<PropPickerContext>('PropPickerContext')
+	const pickablePropertiesFiltered = propPickerContext?.pickablePropertiesFiltered
+
+	function filterIterFromInput(inputJson: Record<string, any> | undefined): Record<string, any> {
+		if (!inputJson || typeof inputJson !== 'object') return {}
+
+		const newJson = { ...inputJson }
+		delete newJson.iter
+
+		return newJson
+	}
+
+	$: filteredInput = filterIterFromInput($pickablePropertiesFiltered?.flow_input)
 </script>
 
 <NodeWrapper let:darkMode>
@@ -65,5 +80,8 @@
 		on:select={(e) => {
 			data.eventHandlers?.select(e.detail)
 		}}
+		inputJson={filteredInput}
+		prefix="flow_input"
+		alwaysPluggable
 	/>
 </NodeWrapper>
diff --git a/frontend/src/lib/components/graph/renderers/nodes/NodeWrapper.svelte b/frontend/src/lib/components/graph/renderers/nodes/NodeWrapper.svelte
index bbf920adc7..e4e13a649c 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/NodeWrapper.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/NodeWrapper.svelte
@@ -18,9 +18,19 @@
 </div>
 
 {#if enableSourceHandle}
-	<Handle type="source" position={Position.Bottom} style={`margin-left: ${offset / 2}px;`} />
+	<Handle
+		type="source"
+		isConnectable={false}
+		position={Position.Bottom}
+		style={`margin-left: ${offset / 2}px;`}
+	/>
 {/if}
 
 {#if enableTargetHandle}
-	<Handle type="target" position={Position.Top} style={`margin-left: ${offset / 2}px;`} />
+	<Handle
+		type="target"
+		isConnectable={false}
+		position={Position.Top}
+		style={`margin-left: ${offset / 2}px;`}
+	/>
 {/if}
diff --git a/frontend/src/lib/components/prop_picker.ts b/frontend/src/lib/components/prop_picker.ts
new file mode 100644
index 0000000000..4940f92244
--- /dev/null
+++ b/frontend/src/lib/components/prop_picker.ts
@@ -0,0 +1,15 @@
+import type { Writable } from 'svelte/store'
+import type { PickableProperties } from '$lib/components/flows/previousResults'
+
+type InsertionMode = 'append' | 'connect' | 'insert'
+
+export type FlowPropPickerConfig = {
+	insertionMode: InsertionMode
+	clearFocus: () => void
+	onSelect: (path: string) => boolean
+}
+
+export type PropPickerContext = {
+	flowPropPickerConfig: Writable<FlowPropPickerConfig | undefined>
+	pickablePropertiesFiltered: Writable<PickableProperties | undefined>
+}
diff --git a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
index 034689bdec..8d2d196134 100644
--- a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
+++ b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
@@ -98,20 +98,19 @@
 			<ul class={`w-full ${level === 0 ? 'border-none' : 'pl-2 border-l border-dotted'}`}>
 				{#each keys.length > keyLimit ? keys.slice(0, keyLimit) : keys as key, index (key)}
 					<li>
-						<div class="inline-flex items-baseline">
-							<Button
-								on:click={() => selectProp(key, undefined, false)}
-								size="xs2"
-								color="light"
-								variant="border"
-								wrapperClasses="inline-flex p-0 whitespace-nowrap w-fit"
-								btnClasses="font-mono h-4 text-2xs font-thin px-1 rounded-[0.275rem]"
-								title={computeFullKey(key, rawKey)}
-							>
-								<span class={pureViewer ? 'cursor-auto' : ''}>{!isArray ? key : index} </span>
-							</Button>
-							<span class="text-2xs text-tertiary">:</span>
-						</div>
+						<Button
+							on:click={() => selectProp(key, undefined, false)}
+							size="xs2"
+							color="light"
+							variant="border"
+							wrapperClasses="inline-flex p-0 whitespace-nowrap w-fit"
+							btnClasses="font-mono h-4 text-2xs font-thin px-1 rounded-[0.275rem]"
+							title={computeFullKey(key, rawKey)}
+						>
+							<span class={pureViewer ? 'cursor-auto' : ''}>{!isArray ? key : index} </span>
+						</Button>
+						<span class="text-2xs -ml-0.5 text-tertiary">:</span>
+
 						{#if getTypeAsString(json[key]) === 'object'}
 							<svelte:self
 								json={json[key]}
@@ -124,15 +123,16 @@
 								collapsed={collapseLevel !== undefined ? level + 1 >= collapseLevel : undefined}
 							/>
 						{:else}
-							<button
-								class="val text-left {pureViewer
+							<!-- svelte-ignore a11y-click-events-have-key-events -->
+							<!-- svelte-ignore a11y-no-static-element-interactions -->
+							<span
+								class="val inline text-left {pureViewer
 									? 'cursor-auto'
-									: ''} rounded px-1 {getTypeAsString(json[key])}"
+									: ''} rounded pl-0.5 {getTypeAsString(json[key])}"
 								on:click={() => {
 									selectProp(key, json[key], true)
 								}}
 								title={JSON.stringify(json[key])}
-								disabled={false}
 							>
 								{#if json[key] === NEVER_TESTED_THIS_FAR}
 									<span class="text-2xs text-tertiary font-normal">
@@ -149,7 +149,7 @@
 										{truncate(JSON.stringify(json[key]), 200)}
 									</span>
 								{/if}
-							</button>
+							</span>
 						{/if}
 					</li>
 				{/each}
@@ -190,18 +190,18 @@
 	<!-- svelte-ignore a11y-no-static-element-interactions -->
 
 	{#if fullyCollapsed}
-		<div class="inline-flex relative">
+		<span>
 			<Button
 				color="light"
 				size="xs2"
 				variant="border"
 				on:click={collapse}
 				wrapperClasses="inline-flex w-fit"
-				btnClasses="font-normal h-4 text-2xs px-1 text-primary rounded-[0.275rem]"
+				btnClasses="h-4 text-[9px] px-1  text-primary rounded-[0.275rem]"
 			>
 				{openBracket}{collapsedSymbol}{closeBracket}
 			</Button>
-		</div>
+		</span>
 	{/if}
 {:else if topBrackets}
 	<span class="text-primary">{openBracket}{closeBracket}</span>
diff --git a/frontend/src/lib/components/propertyPicker/PropPicker.svelte b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
index e4d598d793..0abd608811 100644
--- a/frontend/src/lib/components/propertyPicker/PropPicker.svelte
+++ b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
@@ -10,11 +10,13 @@
 	import type { PickableProperties } from '../flows/previousResults'
 	import ClearableInput from '../common/clearableInput/ClearableInput.svelte'
 	import { filterNestedObject } from '../flows/previousResults'
+	import type { PropPickerContext } from '../prop_picker'
 
 	export let pickableProperties: PickableProperties
 	export let displayContext = true
 	export let error: boolean = false
 	export let allowCopy = false
+	export let alwaysOn = false
 
 	$: previousId = pickableProperties?.previousId
 	let variables: Record<string, string> = {}
@@ -36,10 +38,12 @@
 	const EMPTY_STRING = ''
 	let search = ''
 
-	const { propPickerConfig, filteredPickableProperties, inputMatches } =
+	const { propPickerConfig, inputMatches } =
 		getContext<PropPickerWrapperContext>('PropPickerWrapper')
 
-	$filteredPickableProperties = { ...pickableProperties }
+	const { pickablePropertiesFiltered } = getContext<PropPickerContext>('PropPickerContext')
+	$: $pickablePropertiesFiltered = pickableProperties
+
 	let flowInputsFiltered = pickableProperties.flow_input
 	let resultByIdFiltered = pickableProperties.priorIds
 
@@ -57,14 +61,13 @@
 				search === EMPTY_STRING
 					? pickableProperties.priorIds
 					: keepByKey(pickableProperties.priorIds, search)
-
-			console.log(resultByIdFiltered, search)
 		}, 50)
 	}
 
-	$: suggestedPropsFiltered = $propPickerConfig
-		? keepByKey(pickableProperties.priorIds, $propPickerConfig.propName)
-		: undefined
+	$: suggestedPropsFiltered =
+		$propPickerConfig && $propPickerConfig.propName
+			? keepByKey(pickableProperties.priorIds, $propPickerConfig.propName ?? '')
+			: undefined
 	$: search != undefined && onSearch(search)
 
 	async function loadVariables() {
@@ -116,9 +119,9 @@
 			}
 		}
 
-		if ($filteredPickableProperties) {
-			resultByIdFiltered && ($filteredPickableProperties.priorIds = resultByIdFiltered)
-			flowInputsFiltered && ($filteredPickableProperties.flow_input = flowInputsFiltered)
+		if ($pickablePropertiesFiltered) {
+			resultByIdFiltered && ($pickablePropertiesFiltered.priorIds = resultByIdFiltered)
+			flowInputsFiltered && ($pickablePropertiesFiltered.flow_input = flowInputsFiltered)
 		}
 	}
 
@@ -185,7 +188,10 @@
 	<div class="px-2 py-2">
 		<ClearableInput bind:value={search} placeholder="Search prop..." />
 	</div>
-	<div class="overflow-y-auto px-2 pt-2 grow" class:bg-surface-secondary={!$propPickerConfig}>
+	<div
+		class="overflow-y-auto px-2 pt-2 grow"
+		class:bg-surface-secondary={!$propPickerConfig && !alwaysOn}
+	>
 		{#if flowInputsFiltered && (Object.keys(flowInputsFiltered).length > 0 || !filterActive)}
 			<div class="flex justify-between items-center space-x-1">
 				<span class="font-normal text-sm text-secondary">Flow Input</span>
diff --git a/frontend/src/lib/components/triggers/ScheduledPollPanel.svelte b/frontend/src/lib/components/triggers/ScheduledPollPanel.svelte
index b373d75302..f875953374 100644
--- a/frontend/src/lib/components/triggers/ScheduledPollPanel.svelte
+++ b/frontend/src/lib/components/triggers/ScheduledPollPanel.svelte
@@ -2,8 +2,6 @@
 	import Alert from '$lib/components/common/alert/Alert.svelte'
 	import Label from '$lib/components/Label.svelte'
 	import { base } from '$lib/base'
-
-	$: console.log('dbg base', base)
 </script>
 
 <div class="flex flex-col w-full gap-4 text-sm">
diff --git a/frontend/src/lib/utils.ts b/frontend/src/lib/utils.ts
index e2dabd8f3b..4b99e32084 100644
--- a/frontend/src/lib/utils.ts
+++ b/frontend/src/lib/utils.ts
@@ -171,13 +171,36 @@ export function validatePassword(password: string): boolean {
 
 const portalDivs = ['app-editor-select']
 
-export function clickOutside(node: Node, capture?: boolean): { destroy(): void } {
-	const handleClick = (event: MouseEvent) => {
+interface ClickOutsideOptions {
+	capture?: boolean
+	exclude?: (() => Promise<HTMLElement[]>) | HTMLElement[] | undefined
+}
+
+export function clickOutside(
+	node: Node,
+	options?: ClickOutsideOptions | boolean
+): { destroy(): void; update(newOptions: ClickOutsideOptions | boolean): void } {
+	const handleClick = async (event: MouseEvent) => {
 		const target = event.target as HTMLElement
+		const opts = typeof options === 'boolean' ? { capture: options } : options
 
-		if (node && !node.contains(target) && !event.defaultPrevented) {
+		let excludedElements: HTMLElement[] = []
+		if (opts?.exclude) {
+			if (Array.isArray(opts.exclude)) {
+				excludedElements = opts.exclude
+			} else {
+				excludedElements = await opts.exclude()
+			}
+		}
+
+		const isExcluded = excludedElements.some((excludedEl) => {
+			const contains = excludedEl?.contains?.(target)
+			const isTarget = target === excludedEl
+			return contains || isTarget
+		})
+
+		if (node && !node.contains(target) && !event.defaultPrevented && !isExcluded) {
 			const portalDivsSelector = portalDivs.map((id) => `#${id}`).join(', ')
-
 			const parent = target.closest(portalDivsSelector)
 
 			if (!parent) {
@@ -186,9 +209,13 @@ export function clickOutside(node: Node, capture?: boolean): { destroy(): void }
 		}
 	}
 
+	const capture = typeof options === 'boolean' ? options : options?.capture ?? true
 	document.addEventListener('click', handleClick, capture ?? true)
 
 	return {
+		update(newOptions: ClickOutsideOptions | boolean) {
+			options = newOptions
+		},
 		destroy() {
 			document.removeEventListener('click', handleClick, capture ?? true)
 		}
@@ -724,7 +751,7 @@ export async function tryEvery({
 		try {
 			await tryCode()
 			break
-		} catch (err) { }
+		} catch (err) {}
 		i++
 	}
 	if (i >= times) {
@@ -948,5 +975,4 @@ export function getSchemaFromProperties(properties: { [name: string]: SchemaProp
 export function validateFileExtension(ext: string) {
 	const validExtensionRegex = /^[a-zA-Z0-9]+([._][a-zA-Z0-9]+)*$/
 	return validExtensionRegex.test(ext)
-
 }
diff --git a/frontend/src/routes/flows/dev/+page.svelte b/frontend/src/routes/flows/dev/+page.svelte
index fa984f0fd4..cb984d1095 100644
--- a/frontend/src/routes/flows/dev/+page.svelte
+++ b/frontend/src/routes/flows/dev/+page.svelte
@@ -17,6 +17,8 @@
 	import { getUserExt } from '$lib/user'
 	import DarkModeToggle from '$lib/components/sidebar/DarkModeToggle.svelte'
 	import type { ScheduleTrigger, TriggerContext } from '$lib/components/triggers'
+	import type { FlowPropPickerConfig, PropPickerContext } from '$lib/components/prop_picker'
+	import type { PickableProperties } from '$lib/components/flows/previousResults'
 
 	let token = $page.url.searchParams.get('wm_token') ?? undefined
 	let workspace = $page.url.searchParams.get('workspace') ?? undefined
@@ -99,7 +101,10 @@
 		customUi: {},
 		insertButtonOpen: writable(false)
 	})
-
+	setContext<PropPickerContext>('PropPickerContext', {
+		flowPropPickerConfig: writable<FlowPropPickerConfig | undefined>(undefined),
+		pickablePropertiesFiltered: writable<PickableProperties | undefined>(undefined)
+	})
 	type LastEdit = {
 		content: string
 		path: string

From 22b102eda7781f2dd1e7c1d7f9335dd4fb85c607 Mon Sep 17 00:00:00 2001
From: Henri Courdent <122811744+hcourdent@users.noreply.github.com>
Date: Thu, 7 Nov 2024 16:14:45 +0100
Subject: [PATCH 34/80] Frontend typo fixes, tooltips, doc links, minor aspects
 (#4663)

* Frontend typo fixes, tooltips, doc links, minor aspects

* Buttons dark mode
---
 .../src/lib/components/ScriptBuilder.svelte   | 74 ++++++++++++++++---
 frontend/src/lib/components/Toggle.svelte     |  5 +-
 .../details/ErrorHandlerToggleButtonV2.svelte |  3 +-
 .../flows/content/FlowConstants.svelte        |  4 +-
 .../flows/content/FlowSettings.svelte         | 40 ++++++----
 .../flows/map/FlowConstantsItem.svelte        |  2 +-
 .../flows/map/FlowSettingsItem.svelte         | 15 ++--
 .../triggers/ScheduledPollPanel.svelte        |  2 +-
 8 files changed, 107 insertions(+), 38 deletions(-)

diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte
index 54b9a5b09b..44a73f5bdd 100644
--- a/frontend/src/lib/components/ScriptBuilder.svelte
+++ b/frontend/src/lib/components/ScriptBuilder.svelte
@@ -637,7 +637,14 @@
 						cannot be inferred from the type directly.
 					</Tooltip>
 				</Tab>
-				<Tab value="triggers">Triggers</Tab>
+				<Tab value="triggers">
+					Triggers
+					<Tooltip
+						documentationLink="https://www.windmill.dev/docs/getting_started/trigger_scripts"
+					>
+						Configure how this script will be triggered.
+					</Tooltip>
+				</Tab>
 				<svelte:fragment slot="content">
 					<div
 						class={selectedTab === 'ui' ? 'p-0' : 'p-4'}
@@ -683,6 +690,11 @@
 											/>
 										</Label>
 										<Label label="Path">
+											<svelte:fragment slot="header">
+												<Tooltip documentationLink="https://www.windmill.dev/docs/core_concepts/roles_and_permissions#path">
+													The unique identifier of the script in the workspace that defines permissions
+												</Tooltip>
+											</svelte:fragment>
 											<Path
 												bind:this={path}
 												bind:error={pathError}
@@ -702,7 +714,7 @@
 												promptConfigName="description"
 												elementType="textarea"
 												elementProps={{
-													placeholder: 'Description displayed'
+													placeholder: 'What this script does and how to use it'
 												}}
 											/>
 										</Label>
@@ -782,7 +794,9 @@
 
 								<Section label="Script kind">
 									<svelte:fragment slot="header">
-										<Tooltip>
+										<Tooltip
+											documentationLink="https://www.windmill.dev/docs/script_editor/script_kinds"
+										>
 											Tag this script's purpose within flows such that it is available as the
 											corresponding action.
 										</Tooltip>
@@ -813,6 +827,13 @@
 						<TabContent value="runtime">
 							<div class="flex flex-col gap-8">
 								<Section label="Concurrency limits" eeOnly>
+									<svelte:fragment slot="header">
+										<Tooltip
+											documentationLink="https://www.windmill.dev/docs/core_concepts/concurrency_limits"
+										>
+											Allowed concurrency within a given timeframe
+										</Tooltip>
+									</svelte:fragment>
 									<div class="flex flex-col gap-4">
 										<Label label="Max number of executions within the time window">
 											<div class="flex flex-row gap-2 max-w-sm">
@@ -841,7 +862,9 @@
 										</Label>
 										<Label label="Custom concurrency key (optional)">
 											<svelte:fragment slot="header">
-												<Tooltip>
+												<Tooltip
+													documentationLink="https://www.windmill.dev/docs/core_concepts/concurrency_limits#custom-concurrency-key"
+												>
 													Concurrency keys are global, you can have them be workspace specific using
 													the variable `$workspace`. You can also use an argument's value using
 													`$args[name_of_arg]`</Tooltip
@@ -857,7 +880,7 @@
 										</Label>
 									</div>
 								</Section>
-								<Section label="Worker Group Tag (Queue)">
+								<Section label="Worker group tag (queue)">
 									<svelte:fragment slot="header">
 										<Tooltip
 											documentationLink="https://www.windmill.dev/docs/core_concepts/worker_groups"
@@ -869,6 +892,13 @@
 									<WorkerTagPicker bind:tag={script.tag} />
 								</Section>
 								<Section label="Cache">
+									<svelte:fragment slot="header">
+										<Tooltip
+											documentationLink="https://www.windmill.dev/docs/core_concepts/caching"
+										>
+											Cache the results for each possible inputs
+										</Tooltip>
+									</svelte:fragment>
 									<div class="flex gap-2 shrink flex-col">
 										<Toggle
 											size="sm"
@@ -895,6 +925,13 @@
 									</div>
 								</Section>
 								<Section label="Timeout">
+									<svelte:fragment slot="header">
+										<Tooltip
+											documentationLink="https://www.windmill.dev/docs/script_editor/settings#timeout"
+										>
+											Add a custom timeout for this script
+										</Tooltip>
+									</svelte:fragment>
 									<div class="flex gap-2 shrink flex-col">
 										<Toggle
 											size="sm"
@@ -918,7 +955,14 @@
 										{/if}
 									</div>
 								</Section>
-								<Section label="Perpetual Script">
+								<Section label="Perpetual script">
+									<svelte:fragment slot="header">
+										<Tooltip
+											documentationLink="https://www.windmill.dev/docs/script_editor/perpetual_scripts"
+										>
+											Restart the script upon ending unless cancelled
+										</Tooltip>
+									</svelte:fragment>
 									<div class="flex gap-2 shrink flex-col">
 										<Toggle
 											size="sm"
@@ -936,7 +980,7 @@
 										/>
 									</div>
 								</Section>
-								<Section label="Dedicated Workers" eeOnly>
+								<Section label="Dedicated workers" eeOnly>
 									<Toggle
 										disabled={!$enterpriseLicense ||
 											isCloudHosted() ||
@@ -966,7 +1010,9 @@
 									{/if}
 									<svelte:fragment slot="header">
 										<Tooltip
-											>In this mode, the script is meant to be run on dedicated workers that run the
+											documentationLink="https://www.windmill.dev/docs/core_concepts/dedicated_workers"
+										>
+											In this mode, the script is meant to be run on dedicated workers that run the
 											script at native speed. Can reach >1500rps per dedicated worker. Only
 											available on enterprise edition and for Python3, Deno and Bun. For other
 											languages, the efficiency is already on par with deidcated workers since they
@@ -976,7 +1022,9 @@
 								</Section>
 								<Section label="Delete after use">
 									<svelte:fragment slot="header">
-										<Tooltip>
+										<Tooltip
+											documentationLink="https://www.windmill.dev/docs/script_editor/settings#delete-after-use"
+										>
 											WARNING: This settings ONLY applies to synchronous webhooks or when the script
 											is used within a flow. If used individually, this script must be triggered
 											using a synchronous endpoint to have the desired effect.
@@ -1048,7 +1096,9 @@
 										</Toggle>
 										<svelte:fragment slot="header">
 											<!-- TODO: Add EE-only badge when we have it -->
-											<Tooltip>
+											<Tooltip
+												documentationLink="https://www.windmill.dev/docs/core_concepts/jobs#high-priority-jobs"
+											>
 												Jobs from script labeled as high priority take precedence over the other
 												jobs when in the jobs queue.
 												{#if !$enterpriseLicense}This is a feature only available on enterprise
@@ -1059,7 +1109,9 @@
 								{/if}
 								<Section label="Runs visibility">
 									<svelte:fragment slot="header">
-										<Tooltip>
+										<Tooltip
+											documentationLink="https://www.windmill.dev/docs/core_concepts/monitor_past_and_future_runs#invisible-runs"
+										>
 											When this option is enabled, manual executions of this script are invisible to
 											users other than the user running it, including the owner(s). This setting can
 											be overridden when this script is run manually from the advanced menu.
diff --git a/frontend/src/lib/components/Toggle.svelte b/frontend/src/lib/components/Toggle.svelte
index 2702657a8d..c50b29414a 100644
--- a/frontend/src/lib/components/Toggle.svelte
+++ b/frontend/src/lib/components/Toggle.svelte
@@ -10,6 +10,7 @@
 		leftTooltip?: string
 		right?: string
 		rightTooltip?: string
+		rightDocumentationLink?: string
 	} = {}
 	export let checked: boolean = false
 	export let disabled = false
@@ -94,7 +95,9 @@
 		>
 			{options?.right}
 			{#if options?.rightTooltip}
-				<Tooltip light={lightMode}>{options?.rightTooltip}</Tooltip>
+				<Tooltip documentationLink={options.rightDocumentationLink}>
+					{options.rightTooltip}
+				</Tooltip>
 			{/if}
 		</span>
 	{/if}
diff --git a/frontend/src/lib/components/details/ErrorHandlerToggleButtonV2.svelte b/frontend/src/lib/components/details/ErrorHandlerToggleButtonV2.svelte
index 18d1bd5591..8f52f2293a 100644
--- a/frontend/src/lib/components/details/ErrorHandlerToggleButtonV2.svelte
+++ b/frontend/src/lib/components/details/ErrorHandlerToggleButtonV2.svelte
@@ -61,7 +61,8 @@
 	on:change={toggleErrorHandler}
 	options={{
 		right: 'Mute',
-		rightTooltip: 'Disable workspace error handler, EE only'
+		rightTooltip: 'Disable workspace error handler, EE only',
+		rightDocumentationLink: 'https://www.windmill.dev/docs/core_concepts/error_handling#workspace-error-handler'
 	}}
 	{textDisabled}
 />
diff --git a/frontend/src/lib/components/flows/content/FlowConstants.svelte b/frontend/src/lib/components/flows/content/FlowConstants.svelte
index c0084d89bc..2c79a364c0 100644
--- a/frontend/src/lib/components/flows/content/FlowConstants.svelte
+++ b/frontend/src/lib/components/flows/content/FlowConstants.svelte
@@ -89,8 +89,8 @@
 		<Toggle slot="header" bind:checked={hideOptional} options={{ left: 'Hide optional inputs' }} />
 		<div class="min-h-full flex-1">
 			<Alert type="info" title="Static Inputs" class="m-4"
-				>This page centralizes the static inputs of every steps. It is akin to a file containing all
-				constants. Modifying a value here modify it in the step input directly. It is especially
+				>This page centralizes the static inputs of every steps. It is aking to a file containing all
+				constants. Modifying a value here modifies it in the step input directly. It is especially
 				useful when forking a flow to get an overview of all the variables to parametrize that are
 				not exposed directly as flow inputs.</Alert
 			>
diff --git a/frontend/src/lib/components/flows/content/FlowSettings.svelte b/frontend/src/lib/components/flows/content/FlowSettings.svelte
index 8883b9cc65..51a2410b31 100644
--- a/frontend/src/lib/components/flows/content/FlowSettings.svelte
+++ b/frontend/src/lib/components/flows/content/FlowSettings.svelte
@@ -107,7 +107,7 @@
 						elementType="textarea"
 						elementProps={{
 							id: 'inp',
-							placeholder: 'What this flow does and how to use it.'
+							placeholder: 'What this flow does and how to use it'
 						}}
 					/>
 				</Label>
@@ -135,9 +135,10 @@
 								}
 							}}
 							options={{
-								right: 'Worker Group Tag (Queue)',
+								right: 'Worker group tag (queue)',
 								rightTooltip:
-									"When a worker group tag is defined at the flow level, any steps inside the flow will run on any worker group that listen to that tag, regardless of the steps tag. If no worker group tags is defined, the flow controls will be executed with the default tag 'flow' and the steps will be executed with their respective tag"
+									"When a worker group tag is defined at the flow level, any steps inside the flow will run on any worker group that listen to that tag, regardless of the steps tag. If no worker group tags is defined, the flow controls will be executed with the default tag 'flow' and the steps will be executed with their respective tag",
+							rightDocumentationLink: 'https://www.windmill.dev/docs/core_concepts/worker_groups'
 							}}
 							class="py-1"
 						/>
@@ -183,7 +184,9 @@
 								}
 							}}
 							options={{
-								right: 'Cache the results for each possible inputs'
+								right: 'Cache the results for each possible inputs',
+								rightTooltip: 'When enabled, the flow will cache the results of the flow for each possible set of inputs.',
+								rightDocumentationLink: 'https://www.windmill.dev/docs/flows/cache#cache-flows'
 							}}
 							class="py-1"
 						/>
@@ -221,8 +224,9 @@
 							options={{
 								right: 'Early stop if condition met',
 								rightTooltip:
-									'If defined, at the beginning of the step the predicate expression will be evaluated' +
-									'to decide if the flow should stop early.'
+									'If the inputs meet the predefined condition, the flow will not run.' +
+									'to decide if the flow should stop early.',
+								rightDocumentationLink: 'https://www.windmill.dev/docs/flows/early_stop#early-stop-for-flow'
 							}}
 							class="py-1"
 						/>
@@ -272,7 +276,8 @@
 							options={{
 								right: 'Early return for sync webhooks',
 								rightTooltip:
-									'If defined, sync endpoints will return early at the node defined here while the rest of the flow continue asynchronously.'
+									'If defined, sync endpoints will return early at the node defined here while the rest of the flow continue asynchronously.',
+								rightDocumentationLink: 'https://www.windmill.dev/docs/flows/early_return'
 							}}
 							class="py-1"
 						/>
@@ -306,11 +311,12 @@
 						size="xs"
 						bind:checked={$flowStore.value.same_worker}
 						options={{
-							right: 'Same Worker + Shared Directory on `./shared`',
+							right: 'Same Worker + Shared directory on `./shared`',
 							rightTooltip:
 								'Steps will share a folder at `./shared` in which they can store heavier data and ' +
 								'pass them to the next step. Beware that the `./shared` folder is not ' +
-								'preserved across suspends and sleeps.'
+								'preserved across suspends and sleeps.',
+							rightDocumentationLink: 'https://www.windmill.dev/docs/core_concepts/persistent_storage/within_windmill#shared-directory'
 						}}
 						class="py-1"
 					/>
@@ -332,7 +338,8 @@
 					options={{
 						right: 'Make runs invisible to others',
 						rightTooltip:
-							'When this option is enabled, manual executions of this script are invisible to users other than the user running it, including the owner(s). This setting can be overridden when this script is run manually from the advanced menu.'
+							'When this option is enabled, manual executions of this script are invisible to users other than the user running it, including the owner(s). This setting can be overridden when this script is run manually from the advanced menu.',
+						rightDocumentationLink: 'https://www.windmill.dev/docs/core_concepts/monitor_past_and_future_runs#invisible-runs'
 					}}
 					class="py-1"
 				/>
@@ -372,8 +379,9 @@
 								}
 							}}
 							options={{
-								right: 'Concurrency Limits',
-								rightTooltip: 'Allowed concurrency within a given timeframe'
+								right: 'Concurrency limits',
+								rightTooltip: 'Allowed concurrency within a given timeframe',
+								rightDocumentationLink: 'https://www.windmill.dev/docs/flows/concurrency_limit'
 							}}
 							class="py-1"
 							eeOnly={true}
@@ -443,7 +451,8 @@
 						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. Higher priority numbers are executed first. ${
 							!$enterpriseLicense ? 'This is a feature only available on enterprise edition.' : ''
-						}`
+						}`,
+						rightDocumentationLink: 'https://www.windmill.dev/docs/flows/priority'
 					}}
 					class="py-1 relative"
 				>
@@ -488,7 +497,10 @@
 							}
 						}}
 						options={{
-							right: 'Flow is run on dedicated workers'
+							right: 'Flow is run on dedicated workers',
+							rightTooltip:
+								'When enabled, the flow will be executed on a dedicated worker.',
+							rightDocumentationLink: 'https://www.windmill.dev/docs/core_concepts/jobs#high-priority-jobs'
 						}}
 						class="py-1"
 						eeOnly={true}
diff --git a/frontend/src/lib/components/flows/map/FlowConstantsItem.svelte b/frontend/src/lib/components/flows/map/FlowConstantsItem.svelte
index bb6217570b..a9e7bd52c0 100644
--- a/frontend/src/lib/components/flows/map/FlowConstantsItem.svelte
+++ b/frontend/src/lib/components/flows/map/FlowConstantsItem.svelte
@@ -8,7 +8,7 @@
 
 	$: settingsClass = classNames(
 		'border w-full rounded-sm p-2 bg-surface  text-sm cursor-pointer flex items-center',
-		$selectedId == 'constants' ? 'outline outline-offset-1 outline-2  outline-slate-900 dark:bg-white/5 dark:outline-slate-800/60 dark:border-gray-400' : ''
+		$selectedId == 'constants' ? 'border border-1  border-slate-800 dark:bg-white/5 dark:border-slate-400/60 dark:border-gray-400' : ''
 	)
 </script>
 
diff --git a/frontend/src/lib/components/flows/map/FlowSettingsItem.svelte b/frontend/src/lib/components/flows/map/FlowSettingsItem.svelte
index 8974c46714..4f5c8d569c 100644
--- a/frontend/src/lib/components/flows/map/FlowSettingsItem.svelte
+++ b/frontend/src/lib/components/flows/map/FlowSettingsItem.svelte
@@ -8,9 +8,9 @@
 	const { selectedId, flowStore } = getContext<FlowEditorContext>('FlowEditorContext')
 
 	$: settingsClass = classNames(
-		'border w-full rounded-sm p-2 bg-surface text-sm cursor-pointer flex items-center',
+		'border w-full rounded-sm p-2 bg-surface text-sm cursor-pointer flex items-center h-[32px]',
 		$selectedId?.startsWith('settings')
-			? 'outline outline-offset-1 outline-2  outline-slate-900 dark:bg-white/5 dark:outline-slate-800/60 dark:border-gray-400'
+			? 'border border-1  border-slate-800 dark:bg-white/5 dark:border-slate-400/60 dark:border-gray-400'
 			: ''
 	)
 </script>
@@ -20,10 +20,11 @@
 	<span
 		class="text-xs font-bold flex flex-row justify-between w-full gap-2 items-center truncate ml-1"
 	>
-		Settings
-
-		{#if $flowStore.value.same_worker}
-			<Badge color="blue" baseClass="truncate">./shared</Badge>
-		{/if}
+		<span>Settings</span>
+		<span class="h-[18px] flex items-center">
+			{#if $flowStore.value.same_worker}
+				<Badge color="blue" baseClass="truncate">./shared</Badge>
+			{/if}
+		</span>
 	</span>
 </button>
diff --git a/frontend/src/lib/components/triggers/ScheduledPollPanel.svelte b/frontend/src/lib/components/triggers/ScheduledPollPanel.svelte
index f875953374..5b60c96064 100644
--- a/frontend/src/lib/components/triggers/ScheduledPollPanel.svelte
+++ b/frontend/src/lib/components/triggers/ScheduledPollPanel.svelte
@@ -18,7 +18,7 @@
 	<Label label="Setting a scheduled poll" primary>
 		<ul class="pt-4 space-y-2 text-sm">
 			<li>
-				1. Chose a trigger script using the script picker that will poll for new events regularly <img
+				1. Choose a trigger script using the script picker that will poll for new events regularly <img
 					class="shadow-lg rounded"
 					alt="script picker"
 					src="{base}/script-picker.png"

From 9022d4e1c832db7d2b2db24b7a91be26302f66ce Mon Sep 17 00:00:00 2001
From: Lucas Abel <22837557+uael@users.noreply.github.com>
Date: Thu, 7 Nov 2024 17:18:09 +0100
Subject: [PATCH 35/80] add `nix` documentation + flake cleanups (#4662)

---
 README.md              |  2 ++
 flake.nix              | 81 ++++++++++++++++++++++--------------------
 frontend/README_DEV.md | 44 +++++++++++++++++++++++
 3 files changed, 89 insertions(+), 38 deletions(-)

diff --git a/README.md b/README.md
index eb6c64ee2a..e85d34111b 100644
--- a/README.md
+++ b/README.md
@@ -355,6 +355,8 @@ you to have it being synced automatically everyday.
 See the [./frontend/README_DEV.md](./frontend/README_DEV.md) file for all
 running options.
 
+Using [Nix](./frontend/README_DEV.md#nix).
+
 ### only Frontend
 This will use the backend of <https://app.windmill.dev> but your own frontend
 with hot-code reloading. Note that you will need to use a username / password login due to CSRF checks using a different auth provider.
diff --git a/flake.nix b/flake.nix
index d6fbd0fdf2..28e0816667 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,31 +13,20 @@
         overlays = [ (import rust-overlay) ];
       };
       buildInputs = with pkgs; [
-        openssl.dev libxml2.dev xmlsec.dev libxslt.dev
-        rust-bin.beta.latest.default nodejs go
-        xcaddy sqlx-cli pkg-config
+        openssl openssl.dev libxml2.dev xmlsec.dev libxslt.dev
+        rust-bin.stable.latest.default nodejs
+        postgresql
+        pkg-config
       ];
-      environment = {
-        NODE_ENV = "development";
-        NODE_OPTIONS = "--max-old-space-size=16384";
-        DATABASE_URL = "postgres://postgres:changeme@127.0.0.1:5432/";
-        PKG_CONFIG_PATH = pkgs.lib.makeSearchPath "lib/pkgconfig" (with pkgs; [
-          openssl.dev
-          libxml2.dev
-          xmlsec.dev
-          libxslt.dev
-        ]);
-      };
-      rustcTarget = pkgs.hostPlatform.rust.rustcTarget;
-      fetch_librusty_v8 = { version, shas }: pkgs.fetchurl {
-        name = "librusty_v8-${version}";
-        url = "https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_release_${rustcTarget}.a.gz";
-        sha256 = shas.${system};
-      };
+      PKG_CONFIG_PATH = pkgs.lib.makeSearchPath "lib/pkgconfig" (with pkgs; [
+        openssl.dev
+        libxml2.dev
+        xmlsec.dev
+        libxslt.dev
+      ]);
     in {
       devShell = pkgs.mkShell {
-        inherit (environment) NODE_ENV NODE_OPTIONS DATABASE_URL PKG_CONFIG_PATH;
-        buildInputs = buildInputs;
+        buildInputs = buildInputs ++ (with pkgs; [ git go xcaddy sqlx-cli ]);
         packages = [
           (pkgs.writeScriptBin "wm-caddy" ''
             cd ./frontend
@@ -54,27 +43,39 @@
           '')
           (pkgs.writeScriptBin "wm-migrate" ''
             cd ./backend
-            sqlx database reset
-            sqlx database create
             sqlx migrate run
           '')
           (pkgs.writeScriptBin "wm-setup" ''
+            sqlx database create
             wm-build
             wm-caddy
             wm-migrate
           '')
+          (pkgs.writeScriptBin "wm-reset" ''
+            sqlx database drop -f
+            sqlx database create
+            wm-migrate
+          '')
           (pkgs.writeScriptBin "wm" ''
             cd ./frontend
             npm run dev $*
           '')
         ];
+
+        inherit PKG_CONFIG_PATH;
+        NODE_ENV = "development";
+        NODE_OPTIONS = "--max-old-space-size=16384";
+        DATABASE_URL = "postgres://postgres:changeme@127.0.0.1:5432/";
+        REMOTE = "http://127.0.0.1:8000";
+        REMOTE_LSP = "http://127.0.0.1:3001";
       };
+      packages.default = self.packages.${system}.windmill;
       packages.windmill-client = pkgs.stdenv.mkDerivation {
         pname = "windmill-client";
         version = (pkgs.lib.strings.trim (builtins.readFile ./version.txt));
 
         src = ./.;
-        buildInputs = with pkgs; [ nodejs go ];
+        buildInputs = with pkgs; [ nodejs ];
 
         buildPhase = ''
           export HOME=$(pwd)
@@ -91,8 +92,6 @@
         '';
       };
       packages.windmill = pkgs.rustPlatform.buildRustPackage {
-        inherit (environment) DATABASE_URL PKG_CONFIG_PATH;
-
         pname = "windmill";
         version = (pkgs.lib.strings.trim (builtins.readFile ./version.txt));
 
@@ -111,26 +110,32 @@
           };
         };
 
-        buildFeatures = [ "enterprise" ];
+        buildFeatures = [ ];
         doCheck = false;
         preBuild = ''
           export HOME=$(pwd)
           npm config set strict-ssl false
           cd backend
-          sqlx database create
-          sqlx migrate run
         '';
 
+        inherit PKG_CONFIG_PATH;
+        SQLX_OFFLINE = true;
         FRONTEND_BUILD_DIR = "${self.packages.${system}.windmill-client}/build";
-        RUSTY_V8_ARCHIVE = (fetch_librusty_v8 {
-          version = "130.0.1";
-          shas = {
-            x86_64-linux = pkgs.lib.fakeHash;
-            aarch64-linux = pkgs.lib.fakeHash;
-            x86_64-darwin = pkgs.lib.fakeHash;
-            aarch64-darwin = "sha256-d1QTLt8gOUFxACes4oyIYgDF/srLOEk+5p5Oj1ECajQ=";
+        RUSTY_V8_ARCHIVE =
+          let
+            version = "130.0.1";
+            target = pkgs.hostPlatform.rust.rustcTarget;
+            sha256 = {
+              x86_64-linux = pkgs.lib.fakeHash;
+              aarch64-linux = pkgs.lib.fakeHash;
+              x86_64-darwin = pkgs.lib.fakeHash;
+              aarch64-darwin = "sha256-d1QTLt8gOUFxACes4oyIYgDF/srLOEk+5p5Oj1ECajQ=";
+            }.${system};
+          in pkgs.fetchurl {
+            name = "librusty_v8-${version}";
+            url = "https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_release_${target}.a.gz";
+            inherit sha256;
           };
-        });
       };
     });
 }
diff --git a/frontend/README_DEV.md b/frontend/README_DEV.md
index 198657d3af..ba90278be4 100644
--- a/frontend/README_DEV.md
+++ b/frontend/README_DEV.md
@@ -1,5 +1,7 @@
 # Developing
 
+[Using Nix](#nix), otherwise:
+
 In the `frontend/` directory:
 
 - install the dependencies with `npm install` (or `pnpm install` or `yarn`)
@@ -136,3 +138,45 @@ NOTCATCHALL=true npm run build
 which will generate an index.html and allow you to serve the frontend with any static server.
 
 Env variables used for build are set in .env file. See [https://vitejs.dev/guide/env-and-mode.html#env-files](https://vitejs.dev/guide/env-and-mode.html#env-files) for more details.
+
+## Nix
+
+Windmill use [nix flakes](https://nixos.wiki/wiki/Flakes):
+```bash
+nix run github:windmill-labs/windmill
+```
+
+### Development
+```bash
+nix develop # enter a dev shell containing all necessary packages.
+
+wm-setup # build the frontend and setup the database.
+wm # run the frontend.
+
+# In an other shell:
+nix develop
+cd backend
+cargo run
+```
+
+### Updating [`flake.nix`](../flake.nix)
+
+```bash
+nix flake update # update the lock file.
+```
+
+Some cargo dependencies use fixed git revisions, which are also fixed in `flake.nix`:
+```nix
+outputHashes = {
+  "php-parser-rs-0.1.3" = "sha256-ZeI3KgUPmtjlRfq6eAYveqt8Ay35gwj6B9iOQRjQa9A=";
+  # ...
+};
+```
+
+When updating a revision, replace the incorrect `sha256` with `pkgs.lib.fakeHash`:
+```diff
+-            "php-parser-rs-0.1.3" = "sha256-ZeI3KgUPmtjlRfq6eAYveqt8Ay35gwj6B9iOQRjQa9A=";
++            "php-parser-rs-0.1.3" = pkgs.lib.fakeHash;
+```
+
+Then run `nix build .#windmill` and update with the correct sha.

From adeb30ca515519bddcc15d91b2148085d94722e4 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Thu, 7 Nov 2024 17:18:20 +0100
Subject: [PATCH 36/80] chore(main): release 1.420.0 (#4659)

* chore(main): release 1.420.0

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |  8 +++
 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, 61 insertions(+), 53 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ffa8c6630..7cb7e641ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.420.0](https://github.com/windmill-labs/windmill/compare/v1.419.0...v1.420.0) (2024-11-07)
+
+
+### Features
+
+* **frontend:** detect expr in flow input transform + filter right panel based on expr ([#4651](https://github.com/windmill-labs/windmill/issues/4651)) ([e9b7dca](https://github.com/windmill-labs/windmill/commit/e9b7dca20387e775fa50aaecd832890251582cf9))
+* **frontend:** nodes from flow can be connected directly in expr input through a plug icon ([#4652](https://github.com/windmill-labs/windmill/issues/4652)) ([ceaf56c](https://github.com/windmill-labs/windmill/commit/ceaf56c21ee2e548bc93859f9e0303e53b25b241))
+
 ## [1.419.0](https://github.com/windmill-labs/windmill/compare/v1.418.0...v1.419.0) (2024-11-06)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index a28c70fc4c..d75d8fa292 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -732,9 +732,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "aws-config"
-version = "1.5.9"
+version = "1.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d6448cfb224dd6a9b9ac734f58622dd0d4751f3589f3b777345745f46b2eb14"
+checksum = "9b49afaa341e8dd8577e1a2200468f98956d6eda50bcf4a53246cc00174ba924"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -799,9 +799,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.48.0"
+version = "1.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded855583fa1d22e88fe39fd6062b062376e50a8211989e07cf5e38d52eb3453"
+checksum = "09677244a9da92172c8dc60109b4a9658597d4d298b188dd0018b6a66b410ca4"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -821,9 +821,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.49.0"
+version = "1.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9177ea1192e6601ae16c7273385690d88a7ed386a00b74a6bc894d12103cd933"
+checksum = "81fea2f3a8bb3bd10932ae7ad59cc59f65f270fc9183a7e91f501dc5efbef7ee"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -843,9 +843,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.48.0"
+version = "1.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "823ef553cf36713c97453e2ddff1eb8f62be7f4523544e2a5db64caf80100f0a"
+checksum = "53dcf5e7d9bd1517b8b998e170e650047cea8a2b85fe1835abe3210713e541b7"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -1986,9 +1986,9 @@ dependencies = [
 
 [[package]]
 name = "cron"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f8c3e73077b4b4a6ab1ea5047c37c57aee77657bc8ecd6f29b0af082d0b0c07"
+checksum = "eee8b2b4516038bc0f1d3c9934bcb4a13dd316e04abbc63c96757a6d75978532"
 dependencies = [
  "chrono",
  "nom",
@@ -4832,9 +4832,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.161"
+version = "0.2.162"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
 
 [[package]]
 name = "libgit2-sys"
@@ -10593,7 +10593,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "anyhow",
  "axum",
@@ -10635,7 +10635,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10720,7 +10720,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -10738,7 +10738,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "chrono",
  "serde",
@@ -10751,7 +10751,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10766,7 +10766,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10812,7 +10812,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10827,7 +10827,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10849,7 +10849,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10861,7 +10861,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10870,7 +10870,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10882,7 +10882,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10894,7 +10894,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10906,7 +10906,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10917,7 +10917,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10928,7 +10928,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10946,7 +10946,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10963,7 +10963,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10975,7 +10975,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10993,7 +10993,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -11014,7 +11014,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -11024,7 +11024,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -11057,7 +11057,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -11067,7 +11067,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.419.0"
+version = "1.420.0"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 26251822fb..807682260a 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.419.0"
+version = "1.420.0"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.419.0"
+version = "1.420.0"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 67e52eb9fa..148f5d585b 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.419.0
+  version: 1.420.0
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 85484f8915..0c18c4aba0 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.419.0";
+export const VERSION = "v1.420.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 87dba5b461..8f5e021887 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.419.0";
+export const VERSION = "1.420.0";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 49ea5ca116..3af3131d0c 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.419.0",
+	"version": "1.420.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.419.0",
+			"version": "1.420.0",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index 48dca74fed..ad737bb9e7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.419.0",
+	"version": "1.420.0",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 49652909b5..56da75febb 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.419.0"
-wmill_pg = ">=1.419.0"
+wmill = ">=1.420.0"
+wmill_pg = ">=1.420.0"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 57864131bf..78f8e69bec 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.419.0
+  version: 1.420.0
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index e73338005f..b0faee96a5 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.419.0'
+ModuleVersion = '1.420.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index e07c0b6b25..27b3e8385d 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.419.0"
+version = "1.420.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 72688f686a..76d1eddb54 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.419.0"
+version = "1.420.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 396c44c06b..54c3ee876e 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.419.0",
+  "version": "1.420.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 8e0b78b11d..c4cb721c32 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.419.0",
+  "version": "1.420.0",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index c3911f1102..a28dad7504 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.419.0
+1.420.0

From 0501ad8a99f6f7d9fd26c996b754e8afe8f958b1 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 7 Nov 2024 17:54:55 +0100
Subject: [PATCH 37/80] fix: improve prop filtering on flow prop picker

---
 .../lib/components/flows/previousResults.ts   |  7 +--
 .../propertyPicker/PropPicker.svelte          | 45 ++++++++++++-------
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/frontend/src/lib/components/flows/previousResults.ts b/frontend/src/lib/components/flows/previousResults.ts
index e922c55978..51a09ff699 100644
--- a/frontend/src/lib/components/flows/previousResults.ts
+++ b/frontend/src/lib/components/flows/previousResults.ts
@@ -283,11 +283,8 @@ export function filterNestedObject(obj: any, nestedKeys: string[]) {
 		if (nestedKeys[0] === '') {
 			return obj
 		}
-		const regexes = buildPrefixRegex(Object.keys(obj))
-		const matches = regexes.filter(({ regex }) => regex.test(nestedKeys[0]))
-		return Object.fromEntries(
-			Object.entries(obj).filter(([key]) => matches.some(({ word }) => word === key))
-		)
+
+		return Object.fromEntries(Object.entries(obj).filter(([key]) => key.startsWith(nestedKeys[0])))
 	}
 	const [key, ...rest] = nestedKeys
 	if (obj && typeof obj === 'object' && key in obj) {
diff --git a/frontend/src/lib/components/propertyPicker/PropPicker.svelte b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
index 0abd608811..981ece1feb 100644
--- a/frontend/src/lib/components/propertyPicker/PropPicker.svelte
+++ b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
@@ -2,7 +2,7 @@
 	import { ResourceService, VariableService } from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
 	import { getContext } from 'svelte'
-	import { Button } from '../common'
+	import { Badge, Button } from '../common'
 	import type { PropPickerWrapperContext } from '../flows/propPicker/PropPickerWrapper.svelte'
 
 	import ObjectViewer from './ObjectViewer.svelte'
@@ -44,8 +44,8 @@
 	const { pickablePropertiesFiltered } = getContext<PropPickerContext>('PropPickerContext')
 	$: $pickablePropertiesFiltered = pickableProperties
 
-	let flowInputsFiltered = pickableProperties.flow_input
-	let resultByIdFiltered = pickableProperties.priorIds
+	let flowInputsFiltered: any = pickableProperties.flow_input
+	let resultByIdFiltered: any = pickableProperties.priorIds
 
 	let timeout: NodeJS.Timeout
 	function onSearch(search: string) {
@@ -90,18 +90,23 @@
 		)
 	}
 
+	let filteringFlowInputsOrResult = ''
 	async function filterPickableProperties() {
-		if (!filterActive) {
+		if (!$propPickerConfig || !filterActive) {
+			flowInputsFiltered = pickableProperties.flow_input
+			resultByIdFiltered = pickableProperties.priorIds
+			filteringFlowInputsOrResult = ''
 			return
 		}
 
 		if (!$inputMatches?.some((match) => match.word === 'flow_input')) {
-			flowInputsFiltered = []
+			flowInputsFiltered = {}
 		}
 		if (!$inputMatches?.some((match) => match.word === 'results')) {
-			resultByIdFiltered = []
+			resultByIdFiltered = {}
 		}
 		if ($inputMatches?.length == 1) {
+			filteringFlowInputsOrResult = $inputMatches[0].value
 			if ($inputMatches[0].word === 'flow_input') {
 				flowInputsFiltered = pickableProperties.flow_input
 				let [, ...nestedKeys] = $inputMatches[0].value.split('.')
@@ -117,12 +122,14 @@
 					resultByIdFiltered = filtered
 				}
 			}
+		} else {
+			filteringFlowInputsOrResult = ''
 		}
 
-		if ($pickablePropertiesFiltered) {
-			resultByIdFiltered && ($pickablePropertiesFiltered.priorIds = resultByIdFiltered)
-			flowInputsFiltered && ($pickablePropertiesFiltered.flow_input = flowInputsFiltered)
-		}
+		// if ($pickablePropertiesFiltered) {
+		// 	resultByIdFiltered && ($pickablePropertiesFiltered.priorIds = resultByIdFiltered)
+		// 	flowInputsFiltered && ($pickablePropertiesFiltered.flow_input = flowInputsFiltered)
+		// }
 	}
 
 	async function updateCollapsable() {
@@ -189,10 +196,18 @@
 		<ClearableInput bind:value={search} placeholder="Search prop..." />
 	</div>
 	<div
-		class="overflow-y-auto px-2 pt-2 grow"
+		class="overflow-y-auto px-2 pt-2 grow relative"
 		class:bg-surface-secondary={!$propPickerConfig && !alwaysOn}
 	>
-		{#if flowInputsFiltered && (Object.keys(flowInputsFiltered).length > 0 || !filterActive)}
+		<!-- <pre class="text-2xs w-full"
+			>{JSON.stringify({ pickableProperties, resultByIdFiltered }, null, 2)}</pre
+		> -->
+		{#if filteringFlowInputsOrResult}
+			<div class="absolute bottom-0 right-0">
+				<Badge small>filter: {filteringFlowInputsOrResult}</Badge>
+			</div>
+		{/if}
+		{#if flowInputsFiltered && (Object.keys(flowInputsFiltered ?? {}).length > 0 || !filterActive)}
 			<div class="flex justify-between items-center space-x-1">
 				<span class="font-normal text-sm text-secondary">Flow Input</span>
 				<div class="flex space-x-2 items-center" />
@@ -252,7 +267,7 @@
 			{/if}
 		{:else}
 			{@const json = Object.fromEntries(
-				Object.entries(resultByIdFiltered).filter(([k, v]) => k == previousId)
+				Object.entries(resultByIdFiltered ?? {}).filter(([k, v]) => k == previousId)
 			)}
 			{#if previousId && Object.keys(json).length > 0}
 				<span class="font-normal text-sm text-secondary">Previous Result</span>
@@ -261,7 +276,7 @@
 						{allowCopy}
 						pureViewer={!$propPickerConfig}
 						json={Object.fromEntries(
-							Object.entries(resultByIdFiltered).filter(([k, v]) => k == previousId)
+							Object.entries(resultByIdFiltered ?? {}).filter(([k, v]) => k == previousId)
 						)}
 						prefix="results"
 						on:select
@@ -297,7 +312,7 @@
 						/>
 					</div>
 				{/if}
-				{#if Object.keys(resultByIdFiltered).length > 0}
+				{#if Object.keys(resultByIdFiltered ?? {}).length > 0}
 					<div class="overflow-y-auto pb-2">
 						<span class="font-normal text-sm text-secondary">All Results</span>
 

From d35d2ccfd05dd4a0f1851503ef3d69031dd0b452 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Thu, 7 Nov 2024 17:59:15 +0100
Subject: [PATCH 38/80] chore(main): release 1.420.1 (#4665)

* chore(main): release 1.420.1

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |  7 +++
 backend/Cargo.lock                            | 52 +++++++++----------
 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, 50 insertions(+), 43 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cb7e641ba..09c9329e59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.420.1](https://github.com/windmill-labs/windmill/compare/v1.420.0...v1.420.1) (2024-11-07)
+
+
+### Bug Fixes
+
+* improve prop filtering on flow prop picker ([0501ad8](https://github.com/windmill-labs/windmill/commit/0501ad8a99f6f7d9fd26c996b754e8afe8f958b1))
+
 ## [1.420.0](https://github.com/windmill-labs/windmill/compare/v1.419.0...v1.420.0) (2024-11-07)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index d75d8fa292..40bdafa1d6 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -6123,9 +6123,9 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "polling"
-version = "3.7.3"
+version = "3.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
+checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
@@ -10593,7 +10593,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "anyhow",
  "axum",
@@ -10635,7 +10635,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10720,7 +10720,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -10738,7 +10738,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "chrono",
  "serde",
@@ -10751,7 +10751,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10766,7 +10766,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10812,7 +10812,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10827,7 +10827,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10849,7 +10849,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10861,7 +10861,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10870,7 +10870,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10882,7 +10882,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10894,7 +10894,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10906,7 +10906,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10917,7 +10917,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10928,7 +10928,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10946,7 +10946,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10963,7 +10963,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10975,7 +10975,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10993,7 +10993,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -11014,7 +11014,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -11024,7 +11024,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -11057,7 +11057,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -11067,7 +11067,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.420.0"
+version = "1.420.1"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 807682260a..188e77a272 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.420.0"
+version = "1.420.1"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.420.0"
+version = "1.420.1"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 148f5d585b..c97f81dfde 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.420.0
+  version: 1.420.1
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 0c18c4aba0..7dc27071c9 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.420.0";
+export const VERSION = "v1.420.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 8f5e021887..db4206dc9c 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.420.0";
+export const VERSION = "1.420.1";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 3af3131d0c..c75755d6cb 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.420.0",
+	"version": "1.420.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.420.0",
+			"version": "1.420.1",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index ad737bb9e7..93fc98ea37 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.420.0",
+	"version": "1.420.1",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 56da75febb..67c2a4f15a 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.420.0"
-wmill_pg = ">=1.420.0"
+wmill = ">=1.420.1"
+wmill_pg = ">=1.420.1"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 78f8e69bec..72ecf7f46d 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.420.0
+  version: 1.420.1
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index b0faee96a5..5301480e08 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.420.0'
+ModuleVersion = '1.420.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 27b3e8385d..176627eec8 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.420.0"
+version = "1.420.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 76d1eddb54..48737c7680 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.420.0"
+version = "1.420.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 54c3ee876e..615f3537de 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.420.0",
+  "version": "1.420.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 c4cb721c32..c2c4d34d4b 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.420.0",
+  "version": "1.420.1",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index a28dad7504..5e2ad7ceec 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.420.0
+1.420.1

From dbcf030e7bf5056f12324786ce001a57396d7655 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 7 Nov 2024 19:03:34 +0100
Subject: [PATCH 39/80] improve ObjectViewer brackets & arg info height

---
 frontend/src/lib/components/ArgInfo.svelte             |  2 +-
 .../lib/components/propertyPicker/ObjectViewer.svelte  | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/src/lib/components/ArgInfo.svelte b/frontend/src/lib/components/ArgInfo.svelte
index dc6f8e153d..16ba420372 100644
--- a/frontend/src/lib/components/ArgInfo.svelte
+++ b/frontend/src/lib/components/ArgInfo.svelte
@@ -98,7 +98,7 @@
 				}}><Expand size={18} /></button
 			>
 		{/if}
-		<div class="max-h-40 overflow-auto">
+		<div class="max-h-60 overflow-auto">
 			<ObjectViewer collapsed={false} topBrackets={true} pureViewer={true} json={value} />
 		</div>
 	</div>
diff --git a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
index 8d2d196134..b9db54d62b 100644
--- a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
+++ b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
@@ -94,8 +94,12 @@
 					>-</Button
 				>
 			{/if}
-			{#if level == 0 && topBrackets}<span class="h-0">{openBracket}</span>{/if}
-			<ul class={`w-full ${level === 0 ? 'border-none' : 'pl-2 border-l border-dotted'}`}>
+			{#if level == 0 && topBrackets}<span class="text-tertiary">{openBracket}</span>{/if}
+			<ul
+				class={`w-full ${
+					level === 0 ? `border-none ${topBrackets ? 'pl-2' : ''}` : 'pl-2 border-l border-dotted'
+				}`}
+			>
 				{#each keys.length > keyLimit ? keys.slice(0, keyLimit) : keys as key, index (key)}
 					<li>
 						<Button
@@ -162,7 +166,7 @@
 			</ul>
 			{#if level == 0 && topBrackets}
 				<div class="flex">
-					<span class="h-0">{closeBracket}</span>
+					<span class="text-tertiary">{closeBracket}</span>
 					{#if getTypeAsString(json) === 's3object'}
 						<a
 							class="text-secondary underline font-semibold text-2xs whitespace-nowrap ml-1 w-fit"

From 2456ec67682fc73192b2d0f2776dbe4f8d705636 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 7 Nov 2024 19:14:09 +0100
Subject: [PATCH 40/80] nit fix

---
 frontend/src/lib/components/flows/content/FlowLoop.svelte | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/lib/components/flows/content/FlowLoop.svelte b/frontend/src/lib/components/flows/content/FlowLoop.svelte
index 1d7a695ace..bce967c9d8 100644
--- a/frontend/src/lib/components/flows/content/FlowLoop.svelte
+++ b/frontend/src/lib/components/flows/content/FlowLoop.svelte
@@ -130,8 +130,7 @@
 								}}
 							/>
 						</div>
-						<div
-							>``
+						<div>
 							<div class="mb-2 text-sm font-bold">Run in parallel</div>
 							<Toggle
 								bind:checked={mod.value.parallel}

From 24057811d1799066f110dbab0213d05bc96f0441 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 7 Nov 2024 19:34:32 +0100
Subject: [PATCH 41/80] nits improvements

---
 .../propertyPicker/PropPicker.svelte          | 33 +++++--------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/frontend/src/lib/components/propertyPicker/PropPicker.svelte b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
index 981ece1feb..02e619dc37 100644
--- a/frontend/src/lib/components/propertyPicker/PropPicker.svelte
+++ b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
@@ -209,7 +209,9 @@
 		{/if}
 		{#if flowInputsFiltered && (Object.keys(flowInputsFiltered ?? {}).length > 0 || !filterActive)}
 			<div class="flex justify-between items-center space-x-1">
-				<span class="font-normal text-sm text-secondary">Flow Input</span>
+				<span class="font-normal text-sm text-secondary"
+					><span class="font-mono">flow_input</span></span
+				>
 				<div class="flex space-x-2 items-center" />
 			</div>
 			<div class="overflow-y-auto pb-2">
@@ -253,7 +255,7 @@
 						/>
 					</div>
 				{/if}
-				<span class="font-normal text-sm text-secondary">All Results</span>
+				<span class="font-normal text-sm text-tertiary font-mono">results</span>
 				<div class="overflow-y-auto pb-2">
 					<ObjectViewer
 						{allowCopy}
@@ -266,23 +268,6 @@
 				</div>
 			{/if}
 		{:else}
-			{@const json = Object.fromEntries(
-				Object.entries(resultByIdFiltered ?? {}).filter(([k, v]) => k == previousId)
-			)}
-			{#if previousId && Object.keys(json).length > 0}
-				<span class="font-normal text-sm text-secondary">Previous Result</span>
-				<div class="overflow-y-auto pb-2">
-					<ObjectViewer
-						{allowCopy}
-						pureViewer={!$propPickerConfig}
-						json={Object.fromEntries(
-							Object.entries(resultByIdFiltered ?? {}).filter(([k, v]) => k == previousId)
-						)}
-						prefix="results"
-						on:select
-					/>
-				</div>
-			{/if}
 			{#if pickableProperties.hasResume}
 				<span class="font-normal text-sm text-secondary">Resume payloads</span>
 				<div class="overflow-y-auto pb-2">
@@ -313,8 +298,8 @@
 					</div>
 				{/if}
 				{#if Object.keys(resultByIdFiltered ?? {}).length > 0}
-					<div class="overflow-y-auto pb-2">
-						<span class="font-normal text-sm text-secondary">All Results</span>
+					<div class="overflow-y-auto pb-2 pt-2">
+						<span class="font-normal text-sm text-tertiary font-mono">results</span>
 
 						<ObjectViewer
 							{allowCopy}
@@ -331,8 +316,8 @@
 
 		{#if displayContext}
 			{#if !filterActive || $inputMatches?.some((match) => match.word === 'variable')}
-				<div class="overflow-y-auto pb-2">
-					<span class="font-normal text-sm text-secondary">Variables:</span>
+				<div class="overflow-y-auto pb-2 pt-4">
+					<span class="font-normal text-xs text-secondary">Variables:</span>
 
 					{#if displayVariable}
 						<Button
@@ -373,7 +358,7 @@
 			{/if}
 			{#if !filterActive || $inputMatches?.some((match) => match.word === 'resource')}
 				<div class="overflow-y-auto pb-2">
-					<span class="font-normal text-sm text-secondary">Resources:</span>
+					<span class="font-normal text-xs text-secondary">Resources:</span>
 
 					{#if displayResources}
 						<Button

From 7da44341068054c8782f4ce81c826302420b9cad Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 7 Nov 2024 19:48:11 +0100
Subject: [PATCH 42/80] nits

---
 .../approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte b/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte
index 377879daff..2175c75009 100644
--- a/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte
+++ b/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte
@@ -173,11 +173,8 @@
 	{:else}
 		<div class="flex flex-row justify-between flex-wrap sm:flex-nowrap gap-x-4">
 			<div class="w-full">
-				<h2 class="mt-4">Approvers:</h2>
-				<p class="text-xs italic"
-					>Each approver can only approve once and cannot change their approver name set by the
-					approval sender</p
-				>
+				<h2 class="mt-4">Approvers</h2>
+
 				<div class="my-4">
 					{#if currentApprovers.length > 0}
 						<ul>

From b1b760bbeb37a6353046226c454936f10734d4be Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 7 Nov 2024 20:10:12 +0100
Subject: [PATCH 43/80] nits

---
 .../propertyPicker/PropPicker.svelte          |  1 -
 .../components/sidebar/WorkspaceMenu.svelte   | 26 ++++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/frontend/src/lib/components/propertyPicker/PropPicker.svelte b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
index 02e619dc37..62610d48fc 100644
--- a/frontend/src/lib/components/propertyPicker/PropPicker.svelte
+++ b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
@@ -18,7 +18,6 @@
 	export let allowCopy = false
 	export let alwaysOn = false
 
-	$: previousId = pickableProperties?.previousId
 	let variables: Record<string, string> = {}
 	let resources: Record<string, any> = {}
 	let displayVariable = false
diff --git a/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte b/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte
index 1d1857588e..b4645516a0 100644
--- a/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte
+++ b/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte
@@ -75,17 +75,19 @@
 				</MenuItem>
 			{/each}
 		</div>
-		<div class="py-1" role="none">
-			<a
-				href="{base}/user/create_workspace"
-				class="text-primary px-4 py-2 text-xs hover:bg-surface-hover hover:text-primary flex flex-flow gap-2"
-				role="menuitem"
-				tabindex="-1"
-			>
-				<Plus size={16} />
-				Workspace
-			</a>
-		</div>
+		{#if isCloudHosted() || $superadmin}
+			<div class="py-1" role="none">
+				<a
+					href="{base}/user/create_workspace"
+					class="text-primary px-4 py-2 text-xs hover:bg-surface-hover hover:text-primary flex flex-flow gap-2"
+					role="menuitem"
+					tabindex="-1"
+				>
+					<Plus size={16} />
+					Workspace
+				</a>
+			</div>
+		{/if}
 		<div class="py-1" role="none">
 			<a
 				href="{base}/user/workspaces"
@@ -96,7 +98,7 @@
 				role="menuitem"
 				tabindex="-1"
 			>
-				All workspaces & invites
+				All workspaces
 			</a>
 		</div>
 		{#if $userStore?.is_admin || $superadmin}

From dc8bd6d2b5d6f5cd8521f9034853175ec78d5639 Mon Sep 17 00:00:00 2001
From: HugoCasa <hugo@casademont.ch>
Date: Thu, 7 Nov 2024 20:16:14 +0100
Subject: [PATCH 44/80] feat: http custom routes for static assets (#4666)

* feat: http custom routes for static assets

* update ee ref + fix build

* fix build

* nit
---
 ...2b18dd6da7d962118fee276af354218baac2.json} |  12 +-
 ...c48af411377d2d9f58f92fc9d5eacdf0fba1.json} |   5 +-
 ...99d45828d7c8e0ff10c5d74c454472e0493c.json} |   5 +-
 ...be7b0399cf8ec0e9e6d2b05ceef589c432df.json} |   5 +-
 ...e15a0816a6b4fd036cf7b991a210654b2633.json} |  12 +-
 ...9c6af887c49a29ae44b3a95350ff27fb1ccf.json} |  12 +-
 backend/ee-repo-ref.txt                       |   2 +-
 ...107163553_http_route_static_asset.down.sql |   2 +
 ...41107163553_http_route_static_asset.up.sql |   2 +
 backend/windmill-api/openapi.yaml             |  41 +++++
 backend/windmill-api/src/http_triggers.rs     | 161 +++++++++++++----
 backend/windmill-api/src/job_helpers_ee.rs    |  18 ++
 backend/windmill-common/src/s3_helpers.rs     |   5 +-
 backend/windmill-worker/src/common.rs         |   1 +
 .../src/lib/components/S3FilePicker.svelte    |   2 +-
 .../common/fileInput/FileInput.svelte         |   8 +-
 .../common/fileUpload/FileUpload.svelte       |   9 +-
 .../triggers/RouteEditorInner.svelte          | 164 ++++++++++++++----
 python-client/wmill/wmill/client.py           |  24 ++-
 19 files changed, 402 insertions(+), 88 deletions(-)
 rename backend/.sqlx/{query-fe4f91ca7e179e58041a5c0b1a36015175e9301c01a99e8f2b82cb853349a183.json => query-11b698f82a54aac68b3617047dfe2b18dd6da7d962118fee276af354218baac2.json} (84%)
 rename backend/.sqlx/{query-c229744534f17f7622c3dee21bb1e7292ff17e6dffe58e80e53bff8baade07c8.json => query-333b484ffa030dee08e7b1161fcbc48af411377d2d9f58f92fc9d5eacdf0fba1.json} (76%)
 rename backend/.sqlx/{query-4d8640e84fccf1a0b799d8396a51e69345137e68d5096c70ba0a4332075d97ea.json => query-487d377e2df67fc3ea39d183ba9f99d45828d7c8e0ff10c5d74c454472e0493c.json} (72%)
 rename backend/.sqlx/{query-55d44f569f8ebfccddf975e1a330ef0dc286f4138efe923832371cdbac7157b0.json => query-7113d7cc72e44e4b7e01b69cc18cbe7b0399cf8ec0e9e6d2b05ceef589c432df.json} (68%)
 rename backend/.sqlx/{query-02f1a6eeb27067dc438459238e7b016f5ccf9e3fe0ffbe88471f15aad8f74441.json => query-c9930fcfe79541af570eace58ba7e15a0816a6b4fd036cf7b991a210654b2633.json} (83%)
 rename backend/.sqlx/{query-4fb95eae1c871241efe2ef79615ce03cba0e4a12aad3274e4829d98e38ca1491.json => query-f904702536c106b0e5da8facae119c6af887c49a29ae44b3a95350ff27fb1ccf.json} (83%)
 create mode 100644 backend/migrations/20241107163553_http_route_static_asset.down.sql
 create mode 100644 backend/migrations/20241107163553_http_route_static_asset.up.sql

diff --git a/backend/.sqlx/query-fe4f91ca7e179e58041a5c0b1a36015175e9301c01a99e8f2b82cb853349a183.json b/backend/.sqlx/query-11b698f82a54aac68b3617047dfe2b18dd6da7d962118fee276af354218baac2.json
similarity index 84%
rename from backend/.sqlx/query-fe4f91ca7e179e58041a5c0b1a36015175e9301c01a99e8f2b82cb853349a183.json
rename to backend/.sqlx/query-11b698f82a54aac68b3617047dfe2b18dd6da7d962118fee276af354218baac2.json
index 65cb5c6633..9900461761 100644
--- a/backend/.sqlx/query-fe4f91ca7e179e58041a5c0b1a36015175e9301c01a99e8f2b82cb853349a183.json
+++ b/backend/.sqlx/query-11b698f82a54aac68b3617047dfe2b18dd6da7d962118fee276af354218baac2.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT path, script_path, is_flow, route_path, workspace_id, is_async, requires_auth, edited_by, email, http_method as \"http_method: _\" FROM http_trigger",
+  "query": "SELECT path, script_path, is_flow, route_path, workspace_id, is_async, requires_auth, edited_by, email, http_method as \"http_method: _\", static_asset_config as \"static_asset_config: _\" FROM http_trigger",
   "describe": {
     "columns": [
       {
@@ -65,6 +65,11 @@
             }
           }
         }
+      },
+      {
+        "ordinal": 10,
+        "name": "static_asset_config: _",
+        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -80,8 +85,9 @@
       false,
       false,
       false,
-      false
+      false,
+      true
     ]
   },
-  "hash": "fe4f91ca7e179e58041a5c0b1a36015175e9301c01a99e8f2b82cb853349a183"
+  "hash": "11b698f82a54aac68b3617047dfe2b18dd6da7d962118fee276af354218baac2"
 }
diff --git a/backend/.sqlx/query-c229744534f17f7622c3dee21bb1e7292ff17e6dffe58e80e53bff8baade07c8.json b/backend/.sqlx/query-333b484ffa030dee08e7b1161fcbc48af411377d2d9f58f92fc9d5eacdf0fba1.json
similarity index 76%
rename from backend/.sqlx/query-c229744534f17f7622c3dee21bb1e7292ff17e6dffe58e80e53bff8baade07c8.json
rename to backend/.sqlx/query-333b484ffa030dee08e7b1161fcbc48af411377d2d9f58f92fc9d5eacdf0fba1.json
index df94d893a6..bb21c2a9db 100644
--- a/backend/.sqlx/query-c229744534f17f7622c3dee21bb1e7292ff17e6dffe58e80e53bff8baade07c8.json
+++ b/backend/.sqlx/query-333b484ffa030dee08e7b1161fcbc48af411377d2d9f58f92fc9d5eacdf0fba1.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "INSERT INTO http_trigger (workspace_id, path, route_path, route_path_key, script_path, is_flow, is_async, requires_auth, http_method, edited_by, email, edited_at) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, now())",
+  "query": "INSERT INTO http_trigger (workspace_id, path, route_path, route_path_key, script_path, is_flow, is_async, requires_auth, http_method, static_asset_config, edited_by, email, edited_at) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, now())",
   "describe": {
     "columns": [],
     "parameters": {
@@ -27,11 +27,12 @@
             }
           }
         },
+        "Jsonb",
         "Varchar",
         "Varchar"
       ]
     },
     "nullable": []
   },
-  "hash": "c229744534f17f7622c3dee21bb1e7292ff17e6dffe58e80e53bff8baade07c8"
+  "hash": "333b484ffa030dee08e7b1161fcbc48af411377d2d9f58f92fc9d5eacdf0fba1"
 }
diff --git a/backend/.sqlx/query-4d8640e84fccf1a0b799d8396a51e69345137e68d5096c70ba0a4332075d97ea.json b/backend/.sqlx/query-487d377e2df67fc3ea39d183ba9f99d45828d7c8e0ff10c5d74c454472e0493c.json
similarity index 72%
rename from backend/.sqlx/query-4d8640e84fccf1a0b799d8396a51e69345137e68d5096c70ba0a4332075d97ea.json
rename to backend/.sqlx/query-487d377e2df67fc3ea39d183ba9f99d45828d7c8e0ff10c5d74c454472e0493c.json
index b66edc6d73..7cd37b4c50 100644
--- a/backend/.sqlx/query-4d8640e84fccf1a0b799d8396a51e69345137e68d5096c70ba0a4332075d97ea.json
+++ b/backend/.sqlx/query-487d377e2df67fc3ea39d183ba9f99d45828d7c8e0ff10c5d74c454472e0493c.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "UPDATE http_trigger \n                SET route_path = $1, route_path_key = $2, script_path = $3, path = $4, is_flow = $5, http_method = $6, edited_by = $7, email = $8, is_async = $9, requires_auth = $10, edited_at = now() \n                WHERE workspace_id = $11 AND path = $12",
+  "query": "UPDATE http_trigger \n                SET route_path = $1, route_path_key = $2, script_path = $3, path = $4, is_flow = $5, http_method = $6, static_asset_config = $7, edited_by = $8, email = $9, is_async = $10, requires_auth = $11, edited_at = now() \n                WHERE workspace_id = $12 AND path = $13",
   "describe": {
     "columns": [],
     "parameters": {
@@ -24,6 +24,7 @@
             }
           }
         },
+        "Jsonb",
         "Varchar",
         "Varchar",
         "Bool",
@@ -34,5 +35,5 @@
     },
     "nullable": []
   },
-  "hash": "4d8640e84fccf1a0b799d8396a51e69345137e68d5096c70ba0a4332075d97ea"
+  "hash": "487d377e2df67fc3ea39d183ba9f99d45828d7c8e0ff10c5d74c454472e0493c"
 }
diff --git a/backend/.sqlx/query-55d44f569f8ebfccddf975e1a330ef0dc286f4138efe923832371cdbac7157b0.json b/backend/.sqlx/query-7113d7cc72e44e4b7e01b69cc18cbe7b0399cf8ec0e9e6d2b05ceef589c432df.json
similarity index 68%
rename from backend/.sqlx/query-55d44f569f8ebfccddf975e1a330ef0dc286f4138efe923832371cdbac7157b0.json
rename to backend/.sqlx/query-7113d7cc72e44e4b7e01b69cc18cbe7b0399cf8ec0e9e6d2b05ceef589c432df.json
index ca0a922067..da3503cf35 100644
--- a/backend/.sqlx/query-55d44f569f8ebfccddf975e1a330ef0dc286f4138efe923832371cdbac7157b0.json
+++ b/backend/.sqlx/query-7113d7cc72e44e4b7e01b69cc18cbe7b0399cf8ec0e9e6d2b05ceef589c432df.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "UPDATE http_trigger SET script_path = $1, path = $2, is_flow = $3, http_method = $4, edited_by = $5, email = $6, is_async = $7, requires_auth = $8, edited_at = now() \n                WHERE workspace_id = $9 AND path = $10",
+  "query": "UPDATE http_trigger SET script_path = $1, path = $2, is_flow = $3, http_method = $4, static_asset_config = $5, edited_by = $6, email = $7, is_async = $8, requires_auth = $9, edited_at = now() \n                WHERE workspace_id = $10 AND path = $11",
   "describe": {
     "columns": [],
     "parameters": {
@@ -22,6 +22,7 @@
             }
           }
         },
+        "Jsonb",
         "Varchar",
         "Varchar",
         "Bool",
@@ -32,5 +33,5 @@
     },
     "nullable": []
   },
-  "hash": "55d44f569f8ebfccddf975e1a330ef0dc286f4138efe923832371cdbac7157b0"
+  "hash": "7113d7cc72e44e4b7e01b69cc18cbe7b0399cf8ec0e9e6d2b05ceef589c432df"
 }
diff --git a/backend/.sqlx/query-02f1a6eeb27067dc438459238e7b016f5ccf9e3fe0ffbe88471f15aad8f74441.json b/backend/.sqlx/query-c9930fcfe79541af570eace58ba7e15a0816a6b4fd036cf7b991a210654b2633.json
similarity index 83%
rename from backend/.sqlx/query-02f1a6eeb27067dc438459238e7b016f5ccf9e3fe0ffbe88471f15aad8f74441.json
rename to backend/.sqlx/query-c9930fcfe79541af570eace58ba7e15a0816a6b4fd036cf7b991a210654b2633.json
index a27bc6365a..da7b44d1b9 100644
--- a/backend/.sqlx/query-02f1a6eeb27067dc438459238e7b016f5ccf9e3fe0ffbe88471f15aad8f74441.json
+++ b/backend/.sqlx/query-c9930fcfe79541af570eace58ba7e15a0816a6b4fd036cf7b991a210654b2633.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT path, script_path, is_flow, route_path, workspace_id, is_async, requires_auth, edited_by, email, http_method as \"http_method: _\" FROM http_trigger WHERE workspace_id = $1",
+  "query": "SELECT path, script_path, is_flow, route_path, workspace_id, is_async, requires_auth, edited_by, email, http_method as \"http_method: _\", static_asset_config as \"static_asset_config: _\" FROM http_trigger WHERE workspace_id = $1",
   "describe": {
     "columns": [
       {
@@ -65,6 +65,11 @@
             }
           }
         }
+      },
+      {
+        "ordinal": 10,
+        "name": "static_asset_config: _",
+        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -82,8 +87,9 @@
       false,
       false,
       false,
-      false
+      false,
+      true
     ]
   },
-  "hash": "02f1a6eeb27067dc438459238e7b016f5ccf9e3fe0ffbe88471f15aad8f74441"
+  "hash": "c9930fcfe79541af570eace58ba7e15a0816a6b4fd036cf7b991a210654b2633"
 }
diff --git a/backend/.sqlx/query-4fb95eae1c871241efe2ef79615ce03cba0e4a12aad3274e4829d98e38ca1491.json b/backend/.sqlx/query-f904702536c106b0e5da8facae119c6af887c49a29ae44b3a95350ff27fb1ccf.json
similarity index 83%
rename from backend/.sqlx/query-4fb95eae1c871241efe2ef79615ce03cba0e4a12aad3274e4829d98e38ca1491.json
rename to backend/.sqlx/query-f904702536c106b0e5da8facae119c6af887c49a29ae44b3a95350ff27fb1ccf.json
index d954f2c26c..08592a3f04 100644
--- a/backend/.sqlx/query-4fb95eae1c871241efe2ef79615ce03cba0e4a12aad3274e4829d98e38ca1491.json
+++ b/backend/.sqlx/query-f904702536c106b0e5da8facae119c6af887c49a29ae44b3a95350ff27fb1ccf.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT workspace_id, path, route_path, route_path_key, script_path, is_flow, http_method as \"http_method: _\", edited_by, email, edited_at, extra_perms, is_async, requires_auth\n            FROM http_trigger\n            WHERE workspace_id = $1 AND path = $2",
+  "query": "SELECT workspace_id, path, route_path, route_path_key, script_path, is_flow, http_method as \"http_method: _\", edited_by, email, edited_at, extra_perms, is_async, requires_auth, static_asset_config as \"static_asset_config: _\"\n            FROM http_trigger\n            WHERE workspace_id = $1 AND path = $2",
   "describe": {
     "columns": [
       {
@@ -80,6 +80,11 @@
         "ordinal": 12,
         "name": "requires_auth",
         "type_info": "Bool"
+      },
+      {
+        "ordinal": 13,
+        "name": "static_asset_config: _",
+        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -101,8 +106,9 @@
       false,
       false,
       false,
-      false
+      false,
+      true
     ]
   },
-  "hash": "4fb95eae1c871241efe2ef79615ce03cba0e4a12aad3274e4829d98e38ca1491"
+  "hash": "f904702536c106b0e5da8facae119c6af887c49a29ae44b3a95350ff27fb1ccf"
 }
diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index 9923d56e66..6a33fdaadd 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-aedaf655693cb9bab59fcf79a48c60aad6822668
\ No newline at end of file
+6534b0f31fb4a75dd706fca2ce91e37e77e4ad02
\ No newline at end of file
diff --git a/backend/migrations/20241107163553_http_route_static_asset.down.sql b/backend/migrations/20241107163553_http_route_static_asset.down.sql
new file mode 100644
index 0000000000..b16c347028
--- /dev/null
+++ b/backend/migrations/20241107163553_http_route_static_asset.down.sql
@@ -0,0 +1,2 @@
+-- Add down migration script here
+ALTER TABLE http_trigger DROP COLUMN static_asset_config;
\ No newline at end of file
diff --git a/backend/migrations/20241107163553_http_route_static_asset.up.sql b/backend/migrations/20241107163553_http_route_static_asset.up.sql
new file mode 100644
index 0000000000..fdd1a25b71
--- /dev/null
+++ b/backend/migrations/20241107163553_http_route_static_asset.up.sql
@@ -0,0 +1,2 @@
+-- Add up migration script here
+ALTER TABLE http_trigger ADD COLUMN static_asset_config JSONB;
\ No newline at end of file
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index c97f81dfde..a66bd92019 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -9146,6 +9146,14 @@ paths:
           in: query
           schema:
             type: string
+        - name: content_type
+          in: query
+          schema:
+            type: string
+        - name: content_disposition
+          in: query
+          schema:
+            type: string
       requestBody:
         description: File content
         required: true
@@ -11463,6 +11471,17 @@ components:
           type: string
         route_path:
           type: string
+        static_asset_config:
+          type: object
+          properties:
+            s3:
+              type: string
+            storage:
+              type: string
+            filename:
+              type: string
+          required:
+            - s3
         is_flow:
           type: boolean
         extra_perms:
@@ -11509,6 +11528,17 @@ components:
           type: string
         route_path:
           type: string
+        static_asset_config:
+          type: object
+          properties:
+            s3:
+              type: string
+            storage:
+              type: string
+            filename:
+              type: string
+          required:
+            - s3
         is_flow:
           type: boolean
         http_method:
@@ -11542,6 +11572,17 @@ components:
           type: string
         route_path:
           type: string
+        static_asset_config:
+          type: object
+          properties:
+            s3:
+              type: string
+            storage:
+              type: string
+            filename:
+              type: string
+          required:
+            - s3
         is_flow:
           type: boolean
         http_method:
diff --git a/backend/windmill-api/src/http_triggers.rs b/backend/windmill-api/src/http_triggers.rs
index 61757cb164..2c323c0e8c 100644
--- a/backend/windmill-api/src/http_triggers.rs
+++ b/backend/windmill-api/src/http_triggers.rs
@@ -1,24 +1,5 @@
-use axum::{
-    extract::{Path, Query},
-    response::IntoResponse,
-    routing::{delete, get, post},
-    Extension, Json, Router,
-};
-use http::{HeaderMap, StatusCode};
-use serde::{Deserialize, Serialize};
-use sql_builder::{bind::Bind, SqlBuilder};
-use sqlx::prelude::FromRow;
-use std::collections::HashMap;
-use tower_http::cors::CorsLayer;
-use windmill_audit::{audit_ee::audit_log, ActionKind};
-use windmill_common::{
-    db::UserDB,
-    error::{self, JsonResult},
-    utils::{not_found_if_none, paginate, require_admin, Pagination, StripPath},
-    worker::{to_raw_value, CLOUD_HOSTED},
-};
-use windmill_queue::PushArgsOwned;
-
+#[cfg(feature = "parquet")]
+use crate::job_helpers_ee::get_workspace_s3_resource;
 use crate::{
     db::{ApiAuthed, DB},
     jobs::{
@@ -27,6 +8,31 @@ use crate::{
     },
     users::{fetch_api_authed, OptAuthed},
 };
+use axum::{
+    extract::{Path, Query},
+    response::IntoResponse,
+    routing::{delete, get, post},
+    Extension, Json, Router,
+};
+#[cfg(feature = "parquet")]
+use http::header::IF_NONE_MATCH;
+use http::{HeaderMap, StatusCode};
+use serde::{Deserialize, Serialize};
+use sql_builder::{bind::Bind, SqlBuilder};
+use sqlx::prelude::FromRow;
+use std::collections::HashMap;
+use tower_http::cors::CorsLayer;
+use windmill_audit::{audit_ee::audit_log, ActionKind};
+#[cfg(feature = "parquet")]
+use windmill_common::s3_helpers::build_object_store_client;
+use windmill_common::{
+    db::UserDB,
+    error::{self, JsonResult},
+    s3_helpers::S3Object,
+    utils::{not_found_if_none, paginate, require_admin, Pagination, StripPath},
+    worker::{to_raw_value, CLOUD_HOSTED},
+};
+use windmill_queue::PushArgsOwned;
 
 lazy_static::lazy_static! {
     static ref ROUTE_PATH_KEY_RE: regex::Regex = regex::Regex::new(r"/:\w+").unwrap();
@@ -99,6 +105,7 @@ struct NewTrigger {
     is_async: bool,
     requires_auth: bool,
     http_method: HttpMethod,
+    static_asset_config: Option<sqlx::types::Json<S3Object>>,
 }
 
 #[derive(FromRow, Serialize)]
@@ -116,6 +123,7 @@ struct Trigger {
     is_async: bool,
     requires_auth: bool,
     http_method: HttpMethod,
+    static_asset_config: Option<sqlx::types::Json<S3Object>>,
 }
 
 #[derive(Deserialize)]
@@ -127,6 +135,7 @@ struct EditTrigger {
     is_async: bool,
     requires_auth: bool,
     http_method: HttpMethod,
+    static_asset_config: Option<sqlx::types::Json<S3Object>>,
 }
 
 #[derive(Deserialize)]
@@ -182,7 +191,7 @@ async fn get_trigger(
     let path = path.to_path();
     let trigger = sqlx::query_as!(
         Trigger,
-        r#"SELECT workspace_id, path, route_path, route_path_key, script_path, is_flow, http_method as "http_method: _", edited_by, email, edited_at, extra_perms, is_async, requires_auth
+        r#"SELECT workspace_id, path, route_path, route_path_key, script_path, is_flow, http_method as "http_method: _", edited_by, email, edited_at, extra_perms, is_async, requires_auth, static_asset_config as "static_asset_config: _"
             FROM http_trigger
             WHERE workspace_id = $1 AND path = $2"#,
         w_id,
@@ -209,7 +218,7 @@ async fn create_trigger(
 
     let mut tx = user_db.begin(&authed).await?;
     sqlx::query!(
-        "INSERT INTO http_trigger (workspace_id, path, route_path, route_path_key, script_path, is_flow, is_async, requires_auth, http_method, edited_by, email, edited_at) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, now())",
+        "INSERT INTO http_trigger (workspace_id, path, route_path, route_path_key, script_path, is_flow, is_async, requires_auth, http_method, static_asset_config, edited_by, email, edited_at) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, now())",
         w_id,
         ct.path,
         ct.route_path,
@@ -218,7 +227,8 @@ async fn create_trigger(
         ct.is_flow,
         ct.is_async,
         ct.requires_auth,
-        ct.http_method as HttpMethod,
+        ct.http_method as _,
+        ct.static_asset_config as _,
         &authed.username,
         &authed.email
     )
@@ -261,14 +271,15 @@ async fn update_trigger(
 
         sqlx::query!(
             "UPDATE http_trigger 
-                SET route_path = $1, route_path_key = $2, script_path = $3, path = $4, is_flow = $5, http_method = $6, edited_by = $7, email = $8, is_async = $9, requires_auth = $10, edited_at = now() 
-                WHERE workspace_id = $11 AND path = $12",
+                SET route_path = $1, route_path_key = $2, script_path = $3, path = $4, is_flow = $5, http_method = $6, static_asset_config = $7, edited_by = $8, email = $9, is_async = $10, requires_auth = $11, edited_at = now() 
+                WHERE workspace_id = $12 AND path = $13",
             ct.route_path,
             &route_path_key,
             ct.script_path,
             ct.path,
             ct.is_flow,
-            ct.http_method as HttpMethod,
+            ct.http_method as _,
+            ct.static_asset_config as _,
             &authed.username,
             &authed.email,
             ct.is_async,
@@ -279,12 +290,13 @@ async fn update_trigger(
         .execute(&mut *tx).await?;
     } else {
         sqlx::query!(
-            "UPDATE http_trigger SET script_path = $1, path = $2, is_flow = $3, http_method = $4, edited_by = $5, email = $6, is_async = $7, requires_auth = $8, edited_at = now() 
-                WHERE workspace_id = $9 AND path = $10",
+            "UPDATE http_trigger SET script_path = $1, path = $2, is_flow = $3, http_method = $4, static_asset_config = $5, edited_by = $6, email = $7, is_async = $8, requires_auth = $9, edited_at = now() 
+                WHERE workspace_id = $10 AND path = $11",
             ct.script_path,
             ct.path,
             ct.is_flow,
-            ct.http_method as HttpMethod,
+            ct.http_method as _,
+            ct.static_asset_config as _,
             &authed.username,
             &authed.email,
             ct.is_async,
@@ -405,6 +417,7 @@ struct TriggerRoute {
     edited_by: String,
     email: String,
     http_method: HttpMethod,
+    static_asset_config: Option<sqlx::types::Json<S3Object>>,
 }
 
 async fn get_http_route_trigger(
@@ -421,7 +434,7 @@ async fn get_http_route_trigger(
         let route_path = StripPath(splitted.collect::<Vec<_>>().join("/"));
         let triggers = sqlx::query_as!(
             TriggerRoute,
-            r#"SELECT path, script_path, is_flow, route_path, workspace_id, is_async, requires_auth, edited_by, email, http_method as "http_method: _" FROM http_trigger WHERE workspace_id = $1"#,
+            r#"SELECT path, script_path, is_flow, route_path, workspace_id, is_async, requires_auth, edited_by, email, http_method as "http_method: _", static_asset_config as "static_asset_config: _" FROM http_trigger WHERE workspace_id = $1"#,
             w_id
         )
         .fetch_all(db)
@@ -430,7 +443,7 @@ async fn get_http_route_trigger(
     } else {
         let triggers = sqlx::query_as!(
             TriggerRoute,
-            r#"SELECT path, script_path, is_flow, route_path, workspace_id, is_async, requires_auth, edited_by, email, http_method as "http_method: _" FROM http_trigger"#,
+            r#"SELECT path, script_path, is_flow, route_path, workspace_id, is_async, requires_auth, edited_by, email, http_method as "http_method: _", static_asset_config as "static_asset_config: _" FROM http_trigger"#,
         )
         .fetch_all(db)
         .await?;
@@ -518,6 +531,90 @@ async fn route_job(
             Ok(trigger) => trigger,
             Err(e) => return e.into_response(),
         };
+
+    #[cfg(not(feature = "parquet"))]
+    if trigger.static_asset_config.is_some() {
+        return error::Error::InternalErr(
+            "Static asset configuration is not supported in this build".to_string(),
+        )
+        .into_response();
+    }
+
+    #[cfg(feature = "parquet")]
+    if let Some(sqlx::types::Json(config)) = trigger.static_asset_config {
+        let build_static_response_f = async {
+            let (_, s3_resource_opt) = get_workspace_s3_resource(
+                &authed,
+                &db,
+                None,
+                &"NO_TOKEN".to_string(), // no token is provided in this case
+                &trigger.workspace_id,
+                config.storage,
+            )
+            .await?;
+            let s3_resource = s3_resource_opt.ok_or(error::Error::InternalErr(
+                "No files storage resource defined at the workspace level".to_string(),
+            ))?;
+            let s3_client = build_object_store_client(&s3_resource).await?;
+            let path = object_store::path::Path::from(config.s3);
+            let s3_object = s3_client.get(&path).await.map_err(|err| {
+                tracing::warn!("Error retrieving file from S3: {:?}", err);
+                error::Error::InternalErr(format!("Error retrieving file: {}", err.to_string()))
+            })?;
+            let mut response_headers = http::HeaderMap::new();
+            if let Some(ref e_tag) = s3_object.meta.e_tag {
+                if let Some(if_none_match) = headers.get(IF_NONE_MATCH) {
+                    if if_none_match == e_tag {
+                        return Ok::<_, error::Error>((
+                            StatusCode::NOT_MODIFIED,
+                            response_headers,
+                            axum::body::Body::empty(),
+                        ));
+                    }
+                }
+                if let Ok(e_tag) = e_tag.parse() {
+                    response_headers.insert("etag", e_tag);
+                }
+            }
+            response_headers.insert(
+                "content-type",
+                s3_object
+                    .attributes
+                    .get(&object_store::Attribute::ContentType)
+                    .map(|s| s.parse().ok())
+                    .flatten()
+                    .unwrap_or("application/octet-stream".parse().unwrap()),
+            );
+            response_headers.insert(
+                "content-disposition",
+                config.filename.as_ref().map_or_else(
+                    || {
+                        s3_object
+                            .attributes
+                            .get(&object_store::Attribute::ContentDisposition)
+                            .map(|s| s.parse().ok())
+                            .flatten()
+                            .unwrap_or("inline".parse().unwrap())
+                    },
+                    |filename| {
+                        format!("inline; filename=\"{}\"", filename)
+                            .parse()
+                            .unwrap_or("inline".parse().unwrap())
+                    },
+                ),
+            );
+
+            let body_stream = axum::body::Body::from_stream(s3_object.into_stream());
+            Ok::<_, error::Error>((StatusCode::OK, response_headers, body_stream))
+        };
+        match build_static_response_f.await {
+            Ok((status, headers, body_stream)) => {
+                return (status, headers, body_stream).into_response()
+            }
+            Err(e) => return e.into_response(),
+        }
+    }
+
     let headers = headers
         .iter()
         .map(|(k, v)| (k.to_string(), v.to_str().unwrap_or("").to_string()))
diff --git a/backend/windmill-api/src/job_helpers_ee.rs b/backend/windmill-api/src/job_helpers_ee.rs
index 61a946bb84..b64ccde92d 100644
--- a/backend/windmill-api/src/job_helpers_ee.rs
+++ b/backend/windmill-api/src/job_helpers_ee.rs
@@ -1,5 +1,23 @@
 use axum::Router;
 
+#[cfg(feature = "parquet")]
+use crate::db::{ApiAuthed, DB};
+#[cfg(feature = "parquet")]
+use windmill_common::{db::UserDB, s3_helpers::ObjectStoreResource};
+
 pub fn workspaced_service() -> Router {
     Router::new()
 }
+
+#[cfg(feature = "parquet")]
+pub async fn get_workspace_s3_resource<'c>(
+    _authed: &ApiAuthed,
+    _db: &DB,
+    _user_db: Option<UserDB>,
+    _token: &str,
+    _w_id: &str,
+    _storage: Option<String>,
+) -> windmill_common::error::Result<(Option<bool>, Option<ObjectStoreResource>)> {
+    // implementation is not open source
+    Ok((None, None))
+}
diff --git a/backend/windmill-common/src/s3_helpers.rs b/backend/windmill-common/src/s3_helpers.rs
index 4547c29d51..715615f37f 100644
--- a/backend/windmill-common/src/s3_helpers.rs
+++ b/backend/windmill-common/src/s3_helpers.rs
@@ -109,10 +109,13 @@ pub struct S3AwsOidcResource {
     pub audience: Option<String>,
 }
 
-#[derive(Deserialize, Clone)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct S3Object {
     pub s3: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub storage: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub filename: Option<String>,
 }
 
 #[cfg(feature = "parquet")]
diff --git a/backend/windmill-worker/src/common.rs b/backend/windmill-worker/src/common.rs
index 80269f7777..b406226120 100644
--- a/backend/windmill-worker/src/common.rs
+++ b/backend/windmill-worker/src/common.rs
@@ -799,6 +799,7 @@ pub async fn get_cached_resource_value_if_valid(
                         S3Object {
                             s3: s3_file_key.clone(),
                             storage: cached_resource.storage.clone(),
+                            filename: None,
                         },
                     )
                     .await;
diff --git a/frontend/src/lib/components/S3FilePicker.svelte b/frontend/src/lib/components/S3FilePicker.svelte
index bd4270a836..57adc334b4 100644
--- a/frontend/src/lib/components/S3FilePicker.svelte
+++ b/frontend/src/lib/components/S3FilePicker.svelte
@@ -299,7 +299,7 @@
 
 	let storage: string | undefined = undefined
 	export async function open(
-		preSelectedFileKey: { s3: string; storage: string | undefined } | undefined = undefined
+		preSelectedFileKey: { s3: string; storage?: string } | undefined = undefined
 	) {
 		storage = preSelectedFileKey?.storage
 		if (preSelectedFileKey !== undefined) {
diff --git a/frontend/src/lib/components/common/fileInput/FileInput.svelte b/frontend/src/lib/components/common/fileInput/FileInput.svelte
index 1ce7347143..b123fbb3a4 100644
--- a/frontend/src/lib/components/common/fileInput/FileInput.svelte
+++ b/frontend/src/lib/components/common/fileInput/FileInput.svelte
@@ -4,6 +4,7 @@
 	import Button from '../../common/button/Button.svelte'
 	import { twMerge } from 'tailwind-merge'
 	import type { ReadFileAs } from './model'
+	import { sendUserToast } from '$lib/toast'
 
 	type ConvertedFile = string | ArrayBuffer | null
 
@@ -89,7 +90,12 @@
 		event.preventDefault()
 		if (event.dataTransfer) {
 			if (event.dataTransfer.files && event.dataTransfer.files.length) {
-				onChange(event.dataTransfer.files)
+				if (!multiple && event.dataTransfer.files.length > 1) {
+					sendUserToast('Only one file can be uploaded at a time')
+					return
+				} else {
+					onChange(event.dataTransfer.files)
+				}
 			}
 		}
 	}
diff --git a/frontend/src/lib/components/common/fileUpload/FileUpload.svelte b/frontend/src/lib/components/common/fileUpload/FileUpload.svelte
index 4ba06e3d99..a2e579a86c 100644
--- a/frontend/src/lib/components/common/fileUpload/FileUpload.svelte
+++ b/frontend/src/lib/components/common/fileUpload/FileUpload.svelte
@@ -14,7 +14,9 @@
 
 	export let acceptedFileTypes: string[] | undefined = ['*']
 	export let allowMultiple: boolean = true
-	export let containerText: string = 'Drag and drop files here or click to browse'
+	export let containerText: string = allowMultiple
+		? 'Drag and drop files here or click to browse'
+		: 'Drag and drop a file here or click to browse'
 	export let customResourcePath: string | undefined = undefined
 	export let customResourceType: 's3' | 'azure_blob' | undefined = undefined // when customResourcePath is provided, this should be provided as well. Will default to S3 if not
 	export let customClass: string = ''
@@ -109,6 +111,10 @@
 			if (fileExtension) {
 				params.append('file_extension', fileExtension)
 			}
+			if (fileToUpload.type) {
+				params.append('content_type', fileToUpload.type)
+			}
+
 			// let response = await fetch(
 			// 	`/api/w/${$workspaceStore}/job_helpers/multipart_upload_s3_file?${params.toString()}`,
 			// 	{
@@ -400,7 +406,6 @@
 			accept={acceptedFileTypes?.join(',')}
 			multiple={allowMultiple}
 			returnFileNames
-			includeMimeType
 			on:change={({ detail }) => {
 				forceDisplayUploads = false
 				handleChange(detail)
diff --git a/frontend/src/lib/components/triggers/RouteEditorInner.svelte b/frontend/src/lib/components/triggers/RouteEditorInner.svelte
index 5cf683515b..10eaef0725 100644
--- a/frontend/src/lib/components/triggers/RouteEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/RouteEditorInner.svelte
@@ -10,13 +10,18 @@
 	import { canWrite, emptyString, sendUserToast } from '$lib/utils'
 	import { createEventDispatcher } from 'svelte'
 	import Section from '$lib/components/Section.svelte'
-	import { Loader2, Save } from 'lucide-svelte'
+	import { Loader2, Save, Pipette } from 'lucide-svelte'
 	import Label from '$lib/components/Label.svelte'
 	import ToggleButton from '../common/toggleButton-v2/ToggleButton.svelte'
 	import ToggleButtonGroup from '../common/toggleButton-v2/ToggleButtonGroup.svelte'
 	import { page } from '$app/stores'
 	import { isCloudHosted } from '$lib/cloud'
 	import { base } from '$lib/base'
+	import S3FilePicker from '../S3FilePicker.svelte'
+	import Toggle from '../Toggle.svelte'
+	import JsonEditor from '../apps/editor/settingsPanel/inputEditor/JsonEditor.svelte'
+	import FileUpload from '../common/fileUpload/FileUpload.svelte'
+	import SimpleEditor from '../SimpleEditor.svelte'
 
 	let is_flow: boolean = false
 	let initialPath = ''
@@ -64,6 +69,8 @@
 			initialScriptPath = ''
 			fixedScriptPath = fixedScriptPath_ ?? ''
 			script_path = fixedScriptPath
+			static_asset_config = undefined
+			s3FileUploadRawMode = false
 			path = ''
 			initialPath = ''
 			dirtyPath = false
@@ -81,6 +88,12 @@
 	let initialRoutePath = ''
 	let route_path = ''
 	let http_method: 'get' | 'post' | 'put' | 'patch' | 'delete' = 'post'
+	let static_asset_config: { s3: string; storage?: string; filename?: string } | undefined =
+		undefined
+
+	let s3FilePicker: S3FilePicker
+	let s3FileUploadRawMode = false
+	let s3Editor: SimpleEditor | undefined = undefined
 
 	const dispatch = createEventDispatcher()
 
@@ -100,6 +113,8 @@
 		http_method = s.http_method ?? 'post'
 		is_async = s.is_async
 		requires_auth = s.requires_auth
+		static_asset_config = s.static_asset_config
+		s3FileUploadRawMode = !!static_asset_config
 
 		can_write = canWrite(s.path, s.extra_perms, $userStore)
 	}
@@ -116,7 +131,8 @@
 					is_async,
 					requires_auth,
 					route_path: $userStore?.is_admin || $userStore?.is_super_admin ? route_path : undefined,
-					http_method
+					http_method,
+					static_asset_config
 				}
 			})
 			sendUserToast(`Route ${path} updated`)
@@ -130,7 +146,8 @@
 					is_async,
 					requires_auth,
 					route_path,
-					http_method
+					http_method,
+					static_asset_config
 				}
 			})
 			sendUserToast(`Route ${path} created`)
@@ -181,6 +198,17 @@
 	$: validateRoute(route_path, http_method)
 </script>
 
+{#if static_asset_config}
+	<S3FilePicker
+		bind:this={s3FilePicker}
+		bind:selectedFileKey={static_asset_config}
+		on:close={() => {
+			s3Editor?.setCode(JSON.stringify(static_asset_config, null, 2))
+		}}
+		readOnlyMode={false}
+	/>
+{/if}
+
 <Drawer size="700px" bind:this={drawer}>
 	<DrawerContent
 		title={edit ? (can_write ? `Edit route ${initialPath}` : `Route ${initialPath}`) : 'New route'}
@@ -190,7 +218,11 @@
 			{#if !drawerLoading && can_write}
 				<Button
 					startIcon={{ icon: Save }}
-					disabled={pathError != '' || routeError != '' || emptyString(script_path) || !can_write}
+					disabled={pathError != '' ||
+						routeError != '' ||
+						(!static_asset_config && emptyString(script_path)) ||
+						(static_asset_config && emptyString(static_asset_config.s3)) ||
+						!can_write}
 					on:click={triggerScript}
 				>
 					Save
@@ -286,35 +318,107 @@
 					</div>
 				</Section>
 
-				<Section label="Runnable">
-					<p class="text-xs mb-1 text-tertiary">
-						Pick a script or flow to be triggered<Required required={true} /><br />
-						To handle headers, query or path parameters, add a preprocessor to your runnable.
-					</p>
-					<div class="flex flex-row mb-2">
-						<ScriptPicker
-							disabled={fixedScriptPath != '' || !can_write}
-							initialPath={fixedScriptPath || initialScriptPath}
-							kinds={['script']}
-							allowFlow={true}
-							bind:itemKind
-							bind:scriptPath={script_path}
-							allowRefresh
-						/>
+				<Section label="Target">
+					<ToggleButtonGroup
+						disabled={fixedScriptPath != '' || !can_write}
+						selected={static_asset_config ? 'static_asset' : 'runnable'}
+						on:selected={(ev) => {
+							if (ev.detail === 'static_asset') {
+								static_asset_config = { s3: '' }
+								script_path = ''
+								initialScriptPath = ''
+								is_flow = false
+							} else {
+								static_asset_config = undefined
+							}
+						}}
+					>
+						<ToggleButton label="Runnable" value="runnable" />
+						<ToggleButton label="Static asset" value="static_asset" />
+					</ToggleButtonGroup>
 
-						{#if script_path === undefined}
-							<Button
-								btnClasses="ml-4 mt-2"
-								color="dark"
+					{#if static_asset_config}
+						<div class="flex flex-col w-full gap-1">
+							<Toggle
+								class="flex justify-end"
+								bind:checked={s3FileUploadRawMode}
 								size="xs"
-								href={itemKind === 'flow'
-									? '/flows/add?hub=55'
-									: '/scripts/add?hub=hub%2F9088%2Fwindmill%2FHTTP%20route%20script%20with%20preprocessor%20template'}
-								target="_blank">Create from template</Button
-							>
-						{/if}
-					</div>
+								options={{ left: 'Existing file' }}
+							/>
+							{#if s3FileUploadRawMode}
+								<JsonEditor
+									bind:editor={s3Editor}
+									on:focus={(e) => {
+										dispatch('focus')
+									}}
+									on:blur={(e) => {
+										dispatch('blur')
+									}}
+									code={JSON.stringify(static_asset_config ?? { s3: '' }, null, 2)}
+									bind:value={static_asset_config}
+								/>
+								<Button
+									variant="border"
+									color="light"
+									size="xs"
+									btnClasses="mt-1"
+									on:click={() => {
+										s3FilePicker?.open?.(static_asset_config)
+									}}
+									startIcon={{ icon: Pipette }}
+								>
+									Choose an object from the catalog
+								</Button>
+							{:else}
+								<FileUpload
+									allowMultiple={false}
+									randomFileKey={true}
+									on:addition={(evt) => {
+										static_asset_config = {
+											s3: evt.detail?.path ?? '',
+											filename: evt.detail?.filename ?? undefined
+										}
+										s3FileUploadRawMode = true
+									}}
+									on:deletion={(evt) => {
+										static_asset_config = {
+											s3: ''
+										}
+									}}
+								/>
+							{/if}
+						</div>
+					{:else}
+						<p class="text-xs mb-1 text-tertiary">
+							Pick a script or flow to be triggered<Required required={true} /><br />
+							To handle headers, query or path parameters, add a preprocessor to your runnable.
+						</p>
+						<div class="flex flex-row mb-2">
+							<ScriptPicker
+								disabled={fixedScriptPath != '' || !can_write}
+								initialPath={fixedScriptPath || initialScriptPath}
+								kinds={['script']}
+								allowFlow={true}
+								bind:itemKind
+								bind:scriptPath={script_path}
+								allowRefresh
+							/>
+
+							{#if script_path === undefined}
+								<Button
+									btnClasses="ml-4 mt-2"
+									color="dark"
+									size="xs"
+									href={itemKind === 'flow'
+										? '/flows/add?hub=55'
+										: '/scripts/add?hub=hub%2F9088%2Fwindmill%2FHTTP%20route%20script%20with%20preprocessor%20template'}
+									target="_blank">Create from template</Button
+								>
+							{/if}
+						</div>
+					{/if}
 				</Section>
+
 				<Section label="Settings">
 					<div class="flex flex-col gap-4">
 						<div class="flex flex-row justify-between">
diff --git a/python-client/wmill/wmill/client.py b/python-client/wmill/wmill/client.py
index bfa2760195..6818749627 100644
--- a/python-client/wmill/wmill/client.py
+++ b/python-client/wmill/wmill/client.py
@@ -358,15 +358,15 @@ class Windmill:
                 "percent": value,
                 "flow_job_id": flow_id or None,
             },
-        )        
+        )
 
-    def get_progress(self, job_id: Optional[str] = None ) -> Any:
+    def get_progress(self, job_id: Optional[str] = None) -> Any:
         workspace = get_workspace()
         job_id = job_id or os.environ.get("WM_JOB_ID")
 
         r = self.get(
             f"/w/{workspace}/job_metrics/get_progress/{job_id}",
-        )        
+        )
         if r.status_code == 404:
             print(f"Job {job_id} does not exist")
             return None
@@ -472,7 +472,13 @@ class Windmill:
             print(file_reader.read())
         '''
         """
-        reader = S3BufferedReader(f"{self.workspace}", self.client, s3object["s3"], s3_resource_path, s3object["storage"] if "storage" in s3object else None)
+        reader = S3BufferedReader(
+            f"{self.workspace}",
+            self.client,
+            s3object["s3"],
+            s3_resource_path,
+            s3object["storage"] if "storage" in s3object else None,
+        )
         return reader
 
     def write_s3_file(
@@ -480,6 +486,8 @@ class Windmill:
         s3object: S3Object | None,
         file_content: BufferedReader | bytes,
         s3_resource_path: str | None,
+        content_type: str | None,
+        content_disposition: str | None,
     ) -> S3Object:
         """
         Write a file to the workspace S3 bucket
@@ -511,8 +519,12 @@ class Windmill:
             query_params["file_key"] = s3object["s3"]
         if s3_resource_path is not None and s3_resource_path != "":
             query_params["s3_resource_path"] = s3_resource_path
-        if s3object is not None and  "storage" in s3object and s3object["storage"] is not None:
+        if s3object is not None and "storage" in s3object and s3object["storage"] is not None:
             query_params["storage"] = s3object["storage"]
+        if content_type is not None:
+            query_params["content_type"] = content_type
+        if content_disposition is not None:
+            query_params["content_disposition"] = content_disposition
 
         try:
             # need a vanilla client b/c content-type is not application/json here
@@ -865,6 +877,7 @@ def set_state(value: Any) -> None:
     """
     return _client.set_state(value)
 
+
 @init_global_client
 def set_progress(value: int, job_id: Optional[str] = None) -> None:
     """
@@ -872,6 +885,7 @@ def set_progress(value: int, job_id: Optional[str] = None) -> None:
     """
     return _client.set_progress(value, job_id)
 
+
 @init_global_client
 def get_progress(job_id: Optional[str] = None) -> Any:
     """

From a3feca719799ea2bf08f2b49350e6b732a24abf4 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 7 Nov 2024 20:51:24 +0100
Subject: [PATCH 45/80] fix: improve nested schema editor field change

---
 frontend/src/lib/components/EditableSchemaForm.svelte         | 1 +
 .../src/lib/components/flows/content/FlowModuleSleep.svelte   | 1 +
 .../src/lib/components/flows/content/FlowModuleSuspend.svelte | 1 +
 frontend/src/lib/components/schema/PropertyEditor.svelte      | 4 +++-
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/lib/components/EditableSchemaForm.svelte b/frontend/src/lib/components/EditableSchemaForm.svelte
index e85616319b..3bb5765ddc 100644
--- a/frontend/src/lib/components/EditableSchemaForm.svelte
+++ b/frontend/src/lib/components/EditableSchemaForm.svelte
@@ -349,6 +349,7 @@
 													{isAppInput}
 													on:change={() => {
 														schema = schema
+														// console.log('schema', schema)
 														dispatch('change', schema)
 													}}
 												>
diff --git a/frontend/src/lib/components/flows/content/FlowModuleSleep.svelte b/frontend/src/lib/components/flows/content/FlowModuleSleep.svelte
index ac639012d9..23b9b7058f 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleSleep.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleSleep.svelte
@@ -72,6 +72,7 @@
 						{schema}
 						{previousModuleId}
 						argExtra={{ seconds: true }}
+						bind:editor
 					/>
 				</PropPickerWrapper>
 			</div>
diff --git a/frontend/src/lib/components/flows/content/FlowModuleSuspend.svelte b/frontend/src/lib/components/flows/content/FlowModuleSuspend.svelte
index b1ad154d82..dc69dd8bf1 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleSuspend.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleSuspend.svelte
@@ -200,6 +200,7 @@
 									argName="groups"
 									{schema}
 									{previousModuleId}
+									bind:editor
 								/>
 							</PropPickerWrapper>
 						</div>
diff --git a/frontend/src/lib/components/schema/PropertyEditor.svelte b/frontend/src/lib/components/schema/PropertyEditor.svelte
index 1ce25726fd..7601f70690 100644
--- a/frontend/src/lib/components/schema/PropertyEditor.svelte
+++ b/frontend/src/lib/components/schema/PropertyEditor.svelte
@@ -87,7 +87,9 @@
 	let mounted = false
 	let firstOnContentChange = true
 	onMount(() => {
-		mounted = true
+		setTimeout(() => {
+			mounted = true
+		}, 500)
 	})
 
 	$: extra && mounted && onContentChange()

From 162070dccabb5a334e3397bb08142946f2e75d43 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Thu, 7 Nov 2024 20:54:42 +0100
Subject: [PATCH 46/80] chore(main): release 1.421.0 (#4668)

* chore(main): release 1.421.0

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  | 12 +++++
 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, 53 insertions(+), 41 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09c9329e59..5ee4f0d39b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.421.0](https://github.com/windmill-labs/windmill/compare/v1.420.1...v1.421.0) (2024-11-07)
+
+
+### Features
+
+* http custom routes for static assets ([#4666](https://github.com/windmill-labs/windmill/issues/4666)) ([dc8bd6d](https://github.com/windmill-labs/windmill/commit/dc8bd6d2b5d6f5cd8521f9034853175ec78d5639))
+
+
+### Bug Fixes
+
+* improve nested schema editor field change ([a3feca7](https://github.com/windmill-labs/windmill/commit/a3feca719799ea2bf08f2b49350e6b732a24abf4))
+
 ## [1.420.1](https://github.com/windmill-labs/windmill/compare/v1.420.0...v1.420.1) (2024-11-07)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 40bdafa1d6..24aaeb46f6 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -10593,7 +10593,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "anyhow",
  "axum",
@@ -10635,7 +10635,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10720,7 +10720,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -10738,7 +10738,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "chrono",
  "serde",
@@ -10751,7 +10751,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10766,7 +10766,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10812,7 +10812,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10827,7 +10827,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10849,7 +10849,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10861,7 +10861,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10870,7 +10870,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10882,7 +10882,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10894,7 +10894,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10906,7 +10906,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10917,7 +10917,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10928,7 +10928,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10946,7 +10946,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10963,7 +10963,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10975,7 +10975,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10993,7 +10993,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -11014,7 +11014,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -11024,7 +11024,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -11057,7 +11057,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -11067,7 +11067,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.420.1"
+version = "1.421.0"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 188e77a272..8b9167517b 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.420.1"
+version = "1.421.0"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.420.1"
+version = "1.421.0"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index a66bd92019..9dfe7365dc 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.420.1
+  version: 1.421.0
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 7dc27071c9..4859277980 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.420.1";
+export const VERSION = "v1.421.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 db4206dc9c..366f76f492 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.420.1";
+export const VERSION = "1.421.0";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index c75755d6cb..879210fe69 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.420.1",
+	"version": "1.421.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.420.1",
+			"version": "1.421.0",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index 93fc98ea37..3cca992066 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.420.1",
+	"version": "1.421.0",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 67c2a4f15a..7ed7b72d54 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.420.1"
-wmill_pg = ">=1.420.1"
+wmill = ">=1.421.0"
+wmill_pg = ">=1.421.0"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 72ecf7f46d..035528c799 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.420.1
+  version: 1.421.0
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 5301480e08..e451c04400 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.420.1'
+ModuleVersion = '1.421.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 176627eec8..630107656c 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.420.1"
+version = "1.421.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 48737c7680..564cbb27d6 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.420.1"
+version = "1.421.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 615f3537de..9aae61dc49 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.420.1",
+  "version": "1.421.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 c2c4d34d4b..6e47cb1568 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.420.1",
+  "version": "1.421.0",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 5e2ad7ceec..1c1afe3cf4 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.420.1
+1.421.0

From fbdeb6be09f6c27a0bb128549bf6dfa35c3046d7 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 7 Nov 2024 22:06:39 +0100
Subject: [PATCH 47/80] nits plug sleep & suspend groups

---
 .../flows/content/FlowModuleSleep.svelte      |  1 +
 .../flows/content/FlowModuleSuspend.svelte    |  1 +
 .../flows/propPicker/PropPickerWrapper.svelte | 19 +++++++++++--------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/frontend/src/lib/components/flows/content/FlowModuleSleep.svelte b/frontend/src/lib/components/flows/content/FlowModuleSleep.svelte
index 23b9b7058f..4beb4c1355 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleSleep.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleSleep.svelte
@@ -57,6 +57,7 @@
 		{#if flowModule.sleep && schema.properties['sleep']}
 			<div class="border">
 				<PropPickerWrapper
+					noFlowPlugConnect={true}
 					notSelectable
 					{result}
 					displayContext={false}
diff --git a/frontend/src/lib/components/flows/content/FlowModuleSuspend.svelte b/frontend/src/lib/components/flows/content/FlowModuleSuspend.svelte
index dc69dd8bf1..fa75294f71 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleSuspend.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleSuspend.svelte
@@ -187,6 +187,7 @@
 						<div class="border">
 							<PropPickerWrapper
 								{result}
+								noFlowPlugConnect
 								displayContext={false}
 								pickableProperties={undefined}
 								on:select={({ detail }) => {
diff --git a/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte b/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte
index cd3a55fb8a..47b8ab6032 100644
--- a/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte
+++ b/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte
@@ -43,6 +43,7 @@
 	export let noPadding: boolean = false
 	export let alwaysOn: boolean = false
 	export let paneClass: string = ''
+	export let noFlowPlugConnect = false
 
 	const propPickerConfig: Writable<PropPickerConfig | undefined> = writable<
 		PropPickerConfig | undefined
@@ -67,13 +68,15 @@
 				}
 			}
 			propPickerConfig.set(config)
-			flowPropPickerConfig.set({
-				...config,
-				clearFocus: () => {
-					propPickerConfig.set(undefined)
-					flowPropPickerConfig.set(undefined)
-				}
-			})
+			if (!noFlowPlugConnect) {
+				flowPropPickerConfig.set({
+					...config,
+					clearFocus: () => {
+						propPickerConfig.set(undefined)
+						flowPropPickerConfig.set(undefined)
+					}
+				})
+			}
 		},
 		clearFocus: () => {
 			flowPropPickerConfig.set(undefined)
@@ -121,7 +124,7 @@
 					: 'transparent'}
 				animationDuration="4s"
 			>
-				{#if result}
+				{#if result != undefined}
 					<PropPickerResult
 						{result}
 						{extraResults}

From f9eb64aae2e66d641e993a8330efe963af1d93ea Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 7 Nov 2024 23:30:48 +0100
Subject: [PATCH 48/80] nit flow inputs

---
 frontend/src/lib/components/flows/previousResults.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/lib/components/flows/previousResults.ts b/frontend/src/lib/components/flows/previousResults.ts
index 51a09ff699..3e2a297390 100644
--- a/frontend/src/lib/components/flows/previousResults.ts
+++ b/frontend/src/lib/components/flows/previousResults.ts
@@ -74,7 +74,10 @@ function getFlowInput(
 	if (parentState && parentModule) {
 		if (
 			parentState.previewArgs &&
-			!(parentModule.value?.type === 'forloopflow' && parentModule.value?.modules?.length === 1)
+			!(parentModule.value?.type === 'forloopflow' && parentModule.value?.modules?.length === 1) &&
+			parentState &&
+			typeof parentState.previewArgs == 'object' &&
+			`iter` in parentState.previewArgs
 		) {
 			return { ...topFlowInput, ...parentState.previewArgs }
 		} else {

From 2eb9cfd0a90e764fffd4b2bd3cc9480ea81446ef Mon Sep 17 00:00:00 2001
From: VuRsd <66735452+J1ufan@users.noreply.github.com>
Date: Fri, 8 Nov 2024 16:56:28 +0800
Subject: [PATCH 49/80] add pysocks import handling

add PySocks dependency mapping
---
 backend/parsers/windmill-parser-py-imports/src/lib.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/parsers/windmill-parser-py-imports/src/lib.rs b/backend/parsers/windmill-parser-py-imports/src/lib.rs
index 841a763ec2..38869fcd39 100644
--- a/backend/parsers/windmill-parser-py-imports/src/lib.rs
+++ b/backend/parsers/windmill-parser-py-imports/src/lib.rs
@@ -62,6 +62,7 @@ static PYTHON_IMPORTS_REPLACEMENT: phf::Map<&'static str, &'static str> = phf_ma
     "lokalise" => "python-lokalise-api",
     "msgraph" => "msgraph-sdk",
     "pythonjsonlogger" => "python-json-logger",
+    "socks" => "PySocks",
 };
 
 fn replace_import(x: String) -> String {

From ae70c37363ca8ca166392c2e7a5ab57465a109d0 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Fri, 8 Nov 2024 12:08:30 +0100
Subject: [PATCH 50/80] nit app focus

---
 .../src/lib/components/apps/svelte-grid/Grid.svelte    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/frontend/src/lib/components/apps/svelte-grid/Grid.svelte b/frontend/src/lib/components/apps/svelte-grid/Grid.svelte
index 3b18732c67..1dd3518e7e 100644
--- a/frontend/src/lib/components/apps/svelte-grid/Grid.svelte
+++ b/frontend/src/lib/components/apps/svelte-grid/Grid.svelte
@@ -335,7 +335,15 @@
 	}
 </script>
 
-<svelte:window on:keydown={handleKeyDown} on:keyup={handleKeyUp} />
+<svelte:window
+	on:focus={() => {
+		if ($isCtrlOrMetaPressedStore) {
+			$isCtrlOrMetaPressedStore = false
+		}
+	}}
+	on:keydown={handleKeyDown}
+	on:keyup={handleKeyUp}
+/>
 
 <div
 	class="svlt-grid-container"

From 3ea12f1821500e8b84549b892e3e1bb56a6ace4b Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Fri, 8 Nov 2024 15:35:41 +0100
Subject: [PATCH 51/80] fix(python-client): fix small break params of
 write_s3_file

---
 python-client/wmill/wmill/client.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python-client/wmill/wmill/client.py b/python-client/wmill/wmill/client.py
index 6818749627..c0e3f569ef 100644
--- a/python-client/wmill/wmill/client.py
+++ b/python-client/wmill/wmill/client.py
@@ -486,8 +486,8 @@ class Windmill:
         s3object: S3Object | None,
         file_content: BufferedReader | bytes,
         s3_resource_path: str | None,
-        content_type: str | None,
-        content_disposition: str | None,
+        content_type: str | None = None,
+        content_disposition: str | None = None,
     ) -> S3Object:
         """
         Write a file to the workspace S3 bucket

From 237307ba1834936b02269992433466e1e40d8e01 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Fri, 8 Nov 2024 15:43:03 +0100
Subject: [PATCH 52/80] nits client

---
 python-client/wmill/wmill/client.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/python-client/wmill/wmill/client.py b/python-client/wmill/wmill/client.py
index c0e3f569ef..08338a273f 100644
--- a/python-client/wmill/wmill/client.py
+++ b/python-client/wmill/wmill/client.py
@@ -829,11 +829,19 @@ def write_s3_file(
     s3object: S3Object | None,
     file_content: BufferedReader | bytes,
     s3_resource_path: str | None = None,
+    content_type: str | None = None,
+    content_disposition: str | None = None,
 ) -> S3Object:
     """
     Upload a file to S3
+
+    Content type will be automatically guessed from path extension if left empty
+
+    See MDN for content_disposition: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Disposition
+    and content_type: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Type
+
     """
-    return _client.write_s3_file(s3object, file_content, s3_resource_path if s3_resource_path != "" else None)
+    return _client.write_s3_file(s3object, file_content, s3_resource_path if s3_resource_path != "" else None, content_type, content_disposition)
 
 
 @init_global_client

From 1c7d295c520a68349f9a2c4eea1918f33eae95ef Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Fri, 8 Nov 2024 15:43:28 +0100
Subject: [PATCH 53/80] chore(main): release 1.421.1 (#4674)

* chore(main): release 1.421.1

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |   7 +
 backend/Cargo.lock                            | 139 ++++++++----------
 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, 86 insertions(+), 94 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ee4f0d39b..f81ca07d44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.421.1](https://github.com/windmill-labs/windmill/compare/v1.421.0...v1.421.1) (2024-11-08)
+
+
+### Bug Fixes
+
+* **python-client:** fix small break params of write_s3_file ([3ea12f1](https://github.com/windmill-labs/windmill/commit/3ea12f1821500e8b84549b892e3e1bb56a6ace4b))
+
 ## [1.421.0](https://github.com/windmill-labs/windmill/compare/v1.420.1...v1.421.0) (2024-11-07)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 24aaeb46f6..bb88d0ca6e 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -511,8 +511,8 @@ checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
 dependencies = [
  "async-task",
  "concurrent-queue",
- "fastrand 2.1.1",
- "futures-lite 2.4.0",
+ "fastrand 2.2.0",
+ "futures-lite 2.5.0",
  "slab",
 ]
 
@@ -527,21 +527,21 @@ dependencies = [
  "async-io",
  "async-lock",
  "blocking",
- "futures-lite 2.4.0",
+ "futures-lite 2.5.0",
  "once_cell",
 ]
 
 [[package]]
 name = "async-io"
-version = "2.3.4"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
+checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
 dependencies = [
  "async-lock",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
- "futures-lite 2.4.0",
+ "futures-lite 2.5.0",
  "parking",
  "polling",
  "rustix",
@@ -605,7 +605,7 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-io",
- "futures-lite 2.4.0",
+ "futures-lite 2.5.0",
  "gloo-timers",
  "kv-log-macro",
  "log",
@@ -749,7 +749,7 @@ dependencies = [
  "aws-smithy-types",
  "aws-types",
  "bytes",
- "fastrand 2.1.1",
+ "fastrand 2.2.0",
  "hex",
  "http 0.2.12",
  "ring 0.17.8",
@@ -787,7 +787,7 @@ dependencies = [
  "aws-smithy-types",
  "aws-types",
  "bytes",
- "fastrand 2.1.1",
+ "fastrand 2.2.0",
  "http 0.2.12",
  "http-body 0.4.6",
  "once_cell",
@@ -948,7 +948,7 @@ dependencies = [
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "bytes",
- "fastrand 2.1.1",
+ "fastrand 2.2.0",
  "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
@@ -1357,15 +1357,15 @@ dependencies = [
  "async-channel 2.3.1",
  "async-task",
  "futures-io",
- "futures-lite 2.4.0",
+ "futures-lite 2.5.0",
  "piper",
 ]
 
 [[package]]
 name = "borsh"
-version = "1.5.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed"
+checksum = "f5327f6c99920069d1fe374aa743be1af0031dea9f250852cdf1ae6a0861ee24"
 dependencies = [
  "borsh-derive",
  "cfg_aliases",
@@ -1373,16 +1373,15 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive"
-version = "1.5.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b"
+checksum = "10aedd8f1a81a8aafbfde924b0e3061cd6fedd6f6bbcfc6a76e6fd426d7bfe26"
 dependencies = [
  "once_cell",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn 2.0.87",
- "syn_derive",
 ]
 
 [[package]]
@@ -1599,9 +1598,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.36"
+version = "1.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baee610e9452a8f6f0a1b6194ec09ff9e2d85dea54432acdae41aa0761c95d70"
+checksum = "40545c26d092346d8a8dab71ee48e7685a7a9cba76e634790c215b41a4a7b4cf"
 dependencies = [
  "jobserver",
  "libc",
@@ -3306,9 +3305,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
 
 [[package]]
 name = "ff"
@@ -3587,11 +3586,11 @@ dependencies = [
 
 [[package]]
 name = "futures-lite"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f1fa2f9765705486b33fd2acf1577f8ec449c2ba1f318ae5447697b7c08d210"
+checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1"
 dependencies = [
- "fastrand 2.1.1",
+ "fastrand 2.2.0",
  "futures-core",
  "futures-io",
  "parking",
@@ -5307,15 +5306,15 @@ checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b"
 
 [[package]]
 name = "mysql-common-derive"
-version = "0.31.1"
+version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afe0450cc9344afff34915f8328600ab5ae19260802a334d0f72d2d5bdda3bfe"
+checksum = "63c3512cf11487168e0e9db7157801bf5273be13055a9cc95356dc9e0035e49c"
 dependencies = [
  "darling 0.20.10",
- "heck 0.4.1",
+ "heck 0.5.0",
  "num-bigint",
  "proc-macro-crate",
- "proc-macro-error",
+ "proc-macro-error2",
  "proc-macro2",
  "quote",
  "syn 2.0.87",
@@ -6068,7 +6067,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
 dependencies = [
  "atomic-waker",
- "fastrand 2.1.1",
+ "fastrand 2.2.0",
  "futures-io",
 ]
 
@@ -6250,27 +6249,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "proc-macro-error"
-version = "1.0.4"
+name = "proc-macro-error-attr2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
 dependencies = [
- "proc-macro-error-attr",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
- "version_check",
 ]
 
 [[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
+name = "proc-macro-error2"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
 dependencies = [
+ "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "version_check",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -8869,18 +8866,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "syn_derive"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 2.0.87",
-]
-
 [[package]]
 name = "sync_wrapper"
 version = "0.1.2"
@@ -9123,12 +9108,12 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
  "cfg-if",
- "fastrand 2.1.1",
+ "fastrand 2.2.0",
  "once_cell",
  "rustix",
  "windows-sys 0.59.0",
@@ -10593,7 +10578,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "anyhow",
  "axum",
@@ -10635,7 +10620,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10720,7 +10705,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -10738,7 +10723,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "chrono",
  "serde",
@@ -10751,7 +10736,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10766,7 +10751,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10812,7 +10797,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10827,7 +10812,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10849,7 +10834,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10861,7 +10846,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10870,7 +10855,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10882,7 +10867,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10894,7 +10879,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10906,7 +10891,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10917,7 +10902,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10928,7 +10913,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10946,7 +10931,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10963,7 +10948,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10975,7 +10960,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10993,7 +10978,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -11014,7 +10999,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -11024,7 +11009,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -11057,7 +11042,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -11067,7 +11052,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.421.0"
+version = "1.421.1"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 8b9167517b..889259659e 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.421.0"
+version = "1.421.1"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.421.0"
+version = "1.421.1"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 9dfe7365dc..42ec612f6a 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.421.0
+  version: 1.421.1
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 4859277980..eae7d4a668 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.421.0";
+export const VERSION = "v1.421.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 366f76f492..e01734c2fd 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.421.0";
+export const VERSION = "1.421.1";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 879210fe69..e04d9da80f 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.421.0",
+	"version": "1.421.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.421.0",
+			"version": "1.421.1",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index 3cca992066..d51b6864e3 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.421.0",
+	"version": "1.421.1",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 7ed7b72d54..30f5328b41 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.421.0"
-wmill_pg = ">=1.421.0"
+wmill = ">=1.421.1"
+wmill_pg = ">=1.421.1"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 035528c799..c6808d1508 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.421.0
+  version: 1.421.1
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index e451c04400..0ec7c5eb03 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.421.0'
+ModuleVersion = '1.421.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 630107656c..b0641788a7 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.421.0"
+version = "1.421.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 564cbb27d6..0e58970af1 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.421.0"
+version = "1.421.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 9aae61dc49..33c69ac545 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.421.0",
+  "version": "1.421.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 6e47cb1568..5a6f2e4898 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.421.0",
+  "version": "1.421.1",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 1c1afe3cf4..8199d1f287 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.421.0
+1.421.1

From 8bc9a021a88391147c9170f56b5a0edddd55bc7d Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Fri, 8 Nov 2024 16:33:01 +0100
Subject: [PATCH 54/80] fix(bash): correctly propagate exit errors

---
 backend/windmill-worker/src/bash_executor.rs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/backend/windmill-worker/src/bash_executor.rs b/backend/windmill-worker/src/bash_executor.rs
index 2c4c46ab7d..2582f98b58 100644
--- a/backend/windmill-worker/src/bash_executor.rs
+++ b/backend/windmill-worker/src/bash_executor.rs
@@ -89,8 +89,18 @@ 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
+pid=$!
+
+# Wait for main.sh to finish and capture its exit status
+wait $pid
+exit_status=$?
+
+# Clean up the named pipe and background processes
+rm -f bp
+
+
+# Exit with the captured status
+exit $exit_status
 "#,
         bash = BIN_BASH.as_str(),
     );

From 8c6f5a320b4977730aed1d4b49bc8c5cf575c211 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Fri, 8 Nov 2024 16:37:58 +0100
Subject: [PATCH 55/80] propagate exit code in error result when relevant

---
 backend/windmill-worker/src/result_processor.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backend/windmill-worker/src/result_processor.rs b/backend/windmill-worker/src/result_processor.rs
index 6c4f43746f..fa08fe377b 100644
--- a/backend/windmill-worker/src/result_processor.rs
+++ b/backend/windmill-worker/src/result_processor.rs
@@ -295,6 +295,7 @@ pub async fn process_result(
                     message: format!("error during execution of the script:\n{}", err),
                     name: "ExecutionErr".to_string(),
                     step_id: job.flow_step_id.clone(),
+                    exit_code: None,
                 }),
             };
 
@@ -608,6 +609,8 @@ pub struct SerializedError {
     pub name: String,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub step_id: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exit_code: Option<i32>,
 }
 pub fn extract_error_value(log_lines: &str, i: i32, step_id: Option<String>) -> Box<RawValue> {
     return to_raw_value(&SerializedError {
@@ -617,5 +620,6 @@ pub fn extract_error_value(log_lines: &str, i: i32, step_id: Option<String>) ->
         ),
         name: "ExecutionErr".to_string(),
         step_id,
+        exit_code: Some(i),
     });
 }

From 4c98410b83b77ee4b84203a717de613453644dc1 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Fri, 8 Nov 2024 16:57:09 +0100
Subject: [PATCH 56/80] chore(main): release 1.421.2 (#4675)

* chore(main): release 1.421.2

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |  7 +++
 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, 48 insertions(+), 41 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f81ca07d44..7faf7d54b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.421.2](https://github.com/windmill-labs/windmill/compare/v1.421.1...v1.421.2) (2024-11-08)
+
+
+### Bug Fixes
+
+* **bash:** correctly propagate exit errors ([8bc9a02](https://github.com/windmill-labs/windmill/commit/8bc9a021a88391147c9170f56b5a0edddd55bc7d))
+
 ## [1.421.1](https://github.com/windmill-labs/windmill/compare/v1.421.0...v1.421.1) (2024-11-08)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index bb88d0ca6e..7fe1f09907 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -10578,7 +10578,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "anyhow",
  "axum",
@@ -10620,7 +10620,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10705,7 +10705,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -10723,7 +10723,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "chrono",
  "serde",
@@ -10736,7 +10736,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10751,7 +10751,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10797,7 +10797,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10812,7 +10812,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10834,7 +10834,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10846,7 +10846,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10855,7 +10855,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10867,7 +10867,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10879,7 +10879,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10891,7 +10891,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10902,7 +10902,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10913,7 +10913,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10931,7 +10931,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10948,7 +10948,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10960,7 +10960,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10978,7 +10978,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10999,7 +10999,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -11009,7 +11009,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -11042,7 +11042,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -11052,7 +11052,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.421.1"
+version = "1.421.2"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 889259659e..8663582c19 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.421.1"
+version = "1.421.2"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.421.1"
+version = "1.421.2"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 42ec612f6a..5b274610bd 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.421.1
+  version: 1.421.2
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index eae7d4a668..5c02fcf14d 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.421.1";
+export const VERSION = "v1.421.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 e01734c2fd..38a4087b01 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.421.1";
+export const VERSION = "1.421.2";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e04d9da80f..d3ff5df966 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.421.1",
+	"version": "1.421.2",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.421.1",
+			"version": "1.421.2",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index d51b6864e3..3b10b586cd 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.421.1",
+	"version": "1.421.2",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 30f5328b41..86a7e35c0c 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.421.1"
-wmill_pg = ">=1.421.1"
+wmill = ">=1.421.2"
+wmill_pg = ">=1.421.2"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index c6808d1508..6ce1e0202a 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.421.1
+  version: 1.421.2
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 0ec7c5eb03..9eed73c5d4 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.421.1'
+ModuleVersion = '1.421.2'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index b0641788a7..0ec46457c8 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.421.1"
+version = "1.421.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 0e58970af1..47bd0ed863 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.421.1"
+version = "1.421.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 33c69ac545..afef82391e 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.421.1",
+  "version": "1.421.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 5a6f2e4898..5cd31ed603 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.421.1",
+  "version": "1.421.2",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 8199d1f287..520cca8f24 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.421.1
+1.421.2

From 0d96cfb5a8a167c56c344d8851fb586bab8a18d4 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Fri, 8 Nov 2024 19:20:22 +0100
Subject: [PATCH 57/80] nit right panel flow props

---
 .../src/lib/components/flows/content/FlowInputsQuick.svelte  | 2 +-
 .../lib/components/flows/propPicker/PropPickerWrapper.svelte | 1 +
 .../src/lib/components/propertyPicker/ObjectViewer.svelte    | 5 ++++-
 frontend/src/lib/components/propertyPicker/PropPicker.svelte | 3 +++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/frontend/src/lib/components/flows/content/FlowInputsQuick.svelte b/frontend/src/lib/components/flows/content/FlowInputsQuick.svelte
index bf61ab6433..4439009115 100644
--- a/frontend/src/lib/components/flows/content/FlowInputsQuick.svelte
+++ b/frontend/src/lib/components/flows/content/FlowInputsQuick.svelte
@@ -307,7 +307,7 @@
 		{/if}
 
 		{#if inlineScripts?.length > 0}
-			<div class="pb-0 flex flex-row items-center gap-2">
+			<div class="pb-0 flex flex-row items-center gap-2 -mt-[3px]">
 				<div class=" text-2xs font-light text-secondary ml-2"
 					>New {selectedKind != 'script' ? selectedKind + ' ' : ''}script</div
 				>
diff --git a/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte b/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte
index 47b8ab6032..41f05c1fb5 100644
--- a/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte
+++ b/frontend/src/lib/components/flows/propPicker/PropPickerWrapper.svelte
@@ -142,6 +142,7 @@
 						{alwaysOn}
 						{displayContext}
 						{error}
+						previousId={pickableProperties?.previousId}
 						{pickableProperties}
 						allowCopy={!notSelectable && !$propPickerConfig}
 						on:select={({ detail }) => {
diff --git a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
index b9db54d62b..ffe0269b52 100644
--- a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
+++ b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
@@ -20,6 +20,7 @@
 	export let allowCopy = true
 	export let collapseLevel: number | undefined = undefined
 	export let prefix = ''
+	export let expandedEvenOnLevel0: string | undefined = undefined
 
 	let s3FileViewer: S3FilePicker
 
@@ -124,7 +125,9 @@
 								{allowCopy}
 								on:select
 								{collapseLevel}
-								collapsed={collapseLevel !== undefined ? level + 1 >= collapseLevel : undefined}
+								collapsed={collapseLevel !== undefined
+									? level + 1 >= collapseLevel && key != expandedEvenOnLevel0
+									: undefined}
 							/>
 						{:else}
 							<!-- svelte-ignore a11y-click-events-have-key-events -->
diff --git a/frontend/src/lib/components/propertyPicker/PropPicker.svelte b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
index 62610d48fc..a83952578c 100644
--- a/frontend/src/lib/components/propertyPicker/PropPicker.svelte
+++ b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
@@ -17,6 +17,7 @@
 	export let error: boolean = false
 	export let allowCopy = false
 	export let alwaysOn = false
+	export let previousId: string | undefined = undefined
 
 	let variables: Record<string, string> = {}
 	let resources: Record<string, any> = {}
@@ -257,6 +258,7 @@
 				<span class="font-normal text-sm text-tertiary font-mono">results</span>
 				<div class="overflow-y-auto pb-2">
 					<ObjectViewer
+						expandedEvenOnLevel0={previousId}
 						{allowCopy}
 						pureViewer={!$propPickerConfig}
 						collapseLevel={allResultsCollapsed ? 1 : undefined}
@@ -305,6 +307,7 @@
 							pureViewer={!$propPickerConfig}
 							collapseLevel={allResultsCollapsed ? 1 : undefined}
 							json={resultByIdFiltered}
+							expandedEvenOnLevel0={previousId}
 							prefix="results"
 							on:select
 						/>

From 58194521b12f121b802428eb4e39b5d879f52f4a Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Fri, 8 Nov 2024 19:35:21 +0100
Subject: [PATCH 58/80] nit right panel flow props

---
 .../flows/content/FlowModuleComponent.svelte  |  2 +-
 .../propertyPicker/PropPicker.svelte          | 20 ++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
index 35a8585af1..6eee352cc9 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
@@ -378,7 +378,7 @@
 							class={advancedSelected === 'runtime' ? 'h-[calc(100%-68px)]' : 'h-[calc(100%-34px)]'}
 						>
 							{#if selected === 'inputs' && (flowModule.value.type == 'rawscript' || flowModule.value.type == 'script' || flowModule.value.type == 'flow')}
-								<div class="h-full overflow-auto px-2 bg-surface" id="flow-editor-step-input">
+								<div class="h-full overflow-auto bg-surface" id="flow-editor-step-input">
 									<PropPickerWrapper
 										pickableProperties={stepPropPicker.pickableProperties}
 										error={failureModule}
diff --git a/frontend/src/lib/components/propertyPicker/PropPicker.svelte b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
index a83952578c..54946f627d 100644
--- a/frontend/src/lib/components/propertyPicker/PropPicker.svelte
+++ b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
@@ -11,6 +11,7 @@
 	import ClearableInput from '../common/clearableInput/ClearableInput.svelte'
 	import { filterNestedObject } from '../flows/previousResults'
 	import type { PropPickerContext } from '../prop_picker'
+	import Scrollable from '../Scrollable.svelte'
 
 	export let pickableProperties: PickableProperties
 	export let displayContext = true
@@ -191,14 +192,18 @@
 	$: search, $inputMatches, $propPickerConfig, updateState()
 </script>
 
-<div class="flex flex-col h-full rounded overflow-hidden">
-	<div class="px-2 py-2">
+<div class="flex flex-col h-full rounded">
+	<div class="px-1 py-2">
 		<ClearableInput bind:value={search} placeholder="Search prop..." />
 	</div>
-	<div
-		class="overflow-y-auto px-2 pt-2 grow relative"
-		class:bg-surface-secondary={!$propPickerConfig && !alwaysOn}
-	>
+	<!-- <div
+	class="px-2 pt-2 grow relative"
+	class:bg-surface-secondary={!$propPickerConfig && !alwaysOn} -->
+	<Scrollable scrollableClass="grow relative min-h-0 px-1 py-1 shrink ">
+		<!-- <div
+			class="px-2 pt-2 grow relative"
+			class:bg-surface-secondary={!$propPickerConfig && !alwaysOn}
+		> -->
 		<!-- <pre class="text-2xs w-full"
 			>{JSON.stringify({ pickableProperties, resultByIdFiltered }, null, 2)}</pre
 		> -->
@@ -399,5 +404,6 @@
 				</div>
 			{/if}
 		{/if}
-	</div>
+		<!-- </div> -->
+	</Scrollable>
 </div>

From 2774d394ad2134eeb17a6d0c553602518881551e Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Fri, 8 Nov 2024 19:38:09 +0100
Subject: [PATCH 59/80] nit right panel flow props

---
 .../components/flows/content/FlowModuleComponent.svelte   | 1 +
 .../src/lib/components/propertyPicker/PropPicker.svelte   | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
index 6eee352cc9..790758ca0e 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
@@ -385,6 +385,7 @@
 										noPadding
 									>
 										<InputTransformSchemaForm
+											class="px-1 xl:px-2"
 											bind:this={inputTransformSchemaForm}
 											pickableProperties={stepPropPicker.pickableProperties}
 											schema={$flowStateStore[$selectedId]?.schema ?? {}}
diff --git a/frontend/src/lib/components/propertyPicker/PropPicker.svelte b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
index 54946f627d..66b85816a3 100644
--- a/frontend/src/lib/components/propertyPicker/PropPicker.svelte
+++ b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
@@ -193,13 +193,17 @@
 </script>
 
 <div class="flex flex-col h-full rounded">
-	<div class="px-1 py-2">
+	<div class="px-1 py-1">
 		<ClearableInput bind:value={search} placeholder="Search prop..." />
 	</div>
 	<!-- <div
 	class="px-2 pt-2 grow relative"
 	class:bg-surface-secondary={!$propPickerConfig && !alwaysOn} -->
-	<Scrollable scrollableClass="grow relative min-h-0 px-1 py-1 shrink ">
+	<Scrollable
+		scrollableClass="grow relative min-h-0 px-1 xl:px-2 py-1 shrink {!$propPickerConfig && !alwaysOn
+			? 'bg-surface-secondary'
+			: ''}"
+	>
 		<!-- <div
 			class="px-2 pt-2 grow relative"
 			class:bg-surface-secondary={!$propPickerConfig && !alwaysOn}

From 274eb7815203da8a34f3f0786450f4b058d14b88 Mon Sep 17 00:00:00 2001
From: HugoCasa <hugo@casademont.ch>
Date: Fri, 8 Nov 2024 20:25:03 +0100
Subject: [PATCH 60/80] http routes static assets nits (#4676)

---
 .../src/lib/components/triggers/RouteEditorInner.svelte   | 5 ++++-
 frontend/src/routes/(root)/(logged)/routes/+page.svelte   | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/frontend/src/lib/components/triggers/RouteEditorInner.svelte b/frontend/src/lib/components/triggers/RouteEditorInner.svelte
index 10eaef0725..65fc7db264 100644
--- a/frontend/src/lib/components/triggers/RouteEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/RouteEditorInner.svelte
@@ -283,7 +283,9 @@
 						<ToggleButtonGroup
 							class="w-auto"
 							bind:selected={http_method}
-							disabled={!($userStore?.is_admin || $userStore?.is_super_admin) || !can_write}
+							disabled={!($userStore?.is_admin || $userStore?.is_super_admin) ||
+								!can_write ||
+								!!static_asset_config}
 						>
 							<ToggleButton label="GET" value="get" />
 							<ToggleButton label="POST" value="post" />
@@ -328,6 +330,7 @@
 								script_path = ''
 								initialScriptPath = ''
 								is_flow = false
+								http_method = 'get'
 							} else {
 								static_asset_config = undefined
 							}
diff --git a/frontend/src/routes/(root)/(logged)/routes/+page.svelte b/frontend/src/routes/(root)/(logged)/routes/+page.svelte
index c2f12fbe8a..8906031338 100644
--- a/frontend/src/routes/(root)/(logged)/routes/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/routes/+page.svelte
@@ -200,7 +200,7 @@
 			<div class="text-center text-sm text-tertiary mt-2"> No routes </div>
 		{:else if items?.length}
 			<div class="border rounded-md divide-y">
-				{#each items.slice(0, nbDisplayed) as { path, edited_by, edited_at, script_path, route_path, is_flow, extra_perms, canWrite, marked, http_method } (path)}
+				{#each items.slice(0, nbDisplayed) as { path, edited_by, edited_at, script_path, route_path, is_flow, extra_perms, canWrite, marked, http_method, static_asset_config } (path)}
 					{@const href = `${is_flow ? '/flows/get' : '/scripts/get'}/${script_path}`}
 
 					<div
@@ -228,7 +228,11 @@
 									{path}
 								</div>
 								<div class="text-secondary text-xs truncate text-left font-light">
-									runnable: {script_path}
+									{#if static_asset_config}
+										file: {static_asset_config.s3}
+									{:else}
+										runnable: {script_path}
+									{/if}
 								</div>
 							</a>
 

From d9148eaa78680a93d81d71847a7df67e01f3c110 Mon Sep 17 00:00:00 2001
From: Alexander Petric <alpetric@users.noreply.github.com>
Date: Fri, 8 Nov 2024 18:42:10 -0500
Subject: [PATCH 61/80] feat(frontend): critical alerts UI (#4653)

---
 ...3a64b9e78c4beb423f04baef9a53fbf87e9f9.json |   14 -
 ...3e08952f029480d4a42503ecc3c5e70437995.json |   48 +
 ...8e83c9835ccd30c90cb24788cdb54d1ceb575.json |   20 +
 ...48cd9ff63e5fdfa1d93d8fbec32a257b6b05e.json |   15 +
 ...7375a9a33671be8ef406427d90f67a98c9c9f.json |   14 -
 ...fa1848ed3c1336fa4790f45b8189c4ac97d91.json |   15 +
 ...7f5033b9c9afc344d9c3e385ba20a3ad2197a.json |    2 +-
 ...46976ed7af2e90270902f001115e023cb947d.json |   12 +
 ...25f862dcf039bbb3d75ced9d54c86f53d2580.json |   14 +
 ...4ec68cec17b31dcd277b321f652917346496b.json |   47 +
 ...1105225151_alert_add_acknowledged.down.sql |    1 +
 ...241105225151_alert_add_acknowledged.up.sql |    9 +
 backend/src/main.rs                           |   10 +-
 backend/src/monitor.rs                        |   19 +-
 backend/windmill-api/openapi-deref.json       | 1015 +++++++-
 backend/windmill-api/openapi-deref.yaml       | 2031 +++++++++++------
 backend/windmill-api/openapi.yaml             |   92 +
 backend/windmill-api/src/settings.rs          |  119 +-
 .../windmill-common/src/global_settings.rs    |    1 +
 backend/windmill-common/src/lib.rs            |    2 +
 backend/windmill-common/src/utils.rs          |   17 +-
 .../lib/components/SuperadminSettings.svelte  |    4 +
 .../src/lib/components/instanceSettings.ts    |    9 +
 .../sidebar/CriticalAlertButton.svelte        |   64 +
 .../sidebar/CriticalAlertModal.svelte         |   69 +
 .../sidebar/CriticalAlertModalInner.svelte    |  213 ++
 frontend/src/lib/stores.ts                    |    2 +
 .../src/routes/(root)/(logged)/+layout.svelte |   41 +-
 28 files changed, 3213 insertions(+), 706 deletions(-)
 delete mode 100644 backend/.sqlx/query-00ce4ed3ca0eac7cb6283b047353a64b9e78c4beb423f04baef9a53fbf87e9f9.json
 create mode 100644 backend/.sqlx/query-0b955f2cff82a2d4ba3840588143e08952f029480d4a42503ecc3c5e70437995.json
 create mode 100644 backend/.sqlx/query-33cfb00f61dbae09467bd3732ce8e83c9835ccd30c90cb24788cdb54d1ceb575.json
 create mode 100644 backend/.sqlx/query-3a94ad52c6b7cde844fa868167248cd9ff63e5fdfa1d93d8fbec32a257b6b05e.json
 delete mode 100644 backend/.sqlx/query-4c0067c2135a259aea5cc2db60f7375a9a33671be8ef406427d90f67a98c9c9f.json
 create mode 100644 backend/.sqlx/query-4d22084a5d9860832f30e8f08cbfa1848ed3c1336fa4790f45b8189c4ac97d91.json
 create mode 100644 backend/.sqlx/query-a7c5008aa7ea43d0afac7d9f19846976ed7af2e90270902f001115e023cb947d.json
 create mode 100644 backend/.sqlx/query-be3ae231557e794172336bc27d725f862dcf039bbb3d75ced9d54c86f53d2580.json
 create mode 100644 backend/.sqlx/query-cc5ab80241b88c5befea279f16c4ec68cec17b31dcd277b321f652917346496b.json
 create mode 100644 backend/migrations/20241105225151_alert_add_acknowledged.down.sql
 create mode 100644 backend/migrations/20241105225151_alert_add_acknowledged.up.sql
 create mode 100644 frontend/src/lib/components/sidebar/CriticalAlertButton.svelte
 create mode 100644 frontend/src/lib/components/sidebar/CriticalAlertModal.svelte
 create mode 100644 frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte

diff --git a/backend/.sqlx/query-00ce4ed3ca0eac7cb6283b047353a64b9e78c4beb423f04baef9a53fbf87e9f9.json b/backend/.sqlx/query-00ce4ed3ca0eac7cb6283b047353a64b9e78c4beb423f04baef9a53fbf87e9f9.json
deleted file mode 100644
index e4909fc4da..0000000000
--- a/backend/.sqlx/query-00ce4ed3ca0eac7cb6283b047353a64b9e78c4beb423f04baef9a53fbf87e9f9.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO alerts (alert_type, message) VALUES ('recovered_critical_error', $1)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "00ce4ed3ca0eac7cb6283b047353a64b9e78c4beb423f04baef9a53fbf87e9f9"
-}
diff --git a/backend/.sqlx/query-0b955f2cff82a2d4ba3840588143e08952f029480d4a42503ecc3c5e70437995.json b/backend/.sqlx/query-0b955f2cff82a2d4ba3840588143e08952f029480d4a42503ecc3c5e70437995.json
new file mode 100644
index 0000000000..820e4f45ab
--- /dev/null
+++ b/backend/.sqlx/query-0b955f2cff82a2d4ba3840588143e08952f029480d4a42503ecc3c5e70437995.json
@@ -0,0 +1,48 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT id, alert_type, message, created_at, acknowledged \n             FROM alerts \n             WHERE acknowledged = $1\n             ORDER BY created_at DESC \n             LIMIT $2 OFFSET $3",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 1,
+        "name": "alert_type",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "message",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 3,
+        "name": "created_at",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 4,
+        "name": "acknowledged",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Bool",
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true
+    ]
+  },
+  "hash": "0b955f2cff82a2d4ba3840588143e08952f029480d4a42503ecc3c5e70437995"
+}
diff --git a/backend/.sqlx/query-33cfb00f61dbae09467bd3732ce8e83c9835ccd30c90cb24788cdb54d1ceb575.json b/backend/.sqlx/query-33cfb00f61dbae09467bd3732ce8e83c9835ccd30c90cb24788cdb54d1ceb575.json
new file mode 100644
index 0000000000..26e7a58854
--- /dev/null
+++ b/backend/.sqlx/query-33cfb00f61dbae09467bd3732ce8e83c9835ccd30c90cb24788cdb54d1ceb575.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT value::BOOLEAN as value FROM global_settings WHERE name = 'critical_alert_mute_ui'",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "value",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "33cfb00f61dbae09467bd3732ce8e83c9835ccd30c90cb24788cdb54d1ceb575"
+}
diff --git a/backend/.sqlx/query-3a94ad52c6b7cde844fa868167248cd9ff63e5fdfa1d93d8fbec32a257b6b05e.json b/backend/.sqlx/query-3a94ad52c6b7cde844fa868167248cd9ff63e5fdfa1d93d8fbec32a257b6b05e.json
new file mode 100644
index 0000000000..5a79a3d793
--- /dev/null
+++ b/backend/.sqlx/query-3a94ad52c6b7cde844fa868167248cd9ff63e5fdfa1d93d8fbec32a257b6b05e.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO alerts (alert_type, message, acknowledged) VALUES ('recovered_critical_error', $1, $2)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Bool"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "3a94ad52c6b7cde844fa868167248cd9ff63e5fdfa1d93d8fbec32a257b6b05e"
+}
diff --git a/backend/.sqlx/query-4c0067c2135a259aea5cc2db60f7375a9a33671be8ef406427d90f67a98c9c9f.json b/backend/.sqlx/query-4c0067c2135a259aea5cc2db60f7375a9a33671be8ef406427d90f67a98c9c9f.json
deleted file mode 100644
index 32295ea1e1..0000000000
--- a/backend/.sqlx/query-4c0067c2135a259aea5cc2db60f7375a9a33671be8ef406427d90f67a98c9c9f.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO alerts (alert_type, message) VALUES ('critical_error', $1)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "4c0067c2135a259aea5cc2db60f7375a9a33671be8ef406427d90f67a98c9c9f"
-}
diff --git a/backend/.sqlx/query-4d22084a5d9860832f30e8f08cbfa1848ed3c1336fa4790f45b8189c4ac97d91.json b/backend/.sqlx/query-4d22084a5d9860832f30e8f08cbfa1848ed3c1336fa4790f45b8189c4ac97d91.json
new file mode 100644
index 0000000000..b57d834f87
--- /dev/null
+++ b/backend/.sqlx/query-4d22084a5d9860832f30e8f08cbfa1848ed3c1336fa4790f45b8189c4ac97d91.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO alerts (alert_type, message, acknowledged) VALUES ('critical_error', $1, $2)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Bool"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "4d22084a5d9860832f30e8f08cbfa1848ed3c1336fa4790f45b8189c4ac97d91"
+}
diff --git a/backend/.sqlx/query-661f472ff3860983322162420457f5033b9c9afc344d9c3e385ba20a3ad2197a.json b/backend/.sqlx/query-661f472ff3860983322162420457f5033b9c9afc344d9c3e385ba20a3ad2197a.json
index 1fa370e682..75b8108281 100644
--- a/backend/.sqlx/query-661f472ff3860983322162420457f5033b9c9afc344d9c3e385ba20a3ad2197a.json
+++ b/backend/.sqlx/query-661f472ff3860983322162420457f5033b9c9afc344d9c3e385ba20a3ad2197a.json
@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],
diff --git a/backend/.sqlx/query-a7c5008aa7ea43d0afac7d9f19846976ed7af2e90270902f001115e023cb947d.json b/backend/.sqlx/query-a7c5008aa7ea43d0afac7d9f19846976ed7af2e90270902f001115e023cb947d.json
new file mode 100644
index 0000000000..53ef15ffa5
--- /dev/null
+++ b/backend/.sqlx/query-a7c5008aa7ea43d0afac7d9f19846976ed7af2e90270902f001115e023cb947d.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE alerts SET acknowledged = true WHERE acknowledged = false",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "a7c5008aa7ea43d0afac7d9f19846976ed7af2e90270902f001115e023cb947d"
+}
diff --git a/backend/.sqlx/query-be3ae231557e794172336bc27d725f862dcf039bbb3d75ced9d54c86f53d2580.json b/backend/.sqlx/query-be3ae231557e794172336bc27d725f862dcf039bbb3d75ced9d54c86f53d2580.json
new file mode 100644
index 0000000000..e726f11fe2
--- /dev/null
+++ b/backend/.sqlx/query-be3ae231557e794172336bc27d725f862dcf039bbb3d75ced9d54c86f53d2580.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE alerts SET acknowledged = true WHERE id = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "be3ae231557e794172336bc27d725f862dcf039bbb3d75ced9d54c86f53d2580"
+}
diff --git a/backend/.sqlx/query-cc5ab80241b88c5befea279f16c4ec68cec17b31dcd277b321f652917346496b.json b/backend/.sqlx/query-cc5ab80241b88c5befea279f16c4ec68cec17b31dcd277b321f652917346496b.json
new file mode 100644
index 0000000000..18bc159e6c
--- /dev/null
+++ b/backend/.sqlx/query-cc5ab80241b88c5befea279f16c4ec68cec17b31dcd277b321f652917346496b.json
@@ -0,0 +1,47 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT id, alert_type, message, created_at, acknowledged \n             FROM alerts \n             ORDER BY created_at DESC \n             LIMIT $1 OFFSET $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 1,
+        "name": "alert_type",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "message",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 3,
+        "name": "created_at",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 4,
+        "name": "acknowledged",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true
+    ]
+  },
+  "hash": "cc5ab80241b88c5befea279f16c4ec68cec17b31dcd277b321f652917346496b"
+}
diff --git a/backend/migrations/20241105225151_alert_add_acknowledged.down.sql b/backend/migrations/20241105225151_alert_add_acknowledged.down.sql
new file mode 100644
index 0000000000..ed9a1323d6
--- /dev/null
+++ b/backend/migrations/20241105225151_alert_add_acknowledged.down.sql
@@ -0,0 +1 @@
+ALTER TABLE alerts DROP COLUMN acknowledged;
\ No newline at end of file
diff --git a/backend/migrations/20241105225151_alert_add_acknowledged.up.sql b/backend/migrations/20241105225151_alert_add_acknowledged.up.sql
new file mode 100644
index 0000000000..5174aec6e0
--- /dev/null
+++ b/backend/migrations/20241105225151_alert_add_acknowledged.up.sql
@@ -0,0 +1,9 @@
+-- Step 1: Add the new column 'acknowledged' to the 'alerts' table
+ALTER TABLE alerts
+ADD COLUMN acknowledged BOOLEAN DEFAULT NULL;
+
+-- Step 2: Update all existing rows to set 'acknowledged' to true
+-- we don't want to pop up notifications to all users after migrations
+-- but only show new alerts from the point of the upgrade
+UPDATE alerts
+SET acknowledged = TRUE;
\ No newline at end of file
diff --git a/backend/src/main.rs b/backend/src/main.rs
index 61ee657d2c..6869a24647 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -36,7 +36,7 @@ use windmill_common::{
         ENV_SETTINGS, EXPOSE_DEBUG_METRICS_SETTING, EXPOSE_METRICS_SETTING,
         EXTRA_PIP_INDEX_URL_SETTING, HUB_BASE_URL_SETTING, JOB_DEFAULT_TIMEOUT_SECS_SETTING,
         JWT_SECRET_SETTING, KEEP_JOB_DIR_SETTING, LICENSE_KEY_SETTING, NPM_CONFIG_REGISTRY_SETTING,
-        OAUTH_SETTING, PIP_INDEX_URL_SETTING, REQUEST_SIZE_LIMIT_SETTING,
+        OAUTH_SETTING, PIP_INDEX_URL_SETTING, REQUEST_SIZE_LIMIT_SETTING, CRITICAL_ALERT_MUTE_UI_SETTING,
         REQUIRE_PREEXISTING_USER_FOR_OAUTH_SETTING, RETENTION_PERIOD_SECS_SETTING,
         SAML_METADATA_SETTING, SCIM_TOKEN_SETTING, SMTP_SETTING, TIMEOUT_WAIT_RESULT_SETTING,
     },
@@ -78,7 +78,7 @@ use crate::monitor::{
     reload_hub_base_url_setting, reload_job_default_timeout_setting, reload_jwt_secret_setting,
     reload_license_key, reload_npm_config_registry_setting, reload_pip_index_url_setting,
     reload_retention_period_setting, reload_scim_token_setting, reload_smtp_config,
-    reload_worker_config,
+    reload_worker_config, reload_critical_alert_mute_ui_setting,
 };
 
 #[cfg(feature = "parquet")]
@@ -817,6 +817,12 @@ Windmill Community Edition {GIT_VERSION}
                                                         tracing::error!(error = %e, "Could not reload jwt secret setting");
                                                     }
                                                 },
+                                                CRITICAL_ALERT_MUTE_UI_SETTING => {
+                                                    tracing::info!("Critical alert UI setting changed");
+                                                    if let Err(e) = reload_critical_alert_mute_ui_setting(&db).await {
+                                                        tracing::error!(error = %e, "Could not reload critical alert UI setting");
+                                                    }
+                                                },
                                                 a @_ => {
                                                     tracing::info!("Unrecognized Global Setting Change Payload: {:?}", a);
                                                 }
diff --git a/backend/src/monitor.rs b/backend/src/monitor.rs
index b6cbd55330..da811bb6ff 100644
--- a/backend/src/monitor.rs
+++ b/backend/src/monitor.rs
@@ -39,7 +39,7 @@ use windmill_common::{
         EXPOSE_DEBUG_METRICS_SETTING, EXPOSE_METRICS_SETTING, EXTRA_PIP_INDEX_URL_SETTING,
         HUB_BASE_URL_SETTING, JOB_DEFAULT_TIMEOUT_SECS_SETTING, JWT_SECRET_SETTING,
         KEEP_JOB_DIR_SETTING, LICENSE_KEY_SETTING, NPM_CONFIG_REGISTRY_SETTING, OAUTH_SETTING,
-        PIP_INDEX_URL_SETTING, REQUEST_SIZE_LIMIT_SETTING,
+        PIP_INDEX_URL_SETTING, REQUEST_SIZE_LIMIT_SETTING, CRITICAL_ALERT_MUTE_UI_SETTING,
         REQUIRE_PREEXISTING_USER_FOR_OAUTH_SETTING, RETENTION_PERIOD_SECS_SETTING,
         SAML_METADATA_SETTING, SCIM_TOKEN_SETTING, TIMEOUT_WAIT_RESULT_SETTING,
     },
@@ -55,7 +55,7 @@ use windmill_common::{
         WORKER_GROUP,
     },
     BASE_URL, CRITICAL_ERROR_CHANNELS, DB, DEFAULT_HUB_BASE_URL, HUB_BASE_URL, JOB_RETENTION_SECS,
-    METRICS_DEBUG_ENABLED, METRICS_ENABLED,
+    METRICS_DEBUG_ENABLED, METRICS_ENABLED, CRITICAL_ALERT_MUTE_UI_ENABLED
 };
 use windmill_queue::cancel_job;
 use windmill_worker::{
@@ -131,6 +131,10 @@ pub async fn initial_load(
         tracing::error!("Error loading expose debug metrics: {e:#}");
     }
 
+    if let Err(e) = reload_critical_alert_mute_ui_setting(db).await {
+        tracing::error!("Error loading critical alert mute ui setting: {e:#}");
+    }
+
     if let Err(e) = load_tag_per_workspace_enabled(db).await {
         tracing::error!("Error loading default tag per workpsace: {e:#}");
     }
@@ -226,6 +230,17 @@ pub async fn load_tag_per_workspace_workspaces(db: &DB) -> error::Result<()> {
     Ok(())
 }
 
+pub async fn reload_critical_alert_mute_ui_setting(db: &DB) -> error::Result<()> {
+    let mute = load_value_from_global_settings(db, CRITICAL_ALERT_MUTE_UI_SETTING).await;
+    match mute {
+        Ok(Some(serde_json::Value::Bool(t))) => {
+            CRITICAL_ALERT_MUTE_UI_ENABLED.store(t, Ordering::Relaxed);
+        }
+        _ => (),
+    };
+    Ok(())
+}
+
 pub async fn load_metrics_debug_enabled(db: &DB) -> error::Result<()> {
     let metrics_enabled = load_value_from_global_settings(db, EXPOSE_DEBUG_METRICS_SETTING).await;
     match metrics_enabled {
diff --git a/backend/windmill-api/openapi-deref.json b/backend/windmill-api/openapi-deref.json
index db789c2163..a6e225259a 100644
--- a/backend/windmill-api/openapi-deref.json
+++ b/backend/windmill-api/openapi-deref.json
@@ -1,7 +1,7 @@
 {
   "openapi": "3.0.3",
   "info": {
-    "version": "1.409.0",
+    "version": "1.418.0",
     "title": "Windmill API",
     "contact": {
       "name": "Windmill Team",
@@ -1182,6 +1182,115 @@
         }
       }
     },
+    "/settings/critical_alerts": {
+      "get": {
+        "summary": "Get all critical alerts",
+        "operationId": "getCriticalAlerts",
+        "tags": [
+          "setting"
+        ],
+        "parameters": [
+          {
+            "in": "query",
+            "name": "page",
+            "schema": {
+              "type": "integer",
+              "default": 1,
+              "description": "The page number to retrieve (minimum value is 1)"
+            }
+          },
+          {
+            "in": "query",
+            "name": "page_size",
+            "schema": {
+              "type": "integer",
+              "default": 10,
+              "maximum": 100,
+              "description": "Number of alerts per page (maximum is 100)"
+            }
+          },
+          {
+            "in": "query",
+            "name": "acknowledged",
+            "schema": {
+              "type": "boolean",
+              "nullable": true,
+              "description": "Filter by acknowledgment status; true for acknowledged, false for unacknowledged, and omit for all alerts"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully retrieved all critical alerts",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/CriticalAlert"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/settings/critical_alerts/{id}/acknowledge": {
+      "post": {
+        "summary": "Acknowledge a critical alert",
+        "operationId": "acknowledgeCriticalAlert",
+        "tags": [
+          "setting"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "id",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            },
+            "description": "The ID of the critical alert to acknowledge"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully acknowledged the critical alert",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "example": "Critical alert acknowledged"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/settings/critical_alerts/acknowledge_all": {
+      "post": {
+        "summary": "Acknowledge all unacknowledged critical alerts",
+        "operationId": "acknowledgeAllCriticalAlerts",
+        "tags": [
+          "setting"
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully acknowledged all unacknowledged critical alerts.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "example": "All unacknowledged critical alerts acknowledged"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/settings/test_license_key": {
       "post": {
         "summary": "test license key",
@@ -2239,6 +2348,14 @@
           },
           {
             "$ref": "#/components/parameters/PerPage"
+          },
+          {
+            "name": "active_only",
+            "in": "query",
+            "description": "filter only active users",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
@@ -3328,6 +3445,44 @@
         }
       }
     },
+    "/w/{workspace}/workspaces/used_triggers": {
+      "get": {
+        "summary": "get used triggers",
+        "operationId": "getUsedTriggers",
+        "tags": [
+          "workspace"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "status",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "http_routes_used": {
+                      "type": "boolean"
+                    },
+                    "websocket_used": {
+                      "type": "boolean"
+                    }
+                  },
+                  "required": [
+                    "http_routes_used",
+                    "websocket_used"
+                  ]
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/users/list": {
       "get": {
         "summary": "list users",
@@ -6362,6 +6517,36 @@
         }
       }
     },
+    "/w/{workspace}/scripts/get_latest_version/{path}": {
+      "get": {
+        "summary": "get scripts's latest version (hash)",
+        "operationId": "getScriptLatestVersion",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "tags": [
+          "script"
+        ],
+        "responses": {
+          "200": {
+            "description": "Script version/hash",
+            "content": {
+              "application/json": {
+                "required": false,
+                "schema": {
+                  "$ref": "#/components/schemas/ScriptHistory"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/scripts/history_update/h/{hash}/p/{path}": {
       "post": {
         "summary": "update history of a script",
@@ -7178,6 +7363,36 @@
         }
       }
     },
+    "/w/{workspace}/flows/get_latest_version/{path}": {
+      "get": {
+        "summary": "get flow's latest version",
+        "operationId": "getFlowLatestVersion",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "tags": [
+          "flow"
+        ],
+        "responses": {
+          "200": {
+            "description": "Flow version",
+            "content": {
+              "application/json": {
+                "required": false,
+                "schema": {
+                  "$ref": "#/components/schemas/FlowVersion"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/flows/get/v/{version}/p/{path}": {
       "get": {
         "summary": "get flow version",
@@ -8096,6 +8311,36 @@
         }
       }
     },
+    "/w/{workspace}/apps/get_latest_version/{path}": {
+      "get": {
+        "summary": "get apps's latest version",
+        "operationId": "getAppLatestVersion",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "tags": [
+          "app"
+        ],
+        "responses": {
+          "200": {
+            "description": "App version",
+            "content": {
+              "application/json": {
+                "required": false,
+                "schema": {
+                  "$ref": "#/components/schemas/AppHistory"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/apps/history_update/a/{id}/v/{version}": {
       "post": {
         "summary": "update app history",
@@ -11495,21 +11740,217 @@
         }
       }
     },
-    "/w/{workspace}/http_triggers/used": {
-      "get": {
-        "summary": "whether http triggers are used",
-        "operationId": "used",
+    "/w/{workspace}/websocket_triggers/create": {
+      "post": {
+        "summary": "create websocket trigger",
+        "operationId": "createWebsocketTrigger",
         "tags": [
-          "http_trigger"
+          "websocket_trigger"
         ],
         "parameters": [
           {
             "$ref": "#/components/parameters/WorkspaceId"
           }
         ],
+        "requestBody": {
+          "description": "new websocket trigger",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/NewWebsocketTrigger"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "websocket trigger created",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/websocket_triggers/update/{path}": {
+      "post": {
+        "summary": "update websocket trigger",
+        "operationId": "updateWebsocketTrigger",
+        "tags": [
+          "websocket_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "updated trigger",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EditWebsocketTrigger"
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
-            "description": "whether http triggers are used",
+            "description": "websocket trigger updated",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/websocket_triggers/delete/{path}": {
+      "delete": {
+        "summary": "delete websocket trigger",
+        "operationId": "deleteWebsocketTrigger",
+        "tags": [
+          "websocket_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "websocket trigger deleted",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/websocket_triggers/get/{path}": {
+      "get": {
+        "summary": "get websocket trigger",
+        "operationId": "getWebsocketTrigger",
+        "tags": [
+          "websocket_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "websocket trigger deleted",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/WebsocketTrigger"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/websocket_triggers/list": {
+      "get": {
+        "summary": "list websocket triggers",
+        "operationId": "listWebsocketTriggers",
+        "tags": [
+          "websocket_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId",
+            "required": true
+          },
+          {
+            "$ref": "#/components/parameters/Page"
+          },
+          {
+            "$ref": "#/components/parameters/PerPage"
+          },
+          {
+            "name": "path",
+            "description": "filter by path",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "is_flow",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "path_start",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "websocket trigger list",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/WebsocketTrigger"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/websocket_triggers/exists/{path}": {
+      "get": {
+        "summary": "does websocket trigger exists",
+        "operationId": "existsWebsocketTrigger",
+        "tags": [
+          "websocket_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "websocket trigger exists",
             "content": {
               "application/json": {
                 "schema": {
@@ -11521,6 +11962,54 @@
         }
       }
     },
+    "/w/{workspace}/websocket_triggers/setenabled/{path}": {
+      "post": {
+        "summary": "set enabled websocket trigger",
+        "operationId": "setWebsocketTriggerEnabled",
+        "tags": [
+          "websocket_trigger"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/Path"
+          }
+        ],
+        "requestBody": {
+          "description": "updated websocket trigger enable",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "enabled": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "enabled"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "websocket trigger enabled set",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/groups/list": {
       "get": {
         "summary": "list instance groups",
@@ -12812,6 +13301,40 @@
         }
       }
     },
+    "/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",
@@ -12842,7 +13365,8 @@
                 "folder",
                 "app",
                 "raw_app",
-                "http_trigger"
+                "http_trigger",
+                "websocket_trigger"
               ]
             }
           }
@@ -12894,7 +13418,8 @@
                 "folder",
                 "app",
                 "raw_app",
-                "http_trigger"
+                "http_trigger",
+                "websocket_trigger"
               ]
             }
           }
@@ -12965,7 +13490,8 @@
                 "folder",
                 "app",
                 "raw_app",
-                "http_trigger"
+                "http_trigger",
+                "websocket_trigger"
               ]
             }
           }
@@ -14959,6 +15485,165 @@
           }
         }
       }
+    },
+    "/srch/index/search/service_logs": {
+      "get": {
+        "summary": "Search through service logs with a string query",
+        "operationId": "searchLogsIndex",
+        "tags": [
+          "indexSearch"
+        ],
+        "parameters": [
+          {
+            "name": "search_query",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "mode",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "worker_group",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "hostname",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "min_ts",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "format": "date-time"
+            }
+          },
+          {
+            "name": "max_ts",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "format": "date-time"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "search results",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "query_parse_errors": {
+                      "description": "a list of the terms that couldn't be parsed (and thus ignored)",
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      }
+                    },
+                    "hits": {
+                      "description": "log files that matched the query",
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/LogSearchHit"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/srch/index/search/count_service_logs": {
+      "get": {
+        "summary": "Search and count the log line hits on every provided host",
+        "operationId": "countSearchLogsIndex",
+        "tags": [
+          "indexSearch"
+        ],
+        "parameters": [
+          {
+            "name": "search_query",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "hosts",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "min_ts",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "format": "date-time"
+            }
+          },
+          {
+            "name": "max_ts",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "format": "date-time"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "search results",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "query_parse_errors": {
+                      "description": "a list of the terms that couldn't be parsed (and thus ignored)",
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      }
+                    },
+                    "count_per_host": {
+                      "description": "count of log lines that matched the query per hostname",
+                      "type": "object"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
     }
   },
   "components": {
@@ -16560,6 +17245,7 @@
               "users.delete",
               "users.update",
               "users.login",
+              "users.login_failure",
               "users.logout",
               "users.accept_invite",
               "users.decline_invite",
@@ -16571,6 +17257,7 @@
               "users.impersonate",
               "users.leave_workspace",
               "oauth.login",
+              "oauth.login_failure",
               "oauth.signup",
               "variables.create",
               "variables.delete",
@@ -17533,9 +18220,248 @@
           },
           "email_count": {
             "type": "number"
+          },
+          "websocket_count": {
+            "type": "number"
           }
         }
       },
+      "WebsocketTrigger": {
+        "type": "object",
+        "properties": {
+          "path": {
+            "type": "string"
+          },
+          "edited_by": {
+            "type": "string"
+          },
+          "edited_at": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "script_path": {
+            "type": "string"
+          },
+          "url": {
+            "type": "string"
+          },
+          "is_flow": {
+            "type": "boolean"
+          },
+          "extra_perms": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "boolean"
+            }
+          },
+          "email": {
+            "type": "string"
+          },
+          "workspace_id": {
+            "type": "string"
+          },
+          "server_id": {
+            "type": "string"
+          },
+          "last_server_ping": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "error": {
+            "type": "string"
+          },
+          "enabled": {
+            "type": "boolean"
+          },
+          "filters": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "key": {
+                  "type": "string"
+                },
+                "value": {}
+              },
+              "required": [
+                "key",
+                "value"
+              ]
+            }
+          },
+          "initial_messages": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/WebsocketTriggerInitialMessage"
+            }
+          },
+          "url_runnable_args": {
+            "$ref": "#/components/schemas/ScriptArgs"
+          }
+        },
+        "required": [
+          "path",
+          "edited_by",
+          "edited_at",
+          "script_path",
+          "url",
+          "extra_perms",
+          "is_flow",
+          "email",
+          "workspace_id",
+          "enabled",
+          "filters",
+          "initial_messages",
+          "url_runnable_args"
+        ]
+      },
+      "NewWebsocketTrigger": {
+        "type": "object",
+        "properties": {
+          "path": {
+            "type": "string"
+          },
+          "script_path": {
+            "type": "string"
+          },
+          "is_flow": {
+            "type": "boolean"
+          },
+          "url": {
+            "type": "string"
+          },
+          "enabled": {
+            "type": "boolean"
+          },
+          "filters": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "key": {
+                  "type": "string"
+                },
+                "value": {}
+              },
+              "required": [
+                "key",
+                "value"
+              ]
+            }
+          },
+          "initial_messages": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/WebsocketTriggerInitialMessage"
+            }
+          },
+          "url_runnable_args": {
+            "$ref": "#/components/schemas/ScriptArgs"
+          }
+        },
+        "required": [
+          "path",
+          "script_path",
+          "url",
+          "is_flow",
+          "filters",
+          "initial_messages",
+          "url_runnable_args"
+        ]
+      },
+      "EditWebsocketTrigger": {
+        "type": "object",
+        "properties": {
+          "url": {
+            "type": "string"
+          },
+          "path": {
+            "type": "string"
+          },
+          "script_path": {
+            "type": "string"
+          },
+          "is_flow": {
+            "type": "boolean"
+          },
+          "filters": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "key": {
+                  "type": "string"
+                },
+                "value": {}
+              },
+              "required": [
+                "key",
+                "value"
+              ]
+            }
+          },
+          "initial_messages": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/WebsocketTriggerInitialMessage"
+            }
+          },
+          "url_runnable_args": {
+            "$ref": "#/components/schemas/ScriptArgs"
+          }
+        },
+        "required": [
+          "path",
+          "script_path",
+          "url",
+          "is_flow",
+          "filters",
+          "initial_messages",
+          "url_runnable_args"
+        ]
+      },
+      "WebsocketTriggerInitialMessage": {
+        "anyOf": [
+          {
+            "type": "object",
+            "properties": {
+              "raw_message": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "raw_message"
+            ]
+          },
+          {
+            "type": "object",
+            "properties": {
+              "runnable_result": {
+                "type": "object",
+                "properties": {
+                  "path": {
+                    "type": "string"
+                  },
+                  "args": {
+                    "$ref": "#/components/schemas/ScriptArgs"
+                  },
+                  "is_flow": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "path",
+                  "args",
+                  "is_flow"
+                ]
+              }
+            },
+            "required": [
+              "runnable_result"
+            ]
+          }
+        ]
+      },
       "Group": {
         "type": "object",
         "properties": {
@@ -17817,6 +18743,9 @@
           },
           "username": {
             "type": "string"
+          },
+          "operator_only": {
+            "type": "boolean"
           }
         },
         "required": [
@@ -18796,6 +19725,66 @@
           }
         }
       },
+      "LogSearchHit": {
+        "type": "object",
+        "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"
+          }
+        }
+      },
+      "CriticalAlert": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "description": "Unique identifier for the alert"
+          },
+          "alert_type": {
+            "type": "string",
+            "description": "Type of alert (e.g., critical_error)"
+          },
+          "message": {
+            "type": "string",
+            "description": "The message content of the alert"
+          },
+          "created_at": {
+            "type": "string",
+            "format": "date-time",
+            "description": "Time when the alert was created"
+          },
+          "acknowledged": {
+            "type": "boolean",
+            "nullable": true,
+            "description": "Acknowledgment status of the alert, can be true, false, or null if not set"
+          }
+        }
+      },
       "StaticTransform": {
         "type": "object",
         "properties": {
@@ -18901,6 +19890,9 @@
           },
           "custom_concurrency_key": {
             "type": "string"
+          },
+          "is_trigger": {
+            "type": "boolean"
           }
         },
         "required": [
@@ -18933,6 +19925,9 @@
           },
           "tag_override": {
             "type": "string"
+          },
+          "is_trigger": {
+            "type": "boolean"
           }
         },
         "required": [
diff --git a/backend/windmill-api/openapi-deref.yaml b/backend/windmill-api/openapi-deref.yaml
index e2a0b00a85..94206795c2 100644
--- a/backend/windmill-api/openapi-deref.yaml
+++ b/backend/windmill-api/openapi-deref.yaml
@@ -1,6 +1,6 @@
 openapi: 3.0.3
 info:
-  version: 1.409.0
+  version: 1.418.0
   title: Windmill API
   contact:
     name: Windmill Team
@@ -142,6 +142,7 @@ paths:
                       - users.delete
                       - users.update
                       - users.login
+                      - users.login_failure
                       - users.logout
                       - users.accept_invite
                       - users.decline_invite
@@ -153,6 +154,7 @@ paths:
                       - users.impersonate
                       - users.leave_workspace
                       - oauth.login
+                      - oauth.login_failure
                       - oauth.signup
                       - variables.create
                       - variables.delete
@@ -231,24 +233,24 @@ paths:
         - name: before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: &ref_109
+          schema: &ref_118
             type: string
             format: date-time
         - name: after
           description: filter on created after (exclusive) timestamp
           in: query
-          schema: &ref_110
+          schema: &ref_119
             type: string
             format: date-time
         - name: username
           description: filter on exact username of user
           in: query
-          schema: &ref_119
+          schema: &ref_128
             type: string
         - name: operation
           description: filter on exact or prefix name of operation
           in: query
-          schema: &ref_120
+          schema: &ref_129
             type: string
         - name: operations
           in: query
@@ -263,12 +265,12 @@ paths:
         - name: resource
           description: filter on exact or prefix name of resource
           in: query
-          schema: &ref_121
+          schema: &ref_130
             type: string
         - name: action_kind
           description: filter on type of operation
           in: query
-          schema: &ref_122
+          schema: &ref_131
             type: string
             enum:
               - Create
@@ -300,12 +302,12 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_136
+              properties: &ref_143
                 email:
                   type: string
                 password:
                   type: string
-              required: &ref_137
+              required: &ref_144
                 - email
                 - password
       responses:
@@ -428,7 +430,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_138
+              properties: &ref_145
                 is_admin:
                   type: boolean
                 operator:
@@ -782,7 +784,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_172
+                properties: &ref_183
                   email:
                     type: string
                   workspaces:
@@ -800,7 +802,7 @@ paths:
                         - id
                         - name
                         - username
-                required: &ref_173
+                required: &ref_184
                   - email
                   - workspaces
   /workspaces/list_as_superadmin:
@@ -842,14 +844,14 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_174
+              properties: &ref_185
                 id:
                   type: string
                 name:
                   type: string
                 username:
                   type: string
-              required: &ref_175
+              required: &ref_186
                 - id
                 - name
       responses:
@@ -1042,6 +1044,98 @@ paths:
             text/plain:
               schema:
                 type: string
+  /settings/critical_alerts:
+    get:
+      summary: Get all critical alerts
+      operationId: getCriticalAlerts
+      tags:
+        - setting
+      parameters:
+        - in: query
+          name: page
+          schema:
+            type: integer
+            default: 1
+            description: The page number to retrieve (minimum value is 1)
+        - in: query
+          name: page_size
+          schema:
+            type: integer
+            default: 10
+            maximum: 100
+            description: Number of alerts per page (maximum is 100)
+        - in: query
+          name: acknowledged
+          schema:
+            type: boolean
+            nullable: true
+            description: >-
+              Filter by acknowledgment status; true for acknowledged, false for
+              unacknowledged, and omit for all alerts
+      responses:
+        '200':
+          description: Successfully retrieved all critical alerts
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties: &ref_228
+                    id:
+                      type: integer
+                      description: Unique identifier for the alert
+                    alert_type:
+                      type: string
+                      description: Type of alert (e.g., critical_error)
+                    message:
+                      type: string
+                      description: The message content of the alert
+                    created_at:
+                      type: string
+                      format: date-time
+                      description: Time when the alert was created
+                    acknowledged:
+                      type: boolean
+                      nullable: true
+                      description: >-
+                        Acknowledgment status of the alert, can be true, false,
+                        or null if not set
+  /settings/critical_alerts/{id}/acknowledge:
+    post:
+      summary: Acknowledge a critical alert
+      operationId: acknowledgeCriticalAlert
+      tags:
+        - setting
+      parameters:
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: integer
+          description: The ID of the critical alert to acknowledge
+      responses:
+        '200':
+          description: Successfully acknowledged the critical alert
+          content:
+            application/json:
+              schema:
+                type: string
+                example: Critical alert acknowledged
+  /settings/critical_alerts/acknowledge_all:
+    post:
+      summary: Acknowledge all unacknowledged critical alerts
+      operationId: acknowledgeAllCriticalAlerts
+      tags:
+        - setting
+      responses:
+        '200':
+          description: Successfully acknowledged all unacknowledged critical alerts.
+          content:
+            application/json:
+              schema:
+                type: string
+                example: All unacknowledged critical alerts acknowledged
   /settings/test_license_key:
     post:
       summary: test license key
@@ -1197,12 +1291,12 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_214
+                  properties: &ref_221
                     name:
                       type: string
                     value:
                       type: object
-                  required: &ref_215
+                  required: &ref_222
                     - name
                     - value
   /users/email:
@@ -1361,6 +1455,8 @@ paths:
                     type: string
                   username:
                     type: string
+                  operator_only:
+                    type: boolean
                 required: &ref_13
                   - email
                   - login_type
@@ -1784,6 +1880,11 @@ paths:
           description: number of items to return for a given page (default 30, max 100)
           in: query
           schema: *ref_6
+        - name: active_only
+          in: query
+          description: filter only active users
+          schema:
+            type: boolean
       responses:
         '200':
           description: user
@@ -1932,7 +2033,7 @@ paths:
                         type: array
                         items:
                           type: object
-                          properties: &ref_198
+                          properties: &ref_205
                             script_path:
                               type: string
                             git_repo_resource_path:
@@ -1957,7 +2058,7 @@ paths:
                                   - schedule
                                   - user
                                   - group
-                          required: &ref_199
+                          required: &ref_206
                             - script_path
                             - git_repo_resource_path
                   deploy_ui:
@@ -2639,6 +2740,32 @@ paths:
             text/plain:
               schema:
                 type: number
+  /w/{workspace}/workspaces/used_triggers:
+    get:
+      summary: get used triggers
+      operationId: getUsedTriggers
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+      responses:
+        '200':
+          description: status
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  http_routes_used:
+                    type: boolean
+                  websocket_used:
+                    type: boolean
+                required:
+                  - http_routes_used
+                  - websocket_used
   /w/{workspace}/users/list:
     get:
       summary: list users
@@ -2681,7 +2808,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_135
+                  properties: &ref_142
                     email:
                       type: string
                     executions:
@@ -2742,7 +2869,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_139
+              properties: &ref_146
                 label:
                   type: string
                 expiration:
@@ -2774,7 +2901,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_140
+              properties: &ref_147
                 label:
                   type: string
                 expiration:
@@ -2784,7 +2911,7 @@ paths:
                   type: string
                 workspace_id:
                   type: string
-              required: &ref_141
+              required: &ref_148
                 - impersonate_email
       responses:
         '201':
@@ -2909,7 +3036,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_144
+              properties: &ref_151
                 path:
                   type: string
                 value:
@@ -2925,7 +3052,7 @@ paths:
                 expires_at:
                   type: string
                   format: date-time
-              required: &ref_145
+              required: &ref_152
                 - path
                 - value
                 - is_secret
@@ -3010,7 +3137,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_146
+              properties: &ref_153
                 path:
                   type: string
                 value:
@@ -3195,7 +3322,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_142
+                  properties: &ref_149
                     name:
                       type: string
                     value:
@@ -3204,7 +3331,7 @@ paths:
                       type: string
                     is_custom:
                       type: boolean
-                  required: &ref_143
+                  required: &ref_150
                     - name
                     - value
                     - description
@@ -3344,7 +3471,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_191
+                properties: &ref_198
                   access_token:
                     type: string
                   expires_in:
@@ -3355,7 +3482,7 @@ paths:
                     type: array
                     items:
                       type: string
-                required: &ref_192
+                required: &ref_199
                   - access_token
   /w/{workspace}/oauth/create_account:
     post:
@@ -3560,7 +3687,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_153
+              properties: &ref_160
                 path:
                   type: string
                 value: {}
@@ -3568,7 +3695,7 @@ paths:
                   type: string
                 resource_type:
                   type: string
-              required: &ref_154
+              required: &ref_161
                 - path
                 - value
                 - resource_type
@@ -3623,7 +3750,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_155
+              properties: &ref_162
                 path:
                   type: string
                 description:
@@ -3689,7 +3816,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_156
+                properties: &ref_163
                   workspace_id:
                     type: string
                   path:
@@ -3710,7 +3837,7 @@ paths:
                   edited_at:
                     type: string
                     format: date-time
-                required: &ref_157
+                required: &ref_164
                   - path
                   - resource_type
                   - is_oauth
@@ -3826,7 +3953,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_158
+                  properties: &ref_165
                     workspace_id:
                       type: string
                     path:
@@ -3857,7 +3984,7 @@ paths:
                     edited_at:
                       type: string
                       format: date-time
-                  required: &ref_159
+                  required: &ref_166
                     - path
                     - resource_type
                     - is_oauth
@@ -3904,7 +4031,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: &ref_92
+          schema: &ref_101
             type: string
       responses:
         '200':
@@ -4026,7 +4153,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_160
+              properties: &ref_167
                 schema: {}
                 description:
                   type: string
@@ -4254,14 +4381,14 @@ paths:
                 properties:
                   flow:
                     type: object
-                    properties: &ref_50
+                    properties: &ref_52
                       summary:
                         type: string
                       description:
                         type: string
                       value:
                         type: object
-                        properties: &ref_58
+                        properties: &ref_64
                           modules:
                             type: array
                             items:
@@ -4270,32 +4397,32 @@ paths:
                                 id:
                                   type: string
                                 value:
-                                  oneOf: &ref_239
+                                  oneOf: &ref_249
                                     - type: object
-                                      properties: &ref_223
+                                      properties: &ref_233
                                         input_transforms:
                                           type: object
                                           additionalProperties:
                                             oneOf: &ref_29
                                               - type: object
-                                                properties: &ref_219
+                                                properties: &ref_229
                                                   value: {}
                                                   type:
                                                     type: string
                                                     enum:
                                                       - javascript
-                                                required: &ref_220
+                                                required: &ref_230
                                                   - expr
                                                   - type
                                               - type: object
-                                                properties: &ref_221
+                                                properties: &ref_231
                                                   expr:
                                                     type: string
                                                   type:
                                                     type: string
                                                     enum:
                                                       - javascript
-                                                required: &ref_222
+                                                required: &ref_232
                                                   - expr
                                                   - type
                                             discriminator: &ref_30
@@ -4338,13 +4465,15 @@ paths:
                                           type: number
                                         custom_concurrency_key:
                                           type: string
-                                      required: &ref_224
+                                        is_trigger:
+                                          type: boolean
+                                      required: &ref_234
                                         - type
                                         - content
                                         - language
                                         - input_transforms
                                     - type: object
-                                      properties: &ref_225
+                                      properties: &ref_235
                                         input_transforms:
                                           type: object
                                           additionalProperties:
@@ -4360,12 +4489,14 @@ paths:
                                             - script
                                         tag_override:
                                           type: string
-                                      required: &ref_226
+                                        is_trigger:
+                                          type: boolean
+                                      required: &ref_236
                                         - type
                                         - path
                                         - input_transforms
                                     - type: object
-                                      properties: &ref_227
+                                      properties: &ref_237
                                         input_transforms:
                                           type: object
                                           additionalProperties:
@@ -4377,12 +4508,12 @@ paths:
                                           type: string
                                           enum:
                                             - flow
-                                      required: &ref_228
+                                      required: &ref_238
                                         - type
                                         - path
                                         - input_transforms
                                     - type: object
-                                      properties: &ref_229
+                                      properties: &ref_239
                                         modules:
                                           type: array
                                           items:
@@ -4404,13 +4535,13 @@ paths:
                                           type: boolean
                                         parallelism:
                                           type: integer
-                                      required: &ref_230
+                                      required: &ref_240
                                         - modules
                                         - iterator
                                         - skip_failures
                                         - type
                                     - type: object
-                                      properties: &ref_231
+                                      properties: &ref_241
                                         modules:
                                           type: array
                                           items:
@@ -4427,12 +4558,12 @@ paths:
                                           type: boolean
                                         parallelism:
                                           type: integer
-                                      required: &ref_232
+                                      required: &ref_242
                                         - modules
                                         - skip_failures
                                         - type
                                     - type: object
-                                      properties: &ref_233
+                                      properties: &ref_243
                                         branches:
                                           type: array
                                           items:
@@ -4463,12 +4594,12 @@ paths:
                                           type: string
                                           enum:
                                             - branchone
-                                      required: &ref_234
+                                      required: &ref_244
                                         - branches
                                         - default
                                         - type
                                     - type: object
-                                      properties: &ref_235
+                                      properties: &ref_245
                                         branches:
                                           type: array
                                           items:
@@ -4493,20 +4624,20 @@ paths:
                                             - branchall
                                         parallel:
                                           type: boolean
-                                      required: &ref_236
+                                      required: &ref_246
                                         - branches
                                         - type
                                     - type: object
-                                      properties: &ref_237
+                                      properties: &ref_247
                                         type:
                                           type: string
                                           enum:
                                             - identity
                                         flow:
                                           type: boolean
-                                      required: &ref_238
+                                      required: &ref_248
                                         - type
-                                  discriminator: &ref_240
+                                  discriminator: &ref_250
                                     propertyName: type
                                     mapping:
                                       rawscript: '#/components/schemas/RawScript'
@@ -4588,7 +4719,7 @@ paths:
                                   type: boolean
                                 retry:
                                   type: object
-                                  properties: &ref_87
+                                  properties: &ref_93
                                     constant:
                                       type: object
                                       properties:
@@ -4634,11 +4765,11 @@ paths:
                             type: number
                           early_return:
                             type: string
-                        required: &ref_59
+                        required: &ref_65
                           - modules
                       schema:
                         type: object
-                    required: &ref_51
+                    required: &ref_53
                       - summary
                       - value
   /apps/hub/list:
@@ -4945,12 +5076,12 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: &ref_48
+          schema: &ref_50
             type: boolean
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: &ref_49
+          schema: &ref_51
             type: string
         - name: path_start
           description: mask to filter matching starting path
@@ -5611,7 +5742,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_53
+                properties: &ref_57
                   primary_schedule:
                     type: object
                     properties:
@@ -5625,6 +5756,8 @@ paths:
                     type: number
                   email_count:
                     type: number
+                  websocket_count:
+                    type: number
   /w/{workspace}/scripts/list_tokens/{path}:
     get:
       summary: get tokens with script scope
@@ -5672,7 +5805,7 @@ paths:
           content:
             application/json:
               schema:
-                allOf: &ref_126
+                allOf: &ref_135
                   - type: object
                     properties: *ref_40
                     required: *ref_41
@@ -5710,13 +5843,38 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_127
+                  properties: &ref_42
                     script_hash:
                       type: string
                     deployment_msg:
                       type: string
-                  required: &ref_128
+                  required: &ref_43
                     - script_hash
+  /w/{workspace}/scripts/get_latest_version/{path}:
+    get:
+      summary: get scripts's latest version (hash)
+      operationId: getScriptLatestVersion
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_33
+      tags:
+        - script
+      responses:
+        '200':
+          description: Script version/hash
+          content:
+            application/json:
+              required: false
+              schema:
+                type: object
+                properties: *ref_42
+                required: *ref_43
   /w/{workspace}/scripts/history_update/h/{hash}/p/{path}:
     post:
       summary: update history of a script
@@ -5791,7 +5949,7 @@ paths:
         - name: token
           in: path
           required: true
-          schema: &ref_115
+          schema: &ref_124
             type: string
         - name: path
           in: path
@@ -5939,20 +6097,20 @@ paths:
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: &ref_42
+          schema: &ref_44
             type: string
             format: uuid
         - name: tag
           description: Override the tag to use
           in: query
-          schema: &ref_44
+          schema: &ref_46
             type: string
         - name: cache_ttl
           description: >-
             Override the cache time to live (in seconds). Can not be used to
             disable caching, only override with a new cache ttl
           in: query
-          schema: &ref_45
+          schema: &ref_47
             type: string
         - name: job_id
           description: >-
@@ -5961,7 +6119,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: &ref_43
+          schema: &ref_45
             type: string
             format: uuid
         - name: invisible_to_owner
@@ -6005,7 +6163,7 @@ paths:
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_42
+          schema: *ref_44
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -6013,7 +6171,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_43
+          schema: *ref_45
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -6022,14 +6180,14 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: &ref_46
+          schema: &ref_48
             type: string
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: &ref_47
+          schema: &ref_49
             type: string
       requestBody:
         description: script args
@@ -6065,17 +6223,17 @@ paths:
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_42
+          schema: *ref_44
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_44
+          schema: *ref_46
         - name: cache_ttl
           description: >-
             Override the cache time to live (in seconds). Can not be used to
             disable caching, only override with a new cache ttl
           in: query
-          schema: *ref_45
+          schema: *ref_47
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -6083,7 +6241,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_43
+          schema: *ref_45
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -6092,13 +6250,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_46
+          schema: *ref_48
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_47
+          schema: *ref_49
       requestBody:
         description: script args
         required: true
@@ -6132,17 +6290,17 @@ paths:
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_42
+          schema: *ref_44
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_44
+          schema: *ref_46
         - name: cache_ttl
           description: >-
             Override the cache time to live (in seconds). Can not be used to
             disable caching, only override with a new cache ttl
           in: query
-          schema: *ref_45
+          schema: *ref_47
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -6150,7 +6308,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_43
+          schema: *ref_45
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -6159,13 +6317,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_46
+          schema: *ref_48
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_47
+          schema: *ref_49
         - name: payload
           description: >
             The base64 encoded payload that has been encoded as a JSON. e.g how
@@ -6173,7 +6331,7 @@ paths:
 
             `encodeURIComponent(btoa(JSON.stringify({a: 2})))`
           in: query
-          schema: &ref_86
+          schema: &ref_92
             type: string
       responses:
         '200':
@@ -6204,13 +6362,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_46
+          schema: *ref_48
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_47
+          schema: *ref_49
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -6218,7 +6376,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_43
+          schema: *ref_45
       requestBody:
         description: script args
         required: true
@@ -6256,13 +6414,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_46
+          schema: *ref_48
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_47
+          schema: *ref_49
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -6270,7 +6428,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_43
+          schema: *ref_45
       requestBody:
         description: script args
         required: true
@@ -6381,11 +6539,11 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_48
+          schema: *ref_50
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_49
+          schema: *ref_51
         - name: path_start
           description: mask to filter matching starting path
           in: query
@@ -6439,12 +6597,12 @@ paths:
                 type: array
                 items:
                   allOf:
-                    - allOf: &ref_52
+                    - allOf: &ref_56
                         - type: object
-                          properties: *ref_50
-                          required: *ref_51
+                          properties: *ref_52
+                          required: *ref_53
                         - type: object
-                          properties: &ref_177
+                          properties: &ref_188
                             workspace_id:
                               type: string
                             path:
@@ -6458,7 +6616,7 @@ paths:
                               type: boolean
                             extra_perms:
                               type: object
-                              additionalProperties: &ref_176
+                              additionalProperties: &ref_187
                                 type: boolean
                             starred:
                               type: boolean
@@ -6476,7 +6634,7 @@ paths:
                               type: number
                             visible_to_runner_only:
                               type: boolean
-                          required: &ref_178
+                          required: &ref_189
                             - path
                             - edited_by
                             - edited_at
@@ -6512,7 +6670,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_189
+                  properties: &ref_54
                     id:
                       type: integer
                     created_at:
@@ -6520,9 +6678,34 @@ paths:
                       format: date-time
                     deployment_msg:
                       type: string
-                  required: &ref_190
+                  required: &ref_55
                     - id
                     - created_at
+  /w/{workspace}/flows/get_latest_version/{path}:
+    get:
+      summary: get flow's latest version
+      operationId: getFlowLatestVersion
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_33
+      tags:
+        - flow
+      responses:
+        '200':
+          description: Flow version
+          content:
+            application/json:
+              required: false
+              schema:
+                type: object
+                properties: *ref_54
+                required: *ref_55
   /w/{workspace}/flows/get/v/{version}/p/{path}:
     get:
       summary: get flow version
@@ -6550,7 +6733,7 @@ paths:
           content:
             application/json:
               schema:
-                allOf: *ref_52
+                allOf: *ref_56
   /w/{workspace}/flows/history_update/v/{version}/p/{path}:
     post:
       summary: update flow history
@@ -6616,7 +6799,7 @@ paths:
           content:
             application/json:
               schema:
-                allOf: *ref_52
+                allOf: *ref_56
   /w/{workspace}/flows/get_triggers_count/{path}:
     get:
       summary: get triggers count of flow
@@ -6639,7 +6822,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_53
+                properties: *ref_57
   /w/{workspace}/flows/list_tokens/{path}:
     get:
       summary: get tokens with flow scope
@@ -6720,11 +6903,11 @@ paths:
             application/json:
               schema:
                 allOf:
-                  - allOf: *ref_52
+                  - allOf: *ref_56
                   - type: object
                     properties:
                       draft:
-                        allOf: *ref_52
+                        allOf: *ref_56
   /w/{workspace}/flows/exists/{path}:
     get:
       summary: exists flow by path
@@ -6765,10 +6948,10 @@ paths:
           application/json:
             schema:
               allOf:
-                - allOf: &ref_54
+                - allOf: &ref_58
                     - type: object
-                      properties: *ref_50
-                      required: *ref_51
+                      properties: *ref_52
+                      required: *ref_53
                     - type: object
                       properties:
                         path:
@@ -6822,7 +7005,7 @@ paths:
           application/json:
             schema:
               allOf:
-                - allOf: *ref_54
+                - allOf: *ref_58
                 - type: object
                   properties:
                     deployment_message:
@@ -6910,11 +7093,11 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_48
+          schema: *ref_50
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_49
+          schema: *ref_51
         - name: path_start
           description: mask to filter matching starting path
           in: query
@@ -6941,7 +7124,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_184
+                  properties: &ref_195
                     workspace_id:
                       type: string
                     path:
@@ -6959,7 +7142,7 @@ paths:
                     edited_at:
                       type: string
                       format: date-time
-                  required: &ref_185
+                  required: &ref_196
                     - workspace_id
                     - path
                     - summary
@@ -7002,7 +7185,7 @@ paths:
         - name: version
           in: path
           required: true
-          schema: &ref_114
+          schema: &ref_123
             type: number
         - name: path
           in: path
@@ -7064,11 +7247,11 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_48
+          schema: *ref_50
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_49
+          schema: *ref_51
         - name: path_start
           description: mask to filter matching starting path
           in: query
@@ -7109,7 +7292,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_182
+                  properties: &ref_193
                     id:
                       type: integer
                     workspace_id:
@@ -7135,7 +7318,7 @@ paths:
                         - viewer
                         - publisher
                         - anonymous
-                  required: &ref_183
+                  required: &ref_194
                     - id
                     - workspace_id
                     - path
@@ -7170,7 +7353,7 @@ paths:
                   type: string
                 policy:
                   type: object
-                  properties: &ref_55
+                  properties: &ref_59
                     triggerables:
                       type: object
                       additionalProperties:
@@ -7253,7 +7436,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_56
+                properties: &ref_60
                   id:
                     type: integer
                   workspace_id:
@@ -7275,7 +7458,7 @@ paths:
                     type: object
                   policy:
                     type: object
-                    properties: *ref_55
+                    properties: *ref_59
                   execution_mode:
                     type: string
                     enum:
@@ -7286,7 +7469,7 @@ paths:
                     type: object
                     additionalProperties:
                       type: boolean
-                required: &ref_57
+                required: &ref_61
                   - id
                   - workspace_id
                   - path
@@ -7319,10 +7502,10 @@ paths:
           content:
             application/json:
               schema:
-                allOf: &ref_186
+                allOf: &ref_197
                   - type: object
-                    properties: *ref_56
-                    required: *ref_57
+                    properties: *ref_60
+                    required: *ref_61
                   - type: object
                     properties:
                       draft_only:
@@ -7352,13 +7535,38 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_187
+                  properties: &ref_62
                     version:
                       type: integer
                     deployment_msg:
                       type: string
-                  required: &ref_188
+                  required: &ref_63
                     - version
+  /w/{workspace}/apps/get_latest_version/{path}:
+    get:
+      summary: get apps's latest version
+      operationId: getAppLatestVersion
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_33
+      tags:
+        - app
+      responses:
+        '200':
+          description: App version
+          content:
+            application/json:
+              required: false
+              schema:
+                type: object
+                properties: *ref_62
+                required: *ref_63
   /w/{workspace}/apps/history_update/a/{id}/v/{version}:
     post:
       summary: update app history
@@ -7377,7 +7585,7 @@ paths:
         - name: version
           in: path
           required: true
-          schema: &ref_116
+          schema: &ref_125
             type: integer
       requestBody:
         description: App deployment message
@@ -7418,8 +7626,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_56
-                required: *ref_57
+                properties: *ref_60
+                required: *ref_61
   /w/{workspace}/apps_u/public_resource/{path}:
     get:
       summary: get public resource
@@ -7485,8 +7693,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_56
-                required: *ref_57
+                properties: *ref_60
+                required: *ref_61
   /w/{workspace}/raw_apps/create:
     post:
       summary: create raw app
@@ -7633,7 +7841,7 @@ paths:
                 value: {}
                 policy:
                   type: object
-                  properties: *ref_55
+                  properties: *ref_59
                 deployment_message:
                   type: string
       responses:
@@ -7741,11 +7949,11 @@ paths:
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_42
+          schema: *ref_44
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_44
+          schema: *ref_46
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -7753,7 +7961,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_43
+          schema: *ref_45
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -7762,7 +7970,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_46
+          schema: *ref_48
         - name: invisible_to_owner
           description: make the run invisible to the the flow owner (default false)
           in: query
@@ -7798,7 +8006,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: &ref_83
+          schema: &ref_89
             type: string
             format: uuid
         - name: step_id
@@ -7831,11 +8039,11 @@ paths:
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_42
+          schema: *ref_44
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_44
+          schema: *ref_46
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -7843,7 +8051,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_43
+          schema: *ref_45
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -7852,7 +8060,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_46
+          schema: *ref_48
         - name: invisible_to_owner
           description: make the run invisible to the the flow owner (default false)
           in: query
@@ -7910,17 +8118,17 @@ paths:
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_42
+          schema: *ref_44
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_44
+          schema: *ref_46
         - name: cache_ttl
           description: >-
             Override the cache time to live (in seconds). Can not be used to
             disable caching, only override with a new cache ttl
           in: query
-          schema: *ref_45
+          schema: *ref_47
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -7928,7 +8136,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_43
+          schema: *ref_45
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -7937,7 +8145,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_46
+          schema: *ref_48
         - name: invisible_to_owner
           description: make the run invisible to the the script owner (default false)
           in: query
@@ -7977,7 +8185,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_46
+          schema: *ref_48
         - name: invisible_to_owner
           description: make the run invisible to the the script owner (default false)
           in: query
@@ -7990,7 +8198,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_43
+          schema: *ref_45
       requestBody:
         description: preview
         required: true
@@ -7998,7 +8206,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_147
+              properties: &ref_154
                 content:
                   type: string
                 path:
@@ -8037,7 +8245,7 @@ paths:
                   type: boolean
                 lock:
                   type: string
-              required: &ref_148
+              required: &ref_155
                 - args
       responses:
         '201':
@@ -8075,11 +8283,11 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_149
+              properties: &ref_156
                 args:
                   type: object
                   additionalProperties: *ref_16
-              required: &ref_150
+              required: &ref_157
                 - args
       responses:
         '201':
@@ -8112,7 +8320,7 @@ paths:
                   type: array
                   items:
                     type: object
-                    properties: &ref_208
+                    properties: &ref_215
                       raw_code:
                         type: string
                       path:
@@ -8136,7 +8344,7 @@ paths:
                           - php
                           - rust
                           - ansible
-                    required: &ref_209
+                    required: &ref_216
                       - raw_code
                       - path
                       - language
@@ -8176,7 +8384,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_46
+          schema: *ref_48
         - name: invisible_to_owner
           description: make the run invisible to the the script owner (default false)
           in: query
@@ -8189,7 +8397,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_43
+          schema: *ref_45
       requestBody:
         description: preview
         required: true
@@ -8197,11 +8405,11 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_179
+              properties: &ref_190
                 value:
                   type: object
-                  properties: *ref_58
-                  required: *ref_59
+                  properties: *ref_64
+                  required: *ref_65
                 path:
                   type: string
                 args:
@@ -8211,7 +8419,7 @@ paths:
                   type: string
                 restarted_from:
                   type: object
-                  properties: &ref_181
+                  properties: &ref_192
                     flow_job_id:
                       type: string
                       format: uuid
@@ -8219,7 +8427,7 @@ paths:
                       type: string
                     branch_or_iteration_n:
                       type: integer
-              required: &ref_180
+              required: &ref_191
                 - value
                 - content
                 - args
@@ -8245,94 +8453,94 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_48
+          schema: *ref_50
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_49
+          schema: *ref_51
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_42
+          schema: *ref_44
         - name: script_path_exact
           description: mask to filter exact matching path
           in: query
-          schema: &ref_62
+          schema: &ref_68
             type: string
         - name: script_path_start
           description: mask to filter matching starting path
           in: query
-          schema: &ref_63
+          schema: &ref_69
             type: string
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: &ref_64
+          schema: &ref_70
             type: string
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: &ref_65
+          schema: &ref_71
             type: string
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: &ref_66
+          schema: &ref_72
             type: string
             format: date-time
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: &ref_67
+          schema: &ref_73
             type: string
             format: date-time
         - name: success
           description: filter on successful jobs
           in: query
-          schema: &ref_68
+          schema: &ref_74
             type: boolean
         - name: scheduled_for_before_now
           description: filter on jobs scheduled_for before now (hence waitinf for a worker)
           in: query
-          schema: &ref_69
+          schema: &ref_75
             type: boolean
         - name: job_kinds
           description: >-
             filter on job kind (values 'preview', 'script', 'dependencies',
             'flow') separated by,
           in: query
-          schema: &ref_70
+          schema: &ref_76
             type: string
         - name: suspended
           description: filter on suspended jobs
           in: query
-          schema: &ref_71
+          schema: &ref_77
             type: boolean
         - name: running
           description: filter on running jobs
           in: query
-          schema: &ref_72
+          schema: &ref_78
             type: boolean
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: &ref_73
+          schema: &ref_79
             type: string
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: &ref_74
+          schema: &ref_80
             type: string
         - name: tag
           description: filter on jobs with a given tag/worker group
           in: query
-          schema: &ref_75
+          schema: &ref_81
             type: string
         - name: page
           description: which page to return (start at 1, default 1)
@@ -8363,7 +8571,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_81
+                  properties: &ref_87
                     workspace_id:
                       type: string
                     id:
@@ -8430,14 +8638,14 @@ paths:
                         by extension its DT_TOKEN.
                     flow_status:
                       type: object
-                      properties: &ref_76
+                      properties: &ref_82
                         step:
                           type: integer
                         modules:
                           type: array
                           items:
                             type: object
-                            properties: &ref_60
+                            properties: &ref_66
                               type:
                                 type: string
                                 enum:
@@ -8514,20 +8722,20 @@ paths:
                                   format: uuid
                               skipped:
                                 type: boolean
-                            required: &ref_61
+                            required: &ref_67
                               - type
                         user_states:
                           additionalProperties: true
                         preprocessor_module:
                           allOf:
                             - type: object
-                              properties: *ref_60
-                              required: *ref_61
+                              properties: *ref_66
+                              required: *ref_67
                         failure_module:
                           allOf:
                             - type: object
-                              properties: *ref_60
-                              required: *ref_61
+                              properties: *ref_66
+                              required: *ref_67
                             - type: object
                               properties:
                                 parent_module:
@@ -8542,14 +8750,14 @@ paths:
                               items:
                                 type: string
                                 format: uuid
-                      required: &ref_77
+                      required: &ref_83
                         - step
                         - modules
                         - failure_module
                     raw_flow:
                       type: object
-                      properties: *ref_58
-                      required: *ref_59
+                      properties: *ref_64
+                      required: *ref_65
                     is_flow_step:
                       type: boolean
                     language:
@@ -8587,7 +8795,7 @@ paths:
                       type: number
                     suspend:
                       type: number
-                  required: &ref_82
+                  required: &ref_88
                     - id
                     - running
                     - canceled
@@ -8666,79 +8874,79 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_48
+          schema: *ref_50
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_49
+          schema: *ref_51
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_42
+          schema: *ref_44
         - name: script_path_exact
           description: mask to filter exact matching path
           in: query
-          schema: *ref_62
+          schema: *ref_68
         - name: script_path_start
           description: mask to filter matching starting path
           in: query
-          schema: *ref_63
+          schema: *ref_69
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: *ref_64
+          schema: *ref_70
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: *ref_65
+          schema: *ref_71
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_66
+          schema: *ref_72
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: *ref_67
+          schema: *ref_73
         - name: success
           description: filter on successful jobs
           in: query
-          schema: *ref_68
+          schema: *ref_74
         - name: scheduled_for_before_now
           description: filter on jobs scheduled_for before now (hence waitinf for a worker)
           in: query
-          schema: *ref_69
+          schema: *ref_75
         - name: job_kinds
           description: >-
             filter on job kind (values 'preview', 'script', 'dependencies',
             'flow') separated by,
           in: query
-          schema: *ref_70
+          schema: *ref_76
         - name: suspended
           description: filter on suspended jobs
           in: query
-          schema: *ref_71
+          schema: *ref_77
         - name: running
           description: filter on running jobs
           in: query
-          schema: *ref_72
+          schema: *ref_78
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_73
+          schema: *ref_79
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_74
+          schema: *ref_80
         - name: tag
           description: filter on jobs with a given tag/worker group
           in: query
-          schema: *ref_75
+          schema: *ref_81
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -8816,75 +9024,75 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_48
+          schema: *ref_50
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_49
+          schema: *ref_51
         - name: label
           description: >-
             mask to filter exact matching job's label (job labels are completed
             jobs with as a result an object containing a string in the array at
             key 'wm_labels')
           in: query
-          schema: &ref_78
+          schema: &ref_84
             type: string
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_42
+          schema: *ref_44
         - name: script_path_exact
           description: mask to filter exact matching path
           in: query
-          schema: *ref_62
+          schema: *ref_68
         - name: script_path_start
           description: mask to filter matching starting path
           in: query
-          schema: *ref_63
+          schema: *ref_69
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: *ref_64
+          schema: *ref_70
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: *ref_65
+          schema: *ref_71
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_66
+          schema: *ref_72
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: *ref_67
+          schema: *ref_73
         - name: success
           description: filter on successful jobs
           in: query
-          schema: *ref_68
+          schema: *ref_74
         - name: job_kinds
           description: >-
             filter on job kind (values 'preview', 'script', 'dependencies',
             'flow') separated by,
           in: query
-          schema: *ref_70
+          schema: *ref_76
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_73
+          schema: *ref_79
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_74
+          schema: *ref_80
         - name: tag
           description: filter on jobs with a given tag/worker group
           in: query
-          schema: *ref_75
+          schema: *ref_81
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -8922,7 +9130,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_79
+                  properties: &ref_85
                     workspace_id:
                       type: string
                     id:
@@ -8988,12 +9196,12 @@ paths:
                         by extension its DT_TOKEN.
                     flow_status:
                       type: object
-                      properties: *ref_76
-                      required: *ref_77
+                      properties: *ref_82
+                      required: *ref_83
                     raw_flow:
                       type: object
-                      properties: *ref_58
-                      required: *ref_59
+                      properties: *ref_64
+                      required: *ref_65
                     is_flow_step:
                       type: boolean
                     language:
@@ -9035,7 +9243,7 @@ paths:
                       type: number
                     aggregate_wait_time_ms:
                       type: number
-                  required: &ref_80
+                  required: &ref_86
                     - id
                     - created_by
                     - duration_ms
@@ -9064,54 +9272,54 @@ paths:
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_49
+          schema: *ref_51
         - name: label
           description: >-
             mask to filter exact matching job's label (job labels are completed
             jobs with as a result an object containing a string in the array at
             key 'wm_labels')
           in: query
-          schema: *ref_78
+          schema: *ref_84
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_42
+          schema: *ref_44
         - name: script_path_exact
           description: mask to filter exact matching path
           in: query
-          schema: *ref_62
+          schema: *ref_68
         - name: script_path_start
           description: mask to filter matching starting path
           in: query
-          schema: *ref_63
+          schema: *ref_69
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: *ref_64
+          schema: *ref_70
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: *ref_65
+          schema: *ref_71
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_66
+          schema: *ref_72
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: *ref_67
+          schema: *ref_73
         - name: created_before
           description: filter on created before (inclusive) timestamp
           in: query
-          schema: &ref_117
+          schema: &ref_126
             type: string
             format: date-time
         - name: created_after
           description: filter on created after (exclusive) timestamp
           in: query
-          schema: &ref_118
+          schema: &ref_127
             type: string
             format: date-time
         - name: created_or_started_before
@@ -9119,23 +9327,23 @@ paths:
             filter on created_at for non non started job and started_at
             otherwise before (inclusive) timestamp
           in: query
-          schema: &ref_111
+          schema: &ref_120
             type: string
             format: date-time
         - name: running
           description: filter on running jobs
           in: query
-          schema: *ref_72
+          schema: *ref_78
         - name: scheduled_for_before_now
           description: filter on jobs scheduled_for before now (hence waitinf for a worker)
           in: query
-          schema: *ref_69
+          schema: *ref_75
         - name: created_or_started_after
           description: >-
             filter on created_at for non non started job and started_at
             otherwise after (exclusive) timestamp
           in: query
-          schema: &ref_112
+          schema: &ref_121
             type: string
             format: date-time
         - name: created_or_started_after_completed_jobs
@@ -9144,7 +9352,7 @@ paths:
             otherwise after (exclusive) timestamp but only for the completed
             jobs
           in: query
-          schema: &ref_113
+          schema: &ref_122
             type: string
             format: date-time
         - name: job_kinds
@@ -9152,27 +9360,27 @@ paths:
             filter on job kind (values 'preview', 'script', 'dependencies',
             'flow') separated by,
           in: query
-          schema: *ref_70
+          schema: *ref_76
         - name: suspended
           description: filter on suspended jobs
           in: query
-          schema: *ref_71
+          schema: *ref_77
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_73
+          schema: *ref_79
         - name: tag
           description: filter on jobs with a given tag/worker group
           in: query
-          schema: *ref_75
+          schema: *ref_81
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_74
+          schema: *ref_80
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -9221,11 +9429,11 @@ paths:
               schema:
                 type: array
                 items:
-                  oneOf: &ref_84
+                  oneOf: &ref_90
                     - allOf:
                         - type: object
-                          properties: *ref_79
-                          required: *ref_80
+                          properties: *ref_85
+                          required: *ref_86
                         - type: object
                           properties:
                             type:
@@ -9234,15 +9442,15 @@ paths:
                                 - CompletedJob
                     - allOf:
                         - type: object
-                          properties: *ref_81
-                          required: *ref_82
+                          properties: *ref_87
+                          required: *ref_88
                         - type: object
                           properties:
                             type:
                               type: string
                               enum:
                                 - QueuedJob
-                  discriminator: &ref_85
+                  discriminator: &ref_91
                     propertyName: type
   /jobs/db_clock:
     get:
@@ -9309,7 +9517,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
         - name: no_logs
           in: query
           schema:
@@ -9320,8 +9528,8 @@ paths:
           content:
             application/json:
               schema:
-                oneOf: *ref_84
-                discriminator: *ref_85
+                oneOf: *ref_90
+                discriminator: *ref_91
   /w/{workspace}/jobs_u/get_root_job_id/{id}:
     get:
       summary: get root job id
@@ -9336,7 +9544,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
       responses:
         '200':
           description: get root job id
@@ -9358,7 +9566,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
       responses:
         '200':
           description: job details
@@ -9380,7 +9588,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
       responses:
         '200':
           description: job args
@@ -9401,7 +9609,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
         - name: running
           in: query
           schema:
@@ -9436,9 +9644,9 @@ paths:
                     type: integer
                   flow_status:
                     type: object
-                    additionalProperties: &ref_151
+                    additionalProperties: &ref_158
                       type: object
-                      properties: &ref_152
+                      properties: &ref_159
                         scheduled_for:
                           type: string
                           format: date-time
@@ -9485,7 +9693,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
       responses:
         '200':
           description: flow debug info details
@@ -9506,7 +9714,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
       responses:
         '200':
           description: job details
@@ -9514,8 +9722,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_79
-                required: *ref_80
+                properties: *ref_85
+                required: *ref_86
   /w/{workspace}/jobs_u/completed/get_result/{id}:
     get:
       summary: get completed job result
@@ -9530,7 +9738,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
         - name: suspended_job
           in: query
           schema:
@@ -9567,10 +9775,10 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
         - name: get_started
           in: query
-          schema: &ref_124
+          schema: &ref_133
             type: boolean
       responses:
         '200':
@@ -9604,7 +9812,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
       responses:
         '200':
           description: job details
@@ -9612,8 +9820,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_79
-                required: *ref_80
+                properties: *ref_85
+                required: *ref_86
   /w/{workspace}/jobs_u/queue/cancel/{id}:
     post:
       summary: cancel queued or running job
@@ -9628,7 +9836,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
       requestBody:
         description: reason
         required: true
@@ -9692,7 +9900,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
       requestBody:
         description: reason
         required: true
@@ -9724,7 +9932,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
         - name: resume_id
           in: path
           required: true
@@ -9755,7 +9963,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
         - name: resume_id
           in: path
           required: true
@@ -9797,7 +10005,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
         - name: payload
           description: >
             The base64 encoded payload that has been encoded as a JSON. e.g how
@@ -9805,7 +10013,7 @@ paths:
 
             `encodeURIComponent(btoa(JSON.stringify({a: 2})))`
           in: query
-          schema: *ref_86
+          schema: *ref_92
         - name: resume_id
           in: path
           required: true
@@ -9840,7 +10048,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
         - name: resume_id
           in: path
           required: true
@@ -9882,7 +10090,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
         - name: key
           in: path
           required: true
@@ -9914,7 +10122,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
         - name: key
           in: path
           required: true
@@ -9940,7 +10148,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
       requestBody:
         required: true
         content:
@@ -9968,7 +10176,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
         - name: resume_id
           in: path
           required: true
@@ -10003,7 +10211,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
         - name: resume_id
           in: path
           required: true
@@ -10045,7 +10253,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
         - name: resume_id
           in: path
           required: true
@@ -10069,8 +10277,8 @@ paths:
                 type: object
                 properties:
                   job:
-                    oneOf: *ref_84
-                    discriminator: *ref_85
+                    oneOf: *ref_90
+                    discriminator: *ref_91
                   approvers:
                     type: array
                     items:
@@ -10135,7 +10343,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_162
+              properties: &ref_169
                 path:
                   type: string
                 schedule:
@@ -10176,7 +10384,7 @@ paths:
                   type: boolean
                 retry:
                   type: object
-                  properties: *ref_87
+                  properties: *ref_93
                 no_flow_overlap:
                   type: boolean
                 summary:
@@ -10186,7 +10394,7 @@ paths:
                 paused_until:
                   type: string
                   format: date-time
-              required: &ref_163
+              required: &ref_170
                 - path
                 - schedule
                 - timezone
@@ -10222,7 +10430,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_164
+              properties: &ref_171
                 schedule:
                   type: string
                 timezone:
@@ -10255,7 +10463,7 @@ paths:
                   type: boolean
                 retry:
                   type: object
-                  properties: *ref_87
+                  properties: *ref_93
                 no_flow_overlap:
                   type: boolean
                 summary:
@@ -10265,7 +10473,7 @@ paths:
                 paused_until:
                   type: string
                   format: date-time
-              required: &ref_165
+              required: &ref_172
                 - schedule
                 - timezone
                 - script_path
@@ -10356,7 +10564,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_88
+                properties: &ref_94
                   path:
                     type: string
                   edited_by:
@@ -10410,7 +10618,7 @@ paths:
                     type: boolean
                   retry:
                     type: object
-                    properties: *ref_87
+                    properties: *ref_93
                   summary:
                     type: string
                   no_flow_overlap:
@@ -10420,7 +10628,7 @@ paths:
                   paused_until:
                     type: string
                     format: date-time
-                required: &ref_89
+                required: &ref_95
                   - path
                   - edited_by
                   - edited_at
@@ -10477,7 +10685,7 @@ paths:
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_73
+          schema: *ref_79
         - name: path
           description: filter by path
           in: query
@@ -10500,8 +10708,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_88
-                  required: *ref_89
+                  properties: *ref_94
+                  required: *ref_95
   /w/{workspace}/schedules/list_with_jobs:
     get:
       summary: list schedules with last 20 jobs
@@ -10529,10 +10737,10 @@ paths:
               schema:
                 type: array
                 items:
-                  allOf: &ref_161
+                  allOf: &ref_168
                     - type: object
-                      properties: *ref_88
-                      required: *ref_89
+                      properties: *ref_94
+                      required: *ref_95
                     - type: object
                       properties:
                         jobs:
@@ -10611,7 +10819,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_166
+              properties: &ref_173
                 path:
                   type: string
                 script_path:
@@ -10632,7 +10840,7 @@ paths:
                   type: boolean
                 requires_auth:
                   type: boolean
-              required: &ref_167
+              required: &ref_174
                 - path
                 - script_path
                 - route_path
@@ -10669,7 +10877,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_168
+              properties: &ref_175
                 path:
                   type: string
                 script_path:
@@ -10690,7 +10898,7 @@ paths:
                   type: boolean
                 requires_auth:
                   type: boolean
-              required: &ref_169
+              required: &ref_176
                 - path
                 - script_path
                 - is_flow
@@ -10749,7 +10957,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_90
+                properties: &ref_96
                   path:
                     type: string
                   edited_by:
@@ -10783,7 +10991,7 @@ paths:
                     type: boolean
                   requires_auth:
                     type: boolean
-                required: &ref_91
+                required: &ref_97
                   - path
                   - edited_by
                   - edited_at
@@ -10837,8 +11045,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_90
-                  required: *ref_91
+                  properties: *ref_96
+                  required: *ref_97
   /w/{workspace}/http_triggers/exists/{path}:
     get:
       summary: does http trigger exists
@@ -10901,24 +11109,362 @@ paths:
             application/json:
               schema:
                 type: boolean
-  /w/{workspace}/http_triggers/used:
-    get:
-      summary: whether http triggers are used
-      operationId: used
+  /w/{workspace}/websocket_triggers/create:
+    post:
+      summary: create websocket trigger
+      operationId: createWebsocketTrigger
       tags:
-        - http_trigger
+        - websocket_trigger
       parameters:
         - name: workspace
           in: path
           required: true
           schema: *ref_0
+      requestBody:
+        description: new websocket trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_177
+                path:
+                  type: string
+                script_path:
+                  type: string
+                is_flow:
+                  type: boolean
+                url:
+                  type: string
+                enabled:
+                  type: boolean
+                filters:
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      key:
+                        type: string
+                      value: {}
+                    required:
+                      - key
+                      - value
+                initial_messages:
+                  type: array
+                  items:
+                    anyOf: &ref_98
+                      - type: object
+                        properties:
+                          raw_message:
+                            type: string
+                        required:
+                          - raw_message
+                      - type: object
+                        properties:
+                          runnable_result:
+                            type: object
+                            properties:
+                              path:
+                                type: string
+                              args:
+                                type: object
+                                additionalProperties: *ref_16
+                              is_flow:
+                                type: boolean
+                            required:
+                              - path
+                              - args
+                              - is_flow
+                        required:
+                          - runnable_result
+                url_runnable_args:
+                  type: object
+                  additionalProperties: *ref_16
+              required: &ref_178
+                - path
+                - script_path
+                - url
+                - is_flow
+                - filters
+                - initial_messages
+                - url_runnable_args
+      responses:
+        '201':
+          description: websocket trigger created
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/websocket_triggers/update/{path}:
+    post:
+      summary: update websocket trigger
+      operationId: updateWebsocketTrigger
+      tags:
+        - websocket_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_21
+      requestBody:
+        description: updated trigger
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties: &ref_179
+                url:
+                  type: string
+                path:
+                  type: string
+                script_path:
+                  type: string
+                is_flow:
+                  type: boolean
+                filters:
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      key:
+                        type: string
+                      value: {}
+                    required:
+                      - key
+                      - value
+                initial_messages:
+                  type: array
+                  items:
+                    anyOf: *ref_98
+                url_runnable_args:
+                  type: object
+                  additionalProperties: *ref_16
+              required: &ref_180
+                - path
+                - script_path
+                - url
+                - is_flow
+                - filters
+                - initial_messages
+                - url_runnable_args
       responses:
         '200':
-          description: whether http triggers are used
+          description: websocket trigger updated
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/websocket_triggers/delete/{path}:
+    delete:
+      summary: delete websocket trigger
+      operationId: deleteWebsocketTrigger
+      tags:
+        - websocket_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_21
+      responses:
+        '200':
+          description: websocket trigger deleted
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/websocket_triggers/get/{path}:
+    get:
+      summary: get websocket trigger
+      operationId: getWebsocketTrigger
+      tags:
+        - websocket_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_21
+      responses:
+        '200':
+          description: websocket trigger deleted
+          content:
+            application/json:
+              schema:
+                type: object
+                properties: &ref_99
+                  path:
+                    type: string
+                  edited_by:
+                    type: string
+                  edited_at:
+                    type: string
+                    format: date-time
+                  script_path:
+                    type: string
+                  url:
+                    type: string
+                  is_flow:
+                    type: boolean
+                  extra_perms:
+                    type: object
+                    additionalProperties:
+                      type: boolean
+                  email:
+                    type: string
+                  workspace_id:
+                    type: string
+                  server_id:
+                    type: string
+                  last_server_ping:
+                    type: string
+                    format: date-time
+                  error:
+                    type: string
+                  enabled:
+                    type: boolean
+                  filters:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        key:
+                          type: string
+                        value: {}
+                      required:
+                        - key
+                        - value
+                  initial_messages:
+                    type: array
+                    items:
+                      anyOf: *ref_98
+                  url_runnable_args:
+                    type: object
+                    additionalProperties: *ref_16
+                required: &ref_100
+                  - path
+                  - edited_by
+                  - edited_at
+                  - script_path
+                  - url
+                  - extra_perms
+                  - is_flow
+                  - email
+                  - workspace_id
+                  - enabled
+                  - filters
+                  - initial_messages
+                  - url_runnable_args
+  /w/{workspace}/websocket_triggers/list:
+    get:
+      summary: list websocket triggers
+      operationId: listWebsocketTriggers
+      tags:
+        - websocket_trigger
+      parameters:
+        - required: true
+          name: workspace
+          in: path
+          schema: *ref_0
+        - name: page
+          description: which page to return (start at 1, default 1)
+          in: query
+          schema: *ref_5
+        - name: per_page
+          description: number of items to return for a given page (default 30, max 100)
+          in: query
+          schema: *ref_6
+        - name: path
+          description: filter by path
+          in: query
+          schema:
+            type: string
+        - name: is_flow
+          in: query
+          schema:
+            type: boolean
+        - name: path_start
+          in: query
+          schema:
+            type: string
+      responses:
+        '200':
+          description: websocket trigger list
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties: *ref_99
+                  required: *ref_100
+  /w/{workspace}/websocket_triggers/exists/{path}:
+    get:
+      summary: does websocket trigger exists
+      operationId: existsWebsocketTrigger
+      tags:
+        - websocket_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_21
+      responses:
+        '200':
+          description: websocket trigger exists
           content:
             application/json:
               schema:
                 type: boolean
+  /w/{workspace}/websocket_triggers/setenabled/{path}:
+    post:
+      summary: set enabled websocket trigger
+      operationId: setWebsocketTriggerEnabled
+      tags:
+        - websocket_trigger
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
+        - name: path
+          in: path
+          required: true
+          schema: *ref_21
+      requestBody:
+        description: updated websocket trigger enable
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                enabled:
+                  type: boolean
+              required:
+                - enabled
+      responses:
+        '200':
+          description: websocket trigger enabled set
+          content:
+            text/plain:
+              schema:
+                type: string
   /groups/list:
     get:
       summary: list instance groups
@@ -10934,7 +11480,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_93
+                  properties: &ref_102
                     name:
                       type: string
                     summary:
@@ -10943,7 +11489,7 @@ paths:
                       type: array
                       items:
                         type: string
-                  required: &ref_94
+                  required: &ref_103
                     - name
   /groups/get/{name}:
     get:
@@ -10955,7 +11501,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       responses:
         '200':
           description: instance group
@@ -10963,8 +11509,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_93
-                required: *ref_94
+                properties: *ref_102
+                required: *ref_103
   /groups/create:
     post:
       summary: create instance group
@@ -11002,7 +11548,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       requestBody:
         description: update instance group
         required: true
@@ -11032,7 +11578,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       responses:
         '200':
           description: instance group deleted
@@ -11050,7 +11596,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       requestBody:
         description: user to add to instance group
         required: true
@@ -11080,7 +11626,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       requestBody:
         description: user to remove from instance group
         required: true
@@ -11115,7 +11661,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_95
+                  properties: &ref_104
                     name:
                       type: string
                     summary:
@@ -11130,7 +11676,7 @@ paths:
                       type: string
                     external_id:
                       type: string
-                  required: &ref_96
+                  required: &ref_105
                     - name
   /groups/overwrite:
     post:
@@ -11147,8 +11693,8 @@ paths:
               type: array
               items:
                 type: object
-                properties: *ref_95
-                required: *ref_96
+                properties: *ref_104
+                required: *ref_105
       responses:
         '200':
           description: success message
@@ -11184,7 +11730,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_97
+                  properties: &ref_106
                     name:
                       type: string
                     summary:
@@ -11197,7 +11743,7 @@ paths:
                       type: object
                       additionalProperties:
                         type: boolean
-                  required: &ref_98
+                  required: &ref_107
                     - name
   /w/{workspace}/groups/listnames:
     get:
@@ -11270,7 +11816,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       requestBody:
         description: updated group
         required: true
@@ -11302,7 +11848,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       responses:
         '200':
           description: group deleted
@@ -11324,7 +11870,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       responses:
         '200':
           description: group
@@ -11332,8 +11878,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_97
-                required: *ref_98
+                properties: *ref_106
+                required: *ref_107
   /w/{workspace}/groups/adduser/{name}:
     post:
       summary: add user to group
@@ -11348,7 +11894,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       requestBody:
         description: added user to group
         required: true
@@ -11380,7 +11926,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       requestBody:
         description: added user to group
         required: true
@@ -11426,7 +11972,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_99
+                  properties: &ref_108
                     name:
                       type: string
                     owners:
@@ -11444,7 +11990,7 @@ paths:
                     edited_at:
                       type: string
                       format: date-time
-                  required: &ref_100
+                  required: &ref_109
                     - name
                     - owners
                     - extra_perms
@@ -11526,7 +12072,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       requestBody:
         description: update folder
         required: true
@@ -11565,7 +12111,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       responses:
         '200':
           description: folder deleted
@@ -11587,7 +12133,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       responses:
         '200':
           description: folder
@@ -11595,8 +12141,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_99
-                required: *ref_100
+                properties: *ref_108
+                required: *ref_109
   /w/{workspace}/folders/getusage/{name}:
     get:
       summary: get folder usage
@@ -11611,7 +12157,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       responses:
         '200':
           description: folder
@@ -11653,7 +12199,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       requestBody:
         description: owner user to folder
         required: true
@@ -11687,7 +12233,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       requestBody:
         description: added owner to folder
         required: true
@@ -11741,7 +12287,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_170
+                  properties: &ref_181
                     worker:
                       type: string
                     worker_instance:
@@ -11783,7 +12329,7 @@ paths:
                       type: number
                     wm_memory_usage:
                       type: number
-                  required: &ref_171
+                  required: &ref_182
                     - worker
                     - worker_instance
                     - ping_at
@@ -11876,7 +12422,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       responses:
         '200':
           description: a config
@@ -11893,7 +12439,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       requestBody:
         description: worker group
         required: true
@@ -11916,7 +12462,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_92
+          schema: *ref_101
       responses:
         '200':
           description: Delete config
@@ -11939,13 +12485,49 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_216
+                  properties: &ref_223
                     name:
                       type: string
                     config:
                       type: object
-                  required: &ref_217
+                  required: &ref_224
                     - name
+  /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:
+                  type: object
+                  properties: &ref_227
+                    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
   /w/{workspace}/acls/get/{kind}/{path}:
     get:
       summary: get granular acls
@@ -11977,6 +12559,7 @@ paths:
               - app
               - raw_app
               - http_trigger
+              - websocket_trigger
       responses:
         '200':
           description: acls
@@ -12017,6 +12600,7 @@ paths:
               - app
               - raw_app
               - http_trigger
+              - websocket_trigger
       requestBody:
         description: acl to add
         required: true
@@ -12069,6 +12653,7 @@ paths:
               - app
               - raw_app
               - http_trigger
+              - websocket_trigger
       requestBody:
         description: acl to add
         required: true
@@ -12217,13 +12802,13 @@ paths:
           schema: *ref_0
         - name: runnable_id
           in: query
-          schema: &ref_101
+          schema: &ref_110
             type: string
         - name: runnable_type
           in: query
-          schema: &ref_102
+          schema: &ref_111
             type: string
-            enum: &ref_133
+            enum: &ref_140
               - ScriptHash
               - ScriptPath
               - FlowPath
@@ -12244,7 +12829,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_103
+                  properties: &ref_112
                     id:
                       type: string
                     name:
@@ -12258,7 +12843,7 @@ paths:
                       type: boolean
                     success:
                       type: boolean
-                  required: &ref_104
+                  required: &ref_113
                     - id
                     - name
                     - args
@@ -12308,10 +12893,10 @@ paths:
           schema: *ref_0
         - name: runnable_id
           in: query
-          schema: *ref_101
+          schema: *ref_110
         - name: runnable_type
           in: query
-          schema: *ref_102
+          schema: *ref_111
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -12329,8 +12914,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_103
-                  required: *ref_104
+                  properties: *ref_112
+                  required: *ref_113
   /w/{workspace}/inputs/create:
     post:
       summary: Create an Input for future use in a script or flow
@@ -12344,10 +12929,10 @@ paths:
           schema: *ref_0
         - name: runnable_id
           in: query
-          schema: *ref_101
+          schema: *ref_110
         - name: runnable_type
           in: query
-          schema: *ref_102
+          schema: *ref_111
       requestBody:
         description: Input
         required: true
@@ -12355,12 +12940,12 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_129
+              properties: &ref_136
                 name:
                   type: string
                 args:
                   type: object
-              required: &ref_130
+              required: &ref_137
                 - name
                 - args
                 - created_by
@@ -12390,14 +12975,14 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_131
+              properties: &ref_138
                 id:
                   type: string
                 name:
                   type: string
                 is_public:
                   type: boolean
-              required: &ref_132
+              required: &ref_139
                 - id
                 - name
                 - is_public
@@ -12423,7 +13008,7 @@ paths:
         - name: input
           in: path
           required: true
-          schema: &ref_123
+          schema: &ref_132
             type: string
       responses:
         '200':
@@ -12456,7 +13041,7 @@ paths:
               properties:
                 s3_resource:
                   type: object
-                  properties: &ref_105
+                  properties: &ref_114
                     bucket:
                       type: string
                     region:
@@ -12471,7 +13056,7 @@ paths:
                       type: string
                     pathStyle:
                       type: boolean
-                  required: &ref_106
+                  required: &ref_115
                     - bucket
                     - region
                     - endPoint
@@ -12547,8 +13132,8 @@ paths:
               properties:
                 s3_resource:
                   type: object
-                  properties: *ref_105
-                  required: *ref_106
+                  properties: *ref_114
+                  required: *ref_115
       responses:
         '200':
           description: Connection settings
@@ -12569,10 +13154,10 @@ paths:
                     type: boolean
                   client_kwargs:
                     type: object
-                    properties: &ref_107
+                    properties: &ref_116
                       region_name:
                         type: string
-                    required: &ref_108
+                    required: &ref_117
                       - region_name
                 required:
                   - endpoint_url
@@ -12627,8 +13212,8 @@ paths:
                         type: boolean
                       client_kwargs:
                         type: object
-                        properties: *ref_107
-                        required: *ref_108
+                        properties: *ref_116
+                        required: *ref_117
                     required:
                       - endpoint_url
                       - use_ssl
@@ -12686,8 +13271,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_105
-                required: *ref_106
+                properties: *ref_114
+                required: *ref_115
   /w/{workspace}/job_helpers/test_connection:
     get:
       summary: Test connection to the workspace object storage
@@ -12751,10 +13336,10 @@ paths:
                     type: array
                     items:
                       type: object
-                      properties: &ref_193
+                      properties: &ref_200
                         s3:
                           type: string
-                      required: &ref_194
+                      required: &ref_201
                         - s3
                   restricted_access:
                     type: boolean
@@ -12787,7 +13372,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_195
+                properties: &ref_202
                   mime_type:
                     type: string
                   size_in_bytes:
@@ -12851,7 +13436,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_196
+                properties: &ref_203
                   msg:
                     type: string
                   content:
@@ -12863,7 +13448,7 @@ paths:
                       - Csv
                       - Parquet
                       - Unknown
-                required: &ref_197
+                required: &ref_204
                   - content_type
   /w/{workspace}/job_helpers/load_parquet_preview/{path}:
     get:
@@ -13201,7 +13786,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
       requestBody:
         description: parameters for statistics retrieval
         required: true
@@ -13230,46 +13815,46 @@ paths:
                     type: array
                     items:
                       type: object
-                      properties: &ref_200
+                      properties: &ref_207
                         id:
                           type: string
                         name:
                           type: string
-                      required: &ref_201
+                      required: &ref_208
                         - id
                   scalar_metrics:
                     type: array
                     items:
                       type: object
-                      properties: &ref_202
+                      properties: &ref_209
                         metric_id:
                           type: string
                         value:
                           type: number
-                      required: &ref_203
+                      required: &ref_210
                         - id
                         - value
                   timeseries_metrics:
                     type: array
                     items:
                       type: object
-                      properties: &ref_204
+                      properties: &ref_211
                         metric_id:
                           type: string
                         values:
                           type: array
                           items:
                             type: object
-                            properties: &ref_206
+                            properties: &ref_213
                               timestamp:
                                 type: string
                                 format: date-time
                               value:
                                 type: number
-                            required: &ref_207
+                            required: &ref_214
                               - timestamp
                               - value
-                      required: &ref_205
+                      required: &ref_212
                         - id
                         - values
   /w/{workspace}/job_metrics/set_progress/{id}:
@@ -13286,7 +13871,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
       requestBody:
         description: parameters for statistics retrieval
         required: true
@@ -13320,7 +13905,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
       responses:
         '200':
           description: job progress between 0 and 99
@@ -13338,11 +13923,11 @@ paths:
         - name: before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_109
+          schema: *ref_118
         - name: after
           description: filter on created after (exclusive) timestamp
           in: query
-          schema: *ref_110
+          schema: *ref_119
         - name: with_error
           in: query
           required: false
@@ -13414,12 +13999,12 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_210
+                  properties: &ref_217
                     concurrency_key:
                       type: string
                     total_running:
                       type: number
-                  required: &ref_211
+                  required: &ref_218
                     - concurrency_key
                     - total_running
   /concurrency_groups/prune/{concurrency_id}:
@@ -13432,7 +14017,7 @@ paths:
         - name: concurrency_id
           in: path
           required: true
-          schema: &ref_125
+          schema: &ref_134
             type: string
       responses:
         '200':
@@ -13452,7 +14037,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_83
+          schema: *ref_89
       responses:
         '200':
           description: concurrency key for given job
@@ -13485,93 +14070,93 @@ paths:
         - name: created_by
           description: mask to filter exact matching user creator
           in: query
-          schema: *ref_49
+          schema: *ref_51
         - name: label
           description: >-
             mask to filter exact matching job's label (job labels are completed
             jobs with as a result an object containing a string in the array at
             key 'wm_labels')
           in: query
-          schema: *ref_78
+          schema: *ref_84
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_42
+          schema: *ref_44
         - name: script_path_exact
           description: mask to filter exact matching path
           in: query
-          schema: *ref_62
+          schema: *ref_68
         - name: script_path_start
           description: mask to filter matching starting path
           in: query
-          schema: *ref_63
+          schema: *ref_69
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: *ref_64
+          schema: *ref_70
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: *ref_65
+          schema: *ref_71
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_66
+          schema: *ref_72
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: *ref_67
+          schema: *ref_73
         - name: created_or_started_before
           description: >-
             filter on created_at for non non started job and started_at
             otherwise before (inclusive) timestamp
           in: query
-          schema: *ref_111
+          schema: *ref_120
         - name: running
           description: filter on running jobs
           in: query
-          schema: *ref_72
+          schema: *ref_78
         - name: scheduled_for_before_now
           description: filter on jobs scheduled_for before now (hence waitinf for a worker)
           in: query
-          schema: *ref_69
+          schema: *ref_75
         - name: created_or_started_after
           description: >-
             filter on created_at for non non started job and started_at
             otherwise after (exclusive) timestamp
           in: query
-          schema: *ref_112
+          schema: *ref_121
         - name: created_or_started_after_completed_jobs
           description: >-
             filter on created_at for non non started job and started_at
             otherwise after (exclusive) timestamp but only for the completed
             jobs
           in: query
-          schema: *ref_113
+          schema: *ref_122
         - name: job_kinds
           description: >-
             filter on job kind (values 'preview', 'script', 'dependencies',
             'flow') separated by,
           in: query
-          schema: *ref_70
+          schema: *ref_76
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_73
+          schema: *ref_79
         - name: tag
           description: filter on jobs with a given tag/worker group
           in: query
-          schema: *ref_75
+          schema: *ref_81
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_74
+          schema: *ref_80
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -13619,17 +14204,17 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_212
+                properties: &ref_219
                   jobs:
                     type: array
                     items:
-                      oneOf: *ref_84
-                      discriminator: *ref_85
+                      oneOf: *ref_90
+                      discriminator: *ref_91
                   obscured_jobs:
                     type: array
                     items:
                       type: object
-                      properties: &ref_134
+                      properties: &ref_141
                         typ:
                           type: string
                         started_at:
@@ -13642,7 +14227,7 @@ paths:
                       Obscured jobs omitted for security because of too specific
                       filtering
                     type: boolean
-                required: &ref_213
+                required: &ref_220
                   - jobs
                   - obscured_jobs
   /srch/w/{workspace}/index/search/job:
@@ -13684,9 +14269,118 @@ paths:
                     type: array
                     items:
                       type: object
-                      properties: &ref_218
+                      properties: &ref_225
                         dancer:
                           type: string
+  /srch/index/search/service_logs:
+    get:
+      summary: Search through service logs with a string query
+      operationId: searchLogsIndex
+      tags:
+        - indexSearch
+      parameters:
+        - name: search_query
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: mode
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: worker_group
+          in: query
+          required: false
+          schema:
+            type: string
+        - name: hostname
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: min_ts
+          in: query
+          required: false
+          schema:
+            type: string
+            format: date-time
+        - name: max_ts
+          in: query
+          required: false
+          schema:
+            type: string
+            format: date-time
+      responses:
+        '200':
+          description: search results
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  query_parse_errors:
+                    description: >-
+                      a list of the terms that couldn't be parsed (and thus
+                      ignored)
+                    type: array
+                    items:
+                      type: string
+                  hits:
+                    description: log files that matched the query
+                    type: array
+                    items:
+                      type: object
+                      properties: &ref_226
+                        dancer:
+                          type: string
+  /srch/index/search/count_service_logs:
+    get:
+      summary: Search and count the log line hits on every provided host
+      operationId: countSearchLogsIndex
+      tags:
+        - indexSearch
+      parameters:
+        - name: search_query
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: hosts
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: min_ts
+          in: query
+          required: false
+          schema:
+            type: string
+            format: date-time
+        - name: max_ts
+          in: query
+          required: false
+          schema:
+            type: string
+            format: date-time
+      responses:
+        '200':
+          description: search results
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  query_parse_errors:
+                    description: >-
+                      a list of the terms that couldn't be parsed (and thus
+                      ignored)
+                    type: array
+                    items:
+                      type: string
+                  count_per_host:
+                    description: count of log lines that matched the query per hostname
+                    type: object
 components:
   securitySchemes:
     bearerAuth:
@@ -13711,12 +14405,12 @@ components:
       name: version
       in: path
       required: true
-      schema: *ref_114
+      schema: *ref_123
     Token:
       name: token
       in: path
       required: true
-      schema: *ref_115
+      schema: *ref_124
     AccountId:
       name: id
       in: path
@@ -13741,7 +14435,7 @@ components:
       name: id
       in: path
       required: true
-      schema: *ref_83
+      schema: *ref_89
     Path:
       name: path
       in: path
@@ -13756,12 +14450,12 @@ components:
       name: version
       in: path
       required: true
-      schema: *ref_116
+      schema: *ref_125
     Name:
       name: name
       in: path
       required: true
-      schema: *ref_92
+      schema: *ref_101
     Page:
       name: page
       description: which page to return (start at 1, default 1)
@@ -13776,12 +14470,12 @@ components:
       name: order_desc
       description: order by desc order (default true)
       in: query
-      schema: *ref_48
+      schema: *ref_50
     CreatedBy:
       name: created_by
       description: mask to filter exact matching user creator
       in: query
-      schema: *ref_49
+      schema: *ref_51
     Label:
       name: label
       description: >-
@@ -13789,26 +14483,26 @@ components:
         with as a result an object containing a string in the array at key
         'wm_labels')
       in: query
-      schema: *ref_78
+      schema: *ref_84
     ParentJob:
       name: parent_job
       description: >-
         The parent job that is at the origin and responsible for the execution
         of this script if any
       in: query
-      schema: *ref_42
+      schema: *ref_44
     WorkerTag:
       name: tag
       description: Override the tag to use
       in: query
-      schema: *ref_44
+      schema: *ref_46
     CacheTtl:
       name: cache_ttl
       description: >-
         Override the cache time to live (in seconds). Can not be used to disable
         caching, only override with a new cache ttl
       in: query
-      schema: *ref_45
+      schema: *ref_47
     NewJobId:
       name: job_id
       description: >-
@@ -13816,7 +14510,7 @@ components:
         randomly using the ULID scheme. If a job id already exists in the queue
         or as a completed job, the request to create one will fail (Bad Request)
       in: query
-      schema: *ref_43
+      schema: *ref_45
     IncludeHeader:
       name: include_header
       description: >
@@ -13826,14 +14520,14 @@ components:
         Header's key lowercased and '-'' replaced to '_' such that
         'Content-Type' becomes the 'content_type' arg key
       in: query
-      schema: *ref_46
+      schema: *ref_48
     QueueLimit:
       name: queue_limit
       description: >
         The maximum size of the queue for which the request would get rejected
         if that job would push it above that limit
       in: query
-      schema: *ref_47
+      schema: *ref_49
     Payload:
       name: payload
       description: >
@@ -13842,162 +14536,162 @@ components:
 
         `encodeURIComponent(btoa(JSON.stringify({a: 2})))`
       in: query
-      schema: *ref_86
+      schema: *ref_92
     ScriptStartPath:
       name: script_path_start
       description: mask to filter matching starting path
       in: query
-      schema: *ref_63
+      schema: *ref_69
     SchedulePath:
       name: schedule_path
       description: mask to filter by schedule path
       in: query
-      schema: *ref_64
+      schema: *ref_70
     ScriptExactPath:
       name: script_path_exact
       description: mask to filter exact matching path
       in: query
-      schema: *ref_62
+      schema: *ref_68
     ScriptExactHash:
       name: script_hash
       description: mask to filter exact matching path
       in: query
-      schema: *ref_65
+      schema: *ref_71
     CreatedBefore:
       name: created_before
       description: filter on created before (inclusive) timestamp
       in: query
-      schema: *ref_117
+      schema: *ref_126
     CreatedAfter:
       name: created_after
       description: filter on created after (exclusive) timestamp
       in: query
-      schema: *ref_118
+      schema: *ref_127
     StartedBefore:
       name: started_before
       description: filter on started before (inclusive) timestamp
       in: query
-      schema: *ref_66
+      schema: *ref_72
     StartedAfter:
       name: started_after
       description: filter on started after (exclusive) timestamp
       in: query
-      schema: *ref_67
+      schema: *ref_73
     Before:
       name: before
       description: filter on started before (inclusive) timestamp
       in: query
-      schema: *ref_109
+      schema: *ref_118
     CreatedOrStartedAfter:
       name: created_or_started_after
       description: >-
         filter on created_at for non non started job and started_at otherwise
         after (exclusive) timestamp
       in: query
-      schema: *ref_112
+      schema: *ref_121
     CreatedOrStartedAfterCompletedJob:
       name: created_or_started_after_completed_jobs
       description: >-
         filter on created_at for non non started job and started_at otherwise
         after (exclusive) timestamp but only for the completed jobs
       in: query
-      schema: *ref_113
+      schema: *ref_122
     CreatedOrStartedBefore:
       name: created_or_started_before
       description: >-
         filter on created_at for non non started job and started_at otherwise
         before (inclusive) timestamp
       in: query
-      schema: *ref_111
+      schema: *ref_120
     Success:
       name: success
       description: filter on successful jobs
       in: query
-      schema: *ref_68
+      schema: *ref_74
     ScheduledForBeforeNow:
       name: scheduled_for_before_now
       description: filter on jobs scheduled_for before now (hence waitinf for a worker)
       in: query
-      schema: *ref_69
+      schema: *ref_75
     Suspended:
       name: suspended
       description: filter on suspended jobs
       in: query
-      schema: *ref_71
+      schema: *ref_77
     Running:
       name: running
       description: filter on running jobs
       in: query
-      schema: *ref_72
+      schema: *ref_78
     ArgsFilter:
       name: args
       description: filter on jobs containing those args as a json subset (@> in postgres)
       in: query
-      schema: *ref_73
+      schema: *ref_79
     Tag:
       name: tag
       description: filter on jobs with a given tag/worker group
       in: query
-      schema: *ref_75
+      schema: *ref_81
     ResultFilter:
       name: result
       description: filter on jobs containing those result as a json subset (@> in postgres)
       in: query
-      schema: *ref_74
+      schema: *ref_80
     After:
       name: after
       description: filter on created after (exclusive) timestamp
       in: query
-      schema: *ref_110
+      schema: *ref_119
     Username:
       name: username
       description: filter on exact username of user
       in: query
-      schema: *ref_119
+      schema: *ref_128
     Operation:
       name: operation
       description: filter on exact or prefix name of operation
       in: query
-      schema: *ref_120
+      schema: *ref_129
     ResourceName:
       name: resource
       description: filter on exact or prefix name of resource
       in: query
-      schema: *ref_121
+      schema: *ref_130
     ActionKind:
       name: action_kind
       description: filter on type of operation
       in: query
-      schema: *ref_122
+      schema: *ref_131
     JobKinds:
       name: job_kinds
       description: >-
         filter on job kind (values 'preview', 'script', 'dependencies', 'flow')
         separated by,
       in: query
-      schema: *ref_70
+      schema: *ref_76
     RunnableId:
       name: runnable_id
       in: query
-      schema: *ref_101
+      schema: *ref_110
     RunnableTypeQuery:
       name: runnable_type
       in: query
-      schema: *ref_102
+      schema: *ref_111
     InputId:
       name: input
       in: path
       required: true
-      schema: *ref_123
+      schema: *ref_132
     GetStarted:
       name: get_started
       in: query
-      schema: *ref_124
+      schema: *ref_133
     ConcurrencyId:
       name: concurrency_id
       in: path
       required: true
-      schema: *ref_125
+      schema: *ref_134
   schemas:
     Script:
       type: object
@@ -14008,83 +14702,83 @@ components:
       properties: *ref_40
       required: *ref_41
     NewScriptWithDraft:
-      allOf: *ref_126
+      allOf: *ref_135
     ScriptHistory:
       type: object
-      properties: *ref_127
-      required: *ref_128
+      properties: *ref_42
+      required: *ref_43
     ScriptArgs:
       type: object
       additionalProperties: *ref_16
     Input:
       type: object
-      properties: *ref_103
-      required: *ref_104
+      properties: *ref_112
+      required: *ref_113
     CreateInput:
       type: object
-      properties: *ref_129
-      required: *ref_130
+      properties: *ref_136
+      required: *ref_137
     UpdateInput:
       type: object
-      properties: *ref_131
-      required: *ref_132
+      properties: *ref_138
+      required: *ref_139
     RunnableType:
       type: string
-      enum: *ref_133
+      enum: *ref_140
     QueuedJob:
       type: object
-      properties: *ref_81
-      required: *ref_82
+      properties: *ref_87
+      required: *ref_88
     CompletedJob:
       type: object
-      properties: *ref_79
-      required: *ref_80
+      properties: *ref_85
+      required: *ref_86
     ObscuredJob:
       type: object
-      properties: *ref_134
+      properties: *ref_141
     Job:
-      oneOf: *ref_84
-      discriminator: *ref_85
+      oneOf: *ref_90
+      discriminator: *ref_91
     User:
       type: object
       properties: *ref_10
       required: *ref_11
     UserUsage:
       type: object
-      properties: *ref_135
+      properties: *ref_142
     Login:
       type: object
-      properties: *ref_136
-      required: *ref_137
+      properties: *ref_143
+      required: *ref_144
     EditWorkspaceUser:
       type: object
-      properties: *ref_138
+      properties: *ref_145
     TruncatedToken:
       type: object
       properties: *ref_38
       required: *ref_39
     NewToken:
       type: object
-      properties: *ref_139
+      properties: *ref_146
     NewTokenImpersonate:
       type: object
-      properties: *ref_140
-      required: *ref_141
+      properties: *ref_147
+      required: *ref_148
     ListableVariable:
       type: object
       properties: *ref_22
       required: *ref_23
     ContextualVariable:
       type: object
-      properties: *ref_142
-      required: *ref_143
+      properties: *ref_149
+      required: *ref_150
     CreateVariable:
       type: object
-      properties: *ref_144
-      required: *ref_145
+      properties: *ref_151
+      required: *ref_152
     EditVariable:
       type: object
-      properties: *ref_146
+      properties: *ref_153
     AuditLog:
       type: object
       properties: *ref_1
@@ -14216,93 +14910,107 @@ components:
         - has_preprocessor
     Preview:
       type: object
-      properties: *ref_147
-      required: *ref_148
+      properties: *ref_154
+      required: *ref_155
     WorkflowTask:
-      type: object
-      properties: *ref_149
-      required: *ref_150
-    WorkflowStatusRecord:
-      type: object
-      additionalProperties: *ref_151
-    WorkflowStatus:
-      type: object
-      properties: *ref_152
-    CreateResource:
-      type: object
-      properties: *ref_153
-      required: *ref_154
-    EditResource:
-      type: object
-      properties: *ref_155
-    Resource:
       type: object
       properties: *ref_156
       required: *ref_157
+    WorkflowStatusRecord:
+      type: object
+      additionalProperties: *ref_158
+    WorkflowStatus:
+      type: object
+      properties: *ref_159
+    CreateResource:
+      type: object
+      properties: *ref_160
+      required: *ref_161
+    EditResource:
+      type: object
+      properties: *ref_162
+    Resource:
+      type: object
+      properties: *ref_163
+      required: *ref_164
     ListableResource:
       type: object
-      properties: *ref_158
-      required: *ref_159
+      properties: *ref_165
+      required: *ref_166
     ResourceType:
       type: object
       properties: *ref_26
       required: *ref_27
     EditResourceType:
       type: object
-      properties: *ref_160
+      properties: *ref_167
     Schedule:
       type: object
-      properties: *ref_88
-      required: *ref_89
+      properties: *ref_94
+      required: *ref_95
     ScheduleWJobs:
-      allOf: *ref_161
+      allOf: *ref_168
     NewSchedule:
       type: object
-      properties: *ref_162
-      required: *ref_163
+      properties: *ref_169
+      required: *ref_170
     EditSchedule:
       type: object
-      properties: *ref_164
-      required: *ref_165
+      properties: *ref_171
+      required: *ref_172
     HttpTrigger:
       type: object
-      properties: *ref_90
-      required: *ref_91
+      properties: *ref_96
+      required: *ref_97
     NewHttpTrigger:
       type: object
-      properties: *ref_166
-      required: *ref_167
+      properties: *ref_173
+      required: *ref_174
     EditHttpTrigger:
       type: object
-      properties: *ref_168
-      required: *ref_169
+      properties: *ref_175
+      required: *ref_176
     TriggersCount:
       type: object
-      properties: *ref_53
-    Group:
-      type: object
-      properties: *ref_97
-      required: *ref_98
-    InstanceGroup:
-      type: object
-      properties: *ref_93
-      required: *ref_94
-    Folder:
+      properties: *ref_57
+    WebsocketTrigger:
       type: object
       properties: *ref_99
       required: *ref_100
+    NewWebsocketTrigger:
+      type: object
+      properties: *ref_177
+      required: *ref_178
+    EditWebsocketTrigger:
+      type: object
+      properties: *ref_179
+      required: *ref_180
+    WebsocketTriggerInitialMessage:
+      anyOf: *ref_98
+    Group:
+      type: object
+      properties: *ref_106
+      required: *ref_107
+    InstanceGroup:
+      type: object
+      properties: *ref_102
+      required: *ref_103
+    Folder:
+      type: object
+      properties: *ref_108
+      required: *ref_109
     WorkerPing:
       type: object
-      properties: *ref_170
-      required: *ref_171
+      properties: *ref_181
+      required: *ref_182
     UserWorkspaceList:
       type: object
-      properties: *ref_172
-      required: *ref_173
+      properties: *ref_183
+      required: *ref_184
     CreateWorkspace:
       type: object
-      properties: *ref_174
-      required: *ref_175
+      properties: *ref_185
+      required: *ref_186
     Workspace:
       type: object
       properties: *ref_7
@@ -14316,48 +15024,48 @@ components:
       properties: *ref_12
       required: *ref_13
     Flow:
-      allOf: *ref_52
+      allOf: *ref_56
     ExtraPerms:
       type: object
-      additionalProperties: *ref_176
+      additionalProperties: *ref_187
     FlowMetadata:
       type: object
-      properties: *ref_177
-      required: *ref_178
+      properties: *ref_188
+      required: *ref_189
     OpenFlowWPath:
-      allOf: *ref_54
+      allOf: *ref_58
     FlowPreview:
       type: object
-      properties: *ref_179
-      required: *ref_180
+      properties: *ref_190
+      required: *ref_191
     RestartedFrom:
       type: object
-      properties: *ref_181
+      properties: *ref_192
     Policy:
       type: object
-      properties: *ref_55
+      properties: *ref_59
     ListableApp:
       type: object
-      properties: *ref_182
-      required: *ref_183
+      properties: *ref_193
+      required: *ref_194
     ListableRawApp:
       type: object
-      properties: *ref_184
-      required: *ref_185
+      properties: *ref_195
+      required: *ref_196
     AppWithLastVersion:
       type: object
-      properties: *ref_56
-      required: *ref_57
+      properties: *ref_60
+      required: *ref_61
     AppWithLastVersionWDraft:
-      allOf: *ref_186
+      allOf: *ref_197
     AppHistory:
       type: object
-      properties: *ref_187
-      required: *ref_188
+      properties: *ref_62
+      required: *ref_63
     FlowVersion:
       type: object
-      properties: *ref_189
-      required: *ref_190
+      properties: *ref_54
+      required: *ref_55
     SlackToken:
       type: object
       properties:
@@ -14379,33 +15087,33 @@ components:
         - bot
     TokenResponse:
       type: object
-      properties: *ref_191
-      required: *ref_192
+      properties: *ref_198
+      required: *ref_199
     HubScriptKind:
       name: kind
       schema: *ref_34
     PolarsClientKwargs:
       type: object
-      properties: *ref_107
-      required: *ref_108
+      properties: *ref_116
+      required: *ref_117
     LargeFileStorage:
       type: object
       properties: *ref_17
     WindmillLargeFile:
       type: object
-      properties: *ref_193
-      required: *ref_194
+      properties: *ref_200
+      required: *ref_201
     WindmillFileMetadata:
       type: object
-      properties: *ref_195
+      properties: *ref_202
     WindmillFilePreview:
       type: object
-      properties: *ref_196
-      required: *ref_197
+      properties: *ref_203
+      required: *ref_204
     S3Resource:
       type: object
-      properties: *ref_105
-      required: *ref_106
+      properties: *ref_114
+      required: *ref_115
     WorkspaceGitSyncSettings:
       type: object
       properties: *ref_18
@@ -14417,8 +15125,8 @@ components:
       properties: *ref_20
     GitRepositorySettings:
       type: object
-      properties: *ref_198
-      required: *ref_199
+      properties: *ref_205
+      required: *ref_206
     UploadFilePart:
       type: object
       properties:
@@ -14431,117 +15139,126 @@ components:
         - tag
     MetricMetadata:
       type: object
-      properties: *ref_200
-      required: *ref_201
+      properties: *ref_207
+      required: *ref_208
     ScalarMetric:
       type: object
-      properties: *ref_202
-      required: *ref_203
+      properties: *ref_209
+      required: *ref_210
     TimeseriesMetric:
       type: object
-      properties: *ref_204
-      required: *ref_205
+      properties: *ref_211
+      required: *ref_212
     MetricDataPoint:
       type: object
-      properties: *ref_206
-      required: *ref_207
+      properties: *ref_213
+      required: *ref_214
     RawScriptForDependencies:
       type: object
-      properties: *ref_208
-      required: *ref_209
+      properties: *ref_215
+      required: *ref_216
     ConcurrencyGroup:
       type: object
-      properties: *ref_210
-      required: *ref_211
+      properties: *ref_217
+      required: *ref_218
     ExtendedJobs:
       type: object
-      properties: *ref_212
-      required: *ref_213
+      properties: *ref_219
+      required: *ref_220
     ExportedUser:
       type: object
       properties: *ref_3
       required: *ref_4
     GlobalSetting:
-      type: object
-      properties: *ref_214
-      required: *ref_215
-    Config:
-      type: object
-      properties: *ref_216
-      required: *ref_217
-    ExportedInstanceGroup:
-      type: object
-      properties: *ref_95
-      required: *ref_96
-    JobSearchHit:
-      type: object
-      properties: *ref_218
-    StaticTransform:
-      type: object
-      properties: *ref_219
-      required: *ref_220
-    JavascriptTransform:
       type: object
       properties: *ref_221
       required: *ref_222
+    Config:
+      type: object
+      properties: *ref_223
+      required: *ref_224
+    ExportedInstanceGroup:
+      type: object
+      properties: *ref_104
+      required: *ref_105
+    JobSearchHit:
+      type: object
+      properties: *ref_225
+    LogSearchHit:
+      type: object
+      properties: *ref_226
+    AutoscalingEvent:
+      type: object
+      properties: *ref_227
+    CriticalAlert:
+      type: object
+      properties: *ref_228
+    StaticTransform:
+      type: object
+      properties: *ref_229
+      required: *ref_230
+    JavascriptTransform:
+      type: object
+      properties: *ref_231
+      required: *ref_232
     InputTransform:
       oneOf: *ref_29
       discriminator: *ref_30
     RawScript:
       type: object
-      properties: *ref_223
-      required: *ref_224
+      properties: *ref_233
+      required: *ref_234
     PathScript:
       type: object
-      properties: *ref_225
-      required: *ref_226
+      properties: *ref_235
+      required: *ref_236
     PathFlow:
       type: object
-      properties: *ref_227
-      required: *ref_228
+      properties: *ref_237
+      required: *ref_238
     FlowModule:
       type: object
       properties: *ref_31
       required: *ref_32
     ForloopFlow:
       type: object
-      properties: *ref_229
-      required: *ref_230
+      properties: *ref_239
+      required: *ref_240
     WhileloopFlow:
       type: object
-      properties: *ref_231
-      required: *ref_232
+      properties: *ref_241
+      required: *ref_242
     BranchOne:
       type: object
-      properties: *ref_233
-      required: *ref_234
+      properties: *ref_243
+      required: *ref_244
     BranchAll:
       type: object
-      properties: *ref_235
-      required: *ref_236
+      properties: *ref_245
+      required: *ref_246
     Identity:
       type: object
-      properties: *ref_237
-      required: *ref_238
+      properties: *ref_247
+      required: *ref_248
     FlowModuleValue:
-      oneOf: *ref_239
-      discriminator: *ref_240
+      oneOf: *ref_249
+      discriminator: *ref_250
     Retry:
       type: object
-      properties: *ref_87
+      properties: *ref_93
     FlowValue:
       type: object
-      properties: *ref_58
-      required: *ref_59
+      properties: *ref_64
+      required: *ref_65
     OpenFlow:
       type: object
-      properties: *ref_50
-      required: *ref_51
+      properties: *ref_52
+      required: *ref_53
     FlowStatusModule:
       type: object
-      properties: *ref_60
-      required: *ref_61
+      properties: *ref_66
+      required: *ref_67
     FlowStatus:
       type: object
-      properties: *ref_76
-      required: *ref_77
+      properties: *ref_82
+      required: *ref_83
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 5b274610bd..964df7ee5f 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -773,6 +773,78 @@ paths:
               schema:
                 type: string
 
+  /settings/critical_alerts:
+    get:
+      summary: Get all critical alerts
+      operationId: getCriticalAlerts
+      tags:
+        - setting
+      parameters:
+        - in: query
+          name: page
+          schema:
+            type: integer
+            default: 1
+            description: The page number to retrieve (minimum value is 1)
+        - in: query
+          name: page_size
+          schema:
+            type: integer
+            default: 10
+            maximum: 100
+            description: Number of alerts per page (maximum is 100)
+        - in: query
+          name: acknowledged
+          schema:
+            type: boolean
+            nullable: true
+            description: Filter by acknowledgment status; true for acknowledged, false for unacknowledged, and omit for all alerts
+      responses:
+        "200":
+          description: Successfully retrieved all critical alerts
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/CriticalAlert'
+
+  /settings/critical_alerts/{id}/acknowledge:
+    post:
+      summary: Acknowledge a critical alert
+      operationId: acknowledgeCriticalAlert
+      tags:
+        - setting
+      parameters:
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: integer
+          description: The ID of the critical alert to acknowledge
+      responses:
+        "200":
+          description: Successfully acknowledged the critical alert
+          content:
+            application/json:
+              schema:
+                type: string
+                example: "Critical alert acknowledged"
+
+  /settings/critical_alerts/acknowledge_all:
+    post:
+      summary: Acknowledge all unacknowledged critical alerts
+      operationId: acknowledgeAllCriticalAlerts
+      tags:
+        - setting
+      responses:
+        "200":
+          description: Successfully acknowledged all unacknowledged critical alerts.
+          content:
+            application/json:
+              schema:
+                type: string
+                example: "All unacknowledged critical alerts acknowledged"
 
   /settings/test_license_key:
     post:
@@ -12721,3 +12793,23 @@ components:
           type: string
           format: date-time
 
+    CriticalAlert:
+      type: object
+      properties:
+        id:
+          type: integer
+          description: Unique identifier for the alert
+        alert_type:
+          type: string
+          description: Type of alert (e.g., critical_error)
+        message:
+          type: string
+          description: The message content of the alert
+        created_at:
+          type: string
+          format: date-time
+          description: Time when the alert was created
+        acknowledged:
+          type: boolean
+          nullable: true
+          description: Acknowledgment status of the alert, can be true, false, or null if not set
diff --git a/backend/windmill-api/src/settings.rs b/backend/windmill-api/src/settings.rs
index 0299145a38..5dc46e4382 100644
--- a/backend/windmill-api/src/settings.rs
+++ b/backend/windmill-api/src/settings.rs
@@ -58,7 +58,10 @@ pub fn global_service() -> Router {
         )
         .route("/renew_license_key", post(renew_license_key))
         .route("/customer_portal", post(create_customer_portal_session))
-        .route("/test_critical_channels", post(test_critical_channels));
+        .route("/test_critical_channels", post(test_critical_channels))
+        .route("/critical_alerts", get(get_critical_alerts))
+        .route("/critical_alerts/:id/acknowledge", post(acknowledge_critical_alert))
+        .route("/critical_alerts/acknowledge_all", post(acknowledge_all_critical_alerts));
 
     #[cfg(feature = "parquet")]
     {
@@ -430,3 +433,117 @@ pub async fn test_critical_channels(
 pub async fn test_critical_channels() -> Result<String> {
     Ok("Critical channels require EE".to_string())
 }
+
+use serde::Serialize;
+
+#[derive(Serialize)]
+pub struct CriticalAlert {
+    id: i32,
+    alert_type: String,
+    message: String,
+    created_at: chrono::DateTime<chrono::Utc>,
+    acknowledged: Option<bool>,
+}
+
+#[cfg(feature = "enterprise")]
+#[derive(Deserialize)]
+pub struct AlertQueryParams {
+    pub page: Option<i32>,
+    pub page_size: Option<i32>,
+    pub acknowledged: Option<bool>,
+}
+
+#[cfg(feature = "enterprise")]
+pub async fn get_critical_alerts(
+    Extension(db): Extension<DB>,
+    authed: ApiAuthed,
+    Query(params): Query<AlertQueryParams>,
+) -> JsonResult<Vec<CriticalAlert>> {
+    require_super_admin(&db, &authed.email).await?;
+
+    // Default pagination values if not provided
+    let page = params.page.unwrap_or(1).max(1);
+    let page_size = params.page_size.unwrap_or(10).min(100) as i64;
+    let offset = ((page - 1) * page_size as i32) as i64;
+
+    let alerts = if let Some(acknowledged) = params.acknowledged {
+        sqlx::query_as!(
+            CriticalAlert,
+            "SELECT id, alert_type, message, created_at, acknowledged 
+             FROM alerts 
+             WHERE acknowledged = $1
+             ORDER BY created_at DESC 
+             LIMIT $2 OFFSET $3",
+            acknowledged,
+            page_size,
+            offset
+        )
+        .fetch_all(&db)
+        .await?
+    } else {
+        sqlx::query_as!(
+            CriticalAlert,
+            "SELECT id, alert_type, message, created_at, acknowledged 
+             FROM alerts 
+             ORDER BY created_at DESC 
+             LIMIT $1 OFFSET $2",
+            page_size,
+            offset
+        )
+        .fetch_all(&db)
+        .await?
+    };
+
+    Ok(Json(alerts))
+}
+
+#[cfg(not(feature = "enterprise"))]
+pub async fn get_critical_alerts() -> error::Error {
+    error::Error::NotFound("Critical Alerts require EE".to_string())
+}
+
+#[cfg(feature = "enterprise")]
+pub async fn acknowledge_critical_alert(
+    Extension(db): Extension<DB>,
+    authed: ApiAuthed,
+    Path(id): Path<i32>,
+) -> error::Result<String> {
+    require_super_admin(&db, &authed.email).await?;
+    
+    sqlx::query!(
+        "UPDATE alerts SET acknowledged = true WHERE id = $1",
+        id
+    )
+    .execute(&db)
+    .await?;
+    
+    tracing::info!("Acknowledged critical alert with id: {}", id);
+    Ok("Critical alert acknowledged".to_string())
+}
+
+#[cfg(not(feature = "enterprise"))]
+pub async fn acknowledge_critical_alert() -> error::Error {
+    error::Error::NotFound("Critical Alerts require EE".to_string())
+}
+
+#[cfg(feature = "enterprise")]
+pub async fn acknowledge_all_critical_alerts(
+    Extension(db): Extension<DB>,
+    authed: ApiAuthed,
+) -> error::Result<String> {
+    require_super_admin(&db, &authed.email).await?;
+
+    sqlx::query!(
+        "UPDATE alerts SET acknowledged = true WHERE acknowledged = false"
+    )
+    .execute(&db)
+    .await?;
+
+    tracing::info!("Acknowledged all unacknowledged critical alerts");
+    Ok("All unacknowledged critical alerts acknowledged".to_string())
+}
+
+#[cfg(not(feature = "enterprise"))]
+pub async fn acknowledge_all_critical_alerts() -> error::Error {
+    error::Error::NotFound("Critical Alerts require EE".to_string())
+}
diff --git a/backend/windmill-common/src/global_settings.rs b/backend/windmill-common/src/global_settings.rs
index b0420ca248..a48db22b1f 100644
--- a/backend/windmill-common/src/global_settings.rs
+++ b/backend/windmill-common/src/global_settings.rs
@@ -29,6 +29,7 @@ pub const AUTOMATE_USERNAME_CREATION_SETTING: &str = "automate_username_creation
 pub const HUB_BASE_URL_SETTING: &str = "hub_base_url";
 pub const HUB_ACCESSIBLE_URL_SETTING: &str = "hub_accessible_url";
 pub const CRITICAL_ERROR_CHANNELS_SETTING: &str = "critical_error_channels";
+pub const CRITICAL_ALERT_MUTE_UI_SETTING: &str = "critical_alert_mute_ui";
 pub const DEV_INSTANCE_SETTING: &str = "dev_instance";
 pub const JWT_SECRET_SETTING: &str = "jwt_secret";
 pub const EMAIL_DOMAIN_SETTING: &str = "email_domain";
diff --git a/backend/windmill-common/src/lib.rs b/backend/windmill-common/src/lib.rs
index ad96594ac8..8eb57cb236 100644
--- a/backend/windmill-common/src/lib.rs
+++ b/backend/windmill-common/src/lib.rs
@@ -86,6 +86,8 @@ lazy_static::lazy_static! {
     pub static ref METRICS_ENABLED: AtomicBool = AtomicBool::new(std::env::var("METRICS_PORT").is_ok() || std::env::var("METRICS_ADDR").is_ok());
     pub static ref METRICS_DEBUG_ENABLED: AtomicBool = AtomicBool::new(false);
 
+    pub static ref CRITICAL_ALERT_MUTE_UI_ENABLED: AtomicBool = AtomicBool::new(false);
+
     pub static ref BASE_URL: Arc<RwLock<String>> = Arc::new(RwLock::new("".to_string()));
     pub static ref IS_READY: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
 
diff --git a/backend/windmill-common/src/utils.rs b/backend/windmill-common/src/utils.rs
index 04f95a3406..18c0c93205 100644
--- a/backend/windmill-common/src/utils.rs
+++ b/backend/windmill-common/src/utils.rs
@@ -28,6 +28,9 @@ pub const DEFAULT_PER_PAGE: usize = 1000;
 pub const GIT_VERSION: &str =
     git_version!(args = ["--tag", "--always"], fallback = "unknown-version");
 
+use std::sync::atomic::Ordering;
+use crate::CRITICAL_ALERT_MUTE_UI_ENABLED;
+
 lazy_static::lazy_static! {
     pub static ref HTTP_CLIENT: Client = reqwest::ClientBuilder::new()
         .user_agent("windmill/beta")
@@ -244,9 +247,12 @@ pub fn generate_lock_id(database_name: &str) -> i64 {
 pub async fn report_critical_error(error_message: String, _db: DB) -> () {
     tracing::error!("CRITICAL ERROR: {error_message}");
 
+    let mute = CRITICAL_ALERT_MUTE_UI_ENABLED.load(Ordering::Relaxed);
+
     if let Err(err) = sqlx::query!(
-        "INSERT INTO alerts (alert_type, message) VALUES ('critical_error', $1)",
-        error_message
+        "INSERT INTO alerts (alert_type, message, acknowledged) VALUES ('critical_error', $1, $2)",
+        error_message,
+        mute
     )
     .execute(&_db)
     .await
@@ -261,9 +267,12 @@ pub async fn report_critical_error(error_message: String, _db: DB) -> () {
 pub async fn report_recovered_critical_error(message: String, _db: DB) -> () {
     tracing::info!("RECOVERED CRITICAL ERROR: {message}");
 
+    let mute = CRITICAL_ALERT_MUTE_UI_ENABLED.load(Ordering::Relaxed);
+
     if let Err(err) = sqlx::query!(
-        "INSERT INTO alerts (alert_type, message) VALUES ('recovered_critical_error', $1)",
-        message
+        "INSERT INTO alerts (alert_type, message, acknowledged) VALUES ('recovered_critical_error', $1, $2)",
+        message,
+        mute
     )
     .execute(&_db)
     .await
diff --git a/frontend/src/lib/components/SuperadminSettings.svelte b/frontend/src/lib/components/SuperadminSettings.svelte
index 1e81ace411..1670a51086 100644
--- a/frontend/src/lib/components/SuperadminSettings.svelte
+++ b/frontend/src/lib/components/SuperadminSettings.svelte
@@ -23,6 +23,7 @@
 	import { isCloudHosted } from '$lib/cloud'
 	import InstanceNameEditor from './InstanceNameEditor.svelte'
 	import Toggle from './Toggle.svelte'
+	import { instanceSettingsSelectedTab } from '$lib/stores';
 	let drawer: Drawer
 	let filter = ''
 
@@ -56,6 +57,9 @@
 
 	let tab: 'users' | string = 'users'
 
+	$: $instanceSettingsSelectedTab, tab = $instanceSettingsSelectedTab
+	$: tab, instanceSettingsSelectedTab.set(tab)
+
 	let nbDisplayed = 50
 
 	let instanceSettings
diff --git a/frontend/src/lib/components/instanceSettings.ts b/frontend/src/lib/components/instanceSettings.ts
index 016b5eef78..bd998970e7 100644
--- a/frontend/src/lib/components/instanceSettings.ts
+++ b/frontend/src/lib/components/instanceSettings.ts
@@ -146,6 +146,15 @@ export const settings: Record<string, Setting[]> = {
 			storage: 'setting',
 			ee_only: 'Channels other than tracing are only available in the EE version'
 		},
+		{
+			label: 'Mute critical alerts in UI',
+			description: 'Enable to mute critical alerts in the UI',
+			key: 'critical_alert_mute_ui',
+			fieldType: 'boolean',
+			storage: 'setting',
+			requiresReloadOnChange: true,
+			ee_only: 'Critical alerts in UI are only available in the EE version'
+		},
 		{
 			label: 'Azure OpenAI base path',
 			description:
diff --git a/frontend/src/lib/components/sidebar/CriticalAlertButton.svelte b/frontend/src/lib/components/sidebar/CriticalAlertButton.svelte
new file mode 100644
index 0000000000..9c6d3db68d
--- /dev/null
+++ b/frontend/src/lib/components/sidebar/CriticalAlertButton.svelte
@@ -0,0 +1,64 @@
+<script lang="ts">
+	import { twMerge } from 'tailwind-merge'
+	import Popover from '../Popover.svelte'
+	import { createEventDispatcher } from 'svelte'
+
+	export let label: string | undefined = undefined
+	export let numUnacknowledgedCriticalAlerts: number
+	export let isCollapsed: boolean
+	export let disabled: boolean = false
+	export let lightMode: boolean = false
+	export let stopPropagationOnClick: boolean = false
+	export let shortcut: string = ''
+
+	let dispatch = createEventDispatcher()
+</script>
+
+{#if !disabled}
+	<Popover appearTimeout={0} disappearTimeout={0} class="w-full" disablePopup={!isCollapsed}>
+		<div class="py-1.5 px-1 border-t border-gray-700">
+		<button
+			on:click={(e) => {
+				if (stopPropagationOnClick) e.preventDefault()
+				dispatch('click')
+			}}
+			class={twMerge(
+				'group flex items-center px-2 py-2 font-light rounded-md h-8 gap-3 w-full',
+				lightMode
+					? 'text-primary hover:bg-surface-hover '
+					: '  hover:bg-[#2A3648] text-primary-inverse dark:text-primary',
+				'transition-all',
+				$$props.class
+			)}
+			title={label}
+		>
+			<span
+				class="flex items-center justify-center h-6 w-6 rounded-lg bg-red-600 text-white font-bold text-xs"
+			>
+				{numUnacknowledgedCriticalAlerts > 9 ? '9+' : numUnacknowledgedCriticalAlerts}
+			</span>
+
+			{#if !isCollapsed && label}
+				<span
+					class={twMerge(
+						'whitespace-pre truncate',
+						lightMode ? 'text-primary' : 'text-primary-inverse  dark:text-primary',
+						'transition-all',
+						$$props.class
+					)}
+				>
+					{label}
+					<span class="pl-2 text-xs dark:text-secondary light:text-secondary-inverse font-semibold">
+						{shortcut}
+					</span>
+				</span>
+			{/if}
+		</button>
+	</div>
+		<svelte:fragment slot="text">
+			{#if label}
+				{label}
+			{/if}
+		</svelte:fragment>
+	</Popover>
+{/if}
diff --git a/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte b/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte
new file mode 100644
index 0000000000..9e306ea917
--- /dev/null
+++ b/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte
@@ -0,0 +1,69 @@
+<script lang="ts">
+	import { onMount, onDestroy } from 'svelte'
+	import CriticalAlertModalInner from './CriticalAlertModalInner.svelte'
+	import { SettingService } from '$lib/gen'
+	import { sendUserToast } from '$lib/toast'
+
+	export let open: boolean = false
+	export let numUnacknowledgedCriticalAlerts: number = 0
+
+	let checkForNewAlertsInterval: ReturnType<typeof setInterval>
+	let checkingForNewAlerts = false
+
+	onMount(() => {
+		updateHasUnacknowledgedCriticalAlerts(true)
+		checkForNewAlertsInterval = setInterval(() => {
+			updateHasUnacknowledgedCriticalAlerts(true)
+		}, 15000)
+	})
+
+	onDestroy(() => {
+		clearInterval(checkForNewAlertsInterval)
+	})
+
+	async function updateHasUnacknowledgedCriticalAlerts(sendToast: boolean = false) {
+		if (checkingForNewAlerts) return
+		checkingForNewAlerts = true
+
+		try {
+			const unacknowledged = await SettingService.getCriticalAlerts({
+				page: 1,
+				pageSize: 10,
+				acknowledged: false
+			})
+
+			if (numUnacknowledgedCriticalAlerts === 0 && unacknowledged.length > 0 && sendToast) {
+				sendUserToast(
+					'Critical Alert:',
+					true,
+					[
+						{
+							label: 'View',
+							callback: () => {
+								open = true
+							}
+						},
+						{
+							label: 'Acknowledge',
+							callback: () => {
+								if (unacknowledged[0].id) acknowledgeAlert(unacknowledged[0].id)
+							}
+						}
+					],
+					unacknowledged[0].message,
+					10000
+				)
+			}
+			numUnacknowledgedCriticalAlerts = unacknowledged.length
+		} finally {
+			checkingForNewAlerts = false
+		}
+	}
+
+	async function acknowledgeAlert(id: number) {
+		await SettingService.acknowledgeCriticalAlert({ id })
+		updateHasUnacknowledgedCriticalAlerts()
+	}
+</script>
+
+<CriticalAlertModalInner bind:open {updateHasUnacknowledgedCriticalAlerts} />
diff --git a/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte b/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte
new file mode 100644
index 0000000000..f1b6208962
--- /dev/null
+++ b/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte
@@ -0,0 +1,213 @@
+<script lang="ts">
+	import Modal from '../common/modal/Modal.svelte'
+	import Button from '../common/button/Button.svelte'
+	import Toggle from '$lib/components/Toggle.svelte'
+	import { SettingService } from '$lib/gen'
+	import { CheckCircle2, AlertCircle, RefreshCw, CheckSquare2, AlertTriangle } from 'lucide-svelte'
+	import type { CriticalAlert } from '$lib/gen'
+	import { onMount, beforeUpdate } from 'svelte'
+	import { instanceSettingsSelectedTab } from '$lib/stores'
+	import { goto } from '$app/navigation'
+
+	export let open: boolean = false
+	export let updateHasUnacknowledgedCriticalAlerts: () => void = () => {}
+
+	let alerts: CriticalAlert[] = []
+
+	let isRefreshing = false
+	let previousOpen = open
+	let hasCriticalAlertChannels = false
+
+	$: loading = isRefreshing
+
+	onMount(() => {
+		if (open) refreshAlerts()
+	})
+
+	beforeUpdate(() => {
+		if (open && !previousOpen) {
+			refreshAlerts()
+		}
+		previousOpen = open
+	})
+
+	// Pagination
+	let page = 1
+	let pageSize = 10
+	let hasMore = true
+
+	let hideAcknowledged = false
+
+	async function acknowledgeAll() {
+		await SettingService.acknowledgeAllCriticalAlerts()
+		getAlerts(false)
+	}
+
+	async function fetchAlerts(pageNumber: number) {
+		isRefreshing = true
+		try {
+			const newAlerts = await SettingService.getCriticalAlerts({
+				page: pageNumber,
+				pageSize: pageSize,
+				acknowledged: hideAcknowledged ? false : undefined
+			})
+
+			alerts = newAlerts
+			hasMore = newAlerts.length === pageSize
+			page = pageNumber
+			updateHasUnacknowledgedCriticalAlerts()
+		} finally {
+			setTimeout(() => {
+				isRefreshing = false
+			}, 500)
+		}
+	}
+
+	async function getAlerts(reset?: boolean) {
+		if (reset) page = 1
+		await fetchAlerts(page)
+	}
+
+	async function checkCriticalAlertChannels() {
+		const channels = (await SettingService.getGlobal({ key: 'critical_error_channels' })) as any[]
+		hasCriticalAlertChannels = channels && channels.length > 0
+	}
+
+	async function acknowledgeAlert(id: number) {
+		await SettingService.acknowledgeCriticalAlert({ id })
+		getAlerts(false)
+	}
+
+	function formatDate(dateString: string | undefined): string {
+		if (!dateString) return ''
+		const date = new Date(dateString)
+		return new Intl.DateTimeFormat('en-US', {
+			year: 'numeric',
+			month: 'short',
+			day: 'numeric',
+			hour: '2-digit',
+			minute: '2-digit',
+			second: '2-digit'
+		}).format(date)
+	}
+
+	async function refreshAlerts() {
+		checkCriticalAlertChannels()
+		await getAlerts(true)
+	}
+
+	function goToPreviousPage() {
+		if (page > 1) {
+			fetchAlerts(page - 1)
+		}
+	}
+
+	function goToNextPage() {
+		if (hasMore) {
+			fetchAlerts(page + 1)
+		}
+	}
+
+	function goToCoreTab() {
+		goto('/#superadmin-settings')
+		instanceSettingsSelectedTab.set('Core')
+	}
+</script>
+
+<Modal bind:open title="Critical Alerts" cancelText="Close" style="max-width: 66%;">
+	{#if !hasCriticalAlertChannels}
+		<div class="flex flex-row pb-4">
+			<AlertTriangle color="orange" class="w-6 h-6 mr-2" />
+			<p>
+				No critical alert channels are set up. Go to the
+				<a href="/#superadmin-settings" on:click|preventDefault={goToCoreTab}>Instance Settings</a>
+				page to configure critical alert channels.
+			</p>
+		</div>
+	{/if}
+	<!-- Row of action buttons above the table -->
+	<div class="flex justify-between items-center mb-4">
+		<div class="flex space-x-2">
+			<Button color="green" startIcon={{ icon: CheckSquare2 }} size="sm" on:click={acknowledgeAll}
+				>Acknowledge All</Button
+			>
+		</div>
+
+		<button class="p-2 rounded-full hover:bg-gray-200" on:click={refreshAlerts} disabled={loading}>
+			<RefreshCw class={loading ? 'animate-spin ' : ''} size="20" />
+		</button>
+	</div>
+
+	<!-- Pagination controls above the table -->
+	<div class="flex justify-between items-center mb-2">
+		<div class="flex items-center space-x-4">
+			<Button size="xs2" on:click={goToPreviousPage} disabled={page <= 1}>Previous</Button>
+			<span>Page {page}</span>
+			<Button size="xs2" on:click={goToNextPage} disabled={!hasMore}>Next</Button>
+		</div>
+		<div class="pr-3">
+			<Toggle
+				bind:checked={hideAcknowledged}
+				on:change={refreshAlerts}
+				options={{ right: 'Hide Acknowledged' }}
+				size="xs"
+			/>
+		</div>
+	</div>
+
+	<!-- Table of alerts with scrollable body -->
+	<div class="overflow-y-auto max-h-1/2">
+		<table class="min-w-full w-full">
+			<thead class="bg-gray-600 text-white sticky top-0 z-10">
+				<tr>
+					<th class="w-[60px] px-4 py-2 text-center">Type</th>
+					<th class="px-4 py-2 text-center">Message</th>
+					<th class="w-[150px] px-4 py-2 text-center">Created At</th>
+					<th class="w-[180px] px-4 py-2 text-center">Acknowledge</th>
+				</tr>
+			</thead>
+			<tbody>
+				{#each alerts as { id, alert_type, message, created_at, acknowledged }}
+					{#if !hideAcknowledged || !acknowledged}
+						<tr class="bg-gray-100 dark:bg-gray-700 dark:text-white text-center">
+							<td class="border px-4 py-2 w-[100px]">
+								{#if alert_type === 'recovered_critical_error'}
+									<span title="Recovered Critical Alert">
+										<CheckCircle2 size="20" color="green" />
+									</span>
+								{:else}
+									<span title="Critical Alert">
+										<AlertCircle size="20" color="red" />
+									</span>
+								{/if}
+							</td>
+							<td class="border px-4 py-2">{message}</td>
+							<!-- Flexible width -->
+							<td class="border px-4 py-2 w-[150px]">{formatDate(created_at)}</td>
+							<td class="border px-4 py-2 w-[180px]">
+								<div class="flex justify-center items-center">
+									{#if !acknowledged}
+										<Button
+											color="green"
+											startIcon={{ icon: CheckSquare2 }}
+											size="xs2"
+											on:click={() => {
+												if (id) acknowledgeAlert(id)
+											}}>Acknowledge</Button
+										>
+									{:else}
+										<CheckCircle2 size="20" color="green" />
+									{/if}
+								</div>
+							</td>
+						</tr>
+					{/if}
+				{/each}
+			</tbody>
+		</table>
+	</div>
+
+	{#if alerts.length === 0}
+		<p class="text-center text-gray-500 mt-4">No critical alerts available.</p>
+	{/if}
+</Modal>
diff --git a/frontend/src/lib/stores.ts b/frontend/src/lib/stores.ts
index 18cf32b074..9d8af53bae 100644
--- a/frontend/src/lib/stores.ts
+++ b/frontend/src/lib/stores.ts
@@ -121,3 +121,5 @@ export type DBSchema = SQLSchema | GraphqlSchema
 export type DBSchemas = Partial<Record<string, DBSchema>>
 
 export const dbSchemas = writable<DBSchemas>({})
+
+export const instanceSettingsSelectedTab = writable('Core')
\ No newline at end of file
diff --git a/frontend/src/routes/(root)/(logged)/+layout.svelte b/frontend/src/routes/(root)/(logged)/+layout.svelte
index e5b0c3271d..99fc3c0a0c 100644
--- a/frontend/src/routes/(root)/(logged)/+layout.svelte
+++ b/frontend/src/routes/(root)/(logged)/+layout.svelte
@@ -14,7 +14,9 @@
 	import { classNames, getModifierKey } from '$lib/utils'
 	import WorkspaceMenu from '$lib/components/sidebar/WorkspaceMenu.svelte'
 	import SidebarContent from '$lib/components/sidebar/SidebarContent.svelte'
+	import CriticalAlertModal from '$lib/components/sidebar/CriticalAlertModal.svelte'
 	import {
+		enterpriseLicense,
 		copilotInfo,
 		isPremiumStore,
 		starStore,
@@ -48,6 +50,7 @@
 	import MenuButton from '$lib/components/sidebar/MenuButton.svelte'
 	import { setContext } from 'svelte'
 	import { base } from '$app/paths'
+	import CriticalAlertButton from '$lib/components/sidebar/CriticalAlertButton.svelte'
 
 	OpenAPI.WITH_CREDENTIALS = true
 	let menuOpen = false
@@ -275,6 +278,26 @@
 	}
 
 	setContext('openSearchWithPrefilledText', openSearchModal)
+
+	$: {
+		if ($enterpriseLicense && $superadmin) {
+			loadCriticalAlertsMuted()
+		}
+	}
+
+	let numUnacknowledgedCriticalAlerts = 0
+	let isCriticalAlertsModalOpen = false
+	let isCriticalAlertsUiMuted = false
+
+	async function loadCriticalAlertsMuted() {
+		isCriticalAlertsUiMuted = (await SettingService.getGlobal({
+			key: 'critical_alert_mute_ui'
+		})) as boolean
+	}
+
+	function openCriticalAlertsModal(text?: string): void {
+		isCriticalAlertsModalOpen = true
+	}
 </script>
 
 <svelte:window bind:innerWidth />
@@ -291,6 +314,12 @@
 {:else if $userStore}
 	<GlobalSearchModal bind:this={globalSearchModal} />
 	{#if $superadmin}
+		{#if !isCriticalAlertsUiMuted && $enterpriseLicense}
+			<CriticalAlertModal
+				bind:open={isCriticalAlertsModalOpen}
+				bind:numUnacknowledgedCriticalAlerts
+			/>
+		{/if}
 		<SuperadminSettings bind:this={superadminSettings} />
 	{/if}
 	<div>
@@ -356,7 +385,6 @@
 										<WindmillIcon white={true} height="20px" width="20px" />
 										Windmill
 									</div>
-
 									<div class="px-2 py-4 space-y-2 border-y border-gray-500">
 										<WorkspaceMenu />
 										<FavoriteMenu {favoriteLinks} />
@@ -405,6 +433,17 @@
 									{/if}
 								</div>
 							</button>
+							{#if $superadmin && $enterpriseLicense}
+								<CriticalAlertButton
+									stopPropagationOnClick={true}
+									on:click={() => openCriticalAlertsModal()}
+									{numUnacknowledgedCriticalAlerts}
+									{isCollapsed}
+									label="Critical Alerts"
+									class="!text-xs"
+									disabled={numUnacknowledgedCriticalAlerts === 0}
+								/>
+							{/if}
 							<div class="px-2 py-4 space-y-2 border-y border-gray-700">
 								<WorkspaceMenu {isCollapsed} />
 								<FavoriteMenu {favoriteLinks} {isCollapsed} />

From de9a839af4c40a6c637ca564bf783ef2336a5074 Mon Sep 17 00:00:00 2001
From: Alexander Petric <alpetric@users.noreply.github.com>
Date: Fri, 8 Nov 2024 21:50:36 -0500
Subject: [PATCH 62/80]  improve modal loading in critical alert ui (#4679)

* critical alert ui

* updating ui, backend logic

* revert

* type check fix npm

* checking out cli files from main

* moving alert icon

* adding sqlx mock data

* more sqlx changes

* feat(frontend): nodes from flow can be connected directly in expr input through a plug icon (#4652)

* Add flow prop picker

# Conflicts:
#	frontend/src/lib/components/propertyPicker/PropPicker.svelte

* fix unwanted copy

* cleaning

* Fix unset context

* move button and always display input

* fix unwanted proppicker display

* update

* update

* clean all

* clean all

---------

Co-authored-by: Ruben Fiszel <ruben@rubenfiszel.com>

* replace hide/show with toggle

* adding mutable setting and navigation to settings to configure channels

* merge fix

* ee non ee changees

* auto-acknowledge when muted

* pr comments

* fix bad log

* user inner modal component

* update unaknowledge alerts after acknowledging from modal

* aknowledge -> acknowledge

* format

* immediately check for alerts

* immediately check for alerts

* simplify loading of superadmin/ee

* update modal logic

---------

Co-authored-by: Guilhem <guilhemlemouel@gmail.com>
Co-authored-by: Ruben Fiszel <ruben@rubenfiszel.com>
Co-authored-by: Ruben Fiszel <ruben@windmill.dev>
---
 .../sidebar/CriticalAlertModal.svelte          |  5 ++++-
 .../sidebar/CriticalAlertModalInner.svelte     | 18 ++++--------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte b/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte
index 9e306ea917..68d7bfbffb 100644
--- a/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte
+++ b/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte
@@ -3,6 +3,7 @@
 	import CriticalAlertModalInner from './CriticalAlertModalInner.svelte'
 	import { SettingService } from '$lib/gen'
 	import { sendUserToast } from '$lib/toast'
+	import Modal from '../common/modal/Modal.svelte'
 
 	export let open: boolean = false
 	export let numUnacknowledgedCriticalAlerts: number = 0
@@ -66,4 +67,6 @@
 	}
 </script>
 
-<CriticalAlertModalInner bind:open {updateHasUnacknowledgedCriticalAlerts} />
+<Modal bind:open title="Critical Alerts" cancelText="Close" style="max-width: 66%;">
+	<CriticalAlertModalInner {updateHasUnacknowledgedCriticalAlerts} />
+</Modal>
diff --git a/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte b/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte
index f1b6208962..34ff0ffa35 100644
--- a/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte
+++ b/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte
@@ -1,34 +1,24 @@
 <script lang="ts">
-	import Modal from '../common/modal/Modal.svelte'
 	import Button from '../common/button/Button.svelte'
 	import Toggle from '$lib/components/Toggle.svelte'
 	import { SettingService } from '$lib/gen'
 	import { CheckCircle2, AlertCircle, RefreshCw, CheckSquare2, AlertTriangle } from 'lucide-svelte'
 	import type { CriticalAlert } from '$lib/gen'
-	import { onMount, beforeUpdate } from 'svelte'
+	import { onMount } from 'svelte'
 	import { instanceSettingsSelectedTab } from '$lib/stores'
 	import { goto } from '$app/navigation'
 
-	export let open: boolean = false
 	export let updateHasUnacknowledgedCriticalAlerts: () => void = () => {}
 
 	let alerts: CriticalAlert[] = []
 
 	let isRefreshing = false
-	let previousOpen = open
 	let hasCriticalAlertChannels = false
 
 	$: loading = isRefreshing
 
 	onMount(() => {
-		if (open) refreshAlerts()
-	})
-
-	beforeUpdate(() => {
-		if (open && !previousOpen) {
-			refreshAlerts()
-		}
-		previousOpen = open
+		refreshAlerts()
 	})
 
 	// Pagination
@@ -114,7 +104,7 @@
 	}
 </script>
 
-<Modal bind:open title="Critical Alerts" cancelText="Close" style="max-width: 66%;">
+<div>
 	{#if !hasCriticalAlertChannels}
 		<div class="flex flex-row pb-4">
 			<AlertTriangle color="orange" class="w-6 h-6 mr-2" />
@@ -210,4 +200,4 @@
 	{#if alerts.length === 0}
 		<p class="text-center text-gray-500 mt-4">No critical alerts available.</p>
 	{/if}
-</Modal>
+</div>

From 02170032af1195c1c6ef5c7d4d967a0588a11274 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Sun, 10 Nov 2024 00:05:57 +0100
Subject: [PATCH 63/80] fix python preprocessor indent

---
 frontend/src/lib/script_helpers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/lib/script_helpers.ts b/frontend/src/lib/script_helpers.ts
index 702e60310d..b3f43d2382 100644
--- a/frontend/src/lib/script_helpers.ts
+++ b/frontend/src/lib/script_helpers.ts
@@ -602,7 +602,7 @@ class Websocket(TypedDict):
 class WmTrigger(TypedDict):
     kind: Literal["http", "email", "webhook", "websocket"]
     http: Http | None
-		websocket: Websocket | None
+    websocket: Websocket | None
 
 def preprocessor(
 	wm_trigger: WmTrigger,

From d44976f35e45ade510d1ec220b5a1503e11f3db9 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Mon, 11 Nov 2024 10:05:18 +0100
Subject: [PATCH 64/80] feat: expandable subflows in flows (#4683)

* all

* nit right panel flow props

* nits
---
 .../src/lib/components/FlowGraphViewer.svelte |   3 +
 .../components/FlowStatusViewerInner.svelte   | 125 ++++++++++++++--
 .../src/lib/components/FlowTimeline.svelte    |   2 +-
 .../flows/content/FlowEditorPanel.svelte      |   4 +
 .../flows/content/FlowModuleComponent.svelte  |   8 +-
 .../flows/content/FlowModuleHeader.svelte     |  28 ++++
 .../flows/map/FlowModuleSchemaItem.svelte     |  13 +-
 .../flows/map/FlowModuleSchemaMap.svelte      |   4 +-
 .../lib/components/flows/map/MapItem.svelte   |   1 -
 .../components/flows/map/VirtualItem.svelte   |   2 +-
 .../lib/components/graph/FlowGraphV2.svelte   |  85 +++--------
 .../src/lib/components/graph/graphBuilder.ts  | 137 ++++++++++++++----
 .../graph/renderers/nodes/ModuleNode.svelte   |  15 +-
 .../graph/renderers/nodes/SubflowBound.svelte |  45 ++++++
 .../[job]/[resume]/[hmac]/+page.svelte        |   1 +
 frontend/src/routes/view_graph/+page.svelte   |   9 +-
 16 files changed, 367 insertions(+), 115 deletions(-)
 create mode 100644 frontend/src/lib/components/graph/renderers/nodes/SubflowBound.svelte

diff --git a/frontend/src/lib/components/FlowGraphViewer.svelte b/frontend/src/lib/components/FlowGraphViewer.svelte
index 1ecef2943f..326e1275b6 100644
--- a/frontend/src/lib/components/FlowGraphViewer.svelte
+++ b/frontend/src/lib/components/FlowGraphViewer.svelte
@@ -7,6 +7,7 @@
 	import FlowGraphViewerStep from './FlowGraphViewerStep.svelte'
 	import FlowGraphV2 from './graph/FlowGraphV2.svelte'
 	import { dfs } from './flows/dfs'
+	import { workspaceStore } from '$lib/stores'
 
 	export let flow: {
 		summary: string
@@ -22,6 +23,7 @@
 	export let noGraph = false
 	export let triggerNode = false
 	export let stepDetail: FlowModule | string | undefined = undefined
+	export let workspace: string | undefined = $workspaceStore
 
 	const dispatch = createEventDispatcher()
 </script>
@@ -37,6 +39,7 @@
 				path={flow?.path}
 				{download}
 				minHeight={400}
+				{workspace}
 				modules={flow?.value?.modules}
 				failureModule={flow?.value?.failure_module}
 				preprocessorModule={flow?.value?.preprocessor_module}
diff --git a/frontend/src/lib/components/FlowStatusViewerInner.svelte b/frontend/src/lib/components/FlowStatusViewerInner.svelte
index ec6982a5df..2c9aa54461 100644
--- a/frontend/src/lib/components/FlowStatusViewerInner.svelte
+++ b/frontend/src/lib/components/FlowStatusViewerInner.svelte
@@ -29,6 +29,7 @@
 	import Alert from './common/alert/Alert.svelte'
 	import FlowGraphViewerStep from './FlowGraphViewerStep.svelte'
 	import FlowGraphV2 from './graph/FlowGraphV2.svelte'
+	import { buildPrefix } from './graph/graphBuilder'
 
 	const dispatch = createEventDispatcher()
 
@@ -74,6 +75,10 @@
 
 	export let wideResults = false
 	export let hideFlowResult = false
+	export let workspace: string | undefined = $workspaceStore
+	export let prefix: string | undefined = undefined
+	export let subflowParentsGlobalModuleStates: Writable<Record<string, GraphModuleState>>[] = []
+	export let subflowParentsDurationStatuses: Writable<Record<string, DurationStatus>>[] = []
 
 	let jobResults: any[] =
 		flowJobIds?.flowJobs?.map((x, id) => `iter #${id + 1} not loaded by frontend yet`) ?? []
@@ -83,6 +88,7 @@
 
 	let localModuleStates: Writable<Record<string, GraphModuleState>> = writable({})
 	let localDurationStatuses: Writable<Record<string, DurationStatus>> = writable({})
+	let expandedSubflows: Record<string, FlowModule[]> = {}
 
 	export let job: Job | undefined = undefined
 
@@ -94,6 +100,24 @@
 	// 	}
 	// }
 
+	function updateModuleStates(
+		moduleState: Writable<Record<string, GraphModuleState>>,
+		key: string,
+		newValue: GraphModuleState,
+		keepType: boolean | undefined
+	) {
+		moduleState.update((x) => {
+			if (keepType && (x[key]?.type == 'Success' || x[key]?.type == 'Failure')) {
+				newValue.type = x[key].type
+			}
+			x[key] = newValue
+			return x
+		})
+	}
+
+	function buildSubflowKey(key: string, prefix: string | undefined) {
+		return prefix ? 'subflow:' + prefix + key : key
+	}
 	function setModuleState(
 		key: string,
 		value: Partial<GraphModuleState>,
@@ -102,15 +126,14 @@
 	) {
 		let newValue = { ...($localModuleStates[key] ?? {}), ...value }
 		if (!deepEqual($localModuleStates[key], value) || force) {
-			;[localModuleStates, ...globalModuleStates].forEach((s) => {
-				s.update((x) => {
-					if (keepType && (x[key]?.type == 'Success' || x[key]?.type == 'Failure')) {
-						newValue.type = x[key].type
-					}
-					x[key] = newValue
-					return x
-				})
-			})
+			;[localModuleStates, ...globalModuleStates].forEach((s) =>
+				updateModuleStates(s, key, newValue, keepType)
+			)
+			if (prefix) {
+				subflowParentsGlobalModuleStates.forEach((s) =>
+					updateModuleStates(s, buildSubflowKey(key, prefix), newValue, keepType)
+				)
+			}
 		}
 	}
 
@@ -124,6 +147,14 @@
 					return x
 				})
 			})
+			if (prefix) {
+				subflowParentsDurationStatuses.forEach((s) => {
+					s.update((x) => {
+						x[buildSubflowKey(key, prefix)].byJob[id] = value
+						return x
+					})
+				})
+			}
 		}
 	}
 
@@ -131,15 +162,25 @@
 		if ($localDurationStatuses[modId] == undefined) {
 			$localDurationStatuses[modId] = { byJob: {} }
 		}
-		let prefixed = modId
 		globalDurationStatuses.forEach((x) =>
 			x.update((x) => {
-				if (x[prefixed] == undefined) {
-					x[prefixed] = { byJob: {} }
+				if (x[modId] == undefined) {
+					x[modId] = { byJob: {} }
 				}
 				return x
 			})
 		)
+		if (prefix) {
+			subflowParentsDurationStatuses.forEach((x) =>
+				x.update((x) => {
+					let key = buildSubflowKey(modId, prefix)
+					if (x[key] == undefined) {
+						x[key] = { byJob: {} }
+					}
+					return x
+				})
+			)
+		}
 	}
 
 	let innerModules: FlowStatusModule[] = []
@@ -368,7 +409,7 @@
 		if (globalRefreshes) {
 			let modId = flowJobIds?.moduleId
 			if (modId) {
-				globalRefreshes[modId] = async (loopJob) => {
+				globalRefreshes[buildSubflowKey(modId, prefix)] = async (loopJob) => {
 					setIteration(loopJob.index, loopJob.job, false, modId ?? '')
 					refresh(true, loopJob)
 				}
@@ -631,6 +672,36 @@
 			})
 		}
 	}
+
+	function allModulesForTimeline(
+		modules: FlowModule[],
+		expandedSubflows: Record<string, FlowModule[]>
+	): string[] {
+		const ids = dfs(modules, (x) => x.id)
+
+		function rec(ids: string[], prefix: string | undefined): string[] {
+			return ids.concat(
+				ids.flatMap((id) => {
+					let fms = expandedSubflows[id]
+					let oid = id.split(':').pop()
+					if (!oid) {
+						return []
+					}
+					let nprefix = buildPrefix(prefix, oid)
+					return fms
+						? rec(
+								dfs(fms, (x) =>
+									x.id.startsWith('subflow:') ? x.id : buildSubflowKey(x.id, nprefix)
+								),
+								nprefix
+						  )
+						: []
+				})
+			)
+		}
+
+		return rec(ids, undefined)
+	}
 </script>
 
 {#if notAnonynmous}
@@ -803,6 +874,9 @@
 									job={storedListJobs[j]}
 									globalModuleStates={[localModuleStates, ...globalModuleStates]}
 									globalDurationStatuses={[localDurationStatuses, ...globalDurationStatuses]}
+									{prefix}
+									{subflowParentsGlobalModuleStates}
+									{subflowParentsDurationStatuses}
 									render={forloop_selected == loopJobId && selected == 'sequence' && render}
 									reducedPolling={flowJobIds?.flowJobs.length && flowJobIds?.flowJobs.length > 20}
 									{workspaceId}
@@ -880,6 +954,9 @@
 											{childFlow}
 											globalModuleStates={[localModuleStates, ...globalModuleStates]}
 											globalDurationStatuses={[localDurationStatuses, ...globalDurationStatuses]}
+											{prefix}
+											{subflowParentsGlobalModuleStates}
+											{subflowParentsDurationStatuses}
 											render={failedRetry == retry_selected && render}
 											reducedPolling={false}
 											{workspaceId}
@@ -895,6 +972,17 @@
 										bind:refresh={recursiveRefresh[mod.job ?? '']}
 										globalModuleStates={[]}
 										globalDurationStatuses={[]}
+										prefix={buildPrefix(prefix, mod.id ?? '')}
+										subflowParentsGlobalModuleStates={[
+											localModuleStates,
+											...globalModuleStates,
+											...subflowParentsGlobalModuleStates
+										]}
+										subflowParentsDurationStatuses={[
+											localDurationStatuses,
+											...globalDurationStatuses,
+											...subflowParentsDurationStatuses
+										]}
 										render={selected == 'sequence' && render}
 										{workspaceId}
 										jobId={mod.job}
@@ -915,6 +1003,9 @@
 										globalDurationStatuses={[localDurationStatuses, ...globalDurationStatuses]}
 										render={selected == 'sequence' && render}
 										{workspaceId}
+										{prefix}
+										{subflowParentsGlobalModuleStates}
+										{subflowParentsDurationStatuses}
 										jobId={mod.job}
 										innerModule={mod.flow_jobs ? job.raw_flow?.modules[i]?.value : undefined}
 										flowJobIds={mod.flow_jobs
@@ -973,6 +1064,7 @@
 							minHeight={wrapperHeight}
 							success={jobId != undefined && isSuccess(job?.['success'])}
 							flowModuleStates={$localModuleStates}
+							bind:expandedSubflows
 							on:select={(e) => {
 								if (rightColumnSelect != 'node_definition') {
 									rightColumnSelect = 'node_status'
@@ -1004,11 +1096,13 @@
 									selectedForloopIndex: detail.index
 								})
 								globalRefreshes[detail.moduleId]?.({ job: detail.id, index: detail.index })
+								// console.log('selectedIteration', prefix, detail.moduleId, globalRefreshes)
 							}}
 							modules={job.raw_flow?.modules ?? []}
 							failureModule={job.raw_flow?.failure_module}
 							preprocessorModule={job.raw_flow?.preprocessor_module}
 							allowSimplifiedPoll={false}
+							{workspace}
 						/>
 					</div>
 					<div
@@ -1033,7 +1127,10 @@
 								aggregateWaitTime={job?.aggregate_wait_time_ms}
 								flowDone={job?.['success'] != undefined}
 								bind:this={flowTimeline}
-								flowModules={dfs(job.raw_flow?.modules ?? [], (x) => x.id)}
+								flowModules={allModulesForTimeline(
+									job?.raw_flow?.modules ?? [],
+									expandedSubflows ?? {}
+								)}
 								durationStatuses={localDurationStatuses}
 							/>
 						{:else if rightColumnSelect == 'node_status'}
diff --git a/frontend/src/lib/components/FlowTimeline.svelte b/frontend/src/lib/components/FlowTimeline.svelte
index 3f918c8c6b..4027eca9c3 100644
--- a/frontend/src/lib/components/FlowTimeline.svelte
+++ b/frontend/src/lib/components/FlowTimeline.svelte
@@ -178,7 +178,7 @@
 				{/if}
 
 				<div class="px-2 py-2 grid grid-cols-6 w-full">
-					<div class="truncate">{k}</div>
+					<div class="truncate">{k.startsWith('subflow:') ? k.substring(8) : k}</div>
 					<div class="col-span-5 flex min-h-6">
 						{#if min && total}
 							<div class="flex flex-col gap-2 w-full p-2 ml-4">
diff --git a/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte b/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
index 4993afa0f9..4da8380fa6 100644
--- a/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
+++ b/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
@@ -78,6 +78,10 @@
 		newItem={newFlow}
 		isFlow={true}
 	/>
+{:else if $selectedId.startsWith('subflow:')}
+	<div class="p-4"
+		>Selected step is witin an expanded subflow and is not directly editable in the flow editor</div
+	>
 {:else}
 	{@const dup = checkDup($flowStore.value.modules)}
 	{#if dup}
diff --git a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
index 790758ca0e..97801d24ab 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
@@ -253,6 +253,10 @@
 							forceReload++
 							await reload(flowModule)
 						}
+						if (flowModule.value.type == 'flow') {
+							forceReload++
+							await reload(flowModule)
+						}
 					}}
 					on:createScriptFromInlineScript={async () => {
 						const [module, state] = await createScriptFromInlineScript(
@@ -361,7 +365,9 @@
 								</div>
 							{/if}
 						{:else if flowModule.value.type === 'flow'}
-							<FlowPathViewer path={flowModule.value.path} />
+							{#key forceReload}
+								<FlowPathViewer path={flowModule.value.path} />
+							{/key}
 						{/if}
 					</Pane>
 					<Pane bind:size={editorSettingsPanelSize} minSize={20}>
diff --git a/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte b/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte
index 434cf2451f..a044fadada 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte
@@ -5,10 +5,12 @@
 	import {
 		Bed,
 		Database,
+		ExternalLink,
 		Gauge,
 		GitFork,
 		Pen,
 		PhoneIncoming,
+		RefreshCcw,
 		Repeat,
 		Save,
 		Square,
@@ -139,6 +141,32 @@
 			</Button>
 		{/if}
 	{/if}
+	{#if module.value.type === 'flow'}
+		<Button
+			size="xs"
+			color="light"
+			on:click={async () => {
+				if (module.value.type == 'flow') {
+					window.open(`/flows/edit/${module.value.path}`, '_blank', 'noopener,noreferrer')
+				}
+			}}
+			startIcon={{ icon: Pen }}
+			iconOnly={false}
+		>
+			Edit <ExternalLink size={12} />
+		</Button>
+		<Button
+			size="xs"
+			color="light"
+			on:click={async () => {
+				dispatch('reload')
+			}}
+			startIcon={{
+				icon: RefreshCcw
+			}}
+			iconOnly={true}
+		/>
+	{/if}
 	<div class="px-0.5" />
 	{#if module.value.type === 'rawscript'}
 		<FlowModuleWorkerTagSelect bind:tag={module.value.tag} />
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
index ccf9c1696b..be7b438482 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
@@ -276,8 +276,13 @@
 		</Popover>
 
 		<div class="flex items-center space-x-2 relative max-w-[25%]" bind:clientWidth={idBadgeWidth}>
-			{#if id && id !== 'preprocessor' && !id.startsWith('failure')}
-				<Badge color="indigo" wrapperClass="max-w-full" baseClass="max-w-full truncate" title={id}>
+			{#if id && id !== 'preprocessor' && !id.startsWith('failure') && !id.startsWith('subflow:')}
+				<Badge
+					color="indigo"
+					wrapperClass="max-w-full"
+					baseClass="max-w-full truncate !px-1"
+					title={id}
+				>
 					<span class="max-w-full text-2xs truncate">{id}</span></Badge
 				>
 				{#if deletable}
@@ -290,6 +295,10 @@ hover:border-blue-700 hover:!visible {hover ? '' : '!hidden'}"
 						title="Edit Id"><Pencil size={14} /></button
 					>
 				{/if}
+			{:else if id?.startsWith('subflow:')}
+				<Badge color="blue" wrapperClass="max-w-full" baseClass="!px-1" title={id}>
+					<span class="max-w-full text-2xs truncate">{id.substring('subflow:'.length)}</span></Badge
+				>
 			{/if}
 		</div>
 	</div>
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
index 28167493cf..220b597384 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
@@ -26,7 +26,7 @@
 	import { getDependentComponents } from '../flowExplorer'
 	import type { FlowCopilotContext } from '$lib/components/copilot/flow'
 	import { fade } from 'svelte/transition'
-	import { copilotInfo, tutorialsToDo } from '$lib/stores'
+	import { copilotInfo, tutorialsToDo, workspaceStore } from '$lib/stores'
 
 	import FlowTutorials from '$lib/components/FlowTutorials.svelte'
 	import { ignoredTutorials } from '$lib/components/tutorials/ignoredTutorials'
@@ -44,6 +44,7 @@
 	export let disableSettings = false
 	export let newFlow: boolean = false
 	export let smallErrorHandler = false
+	export let workspace: string | undefined = $workspaceStore
 
 	let flowTutorials: FlowTutorials | undefined = undefined
 
@@ -345,6 +346,7 @@
 			preprocessorModule={$flowStore.value?.preprocessor_module}
 			{selectedId}
 			{flowInputsStore}
+			{workspace}
 			on:delete={({ detail }) => {
 				let e = detail.detail
 				dependents = getDependentComponents(e.id, $flowStore)
diff --git a/frontend/src/lib/components/flows/map/MapItem.svelte b/frontend/src/lib/components/flows/map/MapItem.svelte
index ebd4ffdb9b..05cfc49d90 100644
--- a/frontend/src/lib/components/flows/map/MapItem.svelte
+++ b/frontend/src/lib/components/flows/map/MapItem.svelte
@@ -20,7 +20,6 @@
 	export let modules: FlowModule[]
 	export let moving: string | undefined = undefined
 	export let duration_ms: number | undefined = undefined
-	export let isTrigger: boolean = false
 
 	export let retries: number | undefined = undefined
 	export let flowJobs:
diff --git a/frontend/src/lib/components/flows/map/VirtualItem.svelte b/frontend/src/lib/components/flows/map/VirtualItem.svelte
index a2e022e9ef..3f5350b7ed 100644
--- a/frontend/src/lib/components/flows/map/VirtualItem.svelte
+++ b/frontend/src/lib/components/flows/map/VirtualItem.svelte
@@ -54,7 +54,7 @@
 				<div class="truncate text-2xs text-center"><pre>{preLabel}</pre></div>
 			{/if}
 		</div>
-		{#if id && !hideId}
+		{#if id && !hideId && !id?.startsWith('subflow:')}
 			<div class="flex items-center shrink min-w-0">
 				<Badge color="indigo" wrapperClass="w-full" baseClass="max-w-full" title={id}>
 					<span class="max-w-full text-2xs truncate">{id}</span>
diff --git a/frontend/src/lib/components/graph/FlowGraphV2.svelte b/frontend/src/lib/components/graph/FlowGraphV2.svelte
index caf28e43ce..d09d22cac7 100644
--- a/frontend/src/lib/components/graph/FlowGraphV2.svelte
+++ b/frontend/src/lib/components/graph/FlowGraphV2.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { type FlowModule } from '../../gen'
+	import { FlowService, type FlowModule } from '../../gen'
 	import { NODE, type GraphModuleState } from '.'
 	import { createEventDispatcher, getContext, onDestroy, onMount, setContext } from 'svelte'
 
@@ -39,6 +39,8 @@
 	import FlowYamlEditor from '../flows/header/FlowYamlEditor.svelte'
 	import BranchOneEndNode from './renderers/nodes/branchOneEndNode.svelte'
 	import type { TriggerContext } from '../triggers'
+	import { workspaceStore } from '$lib/stores'
+	import SubflowBound from './renderers/nodes/SubflowBound.svelte'
 
 	export let success: boolean | undefined = undefined
 	export let modules: FlowModule[] | undefined = []
@@ -65,6 +67,7 @@
 		undefined
 	)
 	export let triggerNode = false
+	export let workspace: string = $workspaceStore ?? 'NO_WORKSPACE'
 
 	let useDataflow: Writable<boolean | undefined> = writable<boolean | undefined>(false)
 
@@ -85,6 +88,8 @@
 
 	let simplifiableFlow: SimplifiableFlow | undefined = undefined
 
+	export let expandedSubflows: Record<string, FlowModule[]> = {}
+
 	if (triggerContext && allowSimplifiedPoll) {
 		if (isSimplifiable(modules)) {
 			triggerContext?.simplifiedPoll?.set(true)
@@ -201,6 +206,15 @@
 		},
 		simplifyFlow: (detail) => {
 			triggerContext?.simplifiedPoll.set(detail)
+		},
+		expandSubflow: async (id: string, path: string) => {
+			const flow = await FlowService.getFlowByPath({ workspace: workspace, path })
+			expandedSubflows[id] = flow.value.modules
+			expandedSubflows = expandedSubflows
+		},
+		minimizeSubflow: (id: string) => {
+			delete expandedSubflows[id]
+			expandedSubflows = expandedSubflows
 		}
 	}
 
@@ -222,7 +236,8 @@
 		$selectedId,
 		moving,
 		simplifiableFlow,
-		triggerNode ? path : undefined
+		triggerNode ? path : undefined,
+		expandedSubflows
 	)
 
 	const nodes = writable<Node[]>([])
@@ -230,69 +245,6 @@
 
 	let height = 0
 
-	// function removeInputNode(nodes, edges, id) {
-	// 	const inputNode = nodes.find((node) => node.id === id)
-	// 	if (!inputNode) return { nodes, edges }
-
-	// 	// Find edges connected to the input node
-	// 	const connectedEdges = edges.filter((edge) => edge.source === id || edge.target === id)
-
-	// 	// Remove the input node
-	// 	let updatedNodes = nodes.filter((node) => node.id !== id)
-
-	// 	// Remove edges connected to the input node
-	// 	let updatedEdges = edges.filter((edge) => edge.source !== id && edge.target !== id)
-
-	// 	// Create new edges from the input node's parent to its children
-	// 	const inputEdges = connectedEdges.filter((edge) => edge.target === id)
-	// 	const outputEdges = connectedEdges.filter((edge) => edge.source === id)
-
-	// 	inputEdges.forEach((inputEdge) => {
-	// 		outputEdges.forEach((outputEdge) => {
-	// 			const newEdge = {
-	// 				id: `edge:${inputEdge.source}->${outputEdge.target}`,
-	// 				source: inputEdge.source,
-	// 				target: outputEdge.target,
-	// 				type: 'empty',
-	// 				data: {
-	// 					...outputEdge.data,
-	// 					sourceId: inputEdge.source,
-	// 					targetId: outputEdge.target
-	// 				}
-	// 			}
-	// 			updatedEdges.push(newEdge)
-	// 		})
-	// 	})
-
-	// 	// Update parent ids of the nodes
-	// 	updatedNodes = updatedNodes.map((node) => {
-	// 		if (node.data && node.data.parentIds && node.data.parentIds.includes(id)) {
-	// 			const updatedParentIds = node.data.parentIds.filter((parentId) => parentId !== id)
-	// 			if (inputNode.data && inputNode.data.parentIds) {
-	// 				updatedParentIds.push(...inputNode.data.parentIds)
-	// 			}
-	// 			return {
-	// 				...node,
-	// 				data: {
-	// 					...node.data,
-	// 					parentIds: [...new Set(updatedParentIds)] // Remove duplicates
-	// 				}
-	// 			}
-	// 		}
-	// 		return node
-	// 	})
-
-	// 	return { nodes: updatedNodes, edges: updatedEdges }
-	// }
-
-	// function processGraph(graph, simplifiable) {
-	// 	let newGraph = { nodes: graph.nodes, edges: graph.edges }
-	// 	newGraph = removeInputNode(newGraph.nodes, newGraph.edges, 'Input')
-	// 	newGraph = removeInputNode(newGraph.nodes, newGraph.edges, simplifiable.forLoopNode.id)
-	// 	newGraph = removeInputNode(newGraph.nodes, newGraph.edges, simplifiable.triggerNode.id)
-	// 	return newGraph
-	// }
-
 	function isSimplifiable(modules: FlowModule[] | undefined): boolean {
 		if (!modules || modules?.length !== 2) {
 			return false
@@ -313,7 +265,7 @@
 
 		$nodes = layoutNodes(newGraph.nodes)
 		$edges = newGraph.edges
-		height = Math.max(...$nodes.map((n) => n.position.y + NODE.height + 40), minHeight)
+		height = Math.max(...$nodes.map((n) => n.position.y + NODE.height + 100), minHeight)
 	}
 
 	$: (graph || allowSimplifiedPoll) && updateStores()
@@ -330,6 +282,7 @@
 		whileLoopEnd: ForLoopEndNode,
 		branchOneStart: BranchOneStart,
 		branchOneEnd: BranchOneEndNode,
+		subflowBound: SubflowBound,
 		noBranch: NoBranchNode,
 		trigger: TriggersNode
 	} as any
diff --git a/frontend/src/lib/components/graph/graphBuilder.ts b/frontend/src/lib/components/graph/graphBuilder.ts
index d010c7ae33..a8461971cd 100644
--- a/frontend/src/lib/components/graph/graphBuilder.ts
+++ b/frontend/src/lib/components/graph/graphBuilder.ts
@@ -15,6 +15,8 @@ export type GraphEventHandlers = {
 	selectedIteration: (detail, moduleId: string) => void
 	changeId: (newId: string) => void
 	simplifyFlow: (detail: boolean) => void
+	expandSubflow: (id: string, path: string) => void
+	minimizeSubflow: (id: string) => void
 }
 
 export type SimplifiableFlow = { simplifiedFlow: boolean }
@@ -26,6 +28,10 @@ export function isTriggerStep(module: FlowModule | undefined): boolean {
 		module.value.is_trigger === true
 	)
 }
+
+export function buildPrefix(prefix: string | undefined, id: string): string {
+	return (prefix ?? '') + id + ':'
+}
 export function graphBuilder(
 	modules: FlowModule[] | undefined,
 	extra: Record<string, any>,
@@ -37,7 +43,8 @@ export function graphBuilder(
 	selectedId: string | undefined,
 	moving: string | undefined,
 	simplifiableFlow: SimplifiableFlow | undefined,
-	flowPathForTriggerNode: string | undefined
+	flowPathForTriggerNode: string | undefined,
+	expandedSubflows: Record<string, FlowModule[]>
 	// triggerProps?: {
 	// 	path?: string
 	// 	flowIsSimplifiable?: boolean
@@ -61,6 +68,10 @@ export function graphBuilder(
 				throw new Error(`Duplicated node detected: ${module.id}`)
 			}
 
+			if (module.id.startsWith('subflow:')) {
+				extra.insertable = false
+			}
+
 			nodes.push({
 				id: module.id,
 				data: {
@@ -114,6 +125,7 @@ export function graphBuilder(
 		function addEdge(
 			sourceId: string,
 			targetId: string,
+			prefix: string | undefined,
 			options?: {
 				disableInsert?: boolean
 				customId?: string
@@ -154,7 +166,7 @@ export function graphBuilder(
 					// If the index is -1, it means that the target module is not in the modules array, so we set it to the length of the array
 					index: index >= 0 ? index : mods?.length ?? 0,
 					...extra,
-					insertable: extra.insertable && !options?.disableInsert
+					insertable: extra.insertable && !options?.disableInsert && prefix == undefined
 				}
 			})
 		}
@@ -188,11 +200,11 @@ export function graphBuilder(
 			}
 			nodes.push(triggerNode)
 			if (preprocessorModule != null && preprocessorModule != undefined) {
-				addEdge('Trigger', preprocessorModule.id, {
+				addEdge('Trigger', preprocessorModule.id, undefined, {
 					type: 'empty'
 				})
 			} else {
-				addEdge('Trigger', 'Input', {
+				addEdge('Trigger', 'Input', undefined, {
 					type: 'empty'
 				})
 			}
@@ -220,16 +232,25 @@ export function graphBuilder(
 			beforeNode: Node,
 			nextNode: Node | undefined,
 			simplifiedTriggerView: boolean,
+			prefix: string | undefined,
 			currentOffset = 0,
 			disableMoveIds: string[] = [],
 			parentIndex?: string,
 			branchChosen?: boolean
 		) {
+			if (prefix != undefined) {
+				modules.forEach((m) => {
+					if (!m['oid']) {
+						m['oid'] = m.id
+					}
+					m.id = 'subflow:' + prefix + m['oid']
+				})
+			}
 			let previousId: string | undefined = undefined
 
 			if (modules.length === 0) {
 				if (nextNode) {
-					addEdge(beforeNode.id, nextNode.id, {
+					addEdge(beforeNode.id, nextNode.id, prefix, {
 						subModules: modules,
 						disableMoveIds
 					})
@@ -239,8 +260,8 @@ export function graphBuilder(
 					const localDisableMoveIds = [...disableMoveIds, module.id]
 
 					// Add the edge between the previous node and the current one
-					if (index > 0 && previousId) {
-						addEdge(previousId, module.id, {
+					if (index > 0 && previousId && expandedSubflows[module.id] == undefined) {
+						addEdge(previousId, module.id, prefix, {
 							subModules: modules,
 							disableMoveIds
 						})
@@ -284,10 +305,10 @@ export function graphBuilder(
 
 							nodes.push(startNode)
 
-							addEdge(module.id, startNode.id, {
+							addEdge(module.id, startNode.id, prefix, {
 								type: 'empty'
 							})
-							addEdge(startNode.id, endNode.id, {
+							addEdge(startNode.id, endNode.id, prefix, {
 								type: 'empty'
 							})
 						} else {
@@ -311,7 +332,7 @@ export function graphBuilder(
 
 								nodes.push(startNode)
 
-								addEdge(module.id, startNode.id, {
+								addEdge(module.id, startNode.id, prefix, {
 									type: 'empty'
 								})
 
@@ -320,6 +341,7 @@ export function graphBuilder(
 									startNode,
 									endNode,
 									false,
+									prefix,
 									currentOffset,
 									localDisableMoveIds,
 									parentIndex ? `${parentIndex}-${index}-${branchIndex}` : `${index}-${branchIndex}`
@@ -349,11 +371,11 @@ export function graphBuilder(
 						}
 
 						if (!simplifiedTriggerView) {
-							addEdge(module.id, startNode.id, {
+							addEdge(module.id, startNode.id, prefix, {
 								type: 'empty'
 							})
 						} else if (previousId) {
-							addEdge(previousId, startNode.id, {
+							addEdge(previousId, startNode.id, prefix, {
 								type: 'empty'
 							})
 						}
@@ -383,6 +405,7 @@ export function graphBuilder(
 							startNode,
 							endNode,
 							false,
+							prefix,
 							currentOffset + 25,
 							localDisableMoveIds,
 							parentIndex
@@ -406,7 +429,7 @@ export function graphBuilder(
 							position: { x: -1, y: -1 },
 							type: 'whileLoopStart'
 						}
-						addEdge(module.id, startNode.id, {
+						addEdge(module.id, startNode.id, prefix, {
 							type: 'empty'
 						})
 
@@ -427,6 +450,7 @@ export function graphBuilder(
 							startNode,
 							endNode,
 							false,
+							prefix,
 							currentOffset + 25,
 							localDisableMoveIds,
 							parentIndex
@@ -465,7 +489,7 @@ export function graphBuilder(
 
 						nodes.push(defaultBranch)
 
-						addEdge(module.id, defaultBranch.id, { type: 'empty' })
+						addEdge(module.id, defaultBranch.id, prefix, { type: 'empty' })
 
 						const branchChosen = extra.flowModuleStates?.[module.id]?.branchChosen
 						processModules(
@@ -473,6 +497,7 @@ export function graphBuilder(
 							defaultBranch,
 							endNode,
 							false,
+							prefix,
 							currentOffset,
 							localDisableMoveIds,
 							parentIndex ? `${parentIndex}-${index}` : index.toString(),
@@ -500,13 +525,14 @@ export function graphBuilder(
 
 							nodes.push(startNode)
 
-							addEdge(module.id, startNode.id, { type: 'empty' })
+							addEdge(module.id, startNode.id, prefix, { type: 'empty' })
 
 							processModules(
 								branch.modules,
 								startNode,
 								endNode,
 								false,
+								prefix,
 								currentOffset,
 								localDisableMoveIds,
 								parentIndex ? `${parentIndex}-${index}` : index.toString(),
@@ -516,13 +542,72 @@ export function graphBuilder(
 
 						previousId = endNode.id
 					} else {
-						addNode(module, currentOffset, 'module', modules)
+						let expanded = expandedSubflows[module.id]
+						if (expanded) {
+							const startId = `${module.id}-subflow-start`
+							const idWithoutPrefix = module.id.startsWith('subflow:')
+								? module.id.substring(8)
+								: module.id
+							const startNode = {
+								id: startId,
+								data: {
+									offset: currentOffset,
+									label: `Start of subflow ${idWithoutPrefix}`,
+									id: startId,
+									subflowId: module.id,
+									modules: modules,
+									eventHandlers: eventHandlers,
+									...extra
+								},
+								position: { x: -1, y: -1 },
+								type: 'subflowBound'
+							}
 
-						previousId = module.id
+							nodes.push(startNode)
+
+							if (previousId) {
+								addEdge(previousId!, startNode.id, prefix, { type: 'empty' })
+							} else {
+								addEdge(beforeNode.id, startNode.id, prefix, { type: 'empty' })
+							}
+
+							const endId = `${module.id}-subflow-end`
+							const endNode = {
+								id: endId,
+								data: {
+									offset: currentOffset,
+									label: `End of subflow ${idWithoutPrefix}`,
+									id: endId,
+									subflowId: module.id,
+									modules: modules,
+									eventHandlers: eventHandlers,
+									...extra
+								},
+								position: { x: -1, y: -1 },
+								type: 'subflowBound'
+							}
+
+							nodes.push(endNode)
+
+							processModules(
+								expanded,
+								startNode,
+								endNode,
+								false,
+								buildPrefix(prefix, module['oid'] ?? module.id),
+								currentOffset,
+								localDisableMoveIds
+							)
+
+							previousId = endNode.id
+						} else {
+							addNode(module, currentOffset, 'module', modules)
+							previousId = module.id
+						}
 					}
 
-					if (index === 0) {
-						addEdge(beforeNode.id, module.id, {
+					if (index === 0 && expandedSubflows[module.id] == undefined) {
+						addEdge(beforeNode.id, module.id, prefix, {
 							subModules: modules,
 							disableMoveIds,
 							disableInsert: simplifiedTriggerView
@@ -530,7 +615,7 @@ export function graphBuilder(
 					}
 
 					if (index === modules.length - 1 && previousId && nextNode) {
-						addEdge(previousId, nextNode.id, {
+						addEdge(previousId, nextNode.id, prefix, {
 							subModules: modules,
 							disableMoveIds
 						})
@@ -540,9 +625,9 @@ export function graphBuilder(
 		}
 
 		if (simplifiableFlow?.simplifiedFlow === true && triggerNode) {
-			processModules(modules, triggerNode, undefined, true)
+			processModules(modules, triggerNode, undefined, true, undefined)
 		} else {
-			processModules(modules, inputNode, resultNode, false)
+			processModules(modules, inputNode, resultNode, false, undefined)
 		}
 
 		if (failureModule) {
@@ -558,14 +643,14 @@ export function graphBuilder(
 
 			Object.entries(toAdd).forEach((x) => {
 				addNode({ ...failureModule, id: x[1] }, 0, 'module')
-				addEdge(x[0], x[1], { type: 'empty' })
+				addEdge(x[0], x[1], undefined, { type: 'empty' })
 			})
 		}
 
 		if (preprocessorModule) {
 			addNode(preprocessorModule, 0, 'module')
 			const id = JSON.parse(JSON.stringify(preprocessorModule.id))
-			addEdge(id, 'Input', { type: 'empty' })
+			addEdge(id, 'Input', undefined, { type: 'empty' })
 		}
 
 		if (failureModule && !extra.flowModuleStates) {
@@ -598,7 +683,7 @@ export function graphBuilder(
 							}
 						}
 
-						addEdge(pid, selectedId!, {
+						addEdge(pid, selectedId!, undefined, {
 							customId: `dep-${pid}-${selectedId}-${input}-${index}`,
 							type: 'dataflowedge'
 						})
@@ -608,7 +693,7 @@ export function graphBuilder(
 				Object.entries(deps.dependents).forEach((x, i) => {
 					let pid = x[0]
 
-					addEdge(selectedId!, pid, {
+					addEdge(selectedId!, pid, undefined, {
 						customId: `dep-${selectedId}-${pid}-${i}`,
 						type: 'dataflowedge'
 					})
diff --git a/frontend/src/lib/components/graph/renderers/nodes/ModuleNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/ModuleNode.svelte
index 91d6de5076..97013d973d 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/ModuleNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/ModuleNode.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import MapItem from '$lib/components/flows/map/MapItem.svelte'
 	import type { FlowModule, FlowModuleValue } from '$lib/gen'
-	import { GitBranchPlus } from 'lucide-svelte'
+	import { GitBranchPlus, Maximize2 } from 'lucide-svelte'
 	import NodeWrapper from './NodeWrapper.svelte'
 	import type { GraphEventHandlers } from '../../graphBuilder'
 	import type { GraphModuleState } from '../../model'
@@ -46,6 +46,19 @@
 </script>
 
 <NodeWrapper offset={data.offset} let:darkMode>
+	{#if data.module.value.type == 'flow'}
+		<button
+			title="Unexpand subflow"
+			class="z-50 absolute -top-[10px] right-[25px] rounded-full h-[20px] w-[20px] center-center text-primary bg-surface duration-150 hover:bg-surface-hover"
+			on:click|preventDefault|stopPropagation={() => {
+				if (data.module.value.type == 'flow') {
+					data.eventHandlers.expandSubflow(data.module.id, data.module.value.path)
+				}
+			}}
+		>
+			<Maximize2 size={12} />
+		</button>
+	{/if}
 	<MapItem
 		mod={data.module}
 		insertable={data.insertable}
diff --git a/frontend/src/lib/components/graph/renderers/nodes/SubflowBound.svelte b/frontend/src/lib/components/graph/renderers/nodes/SubflowBound.svelte
new file mode 100644
index 0000000000..587835da45
--- /dev/null
+++ b/frontend/src/lib/components/graph/renderers/nodes/SubflowBound.svelte
@@ -0,0 +1,45 @@
+<script lang="ts">
+	import VirtualItem from '$lib/components/flows/map/VirtualItem.svelte'
+	import NodeWrapper from './NodeWrapper.svelte'
+	import { Minimize2 } from 'lucide-svelte'
+	import type { GraphModuleState } from '../../model'
+	import { getStateColor } from '../../util'
+	import type { FlowModule } from '$lib/gen'
+	import type { GraphEventHandlers } from '../../graphBuilder'
+
+	export let data: {
+		label: string
+		preLabel: string | undefined
+		insertable: boolean
+		flowModuleStates: Record<string, GraphModuleState> | undefined
+		subflowId: string
+		id: string
+		modules: FlowModule[]
+		selected: boolean
+		eventHandlers: GraphEventHandlers
+		offset: number
+	}
+</script>
+
+<NodeWrapper let:darkMode offset={data.offset}>
+	<VirtualItem
+		label={data.label}
+		preLabel={data.preLabel}
+		selectable
+		selected={data.selected}
+		bgColor={getStateColor(undefined, darkMode)}
+		borderColor={undefined}
+		on:select={() => {
+			data.eventHandlers.select(data.id)
+		}}
+	/>
+	<button
+		title="Unexpand subflow"
+		class="z-50 absolute -top-[10px] right-[25px] rounded-full h-[20px] w-[20px] center-center text-primary bg-surface duration-150 hover:bg-surface-hover"
+		on:click|preventDefault|stopPropagation={() => {
+			data.eventHandlers.minimizeSubflow(data.subflowId)
+		}}
+	>
+		<Minimize2 size={12} />
+	</button>
+</NodeWrapper>
diff --git a/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte b/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte
index 2175c75009..eedeca636c 100644
--- a/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte
+++ b/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte
@@ -284,6 +284,7 @@
 			<h2 class="mt-10">Flow details</h2>
 			<div class="border border-gray-700">
 				<FlowGraphV2
+					workspace={job.workspace_id}
 					triggerNode={false}
 					modules={job.raw_flow?.modules}
 					failureModule={job.raw_flow?.failure_module}
diff --git a/frontend/src/routes/view_graph/+page.svelte b/frontend/src/routes/view_graph/+page.svelte
index ef6bea27e0..18b49846a8 100644
--- a/frontend/src/routes/view_graph/+page.svelte
+++ b/frontend/src/routes/view_graph/+page.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import FlowGraphV2 from '$lib/components/graph/FlowGraphV2.svelte'
+	import { workspaceStore } from '$lib/stores'
 	import { decodeState } from '$lib/utils'
 
 	let content = localStorage.getItem('svelvet')
@@ -8,7 +9,13 @@
 		: { modules: [], failureModule: undefined, preprocessorModule: undefined }
 </script>
 
-<FlowGraphV2 triggerNode={false} {modules} {failureModule} {preprocessorModule} />
+<FlowGraphV2
+	workspace={$workspaceStore}
+	triggerNode={false}
+	{modules}
+	{failureModule}
+	{preprocessorModule}
+/>
 <a
 	download="flow.json"
 	href={'data:text/json;charset=utf-8,' +

From d9d63a4e31c05c6d8db7a7a8420e9da8587dfa68 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Mon, 11 Nov 2024 10:34:12 +0100
Subject: [PATCH 65/80] fix autocomplete z-indez on flow editor

---
 frontend/src/lib/components/ArgInput.svelte          | 12 ++++++++++++
 .../src/lib/components/InputTransformForm.svelte     |  9 ++++++---
 .../lib/components/InputTransformSchemaForm.svelte   |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/frontend/src/lib/components/ArgInput.svelte b/frontend/src/lib/components/ArgInput.svelte
index bbaf166e0d..a1b41f2d35 100644
--- a/frontend/src/lib/components/ArgInput.svelte
+++ b/frontend/src/lib/components/ArgInput.svelte
@@ -418,6 +418,9 @@
 									bind:selected={value}
 									options={itemsType?.multiselect ?? []}
 									selectedOptionsDraggable={true}
+									on:open={() => {
+										dispatch('focus')
+									}}
 								/>
 							</div>
 						{:else if itemsType?.enum != undefined && Array.isArray(itemsType?.enum) && Array.isArray(value)}
@@ -428,6 +431,9 @@
 									bind:selected={value}
 									options={itemsType?.enum ?? []}
 									selectedOptionsDraggable={true}
+									on:open={() => {
+										dispatch('focus')
+									}}
 								/>
 							</div>
 						{:else}
@@ -816,6 +822,12 @@
 						bind:value
 						{enum_}
 						{autofocus}
+						on:focus={() => {
+							dispatch('focus')
+						}}
+						on:blur={(e) => {
+							dispatch('blur')
+						}}
 						enumLabels={extra['enumLabels']}
 					/>
 				</div>
diff --git a/frontend/src/lib/components/InputTransformForm.svelte b/frontend/src/lib/components/InputTransformForm.svelte
index 07a7ee534d..c0429a8284 100644
--- a/frontend/src/lib/components/InputTransformForm.svelte
+++ b/frontend/src/lib/components/InputTransformForm.svelte
@@ -279,7 +279,7 @@
 		class={twMerge(
 			'pl-2 pt-2 pb-2 ml-2 relative hover:bg-surface hover:shadow-md transition-all duration-200',
 			$propPickerConfig?.propName == argName
-				? 'bg-surface border-l-4 border-blue-500 shadow-md rounded-l-md z-2000'
+				? 'bg-surface border-l-4 border-blue-500 shadow-md rounded-l-md z-50 '
 				: 'hover:rounded-md',
 			$$props.class
 		)}
@@ -565,10 +565,13 @@
 				</div>
 
 				{#if $propPickerConfig?.propName == argName}
-					<div class="text-blue-500 mt-2" in:fade={{ duration: 200 }}>
+					<div
+						class="text-blue-500 absolute top-2 lg:-right-2.5 -right-1"
+						in:fade={{ duration: 200 }}
+					>
 						<svg
 							xmlns="http://www.w3.org/2000/svg"
-							width="14"
+							width="16"
 							height="24"
 							viewBox="0 0 24 24"
 							fill="currentColor"
diff --git a/frontend/src/lib/components/InputTransformSchemaForm.svelte b/frontend/src/lib/components/InputTransformSchemaForm.svelte
index e9a0f4899d..12c85c05c6 100644
--- a/frontend/src/lib/components/InputTransformSchemaForm.svelte
+++ b/frontend/src/lib/components/InputTransformSchemaForm.svelte
@@ -86,7 +86,7 @@
 	{#if keys.length > 0}
 		{#each keys as argName (argName)}
 			{#if (!filter || filter.includes(argName)) && Object.keys(schema.properties ?? {}).includes(argName)}
-				<div class="z-10 pt-2 relative">
+				<div class="pt-2 relative">
 					<InputTransformForm
 						{previousModuleId}
 						bind:arg={args[argName]}

From d832cd8b5fee9f29c26363eba7aa5f5f6678a400 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Mon, 11 Nov 2024 10:37:17 +0100
Subject: [PATCH 66/80] chore(main): release 1.422.0 (#4678)

* chore(main): release 1.422.0

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |  8 +++
 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, 61 insertions(+), 53 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7faf7d54b4..467d6a40d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.422.0](https://github.com/windmill-labs/windmill/compare/v1.421.2...v1.422.0) (2024-11-11)
+
+
+### Features
+
+* expandable subflows in flows ([#4683](https://github.com/windmill-labs/windmill/issues/4683)) ([d44976f](https://github.com/windmill-labs/windmill/commit/d44976f35e45ade510d1ec220b5a1503e11f3db9))
+* **frontend:** critical alerts UI ([#4653](https://github.com/windmill-labs/windmill/issues/4653)) ([d9148ea](https://github.com/windmill-labs/windmill/commit/d9148eaa78680a93d81d71847a7df67e01f3c110))
+
 ## [1.421.2](https://github.com/windmill-labs/windmill/compare/v1.421.1...v1.421.2) (2024-11-08)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 7fe1f09907..de8c9b6502 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -96,9 +96,9 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+checksum = "611cc2ae7d2e242c457e4be7f97036b8ad9ca152b499f53faf99b1ed8fc2553f"
 
 [[package]]
 name = "android-tzdata"
@@ -2080,9 +2080,9 @@ dependencies = [
 
 [[package]]
 name = "csv"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
+checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
 dependencies = [
  "csv-core",
  "itoa",
@@ -7191,9 +7191,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.39"
+version = "0.38.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee"
+checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
@@ -7539,9 +7539,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.12.0"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
+checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -9139,18 +9139,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.68"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.68"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10578,7 +10578,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "anyhow",
  "axum",
@@ -10620,7 +10620,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10705,7 +10705,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -10723,7 +10723,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "chrono",
  "serde",
@@ -10736,7 +10736,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10751,7 +10751,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10797,7 +10797,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10812,7 +10812,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10834,7 +10834,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10846,7 +10846,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10855,7 +10855,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10867,7 +10867,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10879,7 +10879,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10891,7 +10891,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10902,7 +10902,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10913,7 +10913,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10931,7 +10931,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10948,7 +10948,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10960,7 +10960,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10978,7 +10978,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10999,7 +10999,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -11009,7 +11009,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -11042,7 +11042,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -11052,7 +11052,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.421.2"
+version = "1.422.0"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 8663582c19..44a89a30bb 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.421.2"
+version = "1.422.0"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.421.2"
+version = "1.422.0"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 964df7ee5f..bd9b54aafb 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.421.2
+  version: 1.422.0
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 5c02fcf14d..b110930bdb 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.421.2";
+export const VERSION = "v1.422.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 38a4087b01..b54f215ba9 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.421.2";
+export const VERSION = "1.422.0";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index d3ff5df966..ed4e5b4252 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.421.2",
+	"version": "1.422.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.421.2",
+			"version": "1.422.0",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index 3b10b586cd..e37a9f5f3b 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.421.2",
+	"version": "1.422.0",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 86a7e35c0c..26968a651a 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.421.2"
-wmill_pg = ">=1.421.2"
+wmill = ">=1.422.0"
+wmill_pg = ">=1.422.0"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 6ce1e0202a..9be31150e8 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.421.2
+  version: 1.422.0
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 9eed73c5d4..405ec6922d 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.421.2'
+ModuleVersion = '1.422.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 0ec46457c8..523e9163b1 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.421.2"
+version = "1.422.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 47bd0ed863..0a19fb3453 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.421.2"
+version = "1.422.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 afef82391e..7bc1e27f97 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.421.2",
+  "version": "1.422.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 5cd31ed603..ab0ee64a89 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.421.2",
+  "version": "1.422.0",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 520cca8f24..a9886b01f1 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.421.2
+1.422.0

From 1f09311a08fbb3aadb0313934644326b3288652e Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Mon, 11 Nov 2024 17:48:09 +0100
Subject: [PATCH 67/80] nit toast

---
 frontend/src/lib/components/toast.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/lib/components/toast.ts b/frontend/src/lib/components/toast.ts
index 8c1afb1a31..f1f1a84f19 100644
--- a/frontend/src/lib/components/toast.ts
+++ b/frontend/src/lib/components/toast.ts
@@ -1,8 +1,8 @@
 //regex that match path starting with u/ or f/ and with at least 2 /
 const pathRegex = /\b(u|f)\/[^\/\s]+\/[^\/\s]+\b/g
 
-export function processMessage(message: string): string {
-	return message.replaceAll(pathRegex, (path) => {
+export function processMessage(message: string | undefined): string {
+	return (message ?? 'Error without message').replaceAll(pathRegex, (path) => {
 		return `<span class="bg-surface-secondary p-1 text-xs font-mono whitespace-nowrap rounded-md">${path}</span>`
 	})
 }

From e5e174ae9516f4c6b94ceb6e258b467f5c9a1f1a Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 12 Nov 2024 10:15:09 +0100
Subject: [PATCH 68/80] fix: fix password inputs

---
 frontend/src/lib/components/ArgInput.svelte   | 18 ++---
 .../lib/components/PasswordArgInput.svelte    | 65 +++++++++++--------
 2 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/frontend/src/lib/components/ArgInput.svelte b/frontend/src/lib/components/ArgInput.svelte
index a1b41f2d35..ef20ebdb35 100644
--- a/frontend/src/lib/components/ArgInput.svelte
+++ b/frontend/src/lib/components/ArgInput.svelte
@@ -896,14 +896,16 @@
 				<div class="flex flex-col w-full">
 					<div class="flex flex-row w-full items-center justify-between relative">
 						{#if password || extra?.['password'] == true}
-							{#if value && typeof value == 'string' && value?.startsWith('$var:')}
-								<input type="text" bind:value />
-							{:else if onlyMaskPassword}
-								<Password
-									{disabled}
-									bind:password={value}
-									placeholder={placeholder ?? defaultValue ?? ''}
-								/>
+							{#if onlyMaskPassword}
+								{#if value && typeof value == 'string' && value?.startsWith('$var:')}
+									<input type="text" bind:value />
+								{:else}
+									<Password
+										{disabled}
+										bind:password={value}
+										placeholder={placeholder ?? defaultValue ?? ''}
+									/>
+								{/if}
 							{:else}
 								<PasswordArgInput {disabled} bind:value />
 							{/if}
diff --git a/frontend/src/lib/components/PasswordArgInput.svelte b/frontend/src/lib/components/PasswordArgInput.svelte
index 9b87e8843b..3be0daf60c 100644
--- a/frontend/src/lib/components/PasswordArgInput.svelte
+++ b/frontend/src/lib/components/PasswordArgInput.svelte
@@ -10,41 +10,54 @@
 	let path = ''
 	let password = value && !value.startsWith('$var:') ? value : ''
 
+	let isGenerating = false
 	async function generateValue() {
-		let npath =
-			'u/' +
-			($userStore?.username ?? $userStore?.email)?.split('@')[0] +
-			'/secret_arg/' +
-			generateRandomString(12)
-		let nvalue = '$var:' + npath
-		await VariableService.createVariable({
-			workspace: $workspaceStore!,
-			requestBody: {
-				value: password,
-				is_secret: true,
-				path: npath,
-				description: '',
-				expires_at: new Date(Date.now() + 1000 * 60 * 60 * 24 * 7).toISOString()
-			}
-		})
-		path = npath
-		value = nvalue
+		if (isGenerating) return
+		isGenerating = true
+		try {
+			let npath =
+				'u/' +
+				($userStore?.username ?? $userStore?.email)?.split('@')[0] +
+				'/secret_arg/' +
+				generateRandomString(12)
+			let nvalue = '$var:' + npath
+			const passwordBefore = password
+			await VariableService.createVariable({
+				workspace: $workspaceStore!,
+				requestBody: {
+					value: password,
+					is_secret: true,
+					path: npath,
+					description: 'Ephemeral secret variable',
+					expires_at: new Date(Date.now() + 1000 * 60 * 60 * 24 * 7).toISOString()
+				}
+			})
+			path = npath
+			value = nvalue
+			debouncedUpdate()
+		} finally {
+			isGenerating = false
+		}
 	}
 
 	async function updateValue() {
-		await VariableService.updateVariable({
-			workspace: $workspaceStore!,
-			path: path,
-			requestBody: {
-				value: password
-			}
-		})
+		try {
+			await VariableService.updateVariable({
+				workspace: $workspaceStore!,
+				path: path,
+				requestBody: {
+					value: password
+				}
+			})
+		} catch (e) {
+			generateValue()
+		}
 	}
 
 	let timeout: NodeJS.Timeout | undefined = undefined
 	function debouncedUpdate() {
 		timeout && clearTimeout(timeout)
-		setTimeout(updateValue, 500)
+		timeout = setTimeout(updateValue, 500)
 	}
 
 	$: password && debouncedUpdate()

From 7784c147265d98bed5820a48266986bd876bb0d5 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Tue, 12 Nov 2024 10:44:41 +0100
Subject: [PATCH 69/80] chore(main): release 1.422.1 (#4688)

* chore(main): release 1.422.1

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |  7 ++
 backend/Cargo.lock                            | 70 +++++++++----------
 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, 59 insertions(+), 52 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 467d6a40d3..81efd26ce5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.422.1](https://github.com/windmill-labs/windmill/compare/v1.422.0...v1.422.1) (2024-11-12)
+
+
+### Bug Fixes
+
+* fix password inputs ([e5e174a](https://github.com/windmill-labs/windmill/commit/e5e174ae9516f4c6b94ceb6e258b467f5c9a1f1a))
+
 ## [1.422.0](https://github.com/windmill-labs/windmill/compare/v1.421.2...v1.422.0) (2024-11-11)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index de8c9b6502..b7e16db7b4 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -96,9 +96,9 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.19"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "611cc2ae7d2e242c457e4be7f97036b8ad9ca152b499f53faf99b1ed8fc2553f"
+checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9"
 
 [[package]]
 name = "android-tzdata"
@@ -1943,9 +1943,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
+checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6"
 dependencies = [
  "libc",
 ]
@@ -6773,7 +6773,7 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.8",
+ "regex-automata 0.4.9",
  "regex-syntax 0.8.5",
 ]
 
@@ -6788,9 +6788,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -7579,9 +7579,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
 
 [[package]]
 name = "serde"
-version = "1.0.214"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
  "serde_derive",
 ]
@@ -7620,9 +7620,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.214"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10578,7 +10578,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "anyhow",
  "axum",
@@ -10620,7 +10620,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10705,7 +10705,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -10723,7 +10723,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "chrono",
  "serde",
@@ -10736,7 +10736,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10751,7 +10751,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10797,7 +10797,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10812,7 +10812,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10834,7 +10834,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10846,7 +10846,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10855,7 +10855,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10867,7 +10867,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10879,7 +10879,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10891,7 +10891,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10902,7 +10902,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10913,7 +10913,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10931,7 +10931,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10948,7 +10948,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10960,7 +10960,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10978,7 +10978,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10999,7 +10999,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -11009,7 +11009,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -11042,7 +11042,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -11052,7 +11052,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.422.0"
+version = "1.422.1"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 44a89a30bb..370f24763a 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.422.0"
+version = "1.422.1"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.422.0"
+version = "1.422.1"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index bd9b54aafb..e394d48eaf 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.422.0
+  version: 1.422.1
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index b110930bdb..f5f236d2e2 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.422.0";
+export const VERSION = "v1.422.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 b54f215ba9..e042ac9689 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.422.0";
+export const VERSION = "1.422.1";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index ed4e5b4252..accbb18fc9 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.422.0",
+	"version": "1.422.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.422.0",
+			"version": "1.422.1",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index e37a9f5f3b..cdf580b29c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.422.0",
+	"version": "1.422.1",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 26968a651a..3df63a21c2 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.422.0"
-wmill_pg = ">=1.422.0"
+wmill = ">=1.422.1"
+wmill_pg = ">=1.422.1"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 9be31150e8..cc05d20ab6 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.422.0
+  version: 1.422.1
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 405ec6922d..78e1901cdf 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.422.0'
+ModuleVersion = '1.422.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 523e9163b1..4e65d4314f 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.422.0"
+version = "1.422.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 0a19fb3453..e6d46ce661 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.422.0"
+version = "1.422.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 7bc1e27f97..97969f5f66 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.422.0",
+  "version": "1.422.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 ab0ee64a89..3163237574 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.422.0",
+  "version": "1.422.1",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index a9886b01f1..5b029f78bb 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.422.0
+1.422.1

From c3d49a352ef8d8f36f7464163ee1918f80b6b383 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 12 Nov 2024 10:46:59 +0100
Subject: [PATCH 70/80] small nit

---
 frontend/src/lib/components/PasswordArgInput.svelte | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/lib/components/PasswordArgInput.svelte b/frontend/src/lib/components/PasswordArgInput.svelte
index 3be0daf60c..c9250eab6b 100644
--- a/frontend/src/lib/components/PasswordArgInput.svelte
+++ b/frontend/src/lib/components/PasswordArgInput.svelte
@@ -21,7 +21,6 @@
 				'/secret_arg/' +
 				generateRandomString(12)
 			let nvalue = '$var:' + npath
-			const passwordBefore = password
 			await VariableService.createVariable({
 				workspace: $workspaceStore!,
 				requestBody: {

From 3d9ca62ab6d21dea7d5842ad13bea4a140548dfe Mon Sep 17 00:00:00 2001
From: HugoCasa <hugo@casademont.ch>
Date: Tue, 12 Nov 2024 16:04:36 +0100
Subject: [PATCH 71/80] ts client s3 upload add content type/disposition
 (#4690)

---
 typescript-client/client.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/typescript-client/client.ts b/typescript-client/client.ts
index c5256024a6..1fa88fca1b 100644
--- a/typescript-client/client.ts
+++ b/typescript-client/client.ts
@@ -706,7 +706,9 @@ export async function loadS3FileStream(
 export async function writeS3File(
   s3object: S3Object | undefined,
   fileContent: string | Blob,
-  s3ResourcePath: string | undefined = undefined
+  s3ResourcePath: string | undefined = undefined,
+  contentType: string | undefined = undefined,
+  contentDisposition: string | undefined = undefined
 ): Promise<S3Object> {
   let fileContentBlob: Blob;
   if (typeof fileContent === "string") {
@@ -724,6 +726,8 @@ export async function writeS3File(
     s3ResourcePath: s3ResourcePath,
     requestBody: fileContentBlob,
     storage: s3object?.storage,
+    contentType,
+    contentDisposition,
   });
   return {
     s3: response.file_key,

From 167100510032ab53cd609fb2c7629e67faceb093 Mon Sep 17 00:00:00 2001
From: HugoCasa <hugo@casademont.ch>
Date: Tue, 12 Nov 2024 20:07:59 +0100
Subject: [PATCH 72/80] feat: s3 input available for public apps (#4685)

---
 backend/ee-repo-ref.txt                       |   2 +-
 backend/windmill-api/openapi.yaml             |   4 +
 backend/windmill-api/src/apps.rs              | 350 ++++++++++++++++--
 backend/windmill-api/src/job_helpers_ee.rs    |  38 ++
 backend/windmill-api/src/users.rs             |  12 +-
 .../lib/components/LightweightArgInput.svelte |  15 +
 .../components/LightweightSchemaForm.svelte   |  15 +
 .../components/buttons/AppSchemaForm.svelte   |  26 +-
 .../helpers/RunnableComponent.svelte          |  12 +
 .../components/inputs/AppS3FileInput.svelte   |  14 +
 .../apps/editor/AppEditorHeader.svelte        |  45 ++-
 .../lib/components/apps/editor/appUtilsS3.ts  |  82 ++++
 .../settingsPanel/InputsSpecEditor.svelte     |   2 +-
 .../common/fileUpload/FileUpload.svelte       |  44 ++-
 14 files changed, 614 insertions(+), 47 deletions(-)
 create mode 100644 frontend/src/lib/components/apps/editor/appUtilsS3.ts

diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index 6a33fdaadd..7a1f8f391e 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-6534b0f31fb4a75dd706fca2ce91e37e77e4ad02
\ No newline at end of file
+8f45974252a7ce6fcf8f49482751ffa75b81bed7
\ No newline at end of file
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index e394d48eaf..154200bdcf 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -12186,6 +12186,10 @@ components:
           type: object
           additionalProperties:
             type: object
+        s3_inputs:
+          type: array
+          items:
+            type: object
         execution_mode:
           type: string
           enum: [viewer, publisher, anonymous]
diff --git a/backend/windmill-api/src/apps.rs b/backend/windmill-api/src/apps.rs
index cd65136a2a..4ec07393dc 100644
--- a/backend/windmill-api/src/apps.rs
+++ b/backend/windmill-api/src/apps.rs
@@ -7,6 +7,12 @@ use std::collections::HashMap;
  * Please see the included NOTICE for copyright information and
  * LICENSE-AGPL for a copy of the license.
  */
+
+#[cfg(feature = "parquet")]
+use crate::{job_helpers_ee::{
+    get_random_file_name, get_s3_resource, get_workspace_s3_resource, upload_file_internal,
+    UploadFileResponse,
+}, users::fetch_api_authed_from_permissioned_as};
 use crate::{
     db::{ApiAuthed, DB},
     resources::get_resource_value_interpolated_internal,
@@ -23,7 +29,13 @@ use axum::{
     Router,
 };
 use hyper::StatusCode;
+#[cfg(feature = "parquet")]
+use itertools::Itertools;
 use magic_crypt::MagicCryptTrait;
+#[cfg(feature = "parquet")]
+use object_store::{Attribute, Attributes};
+#[cfg(feature = "parquet")]
+use regex::Regex;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, value::RawValue};
 use sha2::{Digest, Sha256};
@@ -32,6 +44,8 @@ use sqlx::{types::Uuid, FromRow};
 use std::str;
 use windmill_audit::audit_ee::audit_log;
 use windmill_audit::ActionKind;
+#[cfg(feature = "parquet")]
+use windmill_common::s3_helpers::build_object_store_client;
 use windmill_common::{
     apps::ListAppQuery,
     db::UserDB,
@@ -69,6 +83,7 @@ pub fn workspaced_service() -> Router {
 pub fn unauthed_service() -> Router {
     Router::new()
         .route("/execute_component/*path", post(execute_component))
+        .route("/upload_s3_file/*path", post(upload_s3_file_from_app))
         .route("/public_app/:secret", get(get_public_app_by_secret))
         .route("/public_resource/*path", get(get_public_resource))
 }
@@ -179,6 +194,14 @@ pub struct PolicyTriggerableInputs {
     allow_user_resources: AllowUserResources,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct S3Input {
+    allowed_resources: Vec<String>,
+    allow_user_resources: bool,
+    allow_workspace_resource: bool,
+    file_key_regex: String,
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Policy {
     pub on_behalf_of: Option<String>,
@@ -192,6 +215,7 @@ pub struct Policy {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub triggerables_v2: Option<HashMap<String, PolicyTriggerableInputs>>,
     pub execution_mode: ExecutionMode,
+    pub s3_inputs: Option<Vec<S3Input>>,
 }
 
 #[derive(Deserialize)]
@@ -432,9 +456,7 @@ async fn get_latest_version(
     authed: ApiAuthed,
     Extension(user_db): Extension<UserDB>,
     Path((w_id, path)): Path<(String, StripPath)>,
-
 ) -> JsonResult<Option<AppHistory>> {
-
     let mut tx = user_db.begin(&authed).await?;
     let row = sqlx::query!(
         "SELECT a.id as app_id, av.id as version_id, dm.deployment_msg as deployment_msg
@@ -457,7 +479,6 @@ async fn get_latest_version(
     } else {
         return Ok(Json(None));
     }
-
 }
 
 async fn update_app_history(
@@ -1067,6 +1088,49 @@ fn digest(code: &str) -> String {
     format!("rawscript/{:x}", result)
 }
 
+async fn get_on_behalf_details_from_policy_and_authed(
+    policy: &Policy,
+    opt_authed: &Option<ApiAuthed>,
+) -> Result<(String, String, String)> {
+    let (username, permissioned_as, email) = match policy.execution_mode {
+        ExecutionMode::Anonymous => {
+            let username = opt_authed
+                .as_ref()
+                .map(|a| a.username.clone())
+                .unwrap_or_else(|| "anonymous".to_string());
+            let (permissioned_as, email) = get_on_behalf_of(&policy)?;
+            (username, permissioned_as, email)
+        }
+        ExecutionMode::Publisher => {
+            let username = opt_authed
+                .as_ref()
+                .map(|a| a.username.clone())
+                .ok_or_else(|| {
+                    Error::BadRequest(
+                        "publisher execution mode requires authentication".to_string(),
+                    )
+                })?;
+            let (permissioned_as, email) = get_on_behalf_of(&policy)?;
+            (username, permissioned_as, email)
+        }
+        ExecutionMode::Viewer => {
+            let (username, email) = opt_authed
+                .as_ref()
+                .map(|a| (a.username.clone(), a.email.clone()))
+                .ok_or_else(|| {
+                    Error::BadRequest("Required to be authed in viewer mode".to_string())
+                })?;
+            (
+                username.clone(),
+                username_to_permissioned_as(&username),
+                email,
+            )
+        }
+    };
+
+    Ok((username, permissioned_as, email))
+}
+
 async fn execute_component(
     OptAuthed(opt_authed): OptAuthed,
     Extension(db): Extension<DB>,
@@ -1129,6 +1193,7 @@ async fn execute_component(
                 triggerables_v2: Some(hm),
                 on_behalf_of: None,
                 on_behalf_of_email: None,
+                s3_inputs: None,
             }
         }
         _ => {
@@ -1146,41 +1211,8 @@ async fn execute_component(
         }
     };
 
-    let (username, permissioned_as, email) = match policy.execution_mode {
-        ExecutionMode::Anonymous => {
-            let username = opt_authed
-                .as_ref()
-                .map(|a| a.username.clone())
-                .unwrap_or_else(|| "anonymous".to_string());
-            let (permissioned_as, email) = get_on_behalf_of(&policy)?;
-            (username, permissioned_as, email)
-        }
-        ExecutionMode::Publisher => {
-            let username = opt_authed
-                .as_ref()
-                .map(|a| a.username.clone())
-                .ok_or_else(|| {
-                    Error::BadRequest(
-                        "publisher execution mode requires authentication".to_string(),
-                    )
-                })?;
-            let (permissioned_as, email) = get_on_behalf_of(&policy)?;
-            (username, permissioned_as, email)
-        }
-        ExecutionMode::Viewer => {
-            let (username, email) = opt_authed
-                .as_ref()
-                .map(|a| (a.username.clone(), a.email.clone()))
-                .ok_or_else(|| {
-                    Error::BadRequest("Required to be authed in viewer mode".to_string())
-                })?;
-            (
-                username.clone(),
-                username_to_permissioned_as(&username),
-                email,
-            )
-        }
-    };
+    let (username, permissioned_as, email) =
+        get_on_behalf_details_from_policy_and_authed(&policy, &opt_authed).await?;
 
     let (job_payload, (args, job_id), tag) = match payload {
         ExecuteApp { args, component, raw_code: Some(raw_code), path: None, .. } => {
@@ -1249,6 +1281,248 @@ async fn execute_component(
     Ok(uuid.to_string())
 }
 
+#[cfg(not(feature = "parquet"))]
+async fn upload_s3_file_from_app() -> Result<()> {
+    return Err(Error::BadRequest(
+        "This endpoint requires the parquet feature to be enabled".to_string(),
+    ));
+}
+
+
+#[cfg(feature = "parquet")]
+#[derive(Debug, Deserialize, Clone)]
+struct UploadFileToS3Query {
+    file_key: Option<String>,
+    file_extension: Option<String>,
+    s3_resource_path: Option<String>,
+    content_type: Option<String>,
+    content_disposition: Option<String>,
+    force_viewer_file_key_regex: Option<String>,
+    force_viewer_allow_user_resources: Option<bool>,
+    force_viewer_allow_workspace_resource: Option<bool>,
+    force_viewer_allowed_resources: Option<String>,
+}
+
+#[cfg(feature = "parquet")]
+async fn upload_s3_file_from_app(
+    OptAuthed(opt_authed): OptAuthed,
+    Extension(db): Extension<DB>,
+    Path((w_id, path)): Path<(String, StripPath)>,
+    Query(query): Query<UploadFileToS3Query>,
+    request: axum::extract::Request,
+) -> JsonResult<UploadFileResponse> {
+    let policy = if let Some(file_key_regex) = query.force_viewer_file_key_regex {
+        Some(Policy {
+            execution_mode: ExecutionMode::Viewer,
+            triggerables: None,
+            triggerables_v2: None,
+            on_behalf_of: None,
+            on_behalf_of_email: None,
+            s3_inputs: Some(vec![S3Input {
+                file_key_regex: file_key_regex,
+                allow_user_resources: query.force_viewer_allow_user_resources.unwrap_or(false),
+                allow_workspace_resource: query
+                    .force_viewer_allow_workspace_resource
+                    .unwrap_or(false),
+                allowed_resources: query
+                    .force_viewer_allowed_resources
+                    .map(|s| s.split(',').map(|s| s.to_string()).collect())
+                    .unwrap_or_default(),
+            }]),
+        })
+    } else {
+        let policy_o = sqlx::query_scalar!(
+            "SELECT policy from app WHERE path = $1 AND workspace_id = $2",
+            &path.0,
+            &w_id
+        )
+        .fetch_optional(&db)
+        .await?;
+
+        policy_o
+            .map(|p| serde_json::from_value::<Policy>(p).map_err(to_anyhow))
+            .transpose()?
+    };
+
+    let user_db = UserDB::new(db.clone());
+
+    let (s3_resource_opt, file_key) = if policy.as_ref().is_some_and(|p| p.s3_inputs.is_some()) {
+        let policy = policy.unwrap();
+        let s3_inputs = policy.s3_inputs.as_ref().unwrap();
+
+        let (username, permissioned_as, email) =
+            get_on_behalf_details_from_policy_and_authed(&policy, &opt_authed).await?;
+
+        let on_behalf_authed =
+            fetch_api_authed_from_permissioned_as(permissioned_as, email, &w_id, &db, username)
+                .await?;
+
+        if let Some(file_key) = query.file_key {
+            // file key is provided => requires workspace, user or list policy and must match the regex
+            let matching_s3_inputs = if let Some(ref s3_resource_path) = query.s3_resource_path {
+                s3_inputs
+                    .iter()
+                    .filter(|s3_input| {
+                        s3_input.allowed_resources.contains(s3_resource_path)
+                            || s3_input.allow_user_resources
+                    })
+                    .sorted_by_key(|i| i.allow_user_resources) // consider user resources last
+                    .collect::<Vec<_>>()
+            } else {
+                s3_inputs
+                    .iter()
+                    .filter(|s3_input| s3_input.allow_workspace_resource)
+                    .collect::<Vec<_>>()
+            };
+
+            let matched_input = matching_s3_inputs.iter().find(|s3_input| {
+                match Regex::new(&s3_input.file_key_regex) {
+                    Ok(re) => re.is_match(&file_key),
+                    Err(e) => {
+                        tracing::error!("Error compiling regex: {}", e);
+                        false
+                    }
+                }
+            });
+
+            if let Some(matched_input) = matched_input {
+                if let Some(ref s3_resource_path) = query.s3_resource_path {
+                    if matched_input.allow_user_resources {
+                        if let Some(authed) = opt_authed {
+                            (
+                                Some(
+                                    get_s3_resource(
+                                        &authed,
+                                        &db,
+                                        Some(user_db),
+                                        "",
+                                        &w_id,
+                                        s3_resource_path,
+                                        None,
+                                        None,
+                                    )
+                                    .await?,
+                                ),
+                                file_key,
+                            )
+                        } else {
+                            return Err(Error::BadRequest(
+                                "User resources are not allowed without being logged in"
+                                    .to_string(),
+                            ));
+                        }
+                    } else {
+                        (
+                            Some(
+                                get_s3_resource(
+                                    &on_behalf_authed,
+                                    &db,
+                                    Some(user_db),
+                                    "",
+                                    &w_id,
+                                    s3_resource_path,
+                                    None,
+                                    None,
+                                )
+                                .await?,
+                            ),
+                            file_key,
+                        )
+                    }
+                } else {
+                    let (_, s3_resource_opt) =
+                        get_workspace_s3_resource(&on_behalf_authed, &db, None, "", &w_id, None)
+                            .await?;
+                    (s3_resource_opt, file_key)
+                }
+            } else {
+                return Err(Error::BadRequest(
+                    "No matching s3 resource found for the given file key".to_string(),
+                ));
+            }
+        } else {
+            // no file key => requires unnamed upload policy => allow workspace resource and file_key_regex is empty
+            let has_unnamed_policy = s3_inputs.iter().any(|s3_input| {
+                s3_input.allow_workspace_resource && s3_input.file_key_regex.is_empty()
+            });
+
+            if !has_unnamed_policy {
+                return Err(Error::BadRequest(
+                    "no policy found for unnamed s3 file uplooad".to_string(),
+                ));
+            }
+
+            // for now, we place all files into `windmill_uploads` folder with a random name
+            // TODO: make the folder configurable via the workspace settings
+            let file_key = get_random_file_name(query.file_extension);
+
+            let (_, s3_resource_opt) =
+                get_workspace_s3_resource(&on_behalf_authed, &db, None, "", &w_id, None).await?;
+
+            (s3_resource_opt, file_key)
+        }
+    } else {
+        // backward compatibility (no policy)
+        // if no policy but logged in, use the user's auth to get the s3 resource
+        if let Some(authed) = opt_authed {
+            let file_key = query
+                .file_key
+                .unwrap_or_else(|| get_random_file_name(query.file_extension));
+
+            if let Some(ref s3_resource_path) = query.s3_resource_path {
+                (
+                    Some(
+                        get_s3_resource(
+                            &authed,
+                            &db,
+                            Some(user_db),
+                            "",
+                            &w_id,
+                            s3_resource_path,
+                            None,
+                            None,
+                        )
+                        .await?,
+                    ),
+                    file_key,
+                )
+            } else {
+                let (_, s3_resource) =
+                    get_workspace_s3_resource(&authed, &db, None, "", &w_id, None).await?;
+
+                (s3_resource, file_key)
+            }
+        } else {
+            return Err(Error::BadRequest("Missing s3 policy".to_string()));
+        }
+    };
+
+    let s3_resource = s3_resource_opt.ok_or(Error::InternalErr(
+        "No files storage resource defined at the workspace level".to_string(),
+    ))?;
+    let s3_client = build_object_store_client(&s3_resource).await?;
+
+    let options = Attributes::from_iter(vec![
+        (
+            Attribute::ContentType,
+            query.content_type.unwrap_or_else(|| {
+                mime_guess::from_path(&file_key)
+                    .first_or_octet_stream()
+                    .to_string()
+            }),
+        ),
+        (
+            Attribute::ContentDisposition,
+            query.content_disposition.unwrap_or("inline".to_string()),
+        ),
+    ])
+    .into();
+
+    upload_file_internal(s3_client, &file_key, request, options).await?;
+
+    return Ok(Json(UploadFileResponse { file_key }));
+}
+
 fn get_on_behalf_of(policy: &Policy) -> Result<(String, String)> {
     let permissioned_as = policy
         .on_behalf_of
diff --git a/backend/windmill-api/src/job_helpers_ee.rs b/backend/windmill-api/src/job_helpers_ee.rs
index b64ccde92d..3033a2ec5a 100644
--- a/backend/windmill-api/src/job_helpers_ee.rs
+++ b/backend/windmill-api/src/job_helpers_ee.rs
@@ -1,9 +1,21 @@
 use axum::Router;
+use serde::Serialize;
+use uuid::Uuid;
+use windmill_common::s3_helpers::StorageResourceType;
 
 #[cfg(feature = "parquet")]
 use crate::db::{ApiAuthed, DB};
 #[cfg(feature = "parquet")]
+use object_store::{ObjectStore, PutMultipartOpts};
+#[cfg(feature = "parquet")]
+use std::sync::Arc;
+use windmill_common::error;
+#[cfg(feature = "parquet")]
 use windmill_common::{db::UserDB, s3_helpers::ObjectStoreResource};
+#[derive(Serialize)]
+pub struct UploadFileResponse {
+    pub file_key: String,
+}
 
 pub fn workspaced_service() -> Router {
     Router::new()
@@ -21,3 +33,29 @@ pub async fn get_workspace_s3_resource<'c>(
     // implementation is not open source
     Ok((None, None))
 }
+
+pub fn get_random_file_name(_file_extension: Option<String>) -> String {
+    todo!()
+}
+
+pub async fn get_s3_resource<'c>(
+    _authed: &ApiAuthed,
+    _db: &DB,
+    _user_db: Option<UserDB>,
+    _token: &str,
+    _w_id: &str,
+    _resource_path: &str,
+    _resource_type: Option<StorageResourceType>,
+    _job_id: Option<Uuid>,
+) -> error::Result<ObjectStoreResource> {
+    todo!()
+}
+
+pub async fn upload_file_internal(
+    _s3_client: Arc<dyn ObjectStore>,
+    _file_key: &str,
+    _request: axum::extract::Request,
+    _options: PutMultipartOpts,
+) -> error::Result<()> {
+    todo!()
+}
diff --git a/backend/windmill-api/src/users.rs b/backend/windmill-api/src/users.rs
index 005dfad342..380084d524 100644
--- a/backend/windmill-api/src/users.rs
+++ b/backend/windmill-api/src/users.rs
@@ -746,10 +746,20 @@ pub async fn fetch_api_authed(
     username_override: String,
 ) -> error::Result<ApiAuthed> {
     let permissioned_as = username_to_permissioned_as(username.as_str());
+    fetch_api_authed_from_permissioned_as(permissioned_as, email, w_id, db, username_override).await
+}
+
+pub async fn fetch_api_authed_from_permissioned_as(
+    permissioned_as: String,
+    email: String,
+    w_id: &str,
+    db: &DB,
+    username_override: String,
+) -> error::Result<ApiAuthed> {
     let authed =
         fetch_authed_from_permissioned_as(permissioned_as, email.clone(), w_id, db).await?;
     Ok(ApiAuthed {
-        username: username,
+        username: authed.username,
         email: email,
         is_admin: authed.is_admin,
         is_operator: authed.is_operator,
diff --git a/frontend/src/lib/components/LightweightArgInput.svelte b/frontend/src/lib/components/LightweightArgInput.svelte
index bc15a41926..f9c4a04ed0 100644
--- a/frontend/src/lib/components/LightweightArgInput.svelte
+++ b/frontend/src/lib/components/LightweightArgInput.svelte
@@ -61,6 +61,18 @@
 	export let render = true
 	export let title: string | undefined = undefined
 	export let placeholder: string | undefined = undefined
+	export let appPath: string | undefined = undefined
+	export let computeS3ForceViewerPolicies:
+		| (() =>
+				| {
+						allowed_resources: string[]
+						allow_user_resources: boolean
+						allow_workspace_resource: boolean
+						file_key_regex: string
+				  }
+				| undefined)
+		| undefined = undefined
+	export let workspace: string | undefined = undefined
 
 	let oneOfSelected: string | undefined = undefined
 	async function updateOneOfSelected(oneOf: SchemaProperty[] | undefined) {
@@ -428,6 +440,9 @@
 						.toLowerCase() == 's3object'}
 					<div class="flex flex-col w-full gap-1">
 						<FileUpload
+							{appPath}
+							computeForceViewerPolicies={computeS3ForceViewerPolicies}
+							{workspace}
 							allowMultiple={false}
 							randomFileKey={true}
 							on:addition={(evt) => {
diff --git a/frontend/src/lib/components/LightweightSchemaForm.svelte b/frontend/src/lib/components/LightweightSchemaForm.svelte
index d4da597066..55b1373b4d 100644
--- a/frontend/src/lib/components/LightweightSchemaForm.svelte
+++ b/frontend/src/lib/components/LightweightSchemaForm.svelte
@@ -16,6 +16,18 @@
 	export let defaultValues: Record<string, any> = {}
 	export let dynamicEnums: Record<string, any> = {}
 	export let disabled: boolean = false
+	export let appPath: string | undefined = undefined
+	export let computeS3ForceViewerPolicies:
+		| (() =>
+				| {
+						allowed_resources: string[]
+						allow_user_resources: boolean
+						allow_workspace_resource: boolean
+						file_key_regex: string
+				  }
+				| undefined)
+		| undefined = undefined
+	export let workspace: string | undefined = undefined
 
 	let inputCheck: { [id: string]: boolean } = {}
 	let errors: { [id: string]: string } = {}
@@ -104,6 +116,9 @@
 				{displayType}
 				{css}
 				disabled={disabled || schema.properties[argName].disabled}
+				{appPath}
+				{computeS3ForceViewerPolicies}
+				{workspace}
 			/>
 		{/if}
 	{/each}
diff --git a/frontend/src/lib/components/apps/components/buttons/AppSchemaForm.svelte b/frontend/src/lib/components/apps/components/buttons/AppSchemaForm.svelte
index fcbd4e789a..a77d708e13 100644
--- a/frontend/src/lib/components/apps/components/buttons/AppSchemaForm.svelte
+++ b/frontend/src/lib/components/apps/components/buttons/AppSchemaForm.svelte
@@ -18,6 +18,9 @@
 	import ResolveConfig from '../helpers/ResolveConfig.svelte'
 	import ResolveStyle from '../helpers/ResolveStyle.svelte'
 	import { deepEqual } from 'fast-equals'
+	import { computeWorkspaceS3FileInputPolicy } from '../../editor/appUtilsS3'
+	import { defaultIfEmptyString } from '$lib/utils'
+	import { userStore } from '$lib/stores'
 
 	export let id: string
 	export let componentInput: AppInput | undefined
@@ -26,8 +29,16 @@
 	export let configuration: RichConfigurations
 	export let customCss: ComponentCustomCSS<'schemaformcomponent'> | undefined = undefined
 
-	const { worldStore, connectingInput, app, selectedComponent, componentControl } =
-		getContext<AppViewerContext>('AppViewerContext')
+	const {
+		worldStore,
+		connectingInput,
+		app,
+		selectedComponent,
+		componentControl,
+		appPath,
+		isEditor,
+		workspace
+	} = getContext<AppViewerContext>('AppViewerContext')
 	const iterContext = getContext<ListContext>('ListWrapperContext')
 	const listInputs: ListInputs | undefined = getContext<ListInputs>('ListInputs')
 
@@ -100,6 +111,14 @@
 		previousDefault = structuredClone(resolvedConfig.defaultValues)
 		args = previousDefault ?? {}
 	}
+
+	function computeS3ForceViewerPolicies() {
+		if (!isEditor) {
+			return undefined
+		}
+		const policy = computeWorkspaceS3FileInputPolicy()
+		return policy
+	}
 </script>
 
 {#each Object.keys(components['schemaformcomponent'].initialData.configuration) as key (key)}
@@ -140,6 +159,9 @@
 					bind:this={schemaForm}
 					displayType={Boolean(resolvedConfig.displayType)}
 					largeGap={Boolean(resolvedConfig.largeGap)}
+					appPath={defaultIfEmptyString(appPath, `u/${$userStore?.username ?? 'unknown'}/newapp`)}
+					{computeS3ForceViewerPolicies}
+					{workspace}
 					{css}
 				/>
 			</div>
diff --git a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
index 66fd746285..286c5ac573 100644
--- a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
@@ -26,6 +26,7 @@
 	import { get } from 'svelte/store'
 	import RefreshButton from '$lib/components/apps/components/helpers/RefreshButton.svelte'
 	import { ctxRegex } from '../../utils'
+	import { computeWorkspaceS3FileInputPolicy } from '../../editor/appUtilsS3'
 
 	// Component props
 	export let id: string
@@ -671,6 +672,14 @@
 			return undefined
 		}
 	}
+
+	function computeS3ForceViewerPolicies() {
+		if (!isEditor) {
+			return undefined
+		}
+		const policy = computeWorkspaceS3FileInputPolicy()
+		return policy
+	}
 </script>
 
 {#each Object.entries(fields ?? {}) as [key, v] (key)}
@@ -754,6 +763,9 @@
 			<div class="px-2 h-fit min-h-0">
 				<LightweightSchemaForm
 					schema={schemaStripped}
+					appPath={defaultIfEmptyString(appPath, `u/${$userStore?.username ?? 'unknown'}/newapp`)}
+					{computeS3ForceViewerPolicies}
+					{workspace}
 					bind:this={schemaForm}
 					bind:args
 					on:inputClicked={handleInputClick}
diff --git a/frontend/src/lib/components/apps/components/inputs/AppS3FileInput.svelte b/frontend/src/lib/components/apps/components/inputs/AppS3FileInput.svelte
index 32f99024c6..06c049bf10 100644
--- a/frontend/src/lib/components/apps/components/inputs/AppS3FileInput.svelte
+++ b/frontend/src/lib/components/apps/components/inputs/AppS3FileInput.svelte
@@ -10,6 +10,9 @@
 	import { writable, type Writable } from 'svelte/store'
 	import FileUpload from '$lib/components/common/fileUpload/FileUpload.svelte'
 	import InitializeComponent from '../helpers/InitializeComponent.svelte'
+	import { computeS3FileInputPolicy } from '../../editor/appUtilsS3'
+	import { defaultIfEmptyString } from '$lib/utils'
+	import { userStore } from '$lib/stores'
 
 	export let id: string
 	export let configuration: RichConfigurations
@@ -77,6 +80,15 @@
 									{/if}
 									*/
 	let forceDisplayUploads: boolean = false
+
+	const { appPath, isEditor } = getContext<AppViewerContext>('AppViewerContext')
+	function computeForceViewerPolicies() {
+		if (!isEditor) {
+			return undefined
+		}
+		const policy = computeS3FileInputPolicy((configuration as any)?.type?.configuration?.s3, $app)
+		return policy
+	}
 </script>
 
 <InitializeComponent {id} />
@@ -139,5 +151,7 @@
 			outputs.result.set(value)
 		}}
 		{forceDisplayUploads}
+		appPath={defaultIfEmptyString(appPath, `u/${$userStore?.username ?? 'unknown'}/newapp`)}
+		{computeForceViewerPolicies}
 	/>
 {/if}
diff --git a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
index af2f4563df..662631f752 100644
--- a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
+++ b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
@@ -87,6 +87,7 @@
 	import ToggleEnable from '$lib/components/common/toggleButton-v2/ToggleEnable.svelte'
 	import HideButton from './settingsPanel/HideButton.svelte'
 	import DeployOverrideConfirmationModal from '$lib/components/common/confirmationModal/DeployOverrideConfirmationModal.svelte'
+	import { computeS3FileInputPolicy, computeWorkspaceS3FileInputPolicy } from './appUtilsS3'
 
 	async function hash(message) {
 		try {
@@ -195,8 +196,12 @@
 	}
 
 	async function computeTriggerables() {
+		const items = allItems($app.grid, $app.subgrids)
+
+		console.log('items', items)
+
 		const allTriggers: ([string, TriggerableV2] | undefined)[] = (await Promise.all(
-			allItems($app.grid, $app.subgrids)
+			items
 				.flatMap((x) => {
 					let c = x.data as AppComponent
 					let r: { input: AppInput | undefined; id: string }[] = [
@@ -296,6 +301,44 @@
 			allTriggers.filter(Boolean) as [string, TriggerableV2][]
 		)
 		policy.triggerables_v2 = ntriggerables
+
+		const s3_inputs = items
+			.filter((x) => (x.data as AppComponent).type === 's3fileinputcomponent')
+			.map((x) => {
+				const c = x.data as AppComponent
+				const config = c.configuration as any
+				return computeS3FileInputPolicy(config?.type?.configuration?.s3, $app)
+			})
+			.filter(Boolean) as {
+			allowed_resources: string[]
+			allow_user_resources: boolean
+			file_key_regex: string
+		}[]
+
+		if (
+			items.findIndex((x) => {
+				const c = x.data as AppComponent
+				if (c.type === 'schemaformcomponent') {
+					return (
+						Object.values((c.componentInput as any)?.value?.properties ?? {}).findIndex(
+							(p: any) => p?.type === 'object' && p?.format === 'resource-s3_object'
+						) !== -1
+					)
+				} else if (c.type === 'formbuttoncomponent' || c.type === 'formcomponent') {
+					return (
+						Object.values((c.componentInput as any)?.fields ?? {}).findIndex(
+							(p: any) => p?.fieldType === 'object' && p?.format === 'resource-s3_object'
+						) !== -1
+					)
+				} else {
+					return false
+				}
+			}) !== -1
+		) {
+			s3_inputs.push(computeWorkspaceS3FileInputPolicy())
+		}
+
+		policy.s3_inputs = s3_inputs
 	}
 
 	async function processRunnable(
diff --git a/frontend/src/lib/components/apps/editor/appUtilsS3.ts b/frontend/src/lib/components/apps/editor/appUtilsS3.ts
new file mode 100644
index 0000000000..2256331cc4
--- /dev/null
+++ b/frontend/src/lib/components/apps/editor/appUtilsS3.ts
@@ -0,0 +1,82 @@
+import type { AppInput, EvalInputV2 } from '../inputType'
+import type { App } from '../types'
+import { collectOneOfFields } from './appUtils'
+
+function filenameExprToRegex(template: string) {
+	const filenameEscaped = template.replaceAll('${file.name}', '<file_name>') // replace filename with placeholder
+	const escapedTemplate = filenameEscaped
+		.slice(1, -1) // remove quotes
+		.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') // escape regex special characters
+	const regexPattern = escapedTemplate.replaceAll('<file_name>', '[^/]+') // replace filename placeholder with regex pattern
+	return `^${regexPattern}$`
+}
+
+function staticToRegex(str: string) {
+	return `^${str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}$`
+}
+
+function checkIfExprIsString(input: string) {
+	return /^(['"`])[^'"`]*\1$/g.test(input)
+}
+
+function checkIfEvalIsStringWithFilename(input: EvalInputV2) {
+	if (input.connections.length > 0) {
+		return false
+	} else {
+		return checkIfExprIsString(input.expr.replaceAll('${file.name}', ''))
+	}
+}
+
+function removeResourcePrefix(resource: string) {
+	return resource.replace(/^\$res:/, '')
+}
+
+export function computeWorkspaceS3FileInputPolicy() {
+	return {
+		allow_workspace_resource: true,
+		allowed_resources: [],
+		allow_user_resources: false,
+		file_key_regex: ''
+	}
+}
+
+export function computeS3FileInputPolicy(s3Config: any, app: App) {
+	const resourceInput = s3Config?.resource as AppInput | undefined
+	const pathTemplateInput = s3Config?.pathTemplate as AppInput | undefined
+
+	const allow_workspace_resource =
+		!resourceInput || (resourceInput.type === 'static' && !resourceInput.value)
+	const allowed_resources: string[] = resourceInput
+		? resourceInput.type === 'static'
+			? resourceInput.value
+				? [removeResourcePrefix(resourceInput.value)]
+				: []
+			: collectOneOfFields(
+					{
+						s3_resource: resourceInput
+					},
+					app
+			  ).s3_resource?.map((s) => removeResourcePrefix(s)) ?? []
+		: []
+
+	const allow_user_resources =
+		(resourceInput?.type === 'evalv2' && resourceInput?.allowUserResources) ?? false
+	let file_key_regex = '^.*$'
+	if (pathTemplateInput) {
+		if (pathTemplateInput.type === 'static') {
+			file_key_regex = staticToRegex(pathTemplateInput.value)
+		} else if (
+			pathTemplateInput.type === 'evalv2' &&
+			checkIfEvalIsStringWithFilename(pathTemplateInput)
+		) {
+			file_key_regex = filenameExprToRegex(pathTemplateInput.expr)
+		}
+	}
+
+	return {
+		allow_workspace_resource,
+		allowed_resources,
+		allow_user_resources,
+		file_key_regex
+	}
+}
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/InputsSpecEditor.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/InputsSpecEditor.svelte
index 14ecb4855c..02cfce4ea4 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/InputsSpecEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/InputsSpecEditor.svelte
@@ -193,7 +193,7 @@
 		{:else if componentInput?.type === 'user'}
 			<span class="text-2xs italic text-tertiary">Field's value is set by the user</span>
 		{/if}
-		{#if (componentInput?.type === 'evalv2' || componentInput?.type === 'connected' || componentInput?.type === 'user') && fieldType == 'object' && format?.startsWith('resource-')}
+		{#if (componentInput?.type === 'evalv2' || componentInput?.type === 'connected' || componentInput?.type === 'user') && ((fieldType == 'object' && format?.startsWith('resource-') && format !== 'resource-s3_object') || fieldType == 'resource')}
 			<div class="flex flex-row items-center">
 				<Toggle
 					size="xs"
diff --git a/frontend/src/lib/components/common/fileUpload/FileUpload.svelte b/frontend/src/lib/components/common/fileUpload/FileUpload.svelte
index a2e579a86c..d2c326d5fe 100644
--- a/frontend/src/lib/components/common/fileUpload/FileUpload.svelte
+++ b/frontend/src/lib/components/common/fileUpload/FileUpload.svelte
@@ -4,7 +4,7 @@
 
 	import Button from '$lib/components/common/button/Button.svelte'
 	import { sendUserToast } from '$lib/toast'
-	import { workspaceStore } from '$lib/stores'
+	import { userStore, workspaceStore } from '$lib/stores'
 	import { HelpersService } from '$lib/gen'
 	import { writable, type Writable } from 'svelte/store'
 	import { Ban, CheckCheck, FileWarning, Files, RefreshCcw, Trash } from 'lucide-svelte'
@@ -27,6 +27,17 @@
 	export let defaultValue: string | undefined = undefined
 	export let workspace: string | undefined = undefined
 	export let fileUploads: Writable<FileUploadData[]> = writable([])
+	export let appPath: string | undefined = undefined
+	export let computeForceViewerPolicies:
+		| (() =>
+				| {
+						allowed_resources: string[]
+						allow_user_resources: boolean
+						allow_workspace_resource: boolean
+						file_key_regex: string
+				  }
+				| undefined)
+		| undefined = undefined
 
 	const dispatch = createEventDispatcher()
 
@@ -115,6 +126,26 @@
 				params.append('content_type', fileToUpload.type)
 			}
 
+			if (computeForceViewerPolicies !== undefined) {
+				const forceViewerPolicies = computeForceViewerPolicies()
+
+				if (forceViewerPolicies) {
+					params.append(
+						'force_viewer_allowed_resources',
+						forceViewerPolicies.allowed_resources.join(',')
+					)
+					params.append(
+						'force_viewer_allow_user_resources',
+						JSON.stringify(forceViewerPolicies.allow_user_resources)
+					)
+					params.append(
+						'force_viewer_allow_workspace_resource',
+						JSON.stringify(forceViewerPolicies.allow_workspace_resource)
+					)
+					params.append('force_viewer_file_key_regex', forceViewerPolicies.file_key_regex)
+				}
+			}
+
 			// let response = await fetch(
 			// 	`/api/w/${$workspaceStore}/job_helpers/multipart_upload_s3_file?${params.toString()}`,
 			// 	{
@@ -158,9 +189,16 @@
 						}
 					}
 				})
+
 				xhr?.open(
 					'POST',
-					`/api/w/${workspace ?? $workspaceStore}/job_helpers/upload_s3_file?${params.toString()}`,
+					appPath
+						? `/api/w/${
+								workspace ?? $workspaceStore
+						  }/apps_u/upload_s3_file/${appPath}?${params.toString()}`
+						: `/api/w/${
+								workspace ?? $workspaceStore
+						  }/job_helpers/upload_s3_file?${params.toString()}`,
 					true
 				)
 				xhr?.setRequestHeader('Content-Type', 'application/octet-stream')
@@ -309,7 +347,7 @@
 									</Button>
 								{/if}
 
-								{#if fileUpload.progress === 100 && !fileUpload.cancelled}
+								{#if fileUpload.progress === 100 && !fileUpload.cancelled && $userStore}
 									<Button
 										size="xs2"
 										color="red"

From 5e9870a8a993032ec7d45c62e0023008da42c74a Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 12 Nov 2024 22:34:54 +0100
Subject: [PATCH 73/80] fix: prevent underflow for autoscaling scalein

---
 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 7a1f8f391e..84f818e63f 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-8f45974252a7ce6fcf8f49482751ffa75b81bed7
\ No newline at end of file
+8dec1f16e67b8b5b69bf8d605ada861950ac5de0
\ No newline at end of file

From 50861fccc0cd86d4c76120c3306adf94f375330e Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 12 Nov 2024 23:31:00 +0100
Subject: [PATCH 74/80] fix: support multiple pip-extra-index-url with commas

---
 backend/windmill-worker/src/python_executor.rs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/backend/windmill-worker/src/python_executor.rs b/backend/windmill-worker/src/python_executor.rs
index 112b3c84ca..9db4ed529b 100644
--- a/backend/windmill-worker/src/python_executor.rs
+++ b/backend/windmill-worker/src/python_executor.rs
@@ -199,8 +199,11 @@ pub async fn uv_pip_compile(
             .clone()
             .map(handle_ephemeral_token);
         if let Some(url) = pip_extra_index_url.as_ref() {
-            args.extend(["--extra-index-url", url, "--no-emit-index-url"]);
-            pip_args.push(format!("--extra-index-url {}", url));
+            url.split(",").for_each(|url| {
+                args.extend(["--extra-index-url", url]);
+                pip_args.push(format!("--extra-index-url {}", url));
+            });
+            args.push("--no-emit-index-url");
         }
         let pip_index_url = PIP_INDEX_URL
             .read()
@@ -279,7 +282,9 @@ pub async fn uv_pip_compile(
             .clone()
             .map(handle_ephemeral_token);
         if let Some(url) = pip_extra_index_url.as_ref() {
-            args.extend(["--extra-index-url", url]);
+            url.split(",").for_each(|url| {
+                args.extend(["--extra-index-url", url]);
+            });
         }
         let pip_index_url = PIP_INDEX_URL
             .read()
@@ -1167,7 +1172,9 @@ pub async fn handle_python_reqs(
                 .map(handle_ephemeral_token);
 
             if let Some(url) = pip_extra_index_url.as_ref() {
-                command_args.extend(["--extra-index-url", url]);
+                url.split(",").for_each(|url| {
+                    command_args.extend(["--extra-index-url", url]);
+                });
             }
             let pip_index_url = PIP_INDEX_URL
                 .read()

From c1b220be26145c89ba943da5a48131b2cbd1fdbd Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Tue, 12 Nov 2024 23:41:33 +0100
Subject: [PATCH 75/80] chore(main): release 1.423.0 (#4691)

* chore(main): release 1.423.0

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  | 13 ++++
 backend/Cargo.lock                            | 76 ++++++++++---------
 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, 71 insertions(+), 52 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81efd26ce5..3c49c420ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [1.423.0](https://github.com/windmill-labs/windmill/compare/v1.422.1...v1.423.0) (2024-11-12)
+
+
+### Features
+
+* s3 input available for public apps ([#4685](https://github.com/windmill-labs/windmill/issues/4685)) ([1671005](https://github.com/windmill-labs/windmill/commit/167100510032ab53cd609fb2c7629e67faceb093))
+
+
+### Bug Fixes
+
+* prevent underflow for autoscaling scalein ([5e9870a](https://github.com/windmill-labs/windmill/commit/5e9870a8a993032ec7d45c62e0023008da42c74a))
+* support multiple pip-extra-index-url with commas ([50861fc](https://github.com/windmill-labs/windmill/commit/50861fccc0cd86d4c76120c3306adf94f375330e))
+
 ## [1.422.1](https://github.com/windmill-labs/windmill/compare/v1.422.0...v1.422.1) (2024-11-12)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index b7e16db7b4..c2bef9f3a4 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1598,9 +1598,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.37"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40545c26d092346d8a8dab71ee48e7685a7a9cba76e634790c215b41a4a7b4cf"
+checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"
 dependencies = [
  "jobserver",
  "libc",
@@ -1789,7 +1789,7 @@ checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7"
 dependencies = [
  "strum 0.26.3",
  "strum_macros 0.26.4",
- "unicode-width",
+ "unicode-width 0.1.14",
 ]
 
 [[package]]
@@ -1816,7 +1816,7 @@ dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
- "unicode-width",
+ "unicode-width 0.1.14",
  "windows-sys 0.52.0",
 ]
 
@@ -2577,7 +2577,7 @@ dependencies = [
  "swc_visit_macros",
  "text_lines",
  "thiserror",
- "unicode-width",
+ "unicode-width 0.1.14",
  "url",
 ]
 
@@ -3808,7 +3808,7 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
 dependencies = [
- "unicode-width",
+ "unicode-width 0.1.14",
 ]
 
 [[package]]
@@ -4560,15 +4560,15 @@ dependencies = [
 
 [[package]]
 name = "indicatif"
-version = "0.17.8"
+version = "0.17.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
+checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281"
 dependencies = [
  "console",
- "instant",
  "number_prefix",
  "portable-atomic",
- "unicode-width",
+ "unicode-width 0.2.0",
+ "web-time",
 ]
 
 [[package]]
@@ -8539,7 +8539,7 @@ dependencies = [
  "swc_eq_ignore_macros",
  "swc_visit",
  "tracing",
- "unicode-width",
+ "unicode-width 0.1.14",
  "url",
 ]
 
@@ -10116,6 +10116,12 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
 [[package]]
 name = "unicode-xid"
 version = "0.2.6"
@@ -10578,7 +10584,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "anyhow",
  "axum",
@@ -10620,7 +10626,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10705,7 +10711,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -10723,7 +10729,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "chrono",
  "serde",
@@ -10736,7 +10742,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10751,7 +10757,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10797,7 +10803,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10812,7 +10818,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10834,7 +10840,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10846,7 +10852,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10855,7 +10861,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10867,7 +10873,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10879,7 +10885,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10891,7 +10897,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10902,7 +10908,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10913,7 +10919,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10931,7 +10937,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10948,7 +10954,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10960,7 +10966,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10978,7 +10984,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10999,7 +11005,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -11009,7 +11015,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -11042,7 +11048,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -11052,7 +11058,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.422.1"
+version = "1.423.0"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 370f24763a..e420f93e08 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.422.1"
+version = "1.423.0"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.422.1"
+version = "1.423.0"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 154200bdcf..774d746b63 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.422.1
+  version: 1.423.0
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index f5f236d2e2..3f933abd79 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.422.1";
+export const VERSION = "v1.423.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 e042ac9689..10d3c10bc1 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.422.1";
+export const VERSION = "1.423.0";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index accbb18fc9..fae6a3a854 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.422.1",
+	"version": "1.423.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.422.1",
+			"version": "1.423.0",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index cdf580b29c..f0b0023efe 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.422.1",
+	"version": "1.423.0",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 3df63a21c2..9b31d07d1a 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.422.1"
-wmill_pg = ">=1.422.1"
+wmill = ">=1.423.0"
+wmill_pg = ">=1.423.0"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index cc05d20ab6..fa0fe9bfce 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.422.1
+  version: 1.423.0
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 78e1901cdf..0dda1be638 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.422.1'
+ModuleVersion = '1.423.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 4e65d4314f..de4083a1d2 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.422.1"
+version = "1.423.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 e6d46ce661..042aeb26c9 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.422.1"
+version = "1.423.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 97969f5f66..1f6ba0a44e 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.422.1",
+  "version": "1.423.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 3163237574..04f11f52e4 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.422.1",
+  "version": "1.423.0",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 5b029f78bb..9e780c1cbe 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.422.1
+1.423.0

From de00944f09699ff33a382f5a14f515ccf90b2454 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 13 Nov 2024 00:21:45 +0100
Subject: [PATCH 76/80] fix(autoscaling): autoscaling thresholds to be >= and
 not >

---
 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 84f818e63f..1a95bfe721 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-8dec1f16e67b8b5b69bf8d605ada861950ac5de0
\ No newline at end of file
+5938b3f66b070ba3578aeeda89e6cc17c4cbda2d
\ No newline at end of file

From 9f7aa01cac09d0c1c57335ddbc80926be85810bf Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Wed, 13 Nov 2024 11:23:44 +0100
Subject: [PATCH 77/80] chore(main): release 1.423.1 (#4693)

* chore(main): release 1.423.1

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |  7 +++
 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, 48 insertions(+), 41 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c49c420ec..3fb83ac956 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.423.1](https://github.com/windmill-labs/windmill/compare/v1.423.0...v1.423.1) (2024-11-12)
+
+
+### Bug Fixes
+
+* **autoscaling:** autoscaling thresholds to be &gt;= and not > ([de00944](https://github.com/windmill-labs/windmill/commit/de00944f09699ff33a382f5a14f515ccf90b2454))
+
 ## [1.423.0](https://github.com/windmill-labs/windmill/compare/v1.422.1...v1.423.0) (2024-11-12)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index c2bef9f3a4..56bca6cb08 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -10584,7 +10584,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "anyhow",
  "axum",
@@ -10626,7 +10626,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10711,7 +10711,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -10729,7 +10729,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "chrono",
  "serde",
@@ -10742,7 +10742,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "anyhow",
  "rsmq_async",
@@ -10757,7 +10757,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10803,7 +10803,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10818,7 +10818,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10840,7 +10840,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10852,7 +10852,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10861,7 +10861,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10873,7 +10873,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10885,7 +10885,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10897,7 +10897,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10908,7 +10908,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10919,7 +10919,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10937,7 +10937,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10954,7 +10954,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10966,7 +10966,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10984,7 +10984,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -11005,7 +11005,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -11015,7 +11015,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -11048,7 +11048,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -11058,7 +11058,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.423.0"
+version = "1.423.1"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index e420f93e08..3196a3ce84 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.423.0"
+version = "1.423.1"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.423.0"
+version = "1.423.1"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 774d746b63..655e9e5c04 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.423.0
+  version: 1.423.1
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 3f933abd79..3a1d51f69d 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.423.0";
+export const VERSION = "v1.423.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 10d3c10bc1..24fff7a4c2 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.423.0";
+export const VERSION = "1.423.1";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index fae6a3a854..54c95638aa 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.423.0",
+	"version": "1.423.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.423.0",
+			"version": "1.423.1",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index f0b0023efe..fe8ccedc24 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.423.0",
+	"version": "1.423.1",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 9b31d07d1a..d70cd67f7b 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.423.0"
-wmill_pg = ">=1.423.0"
+wmill = ">=1.423.1"
+wmill_pg = ">=1.423.1"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index fa0fe9bfce..18f3820446 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.423.0
+  version: 1.423.1
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 0dda1be638..4b27339b6b 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.423.0'
+ModuleVersion = '1.423.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index de4083a1d2..b0f4355108 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.423.0"
+version = "1.423.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 042aeb26c9..3d61b011ca 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.423.0"
+version = "1.423.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 1f6ba0a44e..1b1f282d21 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.423.0",
+  "version": "1.423.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 04f11f52e4..8b46d97b34 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.423.0",
+  "version": "1.423.1",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 9e780c1cbe..0f093e2b35 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.423.0
+1.423.1

From 60186b8c9ff15e03dc0c66a5eef20c5967ce38ef Mon Sep 17 00:00:00 2001
From: Lucas Abel <22837557+uael@users.noreply.github.com>
Date: Wed, 13 Nov 2024 15:53:01 +0100
Subject: [PATCH 78/80] more benchmark methods (#4695)

* feat(backend): add `rawscript` to `add_batch_jobs` API

* bonus: improve `add_batch_jobs` API performances for `flow` kind

* add `bigrawscript` and `bigscriptinflow` to `benchmark_oneoff.ts`

* add `bigrawscript` and `bigscriptinflow` to the bench suite
---
 ...43e6dbe02e9e92ebbc31a50c99c3a04719284.json |  87 +++++++++++
 ...110d4702a80f455c63af6fcbd7cf45bbc4f7a.json |  23 +++
 backend/windmill-api/src/jobs.rs              | 137 +++++++++++-------
 benchmarks/benchmark_oneoff.ts                |  16 +-
 benchmarks/lib.ts                             |  17 +++
 benchmarks/suite_config.json                  |   8 +
 6 files changed, 234 insertions(+), 54 deletions(-)
 create mode 100644 backend/.sqlx/query-a69ba7471d1a5faa145bebbd17d43e6dbe02e9e92ebbc31a50c99c3a04719284.json
 create mode 100644 backend/.sqlx/query-ae543dfa106fa6ad4e9bf45cda1110d4702a80f455c63af6fcbd7cf45bbc4f7a.json

diff --git a/backend/.sqlx/query-a69ba7471d1a5faa145bebbd17d43e6dbe02e9e92ebbc31a50c99c3a04719284.json b/backend/.sqlx/query-a69ba7471d1a5faa145bebbd17d43e6dbe02e9e92ebbc31a50c99c3a04719284.json
new file mode 100644
index 0000000000..13f1319f04
--- /dev/null
+++ b/backend/.sqlx/query-a69ba7471d1a5faa145bebbd17d43e6dbe02e9e92ebbc31a50c99c3a04719284.json
@@ -0,0 +1,87 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "WITH uuid_table as (\n            select gen_random_uuid() as uuid from generate_series(1, $11)\n        )\n        INSERT INTO queue \n            (id, script_hash, script_path, job_kind, language, args, tag, created_by, permissioned_as, email, scheduled_for, workspace_id, concurrent_limit, concurrency_time_window_s, timeout, raw_code, raw_lock, raw_flow, flow_status)\n            (SELECT uuid, $1, $2, $3, $4, ('{ \"uuid\": \"' || uuid || '\" }')::jsonb, $5, $6, $7, $8, $9, $10, $12, $13, $14, $15, $16, $17, $18 FROM uuid_table) \n        RETURNING id",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Uuid"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Varchar",
+        {
+          "Custom": {
+            "name": "job_kind",
+            "kind": {
+              "Enum": [
+                "script",
+                "preview",
+                "flow",
+                "dependencies",
+                "flowpreview",
+                "script_hub",
+                "identity",
+                "flowdependencies",
+                "http",
+                "graphql",
+                "postgresql",
+                "noop",
+                "appdependencies",
+                "deploymentcallback",
+                "singlescriptflow"
+              ]
+            }
+          }
+        },
+        {
+          "Custom": {
+            "name": "script_lang",
+            "kind": {
+              "Enum": [
+                "python3",
+                "deno",
+                "go",
+                "bash",
+                "postgresql",
+                "nativets",
+                "bun",
+                "mysql",
+                "bigquery",
+                "snowflake",
+                "graphql",
+                "powershell",
+                "mssql",
+                "php",
+                "bunnative",
+                "rust",
+                "ansible"
+              ]
+            }
+          }
+        },
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Timestamptz",
+        "Varchar",
+        "Int4",
+        "Int4",
+        "Int4",
+        "Int4",
+        "Text",
+        "Text",
+        "Jsonb",
+        "Jsonb"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "a69ba7471d1a5faa145bebbd17d43e6dbe02e9e92ebbc31a50c99c3a04719284"
+}
diff --git a/backend/.sqlx/query-ae543dfa106fa6ad4e9bf45cda1110d4702a80f455c63af6fcbd7cf45bbc4f7a.json b/backend/.sqlx/query-ae543dfa106fa6ad4e9bf45cda1110d4702a80f455c63af6fcbd7cf45bbc4f7a.json
new file mode 100644
index 0000000000..c97780ba06
--- /dev/null
+++ b/backend/.sqlx/query-ae543dfa106fa6ad4e9bf45cda1110d4702a80f455c63af6fcbd7cf45bbc4f7a.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT flow_version.value AS \"value: sqlx::types::Json<Box<RawValue>>\" FROM flow \n                    LEFT JOIN flow_version\n                        ON flow_version.id = flow.versions[array_upper(flow.versions, 1)]\n                    WHERE flow.path = $1 AND flow.workspace_id = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "value: sqlx::types::Json<Box<RawValue>>",
+        "type_info": "Jsonb"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "ae543dfa106fa6ad4e9bf45cda1110d4702a80f455c63af6fcbd7cf45bbc4f7a"
+}
diff --git a/backend/windmill-api/src/jobs.rs b/backend/windmill-api/src/jobs.rs
index 7244b2be17..433c859619 100644
--- a/backend/windmill-api/src/jobs.rs
+++ b/backend/windmill-api/src/jobs.rs
@@ -65,7 +65,7 @@ use windmill_common::{
     db::UserDB,
     error::{self, to_anyhow, Error},
     flow_status::{Approval, FlowStatus, FlowStatusModule},
-    flows::FlowValue,
+    flows::{add_virtual_items_if_necessary, FlowValue},
     jobs::{script_path_to_payload, CompletedJob, JobKind, JobPayload, QueuedJob, RawCode},
     oauth2::HmacSha256,
     scripts::{ScriptHash, ScriptLang},
@@ -4275,18 +4275,26 @@ async fn run_flow_dependencies_job(
     wait_result
 }
 
+#[derive(Deserialize)]
+struct BatchRawScript {
+    content: String,
+    language: Option<ScriptLang>,
+    lock: Option<String>,
+}
+
 #[derive(Deserialize)]
 struct BatchInfo {
     kind: String,
     flow_value: Option<FlowValue>,
     path: Option<String>,
+    rawscript: Option<BatchRawScript>,
 }
 
 #[tracing::instrument(level = "trace", skip_all)]
 async fn add_batch_jobs(
     authed: ApiAuthed,
     Extension(db): Extension<DB>,
-    Extension(rsmq): Extension<Option<rsmq_async::MultiplexedRsmq>>,
+    Extension(_rsmq): Extension<Option<rsmq_async::MultiplexedRsmq>>,
     Path((w_id, n)): Path<(String, i32)>,
     Json(batch_info): Json<BatchInfo>,
 ) -> error::JsonResult<Vec<Uuid>> {
@@ -4302,6 +4310,10 @@ async fn add_batch_jobs(
         concurrent_limit,
         concurrent_time_window_s,
         timeout,
+        raw_code,
+        raw_lock,
+        raw_flow,
+        flow_status
     ) = match batch_info.kind.as_str() {
         "script" => {
             if let Some(path) = batch_info.path {
@@ -4329,6 +4341,10 @@ async fn add_batch_jobs(
                     concurrent_limit,
                     concurrency_time_window_s,
                     timeout,
+                    None,
+                    None,
+                    None,
+                    None,
                 )
             } else {
                 Err(anyhow::anyhow!(
@@ -4336,61 +4352,72 @@ 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 }
-            } else {
-                if let Some(path) = batch_info.path.as_ref() {
-                    JobPayload::Flow {
-                        path: path.to_string(),
-                        dedicated_worker: None,
-                        apply_preprocessor: false,
-                    }
-                } else {
-                    Err(anyhow::anyhow!(
-                        "Path is required if no value is not provided"
-                    ))?
-                }
-            };
-            let mut tx = PushIsolationLevel::IsolatedRoot(db.clone(), rsmq);
-            for _ in 0..n {
-                let ehm = HashMap::new();
-                let (uuid, ntx) = push(
-                    &db,
-                    tx,
-                    &w_id,
-                    payload.clone(),
-                    PushArgs::from(&ehm),
-                    authed.display_username(),
-                    &authed.email,
-                    username_to_permissioned_as(&authed.username),
+        "rawscript" => {
+            if let Some(rawscript) = batch_info.rawscript {
+                (
+                    None,
+                    None,
+                    JobKind::Preview,
+                    rawscript.language,
                     None,
                     None,
                     None,
                     None,
                     None,
-                    false,
-                    false,
-                    None,
-                    true,
+                    Some(rawscript.content),
+                    rawscript.lock,
                     None,
                     None,
-                    None,
-                    None,
-                    Some(&authed.clone().into()),
                 )
-                .await?;
-                tx = PushIsolationLevel::Transaction(ntx);
-                uuids.push(uuid);
+            } else {
+                Err(anyhow::anyhow!(
+                    "rawscript is required for `rawscript` kind"
+                ))?
             }
-            match tx {
-                PushIsolationLevel::Transaction(tx) => {
-                    tx.commit().await?;
-                }
-                _ => (),
-            }
-            return Ok(Json(uuids));
+        }
+        "flow" => {
+            let (mut value, job_kind, path) = if let Some(value) = batch_info.flow_value {
+                (value, JobKind::FlowPreview, None)
+            } else if let Some(path) = batch_info.path {
+                let value_json = sqlx::query!(
+                    "SELECT flow_version.value AS \"value: sqlx::types::Json<Box<RawValue>>\" FROM flow 
+                    LEFT JOIN flow_version
+                        ON flow_version.id = flow.versions[array_upper(flow.versions, 1)]
+                    WHERE flow.path = $1 AND flow.workspace_id = $2",
+                    &path, &w_id
+                )
+                .fetch_optional(&db)
+                .await?
+                .ok_or_else(|| Error::InternalErr(format!("not found flow at path {:?}", path)))?;
+                let value =
+                    serde_json::from_str::<FlowValue>(value_json.value.get()).map_err(|err| {
+                        Error::InternalErr(format!(
+                            "could not convert json to flow for {path}: {err:?}"
+                        ))
+                    })?;
+                (value, JobKind::Flow, Some(path))
+            } else {
+                Err(anyhow::anyhow!(
+                    "Path is required if no value is not provided"
+                ))?
+            };
+            add_virtual_items_if_necessary(&mut value.modules);
+            let flow_status = FlowStatus::new(&value);
+            (
+                None,                             // script_hash
+                path,                             // script_path
+                job_kind,                         // job_kind
+                None,                             // language
+                None,                             // dedicated_worker
+                value.concurrency_key.clone(),    // custom_concurrency_key
+                value.concurrent_limit.clone(),   // concurrent_limit
+                value.concurrency_time_window_s,  // concurrency_time_window_s
+                None,                             // timeout
+                None,                             // raw_code
+                None,                             // raw_lock
+                Some(value),                      // raw_flow
+                Some(flow_status),                // flow_status
+            )
         }
         "noop" => (
             None,
@@ -4402,6 +4429,10 @@ async fn add_batch_jobs(
             None,
             None,
             None,
+            None,
+            None,
+            None,
+            None,
         ),
         _ => {
             return Err(error::Error::BadRequest(format!(
@@ -4428,8 +4459,8 @@ async fn add_batch_jobs(
             select gen_random_uuid() as uuid from generate_series(1, $11)
         )
         INSERT INTO queue 
-            (id, script_hash, script_path, job_kind, language, args, tag, created_by, permissioned_as, email, scheduled_for, workspace_id, concurrent_limit, concurrency_time_window_s, timeout)
-            (SELECT uuid, $1, $2, $3, $4, ('{ "uuid": "' || uuid || '" }')::jsonb, $5, $6, $7, $8, $9, $10, $12, $13, $14 FROM uuid_table) 
+            (id, script_hash, script_path, job_kind, language, args, tag, created_by, permissioned_as, email, scheduled_for, workspace_id, concurrent_limit, concurrency_time_window_s, timeout, raw_code, raw_lock, raw_flow, flow_status)
+            (SELECT uuid, $1, $2, $3, $4, ('{ "uuid": "' || uuid || '" }')::jsonb, $5, $6, $7, $8, $9, $10, $12, $13, $14, $15, $16, $17, $18 FROM uuid_table) 
         RETURNING id"#,
             hash.map(|h| h.0),
             path,
@@ -4444,7 +4475,11 @@ async fn add_batch_jobs(
             n,
             concurrent_limit,
             concurrent_time_window_s,
-            timeout
+            timeout,
+            raw_code,
+            raw_lock,
+            raw_flow.map(sqlx::types::Json) as Option<sqlx::types::Json<FlowValue>>,
+            flow_status.map(sqlx::types::Json) as Option<sqlx::types::Json<FlowStatus>>
         )
         .fetch_all(&db)
         .await?;
diff --git a/benchmarks/benchmark_oneoff.ts b/benchmarks/benchmark_oneoff.ts
index 24ba4e2c13..41321b3ec6 100644
--- a/benchmarks/benchmark_oneoff.ts
+++ b/benchmarks/benchmark_oneoff.ts
@@ -8,6 +8,7 @@ import { DenoLandProvider } from "https://deno.land/x/cliffy@v0.25.7/command/upg
 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";
 
 import { VERSION, createBenchScript, getFlowPayload, login } from "./lib.ts";
 
@@ -172,8 +173,8 @@ export async function main({
       kind: "script",
       path: "f/benchmarks/" + kind,
     });
-  } else if (["2steps"].includes(kind)) {
-    nStepsFlow = 2;
+  } else if (["2steps", "bigscriptinflow"].includes(kind)) {
+    nStepsFlow = kind == "2steps" ? 2 : 1;
     const payload = getFlowPayload(kind);
     body = JSON.stringify({
       kind: "flow",
@@ -194,6 +195,15 @@ export async function main({
       kind: "script",
       path: kind.substr(7),
     });
+  } else if (kind == "bigrawscript") {
+    noVerify = true;
+    body = JSON.stringify({
+      kind: "rawscript",
+      rawscript: {
+        language: api.RawScript.language.BASH,
+        content: "# let's bloat that bash script, 3.. 2.. 1.. BOOM\n".repeat(25000) + "echo \"$WM_FLOW_JOB_ID\"\n",
+      },
+    });
   } else {
     throw new Error("Unknown script pattern " + kind);
   }
@@ -246,7 +256,7 @@ export async function main({
     } else {
       const elapsed = start ? Date.now() - start : 0;
       completedJobs = await getCompletedJobsCount();
-      if (kind === "2steps" || kind.startsWith("flow:")) {
+      if (nStepsFlow > 0) {
         completedJobs = Math.floor(completedJobs / (nStepsFlow + 1));
       }
       const avgThr = ((completedJobs / elapsed) * 1000).toFixed(2);
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 3a1d51f69d..372d5be32e 100644
--- a/benchmarks/lib.ts
+++ b/benchmarks/lib.ts
@@ -235,6 +235,23 @@ export const getFlowPayload = (flowPattern: string): api.FlowPreview => {
         ],
       },
     };
+  } else if (flowPattern == "bigscriptinflow") {
+    return {
+      path: "bigscriptinflow",
+      args: {},
+      value: {
+        modules: [
+          {
+            value: {
+              input_transforms: {},
+              language: api.RawScript.language.BASH,
+              type: "rawscript",
+              content: "# let's bloat that bash script, 3.. 2.. 1.. BOOM\n".repeat(25000) + "echo \"$WM_FLOW_JOB_ID\"\n",
+            },
+          }
+        ],
+      }
+    };
   } else {
     return {
       path: "2steps",
diff --git a/benchmarks/suite_config.json b/benchmarks/suite_config.json
index 568402ca2d..7619d4d3b9 100644
--- a/benchmarks/suite_config.json
+++ b/benchmarks/suite_config.json
@@ -30,5 +30,13 @@
   {
     "kind": "nativets",
     "jobs": 2000
+  },
+  {
+    "kind": "bigrawscript",
+    "jobs": 10000
+  },
+  {
+    "kind": "bigscriptinflow",
+    "jobs": 10000
   }
 ]
\ No newline at end of file

From 4a39e45476f39dee909b8061675aa3a696c131a7 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 13 Nov 2024 16:54:58 +0100
Subject: [PATCH 79/80] fix getUser openapi

---
 backend/windmill-api/openapi.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 655e9e5c04..b63b6c0f34 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -190,7 +190,7 @@ paths:
               schema:
                 type: string
 
-  /w/{workspace}/users/{username}:
+  /w/{workspace}/users/get/{username}:
     get:
       summary: get user (require admin privilege)
       operationId: getUser

From ce01fa1677f5b1577cebbebf115c3ffb7f864281 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 13 Nov 2024 18:49:41 +0100
Subject: [PATCH 80/80] split more ee log logic

---
 backend/ee-repo-ref.txt                      |   2 +-
 backend/windmill-worker/src/job_logger.rs    | 198 +------------------
 backend/windmill-worker/src/job_logger_ee.rs |  26 +++
 backend/windmill-worker/src/lib.rs           |   2 +-
 4 files changed, 36 insertions(+), 192 deletions(-)
 create mode 100644 backend/windmill-worker/src/job_logger_ee.rs

diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index 1a95bfe721..32671f9c64 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-5938b3f66b070ba3578aeeda89e6cc17c4cbda2d
\ No newline at end of file
+053cf0a539c64efbe8eee0e2a330b72114a43193
\ No newline at end of file
diff --git a/backend/windmill-worker/src/job_logger.rs b/backend/windmill-worker/src/job_logger.rs
index 05b9e5812b..8a6d824e6e 100644
--- a/backend/windmill-worker/src/job_logger.rs
+++ b/backend/windmill-worker/src/job_logger.rs
@@ -1,15 +1,6 @@
-use itertools::Itertools;
-use swc_ecma_parser::lexer::util::CharExt;
-
-#[cfg(all(feature = "enterprise", feature = "parquet"))]
-use object_store::path::Path;
 use regex::Regex;
 
-#[cfg(all(feature = "enterprise", feature = "parquet"))]
-use windmill_common::s3_helpers::OBJECT_STORE_CACHE_SETTINGS;
-
-use windmill_common::error::{self};
-use windmill_common::worker::{CLOUD_HOSTED, TMP_DIR};
+use windmill_common::worker::CLOUD_HOSTED;
 
 use windmill_queue::append_logs;
 
@@ -19,6 +10,12 @@ use std::sync::Arc;
 use uuid::Uuid;
 use windmill_common::DB;
 
+use crate::job_logger_ee::default_disk_log_storage;
+
+#[cfg(all(feature = "enterprise", feature = "parquet"))]
+use crate::job_logger_ee::s3_storage;
+
+
 pub enum CompactLogs {
     #[cfg(not(all(feature = "enterprise", feature = "parquet")))]
     NotEE,
@@ -28,150 +25,7 @@ pub enum CompactLogs {
     S3,
 }
 
-async fn compact_logs(
-    job_id: Uuid,
-    w_id: &str,
-    db: &DB,
-    nlogs: String,
-    total_size: Arc<AtomicU32>,
-    compact_kind: CompactLogs,
-    _worker_name: &str,
-) -> error::Result<(String, String)> {
-    let mut prev_logs = sqlx::query_scalar!(
-        "SELECT logs FROM job_logs WHERE job_id = $1 AND workspace_id = $2",
-        job_id,
-        w_id
-    )
-    .fetch_optional(db)
-    .await?
-    .flatten()
-    .unwrap_or_default();
-    let size = prev_logs.char_indices().count() as i32;
-    let nlogs_len = nlogs.char_indices().count();
-    let to_keep_in_db = usize::max(
-        usize::min(nlogs_len, 3000),
-        nlogs_len % LARGE_LOG_THRESHOLD_SIZE,
-    );
-    let extra_split = to_keep_in_db < nlogs_len;
-    let stored_in_storage_len = if extra_split {
-        nlogs_len - to_keep_in_db
-    } else {
-        0
-    };
-    let extra_to_newline = nlogs
-        .chars()
-        .skip(stored_in_storage_len)
-        .find_position(|x| x.is_line_break())
-        .map(|(i, _)| i)
-        .unwrap_or(to_keep_in_db);
-    let stored_in_storage_to_newline = stored_in_storage_len + extra_to_newline;
 
-    let (append_to_storage, stored_in_db) = if extra_split {
-        if stored_in_storage_to_newline == nlogs.len() {
-            (nlogs.as_ref(), "".to_string())
-        } else {
-            let split_idx = nlogs
-                .char_indices()
-                .nth(stored_in_storage_to_newline)
-                .map(|(i, _)| i)
-                .unwrap_or(0);
-            let (append_to_storage, stored_in_db) = nlogs.split_at(split_idx);
-            // tracing::error!("{append_to_storage} ||||| {stored_in_db}");
-            // tracing::error!(
-            //     "{:?} {:?} {} {}",
-            //     excess_prev_logs.lines().last(),
-            //     current_logs.lines().next(),
-            //     split_idx,
-            //     excess_size_modulo
-            // );
-            (append_to_storage, stored_in_db.to_string())
-        }
-    } else {
-        // tracing::error!("{:?}", nlogs.lines().last());
-        ("", nlogs.to_string())
-    };
-
-    let new_size_with_excess = size + stored_in_storage_to_newline as i32;
-
-    let new_size = total_size.fetch_add(
-        new_size_with_excess as u32,
-        std::sync::atomic::Ordering::SeqCst,
-    ) + new_size_with_excess as u32;
-
-    let path = format!(
-        "logs/{job_id}/{}_{new_size}.txt",
-        chrono::Utc::now().timestamp_millis()
-    );
-
-    let mut new_current_logs = match compact_kind {
-        CompactLogs::NoS3 => format!("\n[windmill] No object storage set in instance settings. Previous logs have been saved to disk at {path}"),
-        CompactLogs::S3 => format!("\n[windmill] Previous logs have been saved to object storage at {path}"),
-        #[cfg(not(all(feature = "enterprise", feature = "parquet")))]
-        CompactLogs::NotEE => format!("\n[windmill] Previous logs have been saved to disk at {path}"),
-    };
-    new_current_logs.push_str(&stored_in_db);
-
-    sqlx::query!(
-        "UPDATE job_logs SET logs = $1, log_offset = $2, 
-        log_file_index = array_append(coalesce(log_file_index, array[]::text[]), $3) 
-        WHERE workspace_id = $4 AND job_id = $5",
-        new_current_logs,
-        new_size as i32,
-        path,
-        w_id,
-        job_id
-    )
-    .execute(db)
-    .await?;
-    prev_logs.push_str(&append_to_storage);
-
-    return Ok((prev_logs, path));
-}
-
-async fn default_disk_log_storage(
-    job_id: Uuid,
-    w_id: &str,
-    db: &DB,
-    nlogs: String,
-    total_size: Arc<AtomicU32>,
-    compact_kind: CompactLogs,
-    worker_name: &str,
-) {
-    match compact_logs(
-        job_id,
-        &w_id,
-        &db,
-        nlogs,
-        total_size,
-        compact_kind,
-        worker_name,
-    )
-    .await
-    {
-        Err(e) => tracing::error!("Could not compact logs for job {job_id}: {e:?}",),
-        Ok((prev_logs, path)) => {
-            let path = format!("{}/{}", TMP_DIR, path);
-            let splitted = &path.split("/").collect_vec();
-            tokio::fs::create_dir_all(splitted.into_iter().take(splitted.len() - 1).join("/"))
-                .await
-                .map_err(|e| {
-                    tracing::error!("Could not create logs directory: {e:?}",);
-                    e
-                })
-                .ok();
-            let created = tokio::fs::File::create(&path).await;
-            if let Err(e) = created {
-                tracing::error!("Could not create logs file {path}: {e:?}",);
-                return;
-            }
-            if let Err(e) = tokio::fs::write(&path, prev_logs).await {
-                tracing::error!("Could not write to logs file {path}: {e:?}");
-            } else {
-                tracing::info!("Logs length of {job_id} has exceeded a threshold. Previous logs have been saved to disk at {path}");
-            }
-        }
-    }
-}
 
 pub(crate) async fn append_job_logs(
     job_id: Uuid,
@@ -184,43 +38,7 @@ pub(crate) async fn append_job_logs(
 ) -> () {
     if must_compact_logs {
         #[cfg(all(feature = "enterprise", feature = "parquet"))]
-        if let Some(os) = OBJECT_STORE_CACHE_SETTINGS.read().await.clone() {
-            match compact_logs(
-                job_id,
-                &w_id,
-                &db,
-                logs,
-                total_size,
-                CompactLogs::S3,
-                &worker_name,
-            )
-            .await
-            {
-                Err(e) => tracing::error!("Could not compact logs for job {job_id}: {e:?}",),
-                Ok((prev_logs, path)) => {
-                    tracing::info!("Logs length of {job_id} has exceeded a threshold. Previous logs have been saved to object storage at {path}");
-                    let path2 = path.clone();
-                    if let Err(e) = os
-                        .put(&Path::from(path), prev_logs.to_string().into_bytes().into())
-                        .await
-                    {
-                        tracing::error!("Could not save logs to s3: {e:?}");
-                    }
-                    tracing::info!("Logs of {job_id} saved to object storage at {path2}");
-                }
-            }
-        } else {
-            default_disk_log_storage(
-                job_id,
-                &w_id,
-                &db,
-                logs,
-                total_size,
-                CompactLogs::NoS3,
-                &worker_name,
-            )
-            .await;
-        }
+        s3_storage(job_id, &w_id, &db, &logs, &total_size, &worker_name).await;
 
         #[cfg(not(all(feature = "enterprise", feature = "parquet")))]
         {
diff --git a/backend/windmill-worker/src/job_logger_ee.rs b/backend/windmill-worker/src/job_logger_ee.rs
new file mode 100644
index 0000000000..0274c6c777
--- /dev/null
+++ b/backend/windmill-worker/src/job_logger_ee.rs
@@ -0,0 +1,26 @@
+use std::sync::atomic::AtomicU32;
+use std::sync::Arc;
+
+use uuid::Uuid;
+use windmill_common::DB;
+
+use crate::job_logger::CompactLogs;
+
+#[cfg(all(feature = "enterprise", feature = "parquet"))]
+pub(crate) async fn s3_storage(_job_id: Uuid, _w_id: &String, _db: &sqlx::Pool<sqlx::Postgres>, _logs: &String, _total_size: &Arc<AtomicU32>, _worker_name: &String) {
+    tracing::info!("Logs length of {job_id} has exceeded a threshold. Implementation to store excess on s3 in not OSS");
+}
+
+pub(crate) async fn default_disk_log_storage(
+    job_id: Uuid,
+    _w_id: &str,
+    _db: &DB,
+    _nlogs: String,
+    _total_size: Arc<AtomicU32>,
+    _compact_kind: CompactLogs,
+    _worker_name: &str,
+) {
+    tracing::info!("Logs length of {job_id} has exceeded a threshold. Implementation to store excess on disk in not OSS");
+}
+
+
diff --git a/backend/windmill-worker/src/lib.rs b/backend/windmill-worker/src/lib.rs
index b790eb3faf..680f3ca178 100644
--- a/backend/windmill-worker/src/lib.rs
+++ b/backend/windmill-worker/src/lib.rs
@@ -29,7 +29,7 @@ mod rust_executor;
 mod worker;
 mod worker_flow;
 mod worker_lockfiles;
-
+mod job_logger_ee;
 pub use worker::*;
 
 pub use result_processor::handle_job_error;