windmill-components 1.504.5 → 1.510.1

package/package/components/triggers/schedules/ScheduleEditorInner.svelte

@@ -26,7 +26,6 @@ import { runScheduleNow } from '../scheduled/utils';
 import { handleConfigChange } from '../utils';
 let { useDrawer = true, hideTarget = false, docDescription = undefined, allowDraft = false, draftSchema = undefined, customLabel = undefined, isDeployed = false, onUpdate = undefined, onConfigChange = undefined, onDelete = undefined, onReset = undefined, trigger = undefined } = $props();
 let optionTabSelected = $state('error_handler');
-let is_flow = $state(false);
 let initialPath = $state('');
 let edit = $state(true);
 let schedule = $state('0 0 12 * *');
@@ -37,19 +36,17 @@ let initialSchedule;
 let timezone = $state(Intl.DateTimeFormat().resolvedOptions().timeZone);
 let paused_until = $state(undefined);
 let itemKind = $state('script');
+let is_flow = $derived.by(() => itemKind === 'flow');
 let errorHandleritemKind = $state('script');
 let wsErrorHandlerMuted = $state(false);
 let errorHandlerPath = $state(undefined);
-let errorHandlerCustomInitialPath = $state(undefined);
 let errorHandlerSelected = $state('slack');
 let errorHandlerExtraArgs = $state({});
 let recoveryHandlerPath = $state(undefined);
-let recoveryHandlerCustomInitialPath = $state(undefined);
 let recoveryHandlerSelected = $state('slack');
 let recoveryHandlerItemKind = $state('script');
 let recoveryHandlerExtraArgs = $state({});
 let successHandlerPath = $state(undefined);
-let successHandlerCustomInitialPath = $state(undefined);
 let successHandlerSelected = $state('slack');
 let successHandlerItemKind = $state('script');
 let successHandlerExtraArgs = $state({});
@@ -94,9 +91,8 @@ export async function openEdit(ePath, isFlow, defaultCfg) {
     drawerLoading = true;
     try {
         drawer?.openDrawer();
-        is_flow = isFlow;
         initialPath = ePath;
-        itemKind = is_flow ? 'flow' : 'script';
+        itemKind = isFlow ? 'flow' : 'script';
         path = defaultCfg?.path ?? ePath;
         await loadSchedule(defaultCfg);
         edit = true;
@@ -116,7 +112,6 @@ async function setScheduleHandler(s) {
             let splitted = s.on_failure.split('/');
             errorHandleritemKind = splitted[0];
             errorHandlerPath = splitted.slice(1)?.join('/');
-            errorHandlerCustomInitialPath = errorHandlerPath;
             failedTimes = s.on_failure_times ?? 1;
             failedExact = s.on_failure_exact ?? false;
             errorHandlerExtraArgs = s.on_failure_extra_args ?? {};
@@ -125,7 +120,6 @@ async function setScheduleHandler(s) {
         else {
             errorHandlerPath = undefined;
             errorHandleritemKind = 'script';
-            errorHandlerCustomInitialPath = undefined;
             errorHandlerExtraArgs = {};
             failedExact = false;
             failedTimes = 1;
@@ -135,7 +129,6 @@ async function setScheduleHandler(s) {
             let splitted = s.on_recovery.split('/');
             recoveryHandlerItemKind = splitted[0];
             recoveryHandlerPath = splitted.slice(1)?.join('/');
-            recoveryHandlerCustomInitialPath = recoveryHandlerPath;
             recoveredTimes = s.on_recovery_times ?? 1;
             recoveryHandlerExtraArgs = s.on_recovery_extra_args ?? {};
             recoveryHandlerSelected = getHandlerType('recovery', recoveryHandlerPath);
@@ -143,7 +136,6 @@ async function setScheduleHandler(s) {
         else {
             recoveryHandlerPath = undefined;
             recoveryHandlerItemKind = 'script';
-            recoveryHandlerCustomInitialPath = undefined;
             recoveredTimes = 1;
             recoveryHandlerSelected = 'slack';
             recoveryHandlerExtraArgs = {};
@@ -152,14 +144,12 @@ async function setScheduleHandler(s) {
             let splitted = s.on_success.split('/');
             successHandlerItemKind = splitted[0];
             successHandlerPath = splitted.slice(1)?.join('/');
-            successHandlerCustomInitialPath = successHandlerPath;
             successHandlerExtraArgs = s.on_success_extra_args ?? {};
             successHandlerSelected = getHandlerType('success', successHandlerPath);
         }
         else {
             successHandlerPath = undefined;
             successHandlerItemKind = 'script';
-            successHandlerCustomInitialPath = undefined;
             successHandlerSelected = 'slack';
             successHandlerExtraArgs = {};
         }
@@ -185,7 +175,6 @@ async function setScheduleHandler(s) {
             errorHandleritemKind = splitted[0];
             errorHandlerPath = splitted.slice(1)?.join('/');
             errorHandlerExtraArgs = defaultErrorHandlerMaybe['errorHandlerExtraArgs'];
-            errorHandlerCustomInitialPath = errorHandlerPath;
             errorHandlerSelected = getHandlerType('error', errorHandlerPath);
             failedTimes = defaultErrorHandlerMaybe['failedTimes'];
             failedExact = defaultErrorHandlerMaybe['failedExact'];
@@ -195,7 +184,6 @@ async function setScheduleHandler(s) {
             errorHandlerPath = undefined;
             errorHandleritemKind = 'script';
             errorHandlerExtraArgs = {};
-            errorHandlerCustomInitialPath = undefined;
             errorHandlerSelected = 'slack';
             failedTimes = 1;
             failedExact = false;
@@ -205,7 +193,6 @@ async function setScheduleHandler(s) {
             recoveryHandlerItemKind = splitted[0];
             recoveryHandlerPath = splitted.slice(1)?.join('/');
             recoveryHandlerExtraArgs = defaultRecoveryHandlerMaybe['recoveryHandlerExtraArgs'];
-            recoveryHandlerCustomInitialPath = recoveryHandlerPath;
             recoveryHandlerSelected = getHandlerType('recovery', recoveryHandlerPath);
             recoveredTimes = defaultRecoveryHandlerMaybe['recoveredTimes'];
         }
@@ -213,7 +200,6 @@ async function setScheduleHandler(s) {
             recoveryHandlerPath = undefined;
             recoveryHandlerItemKind = 'script';
             recoveryHandlerExtraArgs = {};
-            recoveryHandlerCustomInitialPath = undefined;
             recoveryHandlerSelected = 'slack';
             recoveredTimes = 1;
         }
@@ -222,7 +208,6 @@ async function setScheduleHandler(s) {
             successHandlerItemKind = splitted[0];
             successHandlerPath = splitted.slice(1)?.join('/');
             successHandlerExtraArgs = defaultSuccessHandlerMaybe['successHandlerExtraArgs'];
-            successHandlerCustomInitialPath = successHandlerPath;
             successHandlerSelected = getHandlerType('success', successHandlerPath);
             recoveredTimes = defaultSuccessHandlerMaybe['recoveredTimes'];
         }
@@ -230,7 +215,6 @@ async function setScheduleHandler(s) {
             successHandlerPath = undefined;
             successHandlerItemKind = 'script';
             successHandlerExtraArgs = {};
-            successHandlerCustomInitialPath = undefined;
             successHandlerSelected = 'slack';
         }
     }
@@ -254,9 +238,8 @@ export async function openNew(nis_flow, initial_script_path, defaultValues, sche
         }
         drawer?.openDrawer();
         runnable = undefined;
-        is_flow = s?.is_flow ?? nis_flow;
         edit = false;
-        itemKind = is_flow ? 'flow' : 'script';
+        itemKind = (s?.is_flow ?? nis_flow) ? 'flow' : 'script';
         initialScriptPath = initial_script_path ?? '';
         path = initNewPath
             ? ''
@@ -287,15 +270,6 @@ export async function openNew(nis_flow, initial_script_path, defaultValues, sche
         showLoading = false;
     }
 }
-async function resetRetries() {
-    if (itemKind === 'flow') {
-        retry = undefined;
-    }
-}
-$effect(() => {
-    ;
-    (is_flow = itemKind == 'flow') && resetRetries();
-});
 // set isValid to true when a script/flow without any properties is selected
 $effect(() => {
     setDefaultValid(draftSchema ?? runnable?.schema);
@@ -437,7 +411,7 @@ async function loadScheduleCfg(cfg) {
     description = cfg.description ?? '';
     script_path = cfg.script_path ?? '';
     await loadScript(script_path);
-    is_flow = cfg.is_flow;
+    itemKind = cfg.is_flow ? 'flow' : 'script';
     no_flow_overlap = cfg.no_flow_overlap ?? false;
     wsErrorHandlerMuted = cfg.ws_error_handler_muted ?? false;
     retry = cfg.retry;
@@ -445,7 +419,6 @@ async function loadScheduleCfg(cfg) {
         let splitted = cfg.on_failure.split('/');
         errorHandleritemKind = splitted[0];
         errorHandlerPath = splitted.slice(1)?.join('/');
-        errorHandlerCustomInitialPath = errorHandlerPath;
         failedTimes = cfg.on_failure_times ?? 1;
         failedExact = cfg.on_failure_exact ?? false;
         errorHandlerExtraArgs = cfg.on_failure_extra_args ?? {};
@@ -454,7 +427,6 @@ async function loadScheduleCfg(cfg) {
     else {
         errorHandlerPath = undefined;
         errorHandleritemKind = 'script';
-        errorHandlerCustomInitialPath = undefined;
         errorHandlerExtraArgs = {};
         failedExact = false;
         failedTimes = 1;
@@ -464,7 +436,6 @@ async function loadScheduleCfg(cfg) {
         let splitted = cfg.on_recovery.split('/');
         recoveryHandlerItemKind = splitted[0];
         recoveryHandlerPath = splitted.slice(1)?.join('/');
-        recoveryHandlerCustomInitialPath = recoveryHandlerPath;
         recoveredTimes = cfg.on_recovery_times ?? 1;
         recoveryHandlerExtraArgs = cfg.on_recovery_extra_args ?? {};
         recoveryHandlerSelected = getHandlerType('recovery', recoveryHandlerPath ?? '');
@@ -472,7 +443,6 @@ async function loadScheduleCfg(cfg) {
     else {
         recoveryHandlerPath = undefined;
         recoveryHandlerItemKind = 'script';
-        recoveryHandlerCustomInitialPath = undefined;
         recoveredTimes = 1;
         recoveryHandlerSelected = 'slack';
         recoveryHandlerExtraArgs = {};
@@ -481,14 +451,12 @@ async function loadScheduleCfg(cfg) {
         let splitted = cfg.on_success.split('/');
         successHandlerItemKind = splitted[0];
         successHandlerPath = splitted.slice(1)?.join('/');
-        successHandlerCustomInitialPath = successHandlerPath;
         successHandlerExtraArgs = cfg.on_success_extra_args ?? {};
         successHandlerSelected = getHandlerType('success', successHandlerPath ?? '');
     }
     else {
         successHandlerPath = undefined;
         successHandlerItemKind = 'script';
-        successHandlerCustomInitialPath = undefined;
         successHandlerSelected = 'slack';
         successHandlerExtraArgs = {};
     }
@@ -530,18 +498,6 @@ function getHandlerType(isHandler, scriptPath) {
     }
     return 'custom';
 }
-function isSlackHandler(isSlackHandler, scriptPath) {
-    if (isSlackHandler == 'error') {
-        return (scriptPath.startsWith('hub/') &&
-            scriptPath.endsWith('/workspace-or-schedule-error-handler-slack'));
-    }
-    else if (isSlackHandler == 'recovery') {
-        return (scriptPath.startsWith('hub/') && scriptPath.endsWith('/schedule-recovery-handler-slack'));
-    }
-    else {
-        return scriptPath.startsWith('hub/') && scriptPath.endsWith('/schedule-success-handler-slack');
-    }
-}
 let drawer = $state();
 let pathC = $state();
 let dirtyPath = $state(false);
@@ -563,27 +519,6 @@ function onVersionChange() {
     }
 }
 function getScheduleCfg() {
-    let errorHadlerExtraArgsDerived = structuredClone($state.snapshot(errorHandlerExtraArgs));
-    if (errorHandlerPath !== undefined && isSlackHandler('error', errorHandlerPath)) {
-        errorHadlerExtraArgsDerived['slack'] = '$res:f/slack_bot/bot_token';
-    }
-    else {
-        errorHadlerExtraArgsDerived['slack'] = undefined;
-    }
-    let recoveryHandlerExtraArgsDerived = structuredClone($state.snapshot(recoveryHandlerExtraArgs));
-    if (recoveryHandlerPath !== undefined && isSlackHandler('recovery', recoveryHandlerPath)) {
-        recoveryHandlerExtraArgsDerived['slack'] = '$res:f/slack_bot/bot_token';
-    }
-    else {
-        recoveryHandlerExtraArgsDerived['slack'] = undefined;
-    }
-    let successHandlerExtraArgsDerived = structuredClone($state.snapshot(successHandlerExtraArgs));
-    if (successHandlerPath !== undefined && isSlackHandler('success', successHandlerPath)) {
-        successHandlerExtraArgsDerived['slack'] = '$res:f/slack_bot/bot_token';
-    }
-    else {
-        successHandlerExtraArgsDerived['slack'] = undefined;
-    }
     return {
         path: path,
         schedule: formatCron(schedule),
@@ -595,16 +530,16 @@ function getScheduleCfg() {
         on_failure: errorHandlerPath ? `${errorHandleritemKind}/${errorHandlerPath}` : undefined,
         on_failure_times: failedTimes,
         on_failure_exact: failedExact,
-        on_failure_extra_args: errorHandlerPath ? errorHadlerExtraArgsDerived : undefined,
+        on_failure_extra_args: errorHandlerPath ? errorHandlerExtraArgs : undefined,
         on_recovery: recoveryHandlerPath
             ? `${recoveryHandlerItemKind}/${recoveryHandlerPath}`
             : undefined,
         on_recovery_times: recoveredTimes,
-        on_recovery_extra_args: recoveryHandlerPath ? recoveryHandlerExtraArgsDerived : {},
+        on_recovery_extra_args: recoveryHandlerPath ? recoveryHandlerExtraArgs : {},
         on_success: successHandlerPath
             ? `${successHandlerItemKind}/${successHandlerPath}`
             : undefined,
-        on_success_extra_args: successHandlerPath ? successHandlerExtraArgsDerived : {},
+        on_success_extra_args: successHandlerPath ? successHandlerExtraArgs : {},
         ws_error_handler_muted: wsErrorHandlerMuted,
         retry: retry,
         summary: summary != '' ? summary : undefined,
@@ -909,14 +844,14 @@ $effect(() => {
 {/snippet}
 
 {#snippet errorHandler()}
-	<div class="flex flex-col gap-2">
+	<div class="flex flex-col gap-2 min-h-96">
 		{#if !loading}
 			<Tabs bind:selected={optionTabSelected}>
 				<Tab value="error_handler">Error Handler</Tab>
 				<Tab value="recovery_handler">Recovery Handler</Tab>
 				<Tab value="success_handler">Success Handler</Tab>
+				<Tab value="retries">Retries</Tab>
 				{#if itemKind === 'script'}
-					<Tab value="retries">Retries</Tab>
 					<Tab value="tag">Custom tag</Tab>
 				{/if}
 			</Tabs>
@@ -966,19 +901,21 @@ $effect(() => {
 						showScriptHelpText={true}
 						bind:handlerSelected={errorHandlerSelected}
 						bind:handlerPath={errorHandlerPath}
-						customInitialScriptPath={errorHandlerCustomInitialPath}
 						toggleText="Alert channel on error"
-						customScriptTemplate="/scripts/add?hub=hub%2F9081%2Fwindmill%2Fschedule_error_handler_template"
+						customScriptTemplate="/scripts/add?hub=hub%2F19743%2Fwindmill%2Fschedule_error_handler_template"
 						bind:customHandlerKind={errorHandleritemKind}
 						bind:handlerExtraArgs={errorHandlerExtraArgs}
 					>
-						<!-- @migration-task: migrate this slot by hand, `custom-tab-tooltip` is an invalid identifier -->
-						<svelte:fragment slot="custom-tab-tooltip">
+						{#snippet customTabTooltip()}
 							<Tooltip>
 								<div class="flex gap-20 items-start mt-3">
 									<div class="text-sm"
 										>The following args will be passed to the error handler:
 										<ul class="mt-1 ml-2">
+											<li
+												><b>workspace_id</b>: The ID of the workspace that the schedule belongs to.</li
+											>
+											<li><b>job_id</b>: The UUID of the job that errored.</li>
 											<li><b>path</b>: The path of the script or flow that failed.</li>
 											<li><b>is_flow</b>: Whether the runnable is a flow.</li>
 											<li><b>schedule_path</b>: The path of the schedule.</li>
@@ -992,7 +929,7 @@ $effect(() => {
 									</div>
 								</div>
 							</Tooltip>
-						</svelte:fragment>
+						{/snippet}
 					</ErrorOrRecoveryHandler>
 					<div class="flex flex-row items-center justify-between">
 						<div class="flex flex-row items-center mt-4 font-semibold text-sm gap-2">
@@ -1057,14 +994,12 @@ $effect(() => {
 						errorOrRecovery="recovery"
 						bind:handlerSelected={recoveryHandlerSelected}
 						bind:handlerPath={recoveryHandlerPath}
-						customInitialScriptPath={recoveryHandlerCustomInitialPath}
 						toggleText="Alert channel when error recovered"
 						customScriptTemplate="/scripts/add?hub=hub%2F9082%2Fwindmill%2Fschedule_recovery_handler_template"
 						bind:customHandlerKind={recoveryHandlerItemKind}
 						bind:handlerExtraArgs={recoveryHandlerExtraArgs}
 					>
-						<!-- @migration-task: migrate this slot by hand, `custom-tab-tooltip` is an invalid identifier -->
-						<svelte:fragment slot="custom-tab-tooltip">
+						{#snippet customTabTooltip()}
 							<Tooltip>
 								<div class="flex gap-20 items-start mt-3">
 									<div class=" text-sm"
@@ -1089,7 +1024,7 @@ $effect(() => {
 									</div>
 								</div>
 							</Tooltip>
-						</svelte:fragment>
+						{/snippet}
 					</ErrorOrRecoveryHandler>
 					<div class="flex flex-row items-center justify-between">
 						<div
@@ -1148,14 +1083,12 @@ $effect(() => {
 						errorOrRecovery="success"
 						bind:handlerSelected={successHandlerSelected}
 						bind:handlerPath={successHandlerPath}
-						customInitialScriptPath={successHandlerCustomInitialPath}
 						toggleText="Alert channel when successful"
 						customScriptTemplate="/scripts/add?hub=hub%2F9071%2Fwindmill%2Fschedule_success_handler_template"
 						bind:customHandlerKind={successHandlerItemKind}
 						bind:handlerExtraArgs={successHandlerExtraArgs}
 					>
-						<!-- @migration-task: migrate this slot by hand, `custom-tab-tooltip` is an invalid identifier -->
-						<svelte:fragment slot="custom-tab-tooltip">
+						{#snippet customTabTooltip()}
 							<Tooltip>
 								<div class="flex gap-20 items-start mt-3">
 									<div class=" text-sm"
@@ -1170,7 +1103,7 @@ $effect(() => {
 									</div>
 								</div>
 							</Tooltip>
-						</svelte:fragment>
+						{/snippet}
 					</ErrorOrRecoveryHandler>
 				</Section>
 			{:else if optionTabSelected === 'retries'}
@@ -1188,7 +1121,20 @@ $effect(() => {
 							step in the flow editor.
 						</Tooltip>
 					{/snippet}
-					<FlowRetries bind:flowModuleRetry={retry} disabled={itemKind !== 'script' || disabled} />
+					{#if itemKind !== 'script'}
+						<Alert type="info" title="Only available for scripts" class="mb-2">
+							Error Handler and Retries are only available for scripts. For flows, use the built-in <a
+								href="https://www.windmill.dev/docs/flows/flow_error_handler"
+								target="_blank">error handler</a
+							>
+							and <a href="https://www.windmill.dev/docs/flows/retries" target="_blank">retries</a>.
+						</Alert>
+					{:else}
+						<FlowRetries
+							bind:flowModuleRetry={retry}
+							disabled={itemKind !== 'script' || disabled}
+						/>
+					{/if}
 				</Section>
 			{:else if optionTabSelected === 'tag'}
 				<Section

package/package/components/triggers/sqs/SqsTriggerEditorInner.svelte

@@ -14,7 +14,10 @@ import Required from '../../Required.svelte';
 import { untrack } from 'svelte';
 import TriggerEditorToolbar from '../TriggerEditorToolbar.svelte';
 import { saveSqsTriggerFromCfg } from './utils';
-import { handleConfigChange } from '../utils';
+import { getHandlerType, handleConfigChange } from '../utils';
+import Tabs from '../../common/tabs/Tabs.svelte';
+import Tab from '../../common/tabs/Tab.svelte';
+import TriggerRetriesAndErrorHandler from '../TriggerRetriesAndErrorHandler.svelte';
 let { useDrawer = true, description = undefined, hideTarget = false, hideTooltips = false, allowDraft = false, trigger = undefined, isEditor = false, customLabel = undefined, isDeployed = false, cloudDisabled = false, onConfigChange = undefined, onCaptureConfigChange = undefined, onUpdate = undefined, onDelete = undefined, onReset = undefined } = $props();
 let drawer = $state(undefined);
 let is_flow = $state(false);
@@ -38,6 +41,11 @@ let aws_auth_resource_type = $state('credentials');
 let isValid = $state(false);
 let initialConfig = undefined;
 let deploymentLoading = $state(false);
+let optionTabSelected = $state('error_handler');
+let errorHandlerSelected = $state('slack');
+let error_handler_path = $state();
+let error_handler_args = $state({});
+let retry = $state();
 const sqsConfig = $derived.by(getSaveCfg);
 const captureConfig = $derived.by(getCaptureConfig);
 const saveDisabled = $derived(pathError != '' || emptyString(script_path) || !isValid || !can_write);
@@ -87,6 +95,10 @@ export async function openNew(nis_flow, fixedScriptPath_, defaultValues) {
         edit = false;
         dirtyPath = false;
         enabled = defaultValues?.enabled ?? false;
+        error_handler_path = defaultValues?.error_handler_path ?? undefined;
+        error_handler_args = defaultValues?.error_handler_args ?? {};
+        retry = defaultValues?.retry ?? undefined;
+        errorHandlerSelected = getHandlerType(error_handler_path ?? '');
     }
     finally {
         initialConfig = structuredClone($state.snapshot(getSaveCfg()));
@@ -107,6 +119,10 @@ async function loadTriggerConfig(cfg) {
         enabled = cfg?.enabled;
         aws_auth_resource_type = cfg?.aws_auth_resource_type;
         can_write = canWrite(cfg?.path, cfg?.extra_perms, $userStore);
+        error_handler_path = cfg?.error_handler_path;
+        error_handler_args = cfg?.error_handler_args ?? {};
+        retry = cfg?.retry;
+        errorHandlerSelected = getHandlerType(error_handler_path ?? '');
     }
     catch (error) {
         sendUserToast(`Could not load SQS trigger config: ${error.body}`, true);
@@ -139,7 +155,10 @@ function getSaveCfg() {
         queue_url,
         message_attributes,
         aws_auth_resource_type,
-        enabled
+        enabled,
+        error_handler_path,
+        error_handler_args,
+        retry
     };
 }
 async function handleToggleEnabled(nEnabled) {
@@ -313,6 +332,28 @@ $effect(() => {
 				headless={true}
 				showTestingBadge={isEditor}
 			/>
+
+			<Section label="Advanced" collapsable>
+				<div class="flex flex-col gap-4">
+					<div class="min-h-96">
+						<Tabs bind:selected={optionTabSelected}>
+							<Tab value="error_handler">Error Handler</Tab>
+							<Tab value="retries">Retries</Tab>
+						</Tabs>
+						<div class="mt-4">
+							<TriggerRetriesAndErrorHandler
+								{optionTabSelected}
+								{itemKind}
+								{can_write}
+								bind:errorHandlerSelected
+								bind:error_handler_path
+								bind:error_handler_args
+								bind:retry
+							/>
+						</div>
+					</div>
+				</div>
+			</Section>
 		</div>
 	{/if}
 {/snippet}

package/package/components/triggers/sqs/utils.js

@@ -2,6 +2,13 @@ import { SqsTriggerService } from '../../../gen';
 import { sendUserToast } from '../../../toast';
 import { get } from 'svelte/store';
 export async function saveSqsTriggerFromCfg(initialPath, cfg, edit, workspace, usedTriggerKinds) {
+    const errorHandlerAndRetries = !cfg.is_flow
+        ? {
+            error_handler_path: cfg.error_handler_path,
+            error_handler_args: cfg.error_handler_path ? cfg.error_handler_args : undefined,
+            retry: cfg.retry
+        }
+        : {};
     const requestBody = {
         path: cfg.path,
         script_path: cfg.script_path,
@@ -10,7 +17,8 @@ export async function saveSqsTriggerFromCfg(initialPath, cfg, edit, workspace, u
         queue_url: cfg.queue_url,
         message_attributes: cfg.message_attributes,
         aws_auth_resource_type: cfg.aws_auth_resource_type,
-        enabled: cfg.enabled
+        enabled: cfg.enabled,
+        ...errorHandlerAndRetries
     };
     try {
         if (edit) {

package/package/components/triggers/utils.js

@@ -395,3 +395,15 @@ export function filterDraftTriggers(savedValue, triggersState) {
     }));
     return newSavedValue;
 }
+export function getHandlerType(scriptPath) {
+    const handlerMap = {
+        teams: '/workspace-or-schedule-error-handler-teams',
+        slack: '/workspace-or-schedule-error-handler-slack'
+    };
+    for (const [type, suffix] of Object.entries(handlerMap)) {
+        if (scriptPath.startsWith('hub/') && scriptPath.endsWith(suffix)) {
+            return type;
+        }
+    }
+    return 'custom';
+}

package/package/components/triggers/websocket/WebsocketTriggerEditorInner.svelte

@@ -17,7 +17,10 @@ import WebsocketEditorConfigSection from './WebsocketEditorConfigSection.svelte'
 import { untrack } from 'svelte';
 import TriggerEditorToolbar from '../TriggerEditorToolbar.svelte';
 import { saveWebsocketTriggerFromCfg } from './utils';
-import { handleConfigChange } from '../utils';
+import { getHandlerType, handleConfigChange } from '../utils';
+import Tabs from '../../common/tabs/Tabs.svelte';
+import Tab from '../../common/tabs/Tab.svelte';
+import TriggerRetriesAndErrorHandler from '../TriggerRetriesAndErrorHandler.svelte';
 let { useDrawer = true, description = undefined, hideTarget = false, hideTooltips = false, isEditor = false, allowDraft = false, trigger = undefined, isDeployed = false, customLabel = undefined, onConfigChange = undefined, onCaptureConfigChange = undefined, onUpdate = undefined, onDelete = undefined, onReset = undefined, cloudDisabled = false } = $props();
 let drawer = $state();
 let is_flow = $state(false);
@@ -43,6 +46,11 @@ let showLoading = $state(false);
 let initialConfig = undefined;
 let deploymentLoading = $state(false);
 let isValid = $state(false);
+let optionTabSelected = $state('error_handler');
+let errorHandlerSelected = $state('slack');
+let error_handler_path = $state();
+let error_handler_args = $state({});
+let retry = $state();
 const websocketCfg = $derived.by(getSaveCfg);
 const captureConfig = $derived.by(isEditor ? getCaptureConfig : () => ({}));
 const saveDisabled = $derived.by(() => {
@@ -110,6 +118,10 @@ export async function openNew(nis_flow, fixedScriptPath_, defaultValues) {
         url_runnable_args = defaultValues?.url_runnable_args ?? {};
         dirtyPath = false;
         can_return_message = false;
+        error_handler_path = defaultValues?.error_handler_path ?? undefined;
+        error_handler_args = defaultValues?.error_handler_args ?? {};
+        retry = defaultValues?.retry ?? undefined;
+        errorHandlerSelected = getHandlerType(error_handler_path ?? '');
     }
     finally {
         clearTimeout(loadingTimeout);
@@ -129,6 +141,10 @@ function loadTriggerConfig(cfg) {
     url_runnable_args = cfg?.url_runnable_args;
     can_return_message = cfg?.can_return_message;
     can_write = canWrite(path, cfg?.extra_perms, $userStore);
+    error_handler_path = cfg?.error_handler_path;
+    error_handler_args = cfg?.error_handler_args ?? {};
+    retry = cfg?.retry;
+    errorHandlerSelected = getHandlerType(error_handler_path ?? '');
 }
 function getSaveCfg() {
     return {
@@ -141,7 +157,10 @@ function getSaveCfg() {
         initial_messages,
         url_runnable_args,
         can_return_message,
-        enabled
+        enabled,
+        error_handler_path,
+        error_handler_args,
+        retry
     };
 }
 async function loadTrigger(defaultConfig) {
@@ -593,6 +612,28 @@ $effect(() => {
 					</div>
 				</div>
 			</Section>
+
+			<Section label="Advanced" collapsable>
+				<div class="flex flex-col gap-4">
+					<div class="min-h-96">
+						<Tabs bind:selected={optionTabSelected}>
+							<Tab value="error_handler">Error Handler</Tab>
+							<Tab value="retries">Retries</Tab>
+						</Tabs>
+						<div class="mt-4">
+							<TriggerRetriesAndErrorHandler
+								{optionTabSelected}
+								{itemKind}
+								{can_write}
+								bind:errorHandlerSelected
+								bind:error_handler_path
+								bind:error_handler_args
+								bind:retry
+							/>
+						</div>
+					</div>
+				</div>
+			</Section>
 		</div>
 	{/if}
 {/snippet}

package/package/components/triggers/websocket/utils.js

@@ -2,6 +2,15 @@ import { WebsocketTriggerService } from '../../../gen';
 import { sendUserToast } from '../../../toast';
 import { get } from 'svelte/store';
 export async function saveWebsocketTriggerFromCfg(initialPath, triggerCfg, edit, workspace, usedTriggerKinds) {
+    const errorHandlerAndRetries = !triggerCfg.is_flow
+        ? {
+            error_handler_path: triggerCfg.error_handler_path,
+            error_handler_args: triggerCfg.error_handler_path
+                ? triggerCfg.error_handler_args
+                : undefined,
+            retry: triggerCfg.retry
+        }
+        : {};
     const requestBody = {
         path: triggerCfg.path,
         script_path: triggerCfg.script_path,
@@ -10,7 +19,8 @@ export async function saveWebsocketTriggerFromCfg(initialPath, triggerCfg, edit,
         filters: triggerCfg.filters,
         initial_messages: triggerCfg.initial_messages,
         url_runnable_args: triggerCfg.url_runnable_args,
-        can_return_message: triggerCfg.can_return_message
+        can_return_message: triggerCfg.can_return_message,
+        ...errorHandlerAndRetries
     };
     try {
         if (edit) {

package/package/components/workspaceSettings/AISettings.svelte

@@ -160,8 +160,6 @@ async function onAiProviderChange(provider) {
 					{#if aiProviders[provider]}
 						<div class="mb-4 flex flex-col gap-2">
 							<div class="flex flex-row gap-1">
-								<!-- this can be removed once the parent component moves to runes -->
-								<!-- svelte-ignore binding_property_non_reactive -->
 								<ResourcePicker
 									selectFirst
 									resourceType={provider === 'openai' && usingOpenaiClientCredentialsOauth