Merge remote-tracking branch 'origin/main' into sawka/remove-wave-osc

Author: sawka

frontend/app/view/term/term.tsx

@@ -286,6 +286,7 @@ const TerminalView = ({ blockId, model }: ViewComponentProps<TermViewModel>) =>
                 keydownHandler: model.handleTerminalKeydown.bind(model),
                 useWebGl: !termSettings?.["term:disablewebgl"],
                 sendDataHandler: model.sendDataToController.bind(model),
+                nodeModel: model.nodeModel,
             }
         );
         (window as any).term = termWrap;

frontend/app/view/term/termwrap.ts

@@ -1,6 +1,7 @@
 // Copyright 2025, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+import type { BlockNodeModel } from "@/app/block/blocktypes";
 import { getFileSubject } from "@/app/store/wps";
 import { sendWSCommand } from "@/app/store/ws";
 import { RpcApi } from "@/app/store/wshclientapi";
@@ -26,6 +27,8 @@ const dlog = debug("wave:termwrap");
 const TermFileName = "term";
 const TermCacheFileName = "cache:term:full";
 const MinDataProcessedForCache = 100 * 1024;
+const Osc52MaxDecodedSize = 75 * 1024; // max clipboard size for OSC 52 (matches common terminal implementations)
+const Osc52MaxRawLength = 128 * 1024; // includes selector + base64 + whitespace (rough check)
 export const SupportsImageInput = true;
 
 // detect webgl support
@@ -46,8 +49,86 @@ type TermWrapOptions = {
     keydownHandler?: (e: KeyboardEvent) => boolean;
     useWebGl?: boolean;
     sendDataHandler?: (data: string) => void;
+    nodeModel?: BlockNodeModel;
 };
 
+// for xterm OSC handlers, we return true always because we "own" the OSC number.
+// even if data is invalid we don't want to propagate to other handlers.
+function handleOsc52Command(data: string, blockId: string, loaded: boolean, termWrap: TermWrap): boolean {
+    if (!loaded) {
+        return true;
+    }
+    const isBlockFocused = termWrap.nodeModel ? globalStore.get(termWrap.nodeModel.isFocused) : false;
+    if (!document.hasFocus() || !isBlockFocused) {
+        console.log("OSC 52: rejected, window or block not focused");
+        return true;
+    }
+    if (!data || data.length === 0) {
+        console.log("OSC 52: empty data received");
+        return true;
+    }
+    if (data.length > Osc52MaxRawLength) {
+        console.log("OSC 52: raw data too large", data.length);
+        return true;
+    }
+
+    const semicolonIndex = data.indexOf(";");
+    if (semicolonIndex === -1) {
+        console.log("OSC 52: invalid format (no semicolon)", data.substring(0, 50));
+        return true;
+    }
+
+    const clipboardSelection = data.substring(0, semicolonIndex);
+    const base64Data = data.substring(semicolonIndex + 1);
+
+    // clipboard query ("?") is not supported for security (prevents clipboard theft)
+    if (base64Data === "?") {
+        console.log("OSC 52: clipboard query not supported");
+        return true;
+    }
+
+    if (base64Data.length === 0) {
+        return true;
+    }
+
+    if (clipboardSelection.length > 10) {
+        console.log("OSC 52: clipboard selection too long", clipboardSelection);
+        return true;
+    }
+
+    const estimatedDecodedSize = Math.ceil(base64Data.length * 0.75);
+    if (estimatedDecodedSize > Osc52MaxDecodedSize) {
+        console.log("OSC 52: data too large", estimatedDecodedSize, "bytes");
+        return true;
+    }
+
+    try {
+        // strip whitespace from base64 data (some terminals chunk with newlines per RFC 4648)
+        const cleanBase64Data = base64Data.replace(/\s+/g, "");
+        const decodedText = base64ToString(cleanBase64Data);
+
+        // validate actual decoded size (base64 estimate can be off for multi-byte UTF-8)
+        const actualByteSize = new TextEncoder().encode(decodedText).length;
+        if (actualByteSize > Osc52MaxDecodedSize) {
+            console.log("OSC 52: decoded text too large", actualByteSize, "bytes");
+            return true;
+        }
+
+        fireAndForget(async () => {
+            try {
+                await navigator.clipboard.writeText(decodedText);
+                dlog("OSC 52: copied", decodedText.length, "characters to clipboard");
+            } catch (err) {
+                console.error("OSC 52: clipboard write failed:", err);
+            }
+        });
+    } catch (e) {
+        console.error("OSC 52: base64 decode error:", e);
+    }
+
+    return true;
+}
+
 // for xterm handlers, we return true always because we "own" OSC 7.
 // even if it is invalid we dont want to propagate to other handlers
 function handleOsc7Command(data: string, blockId: string, loaded: boolean): boolean {
@@ -315,6 +396,7 @@ export class TermWrap {
     promptMarkers: TermTypes.IMarker[] = [];
     shellIntegrationStatusAtom: jotai.PrimitiveAtom<"ready" | "running-command" | null>;
     lastCommandAtom: jotai.PrimitiveAtom<string | null>;
+    nodeModel: BlockNodeModel; // this can be null
 
     // IME composition state tracking
     // Prevents duplicate input when switching input methods during composition (e.g., using Capslock)
@@ -341,6 +423,7 @@ export class TermWrap {
         this.tabId = tabId;
         this.blockId = blockId;
         this.sendDataHandler = waveOptions.sendDataHandler;
+        this.nodeModel = waveOptions.nodeModel;
         this.ptyOffset = 0;
         this.dataBytesProcessed = 0;
         this.hasResized = false;
@@ -386,9 +469,13 @@ export class TermWrap {
                 loggedWebGL = true;
             }
         }
+        // Register OSC handlers
         this.terminal.parser.registerOscHandler(7, (data: string) => {
             return handleOsc7Command(data, this.blockId, this.loaded);
         });
+        this.terminal.parser.registerOscHandler(52, (data: string) => {
+            return handleOsc52Command(data, this.blockId, this.loaded, this);
+        });
         this.terminal.parser.registerOscHandler(16162, (data: string) => {
             return handleOsc16162Command(data, this.blockId, this.loaded, this);
         });

go.mod

@@ -28,7 +28,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/sashabaranov/go-openai v1.41.2
 	github.com/sawka/txwrap v0.2.0
-	github.com/shirou/gopsutil/v4 v4.25.11
+	github.com/shirou/gopsutil/v4 v4.25.12
 	github.com/skeema/knownhosts v1.3.1
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.10.2

go.sum

@@ -162,8 +162,8 @@ github.com/sashabaranov/go-openai v1.41.2 h1:vfPRBZNMpnqu8ELsclWcAvF19lDNgh1t6TV
 github.com/sashabaranov/go-openai v1.41.2/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
 github.com/sawka/txwrap v0.2.0 h1:V3LfvKVLULxcYSxdMguLwFyQFMEU9nFDJopg0ZkL+94=
 github.com/sawka/txwrap v0.2.0/go.mod h1:wwQ2SQiN4U+6DU/iVPhbvr7OzXAtgZlQCIGuvOswEfA=
-github.com/shirou/gopsutil/v4 v4.25.11 h1:X53gB7muL9Gnwwo2evPSE+SfOrltMoR6V3xJAXZILTY=
-github.com/shirou/gopsutil/v4 v4.25.11/go.mod h1:EivAfP5x2EhLp2ovdpKSozecVXn1TmuG7SMzs/Wh4PU=
+github.com/shirou/gopsutil/v4 v4.25.12 h1:e7PvW/0RmJ8p8vPGJH4jvNkOyLmbkXgXW4m6ZPic6CY=
+github.com/shirou/gopsutil/v4 v4.25.12/go.mod h1:EivAfP5x2EhLp2ovdpKSozecVXn1TmuG7SMzs/Wh4PU=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8=