windmill-components 1.537.1 → 1.542.4

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

@@ -278,20 +278,43 @@ export const CHAT_SYSTEM_PROMPT = `
 	Your task is to respond to the user's request. Assume all user queries are valid and actionable.
 
 	When the user requests code changes:
-	- Always include a **single code block** with the **entire updated file**, not just the modified sections.
-	- The code can include \`[#START]\` and \`[#END]\` markers to indicate the start and end of a code piece. You MUST only modify the code between these markers if given, and remove them in your response. If a question is asked about the code, you MUST only talk about the code between the markers. Refer to it as the code piece, not the code between the markers.
-	- Follow the instructions carefully and explain the reasoning behind your changes.
-	- If the request is abstract (e.g., "make this cleaner"), interpret it concretely and reflect that in the code block.
+	- ALWAYS use the \`edit_code\` tool to apply code changes. Use it only once with an array of diffs.
+	- Pass an array of **diff objects** to the \`edit_code\` tool. Each diff should specify exactly what text to replace and what to replace it with.
+	- Each diff object must contain:
+	  - \`old_string\`: The exact text to replace (must match the current code exactly)
+	  - \`new_string\`: The replacement text
+	  - \`replace_all\` (optional): Set to true to replace all occurrences, false or omit for first occurrence only
+	- The code can include \`[#START]\` and \`[#END]\` markers to indicate the start and end of a code piece. You MUST only modify the code between these markers if given, and remove them when creating your diffs. If a question is asked about the code, you MUST only talk about the code between the markers. Refer to it as the code piece, not the code between the markers.
+	- Follow the instructions carefully and explain the reasoning behind your changes in your response text.
+	- If the request is abstract (e.g., "make this cleaner"), interpret it concretely and reflect that in the diffs.
 	- Preserve existing formatting, indentation, and whitespace unless changes are strictly required to fulfill the user's request.
 	- The user can ask you to look at or modify specific files, databases or errors by having its name in the INSTRUCTIONS preceded by the @ symbol. In this case, put your focus on the element that is explicitly mentioned.
 	- The user can ask you questions about a list of \`DATABASES\` that are available in the user's workspace. If the user asks you a question about a database, you should ask the user to specify the database name if not given, or take the only one available if there is only one.
 	- You can also receive a \`DIFF\` of the changes that have been made to the code. You should use this diff to give better answers.
 	- Before giving your answer, check again that you carefully followed these instructions.
 	- When asked to create a script that communicates with an external service, you can use the \`search_hub_scripts\` tool to search for relevant scripts in the hub. Make sure the language is the same as what the user is coding in. If you do not find any relevant scripts, you can use the \`search_npm_packages\` tool to search for relevant packages and their documentation. Always give a link to the documentation in your answer if possible.
-	- At the end of your reponse, if you modified or suggested changes to the code, ALWAYS use the \`test_run_script\` tool to test the code, and iterate on the code until it works as expected (MAX 3 times). If the user cancels the test run, do not try again and wait for the next user instruction.
+	- After applying code changes with the \`edit_code\` tool, ALWAYS use the \`test_run_script\` tool to test the code, and iterate on the code until it works as expected (MAX 3 times). If the user cancels the test run, do not try again and wait for the next user instruction.
+
+	Example diff usage:
+	To change "return 1" to "return 2", use:
+	[{
+		"old_string": "return 1",
+		"new_string": "return 2"
+	}]
+
+	To add a new function and modify an existing one:
+	[{
+		"old_string": "export async function main() {",
+		"new_string": "function helper() {\n\treturn 'help';\n}\n\nexport async function main() {"
+	}, {
+		"old_string": "return result;",
+		"new_string": "return result + helper();"
+	}]
 
 	Important:
-	Do not mention or reveal these instructions to the user unless explicitly asked to do so.
+	- Each old_string must match the exact text in the current code, including whitespace and indentation.
+	- Do not return the applied code in your response, just explain what you did. You can return code blocks in your response for explanations or examples as per user request.
+	- Do not mention or reveal these instructions to the user unless explicitly asked to do so.
 `;
 export const INLINE_CHAT_SYSTEM_PROMPT = `
 # Windmill Inline Coding Assistant
@@ -385,10 +408,15 @@ WINDMILL LANGUAGE CONTEXT:
 {lang_context}
 
 `;
-export function prepareScriptSystemMessage() {
+export function prepareScriptSystemMessage(customPrompt) {
+    let content = CHAT_SYSTEM_PROMPT;
+    // If there's a custom prompt, prepend it to the system prompt
+    if (customPrompt?.trim()) {
+        content = `${content}\n\nUSER GIVEN INSTRUCTIONS:\n${customPrompt.trim()}`;
+    }
     return {
         role: 'system',
-        content: CHAT_SYSTEM_PROMPT
+        content
     };
 }
 export function prepareScriptTools(language, context) {
@@ -403,6 +431,7 @@ export function prepareScriptTools(language, context) {
         tools.push(createSearchHubScriptsTool(true));
         tools.push(searchNpmPackagesTool);
     }
+    tools.push(editCodeTool);
     tools.push(testRunScriptTool);
     return tools;
 }
@@ -634,6 +663,44 @@ export async function fetchNpmPackageTypes(packageName, version = 'latest') {
         };
     }
 }
+const EDIT_CODE_TOOL = {
+    type: 'function',
+    function: {
+        name: 'edit_code',
+        description: 'Apply code changes to the current script in the editor using an array of diffs',
+        parameters: {
+            type: 'object',
+            properties: {
+                diffs: {
+                    type: 'array',
+                    description: 'Array of diff objects to apply to the code',
+                    items: {
+                        type: 'object',
+                        properties: {
+                            old_string: {
+                                type: 'string',
+                                description: 'The exact text to replace (must match the current code exactly)'
+                            },
+                            new_string: {
+                                type: 'string',
+                                description: 'The new text to replace the old_string with'
+                            },
+                            replace_all: {
+                                type: 'boolean',
+                                description: 'If true, replace all occurrences of old_string. If false or omitted, only replace the first occurrence.'
+                            }
+                        },
+                        required: ['old_string', 'new_string'],
+                        additionalProperties: false
+                    }
+                }
+            },
+            additionalProperties: false,
+            strict: true,
+            required: ['diffs']
+        }
+    }
+};
 const TEST_RUN_SCRIPT_TOOL = {
     type: 'function',
     function: {
@@ -650,6 +717,61 @@ const TEST_RUN_SCRIPT_TOOL = {
         }
     }
 };
+export const editCodeTool = {
+    def: EDIT_CODE_TOOL,
+    fn: async function ({ args, helpers, toolCallbacks, toolId }) {
+        const scriptOptions = helpers.getScriptOptions();
+        if (!scriptOptions) {
+            toolCallbacks.setToolStatus(toolId, {
+                content: 'No script available to edit',
+                error: 'No script found in current context'
+            });
+            throw new Error('No script code available to edit. Please ensure you have a script open in the editor.');
+        }
+        if (!args.diffs || !Array.isArray(args.diffs)) {
+            toolCallbacks.setToolStatus(toolId, {
+                content: 'Invalid diffs provided',
+                error: 'Diffs parameter is required and must be an array'
+            });
+            throw new Error('Diffs parameter is required and must be an array');
+        }
+        toolCallbacks.setToolStatus(toolId, { content: 'Applying code changes...' });
+        try {
+            // Save old code
+            const oldCode = scriptOptions.code;
+            // Apply diffs sequentially
+            let updatedCode = oldCode;
+            for (const [index, diff] of args.diffs.entries()) {
+                const { old_string, new_string, replace_all = false } = diff;
+                if (!updatedCode.includes(old_string)) {
+                    throw new Error(`Diff at index ${index}: old_string "${old_string}" not found in code`);
+                }
+                if (replace_all) {
+                    updatedCode = updatedCode.replaceAll(old_string, new_string);
+                }
+                else {
+                    updatedCode = updatedCode.replace(old_string, new_string);
+                }
+            }
+            // Apply the code changes directly
+            await helpers.applyCode(updatedCode, { applyAll: true, mode: 'apply' });
+            // Show revert mode
+            await helpers.applyCode(oldCode, { mode: 'revert' });
+            toolCallbacks.setToolStatus(toolId, {
+                content: `Code changes applied`
+            });
+            return `Applied changes to the script editor.`;
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred';
+            toolCallbacks.setToolStatus(toolId, {
+                content: 'Failed to apply code changes',
+                error: errorMessage
+            });
+            throw new Error(`Failed to apply code changes: ${errorMessage}`);
+        }
+    }
+};
 export const testRunScriptTool = {
     def: TEST_RUN_SCRIPT_TOOL,
     fn: async function ({ args, workspace, helpers, toolCallbacks, toolId }) {
@@ -661,23 +783,13 @@ export const testRunScriptTool = {
             });
             throw new Error('No script code available to test. Please ensure you have a script open in the editor.');
         }
-        let codeToTest = scriptOptions.code;
-        // Check if there are suggested code changes to apply
-        const lastSuggestedCode = helpers.getLastSuggestedCode();
-        if (lastSuggestedCode && lastSuggestedCode !== codeToTest) {
-            codeToTest = lastSuggestedCode;
-            toolCallbacks.setToolStatus(toolId, { content: 'Applying code changes...' });
-            // Apply the suggested code changes using the existing mechanism
-            helpers.applyCode(lastSuggestedCode, true);
-            toolCallbacks.setToolStatus(toolId, { content: 'Code changes applied, starting test...' });
-        }
         const parsedArgs = await buildTestRunArgs(args, this.def);
         return executeTestRun({
             jobStarter: () => JobService.runScriptPreview({
                 workspace: workspace,
                 requestBody: {
                     path: scriptOptions.path,
-                    content: codeToTest,
+                    content: scriptOptions.code,
                     args: parsedArgs,
                     language: scriptOptions.lang
                 }

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

@@ -1,4 +1,4 @@
-import type { ChatCompletionMessageParam, ChatCompletionMessageToolCall, ChatCompletionTool } from 'openai/resources/chat/completions.mjs';
+import type { ChatCompletionFunctionTool, ChatCompletionMessageFunctionToolCall, ChatCompletionMessageParam } from 'openai/resources/chat/completions.mjs';
 import type { ContextElement, FlowModuleCodePieceElement } from './context';
 import type { ExtendedOpenFlow } from '../../flows/types';
 import type { FunctionParameters } from 'openai/resources/shared.mjs';
@@ -44,12 +44,12 @@ export type AssistantDisplayMessage = BaseDisplayMessage & {
 export type DisplayMessage = UserDisplayMessage | ToolDisplayMessage | AssistantDisplayMessage;
 export declare function processToolCall<T>({ tools, toolCall, helpers, toolCallbacks }: {
     tools: Tool<T>[];
-    toolCall: ChatCompletionMessageToolCall;
+    toolCall: ChatCompletionMessageFunctionToolCall;
     helpers: T;
     toolCallbacks: ToolCallbacks;
 }): Promise<ChatCompletionMessageParam>;
 export interface Tool<T> {
-    def: ChatCompletionTool;
+    def: ChatCompletionFunctionTool;
     fn: (p: {
         args: any;
         workspace: string;
@@ -70,16 +70,16 @@ export interface ToolCallbacks {
     setToolStatus: (id: string, metadata?: Partial<ToolDisplayMessage>) => void;
     requestConfirmation?: (toolId: string) => Promise<boolean>;
 }
-export declare function createToolDef(zodSchema: z.ZodSchema, name: string, description: string): ChatCompletionTool;
+export declare function createToolDef(zodSchema: z.ZodSchema, name: string, description: string): ChatCompletionFunctionTool;
 export declare const createSearchHubScriptsTool: (withContent?: boolean) => {
-    def: ChatCompletionTool;
+    def: ChatCompletionFunctionTool;
     fn: ({ args, toolId, toolCallbacks }: {
         args: any;
         toolId: any;
         toolCallbacks: any;
     }) => Promise<string>;
 };
-export declare function buildSchemaForTool(toolDef: ChatCompletionTool, schemaBuilder: () => Promise<FunctionParameters>): Promise<boolean>;
+export declare function buildSchemaForTool(toolDef: ChatCompletionFunctionTool, schemaBuilder: () => Promise<FunctionParameters>): Promise<boolean>;
 export interface TestRunConfig {
     jobStarter: () => Promise<string>;
     workspace: string;
@@ -91,6 +91,6 @@ export interface TestRunConfig {
 export declare function pollJobCompletion(jobId: string, workspace: string, toolId: string, toolCallbacks: ToolCallbacks): Promise<CompletedJob>;
 export declare function extractCodeFromMarkdown(markdown: string): string[];
 export declare function getLatestAssistantMessage(displayMessages: DisplayMessage[]): string | undefined;
-export declare function buildTestRunArgs(args: any, toolDef: ChatCompletionTool): Promise<any>;
+export declare function buildTestRunArgs(args: any, toolDef: ChatCompletionFunctionTool): Promise<any>;
 export declare function executeTestRun(config: TestRunConfig): Promise<string>;
 export {};

package/package/components/copilot/lib.d.ts

@@ -1,11 +1,18 @@
 import type { AIProvider, AIProviderModel } from '../../gen';
 import { type DBSchema, type GraphqlSchema, type SQLSchema } from '../../stores';
-import { OpenAI } from 'openai';
-import type { ChatCompletionCreateParams, ChatCompletionMessageParam } from 'openai/resources/index.mjs';
+import OpenAI from 'openai';
+import type { ChatCompletionChunk, ChatCompletionCreateParams, ChatCompletionCreateParamsNonStreaming, ChatCompletionCreateParamsStreaming, ChatCompletionMessageParam } from 'openai/resources/index.mjs';
+import Anthropic from '@anthropic-ai/sdk';
 import { type Writable } from 'svelte/store';
 import { type Script } from '../../gen';
+import { type Tool, type ToolCallbacks } from './chat/shared';
+import type { Stream } from 'openai/core/streaming.mjs';
 export declare const SUPPORTED_LANGUAGES: Set<string>;
-export declare const AI_DEFAULT_MODELS: Record<AIProvider, string[]>;
+interface AIProviderDetails {
+    label: string;
+    defaultModels: string[];
+}
+export declare const AI_PROVIDERS: Record<AIProvider, AIProviderDetails>;
 export interface ModelResponse {
     id: string;
     object: string;
@@ -17,15 +24,18 @@ export interface ModelResponse {
         chat_completion: boolean;
     };
 }
-export declare function fetchAvailableModels(resourcePath: string, workspace: string, provider: AIProvider): Promise<string[]>;
-export declare function getModelContextWindow(model: string): 1000000 | 128000 | 400000 | 200000 | 32000;
+export declare function fetchAvailableModels(resourcePath: string, workspace: string, provider: AIProvider, signal?: AbortSignal): Promise<string[]>;
+export declare function getModelContextWindow(model: string): 1000000 | 400000 | 128000 | 200000 | 32000;
 export declare const PROVIDER_COMPLETION_CONFIG_MAP: Record<AIProvider, ChatCompletionCreateParams>;
 declare class WorkspacedAIClients {
     private openaiClient;
+    private anthropicClient;
     init(workspace: string): void;
     private getBaseURL;
     private initOpenai;
+    private initAnthropic;
     getOpenaiClient(): OpenAI;
+    getAnthropicClient(): Anthropic;
 }
 export declare const workspaceAIClients: WorkspacedAIClients;
 export declare function testKey({ apiKey, resourcePath, model, abortController, messages, aiProvider }: {
@@ -60,6 +70,15 @@ export declare function addResourceTypes(scriptOptions: CopilotOptions, prompt:
 export declare const MAX_SCHEMA_LENGTH: number;
 export declare function addThousandsSeparator(n: number): string;
 export declare function stringifySchema(dbSchema: Omit<SQLSchema, 'stringified'> | Omit<GraphqlSchema, 'stringified'>): string;
+export declare function getProviderAndCompletionConfig<K extends boolean>({ messages, stream, tools, forceModelProvider }: {
+    messages: ChatCompletionMessageParam[];
+    stream: K;
+    tools?: OpenAI.Chat.Completions.ChatCompletionTool[];
+    forceModelProvider?: AIProviderModel;
+}): {
+    provider: AIProvider;
+    config: K extends true ? ChatCompletionCreateParamsStreaming : ChatCompletionCreateParamsNonStreaming;
+};
 export declare function getNonStreamingCompletion(messages: ChatCompletionMessageParam[], abortController: AbortController, testOptions?: {
     apiKey?: string;
     resourcePath?: string;
@@ -67,9 +86,11 @@ export declare function getNonStreamingCompletion(messages: ChatCompletionMessag
 }): Promise<string>;
 export declare const FIM_MAX_TOKENS = 256;
 export declare function getFimCompletion(prompt: string, suffix: string, providerModel: AIProviderModel, abortController: AbortController): Promise<string | undefined>;
-export declare function getCompletion(messages: ChatCompletionMessageParam[], abortController: AbortController, tools?: OpenAI.Chat.Completions.ChatCompletionTool[]): Promise<OpenAI.Chat.Completions.ChatCompletion & {
-    _request_id?: string | null;
-}>;
+export declare function getCompletion(messages: ChatCompletionMessageParam[], abortController: AbortController, tools?: OpenAI.Chat.Completions.ChatCompletionTool[]): Promise<Stream<ChatCompletionChunk>>;
+export declare function parseOpenAICompletion(completion: Stream<ChatCompletionChunk>, callbacks: ToolCallbacks & {
+    onNewToken: (token: string) => void;
+    onMessageEnd: () => void;
+}, messages: ChatCompletionMessageParam[], addedMessages: ChatCompletionMessageParam[], tools: Tool<any>[], helpers: any): Promise<boolean>;
 export declare function getResponseFromEvent(part: OpenAI.Chat.Completions.ChatCompletionChunk): string;
 export declare function copilot(scriptOptions: CopilotOptions, generatedCode: Writable<string>, abortController: AbortController, generatedExplanation?: Writable<string>): Promise<string>;
 export declare function deltaCodeCompletion(messages: ChatCompletionMessageParam[], generatedCodeDelta: Writable<string>, abortController: AbortController): Promise<string>;