breaking-brake
diff --git a/Collapse file
‎src/webview/src/App.tsx‎
Copy file name to clipboardExpand all lines: src/webview/src/App.tsx
+67-2Lines changed: 67 additions & 2 deletions b/Collapse file
‎src/webview/src/App.tsx‎
Copy file name to clipboardExpand all lines: src/webview/src/App.tsx
+67-2Lines changed: 67 additions & 2 deletions
@@ -14,7 +14,7 @@ import type {
   Workflow,
 } from '@shared/types/messages';
 import type React from 'react';
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { ProcessingOverlay } from './components/common/ProcessingOverlay';
 import { SimpleOverlay } from './components/common/SimpleOverlay';
 import { ConfirmDialog } from './components/dialogs/ConfirmDialog';
@@ -35,7 +35,7 @@ import { useCollapsiblePanel } from './hooks/useCollapsiblePanel';
 import { useIsCompactMode } from './hooks/useWindowWidth';
 import { useTranslation } from './i18n/i18n-context';
 import { vscode } from './main';
-import { deserializeWorkflow } from './services/workflow-service';
+import { deserializeWorkflow, serializeWorkflow } from './services/workflow-service';
 import { useRefinementStore } from './stores/refinement-store';
 import { useWorkflowStore } from './stores/workflow-store';
 import type { RefinementChatState } from './types/refinement-chat-state';
@@ -47,10 +47,16 @@ const App: React.FC = () => {
     confirmDeleteNodes,
     cancelDeleteNodes,
     activeWorkflow,
+    nodes,
+    edges,
+    workflowName,
+    workflowDescription,
+    subAgentFlows,
     setNodes,
     setEdges,
     setWorkflowName,
     setActiveWorkflow,
+    updateActiveWorkflowMetadata,
     isPropertyOverlayOpen,
     selectedNodeId,
     activeSubAgentFlowId,
@@ -90,6 +96,65 @@ const App: React.FC = () => {
     refinementStore.closeChat();
   }, [refinementStore]);
 
+  // Issue #384: Sync conversation history from refinement-store to workflow-store
+  // This ensures that conversation history is preserved when the refinement panel
+  // is collapsed/expanded, and is included when the workflow is saved.
+  const prevHistoryRef = useRef(refinementStore.conversationHistory);
+  useEffect(() => {
+    const conversationHistory = refinementStore.conversationHistory;
+
+    // Skip if history hasn't changed (same reference)
+    if (conversationHistory === prevHistoryRef.current) {
+      return;
+    }
+    prevHistoryRef.current = conversationHistory;
+
+    // Only sync if we have both an activeWorkflow and conversation history
+    if (activeWorkflow && conversationHistory) {
+      updateActiveWorkflowMetadata({ conversationHistory });
+    }
+  }, [refinementStore.conversationHistory, activeWorkflow, updateActiveWorkflowMetadata]);
+
+  // Issue #388: Sync activeWorkflow when canvas (nodes/edges) changes
+  // This ensures that AI refinement always sees the current canvas state,
+  // not a stale snapshot from when the panel was opened.
+  // Note: Use updateActiveWorkflowMetadata (not setActiveWorkflow) to avoid
+  // updating nodes/edges which would cause an infinite loop.
+  const prevNodesRef = useRef(nodes);
+  const prevEdgesRef = useRef(edges);
+  useEffect(() => {
+    // Skip if nodes/edges haven't changed (same reference)
+    if (nodes === prevNodesRef.current && edges === prevEdgesRef.current) {
+      return;
+    }
+    prevNodesRef.current = nodes;
+    prevEdgesRef.current = edges;
+
+    // Only sync if we have an activeWorkflow and nodes (non-empty canvas)
+    if (activeWorkflow && nodes.length > 0) {
+      const workflow = serializeWorkflow(
+        nodes,
+        edges,
+        workflowName || 'Untitled',
+        workflowDescription || undefined,
+        activeWorkflow.conversationHistory,
+        subAgentFlows
+      );
+      // Preserve original ID
+      workflow.id = activeWorkflow.id;
+      // Update only activeWorkflow without touching nodes/edges
+      updateActiveWorkflowMetadata(workflow);
+    }
+  }, [
+    nodes,
+    edges,
+    workflowName,
+    workflowDescription,
+    subAgentFlows,
+    activeWorkflow,
+    updateActiveWorkflowMetadata,
+  ]);
+
   // App mode: null = loading, 'edit' = full editor, 'preview' = read-only preview
   // Start with null to prevent flashing the wrong UI
   const [mode, setMode] = useState<'edit' | 'preview' | null>(null);