fix(web): preserve terminal selection copy

packages/app/src/web/api-auth-schema.ts

@@ -28,8 +28,8 @@ const AuthProviderSnapshotFields = {
   claudeAuthPath: Schema.String,
   geminiAuthEntries: Schema.Number,
   geminiAuthPath: Schema.String,
-  grokAuthEntries: Schema.Number,
-  grokAuthPath: Schema.String,
+  grokAuthEntries: Schema.optionalWith(Schema.Number, { default: () => 0 }),
+  grokAuthPath: Schema.optionalWith(Schema.String, { default: () => "" }),
   githubTokenEntries: Schema.Number,
   gitTokenEntries: Schema.Number
 }

packages/app/src/web/terminal-copy-interaction.ts

@@ -0,0 +1,136 @@
+export type TerminalMouseTrackingMode = "any" | "drag" | "none" | "vt200" | "x10"
+
+type TerminalSelectionTarget = {
+  readonly getSelection: () => string
+  readonly hasSelection: () => boolean
+}
+
+export type TerminalCopyInteractionTerminal = TerminalSelectionTarget & {
+  readonly modes: {
+    readonly mouseTrackingMode: TerminalMouseTrackingMode
+  }
+}
+
+type TerminalMouseButtonEvent = {
+  readonly button: number
+}
+
+type TerminalSelectionModifierEvent = {
+  readonly altKey: boolean
+  readonly shiftKey: boolean
+}
+
+type TerminalCopyClipboardData = {
+  readonly setData: (format: string, data: string) => void
+}
+
+type TerminalCopyClipboardEvent = {
+  readonly clipboardData: TerminalCopyClipboardData | null
+  readonly preventDefault: () => void
+  readonly stopPropagation: () => void
+}
+
+type TerminalCopyMouseEvent = TerminalMouseButtonEvent & TerminalSelectionModifierEvent
+
+type TerminalCopyInteractionHost = {
+  readonly addEventListener: {
+    (type: "copy", listener: (event: TerminalCopyClipboardEvent) => void, options: true): void
+    (type: "mousedown", listener: (event: TerminalCopyMouseEvent) => void, options: true): void
+  }
+  readonly removeEventListener: {
+    (type: "copy", listener: (event: TerminalCopyClipboardEvent) => void, options: true): void
+    (type: "mousedown", listener: (event: TerminalCopyMouseEvent) => void, options: true): void
+  }
+}
+
+type TerminalCopyInteractionArgs = {
+  readonly host: TerminalCopyInteractionHost
+  readonly terminal: TerminalCopyInteractionTerminal
+}
+
+const primaryMouseButton = 0
+const secondaryMouseButton = 2
+
+const macPlatformNames = new Set(["Mac68K", "MacIntel", "Macintosh", "MacPPC"])
+
+const currentNavigatorPlatform = (): string => {
+  if (typeof navigator === "undefined") {
+    return ""
+  }
+  return navigator.platform
+}
+
+const isPrimaryMouseButton = (event: TerminalMouseButtonEvent): boolean => event.button === primaryMouseButton
+
+const isSecondaryMouseButton = (event: TerminalMouseButtonEvent): boolean => event.button === secondaryMouseButton
+
+const hasActiveMouseTracking = (terminal: TerminalCopyInteractionTerminal): boolean =>
+  terminal.modes.mouseTrackingMode !== "none"
+
+export const shouldForceBrowserTerminalSelection = (
+  event: TerminalMouseButtonEvent,
+  terminal: TerminalCopyInteractionTerminal
+): boolean => isPrimaryMouseButton(event) && hasActiveMouseTracking(terminal)
+
+export const shouldForceTerminalSelectionContext = (
+  event: TerminalMouseButtonEvent,
+  terminal: TerminalCopyInteractionTerminal
+): boolean => isSecondaryMouseButton(event) && terminal.hasSelection()
+
+const terminalSelectionModifier = (platform: string): keyof TerminalSelectionModifierEvent =>
+  macPlatformNames.has(platform) ? "altKey" : "shiftKey"
+
+export const forceTerminalSelectionModifier = (
+  event: TerminalSelectionModifierEvent,
+  platform: string = currentNavigatorPlatform()
+): boolean =>
+  Reflect.defineProperty(event, terminalSelectionModifier(platform), {
+    configurable: true,
+    value: true
+  })
+
+export const writeTerminalSelectionToClipboardData = (
+  terminal: TerminalSelectionTarget,
+  clipboardData: TerminalCopyClipboardData | null
+): boolean => {
+  if (clipboardData === null || !terminal.hasSelection()) {
+    return false
+  }
+  const selection = terminal.getSelection()
+  if (selection.length === 0) {
+    return false
+  }
+  clipboardData.setData("text/plain", selection)
+  return true
+}
+
+export const attachTerminalCopyInteraction = (
+  args: TerminalCopyInteractionArgs
+): { readonly dispose: () => void } => {
+  const onMouseDown = (event: TerminalCopyMouseEvent): void => {
+    if (
+      !shouldForceBrowserTerminalSelection(event, args.terminal) &&
+      !shouldForceTerminalSelectionContext(event, args.terminal)
+    ) {
+      return
+    }
+    forceTerminalSelectionModifier(event)
+  }
+  const onCopy = (event: TerminalCopyClipboardEvent): void => {
+    if (!writeTerminalSelectionToClipboardData(args.terminal, event.clipboardData)) {
+      return
+    }
+    event.preventDefault()
+    event.stopPropagation()
+  }
+
+  args.host.addEventListener("mousedown", onMouseDown, true)
+  args.host.addEventListener("copy", onCopy, true)
+
+  return {
+    dispose: () => {
+      args.host.removeEventListener("mousedown", onMouseDown, true)
+      args.host.removeEventListener("copy", onCopy, true)
+    }
+  }
+}

packages/app/src/web/terminal-panel-input.ts

@@ -0,0 +1,60 @@
+import type { TerminalPasteGuard } from "./terminal-panel-runtime-types.js"
+
+export type TerminalClientMessage =
+  | { readonly data: string; readonly type: "input" }
+  | { readonly cols: number; readonly rows: number; readonly type: "resize" }
+
+type TerminalClientSocket = {
+  readonly readyState: number
+  readonly send: (data: string) => void
+}
+
+export type TerminalClientSocketRef = { readonly current: TerminalClientSocket | null }
+
+type TerminalInputTarget = {
+  readonly onData: (handler: (data: string) => void) => { readonly dispose: () => void }
+  readonly scrollToBottom: () => void
+}
+
+const csiPrefix = "\u001B["
+const x10MouseReportPrefix = `${csiPrefix}M`
+const x10MouseReportLength = 6
+const sgrMouseReportBodyPattern = /^<\d+;\d+;\d+[Mm]$/u
+const urxvtMouseReportBodyPattern = /^\d+;\d+;\d+M$/u
+
+export const isTerminalMouseReportInput = (data: string): boolean => {
+  if (data.startsWith(x10MouseReportPrefix)) {
+    return data.length === x10MouseReportLength
+  }
+  if (!data.startsWith(csiPrefix)) {
+    return false
+  }
+  const body = data.slice(csiPrefix.length)
+  return sgrMouseReportBodyPattern.test(body) || urxvtMouseReportBodyPattern.test(body)
+}
+
+export const sendTerminalClientMessage = (
+  socketRef: TerminalClientSocketRef,
+  message: TerminalClientMessage
+): void => {
+  const socket = socketRef.current
+  if (socket === null || socket.readyState !== WebSocket.OPEN) {
+    return
+  }
+  socket.send(JSON.stringify(message))
+}
+
+export const attachTerminalInput = (
+  terminal: TerminalInputTarget,
+  socketRef: TerminalClientSocketRef,
+  pasteGuard: TerminalPasteGuard
+) =>
+  terminal.onData((data) => {
+    if (pasteGuard.shouldSuppressTerminalInput(data)) {
+      return
+    }
+    if (!isTerminalMouseReportInput(data)) {
+      terminal.scrollToBottom()
+    }
+    sendTerminalClientMessage(socketRef, { data, type: "input" })
+  })

packages/app/src/web/terminal-panel-runtime-core.ts

@@ -18,13 +18,13 @@ import {
   unavailableTerminalInlineImageEntry
 } from "./terminal-inline-images.js"
 import type { TerminalInlineImageEntry } from "./terminal-inline-images.js"
+import { sendTerminalClientMessage } from "./terminal-panel-input.js"
 import type {
   TerminalCleanupArgs,
   TerminalExitInfo,
   TerminalInputController,
   TerminalLifecycleState,
   TerminalMessageHandlers,
-  TerminalPasteGuard,
   TerminalRuntime,
   TerminalSocketConnectArgs,
   TerminalSocketListenerArgs,
@@ -34,9 +34,7 @@ import { installTerminalQuerySuppression, type TerminalQuerySuppressionOptions }
 import { resolveTerminalReconnectDelay, terminalReconnectGraceMs } from "./terminal-reconnect.js"
 import { parseTerminalServerMessage, resolveTerminalWebSocketUrl } from "./terminal.js"
 
-type TerminalClientMessage =
-  | { readonly data: string; readonly type: "input" }
-  | { readonly cols: number; readonly rows: number; readonly type: "resize" }
+export { attachTerminalInput, isTerminalMouseReportInput } from "./terminal-panel-input.js"
 
 type TerminalRuntimeOptions = {
   readonly querySuppression?: TerminalQuerySuppressionOptions
@@ -90,7 +88,9 @@ export const createTerminalRuntime = (
     cursorBlink: true,
     fontFamily: "'IBM Plex Mono', 'SFMono-Regular', monospace",
     fontSize: 14,
+    macOptionClickForcesSelection: true,
     scrollback: 50_000,
+    scrollOnUserInput: false,
     theme: { background: "#080a0d", foreground: "#f4f7fb" }
   })
   installTerminalQuerySuppression(terminal, options.querySuppression)
@@ -122,17 +122,6 @@ const createTerminalSocket = (
   terminal: Terminal
 ): WebSocket => new WebSocket(resolveTerminalWebSocketUrl(session.websocketPath, terminal.cols, terminal.rows))
 
-const sendTerminalClientMessage = (
-  socketRef: TerminalSocketRef,
-  message: TerminalClientMessage
-): void => {
-  const socket = socketRef.current
-  if (socket === null || socket.readyState !== WebSocket.OPEN) {
-    return
-  }
-  socket.send(JSON.stringify(message))
-}
-
 export const sendTerminalResize = (
   fitAddon: FitAddon,
   socketRef: TerminalSocketRef,
@@ -164,18 +153,6 @@ export const observeTerminalResize = (
   return resizeObserver
 }
 
-export const attachTerminalInput = (
-  terminal: Terminal,
-  socketRef: TerminalSocketRef,
-  pasteGuard: TerminalPasteGuard
-) =>
-  terminal.onData((data) => {
-    if (pasteGuard.shouldSuppressTerminalInput(data)) {
-      return
-    }
-    sendTerminalClientMessage(socketRef, { data, type: "input" })
-  })
-
 const notifyTerminalReady = (
   handlers: TerminalMessageHandlers
 ): void => {