windmill-components 1.511.0 → 1.522.0

package/package/components/apps/editor/settingsPanel/DecisionTreeGraphEditor.svelte

@@ -23,7 +23,7 @@ const { debounced: debouncedNodes } = debounce(() => {
 }, 300);
 let selectedNode = $derived(nodes?.find((node) => node.id == $selectedNodeId));
 setContext('DecisionTreeEditor', { selectedNodeId });
-let sortedSelectedNextNodes = $derived(selectedNode?.next.sort((n1, n2) => n1.id.localeCompare(n2.id)));
+let sortedSelectedNextNodes = $derived([...(selectedNode?.next ?? [])].sort((n1, n2) => n1.id.localeCompare(n2.id)));
 </script>
 
 <Drawer bind:this={drawer} on:close={() => {}} on:open={() => {}} size="1200px">
@@ -104,8 +104,8 @@ let sortedSelectedNextNodes = $derived(selectedNode?.next.sort((n1, n2) => n1.id
 												<InputsSpecEditor
 													key={`condition-${selectedNode.id}-${index}`}
 													customTitle={index === 0
-														? 'Goes to the default branch'
-														: `${index > 0 ? 'Otherwise ' : ''}Goes to branch ${index}`}
+														? 'Goes to branch 1'
+														: `${index > 0 ? 'Otherwise g' : 'G'}oes to branch ${index + 1}`}
 													bind:componentInput={subNode.condition}
 													id={selectedNode.id}
 													userInputEnabled={false}

package/package/components/apps/editor/settingsPanel/decisionTree/DecisionTreePreview.svelte

@@ -140,9 +140,7 @@ function graphBuilder(decisionTreeNodes) {
                     position: { x: -1, y: -1 },
                     data: {
                         node: {
-                            label: positionRelativeToParent === 0
-                                ? 'Default branch'
-                                : `Branch ${positionRelativeToParent}`,
+                            label: `Branch ${(positionRelativeToParent ?? 0) + 1}`,
                             id: branchHeaderId,
                             allowed: undefined,
                             next: [],

package/package/components/assets/AssetsDropdownButton.svelte

@@ -131,7 +131,7 @@ $effect(() => {
 						</svelte:fragment>
 					</Popover>
 					<div class="flex flex-col flex-1">
-						<Tooltip class="select-none max-w-48 truncate" disablePopup={disableLiTooltip}>
+						<Tooltip class="select-none w-48 truncate" disablePopup={disableLiTooltip}>
 							{asset.path}
 							<svelte:fragment slot="text">
 								{asset.path}

package/package/components/assets/JobAssetsViewer.svelte

@@ -2,7 +2,7 @@
 import { inferAssets } from '../../infer';
 import { workspaceStore } from '../../stores';
 import { usePromise } from '../../svelte5Utils.svelte';
-import { pruneNullishArrayWithSet, uniqueBy } from '../../utils';
+import { pruneNullishArray, uniqueBy } from '../../utils';
 import DbManagerDrawer from '../DBManagerDrawer.svelte';
 import ResourceEditorDrawer from '../ResourceEditorDrawer.svelte';
 import S3FilePicker from '../S3FilePicker.svelte';
@@ -14,7 +14,7 @@ async function extractAssets(job) {
         const additionalAssetsMap = {
         // TODO : Transitive assets
         };
-        return uniqueBy(pruneNullishArrayWithSet([
+        return uniqueBy(pruneNullishArray([
             ...(job.raw_flow?.modules.flatMap((m) => getFlowModuleAssets(m, additionalAssetsMap)) ??
                 []),
             ...parseInputArgsAssets(job.args ?? {})

package/package/components/assets/lib.js

@@ -5,6 +5,8 @@ export function formatAsset(asset) {
             return `res://${asset.path}`;
         case 's3object':
             return `s3://${asset.path}`;
+        case 'ducklake':
+            return `ducklake://${asset.path}`;
     }
 }
 export function getAssetUsagePageUri(usage) {
@@ -54,6 +56,8 @@ export function formatAssetKind(asset) {
             }
         case 's3object':
             return 'S3 Object';
+        case 'ducklake':
+            return 'Ducklake';
     }
 }
 export function formatAssetAccessType(accessType) {

package/package/components/auditLogs/AuditLogsFilters.svelte

@@ -45,7 +45,6 @@ $effect.pre(() => {
     }
 });
 async function loadLogs(username, page, perPage, before, after, operation, resource, actionKind, scope) {
-    console.log("loading logs");
     loading = true;
     if (username == 'all') {
         username = undefined;
@@ -74,7 +73,6 @@ async function loadLogs(username, page, perPage, before, after, operation, resou
     });
     hasMore = logs.length > 0 && logs.length === perPage;
     loading = false;
-    console.log("loadede logs");
 }
 async function loadUsers() {
     usernames =
@@ -111,7 +109,7 @@ function updateLogs() {
         addQueryParam('workspace', 'admins');
     }
     const query = '?' + queryParams.join('&');
-    goto(query);
+    goto(query, { replaceState: true, keepFocus: true });
     loadLogs(username, page, perPage, before, after, operation, resource, actionKind, scope);
 }
 function updateQueryParams() {
@@ -282,13 +280,13 @@ $effect(() => {
 		</div>
 	{/if}
 	<div class="flex gap-1 relative w-full">
-		<span class="text-xs absolute -top-4">After</span>
-		<input type="text" value={after ?? 'After'} disabled />
+		<span class="text-xs absolute -top-4">From</span>
+		<input type="text" value={after ?? 'From'} disabled />
 		<CalendarPicker
 			clearable
 			date={after}
 			placement="bottom-end"
-			label="After"
+			label="From"
 			on:change={({ detail }) => {
 				after = new Date(detail).toISOString()
 			}}
@@ -298,12 +296,12 @@ $effect(() => {
 		/>
 	</div>
 	<div class="flex gap-1 relative w-full">
-		<span class="text-xs absolute -top-4">Before</span>
-		<input type="text" value={before ?? 'Before'} disabled />
+		<span class="text-xs absolute -top-4">To</span>
+		<input type="text" value={before ?? 'To'} disabled />
 		<CalendarPicker
 			clearable
 			bind:date={before}
-			label="Before"
+			label="To"
 			placement="bottom-end"
 			on:change={({ detail }) => {
 				before = new Date(detail).toISOString()

package/package/components/common/button/Button.svelte

@@ -10,7 +10,7 @@ import { createTooltip } from '@melt-ui/svelte';
 import { conditionalMelt } from '../../../utils';
 import { createDispatcherIfMounted } from '../../../createDispatcherIfMounted';
 import { triggerableByAI } from '../../../actions/triggerableByAI.svelte';
-let { id = '', aiId = undefined, aiDescription = undefined, size = 'md', spacingSize = size, color = 'blue', variant = 'contained', btnClasses = '', wrapperClasses = '', wrapperStyle = '', disabled = false, href = undefined, target = undefined, iconOnly = false, loadUntilNav = false, clickableWhileLoading = false, element = $bindable(undefined), nonCaptureEvent = false, propagateEvent = false, loading = $bindable(false), title = undefined, style = '', download = undefined, startIcon = undefined, endIcon = undefined, shortCut = undefined, tooltipPopover = undefined, dropdownBtnClasses = '', dropdownItems = undefined, hideDropdown = false, children, tooltip, dropdownOpen = $bindable(false), ...rest } = $props();
+let { id = '', aiId = undefined, aiDescription = undefined, size = 'md', spacingSize = size, color = 'blue', variant = 'contained', btnClasses = '', wrapperClasses = '', wrapperStyle = '', disabled = false, href = undefined, target = undefined, iconOnly = false, loadUntilNav = false, clickableWhileLoading = false, element = $bindable(undefined), nonCaptureEvent = false, propagateEvent = false, loading = $bindable(false), title = undefined, style = '', download = undefined, startIcon = undefined, endIcon = undefined, shortCut = undefined, tooltipPopover = undefined, dropdownBtnClasses = '', dropdownItems = undefined, hideDropdown = false, children, tooltip, onClick, dropdownOpen = $bindable(false), ...rest } = $props();
 function computeDropdowns(menuItems) {
     const items = typeof menuItems === 'function' ? menuItems() : menuItems;
     return items.map((item) => ({
@@ -30,13 +30,14 @@ export function click() {
 const dispatch = createEventDispatcher();
 const dispatchIfMounted = createDispatcherIfMounted(dispatch);
 // Order of classes: border, border modifier, bg, bg modifier, text, text modifier, everything else
-async function onClick(event) {
+async function onclick(event) {
     if (!nonCaptureEvent) {
         event.preventDefault();
         if (!propagateEvent) {
             // by default events are not propagated, added this prop so that we can
             event.stopPropagation();
         }
+        onClick?.(event);
         dispatch('click', event);
     }
 }
@@ -165,7 +166,7 @@ $effect(() => {
 		<button
 			bind:this={element}
 			onpointerdown={bubble('pointerdown')}
-			onclick={onClick}
+			{onclick}
 			onfocus={bubble('focus')}
 			onblur={bubble('blur')}
 			onmouseenter={bubble('mouseenter')}

package/package/components/common/button/Button.svelte.d.ts

@@ -48,6 +48,7 @@ interface Props {
     dropdownBtnClasses?: string;
     dropdownItems?: MenuItem[] | (() => MenuItem[]) | undefined;
     hideDropdown?: boolean;
+    onClick?: (e?: Event) => void;
     children?: import('svelte').Snippet;
     tooltip?: import('svelte').Snippet;
     [key: string]: any;

package/package/components/common/confirmationModal/ConfirmationModal.svelte

@@ -4,7 +4,7 @@ import { fade } from 'svelte/transition';
 import Button from '../button/Button.svelte';
 import { AlertTriangle, CornerDownLeft, Loader2, RefreshCcw } from 'lucide-svelte';
 import { twMerge } from 'tailwind-merge';
-const { title, confirmationText, keyListen = true, loading = false, open = false, type: _type, showIcon = true } = $props();
+const { title, confirmationText, keyListen = true, loading = false, open = false, type: _type, showIcon = true, children, onConfirmed, onCanceled } = $props();
 const type = $derived(_type ?? 'danger');
 const dispatch = createEventDispatcher();
 function onKeyDown(event) {
@@ -14,9 +14,11 @@ function onKeyDown(event) {
         switch (event.key) {
             case 'Enter':
                 dispatch('confirmed');
+                onConfirmed?.();
                 break;
             case 'Escape':
                 dispatch('canceled');
+                onCanceled?.();
                 break;
         }
     }
@@ -83,15 +85,14 @@ const Icon = $derived(theme[type].Icon ?? AlertTriangle);
 								{title}
 							</h3>
 							<div class="mt-2 text-sm text-secondary">
-								<!-- svelte-ignore slot_element_deprecated -->
-								<slot />
+								{@render children?.()}
 							</div>
 						</div>
 					</div>
 					<div class="flex items-center space-x-2 flex-row-reverse space-x-reverse mt-4">
 						<Button
 							disabled={loading}
-							on:click={() => dispatch('confirmed')}
+							on:click={() => (dispatch('confirmed'), onConfirmed?.())}
 							color={theme[type].color}
 							size="sm"
 							shortCut={{ Icon: CornerDownLeft, hide: !keyListen, withoutModifier: true }}
@@ -103,7 +104,7 @@ const Icon = $derived(theme[type].Icon ?? AlertTriangle);
 						</Button>
 						<Button
 							disabled={loading}
-							on:click={() => dispatch('canceled')}
+							on:click={() => (dispatch('canceled'), onCanceled?.())}
 							color="light"
 							size="sm"
 							shortCut={{ key: 'Esc', hide: !keyListen, withoutModifier: true }}

package/package/components/common/confirmationModal/ConfirmationModal.svelte.d.ts

@@ -1,3 +1,4 @@
+import { type Snippet } from 'svelte';
 type Props = {
     title: string;
     confirmationText: string;
@@ -6,6 +7,9 @@ type Props = {
     open?: boolean;
     type?: 'danger' | 'reload';
     showIcon?: boolean;
+    children?: Snippet;
+    onConfirmed?: () => void | Promise<void>;
+    onCanceled?: () => void;
 };
 interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
     new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
@@ -20,20 +24,11 @@ interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> =
     };
     z_$$bindings?: Bindings;
 }
-type $$__sveltets_2_PropsWithChildren<Props, Slots> = Props & (Slots extends {
-    default: any;
-} ? Props extends Record<string, never> ? any : {
-    children?: any;
-} : {});
-declare const ConfirmationModal: $$__sveltets_2_IsomorphicComponent<$$__sveltets_2_PropsWithChildren<Props, {
-    default: {};
-}>, {
+declare const ConfirmationModal: $$__sveltets_2_IsomorphicComponent<Props, {
     confirmed: CustomEvent<any>;
     canceled: CustomEvent<any>;
 } & {
     [evt: string]: CustomEvent<any>;
-}, {
-    default: {};
-}, {}, "">;
+}, {}, {}, "">;
 type ConfirmationModal = InstanceType<typeof ConfirmationModal>;
 export default ConfirmationModal;

package/package/components/common/confirmationModal/asyncConfirmationModal.svelte.d.ts

@@ -0,0 +1,26 @@
+import { type ComponentProps } from 'svelte';
+import type ConfirmationModal from './ConfirmationModal.svelte';
+/**
+ * This allows asking for confirmation while maintaining a linear imperative flow,
+ * and avoiding unnecessary states and callback hopping
+ *
+ * @example
+ *  let confirmationModal = createAsyncConfirmationModal()
+ *  // ...
+ *  let confirmed = await confirmationModal.ask({
+ *    title: "The following objects do not exist",
+ *    confirmationText: `Yes`,
+ *    children: `Do you want to create the objects ?`
+ *  })
+ *  if (!confirmed) return
+ *  // ...
+ *  <ConfirmationModal {...confirmationModal.props} />
+ */
+export declare function createAsyncConfirmationModal(): {
+    props: ComponentProps<ConfirmationModal>;
+    ask: (props: Params) => Promise<boolean>;
+};
+type Params = Omit<ComponentProps<ConfirmationModal>, 'children'> & {
+    children: string;
+};
+export {};

package/package/components/common/confirmationModal/asyncConfirmationModal.svelte.js

@@ -0,0 +1,50 @@
+import { createRawSnippet } from 'svelte';
+import { sendUserToast } from '../../../toast';
+/**
+ * This allows asking for confirmation while maintaining a linear imperative flow,
+ * and avoiding unnecessary states and callback hopping
+ *
+ * @example
+ *  let confirmationModal = createAsyncConfirmationModal()
+ *  // ...
+ *  let confirmed = await confirmationModal.ask({
+ *    title: "The following objects do not exist",
+ *    confirmationText: `Yes`,
+ *    children: `Do you want to create the objects ?`
+ *  })
+ *  if (!confirmed) return
+ *  // ...
+ *  <ConfirmationModal {...confirmationModal.props} />
+ */
+export function createAsyncConfirmationModal() {
+    // Create a new instance of ConfirmationModal with the provided props
+    const o = $state({
+        props: {
+            confirmationText: '',
+            title: ''
+        },
+        ask: (params) => new Promise((resolve) => {
+            o.props = {
+                ...params,
+                children: createRawSnippet(() => ({ render: () => params.children })),
+                open: true,
+                loading: false,
+                onCanceled: () => (resolve(false), (o.props.open = false)),
+                onConfirmed: async () => {
+                    o.props.loading = true;
+                    try {
+                        await params.onConfirmed?.();
+                        o.props.loading = false;
+                        resolve(true);
+                        o.props.open = false;
+                    }
+                    catch (e) {
+                        sendUserToast('Error : ' + JSON.stringify(e), true);
+                        o.props.loading = false;
+                    }
+                }
+            };
+        })
+    });
+    return o;
+}

package/package/components/common/modal/Modal.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">import { createEventDispatcher } from 'svelte';
 import { fade } from 'svelte/transition';
 import Button from '../button/Button.svelte';
-import Badge from '../badge/Badge.svelte';
 import { twMerge } from 'tailwind-merge';
 import CloseButton from '../CloseButton.svelte';
 export let title;
@@ -34,7 +33,7 @@ function fadeFast(node) {
 }
 </script>
 
-<svelte:window on:keydown={onKeyDown} />
+<svelte:window on:keydown|capture={onKeyDown} />
 
 {#if open}
 	<!-- svelte-ignore a11y-click-events-have-key-events -->
@@ -94,9 +93,7 @@ function fadeFast(node) {
 								color="light"
 								size="sm"
 							>
-								<span class="inline-flex gap-2"
-									>{cancelText ?? 'Cancel'}<Badge color="dark-gray">Escape</Badge></span
-								>
+								{cancelText ?? 'Cancel'}
 							</Button>
 						</div>
 					{/if}

package/package/components/common/tabs/TabsV2.svelte

@@ -1,13 +1,14 @@
 <script lang="ts">import { setContext, untrack } from 'svelte';
 import { writable } from 'svelte/store';
 import { twMerge } from 'tailwind-merge';
-let { selected = $bindable(), hideTabs = false, class: c = '', wrapperClass = '', style = '', hashNavigation = false, values = undefined, children, content, onSelectedChange } = $props();
+let { selected = $bindable(), hideTabs = false, class: c = '', wrapperClass = '', style = '', hashNavigation = false, values = undefined, children, content, onSelectedChange, onTabClick } = $props();
 const selectedStore = writable(selected);
 setContext('Tabs', {
     selected: selectedStore,
     update: (value) => {
         selectedStore.set(value);
         selected = value;
+        onTabClick?.(value);
     },
     hashNavigation
 });

package/package/components/common/tabs/TabsV2.svelte.d.ts

@@ -9,6 +9,7 @@ interface Props {
     children?: import('svelte').Snippet<[any]>;
     content?: import('svelte').Snippet;
     onSelectedChange?: (value: string) => void;
+    onTabClick?: (value: string) => void;
 }
 declare const TabsV2: import("svelte").Component<Props, {}, "selected">;
 type TabsV2 = ReturnType<typeof TabsV2>;

package/package/components/copilot/chat/AIChatManager.svelte.js

@@ -8,12 +8,17 @@ import { loadApiTools } from './navigator/apiTools';
 import { prepareScriptUserMessage } from './script/core';
 import { prepareNavigatorUserMessage } from './navigator/core';
 import { sendUserToast } from '../../../toast';
-import { getCompletion } from '../lib';
+import { getCompletion, getModelContextWindow } from '../lib';
 import { dfs } from '../../flows/previousResults';
 import { getStringError } from './utils';
 import { untrack } from 'svelte';
+import { copilotSessionModel } from '../../../stores';
 import { askTools, prepareAskSystemMessage } from './ask/core';
 import { chatState, DEFAULT_SIZE, triggerablesByAi } from './sharedChatState.svelte';
+import { get } from 'svelte/store';
+// If the estimated token usage is greater than the model context window - the threshold, we delete the oldest message
+const MAX_TOKENS_THRESHOLD_PERCENTAGE = 0.05;
+const MAX_TOKENS_HARD_LIMIT = 5000;
 export var AIMode;
 (function (AIMode) {
     AIMode["SCRIPT"] = "script";
@@ -59,6 +64,42 @@ class AIChatManager {
         ask: true
     });
     open = $derived(chatState.size > 0);
+    checkTokenUsageOverLimit = (messages) => {
+        const estimatedTokens = messages.reduce((acc, message) => {
+            // one token is ~ 4 characters
+            const tokenPerCharacter = 4;
+            // handle content
+            if (message.content) {
+                acc += message.content.length / tokenPerCharacter;
+            }
+            // Handle tool calls
+            if (message.role === 'assistant' && message.tool_calls) {
+                acc += JSON.stringify(message.tool_calls).length / tokenPerCharacter;
+            }
+            return acc;
+        }, 0);
+        const modelContextWindow = getModelContextWindow(get(copilotSessionModel)?.model ?? '');
+        return (estimatedTokens >
+            modelContextWindow -
+                Math.max(modelContextWindow * MAX_TOKENS_THRESHOLD_PERCENTAGE, MAX_TOKENS_HARD_LIMIT));
+    };
+    deleteOldestMessage = (messages, maxDepth = 10) => {
+        if (maxDepth <= 0 || messages.length <= 1) {
+            return messages;
+        }
+        const removed = messages.shift();
+        // if the removed message is an assistant with tool calls, we need to delete correspding tool response.
+        if (removed?.role === 'assistant' && removed.tool_calls) {
+            if (messages.length > 0 && messages[0]?.role === 'tool') {
+                messages.shift();
+            }
+        }
+        // keep deleting messages until we are under the limit
+        if (this.checkTokenUsageOverLimit(messages)) {
+            return this.deleteOldestMessage(messages, maxDepth - 1);
+        }
+        return messages;
+    };
     loadApiTools = async () => {
         try {
             this.apiTools = await loadApiTools();
@@ -213,6 +254,7 @@ class AIChatManager {
         }
     };
     chatRequest = async ({ messages, abortController, callbacks, systemMessage: systemMessageOverride }) => {
+        let addedMessages = [];
         try {
             let completion = null;
             while (true) {
@@ -283,12 +325,14 @@ class AIChatManager {
                         }
                     }
                     if (answer) {
-                        messages.push({ role: 'assistant', content: answer });
+                        const toAdd = { role: 'assistant', content: answer };
+                        addedMessages.push(toAdd);
+                        messages.push(toAdd);
                     }
                     callbacks.onMessageEnd();
                     const toolCalls = Object.values(finalToolCalls).filter((toolCall) => toolCall.id !== undefined && toolCall.function?.arguments !== undefined);
                     if (toolCalls.length > 0) {
-                        messages.push({
+                        const toAdd = {
                             role: 'assistant',
                             tool_calls: toolCalls.map((t) => ({
                                 ...t,
@@ -297,15 +341,19 @@ class AIChatManager {
                                     arguments: t.function.arguments || '{}'
                                 }
                             }))
-                        });
+                        };
+                        messages.push(toAdd);
+                        addedMessages.push(toAdd);
                         for (const toolCall of toolCalls) {
-                            await processToolCall({
+                            const messageToAdd = await processToolCall({
                                 tools,
                                 toolCall,
                                 messages,
                                 helpers,
                                 toolCallbacks: callbacks
                             });
+                            messages.push(messageToAdd);
+                            addedMessages.push(messageToAdd);
                         }
                     }
                     else {
@@ -313,6 +361,7 @@ class AIChatManager {
                     }
                 }
             }
+            return addedMessages;
         }
         catch (err) {
             callbacks.onMessageEnd();
@@ -453,8 +502,12 @@ class AIChatManager {
             this.messages.push(userMessage);
             await this.historyManager.saveChat(this.displayMessages, this.messages);
             this.currentReply = '';
+            let trimmedMessages = [...this.messages];
+            if (this.checkTokenUsageOverLimit(trimmedMessages)) {
+                trimmedMessages = this.deleteOldestMessage(trimmedMessages);
+            }
             const params = {
-                messages: this.messages,
+                messages: trimmedMessages,
                 abortController: this.abortController,
                 callbacks: {
                     onNewToken: (token) => (this.currentReply += token),
@@ -487,9 +540,10 @@ class AIChatManager {
             if (this.mode === AIMode.NAVIGATOR && this.apiTools.length === 0) {
                 await this.loadApiTools();
             }
-            await this.chatRequest({
+            const addedMessages = await this.chatRequest({
                 ...params
             });
+            this.messages = [...this.messages, ...(addedMessages ?? [])];
             await this.historyManager.saveChat(this.displayMessages, this.messages);
         }
         catch (err) {

package/package/components/copilot/chat/ContextTextarea.svelte

@@ -296,7 +296,7 @@ export function focus() {
 		}}
 		{placeholder}
 		class={twMerge(
-			'textarea-input resize-none bg-transparent caret-black dark:caret-white',
+			'textarea-input resize-none bg-transparent caret-black dark:caret-white overflow-clip',
 			className
 		)}
 		style={value.length > 0 ? 'color: transparent; -webkit-text-fill-color: transparent;' : ''}

package/package/components/copilot/chat/script/core.js

@@ -203,37 +203,36 @@ export function getLangContext(lang, { allowResourcesFetch = false, isPreprocess
                 PHP_RESOURCE_TYPE_SYSTEM +
                 `${allowResourcesFetch ? `\nTo query the available resource types, you can use the \`search_resource_types\` tool.` : ''}` +
                 `\nIf you need to import libraries, you need to specify them as comments in the following manner before the main function:
-\`\`\`
-// require:
-// mylibrary/mylibrary
-// myotherlibrary/myotherlibrary@optionalversion
-\`\`\`
-Make sure to have one per line.
-No need to require autoload, it is already done.`);
+					\`\`\`
+					// require:
+					// mylibrary/mylibrary
+					// myotherlibrary/myotherlibrary@optionalversion
+					\`\`\`
+					Make sure to have one per line.
+					No need to require autoload, it is already done.`);
         case 'rust':
             return `The user is coding in Rust. On Windmill, it is expected the script contains at least one function called \`main\` (without calling it) defined like this:
-\`\`\`rust
-use anyhow::anyhow;
-use serde::Serialize;
-
-#[derive(Serialize, Debug)]
-struct ReturnType {
-    // ...
-}
-
-fn main(...) -> anyhow::Result<ReturnType>
-\`\`\`
-Arguments should be owned. Make sure the return type is serializable.
-
-Packages must be made available with a partial cargo.toml by adding the following comment at the beginning of the script:
-//! \`\`\`cargo
-//! [dependencies]
-//! anyhow = "1.0.86"
-//! \`\`\'
-Serde is already included, no need to add it again.
-
-If you want to handle async functions (e.g., using tokio), you need to keep the main function sync and create the runtime inside.
-`;
+				\`\`\`rust
+				use anyhow::anyhow;
+				use serde::Serialize;
+
+				#[derive(Serialize, Debug)]
+				struct ReturnType {
+					// ...
+				}
+
+				fn main(...) -> anyhow::Result<ReturnType>
+				\`\`\`
+				Arguments should be owned. Make sure the return type is serializable.
+
+				Packages must be made available with a partial cargo.toml by adding the following comment at the beginning of the script:
+				//! \`\`\`cargo
+				//! [dependencies]
+				//! anyhow = "1.0.86"
+				//! \`\`\'
+				Serde is already included, no need to add it again.
+
+				If you want to handle async functions (e.g., using tokio), you need to keep the main function sync and create the runtime inside.`;
         case 'go':
             return `The user is coding in Go. On Windmill, it is expected the script exports a single function called \`main\`. Its return type has to be (\`{return_type}\`, error). The file package has to be "inner".`;
         case 'bash':

package/package/components/copilot/chat/shared.d.ts

@@ -27,7 +27,7 @@ export declare function processToolCall<T>({ tools, toolCall, messages, helpers,
     messages: ChatCompletionMessageParam[];
     helpers: T;
     toolCallbacks: ToolCallbacks;
-}): Promise<void>;
+}): Promise<ChatCompletionMessageParam>;
 export interface Tool<T> {
     def: ChatCompletionTool;
     fn: (p: {

package/package/components/copilot/chat/shared.js

@@ -30,14 +30,20 @@ export async function processToolCall({ tools, toolCall, messages, helpers, tool
             result =
                 'Error while calling tool, MUST tell the user to check the browser console for more details, and then respond as much as possible to the original request';
         }
-        messages.push({
+        const toAdd = {
             role: 'tool',
             tool_call_id: toolCall.id,
             content: result
-        });
+        };
+        return toAdd;
     }
     catch (err) {
         console.error(err);
+        return {
+            role: 'tool',
+            tool_call_id: toolCall.id,
+            content: 'Error while calling tool, MUST tell the user to check the browser console for more details, and then respond as much as possible to the original request'
+        };
     }
 }
 export function createToolDef(zodSchema, name, description) {