From 54a4e15cf2da7a360ffe4175d70c3a1e06058504 Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Wed, 25 Mar 2026 23:08:22 +0800
Subject: [PATCH] fix agent project menu closing after actions

---
 app/canvas/[id]/page.tsx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/canvas/[id]/page.tsx b/app/canvas/[id]/page.tsx
index 130a4ab28..e8a26e3be 100644
--- a/app/canvas/[id]/page.tsx
+++ b/app/canvas/[id]/page.tsx
@@ -345,6 +345,7 @@ export default function CanvasEditorPage({ params }: PageProps) {
   const [isAgentProjectLoading, setIsAgentProjectLoading] = useState(false);
   const [isAgentProjectSaving, setIsAgentProjectSaving] = useState(false);
   const [isAgentProjectSheetOpen, setIsAgentProjectSheetOpen] = useState(false);
+  const [isAgentProjectMenuOpen, setIsAgentProjectMenuOpen] = useState(false);
   const [workflowHydrationSource, setWorkflowHydrationSource] = useState<
     "pending" | "project" | "local" | "empty"
   >("pending");
@@ -879,6 +880,7 @@ export default function CanvasEditorPage({ params }: PageProps) {
 
     let cancelled = false;
     const loadAgentProject = async () => {
+      setIsAgentProjectMenuOpen(false);
       setIsAgentProjectLoading(true);
       try {
         const result = await agentProjectService.getProject(agentProjectId);
@@ -932,6 +934,12 @@ export default function CanvasEditorPage({ params }: PageProps) {
     };
   }, [agentProjectId, requestedAgentMode]);
 
+  useEffect(() => {
+    if (isAgentProjectSheetOpen) {
+      setIsAgentProjectMenuOpen(false);
+    }
+  }, [isAgentProjectSheetOpen]);
+
   useEffect(() => {
     if (!isAgentMode || !agentProjectId || isAgentProjectLoading) return;
 
@@ -1798,7 +1806,7 @@ export default function CanvasEditorPage({ params }: PageProps) {
         </span>
       </div>
 
-      <DropdownMenu>
+      <DropdownMenu open={isAgentProjectMenuOpen} onOpenChange={setIsAgentProjectMenuOpen}>
         <DropdownMenuTrigger asChild>
           <Button
             type="button"
@@ -1823,6 +1831,7 @@ export default function CanvasEditorPage({ params }: PageProps) {
             className="cursor-pointer text-white focus:bg-white/10 focus:text-white"
             onSelect={(event) => {
               event.preventDefault();
+              setIsAgentProjectMenuOpen(false);
               void handleCreateAgentProject();
             }}
           >
@@ -1834,6 +1843,7 @@ export default function CanvasEditorPage({ params }: PageProps) {
             className="cursor-pointer text-white focus:bg-white/10 focus:text-white"
             onSelect={(event) => {
               event.preventDefault();
+              setIsAgentProjectMenuOpen(false);
               void handleSaveAsAgentProject();
             }}
           >
@@ -1845,6 +1855,7 @@ export default function CanvasEditorPage({ params }: PageProps) {
             className="cursor-pointer text-white focus:bg-white/10 focus:text-white"
             onSelect={(event) => {
               event.preventDefault();
+              setIsAgentProjectMenuOpen(false);
               void handleRenameCurrentAgentProject();
             }}
           >
@@ -1856,6 +1867,7 @@ export default function CanvasEditorPage({ params }: PageProps) {
             className="cursor-pointer text-white focus:bg-white/10 focus:text-white"
             onSelect={(event) => {
               event.preventDefault();
+              setIsAgentProjectMenuOpen(false);
               setIsAgentProjectSheetOpen(true);
             }}
           >