make uxCloseBlock and genericClose consistent. Cmd-W closes wave ai first, if weave ai is open, replace block, switch to wave ai... etc...

Author: sawka

frontend/app/store/keymodel.ts

@@ -134,26 +134,15 @@ function uxCloseBlock(blockId: string) {
 
     const workspaceLayoutModel = WorkspaceLayoutModel.getInstance();
     const isAIPanelOpen = workspaceLayoutModel.getAIPanelVisible();
-
     if (isAIPanelOpen && getStaticTabBlockCount() === 1) {
         const aiModel = WaveAIModel.getInstance();
         const shouldSwitchToAI = !aiModel.isChatEmpty || aiModel.hasNonEmptyInput();
-
         if (shouldSwitchToAI) {
-            replaceBlock(
-                blockId,
-                {
-                    meta: {
-                        view: "launcher",
-                    },
-                },
-                false
-            );
+            replaceBlock(blockId, { meta: { view: "launcher" } }, false);
             setTimeout(() => WaveAIModel.getInstance().focusInput(), 50);
             return;
         }
     }
-
     const layoutModel = getLayoutModelForStaticTab();
     const node = layoutModel.getNodeByBlockId(blockId);
     if (node) {
@@ -171,6 +160,22 @@ function genericClose() {
         TabBarModel.getInstance().jiggleActivePinnedTab();
         return;
     }
+
+    const workspaceLayoutModel = WorkspaceLayoutModel.getInstance();
+    const isAIPanelOpen = workspaceLayoutModel.getAIPanelVisible();
+    if (isAIPanelOpen && getStaticTabBlockCount() === 1) {
+        const aiModel = WaveAIModel.getInstance();
+        const shouldSwitchToAI = !aiModel.isChatEmpty || aiModel.hasNonEmptyInput();
+        if (shouldSwitchToAI) {
+            const layoutModel = getLayoutModelForStaticTab();
+            const focusedNode = globalStore.get(layoutModel.focusedNode);
+            if (focusedNode) {
+                replaceBlock(focusedNode.data.blockId, { meta: { view: "launcher" } }, false);
+                setTimeout(() => WaveAIModel.getInstance().focusInput(), 50);
+                return;
+            }
+        }
+    }
     const blockCount = getStaticTabBlockCount();
     if (blockCount === 0) {
         simpleCloseStaticTab();