windmill-components 1.542.4 → 1.550.0

package/package/components/triggers/AddTriggersButton.svelte

@@ -88,6 +88,7 @@ export function close() {
 {/snippet}
 
 <DropdownV2
+	enableFlyTransition
 	bind:this={dropdown}
 	items={addTriggerItems}
 	{placement}

package/package/components/triggers/gcp/GcpTriggerEditorConfigSection.svelte

@@ -57,7 +57,7 @@ async function loadAllSubscriptionFromGooglePubSubTopic() {
         loadingSubscription = false;
     }
 }
-let { can_write = false, headless = false, isValid = $bindable(false), gcp_resource_path = $bindable(''), subscription_id = $bindable(''), topic_id = $bindable(''), delivery_type = $bindable('pull'), delivery_config = $bindable(), subscription_mode = $bindable('create_update'), base_endpoint = $bindable(getBaseUrl()), auto_acknowledge_msg = $bindable(true), path = '', showTestingBadge = false, cloud_subscription_id = $bindable(''), create_update_subscription_id = $bindable('') } = $props();
+let { can_write = false, headless = false, isValid = $bindable(false), gcp_resource_path = $bindable(''), subscription_id = $bindable(''), topic_id = $bindable(''), delivery_type = $bindable('pull'), delivery_config = $bindable(), subscription_mode = $bindable('create_update'), base_endpoint = $bindable(getBaseUrl()), auto_acknowledge_msg = $bindable(true), ack_deadline = $bindable(), path = '', showTestingBadge = false, cloud_subscription_id = $bindable(''), create_update_subscription_id = $bindable('') } = $props();
 if (gcp_resource_path) {
     loadAllPubSubTopicsFromProject();
 }

package/package/components/triggers/gcp/GcpTriggerEditorConfigSection.svelte.d.ts

@@ -15,7 +15,8 @@ interface Props {
     cloud_subscription_id?: string;
     create_update_subscription_id?: string;
     auto_acknowledge_msg: boolean;
+    ack_deadline?: number;
 }
-declare const GcpTriggerEditorConfigSection: import("svelte").Component<Props, {}, "base_endpoint" | "gcp_resource_path" | "topic_id" | "subscription_id" | "delivery_type" | "subscription_mode" | "delivery_config" | "auto_acknowledge_msg" | "isValid" | "cloud_subscription_id" | "create_update_subscription_id">;
+declare const GcpTriggerEditorConfigSection: import("svelte").Component<Props, {}, "base_endpoint" | "gcp_resource_path" | "topic_id" | "subscription_id" | "delivery_type" | "subscription_mode" | "delivery_config" | "auto_acknowledge_msg" | "ack_deadline" | "isValid" | "cloud_subscription_id" | "create_update_subscription_id">;
 type GcpTriggerEditorConfigSection = ReturnType<typeof GcpTriggerEditorConfigSection>;
 export default GcpTriggerEditorConfigSection;

package/package/components/triggers/gcp/GcpTriggerEditorInner.svelte

@@ -46,6 +46,7 @@ let initialConfig = undefined;
 let deploymentLoading = $state(false);
 let base_endpoint = $derived(`${window.location.origin}${base}`);
 let auto_acknowledge_msg = $state(true);
+let ack_deadline = $state();
 let optionTabSelected = $state('error_handler');
 let errorHandlerSelected = $state('slack');
 let error_handler_path = $state();
@@ -99,6 +100,7 @@ export async function openNew(nis_flow, fixedScriptPath_, defaultValues) {
         error_handler_args = defaultValues?.error_handler_args ?? {};
         retry = defaultValues?.retry ?? undefined;
         auto_acknowledge_msg = defaultValues?.auto_acknowledge_msg ?? true;
+        ack_deadline = defaultValues?.ack_deadline;
         errorHandlerSelected = getHandlerType(error_handler_path ?? '');
     }
     finally {
@@ -140,6 +142,7 @@ async function loadTriggerConfig(cfg) {
     error_handler_args = cfg?.error_handler_args ?? {};
     retry = cfg?.retry;
     auto_acknowledge_msg = cfg?.auto_acknowledge_msg ?? true;
+    ack_deadline = cfg?.ack_deadline;
     errorHandlerSelected = getHandlerType(error_handler_path ?? '');
 }
 async function updateTrigger() {
@@ -171,7 +174,8 @@ function getGcpConfig() {
         error_handler_path,
         error_handler_args,
         retry,
-        auto_acknowledge_msg
+        auto_acknowledge_msg,
+        ack_deadline
     };
 }
 function getGcpCaptureConfig() {
@@ -183,6 +187,7 @@ function getGcpCaptureConfig() {
         delivery_config,
         base_endpoint,
         auto_acknowledge_msg,
+        ack_deadline,
         topic_id,
         path
     };
@@ -337,6 +342,7 @@ $effect(() => {
 				bind:topic_id
 				bind:subscription_mode
 				bind:auto_acknowledge_msg
+				bind:ack_deadline
 				{path}
 				cloud_subscription_id={subscription_id}
 				create_update_subscription_id={subscription_id}
@@ -376,11 +382,28 @@ $effect(() => {
 												</div>
 											{/if}
 										</Subsection>
-									{:else}
-										<div class="flex items-center justify-center h-32 text-tertiary">
-											No settings available for push delivery type
-										</div>
 									{/if}
+									<Subsection
+										label="Acknowledgment deadline"
+										tooltip="Time in seconds within which the message must be acknowledged. If not provided, defaults to the subscription's acknowledgment deadline (600 seconds). Range: 10-600 seconds."
+									>
+										<div class="mt-2">
+											<input
+												type="number"
+												bind:value={ack_deadline}
+												disabled={!can_write}
+												min="10"
+												max="600"
+												step="1"
+												placeholder="600"
+												class="w-full px-3 py-2 text-sm border border-gray-200 dark:border-gray-700 rounded-md bg-surface text-primary focus:ring-2 focus:ring-blue-500 focus:border-blue-500 disabled:opacity-50 disabled:cursor-not-allowed"
+											/>
+										</div>
+										<div class="mt-2 text-xs text-secondary">
+											Leave empty to use subscription default (600 seconds). This affects how long
+											messages remain in flight before being redelivered.
+										</div>
+									</Subsection>
 								</div>
 							{:else}
 								<TriggerRetriesAndErrorHandler

package/package/components/triggers/gcp/utils.js

@@ -23,6 +23,7 @@ export async function saveGcpTriggerFromCfg(initialPath, cfg, edit, workspace, u
             enabled: cfg.enabled,
             is_flow: cfg.is_flow,
             auto_acknowledge_msg: cfg.auto_acknowledge_msg,
+            ack_deadline: cfg.ack_deadline,
             ...errorHandlerAndRetries
         };
         if (edit) {

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

@@ -809,6 +809,7 @@ $effect(() => {
 								{:then Module}
 									<Module.default
 										showReset
+										onlyMaskPassword
 										disabled={!can_write}
 										schema={$state.snapshot(schema)}
 										bind:isValid

package/package/components/triggers/webhook/WebhooksConfigSection.svelte

@@ -5,7 +5,7 @@ import ToggleButton from '../../common/toggleButton-v2/ToggleButton.svelte';
 import { DEFAULT_WEBHOOK_TYPE, SCRIPT_VIEW_SHOW_EXAMPLE_CURL, SCRIPT_VIEW_SHOW_CREATE_TOKEN_BUTTON } from '../../../consts';
 import bash from 'svelte-highlight/languages/bash';
 import { Tabs, Tab, TabContent, Button } from '../../common';
-import { ArrowDownRight, ArrowUpRight, Clipboard } from 'lucide-svelte';
+import { ArrowDownRight, ArrowUpRight, Clipboard, RssIcon } from 'lucide-svelte';
 import { Highlight } from 'svelte-highlight';
 import { typescript } from 'svelte-highlight/languages';
 import ClipboardPanel from '../../details/ClipboardPanel.svelte';
@@ -20,12 +20,18 @@ let { isFlow = false, path = '', hash = undefined, token = $bindable(''), runnab
 let webhooks = $derived(isFlow ? computeFlowWebhooks(path) : computeScriptWebhooks(hash, path));
 let selectedTab = $state('rest');
 let userSettings = $state();
-let webhookType = $state(DEFAULT_WEBHOOK_TYPE);
-let requestType = $state(isFlow ? 'path' : 'path');
+let requestType = $state(DEFAULT_WEBHOOK_TYPE);
+let callMethod = $state('post');
+let runnableId = $state('path');
 let tokenType = $state('headers');
 $effect(() => {
-    if (webhookType === 'async' && requestType === 'get_path') {
-        requestType = hash ? 'hash' : 'path';
+    if (requestType === 'async' && (callMethod === 'get' || callMethod === 'sse')) {
+        callMethod = 'post';
+    }
+});
+$effect(() => {
+    if (callMethod === 'sse' && tokenType === 'headers') {
+        tokenType = 'query';
     }
 });
 let cleanedRunnableArgs = $derived.by(() => {
@@ -34,25 +40,37 @@ let cleanedRunnableArgs = $derived.by(() => {
         ? Object.fromEntries(Object.entries(runnableArgs).filter(([key]) => key !== 'wm_trigger'))
         : runnableArgs;
 });
-let url = $derived(webhooks[webhookType][requestType] +
+let url = $derived(webhooks[requestType][callMethod][runnableId] +
     (tokenType === 'query'
-        ? `?token=${token}${requestType === 'get_path'
+        ? `?token=${token}${callMethod === 'get' || callMethod === 'sse'
             ? `&payload=${encodeURIComponent(btoa(JSON.stringify(cleanedRunnableArgs ?? {})))}`
             : ''}`
-        : `${requestType === 'get_path'
+        : `${callMethod === 'get'
             ? `?payload=${encodeURIComponent(btoa(JSON.stringify(cleanedRunnableArgs ?? {})))}`
             : ''}`));
 function computeScriptWebhooks(hash, path) {
     let webhookBase = `${location.origin}${base}/api/w/${$workspaceStore}/jobs`;
     return {
         async: {
-            hash: `${webhookBase}/run/h/${hash}`,
-            path: `${webhookBase}/run/p/${path}`
+            get: {},
+            post: {
+                hash: `${webhookBase}/run/h/${hash}`,
+                path: `${webhookBase}/run/p/${path}`
+            },
+            sse: {}
         },
         sync: {
-            hash: `${webhookBase}/run_wait_result/h/${hash}`,
-            path: `${webhookBase}/run_wait_result/p/${path}`,
-            get_path: `${webhookBase}/run_wait_result/p/${path}`
+            get: {
+                path: `${webhookBase}/run_wait_result/p/${path}`
+            },
+            post: {
+                hash: `${webhookBase}/run_wait_result/h/${hash}`,
+                path: `${webhookBase}/run_wait_result/p/${path}`
+            },
+            sse: {
+                hash: `${webhookBase}/run_and_stream/h/${hash}`,
+                path: `${webhookBase}/run_and_stream/p/${path}`
+            }
         }
     };
 }
@@ -60,19 +78,31 @@ function computeFlowWebhooks(path) {
     let webhooksBase = `${location.origin}${base}/api/w/${$workspaceStore}/jobs`;
     let urlAsync = `${webhooksBase}/run/f/${path}`;
     let urlSync = `${webhooksBase}/run_wait_result/f/${path}`;
+    let urlStream = `${webhooksBase}/run_and_stream/f/${path}`;
     return {
         async: {
-            path: urlAsync
+            get: {},
+            post: {
+                path: urlAsync
+            },
+            sse: {}
         },
         sync: {
-            path: urlSync,
-            get_path: urlSync
+            get: {
+                path: urlSync
+            },
+            post: {
+                path: urlSync
+            },
+            sse: {
+                path: urlStream
+            }
         }
     };
 }
 function headers() {
     const headers = {};
-    if (requestType != 'get_path') {
+    if (callMethod === 'post') {
         headers['Content-Type'] = 'application/json';
     }
     if (tokenType === 'headers') {
@@ -81,7 +111,34 @@ function headers() {
     return headers;
 }
 function fetchCode() {
-    if (webhookType === 'sync') {
+    if (callMethod === 'sse') {
+        return `
+import { EventSource } from "eventsource";
+
+export async function main() {
+	const endpoint = \`${url}\`;
+
+	return new Promise((resolve, reject) => {
+		const eventSource = new EventSource(endpoint);
+
+		eventSource.onmessage = (event) => {
+			const data = JSON.parse(event.data);
+			console.log(data);
+			if (data.completed) {
+				eventSource.close();
+				resolve();
+			}
+		};
+
+		eventSource.onerror = (error) => {
+			console.error('EventSource error:', error);
+			eventSource.close();
+			reject(error);
+		};
+	});
+}`;
+    }
+    if (requestType === 'sync') {
         return `
 export async function main() {
   const jobTriggerResponse = await triggerJob();
@@ -90,39 +147,40 @@ export async function main() {
 }
 
 async function triggerJob() {
-  ${requestType === 'get_path'
+  ${callMethod === 'get'
             ? '// Payload is a base64 encoded string of the arguments'
             : `const body = JSON.stringify(${JSON.stringify(cleanedRunnableArgs ?? {}, null, 2).replaceAll('\n', '\n\t')});`}
   const endpoint = \`${url}\`;
 
   return await fetch(endpoint, {
-    method: '${requestType === 'get_path' ? 'GET' : 'POST'}',
-    headers: ${JSON.stringify(headers(), null, 2).replaceAll('\n', '\n\t\t')}${requestType === 'get_path' ? '' : `,\n\t\tbody`}
+    method: '${callMethod === 'get' ? 'GET' : 'POST'}',
+    headers: ${JSON.stringify(headers(), null, 2).replaceAll('\n', '\n\t\t')}${callMethod === 'get' ? '' : `,\n\t\tbody`}
   });
 }`;
     }
-    // Main function
-    let mainFunction = `
+    else {
+        // Main function
+        let mainFunction = `
 export async function main() {
   const jobTriggerResponse = await triggerJob();
   const UUID = await jobTriggerResponse.text();
   const jobCompletionData = await waitForJobCompletion(UUID);
   return jobCompletionData;
 }`;
-    // triggerJob function
-    let triggerJobFunction = `
+        // triggerJob function
+        let triggerJobFunction = `
 async function triggerJob() {
   const body = JSON.stringify(${JSON.stringify(cleanedRunnableArgs ?? {}, null, 2).replaceAll('\n', '\n\t')});
   const endpoint = \`${url}\`;
 
   return await fetch(endpoint, {
-    method: '${requestType === 'get_path' ? 'GET' : 'POST'}',
+    method: '${callMethod === 'get' ? 'GET' : 'POST'}',
     headers: ${JSON.stringify(headers(), null, 2).replaceAll('\n', '\n\t\t')},
     body
   });
 }`;
-    // waitForJobCompletion function
-    let waitForJobCompletionFunction = `
+        // waitForJobCompletion function
+        let waitForJobCompletionFunction = `
 function waitForJobCompletion(UUID) {
   return new Promise(async (resolve, reject) => {
     try {
@@ -148,16 +206,17 @@ function waitForJobCompletion(UUID) {
     }
   });
 }`;
-    // Combine and return
-    return `${mainFunction}\n\n${triggerJobFunction}\n\n${waitForJobCompletionFunction}`;
+        // Combine and return
+        return `${mainFunction}\n\n${triggerJobFunction}\n\n${waitForJobCompletionFunction}`;
+    }
 }
 function curlCode() {
     return `TOKEN='${token}'
-${requestType !== 'get_path' ? `BODY='${JSON.stringify(cleanedRunnableArgs ?? {})}'` : ''}
+${callMethod !== 'get' ? `BODY='${JSON.stringify(cleanedRunnableArgs ?? {})}'` : ''}
 URL='${url}'
-${webhookType === 'sync' ? 'RESULT' : 'UUID'}=$(curl -s ${requestType != 'get_path' ? "-H 'Content-Type: application/json'" : ''} ${tokenType === 'headers' ? `-H "Authorization: Bearer $TOKEN"` : ''} -X ${requestType === 'get_path' ? 'GET' : 'POST'} ${requestType !== 'get_path' ? `-d "$BODY" ` : ''}$URL)
+${requestType === 'sync' ? 'RESULT' : 'UUID'}=$(curl -s ${callMethod != 'get' ? "-H 'Content-Type: application/json'" : ''} ${tokenType === 'headers' ? `-H "Authorization: Bearer $TOKEN"` : ''} -X ${callMethod === 'get' ? 'GET' : 'POST'} ${callMethod !== 'get' ? `-d "$BODY" ` : ''}$URL)
 
-${webhookType === 'sync'
+${requestType === 'sync'
         ? 'echo -E $RESULT | jq'
         : `
 URL="${location.origin}/api/w/${$workspaceStore}/jobs_u/completed/get_result_maybe/$UUID"
@@ -213,7 +272,7 @@ done`}`;
 	<div class="flex flex-col gap-2">
 		<div class="flex flex-row justify-between">
 			<div class="text-sm font-normal text-secondary flex flex-row items-center">Request type</div>
-			<ToggleButtonGroup class="h-[30px] w-auto" bind:selected={webhookType}>
+			<ToggleButtonGroup class="h-[30px] w-auto" bind:selected={requestType}>
 				{#snippet children({ item })}
 					<ToggleButton
 						label="Async"
@@ -232,44 +291,63 @@ done`}`;
 		</div>
 		<div class="flex flex-row justify-between">
 			<div class="text-sm font-normal text-secondary flex flex-row items-center">Call method</div>
-			<ToggleButtonGroup class="h-[30px] w-auto" bind:selected={requestType}>
+			<ToggleButtonGroup class="h-[30px] w-auto" bind:selected={callMethod}>
 				{#snippet children({ item })}
 					<ToggleButton
-						label="POST by path"
-						value="path"
-						icon={ArrowUpRight}
+						label="POST"
+						icon={ArrowDownRight}
+						selectedColor="#14b8a6"
+						value="post"
 						{item}
+					/>
+					<ToggleButton
+						label="GET"
+						icon={ArrowUpRight}
 						selectedColor="#fb923c"
+						value="get"
+						{item}
+						disabled={requestType !== 'sync'}
 					/>
-					{#if !isFlow}
-						<ToggleButton
-							label="POST by hash"
-							value="hash"
-							icon={ArrowUpRight}
-							selectedColor="#fb923c"
-							disabled={!hash}
-							{item}
-						/>
-					{/if}
-
 					<ToggleButton
-						label="GET by path"
-						value="get_path"
-						icon={ArrowDownRight}
-						disabled={webhookType !== 'sync'}
+						label="SSE"
+						value="sse"
+						icon={RssIcon}
+						selectedColor="#3B82F6"
+						disabled={requestType !== 'sync'}
+						tooltip={'Returns an SSE stream. ' +
+							(isFlow
+								? 'Only useful if the last step of the flow returns a stream.'
+								: 'Only useful if the script returns a stream.')}
 						{item}
-						selectedColor="#14b8a6"
 					/>
 				{/snippet}
 			</ToggleButtonGroup>
 		</div>
+		{#if !isFlow}
+			<div class="flex flex-row justify-between">
+				<div class="text-sm font-normal text-secondary flex flex-row items-center">
+					Reference type
+				</div>
+				<ToggleButtonGroup class="h-[30px] w-auto" bind:selected={runnableId}>
+					{#snippet children({ item })}
+						<ToggleButton label="Path" value="path" {item} />
+						<ToggleButton label="Hash" value="hash" disabled={!hash} {item} />
+					{/snippet}
+				</ToggleButtonGroup>
+			</div>
+		{/if}
 		<div class="flex flex-row justify-between">
 			<div class="text-sm font-normal text-secondary flex flex-row items-center"
 				>Token configuration</div
 			>
 			<ToggleButtonGroup class="h-[30px] w-auto" bind:selected={tokenType}>
 				{#snippet children({ item })}
-					<ToggleButton label="Token in Headers" value="headers" {item} />
+					<ToggleButton
+						label="Token in Headers"
+						value="headers"
+						{item}
+						disabled={callMethod === 'sse'}
+					/>
 					<ToggleButton label="Token in Query" value="query" {item} />
 				{/snippet}
 			</ToggleButtonGroup>
@@ -281,10 +359,12 @@ done`}`;
 	<div>
 		<Tabs bind:selected={selectedTab}>
 			<Tab value="rest" size="xs">REST</Tab>
-			{#if SCRIPT_VIEW_SHOW_EXAMPLE_CURL}
+			{#if SCRIPT_VIEW_SHOW_EXAMPLE_CURL && callMethod !== 'sse'}
 				<Tab value="curl" size="xs">Curl</Tab>
 			{/if}
-			<Tab value="fetch" size="xs">Fetch</Tab>
+			<Tab value="fetch" size="xs">
+				{callMethod === 'sse' ? 'Event Source' : 'Fetch'}
+			</Tab>
 
 			{#snippet content()}
 				{#key token}
@@ -294,12 +374,12 @@ done`}`;
 								<ClipboardPanel content={url} />
 							</Label>
 
-							{#if requestType !== 'get_path'}
+							{#if callMethod !== 'get'}
 								<Label label="Body">
 									<ClipboardPanel content={JSON.stringify(cleanedRunnableArgs ?? {}, null, 2)} />
 								</Label>
 							{/if}
-							{#key requestType}
+							{#key callMethod}
 								{#key tokenType}
 									<Label label="Headers">
 										<ClipboardPanel content={JSON.stringify(headers(), null, 2)} />
@@ -311,8 +391,8 @@ done`}`;
 					<TabContent value="curl" class="flex flex-col flex-1 h-full">
 						<div class="relative">
 							{#key runnableArgs}
-								{#key requestType}
-									{#key webhookType}
+								{#key callMethod}
+									{#key requestType}
 										{#key tokenType}
 											<div
 												class="flex flex-row flex-1 h-full border p-2 rounded-md overflow-auto relative"
@@ -332,8 +412,8 @@ done`}`;
 					</TabContent>
 					<TabContent value="fetch">
 						{#key runnableArgs}
-							{#key requestType}
-								{#key webhookType}
+							{#key callMethod}
+								{#key requestType}
 									{#key tokenType}
 										{#key token}
 											<div

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

@@ -39,6 +39,7 @@ let filters = $state([]);
 let initial_messages = $state([]);
 let url_runnable_args = $state({});
 let can_return_message = $state(false);
+let can_return_error_result = $state(false);
 let dirtyPath = $state(false);
 let can_write = $state(true);
 let drawerLoading = $state(true);
@@ -70,6 +71,11 @@ const saveDisabled = $derived.by(() => {
 $effect(() => {
     is_flow = itemKind === 'flow';
 });
+$effect(() => {
+    if (!can_return_message) {
+        can_return_error_result = false;
+    }
+});
 export async function openEdit(ePath, isFlow, defaultConfig) {
     let loadingTimeout = setTimeout(() => {
         showLoading = true;
@@ -118,6 +124,7 @@ export async function openNew(nis_flow, fixedScriptPath_, defaultValues) {
         url_runnable_args = defaultValues?.url_runnable_args ?? {};
         dirtyPath = false;
         can_return_message = false;
+        can_return_error_result = false;
         error_handler_path = defaultValues?.error_handler_path ?? undefined;
         error_handler_args = defaultValues?.error_handler_args ?? {};
         retry = defaultValues?.retry ?? undefined;
@@ -140,6 +147,7 @@ function loadTriggerConfig(cfg) {
     initial_messages = cfg?.initial_messages ?? [];
     url_runnable_args = cfg?.url_runnable_args;
     can_return_message = cfg?.can_return_message;
+    can_return_error_result = cfg?.can_return_error_result;
     can_write = canWrite(path, cfg?.extra_perms, $userStore);
     error_handler_path = cfg?.error_handler_path;
     error_handler_args = cfg?.error_handler_args ?? {};
@@ -157,6 +165,7 @@ function getSaveCfg() {
         initial_messages,
         url_runnable_args,
         can_return_message,
+        can_return_error_result,
         enabled,
         error_handler_path,
         error_handler_args,
@@ -377,6 +386,19 @@ $effect(() => {
 					}}
 					disabled={!can_write}
 				/>
+
+				<Toggle
+					checked={can_return_error_result}
+					on:change={() => {
+						can_return_error_result = !can_return_error_result
+					}}
+					options={{
+						right: 'Send result on error',
+						rightTooltip:
+							'Allows the runnable result to be sent as a message to the WebSocket server if the result is a non-null error.'
+					}}
+					disabled={!can_write || !can_return_message}
+				/>
 			</Section>
 
 			<WebsocketEditorConfigSection

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

@@ -20,6 +20,7 @@ export async function saveWebsocketTriggerFromCfg(initialPath, triggerCfg, edit,
         initial_messages: triggerCfg.initial_messages,
         url_runnable_args: triggerCfg.url_runnable_args,
         can_return_message: triggerCfg.can_return_message,
+        can_return_error_result: triggerCfg.can_return_error_result,
         ...errorHandlerAndRetries
     };
     try {

package/package/components/workspaceSettings/AISettings.svelte

@@ -17,8 +17,9 @@ import { AIMode } from '../copilot/chat/AIChatManager.svelte';
 import ToggleButtonGroup from '../common/toggleButton-v2/ToggleButtonGroup.svelte';
 import ToggleButton from '../common/toggleButton-v2/ToggleButton.svelte';
 import autosize from '../../autosize';
+import ModelTokenLimits from './ModelTokenLimits.svelte';
 const MAX_CUSTOM_PROMPT_LENGTH = 5000;
-let { aiProviders = $bindable(), codeCompletionModel = $bindable(), defaultModel = $bindable(), customPrompts = $bindable(), usingOpenaiClientCredentialsOauth = $bindable() } = $props();
+let { aiProviders = $bindable(), codeCompletionModel = $bindable(), defaultModel = $bindable(), customPrompts = $bindable(), maxTokensPerModel = $bindable(), usingOpenaiClientCredentialsOauth = $bindable() } = $props();
 let fetchedAiModels = $state(false);
 let availableAiModels = $state(Object.fromEntries(Object.keys(AI_PROVIDERS).map((provider) => [provider, AI_PROVIDERS[provider].defaultModels])));
 // Custom system prompt settings
@@ -66,7 +67,8 @@ async function editCopilotConfig() {
             providers: aiProviders,
             code_completion_model,
             default_model,
-            custom_prompts: Object.keys(custom_prompts).length > 0 ? custom_prompts : undefined
+            custom_prompts: Object.keys(custom_prompts).length > 0 ? custom_prompts : undefined,
+            max_tokens_per_model: Object.keys(maxTokensPerModel).length > 0 ? maxTokensPerModel : undefined
         };
         await WorkspaceService.editCopilotConfig({
             workspace: $workspaceStore,
@@ -276,6 +278,10 @@ async function onAiProviderChange(provider) {
 		</div>
 	{/if}
 
+	{#if Object.keys(aiProviders).length > 0}
+		<ModelTokenLimits {aiProviders} bind:maxTokensPerModel />
+	{/if}
+
 	{#if Object.keys(aiProviders).length > 0}
 		<div class="flex flex-col gap-2">
 			<p class="font-semibold">Custom system prompts</p>

package/package/components/workspaceSettings/AISettings.svelte.d.ts

@@ -4,8 +4,9 @@ type $$ComponentProps = {
     codeCompletionModel: string | undefined;
     defaultModel: string | undefined;
     customPrompts: Record<string, string>;
+    maxTokensPerModel: Record<string, number>;
     usingOpenaiClientCredentialsOauth: boolean;
 };
-declare const AiSettings: import("svelte").Component<$$ComponentProps, {}, "codeCompletionModel" | "defaultModel" | "aiProviders" | "customPrompts" | "usingOpenaiClientCredentialsOauth">;
+declare const AiSettings: import("svelte").Component<$$ComponentProps, {}, "codeCompletionModel" | "defaultModel" | "aiProviders" | "maxTokensPerModel" | "customPrompts" | "usingOpenaiClientCredentialsOauth">;
 type AiSettings = ReturnType<typeof AiSettings>;
 export default AiSettings;