Fix block rename and preview follow terminal issues

- Fix block rename Enter key not saving by removing early cancelRef check
- Add shellType normalization to handle case-insensitive values
- Fix suppressBidir flag stuck state with timeout fallback
- Extract shell escape functions to separate module
- Add percent sign escaping for cmd.exe paths
- Refactor menu cleanup to reduce duplication

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

Author: cowhen

frontend/app/block/blockframe-header.tsx

@@ -104,10 +104,6 @@ const HeaderTextElems = React.memo(({ viewModel, blockId, preview, error }: Head
 
     const saveRename = React.useCallback(
         async (newTitle: string, sessionId: number) => {
-            if (cancelRef.current) {
-                cancelRef.current = false;
-                return;
-            }
             const val = newTitle.trim() || null;
             try {
                 await waveEnv.rpc.SetMetaCommand(TabRpcClient, {
@@ -127,6 +123,7 @@ const HeaderTextElems = React.memo(({ viewModel, blockId, preview, error }: Head
     React.useEffect(() => {
         if (isRenaming) {
             sessionIdRef.current++;
+            cancelRef.current = false;
         }
     }, [isRenaming]);
 

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

@@ -632,22 +632,23 @@ export class PreviewModel implements ViewModel {
         this.updateOpenFileModalAndError(!modalOpen);
     }
 
-    async goHistory(newPath: string) {
+    async goHistory(newPath: string): Promise<boolean> {
         let fileName = globalStore.get(this.metaFilePath);
         if (fileName == null) {
             fileName = "";
         }
         const blockMeta = globalStore.get(this.blockAtom)?.meta;
         const updateMeta = goHistory("file", fileName, newPath, blockMeta);
         if (updateMeta == null) {
-            return;
+            return false;
         }
         const blockOref = WOS.makeORef("block", this.blockId);
         await this.env.services.object.UpdateObjectMeta(blockOref, updateMeta);
 
         // Clear the saved file buffers
         globalStore.set(this.fileContentSaved, null);
         globalStore.set(this.newFileContent, null);
+        return true;
     }
 
     async goParentDirectory({ fileInfo = null }: { fileInfo?: FileInfo | null }) {

frontend/app/view/preview/preview.test.ts

@@ -2,36 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { describe, expect, it } from "vitest";
-
-// Note: These functions are tested by importing the module and accessing them
-// In a real setup, you'd export these from a shared utility module
-// For now, we'll duplicate the logic for testing purposes
-
-function posixEscapePath(path: string): string {
-    if (path === "~") return "~";
-    if (path.startsWith("~/")) {
-        return "~/" + "'" + path.slice(2).replace(/'/g, "'\\''") + "'";
-    }
-    return "'" + path.replace(/'/g, "'\\''") + "'";
-}
-
-function pwshEscapePath(path: string): string {
-    return "'" + path.replace(/'/g, "''") + "'";
-}
-
-function cmdEscapePath(path: string): string {
-    return '"' + path.replace(/"/g, '""') + '"';
-}
-
-function buildCdCommand(shellType: string, path: string): string {
-    if (shellType === "pwsh" || shellType === "powershell") {
-        return "\x1bSet-Location -LiteralPath " + pwshEscapePath(path) + "\r";
-    }
-    if (shellType === "cmd") {
-        return "\x1bcd /d " + cmdEscapePath(path) + "\r";
-    }
-    return "\x15cd " + posixEscapePath(path) + "\r";
-}
+import { buildCdCommand, cmdEscapePath, posixEscapePath, pwshEscapePath } from "./shellescape";
 
 describe("posixEscapePath", () => {
     it("handles tilde-only path", () => {
@@ -110,6 +81,10 @@ describe("cmdEscapePath", () => {
         expect(cmdEscapePath("C:\\Program Files")).toBe('"C:\\Program Files"');
     });
 
+    it("handles path with percent signs in cmd.exe", () => {
+        expect(cmdEscapePath("C:\\100%complete")).toBe('"C:\\100%%complete"');
+    });
+
     it("handles empty string", () => {
         expect(cmdEscapePath("")).toBe('""');
     });

frontend/app/view/preview/preview.tsx

@@ -21,32 +21,7 @@ import { MarkdownPreview } from "./preview-markdown";
 import type { PreviewModel } from "./preview-model";
 import { StreamingPreview } from "./preview-streaming";
 import type { PreviewEnv } from "./previewenv";
-
-function posixEscapePath(path: string): string {
-    if (path === "~") return "~";
-    if (path.startsWith("~/")) {
-        return "~/" + "'" + path.slice(2).replace(/'/g, "'\\''") + "'";
-    }
-    return "'" + path.replace(/'/g, "'\\''") + "'";
-}
-
-function pwshEscapePath(path: string): string {
-    return "'" + path.replace(/'/g, "''") + "'";
-}
-
-function cmdEscapePath(path: string): string {
-    return '"' + path.replace(/"/g, '""') + '"';
-}
-
-function buildCdCommand(shellType: string, path: string): string {
-    if (shellType === "pwsh" || shellType === "powershell") {
-        return "\x1bSet-Location -LiteralPath " + pwshEscapePath(path) + "\r";
-    }
-    if (shellType === "cmd") {
-        return "\x1bcd /d " + cmdEscapePath(path) + "\r";
-    }
-    return "\x15cd " + posixEscapePath(path) + "\r";
-}
+import { buildCdCommand } from "./shellescape";
 
 async function sendCdToTerminal(termBlockId: string, path: string) {
     const block = WOS.getObjectValue<Block>(WOS.makeORef("block", termBlockId), globalStore.get);
@@ -188,16 +163,14 @@ function FollowTermDropdown({ model }: { model: PreviewModel }) {
 
     const { pos, terms, currentFollowId, bidir } = menuData;
     const linkTerm = (blockId: string) => {
-        BlockModel.getInstance().setBlockHighlight(null);
         fireAndForget(async () => {
-            const updates: Record<string, any> = { "preview:followtermid": blockId };
+            const updates: Record<string, string | boolean> = { "preview:followtermid": blockId };
             if (blockId !== currentFollowId) {
                 updates["preview:followterm:bidir"] = false;
             }
             await model.env.services.object.UpdateObjectMeta(WOS.makeORef("block", model.blockId), updates);
+            closeMenu();
         });
-        globalStore.set(model.followTermMenuDataAtom, null);
-        restoreFocus();
     };
     const toggleBidir = () => {
         fireAndForget(async () => {
@@ -213,9 +186,8 @@ function FollowTermDropdown({ model }: { model: PreviewModel }) {
                 "preview:followtermid": null,
                 "preview:followterm:bidir": null,
             });
+            closeMenu();
         });
-        globalStore.set(model.followTermMenuDataAtom, null);
-        restoreFocus();
     };
 
     const dropdownStyle: React.CSSProperties = {
@@ -345,9 +317,16 @@ function PreviewView({
         if (!followTermId || !followTermCwd) return;
         const currentPath = globalStore.get(model.metaFilePath) ?? "";
         if (followTermCwd !== currentPath) {
-            suppressBidirRef.current = true;
+            fireAndForget(async () => {
+                const updated = await model.goHistory(followTermCwd);
+                if (updated) {
+                    suppressBidirRef.current = true;
+                    setTimeout(() => {
+                        suppressBidirRef.current = false;
+                    }, 400);
+                }
+            });
         }
-        fireAndForget(() => model.goHistory(followTermCwd));
     }, [followTermCwd, followTermId, model]);
 
     useEffect(() => {

frontend/app/view/preview/shellescape.ts

@@ -0,0 +1,29 @@
+// Copyright 2026, Command Line Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+export function posixEscapePath(path: string): string {
+    if (path === "~") return "~";
+    if (path.startsWith("~/")) {
+        return "~/" + "'" + path.slice(2).replace(/'/g, "'\\''") + "'";
+    }
+    return "'" + path.replace(/'/g, "'\\''") + "'";
+}
+
+export function pwshEscapePath(path: string): string {
+    return "'" + path.replace(/'/g, "''") + "'";
+}
+
+export function cmdEscapePath(path: string): string {
+    return '"' + path.replace(/%/g, "%%").replace(/"/g, '""') + '"';
+}
+
+export function buildCdCommand(shellType: string, path: string): string {
+    const normalizedShellType = (shellType || "").toLowerCase();
+    if (normalizedShellType === "pwsh" || normalizedShellType === "powershell") {
+        return "\x1bSet-Location -LiteralPath " + pwshEscapePath(path) + "\r";
+    }
+    if (normalizedShellType === "cmd") {
+        return "\x1bcd /d " + cmdEscapePath(path) + "\r";
+    }
+    return "\x15cd " + posixEscapePath(path) + "\r";
+}