windmill-components 1.677.1 → 1.695.0

package/package/components/copilot/chat/flow/FlowAIChat.svelte

@@ -1,29 +1,18 @@
 <script lang="ts">import FlowModuleSchemaMap from '../../../flows/map/FlowModuleSchemaMap.svelte';
 import { getContext, untrack } from 'svelte';
-import { dfs } from '../../../flows/previousResults';
-import { restoreInlineScriptReferences } from './inlineScriptsUtils';
+import { createInlineScriptSession } from './inlineScriptsUtils';
 import { loadSchemaFromModule } from '../../../flows/flowInfers';
 import { aiChatManager } from '../AIChatManager.svelte';
 import { refreshStateStore } from '../../../../svelte5Utils.svelte';
-import { getSubModules } from '../../../flows/flowExplorer';
-import { SPECIAL_MODULE_IDS } from '../shared';
+import { applyFlowJsonUpdate, updateRawScriptModuleContent } from './helperUtils';
+import { findModuleInFlow } from '../../../flows/flowTree';
 let { flowModuleSchemaMap, onTestFlow } = $props();
 const { flowStore, flowStateStore, selectionManager, currentEditor, previewArgs } = getContext('FlowEditorContext');
 const selectedId = $derived(selectionManager.getSelectedId());
 const { exprsToSet } = getContext('FlowCopilotContext') ?? {};
+const inlineScriptSession = createInlineScriptSession();
 // Get diffManager from the graph
 const diffManager = $derived(flowModuleSchemaMap?.getDiffManager());
-function getModule(id, flow = flowStore.val) {
-    if (id === SPECIAL_MODULE_IDS.PREPROCESSOR) {
-        return flow.value.preprocessor_module;
-    }
-    else if (id === SPECIAL_MODULE_IDS.FAILURE) {
-        return flow.value.failure_module;
-    }
-    else {
-        return dfs(id, flow, false)[0];
-    }
-}
 const flowHelpers = {
     // flow context
     getFlowAndSelectedId: () => {
@@ -33,16 +22,10 @@ const flowHelpers = {
             selectedId: selectedId === 'settings-metadata' ? '' : selectedId
         };
     },
-    getModules: (id) => {
-        if (id) {
-            const module = getModule(id);
-            if (!module) {
-                throw new Error('Module not found');
-            }
-            return getSubModules(module).flat();
-        }
+    getRootModules: () => {
         return flowStore.val.value.modules;
     },
+    inlineScriptSession,
     setSnapshot: (snapshot) => {
         diffManager?.setBeforeFlow(snapshot);
     },
@@ -54,7 +37,7 @@ const flowHelpers = {
         // Update current editor if needed
         const targetSnapshot = snapshot ?? diffManager.beforeFlow;
         if ($currentEditor && targetSnapshot) {
-            const module = getModule($currentEditor.stepId, targetSnapshot);
+            const module = findModuleInFlow(targetSnapshot.value, $currentEditor.stepId) ?? undefined;
             if (module) {
                 if ($currentEditor.type === 'script' && module.value.type === 'rawscript') {
                     $currentEditor.editor.setCode(module.value.content);
@@ -67,48 +50,43 @@ const flowHelpers = {
     },
     // ai chat tools
     setCode: async (id, code) => {
-        const module = getModule(id);
+        // 1. Take snapshot only if none exists (preserves baseline for cumulative changes)
+        if (!diffManager?.beforeFlow) {
+            const snapshot = $state.snapshot(flowStore).val;
+            diffManager?.setBeforeFlow(snapshot);
+            diffManager?.setEditMode(true);
+        }
+        // 2. Apply the code change
+        const module = updateRawScriptModuleContent(flowStore.val, id, code);
         if (!module) {
-            throw new Error('Module not found');
+            throw new Error('Module not found or is not a rawscript');
         }
-        if (module.value.type === 'rawscript') {
-            // 1. Take snapshot only if none exists (preserves baseline for cumulative changes)
-            if (!diffManager?.beforeFlow) {
-                const snapshot = $state.snapshot(flowStore).val;
-                diffManager?.setBeforeFlow(snapshot);
-                diffManager?.setEditMode(true);
-            }
-            // 2. Apply the code change
-            module.value.content = code;
-            const { input_transforms, schema } = await loadSchemaFromModule(module);
-            module.value.input_transforms = input_transforms;
-            refreshStateStore(flowStore);
-            // Update exprsToSet if this module is currently selected
-            if (id === selectedId && exprsToSet) {
-                exprsToSet.set(input_transforms);
-            }
-            if (flowStateStore.val[id]) {
-                flowStateStore.val[id].schema = schema;
-            }
-            else {
-                flowStateStore.val[id] = {
-                    schema
-                };
-            }
-            // 3. Manually add to moduleActions, preserving existing action types
-            // Note: currentFlow is auto-synced by FlowGraphV2's effect after refreshStateStore
-            const currentAction = diffManager?.moduleActions[id];
-            if (!currentAction) {
-                diffManager?.setModuleActions({
-                    ...diffManager?.moduleActions,
-                    [id]: { action: 'modified', pending: true }
-                });
-            }
-            // If already tracked (e.g., 'added' from setFlowJson), keep that status
+        inlineScriptSession.set(id, code);
+        const { input_transforms, schema } = await loadSchemaFromModule(module);
+        module.value.input_transforms = input_transforms;
+        refreshStateStore(flowStore);
+        // Update exprsToSet if this module is currently selected
+        if (id === selectedId && exprsToSet) {
+            exprsToSet.set(input_transforms);
+        }
+        if (flowStateStore.val[id]) {
+            flowStateStore.val[id].schema = schema;
         }
         else {
-            throw new Error('Module is not a rawscript or script');
+            flowStateStore.val[id] = {
+                schema
+            };
+        }
+        // 3. Manually add to moduleActions, preserving existing action types
+        // Note: currentFlow is auto-synced by FlowGraphV2's effect after refreshStateStore
+        const currentAction = diffManager?.moduleActions[id];
+        if (!currentAction) {
+            diffManager?.setModuleActions({
+                ...diffManager?.moduleActions,
+                [id]: { action: 'modified', pending: true }
+            });
         }
+        // If already tracked (e.g., 'added' from setFlowJson), keep that status
         if ($currentEditor && $currentEditor.type === 'script' && $currentEditor.stepId === id) {
             $currentEditor.editor.setCode(code);
         }
@@ -143,7 +121,7 @@ const flowHelpers = {
         return await onTestFlow?.(conversationId);
     },
     getLintErrors: async (moduleId) => {
-        const module = getModule(moduleId);
+        const module = findModuleInFlow(flowStore.val.value, moduleId) ?? undefined;
         if (!module || module.value.type !== 'rawscript') {
             return { errorCount: 0, warningCount: 0, errors: [], warnings: [] };
         }
@@ -164,9 +142,13 @@ const flowHelpers = {
         }
         return { errorCount: 0, warningCount: 0, errors: [], warnings: [] };
     },
-    setFlowJson: async (modules, schema) => {
+    setFlowJson: async ({ modules, schema, preprocessorModule, failureModule, groups }) => {
         try {
-            if (modules || schema) {
+            if (modules !== undefined ||
+                schema !== undefined ||
+                preprocessorModule !== undefined ||
+                failureModule !== undefined ||
+                groups !== undefined) {
                 // Take snapshot of current flowStore and set as beforeFlow
                 if (!diffManager?.hasPendingChanges) {
                     const snapshot = $state.snapshot(flowStore).val;
@@ -174,21 +156,18 @@ const flowHelpers = {
                     diffManager?.setEditMode(true);
                 }
             }
-            if (modules) {
-                // Restore inline script references back to full content
-                const restoredModules = restoreInlineScriptReferences(modules);
-                // Directly modify flowStore (immediate effect)
-                flowStore.val.value.modules = restoredModules;
-            }
-            // Update schema if provided
-            if (schema !== undefined) {
-                flowStore.val.schema = schema;
-            }
+            const result = applyFlowJsonUpdate(flowStore.val, inlineScriptSession, {
+                modules,
+                schema,
+                preprocessorModule,
+                failureModule,
+                groups
+            });
             // Refresh the state store to update UI
             refreshStateStore(flowStore);
+            return result;
         }
         catch (error) {
-            console.error('setFlowJson error:', error);
             throw new Error(`Failed to parse or apply JSON: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
@@ -198,7 +177,9 @@ $effect(() => {
         selectedId &&
         diffManager?.moduleActions[selectedId]?.pending &&
         $currentEditor.editor.getAiChatEditorHandler()) {
-        const moduleLastSnapshot = getModule(selectedId, diffManager.beforeFlow);
+        const moduleLastSnapshot = diffManager.beforeFlow
+            ? (findModuleInFlow(diffManager.beforeFlow.value, selectedId) ?? undefined)
+            : undefined;
         const content = moduleLastSnapshot?.value.type === 'rawscript' ? moduleLastSnapshot.value.content : '';
         if (content.length > 0) {
             untrack(() => $currentEditor.editor.reviewAppliedCode(content, {

package/package/components/copilot/chat/flow/core.d.ts

@@ -3,6 +3,15 @@ import type { ChatCompletionSystemMessageParam, ChatCompletionUserMessageParam }
 import { type Tool, type ScriptLintResult } from '../shared';
 import type { ContextElement } from '../context';
 import type { ExtendedOpenFlow } from '../../../flows/types';
+import { type InlineScriptSession } from './inlineScriptsUtils';
+import { type FlowGroup, type FlowJsonUpdateResult } from './helperUtils';
+type FlowJsonUpdate = {
+    modules?: FlowModule[];
+    schema?: Record<string, any> | null;
+    preprocessorModule?: FlowModule | null;
+    failureModule?: FlowModule | null;
+    groups?: FlowGroup[] | null;
+};
 /**
  * Helper interface for AI chat flow operations
  *
@@ -14,13 +23,14 @@ export interface FlowAIChatHelpers {
         flow: ExtendedOpenFlow;
         selectedId: string;
     };
-    getModules: (id?: string) => FlowModule[];
+    getRootModules: () => FlowModule[];
+    inlineScriptSession: InlineScriptSession;
     /** Set the before flow snapshot */
     setSnapshot: (snapshot: ExtendedOpenFlow) => void;
     /** Revert the entire flow to a previous snapshot */
     revertToSnapshot: (snapshot?: ExtendedOpenFlow) => void;
     setCode: (id: string, code: string) => Promise<void>;
-    setFlowJson: (modules: FlowModule[] | undefined, schema: Record<string, any> | undefined) => Promise<void>;
+    setFlowJson: (update: FlowJsonUpdate) => Promise<FlowJsonUpdateResult>;
     getFlowInputsSchema: () => Promise<Record<string, any>>;
     /** Update exprsToSet store for InputTransformForm components (only if module is selected) */
     updateExprsToSet: (id: string, inputTransforms: Record<string, InputTransform>) => void;
@@ -42,4 +52,5 @@ export declare function prepareFlowSystemMessage(customPrompt?: string): ChatCom
 export declare function prepareFlowUserMessage(instructions: string, flowAndSelectedId?: {
     flow: ExtendedOpenFlow;
     selectedId: string;
-}, selectedContext?: ContextElement[]): ChatCompletionUserMessageParam;
+}, selectedContext?: ContextElement[], inlineScriptSession?: InlineScriptSession): ChatCompletionUserMessageParam;
+export {};