fix orphaned blocks issue

Author: sawka

frontend/app/store/services.ts

@@ -7,6 +7,11 @@ import * as WOS from "./wos";
 
 // blockservice.BlockService (block)
 class BlockServiceType {
+    // queue a layout action to cleanup orphaned blocks in the tab
+    // @returns object updates
+    CleanupOrphanedBlocks(tabId: string): Promise<void> {
+        return WOS.callBackendService("block", "CleanupOrphanedBlocks", Array.from(arguments))
+    }
     GetControllerStatus(arg2: string): Promise<BlockControllerRuntimeStatus> {
         return WOS.callBackendService("block", "GetControllerStatus", Array.from(arguments))
     }

frontend/app/view/codeeditor/diffviewer.tsx

@@ -4,7 +4,7 @@
 import { useOverrideConfigAtom } from "@/app/store/global";
 import { DiffEditor } from "@monaco-editor/react";
 import type * as MonacoTypes from "monaco-editor/esm/vs/editor/editor.api";
-import React, { useMemo } from "react";
+import { useMemo } from "react";
 
 import { boundNumber } from "@/util/util";
 
@@ -66,4 +66,4 @@ export function DiffViewer({ blockId, original, modified, language, fileName }:
             </div>
         </div>
     );
-}
+}

frontend/layout/lib/layoutModel.ts

@@ -3,6 +3,7 @@
 
 import { FocusManager } from "@/app/store/focusManager";
 import { getSettingsKeyAtom } from "@/app/store/global";
+import { BlockService } from "@/app/store/services";
 import { atomWithThrottle, boundNumber, fireAndForget } from "@/util/util";
 import { Atom, atom, Getter, PrimitiveAtom, Setter } from "jotai";
 import { splitAtom } from "jotai/utils";
@@ -406,6 +407,26 @@ export class LayoutModel {
         this.persistToBackend();
     }
 
+    private async cleanupOrphanedBlocks() {
+        const tab = this.getter(this.tabAtom);
+        const layoutBlockIds = new Set<string>();
+
+        walkNodes(this.treeState.rootNode, (node) => {
+            if (node.data?.blockId) {
+                layoutBlockIds.add(node.data.blockId);
+            }
+        });
+
+        for (const blockId of tab.blockids || []) {
+            if (!layoutBlockIds.has(blockId)) {
+                console.log("Cleaning up orphaned block:", blockId);
+                if (this.onNodeDelete) {
+                    await this.onNodeDelete({ blockId });
+                }
+            }
+        }
+    }
+
     private async handleBackendAction(action: LayoutActionData) {
         switch (action.actiontype) {
             case LayoutTreeActionType.InsertNode: {
@@ -537,6 +558,10 @@ export class LayoutModel {
                 this.treeReducer(splitAction, false);
                 break;
             }
+            case "cleanuporphaned": {
+                await this.cleanupOrphanedBlocks();
+                break;
+            }
             default:
                 console.warn("unsupported layout action", action);
                 break;
@@ -574,6 +599,8 @@ export class LayoutModel {
         if (contents.gapSizePx !== undefined) {
             this.setter(this.gapSizePx, contents.gapSizePx);
         }
+        const tab = this.getter(this.tabAtom);
+        fireAndForget(() => BlockService.CleanupOrphanedBlocks(tab.oid));
     }
 
     /**

pkg/aiusechat/tools.go

@@ -120,6 +120,8 @@ func MakeBlockShortDesc(block *waveobj.Block) string {
 		return "placeholder widget used to launch other widgets"
 	case "tsunami":
 		return handleTsunamiBlockDesc(block)
+	case "aifilediff":
+		return "" // AI doesn't need to see these
 	default:
 		return fmt.Sprintf("unknown widget with type %q", viewType)
 	}

pkg/service/blockservice/blockservice.go

@@ -9,10 +9,12 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/wavetermdev/waveterm/pkg/blockcontroller"
 	"github.com/wavetermdev/waveterm/pkg/filestore"
 	"github.com/wavetermdev/waveterm/pkg/tsgen/tsgenmeta"
 	"github.com/wavetermdev/waveterm/pkg/waveobj"
+	"github.com/wavetermdev/waveterm/pkg/wcore"
 	"github.com/wavetermdev/waveterm/pkg/wshrpc"
 	"github.com/wavetermdev/waveterm/pkg/wstore"
 )
@@ -87,3 +89,23 @@ func (bs *BlockService) SaveWaveAiData(ctx context.Context, blockId string, hist
 	}
 	return nil
 }
+
+func (*BlockService) CleanupOrphanedBlocks_Meta() tsgenmeta.MethodMeta {
+	return tsgenmeta.MethodMeta{
+		Desc:     "queue a layout action to cleanup orphaned blocks in the tab",
+		ArgNames: []string{"ctx", "tabId"},
+	}
+}
+
+func (bs *BlockService) CleanupOrphanedBlocks(ctx context.Context, tabId string) (waveobj.UpdatesRtnType, error) {
+	ctx = waveobj.ContextWithUpdates(ctx)
+	layoutAction := waveobj.LayoutActionData{
+		ActionType: wcore.LayoutActionDataType_CleanupOrphaned,
+		ActionId:   uuid.NewString(),
+	}
+	err := wcore.QueueLayoutActionForTab(ctx, tabId, layoutAction)
+	if err != nil {
+		return nil, fmt.Errorf("error queuing cleanup layout action: %w", err)
+	}
+	return waveobj.ContextGetUpdatesRtn(ctx), nil
+}

pkg/wcore/layout.go

@@ -22,6 +22,7 @@ const (
 	LayoutActionDataType_Replace         = "replace"
 	LayoutActionDataType_SplitHorizontal = "splithorizontal"
 	LayoutActionDataType_SplitVertical   = "splitvertical"
+	LayoutActionDataType_CleanupOrphaned = "cleanuporphaned"
 )
 
 type PortableLayout []struct {