+ {#if categorize}
+ {#if currentView === 'categories'}
+ {#each categories as category}
+ {@const itemCount = contextByCategory[category.id].length}
+ {@const Icon = category.icon}
+ {#if itemCount > 0}
+
+ {/if}
+ {/each}
+ {#if categories.every((cat) => contextByCategory[cat.id].length === 0)}
+
No available context
+ {/if}
+ {:else}
+
+
+
+ {#if currentCategoryItems.length === 0}
+
No items in this category
+ {:else}
+ {#each currentCategoryItems as element}
+ {@const Icon = ContextIconMap[element.type]}
+
+ {/each}
+ {/if}
+ {/if}
{:else}
- {#each actualAvailableContext as element, i}
+ {#each filteredAvailableContext as element, i}
{@const Icon = ContextIconMap[element.type]}
{/each}
{/if}
diff --git a/frontend/src/lib/components/copilot/chat/ContextElementBadge.svelte b/frontend/src/lib/components/copilot/chat/ContextElementBadge.svelte
index d001f7493c..c2f98b76c3 100644
--- a/frontend/src/lib/components/copilot/chat/ContextElementBadge.svelte
+++ b/frontend/src/lib/components/copilot/chat/ContextElementBadge.svelte
@@ -10,46 +10,53 @@
formatSchema
} from '$lib/components/apps/components/display/dbtable/utils'
import ObjectViewer from '$lib/components/propertyPicker/ObjectViewer.svelte'
- import { createEventDispatcher } from 'svelte'
import HighlightCode from '$lib/components/HighlightCode.svelte'
+ import FlowModuleIcon from '$lib/components/flows/FlowModuleIcon.svelte'
+ import type { FlowModule } from '$lib/gen'
- export let contextElement: ContextElement
- export let deletable = false
+ interface Props {
+ contextElement: ContextElement
+ deletable?: boolean
+ onDelete?: () => void
+ }
+
+ let { contextElement, deletable = false, onDelete }: Props = $props()
const icon = ContextIconMap[contextElement.type]
- let showDelete = false
+ let showDelete = $state(false)
- const dispatch = createEventDispatcher<{
- delete: void
- }>()
+ const isDeletable = $derived(deletable && contextElement.deletable !== false)
-
+ {#snippet trigger()}
(showDelete = true)}
- on:mouseleave={() => (showDelete = false)}
+ onmouseenter={() => (showDelete = true)}
+ onmouseleave={() => (showDelete = false)}
aria-label="Context element"
role="button"
tabindex={0}
>
-
-
-
+ {/snippet}
+ {#snippet content()}
{#if contextElement.type === 'error'}
@@ -79,6 +86,20 @@
class="w-full p-2 "
/>
+ {:else if contextElement.type === 'flow_module'}
+ {#if contextElement.value.content}
+
+
+
+ {:else}
+
+
{contextElement.title}
+
diff --git a/frontend/src/lib/components/copilot/chat/ContextManager.svelte.ts b/frontend/src/lib/components/copilot/chat/ContextManager.svelte.ts
index a7eb958fca..e56085ae2b 100644
--- a/frontend/src/lib/components/copilot/chat/ContextManager.svelte.ts
+++ b/frontend/src/lib/components/copilot/chat/ContextManager.svelte.ts
@@ -1,11 +1,13 @@
-import { ResourceService, type ListResourceResponse, type ScriptLang } from '$lib/gen'
+import { ResourceService, type Flow, type ListResourceResponse, type ScriptLang } from '$lib/gen'
import { scriptLangToEditorLang } from '$lib/scripts'
import { SQLSchemaLanguages, type DBSchemas } from '$lib/stores'
import { diffLines } from 'diff'
import type { ContextElement } from './context'
+import type { FlowModule } from '$lib/gen'
import type { DisplayMessage } from './shared'
import { langToExt } from '$lib/editorLangUtils'
+import type { ExtendedOpenFlow } from '$lib/components/flows/types'
export interface ScriptOptions {
lang: ScriptLang | 'bunnative'
@@ -18,6 +20,14 @@ export interface ScriptOptions {
diffMode: boolean
}
+export interface FlowOptions {
+ currentFlow: ExtendedOpenFlow
+ lastDeployedFlow?: Flow
+ path: string | undefined
+ modules: FlowModule[]
+ lastSavedFlow?: Flow
+}
+
export default class ContextManager {
private selectedContext: ContextElement[] = $state([])
private availableContext: ContextElement[] = $state([])
@@ -55,6 +65,93 @@ export default class ContextManager {
)
}
+ async updateAvailableContextForFlow(
+ flowOptions: FlowOptions,
+ dbSchemas: DBSchemas,
+ workspace: string,
+ toolSupport: boolean,
+ currentlySelectedContext: ContextElement[]
+ ) {
+ try {
+ if (this.workspace !== workspace) {
+ await this.refreshDbResources(workspace)
+ this.workspace = workspace
+ }
+
+ let newAvailableContext: ContextElement[] = []
+
+ // Add diff context if we have a deployed flow version
+ const deployedFlowString = JSON.stringify(flowOptions.lastDeployedFlow, null, 2)
+ const savedFlowString = JSON.stringify(flowOptions.lastSavedFlow, null, 2)
+ const currentFlowString = JSON.stringify(flowOptions.currentFlow, null, 2)
+
+ if (currentFlowString && deployedFlowString && deployedFlowString !== currentFlowString) {
+ newAvailableContext.push({
+ type: 'diff',
+ title: 'diff_with_last_deployed_version',
+ content: deployedFlowString,
+ diff: diffLines(deployedFlowString, currentFlowString),
+ lang: 'graphql' // irrelevant, but needed for the diff component
+ })
+ }
+
+ if (currentFlowString && savedFlowString && savedFlowString !== currentFlowString) {
+ newAvailableContext.push({
+ type: 'diff',
+ title: 'diff_with_last_saved_draft',
+ content: savedFlowString,
+ diff: diffLines(savedFlowString, currentFlowString),
+ lang: 'graphql' // irrelevant, but needed for the diff component
+ })
+ }
+
+ for (const module of flowOptions.modules) {
+ newAvailableContext.push({
+ type: 'flow_module',
+ id: module.id,
+ title: `module_[${module.id}]`,
+ value: {
+ language: 'language' in module.value ? module.value.language : 'bunnative',
+ path: 'path' in module.value ? module.value.path : '',
+ content: 'content' in module.value ? module.value.content : '',
+ type: module.value.type
+ }
+ })
+ }
+
+ if (toolSupport) {
+ for (const d of this.dbResources) {
+ const loadedSchema = dbSchemas[d.path]
+ newAvailableContext.push({
+ type: 'db',
+ title: d.path,
+ // If the db is already fetched, add the schema to the context
+ ...(loadedSchema ? { schema: loadedSchema } : {})
+ })
+ }
+ }
+
+ let newSelectedContext: ContextElement[] = [...currentlySelectedContext]
+
+ // Filter selected context to only include available items
+ newSelectedContext = newSelectedContext
+ .filter((c) => newAvailableContext.some((ac) => ac.type === c.type && ac.title === c.title))
+ .map((c) =>
+ c.type === 'db' && dbSchemas[c.title]
+ ? {
+ ...c,
+ schema: dbSchemas[c.title]
+ }
+ : c
+ )
+
+ this.availableContext = newAvailableContext
+ this.selectedContext = newSelectedContext
+ } catch (err) {
+ console.error('Could not update available context for flow', err)
+ }
+ }
+
async updateAvailableContext(
scriptOptions: ScriptOptions,
dbSchemas: DBSchemas,
@@ -63,12 +160,10 @@ export default class ContextManager {
currentlySelectedContext: ContextElement[]
) {
try {
- let firstTime = !this.workspace
if (this.workspace !== workspace) {
await this.refreshDbResources(workspace)
this.workspace = workspace
}
- this.scriptOptions = scriptOptions
let newAvailableContext: ContextElement[] = [
{
type: 'code',
@@ -123,16 +218,15 @@ export default class ContextManager {
let newSelectedContext: ContextElement[] = [...currentlySelectedContext]
- if (firstTime) {
- newSelectedContext = [
- {
- type: 'code',
- title: this.getContextCodePath(scriptOptions) ?? '',
- content: scriptOptions.code,
- lang: scriptOptions.lang
- }
- ]
- }
+ newSelectedContext = [
+ {
+ type: 'code',
+ title: this.getContextCodePath(scriptOptions) ?? '',
+ content: scriptOptions.code,
+ lang: scriptOptions.lang,
+ deletable: false
+ }
+ ]
const db = this.getSelectedDBSchema(scriptOptions, dbSchemas)
if (
@@ -160,15 +254,15 @@ export default class ContextManager {
.map((c) =>
c.type === 'code'
? {
- ...c,
- content: scriptOptions.code,
- title: this.getContextCodePath(scriptOptions)
- }
+ ...c,
+ content: scriptOptions.code,
+ title: this.getContextCodePath(scriptOptions)
+ }
: c.type === 'db' && dbSchemas[c.title]
? {
- ...c,
- schema: dbSchemas[c.title]
- }
+ ...c,
+ schema: dbSchemas[c.title]
+ }
: c
)
@@ -191,12 +285,15 @@ export default class ContextManager {
return this.availableContext
}
- addSelectedLinesToContext(lines: string, startLine: number, endLine: number) {
+ setScriptOptions(scriptOptions: ScriptOptions) {
+ this.scriptOptions = scriptOptions
+ }
+
+ addSelectedLinesToContext(lines: string, startLine: number, endLine: number, moduleId?: string) {
+ const title = moduleId ? `[${moduleId}] L${startLine}-L${endLine}` : `L${startLine}-L${endLine}`
if (
!this.scriptOptions ||
- this.selectedContext.find(
- (c) => c.type === 'code_piece' && c.title === `L${startLine}-L${endLine}`
- )
+ this.selectedContext.find((c) => c.type === 'code_piece' && c.title === title)
) {
return
}
@@ -204,7 +301,7 @@ export default class ContextManager {
...this.selectedContext,
{
type: 'code_piece',
- title: `L${startLine}-L${endLine}`,
+ title: title,
startLine,
endLine,
content: lines,
@@ -234,14 +331,14 @@ export default class ContextManager {
...(options.withCode === false ? [] : [codeContext]),
...(options.withDiff
? [
- {
- type: 'diff' as const,
- title: 'diff_with_last_deployed_version',
- content: this.scriptOptions.lastDeployedCode ?? '',
- diff: diffLines(this.scriptOptions.lastDeployedCode ?? '', this.scriptOptions.code),
- lang: this.scriptOptions.lang
- }
- ]
+ {
+ type: 'diff' as const,
+ title: 'diff_with_last_deployed_version',
+ content: this.scriptOptions.lastDeployedCode ?? '',
+ diff: diffLines(this.scriptOptions.lastDeployedCode ?? '', this.scriptOptions.code),
+ lang: this.scriptOptions.lang
+ }
+ ]
: [])
]
}
@@ -268,15 +365,37 @@ export default class ContextManager {
contextElements:
m.role !== 'tool' && m.contextElements
? m.contextElements.map((c) =>
- c.type === 'db'
- ? {
- type: 'db',
- title: c.title,
- schema: dbSchemas[c.title]
- }
- : c
- )
+ c.type === 'db'
+ ? {
+ type: 'db',
+ title: c.title,
+ schema: dbSchemas[c.title]
+ }
+ : c
+ )
: undefined
}))
}
+
+ setSelectedModuleContext(
+ moduleId: string | undefined,
+ availableContext: ContextElement[] | undefined
+ ) {
+ if (availableContext && moduleId) {
+ const module = availableContext.find((c) => c.type === 'flow_module' && c.id === moduleId)
+ if (
+ module &&
+ !this.selectedContext.find((c) => c.type === 'flow_module' && c.id === moduleId)
+ ) {
+ this.selectedContext = this.selectedContext.filter((c) => c.type !== 'flow_module')
+ this.selectedContext = [module, ...this.selectedContext]
+ }
+ } else if (!moduleId) {
+ this.selectedContext = this.selectedContext.filter((c) => c.type !== 'flow_module')
+ }
+ }
+
+ clearContext() {
+ this.selectedContext = []
+ }
}
diff --git a/frontend/src/lib/components/copilot/chat/ContextTextarea.svelte b/frontend/src/lib/components/copilot/chat/ContextTextarea.svelte
index d45d36ca2f..090437e259 100644
--- a/frontend/src/lib/components/copilot/chat/ContextTextarea.svelte
+++ b/frontend/src/lib/components/copilot/chat/ContextTextarea.svelte
@@ -155,7 +155,7 @@
}
function getHighlightedText(text: string) {
- return text.replace(/@[\w/.-]+/g, (match) => {
+ return text.replace(/@[\w/.\-\[\]]+/g, (match) => {
const contextElement = availableContext.find((c) => c.title === match.slice(1))
if (contextElement) {
return `
${match}`
diff --git a/frontend/src/lib/components/copilot/chat/context.ts b/frontend/src/lib/components/copilot/chat/context.ts
index e1dcf9d115..c25ae2ade4 100644
--- a/frontend/src/lib/components/copilot/chat/context.ts
+++ b/frontend/src/lib/components/copilot/chat/context.ts
@@ -9,6 +9,7 @@ export const ContextIconMap = {
db: Database,
diff: Diff,
code_piece: Code
+ // flow_module type is handled with FlowModuleIcon
}
export interface CodeElement {
@@ -47,4 +48,26 @@ export interface CodePieceElement {
lang: ScriptLang | 'bunnative'
}
-export type ContextElement = CodeElement | ErrorElement | DBElement | DiffElement | CodePieceElement
+export interface FlowModule {
+ type: 'flow_module'
+ id: string
+ title: string
+ // mimics the FlowModule type, with only the fields we need
+ value: {
+ language?: ScriptLang | 'bunnative'
+ path?: string
+ content?: string
+ type: string
+ }
+}
+
+export type ContextElement = (
+ | CodeElement
+ | ErrorElement
+ | DBElement
+ | DiffElement
+ | CodePieceElement
+ | FlowModule
+) & {
+ deletable?: boolean
+}
diff --git a/frontend/src/lib/components/copilot/chat/flow/FlowAIChat.svelte b/frontend/src/lib/components/copilot/chat/flow/FlowAIChat.svelte
index 7c9d76cafd..8170731ee9 100644
--- a/frontend/src/lib/components/copilot/chat/flow/FlowAIChat.svelte
+++ b/frontend/src/lib/components/copilot/chat/flow/FlowAIChat.svelte
@@ -19,7 +19,7 @@
import DiffDrawer from '$lib/components/DiffDrawer.svelte'
let {
- flowModuleSchemaMap
+ flowModuleSchemaMap,
}: {
flowModuleSchemaMap: FlowModuleSchemaMap | undefined
} = $props()
diff --git a/frontend/src/lib/components/copilot/chat/flow/core.ts b/frontend/src/lib/components/copilot/chat/flow/core.ts
index 975a6de62b..741e86a575 100644
--- a/frontend/src/lib/components/copilot/chat/flow/core.ts
+++ b/frontend/src/lib/components/copilot/chat/flow/core.ts
@@ -10,9 +10,21 @@ import { emptySchema, emptyString } from '$lib/utils'
import {
getFormattedResourceTypes,
getLangContext,
- SUPPORTED_CHAT_SCRIPT_LANGUAGES
+ SUPPORTED_CHAT_SCRIPT_LANGUAGES,
+ createDbSchemaTool
} from '../script/core'
-import { createSearchHubScriptsTool, createToolDef, type Tool, executeTestRun, buildSchemaForTool, buildTestRunArgs } from '../shared'
+import {
+ createSearchHubScriptsTool,
+ createToolDef,
+ type Tool,
+ executeTestRun,
+ buildSchemaForTool,
+ buildTestRunArgs,
+ buildContextString,
+ applyCodePiecesToFlowModules,
+ findModuleById
+} from '../shared'
+import type { ContextElement } from '../context'
import type { ExtendedOpenFlow } from '$lib/components/flows/types'
export type AIModuleAction = 'added' | 'modified' | 'removed'
@@ -339,8 +351,11 @@ const getInstructionsForCodeGenerationToolDef = createToolDef(
// Will be overridden by setSchema
const testRunFlowSchema = z.object({
- args: z.object({}).nullable().optional()
- .describe('Arguments to pass to the flow (optional, uses default flow inputs if not provided)')
+ args: z
+ .object({})
+ .nullable()
+ .optional()
+ .describe('Arguments to pass to the flow (optional, uses default flow inputs if not provided)')
})
const testRunFlowToolDef = createToolDef(
@@ -368,6 +383,7 @@ const workspaceScriptsSearch = new WorkspaceScriptsSearch()
export const flowTools: Tool
[] = [
createSearchHubScriptsTool(false),
+ createDbSchemaTool(),
{
def: searchScriptsToolDef,
fn: async ({ args, workspace, toolId, toolCallbacks }) => {
@@ -562,7 +578,7 @@ export const flowTools: Tool[] = [
},
{
def: testRunFlowToolDef,
- fn: async function({ args, workspace, helpers, toolCallbacks, toolId }) {
+ fn: async function ({ args, workspace, helpers, toolCallbacks, toolId }) {
const { flow } = helpers.getFlowAndSelectedId()
if (!flow || !flow.value) {
@@ -577,13 +593,14 @@ export const flowTools: Tool[] = [
const parsedArgs = await buildTestRunArgs(args, this.def)
return executeTestRun({
- jobStarter: () => JobService.runFlowPreview({
- workspace: workspace,
- requestBody: {
- args: parsedArgs,
- value: flow.value,
- }
- }),
+ jobStarter: () =>
+ JobService.runFlowPreview({
+ workspace: workspace,
+ requestBody: {
+ args: parsedArgs,
+ value: flow.value
+ }
+ }),
workspace,
toolCallbacks,
toolId,
@@ -591,7 +608,7 @@ export const flowTools: Tool[] = [
contextName: 'flow'
})
},
- setSchema: async function(helpers: FlowAIChatHelpers) {
+ setSchema: async function (helpers: FlowAIChatHelpers) {
await buildSchemaForTool(this.def, async () => {
const flowInputsSchema = await helpers.getFlowInputsSchema()
return flowInputsSchema
@@ -622,7 +639,7 @@ export const flowTools: Tool[] = [
// Find the step in the flow
const modules = helpers.getModules()
- let targetModule: FlowModule | undefined = modules.find((m) => m.id === stepId)
+ let targetModule: FlowModule | undefined = findModuleById(modules, stepId)
if (!targetModule) {
toolCallbacks.setToolStatus(toolId, {
@@ -647,7 +664,10 @@ export const flowTools: Tool[] = [
requestBody: {
content: moduleValue.content ?? '',
language: moduleValue.language,
- args: module.id === 'preprocessor' ? { _ENTRYPOINT_OVERRIDE: 'preprocessor', ...stepArgs } : stepArgs
+ args:
+ module.id === 'preprocessor'
+ ? { _ENTRYPOINT_OVERRIDE: 'preprocessor', ...stepArgs }
+ : stepArgs
}
}),
workspace,
@@ -675,7 +695,10 @@ export const flowTools: Tool[] = [
requestBody: {
content: script.content,
language: script.language,
- args: module.id === 'preprocessor' ? { _ENTRYPOINT_OVERRIDE: 'preprocessor', ...stepArgs } : stepArgs,
+ args:
+ module.id === 'preprocessor'
+ ? { _ENTRYPOINT_OVERRIDE: 'preprocessor', ...stepArgs }
+ : stepArgs
}
}),
workspace,
@@ -721,6 +744,16 @@ Follow the user instructions carefully.
Go step by step, and explain what you're doing as you're doing it.
DO NOT wait for user confirmation before performing an action. Only do it if the user explicitly asks you to wait in their initial instructions.
ALWAYS test your modifications. You have access to the \`test_run_flow\` and \`test_run_step\` tools to test the flow and steps. If you only modified a single step, use the \`test_run_step\` tool to test it. If you modified the flow, use the \`test_run_flow\` tool to test it. If the user cancels the test run, do not try again and wait for the next user instruction.
+When testing steps that are sql scripts, the arguments to be passed are { database: $res: }.
+
+## Code Markers in Flow Modules
+
+When viewing flow modules, the code content of rawscript steps may include \`[#START]\` and \`[#END]\` markers:
+- These markers indicate specific code sections that need attention
+- You MUST only modify the code between these markers when using the \`set_code\` tool
+- After modifying the code, remove the markers from your response
+- If a question is asked about the code, focus only on the code between the markers
+- The markers appear in the YAML representation of flow modules when specific code pieces are selected
## Understanding User Requests
@@ -802,6 +835,16 @@ For truly static values in step inputs (those not linked to previous steps or lo
Both modules only support a script or rawscript step. You cannot nest modules using forloop/branchone/branchall.
+### Contexts
+
+You have access to the following contexts:
+- Database schemas
+- Flow diffs
+- Focused flow modules
+Database schemas give you the schema of databases the user is using.
+Flow diffs give you the diff between the current flow and the last deployed flow.
+Focused flow modules give you the ids of the flow modules the user is focused on. Your response should focus on these modules.
+
## Resource types
On Windmill, credentials and configuration are stored in resources. Resource types define the format of the resource.
If the user needs a resource as flow input, you should set the property type in the schema to "object" as well as add a key called "format" and set it to "resource-nameofresourcetype" (e.g. "resource-stripe").
@@ -816,26 +859,33 @@ If the user wants a specific resource as step input, you should set the step val
export function prepareFlowUserMessage(
instructions: string,
- flowAndSelectedId?: { flow: ExtendedOpenFlow; selectedId: string }
+ flowAndSelectedId?: { flow: ExtendedOpenFlow; selectedId: string },
+ selectedContext?: ContextElement[]
): ChatCompletionUserMessageParam {
const flow = flowAndSelectedId?.flow
const selectedId = flowAndSelectedId?.selectedId
+ // Handle context elements
+ const contextInstructions = selectedContext ? buildContextString(selectedContext) : ''
+
if (!flow || !selectedId) {
+ let userMessage = `## INSTRUCTIONS:
+${instructions}`
return {
role: 'user',
- content: `## INSTRUCTIONS:
-${instructions}`
+ content: userMessage
}
}
- return {
- role: 'user',
- content: `## FLOW:
+
+ const codePieces = selectedContext?.filter((c) => c.type === 'code_piece') ?? []
+ const flowModulesYaml = applyCodePiecesToFlowModules(codePieces, flow.value.modules)
+
+ let flowContent = `## FLOW:
flow_input schema:
${JSON.stringify(flow.schema ?? emptySchema())}
flow modules:
-${YAML.stringify(flow.value.modules)}
+${flowModulesYaml}
preprocessor module:
${YAML.stringify(flow.value.preprocessor_module)}
@@ -844,9 +894,15 @@ failure module:
${YAML.stringify(flow.value.failure_module)}
currently selected step:
-${selectedId}
+${selectedId}`
-## INSTRUCTIONS:
+ flowContent += contextInstructions
+
+ flowContent += `\n\n## INSTRUCTIONS:
${instructions}`
+
+ return {
+ role: 'user',
+ content: flowContent
}
}
diff --git a/frontend/src/lib/components/copilot/chat/script/core.ts b/frontend/src/lib/components/copilot/chat/script/core.ts
index 6ad56de1b4..ee6b364ecf 100644
--- a/frontend/src/lib/components/copilot/chat/script/core.ts
+++ b/frontend/src/lib/components/copilot/chat/script/core.ts
@@ -1,6 +1,6 @@
import { ResourceService, JobService } from '$lib/gen/services.gen'
import type { ResourceType, ScriptLang } from '$lib/gen/types.gen'
-import { capitalize, emptySchema, isObject, toCamel } from '$lib/utils'
+import { capitalize, isObject, toCamel } from '$lib/utils'
import { get } from 'svelte/store'
import { compile, phpCompile, pythonCompile } from '../../utils'
import type {
@@ -9,14 +9,18 @@ import type {
ChatCompletionUserMessageParam
} from 'openai/resources/index.mjs'
import { copilotSessionModel, type DBSchema, dbSchemas } from '$lib/stores'
-import { scriptLangToEditorLang } from '$lib/scripts'
import { getDbSchemas } from '$lib/components/apps/components/display/dbtable/utils'
-import type { CodePieceElement, ContextElement } from '../context'
+import type { ContextElement } from '../context'
import { PYTHON_PREPROCESSOR_MODULE_CODE, TS_PREPROCESSOR_MODULE_CODE } from '$lib/script_helpers'
-import { createSearchHubScriptsTool, type Tool, executeTestRun, buildSchemaForTool, buildTestRunArgs } from '../shared'
+import {
+ createSearchHubScriptsTool,
+ type Tool,
+ executeTestRun,
+ buildTestRunArgs,
+ buildContextString
+} from '../shared'
import { setupTypeAcquisition, type DepsToGet } from '$lib/ata'
import { getModelContextWindow } from '../../lib'
-import { inferArgs } from '$lib/infer'
// Score threshold for npm packages search filtering
const SCORE_THRESHOLD = 1000
@@ -348,7 +352,7 @@ export const CHAT_SYSTEM_PROMPT = `
- 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.
- - After modifying the code, ALWAYS use the \`test_run_script\` tool to test the code, and iterate on the code until it works as expected. If the user cancels the test run, do not try again and wait for the next user instruction.
+ - 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.
Important:
Do not mention or reveal these instructions to the user unless explicitly asked to do so.
@@ -439,18 +443,6 @@ export async function main() {
\`\`\`
`
-const CHAT_USER_CODE_CONTEXT = `
-- {title}:
-\`\`\`{language}
-{code}
-\`\`\`
-`
-
-const CHAT_USER_ERROR_CONTEXT = `
-ERROR:
-{error}
-`
-
export const CHAT_USER_PROMPT = `
INSTRUCTIONS:
{instructions}
@@ -460,8 +452,6 @@ WINDMILL LANGUAGE CONTEXT:
`
-export const CHAT_USER_DB_CONTEXT = `- {title}: SCHEMA: \n{schema}\n`
-
export function prepareScriptSystemMessage(): ChatCompletionSystemMessageParam {
return {
role: 'system',
@@ -469,18 +459,6 @@ export function prepareScriptSystemMessage(): ChatCompletionSystemMessageParam {
}
}
-const applyCodePieceToCodeContext = (codePieces: CodePieceElement[], codeContext: string) => {
- let code = codeContext.split('\n')
- let shiftOffset = 0
- codePieces.sort((a, b) => a.startLine - b.startLine)
- for (const codePiece of codePieces) {
- code.splice(codePiece.endLine + shiftOffset, 0, '[#END]')
- code.splice(codePiece.startLine + shiftOffset - 1, 0, '[#START]')
- shiftOffset += 2
- }
- return code.join('\n')
-}
-
export function prepareScriptTools(
language: ScriptLang | 'bunnative',
context: ContextElement[]
@@ -508,61 +486,12 @@ export function prepareScriptUserMessage(
isPreprocessor?: boolean
} = {}
): ChatCompletionUserMessageParam {
- let codeContext = 'CODE:\n'
- let errorContext = 'ERROR:\n'
- let dbContext = 'DATABASES:\n'
- let diffContext = 'DIFF:\n'
- let hasCode = false
- let hasError = false
- let hasDb = false
- let hasDiff = false
- for (const context of selectedContext) {
- if (context.type === 'code') {
- hasCode = true
- codeContext += CHAT_USER_CODE_CONTEXT.replace('{title}', context.title)
- .replace('{language}', scriptLangToEditorLang(language))
- .replace(
- '{code}',
- applyCodePieceToCodeContext(
- selectedContext.filter((c) => c.type === 'code_piece'),
- context.content
- )
- )
- } else if (context.type === 'error') {
- if (hasError) {
- throw new Error('Multiple error contexts provided')
- }
- hasError = true
- errorContext = CHAT_USER_ERROR_CONTEXT.replace('{error}', context.content)
- } else if (context.type === 'db') {
- hasDb = true
- dbContext += CHAT_USER_DB_CONTEXT.replace('{title}', context.title).replace(
- '{schema}',
- context.schema?.stringified ?? 'to fetch with get_db_schema'
- )
- } else if (context.type === 'diff') {
- hasDiff = true
- const diff = JSON.stringify(context.diff)
- diffContext = diff.length > 3000 ? diff.slice(0, 3000) + '...' : diff
- }
- }
-
let userMessage = CHAT_USER_PROMPT.replace('{instructions}', instructions).replace(
'{lang_context}',
getLangContext(language, { allowResourcesFetch: true, ...options })
)
- if (hasCode) {
- userMessage += codeContext
- }
- if (hasError) {
- userMessage += errorContext
- }
- if (hasDb) {
- userMessage += dbContext
- }
- if (hasDiff) {
- userMessage += diffContext
- }
+ const contextInstructions = buildContextString(selectedContext)
+ userMessage += contextInstructions
return {
role: 'user',
content: userMessage
@@ -626,7 +555,12 @@ async function formatDBSchema(dbSchema: DBSchema) {
}
export interface ScriptChatHelpers {
- getScriptOptions: () => { code: string; lang: ScriptLang | 'bunnative'; path: string; args: Record }
+ getScriptOptions: () => {
+ code: string
+ lang: ScriptLang | 'bunnative'
+ path: string
+ args: Record
+ }
getLastSuggestedCode: () => string | undefined
applyCode: (code: string, applyAll?: boolean) => void
}
@@ -634,51 +568,60 @@ export interface ScriptChatHelpers {
export const resourceTypeTool: Tool = {
def: RESOURCE_TYPE_FUNCTION_DEF,
fn: async ({ args, workspace, helpers, toolCallbacks, toolId }) => {
- toolCallbacks.setToolStatus(toolId, { content: 'Searching resource types for "' + args.query + '"...' })
+ toolCallbacks.setToolStatus(toolId, {
+ content: 'Searching resource types for "' + args.query + '"...'
+ })
const lang = helpers.getScriptOptions().lang
- const formattedResourceTypes = await getFormattedResourceTypes(
- lang,
- args.query,
- workspace
- )
- toolCallbacks.setToolStatus(toolId, { content: 'Retrieved resource types for "' + args.query + '"' })
+ const formattedResourceTypes = await getFormattedResourceTypes(lang, args.query, workspace)
+ toolCallbacks.setToolStatus(toolId, {
+ content: 'Retrieved resource types for "' + args.query + '"'
+ })
return formattedResourceTypes
}
}
-export const dbSchemaTool: Tool = {
- def: DB_SCHEMA_FUNCTION_DEF,
- fn: async ({ args, workspace, toolCallbacks, toolId }) => {
- if (!args.resourcePath) {
- throw new Error('Database path not provided')
- }
- toolCallbacks.setToolStatus(toolId, { content: 'Getting database schema for ' + args.resourcePath + '...' })
- const resource = await ResourceService.getResource({
- workspace: workspace,
- path: args.resourcePath
- })
- const newDbSchemas = {}
- await getDbSchemas(
- resource.resource_type,
- args.resourcePath,
- workspace,
- newDbSchemas,
- (error) => {
- console.error(error)
+// Generic DB schema tool factory that can be used by both script and flow modes
+export function createDbSchemaTool(): Tool {
+ return {
+ def: DB_SCHEMA_FUNCTION_DEF,
+ fn: async ({ args, workspace, toolCallbacks, toolId }) => {
+ if (!args.resourcePath) {
+ throw new Error('Database path not provided')
}
- )
- dbSchemas.update((schemas) => ({ ...schemas, ...newDbSchemas }))
- const dbs = get(dbSchemas)
- const db = dbs[args.resourcePath]
- if (!db) {
- throw new Error('Database not found')
+ toolCallbacks.setToolStatus(toolId, {
+ content: 'Getting database schema for ' + args.resourcePath + '...'
+ })
+ const resource = await ResourceService.getResource({
+ workspace: workspace,
+ path: args.resourcePath
+ })
+ const newDbSchemas = {}
+ await getDbSchemas(
+ resource.resource_type,
+ args.resourcePath,
+ workspace,
+ newDbSchemas,
+ (error) => {
+ console.error(error)
+ }
+ )
+ dbSchemas.update((schemas) => ({ ...schemas, ...newDbSchemas }))
+ const dbs = get(dbSchemas)
+ const db = dbs[args.resourcePath]
+ if (!db) {
+ throw new Error('Database not found')
+ }
+ const stringSchema = await formatDBSchema(db)
+ toolCallbacks.setToolStatus(toolId, {
+ content: 'Retrieved database schema for ' + args.resourcePath
+ })
+ return stringSchema
}
- const stringSchema = await formatDBSchema(db)
- toolCallbacks.setToolStatus(toolId, { content: 'Retrieved database schema for ' + args.resourcePath })
- return stringSchema
}
}
+export const dbSchemaTool: Tool = createDbSchemaTool()
+
type PackageSearchQuery = {
package: {
name: string
@@ -839,31 +782,31 @@ const TEST_RUN_SCRIPT_TOOL: ChatCompletionTool = {
function: {
name: 'test_run_script',
description: 'Execute a test run of the current script in the editor',
- // will be overridden by setSchema
parameters: {
type: 'object',
properties: {
- args: {
- type: 'object',
- description: 'Arguments to pass to the script (optional, uses current editor args if not provided)'
- }
+ args: { type: 'string', description: 'JSON string containing the arguments for the tool' }
},
- required: []
+ additionalProperties: false,
+ strict: false,
+ required: ['args']
}
- },
+ }
}
export const testRunScriptTool: Tool = {
def: TEST_RUN_SCRIPT_TOOL,
- fn: async function({ args, workspace, helpers, toolCallbacks, toolId }) {
+ fn: async function ({ args, workspace, helpers, toolCallbacks, toolId }) {
const scriptOptions = helpers.getScriptOptions()
-
+
if (!scriptOptions) {
- toolCallbacks.setToolStatus(toolId, {
+ toolCallbacks.setToolStatus(toolId, {
content: 'No script available to test',
error: 'No script found in current context'
})
- throw new Error('No script code available to test. Please ensure you have a script open in the editor.')
+ throw new Error(
+ 'No script code available to test. Please ensure you have a script open in the editor.'
+ )
}
let codeToTest = scriptOptions.code
@@ -873,7 +816,7 @@ export const testRunScriptTool: Tool = {
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)
@@ -883,15 +826,16 @@ export const testRunScriptTool: Tool = {
const parsedArgs = await buildTestRunArgs(args, this.def)
return executeTestRun({
- jobStarter: () => JobService.runScriptPreview({
- workspace: workspace,
- requestBody: {
- path: scriptOptions.path,
- content: codeToTest,
- args: parsedArgs,
- language: scriptOptions.lang as ScriptLang,
- }
- }),
+ jobStarter: () =>
+ JobService.runScriptPreview({
+ workspace: workspace,
+ requestBody: {
+ path: scriptOptions.path,
+ content: codeToTest,
+ args: parsedArgs,
+ language: scriptOptions.lang as ScriptLang
+ }
+ }),
workspace,
toolCallbacks,
toolId,
@@ -899,23 +843,7 @@ export const testRunScriptTool: Tool = {
contextName: 'script'
})
},
- setSchema: async function(helpers: ScriptChatHelpers) {
- await buildSchemaForTool(this.def, async () => {
- const scriptOptions = helpers.getScriptOptions()
- const code = scriptOptions?.code
- const lang = scriptOptions?.lang
- const lastSuggestedCode = helpers.getLastSuggestedCode()
-
- const codeToTest = lastSuggestedCode ?? code
- if (codeToTest) {
- const newSchema = emptySchema()
- await inferArgs(lang, codeToTest, newSchema)
- return newSchema
- }
- return emptySchema()
- })
- },
requiresConfirmation: true,
confirmationMessage: 'Run script test',
- showDetails: true,
+ showDetails: true
}
diff --git a/frontend/src/lib/components/copilot/chat/shared.ts b/frontend/src/lib/components/copilot/chat/shared.ts
index 1aa8aab89c..f47632ffbd 100644
--- a/frontend/src/lib/components/copilot/chat/shared.ts
+++ b/frontend/src/lib/components/copilot/chat/shared.ts
@@ -4,13 +4,179 @@ import type {
ChatCompletionTool
} from 'openai/resources/chat/completions.mjs'
import { get } from 'svelte/store'
-import type { ContextElement } from './context'
+import type { CodePieceElement, ContextElement } from './context'
import { copilotSessionModel, workspaceStore } from '$lib/stores'
import type { ExtendedOpenFlow } from '$lib/components/flows/types'
import type { FunctionParameters } from 'openai/resources/shared.mjs'
import { zodToJsonSchema } from 'zod-to-json-schema'
import { z } from 'zod'
-import { ScriptService, JobService, type CompletedJob } from '$lib/gen'
+import { ScriptService, JobService, type CompletedJob, type FlowModule } from '$lib/gen'
+import { scriptLangToEditorLang } from '$lib/scripts'
+import YAML from 'yaml'
+
+export interface ContextStringResult {
+ dbContext: string
+ diffContext: string
+ flowModuleContext: string
+ hasDb: boolean
+ hasDiff: boolean
+ hasFlowModule: boolean
+}
+
+export const findModuleById = (modules: FlowModule[], moduleId: string): FlowModule | undefined => {
+ for (const module of modules) {
+ if (module.id === moduleId) {
+ return module
+ }
+ if (module.value.type === 'forloopflow' || module.value.type === 'whileloopflow') {
+ const found = findModuleById(module.value.modules, moduleId)
+ if (found) {
+ return found
+ }
+ }
+ if (module.value.type === 'branchall') {
+ const allModules = module.value.branches.flatMap((b) => b.modules)
+ const found = findModuleById(allModules, moduleId)
+ if (found) {
+ return found
+ }
+ }
+ if (module.value.type === 'branchone') {
+ const allModules = [
+ ...module.value.branches.flatMap((b) => b.modules),
+ ...module.value.default
+ ]
+ const found = findModuleById(allModules, moduleId)
+ if (found) {
+ return found
+ }
+ }
+ }
+ return undefined
+}
+
+const applyCodePieceToCodeContext = (codePieces: CodePieceElement[], codeContext: string) => {
+ let code = codeContext.split('\n')
+ let shiftOffset = 0
+ codePieces.sort((a, b) => a.startLine - b.startLine)
+ for (const codePiece of codePieces) {
+ code.splice(codePiece.endLine + shiftOffset, 0, '[#END]')
+ code.splice(codePiece.startLine + shiftOffset - 1, 0, '[#START]')
+ shiftOffset += 2
+ }
+ return code.join('\n')
+}
+
+export function applyCodePiecesToFlowModules(
+ codePieces: CodePieceElement[],
+ flowModules: FlowModule[]
+): string {
+ // Parse code piece titles to extract module IDs
+ // Format: "[id] L3-L5"
+ const moduleCodePieces = new Map()
+
+ for (const codePiece of codePieces) {
+ const match = codePiece.title.match(/\[([^\]]+)\]\s+L\d+-L\d+/)
+ if (match) {
+ const moduleId = match[1]
+ if (!moduleCodePieces.has(moduleId)) {
+ moduleCodePieces.set(moduleId, [])
+ }
+ moduleCodePieces.get(moduleId)!.push(codePiece)
+ }
+ }
+
+ // Clone modules to avoid mutation
+ const modifiedModules = JSON.parse(JSON.stringify(flowModules))
+
+ // Apply code pieces to each module
+ for (const [moduleId, pieces] of moduleCodePieces) {
+ const module = findModuleById(modifiedModules, moduleId)
+ if (module && module.value.type === 'rawscript' && module.value.content) {
+ module.value.content = applyCodePieceToCodeContext(pieces, module.value.content)
+ }
+ }
+
+ return YAML.stringify(modifiedModules)
+}
+
+export function buildContextString(selectedContext: ContextElement[]): string {
+ const dbTemplate = `- {title}: SCHEMA: \n{schema}\n`
+ const codeTemplate = `
+ - {title}:
+ \`\`\`{language}
+ {code}
+ \`\`\`
+ `
+
+ let dbContext = 'DATABASES:\n'
+ let diffContext = 'DIFF:\n'
+ let flowModuleContext = 'FOCUSED FLOW MODULES IDS:\n'
+ let codeContext = 'CODE:\n'
+ let errorContext = `
+ ERROR:
+ {error}
+ `
+ let hasCode = false
+ let hasDb = false
+ let hasDiff = false
+ let hasFlowModule = false
+ let hasError = false
+
+ let result = '\n\n'
+ for (const context of selectedContext) {
+ if (context.type === 'code') {
+ hasCode = true
+ codeContext += codeTemplate
+ .replace('{title}', context.title)
+ .replace('{language}', scriptLangToEditorLang(context.lang))
+ .replace(
+ '{code}',
+ applyCodePieceToCodeContext(
+ selectedContext.filter((c) => c.type === 'code_piece'),
+ context.content
+ )
+ )
+ } else if (context.type === 'error') {
+ if (hasError) {
+ throw new Error('Multiple error contexts provided')
+ }
+ hasError = true
+ errorContext = errorContext.replace('{error}', context.content)
+ } else if (context.type === 'db') {
+ hasDb = true
+ dbContext += dbTemplate
+ .replace('{title}', context.title)
+ .replace('{schema}', context.schema?.stringified ?? 'to fetch with get_db_schema')
+ dbContext += '\n'
+ } else if (context.type === 'diff') {
+ hasDiff = true
+ const diff = JSON.stringify(context.diff)
+ diffContext += (diff.length > 3000 ? diff.slice(0, 3000) + '...' : diff) + '\n'
+ } else if (context.type === 'flow_module') {
+ hasFlowModule = true
+ flowModuleContext += `${context.id}\n`
+ }
+ }
+
+ if (hasCode) {
+ result += '\n' + codeContext
+ }
+ if (hasError) {
+ result += '\n' + errorContext
+ }
+ if (hasDb) {
+ result += '\n' + dbContext
+ }
+ if (hasDiff) {
+ result += '\n' + diffContext
+ }
+ if (hasFlowModule) {
+ result += '\n' + flowModuleContext
+ }
+
+ return result
+}
type BaseDisplayMessage = {
content: string
@@ -89,11 +255,13 @@ export async function processToolCall({
// Add the tool to the display with appropriate status
toolCallbacks.setToolStatus(toolCall.id, {
- ...(tool?.requiresConfirmation ? { content: tool.confirmationMessage ?? "Waiting for confirmation..." } : {}),
+ ...(tool?.requiresConfirmation
+ ? { content: tool.confirmationMessage ?? 'Waiting for confirmation...' }
+ : {}),
parameters: args,
isLoading: true,
needsConfirmation: needsConfirmation,
- showDetails: tool?.showDetails,
+ showDetails: tool?.showDetails
})
// If confirmation is needed and we have the callback, wait for it
@@ -254,12 +422,17 @@ export const createSearchHubScriptsTool = (withContent: boolean = false) => ({
}
})
-export async function buildSchemaForTool(toolDef: ChatCompletionTool, schemaBuilder: () => Promise): Promise {
+export async function buildSchemaForTool(
+ toolDef: ChatCompletionTool,
+ schemaBuilder: () => Promise
+): Promise {
try {
const schema = await schemaBuilder()
// if schema properties contains values different from '^[a-zA-Z0-9_.-]{1,64}$'
- const invalidProperties = Object.keys(schema.properties ?? {}).filter((key) => !/^[a-zA-Z0-9_.-]{1,64}$/.test(key))
+ const invalidProperties = Object.keys(schema.properties ?? {}).filter(
+ (key) => !/^[a-zA-Z0-9_.-]{1,64}$/.test(key)
+ )
if (invalidProperties.length > 0) {
console.warn(`Invalid flow inputs schema: ${invalidProperties.join(', ')}`)
throw new Error(`Invalid flow inputs schema: ${invalidProperties.join(', ')}`)
@@ -275,7 +448,15 @@ export async function buildSchemaForTool(toolDef: ChatCompletionTool, schemaBuil
} catch (error) {
console.error('Error building schema for tool', error)
// fallback to schema with args as a JSON string
- toolDef.function.parameters = { type: 'object', properties: { args: { type: 'string', description: 'JSON string containing the arguments for the tool' } }, additionalProperties: false, strict: false, required: ['args'] }
+ toolDef.function.parameters = {
+ type: 'object',
+ properties: {
+ args: { type: 'string', description: 'JSON string containing the arguments for the tool' }
+ },
+ additionalProperties: false,
+ strict: false,
+ required: ['args']
+ }
return false
}
}
@@ -393,7 +574,10 @@ function getErrorMessage(result: unknown): string {
export async function buildTestRunArgs(args: any, toolDef: ChatCompletionTool): Promise {
let parsedArgs = args
// if the schema is the fallback schema, parse the args as a JSON string
- if ((toolDef.function.parameters as any).properties?.args?.description === 'JSON string containing the arguments for the tool') {
+ if (
+ (toolDef.function.parameters as any).properties?.args?.description ===
+ 'JSON string containing the arguments for the tool'
+ ) {
try {
parsedArgs = JSON.parse(args.args)
} catch (error) {
diff --git a/frontend/src/lib/components/flows/FlowEditor.svelte b/frontend/src/lib/components/flows/FlowEditor.svelte
index 2e264d94ae..25cb5c60ab 100644
--- a/frontend/src/lib/components/flows/FlowEditor.svelte
+++ b/frontend/src/lib/components/flows/FlowEditor.svelte
@@ -18,6 +18,7 @@
import { triggerableByAI } from '$lib/actions/triggerableByAI.svelte'
import type { ModulesTestStates } from '../modulesTest.svelte'
import type { StateStore } from '$lib/utils'
+ import type { FlowOptions } from '../copilot/chat/ContextManager.svelte'
const { flowStore } = getContext('FlowEditorContext')
interface Props {
@@ -103,11 +104,24 @@
pickablePropertiesFiltered: writable(undefined)
})
+ $effect(() => {
+ const options: FlowOptions = {
+ currentFlow: flowStore.val,
+ lastDeployedFlow: savedFlow,
+ lastSavedFlow: savedFlow?.draft,
+ path: savedFlow?.path,
+ modules: flowStore.val.value.modules
+ }
+ aiChatManager.flowOptions = options
+ })
+
onMount(() => {
+ aiChatManager.saveAndClear()
aiChatManager.changeMode(AIMode.FLOW)
})
onDestroy(() => {
+ aiChatManager.flowOptions = undefined
aiChatManager.changeMode(AIMode.NAVIGATOR)
})
diff --git a/frontend/src/lib/components/flows/FlowModuleIcon.svelte b/frontend/src/lib/components/flows/FlowModuleIcon.svelte
new file mode 100644
index 0000000000..ecadb9ea4f
--- /dev/null
+++ b/frontend/src/lib/components/flows/FlowModuleIcon.svelte
@@ -0,0 +1,50 @@
+
+
+{#if module.value.type === 'aiagent'}
+
+{:else if module.value.type === 'rawscript'}
+
+{:else if module.summary === 'Terminate flow'}
+
+{:else if module.value.type === 'identity'}
+
+{:else if module.value.type === 'flow'}
+
+{:else if module.value.type === 'forloopflow' || module.value.type === 'whileloopflow'}
+
+{:else if module.value.type === 'branchone' || module.value.type === 'branchall'}
+
+{:else if module.value.type === 'script'}
+ {#if module.value.path.startsWith('hub/')}
+
+ {:else}
+
+ {/if}
+{:else}
+
+
+{/if}
diff --git a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
index d00341032d..f30dd02ca2 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
@@ -419,6 +419,7 @@
{lastDeployedCode}
{diffMode}
openAiChat
+ moduleId={flowModule.id}
/>
{/if}
@@ -477,6 +478,7 @@
{}
)}
key={`flow-inline-${$workspaceStore}-${$pathStore}-${flowModule.id}`}
+ moduleId={flowModule.id}
/>