move the override config atoms to term.tsx instead of reading them in the termwrap ctor

Author: sawka

frontend/app/view/term/term.tsx

@@ -20,7 +20,7 @@ import * as jotai from "jotai";
 import * as React from "react";
 import { TermStickers } from "./termsticker";
 import { TermThemeUpdater } from "./termtheme";
-import { computeTheme } from "./termutil";
+import { computeTheme, normalizeCursorStyle } from "./termutil";
 import { TermWrap } from "./termwrap";
 import "./xterm.css";
 
@@ -275,6 +275,8 @@ const TerminalView = ({ blockId, model }: ViewComponentProps<TermViewModel>) =>
         }
         const termAllowBPM = globalStore.get(model.termBPMAtom) ?? true;
         const termMacOptionIsMeta = globalStore.get(termMacOptionIsMetaAtom) ?? false;
+        const termCursorStyle = normalizeCursorStyle(globalStore.get(getOverrideConfigAtom(blockId, "term:cursor")));
+        const termCursorBlink = globalStore.get(getOverrideConfigAtom(blockId, "term:cursorblink")) ?? false;
         const wasFocused = model.termRef.current != null && globalStore.get(model.nodeModel.isFocused);
         const termWrap = new TermWrap(
             tabModel.tabId,
@@ -292,6 +294,8 @@ const TerminalView = ({ blockId, model }: ViewComponentProps<TermViewModel>) =>
                 allowProposedApi: true, // Required by @xterm/addon-search to enable search functionality and decorations
                 ignoreBracketedPasteMode: !termAllowBPM,
                 macOptionIsMeta: termMacOptionIsMeta,
+                cursorStyle: termCursorStyle,
+                cursorBlink: termCursorBlink,
             },
             {
                 keydownHandler: model.handleTerminalKeydown.bind(model),

frontend/app/view/term/termutil.ts

@@ -10,6 +10,13 @@ import { colord } from "colord";
 
 export type GenClipboardItem = { text?: string; image?: Blob };
 
+export function normalizeCursorStyle(cursorStyle: string): TermTypes.Terminal["options"]["cursorStyle"] {
+    if (cursorStyle === "underline" || cursorStyle === "bar") {
+        return cursorStyle;
+    }
+    return "block";
+}
+
 function applyTransparencyToColor(hexColor: string, transparency: number): string {
     const alpha = 1 - transparency; // transparency is already 0-1
     return colord(hexColor).alpha(alpha).toHex();

frontend/app/view/term/termwrap.ts

@@ -34,7 +34,7 @@ import {
     handleOsc7Command,
     type ShellIntegrationStatus,
 } from "./osc-handlers";
-import { bufferLinesToText, createTempFileFromBlob, extractAllClipboardData } from "./termutil";
+import { bufferLinesToText, createTempFileFromBlob, extractAllClipboardData, normalizeCursorStyle } from "./termutil";
 
 const dlog = debug("wave:termwrap");
 
@@ -124,8 +124,6 @@ export class TermWrap {
         this.shellIntegrationStatusAtom = jotai.atom(null) as jotai.PrimitiveAtom<ShellIntegrationStatus | null>;
         this.lastCommandAtom = jotai.atom(null) as jotai.PrimitiveAtom<string | null>;
         this.terminal = new Terminal(options);
-        this.setCursorStyle(globalStore.get(getOverrideConfigAtom(this.blockId, "term:cursor")));
-        this.setCursorBlink(globalStore.get(getOverrideConfigAtom(this.blockId, "term:cursorblink")) ?? false);
         this.fitAddon = new FitAddon();
         this.fitAddon.noScrollbar = PLATFORM === PlatformMacOS;
         this.serializeAddon = new SerializeAddon();
@@ -214,11 +212,7 @@ export class TermWrap {
     }
 
     setCursorStyle(cursorStyle: string) {
-        if (cursorStyle === "underline" || cursorStyle === "bar") {
-            this.terminal.options.cursorStyle = cursorStyle;
-            return;
-        }
-        this.terminal.options.cursorStyle = "block";
+        this.terminal.options.cursorStyle = normalizeCursorStyle(cursorStyle);
     }
 
     setCursorBlink(cursorBlink: boolean) {