diff --git a/frontend/src/components/tree-editor/FlowCanvas.tsx b/frontend/src/components/tree-editor/FlowCanvas.tsx
index 5a467c11..17e159ed 100644
--- a/frontend/src/components/tree-editor/FlowCanvas.tsx
+++ b/frontend/src/components/tree-editor/FlowCanvas.tsx
@@ -31,9 +31,10 @@ interface FlowCanvasProps {
   selectedNodeId: string | null
   onNodeSelect: (nodeId: string | null) => void
   onSelectAnswerType: (nodeId: string, type: 'decision' | 'action' | 'solution') => void
+  onNodeContextMenu?: (e: React.MouseEvent, nodeId: string) => void
 }
 
-function FlowCanvasInner({ selectedNodeId, onNodeSelect, onSelectAnswerType }: FlowCanvasProps) {
+function FlowCanvasInner({ selectedNodeId, onNodeSelect, onSelectAnswerType, onNodeContextMenu }: FlowCanvasProps) {
   const { fitView, setCenter } = useReactFlow()
   const { nodes: layoutNodes, edges: layoutEdges, collapsedNodeIds, toggleCollapse, onNodesMeasured } = useTreeLayout()
   const [minimapVisible, setMinimapVisible] = useState(true)
@@ -46,7 +47,7 @@ function FlowCanvasInner({ selectedNodeId, onNodeSelect, onSelectAnswerType }: F
         return {
           ...n,
           selected: n.id === selectedNodeId,
-          data: { ...data, onToggleCollapse: toggleCollapse },
+          data: { ...data, onToggleCollapse: toggleCollapse, onContextMenu: onNodeContextMenu },
         }
       }
       if (n.type === 'answerStub') {
@@ -59,7 +60,7 @@ function FlowCanvasInner({ selectedNodeId, onNodeSelect, onSelectAnswerType }: F
       }
       return n
     })
-  }, [layoutNodes, selectedNodeId, toggleCollapse, onSelectAnswerType])
+  }, [layoutNodes, selectedNodeId, toggleCollapse, onSelectAnswerType, onNodeContextMenu])
 
   const [nodes, setNodes, onNodesChange] = useNodesState(nodesWithCallbacks)
   const [edges, setEdges, onEdgesChange] = useEdgesState(layoutEdges)
diff --git a/frontend/src/components/tree-editor/FlowCanvasNode.tsx b/frontend/src/components/tree-editor/FlowCanvasNode.tsx
index 096591dd..38800d12 100644
--- a/frontend/src/components/tree-editor/FlowCanvasNode.tsx
+++ b/frontend/src/components/tree-editor/FlowCanvasNode.tsx
@@ -41,10 +41,14 @@ export interface FlowCanvasNodeData {
   hasValidationErrors: boolean
   isNew: boolean
   onToggleCollapse: (nodeId: string) => void
+  onContextMenu?: (e: React.MouseEvent, nodeId: string) => void
+  onAcceptSuggestion?: (nodeId: string) => void
+  onDismissSuggestion?: (nodeId: string) => void
 }
 
 function FlowCanvasNodeComponent({ data, selected }: NodeProps) {
-  const { node, hasChildren, isCollapsed, hasValidationErrors, isNew, onToggleCollapse } = data as unknown as FlowCanvasNodeData
+  const { node, hasChildren, isCollapsed, hasValidationErrors, isNew, onToggleCollapse, onContextMenu, onAcceptSuggestion, onDismissSuggestion } = data as unknown as FlowCanvasNodeData
+  const isGhost = !!(node as unknown as Record<string, unknown>)._suggestion
   const nodeType = node.type as Exclude<NodeType, 'answer'>
   const config = NODE_TYPE_CONFIG[nodeType] ?? NODE_TYPE_CONFIG.decision
   const Icon = config.icon
@@ -61,10 +65,12 @@ function FlowCanvasNodeComponent({ data, selected }: NodeProps) {
       <Handle type="target" position={Position.Top} className="!bg-border !w-2 !h-2 !border-0" />
 
       <div
+        onContextMenu={(e) => onContextMenu?.(e, node.id)}
         className={cn(
           'w-[280px] rounded-xl border border-border bg-card shadow-sm cursor-pointer transition-all',
           config.borderClass,
-          selected && 'ring-1 ring-primary shadow-md'
+          selected && 'ring-1 ring-primary shadow-md',
+          isGhost && 'border-dashed !border-primary/40 opacity-60'
         )}
       >
         {/* Header */}
@@ -142,6 +148,30 @@ function FlowCanvasNodeComponent({ data, selected }: NodeProps) {
             </button>
           </div>
         )}
+
+        {/* Ghost node accept/dismiss overlay */}
+        {isGhost && (
+          <div className="mt-2 flex gap-2 border-t border-border/50 pt-2 px-3 pb-2">
+            <button
+              onClick={(e) => {
+                e.stopPropagation()
+                onAcceptSuggestion?.(node.id)
+              }}
+              className="flex-1 rounded-md bg-emerald-500/20 px-2 py-1 text-xs text-emerald-400 hover:bg-emerald-500/30 transition-colors"
+            >
+              Accept
+            </button>
+            <button
+              onClick={(e) => {
+                e.stopPropagation()
+                onDismissSuggestion?.(node.id)
+              }}
+              className="flex-1 rounded-md bg-rose-500/20 px-2 py-1 text-xs text-rose-400 hover:bg-rose-500/30 transition-colors"
+            >
+              Dismiss
+            </button>
+          </div>
+        )}
       </div>
 
       {/* Source handle at bottom */}
diff --git a/frontend/src/components/tree-editor/TreeEditorLayout.tsx b/frontend/src/components/tree-editor/TreeEditorLayout.tsx
index 94221c9d..be26846f 100644
--- a/frontend/src/components/tree-editor/TreeEditorLayout.tsx
+++ b/frontend/src/components/tree-editor/TreeEditorLayout.tsx
@@ -19,6 +19,7 @@ interface TreeEditorLayoutProps {
   editingNodeId: string | null
   onNodeSelect: (nodeId: string | null) => void
   onSelectAnswerType: (nodeId: string, type: 'decision' | 'action' | 'solution') => void
+  onNodeContextMenu?: (e: React.MouseEvent, nodeId: string) => void
 }
 
 export function TreeEditorLayout({
@@ -28,6 +29,7 @@ export function TreeEditorLayout({
   editingNodeId,
   onNodeSelect,
   onSelectAnswerType,
+  onNodeContextMenu,
 }: TreeEditorLayoutProps) {
   const editorMode = useTreeEditorStore(s => s.editorMode)
 
@@ -70,6 +72,7 @@ export function TreeEditorLayout({
               selectedNodeId={editingNodeId}
               onNodeSelect={onNodeSelect}
               onSelectAnswerType={onSelectAnswerType}
+              onNodeContextMenu={onNodeContextMenu}
             />
           </div>
 
diff --git a/frontend/src/pages/TreeEditorPage.tsx b/frontend/src/pages/TreeEditorPage.tsx
index cc0a44fc..422413c9 100644
--- a/frontend/src/pages/TreeEditorPage.tsx
+++ b/frontend/src/pages/TreeEditorPage.tsx
@@ -1,7 +1,7 @@
-import { useEffect, useState, useCallback } from 'react'
+import { useEffect, useState, useCallback, useRef } from 'react'
 import { useParams, useNavigate, useBlocker } from 'react-router-dom'
 import { useStore } from 'zustand'
-import { Undo2, Redo2, Save, CheckCircle2, Monitor, FileText, Code2, LayoutList, BarChart3, Settings, Download } from 'lucide-react'
+import { Undo2, Redo2, Save, CheckCircle2, Monitor, FileText, Code2, LayoutList, BarChart3, Settings, Download, Sparkles } from 'lucide-react'
 import { getMonacoEditor } from '@/components/tree-editor/code-mode'
 import { treesApi } from '@/api/trees'
 import { treeMarkdownApi } from '@/api/treeMarkdown'
@@ -17,6 +17,10 @@ import { cn, safeGetItem } from '@/lib/utils'
 import { toast } from '@/lib/toast'
 import { FlowAnalyticsPanel } from '@/components/analytics/FlowAnalyticsPanel'
 import { ExportFlowModal } from '@/components/library/ExportFlowModal'
+import { EditorAIPanel } from '@/components/editor-ai/EditorAIPanel'
+import { ContextMenu } from '@/components/common/ContextMenu'
+import { useEditorAI } from '@/hooks/useEditorAI'
+import { findNodeInTree } from '@/store/treeEditorStore'
 
 /** Recursively check if any node in the tree has type 'answer' */
 function hasAnswerNodes(node: TreeStructure): boolean {
@@ -37,6 +41,7 @@ export function TreeEditorPage() {
     isSaving,
     validationErrors,
     editorMode,
+    treeStructure,
     initNewTree,
     loadTree,
     loadDraft,
@@ -49,7 +54,9 @@ export function TreeEditorPage() {
     setSaving,
     selectNode,
     updateNode,
+    deleteNode,
     setEditorMode,
+    getAllNodeIds,
   } = useTreeEditorStore()
 
   // Access undo/redo from temporal store
@@ -74,6 +81,22 @@ export function TreeEditorPage() {
     return () => window.removeEventListener('resize', check)
   }, [])
 
+  // AI Assist panel
+  const editorAI = useEditorAI({
+    flowType: 'troubleshooting',
+    treeId: id,
+  })
+
+  const previousEditingNodeRef = useRef<string | null>(null)
+
+  const handleAIPanelClose = useCallback(() => {
+    editorAI.closePanel()
+    if (previousEditingNodeRef.current) {
+      setEditingNodeId(previousEditingNodeRef.current)
+      previousEditingNodeRef.current = null
+    }
+  }, [editorAI])
+
   // Calculate if there are blocking errors
   const hasBlockingErrors = validationErrors.some(e => e.severity === 'error')
 
@@ -705,6 +728,31 @@ export function TreeEditorPage() {
             </button>
           )}
 
+          {/* AI Assist toggle */}
+          <button
+            onClick={() => {
+              if (editorAI.isOpen) {
+                handleAIPanelClose()
+              } else {
+                if (editingNodeId) {
+                  previousEditingNodeRef.current = editingNodeId
+                  setEditingNodeId(null)
+                }
+                editorAI.openPanel()
+              }
+            }}
+            title="Toggle AI Assist panel"
+            className={cn(
+              'flex items-center gap-2 rounded-md border border-border px-3 py-2 text-sm font-medium transition-colors',
+              editorAI.isOpen
+                ? 'bg-primary/10 text-primary border-primary/30'
+                : 'bg-card text-muted-foreground hover:bg-accent hover:text-foreground'
+            )}
+          >
+            <Sparkles className="h-4 w-4" />
+            AI Assist
+          </button>
+
           <button
             onClick={handleManualValidate}
             disabled={isSaving}
@@ -771,15 +819,37 @@ export function TreeEditorPage() {
         </div>
       )}
 
-      {/* Main Editor */}
-      <TreeEditorLayout
-        isMobile={isMobile}
-        isMetadataOpen={isMetadataOpen}
-        onCloseMetadata={() => setIsMetadataOpen(false)}
-        editingNodeId={editingNodeId}
-        onNodeSelect={handleNodeSelect}
-        onSelectAnswerType={handleSelectAnswerType}
-      />
+      {/* Main Editor + AI Panel */}
+      <div className="flex min-h-0 flex-1 overflow-hidden">
+        <div className="flex-1 overflow-hidden">
+          <TreeEditorLayout
+            isMobile={isMobile}
+            isMetadataOpen={isMetadataOpen}
+            onCloseMetadata={() => setIsMetadataOpen(false)}
+            editingNodeId={editorAI.isOpen ? null : editingNodeId}
+            onNodeSelect={handleNodeSelect}
+            onSelectAnswerType={handleSelectAnswerType}
+            onNodeContextMenu={editorAI.openContextMenu}
+          />
+        </div>
+
+        <EditorAIPanel
+          isOpen={editorAI.isOpen}
+          onClose={handleAIPanelClose}
+          focalNode={editorAI.focalNodeId && treeStructure
+            ? findNodeInTree(editorAI.focalNodeId, treeStructure)
+            : null}
+          flowName={name}
+          flowType="troubleshooting"
+          nodeCount={treeStructure ? getAllNodeIds().length : 0}
+          messages={editorAI.messages}
+          input={editorAI.input}
+          onInputChange={editorAI.setInput}
+          onSend={editorAI.sendMessage}
+          isLoading={editorAI.isLoading}
+          suggestions={editorAI.suggestions}
+        />
+      </div>
 
       {/* Flow Analytics Panel (collapsible) */}
       {showAnalytics && id && (
@@ -806,6 +876,60 @@ export function TreeEditorPage() {
           onClose={() => setShowExportModal(false)}
         />
       )}
+
+      {/* AI Context Menu */}
+      {editorAI.contextMenu && (
+        <ContextMenu
+          position={editorAI.contextMenu.position}
+          items={[
+            {
+              id: 'generate-branch',
+              label: 'Generate Branch',
+              icon: <Sparkles className="h-4 w-4" />,
+              onClick: () => {
+                if (editingNodeId) {
+                  previousEditingNodeRef.current = editingNodeId
+                  setEditingNodeId(null)
+                }
+                editorAI.triggerAction(
+                  editorAI.contextMenu!.nodeId,
+                  'generate_branch',
+                  `Generate a branch from this node`
+                )
+              },
+            },
+            {
+              id: 'explain',
+              label: 'Explain Node',
+              icon: <Sparkles className="h-4 w-4" />,
+              onClick: () => {
+                if (editingNodeId) {
+                  previousEditingNodeRef.current = editingNodeId
+                  setEditingNodeId(null)
+                }
+                editorAI.triggerAction(
+                  editorAI.contextMenu!.nodeId,
+                  'quick_action',
+                  `Explain what this node does`
+                )
+              },
+            },
+            {
+              id: 'sep1',
+              label: '',
+              onClick: () => {},
+              separator: true,
+            },
+            {
+              id: 'delete',
+              label: 'Delete Node',
+              variant: 'danger' as const,
+              onClick: () => deleteNode(editorAI.contextMenu!.nodeId),
+            },
+          ]}
+          onClose={editorAI.closeContextMenu}
+        />
+      )}
     </div>
   )
 }