Improve block rename and preview follow terminal features

Block rename improvements:
- Restrict rename menu to terminal blocks only (match badge visibility)
- Disable rename for preview/ephemeral blocks
- Add race condition protection for Escape/blur handling
- Auto-select text on focus for better UX
- Await RPC calls and log errors instead of fire-and-forget

Preview follow terminal enhancements:
- Add keyboard accessibility (Escape, Enter, Space navigation)
- Add ARIA roles and labels for screen readers
- Implement focus management (capture and restore)
- Fix effect dependencies to prevent stale closures
- Improve bidir suppression with timeout cleanup
- Make sendCdToTerminal shell-aware (POSIX, PowerShell, cmd.exe)
- Clear bidir state when linking new terminal
- Fix terminal numbering to use tab order instead of filtered index
- Move helper functions after imports for better organization

Dev build improvements:
- Update CLAUDE.md with explicit config/data env variables
- Make launch_wave_dev.command portable with dynamic paths
- Document why explicit overrides needed for clean installs

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: cowhen

CLAUDE.md

@@ -25,7 +25,10 @@ This project uses a set of "skill" guides — focused how-to documents for commo
 - **Build**: `task package` (requires `PATH="/opt/homebrew/bin:$PATH"` for Go/Task). Builds as `Wave Dev.app` in `make/mac-arm64/`.
 - **Launch**: Use `launch_wave_dev.command` or run directly:
   ```bash
-  WAVETERM_HOME=~/.waveterm-dev make/mac-arm64/Wave\ Dev.app/Contents/MacOS/Wave\ Dev
+  WAVETERM_HOME=~/.waveterm-dev \
+  WAVETERM_CONFIG_HOME=~/.waveterm-dev/config \
+  WAVETERM_DATA_HOME=~/.waveterm-dev/data \
+  make/mac-arm64/Wave\ Dev.app/Contents/MacOS/Wave\ Dev
   ```
-  `WAVETERM_HOME` gives the dev build a separate data directory (`~/.waveterm-dev`) from the vanilla install (`~/.waveterm`).
+  These variables create isolated config and data directories for the dev build. Note: `getWaveHomeDir()` only honors `WAVETERM_HOME` after `wave.lock` exists, so explicit `CONFIG/DATA` overrides are needed for clean installs and newly launched dev instances.
 - **Do not modify Info.plist or re-sign** the built app bundle — it breaks code signing on macOS and causes crashes.

frontend/app/block/blockframe-header.tsx

@@ -37,16 +37,24 @@ function handleHeaderContextMenu(
     blockId: string,
     viewModel: ViewModel,
     nodeModel: NodeModel,
-    blockEnv: BlockEnv
+    blockEnv: BlockEnv,
+    preview: boolean
 ) {
     e.preventDefault();
     e.stopPropagation();
     const magnified = globalStore.get(nodeModel.isMagnified);
-    const menu: ContextMenuItem[] = [
-        {
+    const ephemeral = globalStore.get(nodeModel.isEphemeral);
+    const useTermHeader = viewModel?.useTermHeader ? globalStore.get(viewModel.useTermHeader) : false;
+    const menu: ContextMenuItem[] = [];
+
+    if (!ephemeral && !preview && useTermHeader) {
+        menu.push({
             label: "Rename Block",
             click: () => startBlockRename(blockId),
-        },
+        });
+    }
+
+    menu.push(
         {
             label: magnified ? "Un-Magnify Block" : "Magnify Block",
             click: () => {
@@ -59,8 +67,8 @@ function handleHeaderContextMenu(
             click: () => {
                 navigator.clipboard.writeText(blockId);
             },
-        },
-    ];
+        }
+    );
     const extraItems = viewModel?.getSettingsMenuItems?.();
     if (extraItems && extraItems.length > 0) menu.push({ type: "separator" }, ...extraItems);
     menu.push(
@@ -91,14 +99,23 @@ const HeaderTextElems = React.memo(({ viewModel, blockId, preview, error }: Head
     const useTermHeader = util.useAtomValueSafe(viewModel?.useTermHeader);
     let headerTextUnion = util.useAtomValueSafe(viewModel?.viewText);
     headerTextUnion = frameText ?? headerTextUnion;
+    const cancelRef = React.useRef(false);
 
     const saveRename = React.useCallback(
-        (newTitle: string) => {
+        async (newTitle: string) => {
+            if (cancelRef.current) {
+                cancelRef.current = false;
+                return;
+            }
             const val = newTitle.trim() || null;
-            waveEnv.rpc.SetMetaCommand(TabRpcClient, {
-                oref: WOS.makeORef("block", blockId),
-                meta: { "frame:title": val },
-            });
+            try {
+                await waveEnv.rpc.SetMetaCommand(TabRpcClient, {
+                    oref: WOS.makeORef("block", blockId),
+                    meta: { "frame:title": val },
+                });
+            } catch (error) {
+                console.error("Failed to save block rename:", error);
+            }
             stopBlockRename();
         },
         [blockId, waveEnv]
@@ -112,11 +129,20 @@ const HeaderTextElems = React.memo(({ viewModel, blockId, preview, error }: Head
                     defaultValue={frameTitle ?? ""}
                     placeholder="Block name..."
                     className="block-frame-rename-input bg-transparent border border-white/20 rounded px-2 py-0.5 text-sm outline-none focus:border-white/40 min-w-0 w-full max-w-[200px]"
-                    onBlur={(e) => saveRename(e.currentTarget.value)}
+                    onFocus={(e) => e.currentTarget.select()}
+                    onBlur={(e) => {
+                        if (cancelRef.current) {
+                            cancelRef.current = false;
+                            stopBlockRename();
+                            return;
+                        }
+                        saveRename(e.currentTarget.value);
+                    }}
                     onKeyDown={(e) => {
                         if (e.key === "Enter") {
                             saveRename(e.currentTarget.value);
                         } else if (e.key === "Escape") {
+                            cancelRef.current = true;
                             stopBlockRename();
                         }
                     }}
@@ -174,9 +200,10 @@ type HeaderEndIconsProps = {
     viewModel: ViewModel;
     nodeModel: NodeModel;
     blockId: string;
+    preview: boolean;
 };
 
-const HeaderEndIcons = React.memo(({ viewModel, nodeModel, blockId }: HeaderEndIconsProps) => {
+const HeaderEndIcons = React.memo(({ viewModel, nodeModel, blockId, preview }: HeaderEndIconsProps) => {
     const blockEnv = useWaveEnv<BlockEnv>();
     const endIconButtons = util.useAtomValueSafe(viewModel?.endIconButtons);
     const magnified = jotai.useAtomValue(nodeModel.isMagnified);
@@ -226,7 +253,7 @@ const HeaderEndIcons = React.memo(({ viewModel, nodeModel, blockId }: HeaderEndI
         elemtype: "iconbutton",
         icon: "cog",
         title: "Settings",
-        click: (e) => handleHeaderContextMenu(e, blockId, viewModel, nodeModel, blockEnv),
+        click: (e) => handleHeaderContextMenu(e, blockId, viewModel, nodeModel, blockEnv, preview),
     };
     endIconsElem.push(<IconButton key="settings" decl={settingsDecl} className="block-frame-settings" />);
     if (ephemeral) {
@@ -309,7 +336,7 @@ const BlockFrame_Header = ({
             className={cn("block-frame-default-header", useTermHeader && "!pl-[2px]")}
             data-role="block-header"
             ref={dragHandleRef}
-            onContextMenu={(e) => handleHeaderContextMenu(e, nodeModel.blockId, viewModel, nodeModel, waveEnv)}
+            onContextMenu={(e) => handleHeaderContextMenu(e, nodeModel.blockId, viewModel, nodeModel, waveEnv, preview)}
         >
             {!useTermHeader && (
                 <>
@@ -344,7 +371,7 @@ const BlockFrame_Header = ({
                 </div>
             )}
             <HeaderTextElems viewModel={viewModel} blockId={nodeModel.blockId} preview={preview} error={error} />
-            <HeaderEndIcons viewModel={viewModel} nodeModel={nodeModel} blockId={nodeModel.blockId} />
+            <HeaderEndIcons viewModel={viewModel} nodeModel={nodeModel} blockId={nodeModel.blockId} preview={preview} />
         </div>
     );
 };

frontend/app/view/preview/preview-model.tsx

@@ -520,17 +520,22 @@ export class PreviewModel implements ViewModel {
     showFollowTermMenu(e: React.MouseEvent<any>) {
         const tabData = globalStore.get(this.tabModel.tabAtom);
         const blockIds = tabData?.blockids ?? [];
-        const terms = blockIds
-            .filter((bid) => bid !== this.blockId)
-            .map((bid) => {
+
+        const termBlockIds = blockIds
+            .filter((bid) => {
+                if (bid === this.blockId) return false;
                 const block = WOS.getObjectValue<Block>(WOS.makeORef("block", bid), globalStore.get);
-                return { blockId: bid, block };
-            })
-            .filter(({ block }) => block?.meta?.view === "term")
-            .map(({ blockId: bid, block }, i) => ({
+                return block?.meta?.view === "term";
+            });
+
+        const terms = termBlockIds.map((bid) => {
+            const block = WOS.getObjectValue<Block>(WOS.makeORef("block", bid), globalStore.get);
+            const termIndex = termBlockIds.indexOf(bid) + 1;
+            return {
                 blockId: bid,
-                title: (block?.meta?.["frame:title"] as string) || `Terminal ${i + 1}`,
-            }));
+                title: (block?.meta?.["frame:title"] as string) || `Terminal ${termIndex}`,
+            };
+        });
 
         const rect = (e.currentTarget as HTMLElement).getBoundingClientRect();
         const currentFollowId = globalStore.get(this.followTermIdAtom);