mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-09-12 08:05:44 +00:00
* refactor: make flow chat code edits explicit * refactor: centralize flow tree lookups Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor: simplify flow chat tree mutations Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor: reuse flow tree lookup in schema map Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor: remove flow lookup alias Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor: reuse flow tree in previous results Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor: reuse canonical flow module lookup * fix: align rebased flow helpers Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * docs: remove flow chat cleanup plan Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor: remove flow chat helper wrappers Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: preserve non-flowmodule AI agent tools in skeleton and previous_result Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor: consolidate flow module ID collectors into flowTree Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: search full flow tree in test_run_step to find special modules Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: recurse into aiagent tools in collectAllFlowModuleIds Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
500 lines
15 KiB
TypeScript
500 lines
15 KiB
TypeScript
/**
|
|
* Flow Diff Manager
|
|
*
|
|
* A reusable store for managing flow diff state, module actions, and accept/reject operations.
|
|
* This decouples diff management from specific UI components (like AI chat) and makes it
|
|
* available for any use case that needs to track and apply flow changes.
|
|
*/
|
|
|
|
import type { ExtendedOpenFlow } from './types'
|
|
import type { FlowModule, FlowValue } from '$lib/gen'
|
|
import type { ModuleActionInfo } from './flowDiff'
|
|
import {
|
|
buildFlowTimeline,
|
|
insertModuleIntoFlow,
|
|
locationsEqual,
|
|
DUPLICATE_MODULE_PREFIX,
|
|
NEW_MODULE_PREFIX
|
|
} from './flowDiff'
|
|
import {
|
|
findModuleInFlow,
|
|
findModuleParent,
|
|
removeFlowModule,
|
|
replaceFlowModule
|
|
} from './flowTree'
|
|
import { refreshStateStore } from '$lib/svelte5Utils.svelte'
|
|
import type { StateStore } from '$lib/utils'
|
|
import type DiffDrawer from '../DiffDrawer.svelte'
|
|
import { SPECIAL_MODULE_IDS } from '../copilot/chat/shared'
|
|
|
|
export type FlowDiffManager = ReturnType<typeof createFlowDiffManager>
|
|
|
|
/**
|
|
* Options for computing diff
|
|
*/
|
|
export type ComputeDiffOptions = {
|
|
/** Mark all changes as pending (requiring user approval) */
|
|
markAsPending?: boolean
|
|
/** Mark removed modules as shadowed instead of removed (for visualization) */
|
|
markRemovedAsShadowed?: boolean
|
|
}
|
|
|
|
/**
|
|
* Creates a flow diff manager instance
|
|
*/
|
|
function createSkeletonModule(module: FlowModule): FlowModule {
|
|
const clone = JSON.parse(JSON.stringify(module))
|
|
if (clone.value.type === 'forloopflow' || clone.value.type === 'whileloopflow') {
|
|
clone.value.modules = []
|
|
} else if (clone.value.type === 'branchone') {
|
|
clone.value.default = []
|
|
clone.value.branches.forEach((b: any) => (b.modules = []))
|
|
} else if (clone.value.type === 'branchall') {
|
|
clone.value.branches.forEach((b: any) => (b.modules = []))
|
|
} else if (clone.value.type === 'aiagent') {
|
|
clone.value.tools = (clone.value.tools ?? []).filter(
|
|
(t: any) => t.value?.tool_type && t.value.tool_type !== 'flowmodule'
|
|
)
|
|
}
|
|
return clone
|
|
}
|
|
|
|
export function createFlowDiffManager({ testMode = false } = {}) {
|
|
// State: snapshot of flow before changes
|
|
let beforeFlow = $state<ExtendedOpenFlow | undefined>(undefined)
|
|
|
|
// State: current flow (after changes)
|
|
let currentFlow = $state<FlowValue | undefined>(undefined)
|
|
|
|
// State: merged flow containing both original and modified/removed modules
|
|
let mergedFlow = $state<FlowValue | undefined>(undefined)
|
|
|
|
// State: current input schema
|
|
let currentInputSchema = $state<Record<string, any> | undefined>(undefined)
|
|
|
|
// State: whether to mark removed modules as shadowed (for side-by-side view)
|
|
let markRemovedAsShadowed = $state(false)
|
|
|
|
// State: whether to allow accepting/rejecting changes to the flow
|
|
let editMode = $state(false)
|
|
|
|
// State: module actions tracking changes (added/modified/removed/shadowed)
|
|
let moduleActions = $state<Record<string, ModuleActionInfo>>({})
|
|
|
|
// Reference to DiffDrawer component for showing module diffs (not reactive)
|
|
let diffDrawer: DiffDrawer | undefined = undefined
|
|
|
|
// Derived: whether there are any pending changes
|
|
const hasPendingChanges = $derived(Object.values(moduleActions).some((info) => info.pending))
|
|
|
|
// Auto-compute diff when beforeFlow or currentFlow changes
|
|
$effect(() => {
|
|
if (beforeFlow && currentFlow) {
|
|
const timeline = buildFlowTimeline(beforeFlow.value, currentFlow, {
|
|
markRemovedAsShadowed: markRemovedAsShadowed,
|
|
markAsPending: editMode
|
|
})
|
|
|
|
// Store the merged flow for rendering
|
|
mergedFlow = timeline.mergedFlow
|
|
|
|
// Update module actions
|
|
const newActions = { ...timeline.afterActions }
|
|
|
|
// Check for input schema changes
|
|
if (beforeFlow.schema && currentInputSchema) {
|
|
const schemaChanged =
|
|
JSON.stringify(beforeFlow.schema) !== JSON.stringify(currentInputSchema)
|
|
if (schemaChanged) {
|
|
newActions[SPECIAL_MODULE_IDS.INPUT] = {
|
|
action: 'modified',
|
|
pending: editMode
|
|
}
|
|
}
|
|
}
|
|
|
|
updateModuleActions(newActions)
|
|
|
|
// If no more actions, clear the snapshot (exit diff mode)
|
|
if (Object.keys(newActions).length === 0 && !testMode) {
|
|
clearSnapshot()
|
|
}
|
|
} else if (!beforeFlow) {
|
|
// Clear module actions and merged flow when no snapshot
|
|
mergedFlow = undefined
|
|
updateModuleActions({})
|
|
}
|
|
})
|
|
|
|
/**
|
|
* Helper to update moduleActions and notify listeners
|
|
*/
|
|
function updateModuleActions(newActions: Record<string, ModuleActionInfo>) {
|
|
moduleActions = newActions
|
|
}
|
|
|
|
/**
|
|
* Set the before flow snapshot for diff computation
|
|
*/
|
|
function setBeforeFlow(flow: ExtendedOpenFlow | undefined) {
|
|
beforeFlow = flow
|
|
}
|
|
|
|
/**
|
|
* Set the current flow state for diff computation
|
|
*/
|
|
function setCurrentFlow(flow: FlowValue | undefined) {
|
|
currentFlow = flow
|
|
}
|
|
|
|
/**
|
|
* Set the current input schema for tracking schema changes
|
|
*/
|
|
function setCurrentInputSchema(schema: Record<string, any> | undefined) {
|
|
currentInputSchema = schema
|
|
}
|
|
|
|
/**
|
|
* Set whether to mark removed modules as shadowed (for side-by-side view)
|
|
*/
|
|
function setMarkRemovedAsShadowed(value: boolean) {
|
|
markRemovedAsShadowed = value
|
|
}
|
|
|
|
/**
|
|
* Set whether to edit the flow
|
|
*/
|
|
function setEditMode(value: boolean) {
|
|
editMode = value
|
|
}
|
|
|
|
/**
|
|
* Clear the snapshot and all module actions
|
|
*/
|
|
function clearSnapshot() {
|
|
beforeFlow = undefined
|
|
currentFlow = undefined
|
|
mergedFlow = undefined
|
|
currentInputSchema = undefined
|
|
updateModuleActions({})
|
|
}
|
|
|
|
/**
|
|
* Set module actions directly (useful when actions are computed elsewhere)
|
|
*/
|
|
function setModuleActions(actions: Record<string, ModuleActionInfo>) {
|
|
updateModuleActions(actions)
|
|
}
|
|
|
|
/**
|
|
* Internal helper to delete a module from a flow object
|
|
* Returns true if the module was found and deleted, false otherwise
|
|
*/
|
|
function deleteModuleInternal(id: string, flow: ExtendedOpenFlow): boolean {
|
|
return removeFlowModule(flow.value, id) !== null
|
|
}
|
|
|
|
/**
|
|
* Helper to delete a module from the flow
|
|
* Returns true if the module was found and deleted, false otherwise
|
|
*/
|
|
function deleteModuleFromFlow(
|
|
id: string,
|
|
flowStore: StateStore<ExtendedOpenFlow>,
|
|
selectNextIdFn?: (id: string) => void
|
|
): boolean {
|
|
selectNextIdFn?.(id)
|
|
const deleted = deleteModuleInternal(id, flowStore.val)
|
|
if (deleted) {
|
|
refreshStateStore(flowStore)
|
|
}
|
|
return deleted
|
|
}
|
|
|
|
/**
|
|
* Accept a module action (keep the changes)
|
|
* Removes the action from tracking after acceptance
|
|
*/
|
|
function acceptModule(id: string, flowStore?: StateStore<ExtendedOpenFlow>, asSkeleton = false) {
|
|
if (!beforeFlow || !currentFlow) {
|
|
console.warn('Cannot accept module without beforeFlow and currentFlow snapshots')
|
|
return
|
|
}
|
|
|
|
const info = moduleActions[id]
|
|
if (!info) return
|
|
|
|
const actualId = id.startsWith(DUPLICATE_MODULE_PREFIX)
|
|
? id.substring(DUPLICATE_MODULE_PREFIX.length)
|
|
: id
|
|
|
|
if (id === SPECIAL_MODULE_IDS.INPUT) {
|
|
// Accept input schema changes: update beforeFlow to match currentInputSchema
|
|
if (beforeFlow.schema && currentInputSchema) {
|
|
beforeFlow.schema = JSON.parse(JSON.stringify(currentInputSchema))
|
|
}
|
|
} else if (info.action === 'removed') {
|
|
// Removed in after: Remove from beforeFlow
|
|
deleteModuleInternal(actualId, beforeFlow)
|
|
} else if (info.action === 'added') {
|
|
// Added in after: Add to beforeFlow
|
|
|
|
// Check if parent exists in beforeFlow; if not, recursively accept parent first.
|
|
const parentLoc = findModuleParent(currentFlow, actualId)
|
|
if (
|
|
parentLoc &&
|
|
parentLoc.type !== 'root' &&
|
|
parentLoc.type !== 'failure' &&
|
|
parentLoc.type !== 'preprocessor'
|
|
) {
|
|
const parentInBefore = findModuleInFlow(beforeFlow.value, parentLoc.parentId) ?? undefined
|
|
if (!parentInBefore) {
|
|
// Parent is missing in beforeFlow. It must be pending acceptance.
|
|
// Accept as skeleton to avoid auto-accepting all siblings.
|
|
acceptModule(parentLoc.parentId, flowStore, true)
|
|
}
|
|
}
|
|
|
|
// Use insertModuleIntoFlow targeting beforeFlow, sourcing position from currentFlow
|
|
let module = findModuleInFlow(currentFlow, actualId) ?? undefined
|
|
|
|
if (module) {
|
|
// Check if module already exists in beforeFlow (could be a skeleton from earlier acceptance)
|
|
const existingModule = findModuleInFlow(beforeFlow.value, actualId) ?? undefined
|
|
|
|
if (existingModule) {
|
|
// Module exists in beforeFlow - check if it's in the same location
|
|
const beforeLocation = findModuleParent(beforeFlow.value, actualId)
|
|
const afterLocation = findModuleParent(currentFlow, actualId)
|
|
|
|
// Compare locations - if different, this is a move and we need to insert at new location
|
|
const sameLocation = locationsEqual(beforeLocation, afterLocation)
|
|
|
|
if (sameLocation) {
|
|
// Module is in the same location, update it in-place
|
|
const moduleToApply = asSkeleton ? createSkeletonModule(module) : module
|
|
replaceFlowModule(existingModule, $state.snapshot(moduleToApply))
|
|
} else {
|
|
// Module is being moved - insert at new location (the old copy will be removed when old__id is accepted)
|
|
const moduleToInsert = asSkeleton ? createSkeletonModule(module) : module
|
|
insertModuleIntoFlow(
|
|
beforeFlow.value,
|
|
$state.snapshot(moduleToInsert),
|
|
currentFlow,
|
|
actualId
|
|
)
|
|
}
|
|
} else {
|
|
// Module doesn't exist, insert it
|
|
const moduleToInsert = asSkeleton ? createSkeletonModule(module) : module
|
|
insertModuleIntoFlow(
|
|
beforeFlow.value,
|
|
$state.snapshot(moduleToInsert),
|
|
currentFlow,
|
|
actualId
|
|
)
|
|
}
|
|
}
|
|
} else if (info.action === 'modified') {
|
|
// Modified: Apply modifications to beforeFlow module
|
|
const beforeModule = findModuleInFlow(beforeFlow.value, actualId) ?? undefined
|
|
const afterModule = findModuleInFlow(currentFlow, actualId) ?? undefined
|
|
|
|
if (beforeModule && afterModule) {
|
|
replaceFlowModule(beforeModule, $state.snapshot(afterModule))
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Reject a module action (revert the changes)
|
|
* Removes the action from tracking after rejection
|
|
*/
|
|
function rejectModule(id: string, flowStore?: StateStore<ExtendedOpenFlow>) {
|
|
if (!beforeFlow) {
|
|
throw new Error('Cannot reject module without a beforeFlow snapshot')
|
|
}
|
|
|
|
const actualId = id.startsWith(DUPLICATE_MODULE_PREFIX)
|
|
? id.substring(DUPLICATE_MODULE_PREFIX.length)
|
|
: id
|
|
const info = moduleActions[id]
|
|
|
|
if (!info) return
|
|
|
|
// Only perform revert operations if flowStore is provided
|
|
if (flowStore) {
|
|
if (id === SPECIAL_MODULE_IDS.INPUT) {
|
|
// Revert input schema changes
|
|
flowStore.val.schema = beforeFlow.schema
|
|
currentInputSchema = flowStore.val.schema
|
|
} else if (info.action === 'added') {
|
|
// Added in after: Remove from flowStore (currentFlow)
|
|
// deleteModuleFromFlow handles the case where the module was already deleted (e.g., with its parent)
|
|
deleteModuleFromFlow(actualId, flowStore)
|
|
} else if (info.action === 'removed') {
|
|
// Removed in after: Restore to flowStore (currentFlow)
|
|
// Source from beforeFlow
|
|
const oldModule = findModuleInFlow(beforeFlow.value, actualId) ?? undefined
|
|
if (oldModule) {
|
|
// For type changes (old__ prefix), rename the new module to avoid ID conflict
|
|
if (id.startsWith(DUPLICATE_MODULE_PREFIX)) {
|
|
const existingNew = findModuleInFlow(flowStore.val.value, actualId) ?? undefined
|
|
if (existingNew) {
|
|
existingNew.id = `${NEW_MODULE_PREFIX}${actualId}`
|
|
}
|
|
}
|
|
insertModuleIntoFlow(
|
|
flowStore.val.value,
|
|
$state.snapshot(oldModule),
|
|
beforeFlow.value,
|
|
actualId
|
|
)
|
|
}
|
|
refreshStateStore(flowStore)
|
|
} else if (info.action === 'modified') {
|
|
// Modified: Revert modifications in flowStore (currentFlow)
|
|
const oldModule = findModuleInFlow(beforeFlow.value, actualId) ?? undefined
|
|
const newModule = findModuleInFlow(flowStore.val.value, actualId) ?? undefined
|
|
|
|
if (oldModule && newModule) {
|
|
replaceFlowModule(newModule, $state.snapshot(oldModule))
|
|
}
|
|
refreshStateStore(flowStore)
|
|
}
|
|
|
|
currentFlow = flowStore.val.value
|
|
}
|
|
|
|
// Note: The $effect will automatically recompute the diff, clearing the action
|
|
// since flowStore (currentFlow) now matches beforeFlow for this module.
|
|
}
|
|
|
|
/**
|
|
* Accept all pending module actions
|
|
*/
|
|
function acceptAll(flowStore?: StateStore<ExtendedOpenFlow>) {
|
|
const ids = Object.keys(moduleActions)
|
|
for (const id of ids) {
|
|
if (moduleActions[id]?.pending) {
|
|
acceptModule(id, flowStore)
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Reject all pending module actions (in reverse order for nested modules)
|
|
*/
|
|
function rejectAll(flowStore?: StateStore<ExtendedOpenFlow>) {
|
|
const ids = Object.keys(moduleActions)
|
|
// Process in reverse to handle nested modules correctly
|
|
for (let i = ids.length - 1; i >= 0; i--) {
|
|
if (moduleActions[ids[i]]?.pending) {
|
|
rejectModule(ids[i], flowStore)
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Revert the entire flow to the snapshot
|
|
* @param flowStore - The flow store to update
|
|
* @param snapshot - Optional specific snapshot to revert to (defaults to beforeFlow)
|
|
*/
|
|
function revertToSnapshot(flowStore: StateStore<ExtendedOpenFlow>, snapshot?: ExtendedOpenFlow) {
|
|
const targetSnapshot = snapshot ?? beforeFlow
|
|
if (!targetSnapshot) return
|
|
|
|
flowStore.val = targetSnapshot
|
|
refreshStateStore(flowStore)
|
|
clearSnapshot()
|
|
}
|
|
|
|
/**
|
|
* Set the DiffDrawer instance for showing module diffs
|
|
*/
|
|
function setDiffDrawer(drawer: DiffDrawer | undefined) {
|
|
diffDrawer = drawer
|
|
}
|
|
|
|
/**
|
|
* Show diff for a specific module or Input schema
|
|
*/
|
|
function showModuleDiff(moduleId: string) {
|
|
if (!diffDrawer || !beforeFlow) return
|
|
|
|
if (moduleId === SPECIAL_MODULE_IDS.INPUT) {
|
|
// Show input schema diff
|
|
diffDrawer.openDrawer()
|
|
diffDrawer.setDiff({
|
|
mode: 'simple',
|
|
title: 'Flow Input Schema Diff',
|
|
original: { schema: beforeFlow.schema ?? {} },
|
|
current: { schema: currentInputSchema ?? {} }
|
|
})
|
|
} else {
|
|
// Show module diff
|
|
const beforeModule = findModuleInFlow(beforeFlow.value, moduleId) ?? undefined
|
|
const afterModule = currentFlow
|
|
? (findModuleInFlow(currentFlow, moduleId) ?? undefined)
|
|
: undefined
|
|
|
|
if (beforeModule && afterModule) {
|
|
diffDrawer.openDrawer()
|
|
diffDrawer.setDiff({
|
|
mode: 'simple',
|
|
title: `Module Diff: ${moduleId}`,
|
|
original: beforeModule,
|
|
current: afterModule
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
return {
|
|
// State accessors
|
|
get beforeFlow() {
|
|
return beforeFlow
|
|
},
|
|
get currentFlow() {
|
|
return currentFlow
|
|
},
|
|
get mergedFlow() {
|
|
return mergedFlow
|
|
},
|
|
get moduleActions() {
|
|
return moduleActions
|
|
},
|
|
get hasPendingChanges() {
|
|
return hasPendingChanges
|
|
},
|
|
get currentInputSchema() {
|
|
return currentInputSchema
|
|
},
|
|
get editModeEnabled() {
|
|
return editMode
|
|
},
|
|
|
|
// Snapshot management
|
|
setBeforeFlow,
|
|
setCurrentFlow,
|
|
setCurrentInputSchema,
|
|
setMarkRemovedAsShadowed,
|
|
setEditMode,
|
|
clearSnapshot,
|
|
|
|
// Module actions management
|
|
setModuleActions,
|
|
|
|
// Accept/reject operations
|
|
acceptModule,
|
|
rejectModule,
|
|
acceptAll,
|
|
rejectAll,
|
|
revertToSnapshot,
|
|
|
|
// Diff drawer management
|
|
setDiffDrawer,
|
|
showModuleDiff
|
|
}
|
|
}
|