Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
189 changes: 156 additions & 33 deletions apps/web/src/components/ThreadTerminalDrawer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import {
XIcon,
} from "lucide-react";
import {
type ContextMenuItem,
type ResolvedKeybindingsConfig,
type ScopedThreadRef,
type ThreadId,
Expand All@@ -32,7 +33,7 @@ import {
} from "react";
import { Popover, PopoverPopup, PopoverTrigger } from "~/components/ui/popover";
import { Button } from "~/components/ui/button";
import { writeTextToClipboard } from "~/hooks/useCopyToClipboard";
import { readTextFromClipboard, writeTextToClipboard } from "~/hooks/useCopyToClipboard";
import { cn } from "~/lib/utils";
import { type TerminalContextSelection } from "~/lib/terminalContext";
import {
Expand DownExpand Up@@ -255,6 +256,49 @@ export function terminalSelectionLineRange(position: {
};
}

export type TerminalContextMenuAction = "add-to-chat" | "copy" | "paste";

/** Post-selection popup: just the two selection actions, always enabled. */
export function terminalSelectionMenuItems(): ContextMenuItem<"add-to-chat" | "copy">[] {
return [
{ id: "add-to-chat", label: "Add to chat" },
{ id: "copy", label: "Copy" },
];
}

/**
* Right-click menu for the terminal canvas: the selection actions (disabled
* until a selection exists) plus Paste. Paste is always offered: the browser
* (and Electron's default editing menu) can only paste into an editable
* element, so a canvas terminal never gets a usable entry from them.
*/
export function terminalContextMenuItems(options: {
hasSelection: boolean;
}): ContextMenuItem<TerminalContextMenuAction>[] {
return [
...terminalSelectionMenuItems().map((item) => ({
...item,
disabled: !options.hasSelection,
})),
{ id: "paste", label: "Paste" },
];
}

/**
* An empty selection change may only cancel a selection-action flow that is
* still current: a pending popup timer, or an open popup whose request id has
* not been superseded. A popup already superseded by a right-click keeps its
* menu promise unsettled for a moment; treating it as active would cancel the
* newer context-menu flow instead.
*/
export function shouldClearTerminalSelectionAction(options: {
timerPending: boolean;
openMenuRequestId: number | null;
currentRequestId: number;
}): boolean {
return options.timerPending || options.openMenuRequestId === options.currentRequestId;
}

export function shouldHandleTerminalExit(
current: TerminalSessionState["status"],
synchronized: TerminalSessionState["status"],
Expand DownExpand Up@@ -328,7 +372,10 @@ export function TerminalViewport({
const selectionPointerRef = useRef<{ x: number; y: number } | null>(null);
const selectionGestureActiveRef = useRef(false);
const selectionActionRequestIdRef = useRef(0);
const selectionActionMenuOpenRef = useRef(false);
// Holds the request id of the selection popup currently on screen, so a
// popup that was superseded (but whose menu promise has not settled yet)
// cannot be mistaken for the active flow.
const openSelectionMenuRequestIdRef = useRef<number | null>(null);
const selectionActionTimerRef = useRef<number | null>(null);
const keybindingsRef = useRef(keybindings);
const runtimeEnvKey = useMemo(() => runtimeEnvSignature(runtimeEnv), [runtimeEnv]);
Expand DownExpand Up@@ -443,6 +490,12 @@ export function TerminalViewport({
onSelectionChange: () => handleSelectionChange(),
beforeKey: (event) => handleBeforeKey(event),
onLinkActivate: (text, event) => handleLinkActivate(text, event),
// The surface listens from construction, so a right-click can land
// while `create` is still awaiting WASM — before the handler below it
// exists. The ref is only assigned once that setup has run.
onContextMenu: (event) => {
if (terminalRef.current) void showTerminalContextMenu(event);
},
};
const terminal = await GhosttyTerminalSurface.create(mount, terminalOptions);
if (cancelled) {
Expand DownExpand Up@@ -518,12 +571,98 @@ export function TerminalViewport({
};
};

const addSelectionToChat = (selection: TerminalContextSelection) => {
handleAddTerminalContext(selection);
terminalRef.current?.clearSelection();
terminalRef.current?.focus();
};

// A selection-action flow that was superseded while its async work ran
// must go silent: no error message, no focus steal.
const reportIfCurrent = (requestId: number, error: unknown, fallback: string) => {
if (requestId !== selectionActionRequestIdRef.current) return;
const activeTerminal = terminalRef.current;
if (activeTerminal) {
writeSystemMessage(activeTerminal, error instanceof Error ? error.message : fallback);
}
};

const focusIfCurrent = (requestId: number) => {
if (requestId === selectionActionRequestIdRef.current) {
terminalRef.current?.focus();
}
};

const copySelection = async (text: string, requestId: number) => {
try {
await writeTextToClipboard(text, "terminal selection");
} catch (error) {
reportIfCurrent(requestId, error, "Unable to copy terminal selection");
}
focusIfCurrent(requestId);
};

const pasteFromClipboard = async (requestId: number) => {
const activeTerminal = terminalRef.current;
if (!activeTerminal) return;
try {
// The surface owns the read so it can claim the paste race before it
// starts: a paste shortcut fired while the menu read is in flight
// supersedes this paste instead of landing alongside it.
await activeTerminal.pasteFromClipboard(
() => readTextFromClipboard("terminal input"),
() => requestId === selectionActionRequestIdRef.current,
);
Comment thread
StiensWout marked this conversation as resolved.
} catch (error) {
reportIfCurrent(requestId, error, "Unable to read the clipboard");
return;
}
focusIfCurrent(requestId);
};
Comment thread
cursor[bot] marked this conversation as resolved.

const showTerminalContextMenu = async (event: MouseEvent) => {
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
if (!localApi || !terminalRef.current) return;
// Own the gesture before anything async: leaving the default alive lets
// the browser (or Electron's editing menu) answer with a Paste entry
// that is permanently disabled over the terminal canvas.
event.preventDefault();
// A right-click supersedes a selection popup that is pending or open.
clearSelectionAction();
const selectionAction = readSelectionAction();
Comment thread
StiensWout marked this conversation as resolved.
const requestId = selectionActionRequestIdRef.current;
let clicked: TerminalContextMenuAction | null;
try {
clicked = await localApi.contextMenu.show(
terminalContextMenuItems({ hasSelection: selectionAction !== null }),
{ x: event.clientX, y: event.clientY },
);
} catch (error) {
reportIfCurrent(requestId, error, "Unable to open the terminal context menu");
focusIfCurrent(requestId);
return;
}
if (requestId !== selectionActionRequestIdRef.current || clicked === null) {
return;
}
switch (clicked) {
case "add-to-chat":
if (selectionAction) addSelectionToChat(selectionAction.selection);
return;
case "copy":
if (selectionAction) await copySelection(selectionAction.clipboardText, requestId);
return;
case "paste":
await pasteFromClipboard(requestId);
return;
}
};

const showSelectionAction = async () => {
if (!localApi) {
clearSelectionAction();
return;
}
if (selectionActionMenuOpenRef.current) {
if (openSelectionMenuRequestIdRef.current !== null) {
return;
}
const nextAction = readSelectionAction();
Expand All@@ -532,45 +671,23 @@ export function TerminalViewport({
return;
}
const requestId = ++selectionActionRequestIdRef.current;
selectionActionMenuOpenRef.current = true;
openSelectionMenuRequestIdRef.current = requestId;
const clicked = await localApi.contextMenu
.show(
[
{ id: "add-to-chat", label: "Add to chat" },
{ id: "copy", label: "Copy" },
],
nextAction.position,
)
.show(terminalSelectionMenuItems(), nextAction.position)
.finally(() => {
selectionActionMenuOpenRef.current = false;
if (openSelectionMenuRequestIdRef.current === requestId) {
openSelectionMenuRequestIdRef.current = null;
}
});
if (requestId !== selectionActionRequestIdRef.current || clicked === null) {
return;
}
switch (clicked) {
case "add-to-chat":
handleAddTerminalContext(nextAction.selection);
terminalRef.current?.clearSelection();
terminalRef.current?.focus();
addSelectionToChat(nextAction.selection);
return;
case "copy":
try {
await writeTextToClipboard(nextAction.clipboardText, "terminal selection");
} catch (error) {
if (requestId !== selectionActionRequestIdRef.current) {
return;
}
const activeTerminal = terminalRef.current;
if (activeTerminal) {
writeSystemMessage(
activeTerminal,
error instanceof Error ? error.message : "Unable to copy terminal selection",
);
}
}
if (requestId === selectionActionRequestIdRef.current) {
terminalRef.current?.focus();
}
await copySelection(nextAction.clipboardText, requestId);
return;
}
};
Expand DownExpand Up@@ -684,11 +801,17 @@ export function TerminalViewport({
if (terminalRef.current?.hasSelection()) {
return;
}
const shouldClear = shouldClearTerminalSelectionAction({
timerPending: selectionActionTimerRef.current !== null,
openMenuRequestId: openSelectionMenuRequestIdRef.current,
currentRequestId: selectionActionRequestIdRef.current,
});
if (!shouldClear) return;
clearSelectionAction();
// A copy shortcut that clears the selection (Ctrl+C) must also close
// the context menu that appears with the selection, but a clear that
// never opened a menu must not dismiss an unrelated one.
if (selectionActionMenuOpenRef.current) {
if (openSelectionMenuRequestIdRef.current !== null) {
void localApi?.contextMenu.close();
}
}
Expand Down
44 changes: 44 additions & 0 deletions apps/web/src/hooks/useCopyToClipboard.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,29 @@ export class ClipboardWriteError extends Schema.TaggedErrorClass<ClipboardWriteE
}
}

export class ClipboardReadUnavailableError extends Schema.TaggedErrorClass<ClipboardReadUnavailableError>()(
"ClipboardReadUnavailableError",
{
target: Schema.String,
},
) {
override get message(): string {
return `Clipboard API is unavailable while reading ${this.target}.`;
}
}

export class ClipboardReadError extends Schema.TaggedErrorClass<ClipboardReadError>()(
"ClipboardReadError",
{
target: Schema.String,
cause: Schema.Defect(),
},
) {
override get message(): string {
return `Failed to read ${this.target} from the clipboard.`;
}
}

export async function writeTextToClipboard(value: string, target = "text") {
if (
typeof window === "undefined" ||
Expand All@@ -48,6 +71,27 @@ export async function writeTextToClipboard(value: string, target = "text") {
}
}

export async function readTextFromClipboard(target = "text"): Promise<string> {
if (
typeof window === "undefined" ||
typeof navigator === "undefined" ||
!navigator.clipboard?.readText
) {
throw new ClipboardReadUnavailableError({
target,
});
}

try {
return await navigator.clipboard.readText();
} catch (cause) {
throw new ClipboardReadError({
target,
cause,
});
}
}

export function useCopyToClipboard<TContext = void>({
timeout = 2000,
target = "text",
Expand Down
30 changes: 30 additions & 0 deletions apps/web/src/terminal/ghostty/surface.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -465,6 +465,12 @@ export interface GhosttyTerminalSurfaceOptions {
readonly onSelectionChange: () => void;
readonly beforeKey: (event: KeyboardEvent) => boolean;
readonly onLinkActivate: (text: string, event: MouseEvent) => void;
/**
* A right-click the running application did not claim through mouse
* reporting. The host owns the menu, so it also owns preventing the browser
* default — whose Paste entry can never reach a canvas terminal.
*/
readonly onContextMenu?: (event: MouseEvent) => void;
}

export class GhosttyTerminalSurface {
Expand DownExpand Up@@ -801,6 +807,28 @@ export class GhosttyTerminalSurface {
this.input.focus({ preventScroll: true });
}

/**
* Pastes clipboard text read by the host (context menu) with the same
* bracketed-paste encoding as a native paste event. The read joins the same
* race the paste shortcut uses — the token is claimed before it starts — so
* a shortcut or native paste arriving during the read supersedes this one
* instead of both reaching the shell.
*/
async pasteFromClipboard(
readText: () => Promise<string>,
isCurrent: () => boolean = () => true,
): Promise<void> {
const token = ++this.pasteShortcutToken;
const text = await readText();
if (this.disposed || this.pasteShortcutToken !== token || !isCurrent()) return;
// As in every paste path, delivering bumps the token so a clipboard read
// still in flight cannot land after this text reaches the shell.
this.pasteShortcutToken += 1;
if (text.length === 0) return;
const encoded = this.core.encodePaste(text);
if (encoded.length > 0) this.options.onData(encoded);
}

hasSelection(): boolean {
return this.core.selectionText().length > 0;
}
Expand DownExpand Up@@ -1373,7 +1401,9 @@ export class GhosttyTerminalSurface {
private readonly onContextMenu = (event: MouseEvent) => {
if (shouldReportTerminalMouse(this.core.isMouseTracking(), event)) {
event.preventDefault();
return;
}
this.options.onContextMenu?.(event);
};

private readonly onScrollbarPointerDown = (event: PointerEvent) => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
189 changes: 156 additions & 33 deletions apps/web/src/components/ThreadTerminalDrawer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import {
XIcon,
} from "lucide-react";
import {
type ContextMenuItem,
type ResolvedKeybindingsConfig,
type ScopedThreadRef,
type ThreadId,
Expand All@@ -32,7 +33,7 @@ import {
} from "react";
import { Popover, PopoverPopup, PopoverTrigger } from "~/components/ui/popover";
import { Button } from "~/components/ui/button";
import { writeTextToClipboard } from "~/hooks/useCopyToClipboard";
import { readTextFromClipboard, writeTextToClipboard } from "~/hooks/useCopyToClipboard";
import { cn } from "~/lib/utils";
import { type TerminalContextSelection } from "~/lib/terminalContext";
import {
Expand DownExpand Up@@ -255,6 +256,49 @@ export function terminalSelectionLineRange(position: {
};
}

export type TerminalContextMenuAction = "add-to-chat" | "copy" | "paste";

/** Post-selection popup: just the two selection actions, always enabled. */
export function terminalSelectionMenuItems(): ContextMenuItem<"add-to-chat" | "copy">[] {
return [
{ id: "add-to-chat", label: "Add to chat" },
{ id: "copy", label: "Copy" },
];
}

/**
* Right-click menu for the terminal canvas: the selection actions (disabled
* until a selection exists) plus Paste. Paste is always offered: the browser
* (and Electron's default editing menu) can only paste into an editable
* element, so a canvas terminal never gets a usable entry from them.
*/
export function terminalContextMenuItems(options: {
hasSelection: boolean;
}): ContextMenuItem<TerminalContextMenuAction>[] {
return [
...terminalSelectionMenuItems().map((item) => ({
...item,
disabled: !options.hasSelection,
})),
{ id: "paste", label: "Paste" },
];
}

/**
* An empty selection change may only cancel a selection-action flow that is
* still current: a pending popup timer, or an open popup whose request id has
* not been superseded. A popup already superseded by a right-click keeps its
* menu promise unsettled for a moment; treating it as active would cancel the
* newer context-menu flow instead.
*/
export function shouldClearTerminalSelectionAction(options: {
timerPending: boolean;
openMenuRequestId: number | null;
currentRequestId: number;
}): boolean {
return options.timerPending || options.openMenuRequestId === options.currentRequestId;
}

export function shouldHandleTerminalExit(
current: TerminalSessionState["status"],
synchronized: TerminalSessionState["status"],
Expand DownExpand Up@@ -328,7 +372,10 @@ export function TerminalViewport({
const selectionPointerRef = useRef<{ x: number; y: number } | null>(null);
const selectionGestureActiveRef = useRef(false);
const selectionActionRequestIdRef = useRef(0);
const selectionActionMenuOpenRef = useRef(false);
// Holds the request id of the selection popup currently on screen, so a
// popup that was superseded (but whose menu promise has not settled yet)
// cannot be mistaken for the active flow.
const openSelectionMenuRequestIdRef = useRef<number | null>(null);
const selectionActionTimerRef = useRef<number | null>(null);
const keybindingsRef = useRef(keybindings);
const runtimeEnvKey = useMemo(() => runtimeEnvSignature(runtimeEnv), [runtimeEnv]);
Expand DownExpand Up@@ -443,6 +490,12 @@ export function TerminalViewport({
onSelectionChange: () => handleSelectionChange(),
beforeKey: (event) => handleBeforeKey(event),
onLinkActivate: (text, event) => handleLinkActivate(text, event),
// The surface listens from construction, so a right-click can land
// while `create` is still awaiting WASM — before the handler below it
// exists. The ref is only assigned once that setup has run.
onContextMenu: (event) => {
if (terminalRef.current) void showTerminalContextMenu(event);
},
};
const terminal = await GhosttyTerminalSurface.create(mount, terminalOptions);
if (cancelled) {
Expand DownExpand Up@@ -518,12 +571,98 @@ export function TerminalViewport({
};
};

const addSelectionToChat = (selection: TerminalContextSelection) => {
handleAddTerminalContext(selection);
terminalRef.current?.clearSelection();
terminalRef.current?.focus();
};

// A selection-action flow that was superseded while its async work ran
// must go silent: no error message, no focus steal.
const reportIfCurrent = (requestId: number, error: unknown, fallback: string) => {
if (requestId !== selectionActionRequestIdRef.current) return;
const activeTerminal = terminalRef.current;
if (activeTerminal) {
writeSystemMessage(activeTerminal, error instanceof Error ? error.message : fallback);
}
};

const focusIfCurrent = (requestId: number) => {
if (requestId === selectionActionRequestIdRef.current) {
terminalRef.current?.focus();
}
};

const copySelection = async (text: string, requestId: number) => {
try {
await writeTextToClipboard(text, "terminal selection");
} catch (error) {
reportIfCurrent(requestId, error, "Unable to copy terminal selection");
}
focusIfCurrent(requestId);
};

const pasteFromClipboard = async (requestId: number) => {
const activeTerminal = terminalRef.current;
if (!activeTerminal) return;
try {
// The surface owns the read so it can claim the paste race before it
// starts: a paste shortcut fired while the menu read is in flight
// supersedes this paste instead of landing alongside it.
await activeTerminal.pasteFromClipboard(
() => readTextFromClipboard("terminal input"),
() => requestId === selectionActionRequestIdRef.current,
);
Comment thread
StiensWout marked this conversation as resolved.
} catch (error) {
reportIfCurrent(requestId, error, "Unable to read the clipboard");
return;
}
focusIfCurrent(requestId);
};
Comment thread
cursor[bot] marked this conversation as resolved.

const showTerminalContextMenu = async (event: MouseEvent) => {
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
if (!localApi || !terminalRef.current) return;
// Own the gesture before anything async: leaving the default alive lets
// the browser (or Electron's editing menu) answer with a Paste entry
// that is permanently disabled over the terminal canvas.
event.preventDefault();
// A right-click supersedes a selection popup that is pending or open.
clearSelectionAction();
const selectionAction = readSelectionAction();
Comment thread
StiensWout marked this conversation as resolved.
const requestId = selectionActionRequestIdRef.current;
let clicked: TerminalContextMenuAction | null;
try {
clicked = await localApi.contextMenu.show(
terminalContextMenuItems({ hasSelection: selectionAction !== null }),
{ x: event.clientX, y: event.clientY },
);
} catch (error) {
reportIfCurrent(requestId, error, "Unable to open the terminal context menu");
focusIfCurrent(requestId);
return;
}
if (requestId !== selectionActionRequestIdRef.current || clicked === null) {
return;
}
switch (clicked) {
case "add-to-chat":
if (selectionAction) addSelectionToChat(selectionAction.selection);
return;
case "copy":
if (selectionAction) await copySelection(selectionAction.clipboardText, requestId);
return;
case "paste":
await pasteFromClipboard(requestId);
return;
}
};

const showSelectionAction = async () => {
if (!localApi) {
clearSelectionAction();
return;
}
if (selectionActionMenuOpenRef.current) {
if (openSelectionMenuRequestIdRef.current !== null) {
return;
}
const nextAction = readSelectionAction();
Expand All@@ -532,45 +671,23 @@ export function TerminalViewport({
return;
}
const requestId = ++selectionActionRequestIdRef.current;
selectionActionMenuOpenRef.current = true;
openSelectionMenuRequestIdRef.current = requestId;
const clicked = await localApi.contextMenu
.show(
[
{ id: "add-to-chat", label: "Add to chat" },
{ id: "copy", label: "Copy" },
],
nextAction.position,
)
.show(terminalSelectionMenuItems(), nextAction.position)
.finally(() => {
selectionActionMenuOpenRef.current = false;
if (openSelectionMenuRequestIdRef.current === requestId) {
openSelectionMenuRequestIdRef.current = null;
}
});
if (requestId !== selectionActionRequestIdRef.current || clicked === null) {
return;
}
switch (clicked) {
case "add-to-chat":
handleAddTerminalContext(nextAction.selection);
terminalRef.current?.clearSelection();
terminalRef.current?.focus();
addSelectionToChat(nextAction.selection);
return;
case "copy":
try {
await writeTextToClipboard(nextAction.clipboardText, "terminal selection");
} catch (error) {
if (requestId !== selectionActionRequestIdRef.current) {
return;
}
const activeTerminal = terminalRef.current;
if (activeTerminal) {
writeSystemMessage(
activeTerminal,
error instanceof Error ? error.message : "Unable to copy terminal selection",
);
}
}
if (requestId === selectionActionRequestIdRef.current) {
terminalRef.current?.focus();
}
await copySelection(nextAction.clipboardText, requestId);
return;
}
};
Expand DownExpand Up@@ -684,11 +801,17 @@ export function TerminalViewport({
if (terminalRef.current?.hasSelection()) {
return;
}
const shouldClear = shouldClearTerminalSelectionAction({
timerPending: selectionActionTimerRef.current !== null,
openMenuRequestId: openSelectionMenuRequestIdRef.current,
currentRequestId: selectionActionRequestIdRef.current,
});
if (!shouldClear) return;
clearSelectionAction();
// A copy shortcut that clears the selection (Ctrl+C) must also close
// the context menu that appears with the selection, but a clear that
// never opened a menu must not dismiss an unrelated one.
if (selectionActionMenuOpenRef.current) {
if (openSelectionMenuRequestIdRef.current !== null) {
void localApi?.contextMenu.close();
}
}
Expand Down
44 changes: 44 additions & 0 deletions apps/web/src/hooks/useCopyToClipboard.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,29 @@ export class ClipboardWriteError extends Schema.TaggedErrorClass<ClipboardWriteE
}
}

export class ClipboardReadUnavailableError extends Schema.TaggedErrorClass<ClipboardReadUnavailableError>()(
"ClipboardReadUnavailableError",
{
target: Schema.String,
},
) {
override get message(): string {
return `Clipboard API is unavailable while reading ${this.target}.`;
}
}

export class ClipboardReadError extends Schema.TaggedErrorClass<ClipboardReadError>()(
"ClipboardReadError",
{
target: Schema.String,
cause: Schema.Defect(),
},
) {
override get message(): string {
return `Failed to read ${this.target} from the clipboard.`;
}
}

export async function writeTextToClipboard(value: string, target = "text") {
if (
typeof window === "undefined" ||
Expand All@@ -48,6 +71,27 @@ export async function writeTextToClipboard(value: string, target = "text") {
}
}

export async function readTextFromClipboard(target = "text"): Promise<string> {
if (
typeof window === "undefined" ||
typeof navigator === "undefined" ||
!navigator.clipboard?.readText
) {
throw new ClipboardReadUnavailableError({
target,
});
}

try {
return await navigator.clipboard.readText();
} catch (cause) {
throw new ClipboardReadError({
target,
cause,
});
}
}

export function useCopyToClipboard<TContext = void>({
timeout = 2000,
target = "text",
Expand Down
30 changes: 30 additions & 0 deletions apps/web/src/terminal/ghostty/surface.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -465,6 +465,12 @@ export interface GhosttyTerminalSurfaceOptions {
readonly onSelectionChange: () => void;
readonly beforeKey: (event: KeyboardEvent) => boolean;
readonly onLinkActivate: (text: string, event: MouseEvent) => void;
/**
* A right-click the running application did not claim through mouse
* reporting. The host owns the menu, so it also owns preventing the browser
* default — whose Paste entry can never reach a canvas terminal.
*/
readonly onContextMenu?: (event: MouseEvent) => void;
}

export class GhosttyTerminalSurface {
Expand DownExpand Up@@ -801,6 +807,28 @@ export class GhosttyTerminalSurface {
this.input.focus({ preventScroll: true });
}

/**
* Pastes clipboard text read by the host (context menu) with the same
* bracketed-paste encoding as a native paste event. The read joins the same
* race the paste shortcut uses — the token is claimed before it starts — so
* a shortcut or native paste arriving during the read supersedes this one
* instead of both reaching the shell.
*/
async pasteFromClipboard(
readText: () => Promise<string>,
isCurrent: () => boolean = () => true,
): Promise<void> {
const token = ++this.pasteShortcutToken;
const text = await readText();
if (this.disposed || this.pasteShortcutToken !== token || !isCurrent()) return;
// As in every paste path, delivering bumps the token so a clipboard read
// still in flight cannot land after this text reaches the shell.
this.pasteShortcutToken += 1;
if (text.length === 0) return;
const encoded = this.core.encodePaste(text);
if (encoded.length > 0) this.options.onData(encoded);
}

hasSelection(): boolean {
return this.core.selectionText().length > 0;
}
Expand DownExpand Up@@ -1373,7 +1401,9 @@ export class GhosttyTerminalSurface {
private readonly onContextMenu = (event: MouseEvent) => {
if (shouldReportTerminalMouse(this.core.isMouseTracking(), event)) {
event.preventDefault();
return;
}
this.options.onContextMenu?.(event);
};

private readonly onScrollbarPointerDown = (event: PointerEvent) => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
189 changes: 156 additions & 33 deletions apps/web/src/components/ThreadTerminalDrawer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import {
XIcon,
} from "lucide-react";
import {
type ContextMenuItem,
type ResolvedKeybindingsConfig,
type ScopedThreadRef,
type ThreadId,
Expand All@@ -32,7 +33,7 @@ import {
} from "react";
import { Popover, PopoverPopup, PopoverTrigger } from "~/components/ui/popover";
import { Button } from "~/components/ui/button";
import { writeTextToClipboard } from "~/hooks/useCopyToClipboard";
import { readTextFromClipboard, writeTextToClipboard } from "~/hooks/useCopyToClipboard";
import { cn } from "~/lib/utils";
import { type TerminalContextSelection } from "~/lib/terminalContext";
import {
Expand DownExpand Up@@ -255,6 +256,49 @@ export function terminalSelectionLineRange(position: {
};
}

export type TerminalContextMenuAction = "add-to-chat" | "copy" | "paste";

/** Post-selection popup: just the two selection actions, always enabled. */
export function terminalSelectionMenuItems(): ContextMenuItem<"add-to-chat" | "copy">[] {
return [
{ id: "add-to-chat", label: "Add to chat" },
{ id: "copy", label: "Copy" },
];
}

/**
* Right-click menu for the terminal canvas: the selection actions (disabled
* until a selection exists) plus Paste. Paste is always offered: the browser
* (and Electron's default editing menu) can only paste into an editable
* element, so a canvas terminal never gets a usable entry from them.
*/
export function terminalContextMenuItems(options: {
hasSelection: boolean;
}): ContextMenuItem<TerminalContextMenuAction>[] {
return [
...terminalSelectionMenuItems().map((item) => ({
...item,
disabled: !options.hasSelection,
})),
{ id: "paste", label: "Paste" },
];
}

/**
* An empty selection change may only cancel a selection-action flow that is
* still current: a pending popup timer, or an open popup whose request id has
* not been superseded. A popup already superseded by a right-click keeps its
* menu promise unsettled for a moment; treating it as active would cancel the
* newer context-menu flow instead.
*/
export function shouldClearTerminalSelectionAction(options: {
timerPending: boolean;
openMenuRequestId: number | null;
currentRequestId: number;
}): boolean {
return options.timerPending || options.openMenuRequestId === options.currentRequestId;
}

export function shouldHandleTerminalExit(
current: TerminalSessionState["status"],
synchronized: TerminalSessionState["status"],
Expand DownExpand Up@@ -328,7 +372,10 @@ export function TerminalViewport({
const selectionPointerRef = useRef<{ x: number; y: number } | null>(null);
const selectionGestureActiveRef = useRef(false);
const selectionActionRequestIdRef = useRef(0);
const selectionActionMenuOpenRef = useRef(false);
// Holds the request id of the selection popup currently on screen, so a
// popup that was superseded (but whose menu promise has not settled yet)
// cannot be mistaken for the active flow.
const openSelectionMenuRequestIdRef = useRef<number | null>(null);
const selectionActionTimerRef = useRef<number | null>(null);
const keybindingsRef = useRef(keybindings);
const runtimeEnvKey = useMemo(() => runtimeEnvSignature(runtimeEnv), [runtimeEnv]);
Expand DownExpand Up@@ -443,6 +490,12 @@ export function TerminalViewport({
onSelectionChange: () => handleSelectionChange(),
beforeKey: (event) => handleBeforeKey(event),
onLinkActivate: (text, event) => handleLinkActivate(text, event),
// The surface listens from construction, so a right-click can land
// while `create` is still awaiting WASM — before the handler below it
// exists. The ref is only assigned once that setup has run.
onContextMenu: (event) => {
if (terminalRef.current) void showTerminalContextMenu(event);
},
};
const terminal = await GhosttyTerminalSurface.create(mount, terminalOptions);
if (cancelled) {
Expand DownExpand Up@@ -518,12 +571,98 @@ export function TerminalViewport({
};
};

const addSelectionToChat = (selection: TerminalContextSelection) => {
handleAddTerminalContext(selection);
terminalRef.current?.clearSelection();
terminalRef.current?.focus();
};

// A selection-action flow that was superseded while its async work ran
// must go silent: no error message, no focus steal.
const reportIfCurrent = (requestId: number, error: unknown, fallback: string) => {
if (requestId !== selectionActionRequestIdRef.current) return;
const activeTerminal = terminalRef.current;
if (activeTerminal) {
writeSystemMessage(activeTerminal, error instanceof Error ? error.message : fallback);
}
};

const focusIfCurrent = (requestId: number) => {
if (requestId === selectionActionRequestIdRef.current) {
terminalRef.current?.focus();
}
};

const copySelection = async (text: string, requestId: number) => {
try {
await writeTextToClipboard(text, "terminal selection");
} catch (error) {
reportIfCurrent(requestId, error, "Unable to copy terminal selection");
}
focusIfCurrent(requestId);
};

const pasteFromClipboard = async (requestId: number) => {
const activeTerminal = terminalRef.current;
if (!activeTerminal) return;
try {
// The surface owns the read so it can claim the paste race before it
// starts: a paste shortcut fired while the menu read is in flight
// supersedes this paste instead of landing alongside it.
await activeTerminal.pasteFromClipboard(
() => readTextFromClipboard("terminal input"),
() => requestId === selectionActionRequestIdRef.current,
);
Comment thread
StiensWout marked this conversation as resolved.
} catch (error) {
reportIfCurrent(requestId, error, "Unable to read the clipboard");
return;
}
focusIfCurrent(requestId);
};
Comment thread
cursor[bot] marked this conversation as resolved.

const showTerminalContextMenu = async (event: MouseEvent) => {
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
if (!localApi || !terminalRef.current) return;
// Own the gesture before anything async: leaving the default alive lets
// the browser (or Electron's editing menu) answer with a Paste entry
// that is permanently disabled over the terminal canvas.
event.preventDefault();
// A right-click supersedes a selection popup that is pending or open.
clearSelectionAction();
const selectionAction = readSelectionAction();
Comment thread
StiensWout marked this conversation as resolved.
const requestId = selectionActionRequestIdRef.current;
let clicked: TerminalContextMenuAction | null;
try {
clicked = await localApi.contextMenu.show(
terminalContextMenuItems({ hasSelection: selectionAction !== null }),
{ x: event.clientX, y: event.clientY },
);
} catch (error) {
reportIfCurrent(requestId, error, "Unable to open the terminal context menu");
focusIfCurrent(requestId);
return;
}
if (requestId !== selectionActionRequestIdRef.current || clicked === null) {
return;
}
switch (clicked) {
case "add-to-chat":
if (selectionAction) addSelectionToChat(selectionAction.selection);
return;
case "copy":
if (selectionAction) await copySelection(selectionAction.clipboardText, requestId);
return;
case "paste":
await pasteFromClipboard(requestId);
return;
}
};

const showSelectionAction = async () => {
if (!localApi) {
clearSelectionAction();
return;
}
if (selectionActionMenuOpenRef.current) {
if (openSelectionMenuRequestIdRef.current !== null) {
return;
}
const nextAction = readSelectionAction();
Expand All@@ -532,45 +671,23 @@ export function TerminalViewport({
return;
}
const requestId = ++selectionActionRequestIdRef.current;
selectionActionMenuOpenRef.current = true;
openSelectionMenuRequestIdRef.current = requestId;
const clicked = await localApi.contextMenu
.show(
[
{ id: "add-to-chat", label: "Add to chat" },
{ id: "copy", label: "Copy" },
],
nextAction.position,
)
.show(terminalSelectionMenuItems(), nextAction.position)
.finally(() => {
selectionActionMenuOpenRef.current = false;
if (openSelectionMenuRequestIdRef.current === requestId) {
openSelectionMenuRequestIdRef.current = null;
}
});
if (requestId !== selectionActionRequestIdRef.current || clicked === null) {
return;
}
switch (clicked) {
case "add-to-chat":
handleAddTerminalContext(nextAction.selection);
terminalRef.current?.clearSelection();
terminalRef.current?.focus();
addSelectionToChat(nextAction.selection);
return;
case "copy":
try {
await writeTextToClipboard(nextAction.clipboardText, "terminal selection");
} catch (error) {
if (requestId !== selectionActionRequestIdRef.current) {
return;
}
const activeTerminal = terminalRef.current;
if (activeTerminal) {
writeSystemMessage(
activeTerminal,
error instanceof Error ? error.message : "Unable to copy terminal selection",
);
}
}
if (requestId === selectionActionRequestIdRef.current) {
terminalRef.current?.focus();
}
await copySelection(nextAction.clipboardText, requestId);
return;
}
};
Expand DownExpand Up@@ -684,11 +801,17 @@ export function TerminalViewport({
if (terminalRef.current?.hasSelection()) {
return;
}
const shouldClear = shouldClearTerminalSelectionAction({
timerPending: selectionActionTimerRef.current !== null,
openMenuRequestId: openSelectionMenuRequestIdRef.current,
currentRequestId: selectionActionRequestIdRef.current,
});
if (!shouldClear) return;
clearSelectionAction();
// A copy shortcut that clears the selection (Ctrl+C) must also close
// the context menu that appears with the selection, but a clear that
// never opened a menu must not dismiss an unrelated one.
if (selectionActionMenuOpenRef.current) {
if (openSelectionMenuRequestIdRef.current !== null) {
void localApi?.contextMenu.close();
}
}
Expand Down
44 changes: 44 additions & 0 deletions apps/web/src/hooks/useCopyToClipboard.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,29 @@ export class ClipboardWriteError extends Schema.TaggedErrorClass<ClipboardWriteE
}
}

export class ClipboardReadUnavailableError extends Schema.TaggedErrorClass<ClipboardReadUnavailableError>()(
"ClipboardReadUnavailableError",
{
target: Schema.String,
},
) {
override get message(): string {
return `Clipboard API is unavailable while reading ${this.target}.`;
}
}

export class ClipboardReadError extends Schema.TaggedErrorClass<ClipboardReadError>()(
"ClipboardReadError",
{
target: Schema.String,
cause: Schema.Defect(),
},
) {
override get message(): string {
return `Failed to read ${this.target} from the clipboard.`;
}
}

export async function writeTextToClipboard(value: string, target = "text") {
if (
typeof window === "undefined" ||
Expand All@@ -48,6 +71,27 @@ export async function writeTextToClipboard(value: string, target = "text") {
}
}

export async function readTextFromClipboard(target = "text"): Promise<string> {
if (
typeof window === "undefined" ||
typeof navigator === "undefined" ||
!navigator.clipboard?.readText
) {
throw new ClipboardReadUnavailableError({
target,
});
}

try {
return await navigator.clipboard.readText();
} catch (cause) {
throw new ClipboardReadError({
target,
cause,
});
}
}

export function useCopyToClipboard<TContext = void>({
timeout = 2000,
target = "text",
Expand Down
30 changes: 30 additions & 0 deletions apps/web/src/terminal/ghostty/surface.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -465,6 +465,12 @@ export interface GhosttyTerminalSurfaceOptions {
readonly onSelectionChange: () => void;
readonly beforeKey: (event: KeyboardEvent) => boolean;
readonly onLinkActivate: (text: string, event: MouseEvent) => void;
/**
* A right-click the running application did not claim through mouse
* reporting. The host owns the menu, so it also owns preventing the browser
* default — whose Paste entry can never reach a canvas terminal.
*/
readonly onContextMenu?: (event: MouseEvent) => void;
}

export class GhosttyTerminalSurface {
Expand DownExpand Up@@ -801,6 +807,28 @@ export class GhosttyTerminalSurface {
this.input.focus({ preventScroll: true });
}

/**
* Pastes clipboard text read by the host (context menu) with the same
* bracketed-paste encoding as a native paste event. The read joins the same
* race the paste shortcut uses — the token is claimed before it starts — so
* a shortcut or native paste arriving during the read supersedes this one
* instead of both reaching the shell.
*/
async pasteFromClipboard(
readText: () => Promise<string>,
isCurrent: () => boolean = () => true,
): Promise<void> {
const token = ++this.pasteShortcutToken;
const text = await readText();
if (this.disposed || this.pasteShortcutToken !== token || !isCurrent()) return;
// As in every paste path, delivering bumps the token so a clipboard read
// still in flight cannot land after this text reaches the shell.
this.pasteShortcutToken += 1;
if (text.length === 0) return;
const encoded = this.core.encodePaste(text);
if (encoded.length > 0) this.options.onData(encoded);
}

hasSelection(): boolean {
return this.core.selectionText().length > 0;
}
Expand DownExpand Up@@ -1373,7 +1401,9 @@ export class GhosttyTerminalSurface {
private readonly onContextMenu = (event: MouseEvent) => {
if (shouldReportTerminalMouse(this.core.isMouseTracking(), event)) {
event.preventDefault();
return;
}
this.options.onContextMenu?.(event);
};

private readonly onScrollbarPointerDown = (event: PointerEvent) => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
189 changes: 156 additions & 33 deletions apps/web/src/components/ThreadTerminalDrawer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import {
XIcon,
} from "lucide-react";
import {
type ContextMenuItem,
type ResolvedKeybindingsConfig,
type ScopedThreadRef,
type ThreadId,
Expand All@@ -32,7 +33,7 @@ import {
} from "react";
import { Popover, PopoverPopup, PopoverTrigger } from "~/components/ui/popover";
import { Button } from "~/components/ui/button";
import { writeTextToClipboard } from "~/hooks/useCopyToClipboard";
import { readTextFromClipboard, writeTextToClipboard } from "~/hooks/useCopyToClipboard";
import { cn } from "~/lib/utils";
import { type TerminalContextSelection } from "~/lib/terminalContext";
import {
Expand DownExpand Up@@ -255,6 +256,49 @@ export function terminalSelectionLineRange(position: {
};
}

export type TerminalContextMenuAction = "add-to-chat" | "copy" | "paste";

/** Post-selection popup: just the two selection actions, always enabled. */
export function terminalSelectionMenuItems(): ContextMenuItem<"add-to-chat" | "copy">[] {
return [
{ id: "add-to-chat", label: "Add to chat" },
{ id: "copy", label: "Copy" },
];
}

/**
* Right-click menu for the terminal canvas: the selection actions (disabled
* until a selection exists) plus Paste. Paste is always offered: the browser
* (and Electron's default editing menu) can only paste into an editable
* element, so a canvas terminal never gets a usable entry from them.
*/
export function terminalContextMenuItems(options: {
hasSelection: boolean;
}): ContextMenuItem<TerminalContextMenuAction>[] {
return [
...terminalSelectionMenuItems().map((item) => ({
...item,
disabled: !options.hasSelection,
})),
{ id: "paste", label: "Paste" },
];
}

/**
* An empty selection change may only cancel a selection-action flow that is
* still current: a pending popup timer, or an open popup whose request id has
* not been superseded. A popup already superseded by a right-click keeps its
* menu promise unsettled for a moment; treating it as active would cancel the
* newer context-menu flow instead.
*/
export function shouldClearTerminalSelectionAction(options: {
timerPending: boolean;
openMenuRequestId: number | null;
currentRequestId: number;
}): boolean {
return options.timerPending || options.openMenuRequestId === options.currentRequestId;
}

export function shouldHandleTerminalExit(
current: TerminalSessionState["status"],
synchronized: TerminalSessionState["status"],
Expand DownExpand Up@@ -328,7 +372,10 @@ export function TerminalViewport({
const selectionPointerRef = useRef<{ x: number; y: number } | null>(null);
const selectionGestureActiveRef = useRef(false);
const selectionActionRequestIdRef = useRef(0);
const selectionActionMenuOpenRef = useRef(false);
// Holds the request id of the selection popup currently on screen, so a
// popup that was superseded (but whose menu promise has not settled yet)
// cannot be mistaken for the active flow.
const openSelectionMenuRequestIdRef = useRef<number | null>(null);
const selectionActionTimerRef = useRef<number | null>(null);
const keybindingsRef = useRef(keybindings);
const runtimeEnvKey = useMemo(() => runtimeEnvSignature(runtimeEnv), [runtimeEnv]);
Expand DownExpand Up@@ -443,6 +490,12 @@ export function TerminalViewport({
onSelectionChange: () => handleSelectionChange(),
beforeKey: (event) => handleBeforeKey(event),
onLinkActivate: (text, event) => handleLinkActivate(text, event),
// The surface listens from construction, so a right-click can land
// while `create` is still awaiting WASM — before the handler below it
// exists. The ref is only assigned once that setup has run.
onContextMenu: (event) => {
if (terminalRef.current) void showTerminalContextMenu(event);
},
};
const terminal = await GhosttyTerminalSurface.create(mount, terminalOptions);
if (cancelled) {
Expand DownExpand Up@@ -518,12 +571,98 @@ export function TerminalViewport({
};
};

const addSelectionToChat = (selection: TerminalContextSelection) => {
handleAddTerminalContext(selection);
terminalRef.current?.clearSelection();
terminalRef.current?.focus();
};

// A selection-action flow that was superseded while its async work ran
// must go silent: no error message, no focus steal.
const reportIfCurrent = (requestId: number, error: unknown, fallback: string) => {
if (requestId !== selectionActionRequestIdRef.current) return;
const activeTerminal = terminalRef.current;
if (activeTerminal) {
writeSystemMessage(activeTerminal, error instanceof Error ? error.message : fallback);
}
};

const focusIfCurrent = (requestId: number) => {
if (requestId === selectionActionRequestIdRef.current) {
terminalRef.current?.focus();
}
};

const copySelection = async (text: string, requestId: number) => {
try {
await writeTextToClipboard(text, "terminal selection");
} catch (error) {
reportIfCurrent(requestId, error, "Unable to copy terminal selection");
}
focusIfCurrent(requestId);
};

const pasteFromClipboard = async (requestId: number) => {
const activeTerminal = terminalRef.current;
if (!activeTerminal) return;
try {
// The surface owns the read so it can claim the paste race before it
// starts: a paste shortcut fired while the menu read is in flight
// supersedes this paste instead of landing alongside it.
await activeTerminal.pasteFromClipboard(
() => readTextFromClipboard("terminal input"),
() => requestId === selectionActionRequestIdRef.current,
);
Comment thread
StiensWout marked this conversation as resolved.
} catch (error) {
reportIfCurrent(requestId, error, "Unable to read the clipboard");
return;
}
focusIfCurrent(requestId);
};
Comment thread
cursor[bot] marked this conversation as resolved.

const showTerminalContextMenu = async (event: MouseEvent) => {
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
if (!localApi || !terminalRef.current) return;
// Own the gesture before anything async: leaving the default alive lets
// the browser (or Electron's editing menu) answer with a Paste entry
// that is permanently disabled over the terminal canvas.
event.preventDefault();
// A right-click supersedes a selection popup that is pending or open.
clearSelectionAction();
const selectionAction = readSelectionAction();
Comment thread
StiensWout marked this conversation as resolved.
const requestId = selectionActionRequestIdRef.current;
let clicked: TerminalContextMenuAction | null;
try {
clicked = await localApi.contextMenu.show(
terminalContextMenuItems({ hasSelection: selectionAction !== null }),
{ x: event.clientX, y: event.clientY },
);
} catch (error) {
reportIfCurrent(requestId, error, "Unable to open the terminal context menu");
focusIfCurrent(requestId);
return;
}
if (requestId !== selectionActionRequestIdRef.current || clicked === null) {
return;
}
switch (clicked) {
case "add-to-chat":
if (selectionAction) addSelectionToChat(selectionAction.selection);
return;
case "copy":
if (selectionAction) await copySelection(selectionAction.clipboardText, requestId);
return;
case "paste":
await pasteFromClipboard(requestId);
return;
}
};

const showSelectionAction = async () => {
if (!localApi) {
clearSelectionAction();
return;
}
if (selectionActionMenuOpenRef.current) {
if (openSelectionMenuRequestIdRef.current !== null) {
return;
}
const nextAction = readSelectionAction();
Expand All@@ -532,45 +671,23 @@ export function TerminalViewport({
return;
}
const requestId = ++selectionActionRequestIdRef.current;
selectionActionMenuOpenRef.current = true;
openSelectionMenuRequestIdRef.current = requestId;
const clicked = await localApi.contextMenu
.show(
[
{ id: "add-to-chat", label: "Add to chat" },
{ id: "copy", label: "Copy" },
],
nextAction.position,
)
.show(terminalSelectionMenuItems(), nextAction.position)
.finally(() => {
selectionActionMenuOpenRef.current = false;
if (openSelectionMenuRequestIdRef.current === requestId) {
openSelectionMenuRequestIdRef.current = null;
}
});
if (requestId !== selectionActionRequestIdRef.current || clicked === null) {
return;
}
switch (clicked) {
case "add-to-chat":
handleAddTerminalContext(nextAction.selection);
terminalRef.current?.clearSelection();
terminalRef.current?.focus();
addSelectionToChat(nextAction.selection);
return;
case "copy":
try {
await writeTextToClipboard(nextAction.clipboardText, "terminal selection");
} catch (error) {
if (requestId !== selectionActionRequestIdRef.current) {
return;
}
const activeTerminal = terminalRef.current;
if (activeTerminal) {
writeSystemMessage(
activeTerminal,
error instanceof Error ? error.message : "Unable to copy terminal selection",
);
}
}
if (requestId === selectionActionRequestIdRef.current) {
terminalRef.current?.focus();
}
await copySelection(nextAction.clipboardText, requestId);
return;
}
};
Expand DownExpand Up@@ -684,11 +801,17 @@ export function TerminalViewport({
if (terminalRef.current?.hasSelection()) {
return;
}
const shouldClear = shouldClearTerminalSelectionAction({
timerPending: selectionActionTimerRef.current !== null,
openMenuRequestId: openSelectionMenuRequestIdRef.current,
currentRequestId: selectionActionRequestIdRef.current,
});
if (!shouldClear) return;
clearSelectionAction();
// A copy shortcut that clears the selection (Ctrl+C) must also close
// the context menu that appears with the selection, but a clear that
// never opened a menu must not dismiss an unrelated one.
if (selectionActionMenuOpenRef.current) {
if (openSelectionMenuRequestIdRef.current !== null) {
void localApi?.contextMenu.close();
}
}
Expand Down
44 changes: 44 additions & 0 deletions apps/web/src/hooks/useCopyToClipboard.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,29 @@ export class ClipboardWriteError extends Schema.TaggedErrorClass<ClipboardWriteE
}
}

export class ClipboardReadUnavailableError extends Schema.TaggedErrorClass<ClipboardReadUnavailableError>()(
"ClipboardReadUnavailableError",
{
target: Schema.String,
},
) {
override get message(): string {
return `Clipboard API is unavailable while reading ${this.target}.`;
}
}

export class ClipboardReadError extends Schema.TaggedErrorClass<ClipboardReadError>()(
"ClipboardReadError",
{
target: Schema.String,
cause: Schema.Defect(),
},
) {
override get message(): string {
return `Failed to read ${this.target} from the clipboard.`;
}
}

export async function writeTextToClipboard(value: string, target = "text") {
if (
typeof window === "undefined" ||
Expand All@@ -48,6 +71,27 @@ export async function writeTextToClipboard(value: string, target = "text") {
}
}

export async function readTextFromClipboard(target = "text"): Promise<string> {
if (
typeof window === "undefined" ||
typeof navigator === "undefined" ||
!navigator.clipboard?.readText
) {
throw new ClipboardReadUnavailableError({
target,
});
}

try {
return await navigator.clipboard.readText();
} catch (cause) {
throw new ClipboardReadError({
target,
cause,
});
}
}

export function useCopyToClipboard<TContext = void>({
timeout = 2000,
target = "text",
Expand Down
30 changes: 30 additions & 0 deletions apps/web/src/terminal/ghostty/surface.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -465,6 +465,12 @@ export interface GhosttyTerminalSurfaceOptions {
readonly onSelectionChange: () => void;
readonly beforeKey: (event: KeyboardEvent) => boolean;
readonly onLinkActivate: (text: string, event: MouseEvent) => void;
/**
* A right-click the running application did not claim through mouse
* reporting. The host owns the menu, so it also owns preventing the browser
* default — whose Paste entry can never reach a canvas terminal.
*/
readonly onContextMenu?: (event: MouseEvent) => void;
}

export class GhosttyTerminalSurface {
Expand DownExpand Up@@ -801,6 +807,28 @@ export class GhosttyTerminalSurface {
this.input.focus({ preventScroll: true });
}

/**
* Pastes clipboard text read by the host (context menu) with the same
* bracketed-paste encoding as a native paste event. The read joins the same
* race the paste shortcut uses — the token is claimed before it starts — so
* a shortcut or native paste arriving during the read supersedes this one
* instead of both reaching the shell.
*/
async pasteFromClipboard(
readText: () => Promise<string>,
isCurrent: () => boolean = () => true,
): Promise<void> {
const token = ++this.pasteShortcutToken;
const text = await readText();
if (this.disposed || this.pasteShortcutToken !== token || !isCurrent()) return;
// As in every paste path, delivering bumps the token so a clipboard read
// still in flight cannot land after this text reaches the shell.
this.pasteShortcutToken += 1;
if (text.length === 0) return;
const encoded = this.core.encodePaste(text);
if (encoded.length > 0) this.options.onData(encoded);
}

hasSelection(): boolean {
return this.core.selectionText().length > 0;
}
Expand DownExpand Up@@ -1373,7 +1401,9 @@ export class GhosttyTerminalSurface {
private readonly onContextMenu = (event: MouseEvent) => {
if (shouldReportTerminalMouse(this.core.isMouseTracking(), event)) {
event.preventDefault();
return;
}
this.options.onContextMenu?.(event);
};

private readonly onScrollbarPointerDown = (event: PointerEvent) => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
189 changes: 156 additions & 33 deletions apps/web/src/components/ThreadTerminalDrawer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import {
XIcon,
} from "lucide-react";
import {
type ContextMenuItem,
type ResolvedKeybindingsConfig,
type ScopedThreadRef,
type ThreadId,
Expand All@@ -32,7 +33,7 @@ import {
} from "react";
import { Popover, PopoverPopup, PopoverTrigger } from "~/components/ui/popover";
import { Button } from "~/components/ui/button";
import { writeTextToClipboard } from "~/hooks/useCopyToClipboard";
import { readTextFromClipboard, writeTextToClipboard } from "~/hooks/useCopyToClipboard";
import { cn } from "~/lib/utils";
import { type TerminalContextSelection } from "~/lib/terminalContext";
import {
Expand DownExpand Up@@ -255,6 +256,49 @@ export function terminalSelectionLineRange(position: {
};
}

export type TerminalContextMenuAction = "add-to-chat" | "copy" | "paste";

/** Post-selection popup: just the two selection actions, always enabled. */
export function terminalSelectionMenuItems(): ContextMenuItem<"add-to-chat" | "copy">[] {
return [
{ id: "add-to-chat", label: "Add to chat" },
{ id: "copy", label: "Copy" },
];
}

/**
* Right-click menu for the terminal canvas: the selection actions (disabled
* until a selection exists) plus Paste. Paste is always offered: the browser
* (and Electron's default editing menu) can only paste into an editable
* element, so a canvas terminal never gets a usable entry from them.
*/
export function terminalContextMenuItems(options: {
hasSelection: boolean;
}): ContextMenuItem<TerminalContextMenuAction>[] {
return [
...terminalSelectionMenuItems().map((item) => ({
...item,
disabled: !options.hasSelection,
})),
{ id: "paste", label: "Paste" },
];
}

/**
* An empty selection change may only cancel a selection-action flow that is
* still current: a pending popup timer, or an open popup whose request id has
* not been superseded. A popup already superseded by a right-click keeps its
* menu promise unsettled for a moment; treating it as active would cancel the
* newer context-menu flow instead.
*/
export function shouldClearTerminalSelectionAction(options: {
timerPending: boolean;
openMenuRequestId: number | null;
currentRequestId: number;
}): boolean {
return options.timerPending || options.openMenuRequestId === options.currentRequestId;
}

export function shouldHandleTerminalExit(
current: TerminalSessionState["status"],
synchronized: TerminalSessionState["status"],
Expand DownExpand Up@@ -328,7 +372,10 @@ export function TerminalViewport({
const selectionPointerRef = useRef<{ x: number; y: number } | null>(null);
const selectionGestureActiveRef = useRef(false);
const selectionActionRequestIdRef = useRef(0);
const selectionActionMenuOpenRef = useRef(false);
// Holds the request id of the selection popup currently on screen, so a
// popup that was superseded (but whose menu promise has not settled yet)
// cannot be mistaken for the active flow.
const openSelectionMenuRequestIdRef = useRef<number | null>(null);
const selectionActionTimerRef = useRef<number | null>(null);
const keybindingsRef = useRef(keybindings);
const runtimeEnvKey = useMemo(() => runtimeEnvSignature(runtimeEnv), [runtimeEnv]);
Expand DownExpand Up@@ -443,6 +490,12 @@ export function TerminalViewport({
onSelectionChange: () => handleSelectionChange(),
beforeKey: (event) => handleBeforeKey(event),
onLinkActivate: (text, event) => handleLinkActivate(text, event),
// The surface listens from construction, so a right-click can land
// while `create` is still awaiting WASM — before the handler below it
// exists. The ref is only assigned once that setup has run.
onContextMenu: (event) => {
if (terminalRef.current) void showTerminalContextMenu(event);
},
};
const terminal = await GhosttyTerminalSurface.create(mount, terminalOptions);
if (cancelled) {
Expand DownExpand Up@@ -518,12 +571,98 @@ export function TerminalViewport({
};
};

const addSelectionToChat = (selection: TerminalContextSelection) => {
handleAddTerminalContext(selection);
terminalRef.current?.clearSelection();
terminalRef.current?.focus();
};

// A selection-action flow that was superseded while its async work ran
// must go silent: no error message, no focus steal.
const reportIfCurrent = (requestId: number, error: unknown, fallback: string) => {
if (requestId !== selectionActionRequestIdRef.current) return;
const activeTerminal = terminalRef.current;
if (activeTerminal) {
writeSystemMessage(activeTerminal, error instanceof Error ? error.message : fallback);
}
};

const focusIfCurrent = (requestId: number) => {
if (requestId === selectionActionRequestIdRef.current) {
terminalRef.current?.focus();
}
};

const copySelection = async (text: string, requestId: number) => {
try {
await writeTextToClipboard(text, "terminal selection");
} catch (error) {
reportIfCurrent(requestId, error, "Unable to copy terminal selection");
}
focusIfCurrent(requestId);
};

const pasteFromClipboard = async (requestId: number) => {
const activeTerminal = terminalRef.current;
if (!activeTerminal) return;
try {
// The surface owns the read so it can claim the paste race before it
// starts: a paste shortcut fired while the menu read is in flight
// supersedes this paste instead of landing alongside it.
await activeTerminal.pasteFromClipboard(
() => readTextFromClipboard("terminal input"),
() => requestId === selectionActionRequestIdRef.current,
);
Comment thread
StiensWout marked this conversation as resolved.
} catch (error) {
reportIfCurrent(requestId, error, "Unable to read the clipboard");
return;
}
focusIfCurrent(requestId);
};
Comment thread
cursor[bot] marked this conversation as resolved.

const showTerminalContextMenu = async (event: MouseEvent) => {
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
if (!localApi || !terminalRef.current) return;
// Own the gesture before anything async: leaving the default alive lets
// the browser (or Electron's editing menu) answer with a Paste entry
// that is permanently disabled over the terminal canvas.
event.preventDefault();
// A right-click supersedes a selection popup that is pending or open.
clearSelectionAction();
const selectionAction = readSelectionAction();
Comment thread
StiensWout marked this conversation as resolved.
const requestId = selectionActionRequestIdRef.current;
let clicked: TerminalContextMenuAction | null;
try {
clicked = await localApi.contextMenu.show(
terminalContextMenuItems({ hasSelection: selectionAction !== null }),
{ x: event.clientX, y: event.clientY },
);
} catch (error) {
reportIfCurrent(requestId, error, "Unable to open the terminal context menu");
focusIfCurrent(requestId);
return;
}
if (requestId !== selectionActionRequestIdRef.current || clicked === null) {
return;
}
switch (clicked) {
case "add-to-chat":
if (selectionAction) addSelectionToChat(selectionAction.selection);
return;
case "copy":
if (selectionAction) await copySelection(selectionAction.clipboardText, requestId);
return;
case "paste":
await pasteFromClipboard(requestId);
return;
}
};

const showSelectionAction = async () => {
if (!localApi) {
clearSelectionAction();
return;
}
if (selectionActionMenuOpenRef.current) {
if (openSelectionMenuRequestIdRef.current !== null) {
return;
}
const nextAction = readSelectionAction();
Expand All@@ -532,45 +671,23 @@ export function TerminalViewport({
return;
}
const requestId = ++selectionActionRequestIdRef.current;
selectionActionMenuOpenRef.current = true;
openSelectionMenuRequestIdRef.current = requestId;
const clicked = await localApi.contextMenu
.show(
[
{ id: "add-to-chat", label: "Add to chat" },
{ id: "copy", label: "Copy" },
],
nextAction.position,
)
.show(terminalSelectionMenuItems(), nextAction.position)
.finally(() => {
selectionActionMenuOpenRef.current = false;
if (openSelectionMenuRequestIdRef.current === requestId) {
openSelectionMenuRequestIdRef.current = null;
}
});
if (requestId !== selectionActionRequestIdRef.current || clicked === null) {
return;
}
switch (clicked) {
case "add-to-chat":
handleAddTerminalContext(nextAction.selection);
terminalRef.current?.clearSelection();
terminalRef.current?.focus();
addSelectionToChat(nextAction.selection);
return;
case "copy":
try {
await writeTextToClipboard(nextAction.clipboardText, "terminal selection");
} catch (error) {
if (requestId !== selectionActionRequestIdRef.current) {
return;
}
const activeTerminal = terminalRef.current;
if (activeTerminal) {
writeSystemMessage(
activeTerminal,
error instanceof Error ? error.message : "Unable to copy terminal selection",
);
}
}
if (requestId === selectionActionRequestIdRef.current) {
terminalRef.current?.focus();
}
await copySelection(nextAction.clipboardText, requestId);
return;
}
};
Expand DownExpand Up@@ -684,11 +801,17 @@ export function TerminalViewport({
if (terminalRef.current?.hasSelection()) {
return;
}
const shouldClear = shouldClearTerminalSelectionAction({
timerPending: selectionActionTimerRef.current !== null,
openMenuRequestId: openSelectionMenuRequestIdRef.current,
currentRequestId: selectionActionRequestIdRef.current,
});
if (!shouldClear) return;
clearSelectionAction();
// A copy shortcut that clears the selection (Ctrl+C) must also close
// the context menu that appears with the selection, but a clear that
// never opened a menu must not dismiss an unrelated one.
if (selectionActionMenuOpenRef.current) {
if (openSelectionMenuRequestIdRef.current !== null) {
void localApi?.contextMenu.close();
}
}
Expand Down
44 changes: 44 additions & 0 deletions apps/web/src/hooks/useCopyToClipboard.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,29 @@ export class ClipboardWriteError extends Schema.TaggedErrorClass<ClipboardWriteE
}
}

export class ClipboardReadUnavailableError extends Schema.TaggedErrorClass<ClipboardReadUnavailableError>()(
"ClipboardReadUnavailableError",
{
target: Schema.String,
},
) {
override get message(): string {
return `Clipboard API is unavailable while reading ${this.target}.`;
}
}

export class ClipboardReadError extends Schema.TaggedErrorClass<ClipboardReadError>()(
"ClipboardReadError",
{
target: Schema.String,
cause: Schema.Defect(),
},
) {
override get message(): string {
return `Failed to read ${this.target} from the clipboard.`;
}
}

export async function writeTextToClipboard(value: string, target = "text") {
if (
typeof window === "undefined" ||
Expand All@@ -48,6 +71,27 @@ export async function writeTextToClipboard(value: string, target = "text") {
}
}

export async function readTextFromClipboard(target = "text"): Promise<string> {
if (
typeof window === "undefined" ||
typeof navigator === "undefined" ||
!navigator.clipboard?.readText
) {
throw new ClipboardReadUnavailableError({
target,
});
}

try {
return await navigator.clipboard.readText();
} catch (cause) {
throw new ClipboardReadError({
target,
cause,
});
}
}

export function useCopyToClipboard<TContext = void>({
timeout = 2000,
target = "text",
Expand Down
30 changes: 30 additions & 0 deletions apps/web/src/terminal/ghostty/surface.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -465,6 +465,12 @@ export interface GhosttyTerminalSurfaceOptions {
readonly onSelectionChange: () => void;
readonly beforeKey: (event: KeyboardEvent) => boolean;
readonly onLinkActivate: (text: string, event: MouseEvent) => void;
/**
* A right-click the running application did not claim through mouse
* reporting. The host owns the menu, so it also owns preventing the browser
* default — whose Paste entry can never reach a canvas terminal.
*/
readonly onContextMenu?: (event: MouseEvent) => void;
}

export class GhosttyTerminalSurface {
Expand DownExpand Up@@ -801,6 +807,28 @@ export class GhosttyTerminalSurface {
this.input.focus({ preventScroll: true });
}

/**
* Pastes clipboard text read by the host (context menu) with the same
* bracketed-paste encoding as a native paste event. The read joins the same
* race the paste shortcut uses — the token is claimed before it starts — so
* a shortcut or native paste arriving during the read supersedes this one
* instead of both reaching the shell.
*/
async pasteFromClipboard(
readText: () => Promise<string>,
isCurrent: () => boolean = () => true,
): Promise<void> {
const token = ++this.pasteShortcutToken;
const text = await readText();
if (this.disposed || this.pasteShortcutToken !== token || !isCurrent()) return;
// As in every paste path, delivering bumps the token so a clipboard read
// still in flight cannot land after this text reaches the shell.
this.pasteShortcutToken += 1;
if (text.length === 0) return;
const encoded = this.core.encodePaste(text);
if (encoded.length > 0) this.options.onData(encoded);
}

hasSelection(): boolean {
return this.core.selectionText().length > 0;
}
Expand DownExpand Up@@ -1373,7 +1401,9 @@ export class GhosttyTerminalSurface {
private readonly onContextMenu = (event: MouseEvent) => {
if (shouldReportTerminalMouse(this.core.isMouseTracking(), event)) {
event.preventDefault();
return;
}
this.options.onContextMenu?.(event);
};

private readonly onScrollbarPointerDown = (event: PointerEvent) => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
189 changes: 156 additions & 33 deletions apps/web/src/components/ThreadTerminalDrawer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import {
XIcon,
} from "lucide-react";
import {
type ContextMenuItem,
type ResolvedKeybindingsConfig,
type ScopedThreadRef,
type ThreadId,
Expand All@@ -32,7 +33,7 @@ import {
} from "react";
import { Popover, PopoverPopup, PopoverTrigger } from "~/components/ui/popover";
import { Button } from "~/components/ui/button";
import { writeTextToClipboard } from "~/hooks/useCopyToClipboard";
import { readTextFromClipboard, writeTextToClipboard } from "~/hooks/useCopyToClipboard";
import { cn } from "~/lib/utils";
import { type TerminalContextSelection } from "~/lib/terminalContext";
import {
Expand DownExpand Up@@ -255,6 +256,49 @@ export function terminalSelectionLineRange(position: {
};
}

export type TerminalContextMenuAction = "add-to-chat" | "copy" | "paste";

/** Post-selection popup: just the two selection actions, always enabled. */
export function terminalSelectionMenuItems(): ContextMenuItem<"add-to-chat" | "copy">[] {
return [
{ id: "add-to-chat", label: "Add to chat" },
{ id: "copy", label: "Copy" },
];
}

/**
* Right-click menu for the terminal canvas: the selection actions (disabled
* until a selection exists) plus Paste. Paste is always offered: the browser
* (and Electron's default editing menu) can only paste into an editable
* element, so a canvas terminal never gets a usable entry from them.
*/
export function terminalContextMenuItems(options: {
hasSelection: boolean;
}): ContextMenuItem<TerminalContextMenuAction>[] {
return [
...terminalSelectionMenuItems().map((item) => ({
...item,
disabled: !options.hasSelection,
})),
{ id: "paste", label: "Paste" },
];
}

/**
* An empty selection change may only cancel a selection-action flow that is
* still current: a pending popup timer, or an open popup whose request id has
* not been superseded. A popup already superseded by a right-click keeps its
* menu promise unsettled for a moment; treating it as active would cancel the
* newer context-menu flow instead.
*/
export function shouldClearTerminalSelectionAction(options: {
timerPending: boolean;
openMenuRequestId: number | null;
currentRequestId: number;
}): boolean {
return options.timerPending || options.openMenuRequestId === options.currentRequestId;
}

export function shouldHandleTerminalExit(
current: TerminalSessionState["status"],
synchronized: TerminalSessionState["status"],
Expand DownExpand Up@@ -328,7 +372,10 @@ export function TerminalViewport({
const selectionPointerRef = useRef<{ x: number; y: number } | null>(null);
const selectionGestureActiveRef = useRef(false);
const selectionActionRequestIdRef = useRef(0);
const selectionActionMenuOpenRef = useRef(false);
// Holds the request id of the selection popup currently on screen, so a
// popup that was superseded (but whose menu promise has not settled yet)
// cannot be mistaken for the active flow.
const openSelectionMenuRequestIdRef = useRef<number | null>(null);
const selectionActionTimerRef = useRef<number | null>(null);
const keybindingsRef = useRef(keybindings);
const runtimeEnvKey = useMemo(() => runtimeEnvSignature(runtimeEnv), [runtimeEnv]);
Expand DownExpand Up@@ -443,6 +490,12 @@ export function TerminalViewport({
onSelectionChange: () => handleSelectionChange(),
beforeKey: (event) => handleBeforeKey(event),
onLinkActivate: (text, event) => handleLinkActivate(text, event),
// The surface listens from construction, so a right-click can land
// while `create` is still awaiting WASM — before the handler below it
// exists. The ref is only assigned once that setup has run.
onContextMenu: (event) => {
if (terminalRef.current) void showTerminalContextMenu(event);
},
};
const terminal = await GhosttyTerminalSurface.create(mount, terminalOptions);
if (cancelled) {
Expand DownExpand Up@@ -518,12 +571,98 @@ export function TerminalViewport({
};
};

const addSelectionToChat = (selection: TerminalContextSelection) => {
handleAddTerminalContext(selection);
terminalRef.current?.clearSelection();
terminalRef.current?.focus();
};

// A selection-action flow that was superseded while its async work ran
// must go silent: no error message, no focus steal.
const reportIfCurrent = (requestId: number, error: unknown, fallback: string) => {
if (requestId !== selectionActionRequestIdRef.current) return;
const activeTerminal = terminalRef.current;
if (activeTerminal) {
writeSystemMessage(activeTerminal, error instanceof Error ? error.message : fallback);
}
};

const focusIfCurrent = (requestId: number) => {
if (requestId === selectionActionRequestIdRef.current) {
terminalRef.current?.focus();
}
};

const copySelection = async (text: string, requestId: number) => {
try {
await writeTextToClipboard(text, "terminal selection");
} catch (error) {
reportIfCurrent(requestId, error, "Unable to copy terminal selection");
}
focusIfCurrent(requestId);
};

const pasteFromClipboard = async (requestId: number) => {
const activeTerminal = terminalRef.current;
if (!activeTerminal) return;
try {
// The surface owns the read so it can claim the paste race before it
// starts: a paste shortcut fired while the menu read is in flight
// supersedes this paste instead of landing alongside it.
await activeTerminal.pasteFromClipboard(
() => readTextFromClipboard("terminal input"),
() => requestId === selectionActionRequestIdRef.current,
);
Comment thread
StiensWout marked this conversation as resolved.
} catch (error) {
reportIfCurrent(requestId, error, "Unable to read the clipboard");
return;
}
focusIfCurrent(requestId);
};
Comment thread
cursor[bot] marked this conversation as resolved.

const showTerminalContextMenu = async (event: MouseEvent) => {
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
if (!localApi || !terminalRef.current) return;
// Own the gesture before anything async: leaving the default alive lets
// the browser (or Electron's editing menu) answer with a Paste entry
// that is permanently disabled over the terminal canvas.
event.preventDefault();
// A right-click supersedes a selection popup that is pending or open.
clearSelectionAction();
const selectionAction = readSelectionAction();
Comment thread
StiensWout marked this conversation as resolved.
const requestId = selectionActionRequestIdRef.current;
let clicked: TerminalContextMenuAction | null;
try {
clicked = await localApi.contextMenu.show(
terminalContextMenuItems({ hasSelection: selectionAction !== null }),
{ x: event.clientX, y: event.clientY },
);
} catch (error) {
reportIfCurrent(requestId, error, "Unable to open the terminal context menu");
focusIfCurrent(requestId);
return;
}
if (requestId !== selectionActionRequestIdRef.current || clicked === null) {
return;
}
switch (clicked) {
case "add-to-chat":
if (selectionAction) addSelectionToChat(selectionAction.selection);
return;
case "copy":
if (selectionAction) await copySelection(selectionAction.clipboardText, requestId);
return;
case "paste":
await pasteFromClipboard(requestId);
return;
}
};

const showSelectionAction = async () => {
if (!localApi) {
clearSelectionAction();
return;
}
if (selectionActionMenuOpenRef.current) {
if (openSelectionMenuRequestIdRef.current !== null) {
return;
}
const nextAction = readSelectionAction();
Expand All@@ -532,45 +671,23 @@ export function TerminalViewport({
return;
}
const requestId = ++selectionActionRequestIdRef.current;
selectionActionMenuOpenRef.current = true;
openSelectionMenuRequestIdRef.current = requestId;
const clicked = await localApi.contextMenu
.show(
[
{ id: "add-to-chat", label: "Add to chat" },
{ id: "copy", label: "Copy" },
],
nextAction.position,
)
.show(terminalSelectionMenuItems(), nextAction.position)
.finally(() => {
selectionActionMenuOpenRef.current = false;
if (openSelectionMenuRequestIdRef.current === requestId) {
openSelectionMenuRequestIdRef.current = null;
}
});
if (requestId !== selectionActionRequestIdRef.current || clicked === null) {
return;
}
switch (clicked) {
case "add-to-chat":
handleAddTerminalContext(nextAction.selection);
terminalRef.current?.clearSelection();
terminalRef.current?.focus();
addSelectionToChat(nextAction.selection);
return;
case "copy":
try {
await writeTextToClipboard(nextAction.clipboardText, "terminal selection");
} catch (error) {
if (requestId !== selectionActionRequestIdRef.current) {
return;
}
const activeTerminal = terminalRef.current;
if (activeTerminal) {
writeSystemMessage(
activeTerminal,
error instanceof Error ? error.message : "Unable to copy terminal selection",
);
}
}
if (requestId === selectionActionRequestIdRef.current) {
terminalRef.current?.focus();
}
await copySelection(nextAction.clipboardText, requestId);
return;
}
};
Expand DownExpand Up@@ -684,11 +801,17 @@ export function TerminalViewport({
if (terminalRef.current?.hasSelection()) {
return;
}
const shouldClear = shouldClearTerminalSelectionAction({
timerPending: selectionActionTimerRef.current !== null,
openMenuRequestId: openSelectionMenuRequestIdRef.current,
currentRequestId: selectionActionRequestIdRef.current,
});
if (!shouldClear) return;
clearSelectionAction();
// A copy shortcut that clears the selection (Ctrl+C) must also close
// the context menu that appears with the selection, but a clear that
// never opened a menu must not dismiss an unrelated one.
if (selectionActionMenuOpenRef.current) {
if (openSelectionMenuRequestIdRef.current !== null) {
void localApi?.contextMenu.close();
}
}
Expand Down
44 changes: 44 additions & 0 deletions apps/web/src/hooks/useCopyToClipboard.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,29 @@ export class ClipboardWriteError extends Schema.TaggedErrorClass<ClipboardWriteE
}
}

export class ClipboardReadUnavailableError extends Schema.TaggedErrorClass<ClipboardReadUnavailableError>()(
"ClipboardReadUnavailableError",
{
target: Schema.String,
},
) {
override get message(): string {
return `Clipboard API is unavailable while reading ${this.target}.`;
}
}

export class ClipboardReadError extends Schema.TaggedErrorClass<ClipboardReadError>()(
"ClipboardReadError",
{
target: Schema.String,
cause: Schema.Defect(),
},
) {
override get message(): string {
return `Failed to read ${this.target} from the clipboard.`;
}
}

export async function writeTextToClipboard(value: string, target = "text") {
if (
typeof window === "undefined" ||
Expand All@@ -48,6 +71,27 @@ export async function writeTextToClipboard(value: string, target = "text") {
}
}

export async function readTextFromClipboard(target = "text"): Promise<string> {
if (
typeof window === "undefined" ||
typeof navigator === "undefined" ||
!navigator.clipboard?.readText
) {
throw new ClipboardReadUnavailableError({
target,
});
}

try {
return await navigator.clipboard.readText();
} catch (cause) {
throw new ClipboardReadError({
target,
cause,
});
}
}

export function useCopyToClipboard<TContext = void>({
timeout = 2000,
target = "text",
Expand Down
30 changes: 30 additions & 0 deletions apps/web/src/terminal/ghostty/surface.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -465,6 +465,12 @@ export interface GhosttyTerminalSurfaceOptions {
readonly onSelectionChange: () => void;
readonly beforeKey: (event: KeyboardEvent) => boolean;
readonly onLinkActivate: (text: string, event: MouseEvent) => void;
/**
* A right-click the running application did not claim through mouse
* reporting. The host owns the menu, so it also owns preventing the browser
* default — whose Paste entry can never reach a canvas terminal.
*/
readonly onContextMenu?: (event: MouseEvent) => void;
}

export class GhosttyTerminalSurface {
Expand DownExpand Up@@ -801,6 +807,28 @@ export class GhosttyTerminalSurface {
this.input.focus({ preventScroll: true });
}

/**
* Pastes clipboard text read by the host (context menu) with the same
* bracketed-paste encoding as a native paste event. The read joins the same
* race the paste shortcut uses — the token is claimed before it starts — so
* a shortcut or native paste arriving during the read supersedes this one
* instead of both reaching the shell.
*/
async pasteFromClipboard(
readText: () => Promise<string>,
isCurrent: () => boolean = () => true,
): Promise<void> {
const token = ++this.pasteShortcutToken;
const text = await readText();
if (this.disposed || this.pasteShortcutToken !== token || !isCurrent()) return;
// As in every paste path, delivering bumps the token so a clipboard read
// still in flight cannot land after this text reaches the shell.
this.pasteShortcutToken += 1;
if (text.length === 0) return;
const encoded = this.core.encodePaste(text);
if (encoded.length > 0) this.options.onData(encoded);
}

hasSelection(): boolean {
return this.core.selectionText().length > 0;
}
Expand DownExpand Up@@ -1373,7 +1401,9 @@ export class GhosttyTerminalSurface {
private readonly onContextMenu = (event: MouseEvent) => {
if (shouldReportTerminalMouse(this.core.isMouseTracking(), event)) {
event.preventDefault();
return;
}
this.options.onContextMenu?.(event);
};

private readonly onScrollbarPointerDown = (event: PointerEvent) => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
189 changes: 156 additions & 33 deletions apps/web/src/components/ThreadTerminalDrawer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import {
XIcon,
} from "lucide-react";
import {
type ContextMenuItem,
type ResolvedKeybindingsConfig,
type ScopedThreadRef,
type ThreadId,
Expand All@@ -32,7 +33,7 @@ import {
} from "react";
import { Popover, PopoverPopup, PopoverTrigger } from "~/components/ui/popover";
import { Button } from "~/components/ui/button";
import { writeTextToClipboard } from "~/hooks/useCopyToClipboard";
import { readTextFromClipboard, writeTextToClipboard } from "~/hooks/useCopyToClipboard";
import { cn } from "~/lib/utils";
import { type TerminalContextSelection } from "~/lib/terminalContext";
import {
Expand DownExpand Up@@ -255,6 +256,49 @@ export function terminalSelectionLineRange(position: {
};
}

export type TerminalContextMenuAction = "add-to-chat" | "copy" | "paste";

/** Post-selection popup: just the two selection actions, always enabled. */
export function terminalSelectionMenuItems(): ContextMenuItem<"add-to-chat" | "copy">[] {
return [
{ id: "add-to-chat", label: "Add to chat" },
{ id: "copy", label: "Copy" },
];
}

/**
* Right-click menu for the terminal canvas: the selection actions (disabled
* until a selection exists) plus Paste. Paste is always offered: the browser
* (and Electron's default editing menu) can only paste into an editable
* element, so a canvas terminal never gets a usable entry from them.
*/
export function terminalContextMenuItems(options: {
hasSelection: boolean;
}): ContextMenuItem<TerminalContextMenuAction>[] {
return [
...terminalSelectionMenuItems().map((item) => ({
...item,
disabled: !options.hasSelection,
})),
{ id: "paste", label: "Paste" },
];
}

/**
* An empty selection change may only cancel a selection-action flow that is
* still current: a pending popup timer, or an open popup whose request id has
* not been superseded. A popup already superseded by a right-click keeps its
* menu promise unsettled for a moment; treating it as active would cancel the
* newer context-menu flow instead.
*/
export function shouldClearTerminalSelectionAction(options: {
timerPending: boolean;
openMenuRequestId: number | null;
currentRequestId: number;
}): boolean {
return options.timerPending || options.openMenuRequestId === options.currentRequestId;
}

export function shouldHandleTerminalExit(
current: TerminalSessionState["status"],
synchronized: TerminalSessionState["status"],
Expand DownExpand Up@@ -328,7 +372,10 @@ export function TerminalViewport({
const selectionPointerRef = useRef<{ x: number; y: number } | null>(null);
const selectionGestureActiveRef = useRef(false);
const selectionActionRequestIdRef = useRef(0);
const selectionActionMenuOpenRef = useRef(false);
// Holds the request id of the selection popup currently on screen, so a
// popup that was superseded (but whose menu promise has not settled yet)
// cannot be mistaken for the active flow.
const openSelectionMenuRequestIdRef = useRef<number | null>(null);
const selectionActionTimerRef = useRef<number | null>(null);
const keybindingsRef = useRef(keybindings);
const runtimeEnvKey = useMemo(() => runtimeEnvSignature(runtimeEnv), [runtimeEnv]);
Expand DownExpand Up@@ -443,6 +490,12 @@ export function TerminalViewport({
onSelectionChange: () => handleSelectionChange(),
beforeKey: (event) => handleBeforeKey(event),
onLinkActivate: (text, event) => handleLinkActivate(text, event),
// The surface listens from construction, so a right-click can land
// while `create` is still awaiting WASM — before the handler below it
// exists. The ref is only assigned once that setup has run.
onContextMenu: (event) => {
if (terminalRef.current) void showTerminalContextMenu(event);
},
};
const terminal = await GhosttyTerminalSurface.create(mount, terminalOptions);
if (cancelled) {
Expand DownExpand Up@@ -518,12 +571,98 @@ export function TerminalViewport({
};
};

const addSelectionToChat = (selection: TerminalContextSelection) => {
handleAddTerminalContext(selection);
terminalRef.current?.clearSelection();
terminalRef.current?.focus();
};

// A selection-action flow that was superseded while its async work ran
// must go silent: no error message, no focus steal.
const reportIfCurrent = (requestId: number, error: unknown, fallback: string) => {
if (requestId !== selectionActionRequestIdRef.current) return;
const activeTerminal = terminalRef.current;
if (activeTerminal) {
writeSystemMessage(activeTerminal, error instanceof Error ? error.message : fallback);
}
};

const focusIfCurrent = (requestId: number) => {
if (requestId === selectionActionRequestIdRef.current) {
terminalRef.current?.focus();
}
};

const copySelection = async (text: string, requestId: number) => {
try {
await writeTextToClipboard(text, "terminal selection");
} catch (error) {
reportIfCurrent(requestId, error, "Unable to copy terminal selection");
}
focusIfCurrent(requestId);
};

const pasteFromClipboard = async (requestId: number) => {
const activeTerminal = terminalRef.current;
if (!activeTerminal) return;
try {
// The surface owns the read so it can claim the paste race before it
// starts: a paste shortcut fired while the menu read is in flight
// supersedes this paste instead of landing alongside it.
await activeTerminal.pasteFromClipboard(
() => readTextFromClipboard("terminal input"),
() => requestId === selectionActionRequestIdRef.current,
);
Comment thread
StiensWout marked this conversation as resolved.
} catch (error) {
reportIfCurrent(requestId, error, "Unable to read the clipboard");
return;
}
focusIfCurrent(requestId);
};
Comment thread
cursor[bot] marked this conversation as resolved.

const showTerminalContextMenu = async (event: MouseEvent) => {
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
if (!localApi || !terminalRef.current) return;
// Own the gesture before anything async: leaving the default alive lets
// the browser (or Electron's editing menu) answer with a Paste entry
// that is permanently disabled over the terminal canvas.
event.preventDefault();
// A right-click supersedes a selection popup that is pending or open.
clearSelectionAction();
const selectionAction = readSelectionAction();
Comment thread
StiensWout marked this conversation as resolved.
const requestId = selectionActionRequestIdRef.current;
let clicked: TerminalContextMenuAction | null;
try {
clicked = await localApi.contextMenu.show(
terminalContextMenuItems({ hasSelection: selectionAction !== null }),
{ x: event.clientX, y: event.clientY },
);
} catch (error) {
reportIfCurrent(requestId, error, "Unable to open the terminal context menu");
focusIfCurrent(requestId);
return;
}
if (requestId !== selectionActionRequestIdRef.current || clicked === null) {
return;
}
switch (clicked) {
case "add-to-chat":
if (selectionAction) addSelectionToChat(selectionAction.selection);
return;
case "copy":
if (selectionAction) await copySelection(selectionAction.clipboardText, requestId);
return;
case "paste":
await pasteFromClipboard(requestId);
return;
}
};

const showSelectionAction = async () => {
if (!localApi) {
clearSelectionAction();
return;
}
if (selectionActionMenuOpenRef.current) {
if (openSelectionMenuRequestIdRef.current !== null) {
return;
}
const nextAction = readSelectionAction();
Expand All@@ -532,45 +671,23 @@ export function TerminalViewport({
return;
}
const requestId = ++selectionActionRequestIdRef.current;
selectionActionMenuOpenRef.current = true;
openSelectionMenuRequestIdRef.current = requestId;
const clicked = await localApi.contextMenu
.show(
[
{ id: "add-to-chat", label: "Add to chat" },
{ id: "copy", label: "Copy" },
],
nextAction.position,
)
.show(terminalSelectionMenuItems(), nextAction.position)
.finally(() => {
selectionActionMenuOpenRef.current = false;
if (openSelectionMenuRequestIdRef.current === requestId) {
openSelectionMenuRequestIdRef.current = null;
}
});
if (requestId !== selectionActionRequestIdRef.current || clicked === null) {
return;
}
switch (clicked) {
case "add-to-chat":
handleAddTerminalContext(nextAction.selection);
terminalRef.current?.clearSelection();
terminalRef.current?.focus();
addSelectionToChat(nextAction.selection);
return;
case "copy":
try {
await writeTextToClipboard(nextAction.clipboardText, "terminal selection");
} catch (error) {
if (requestId !== selectionActionRequestIdRef.current) {
return;
}
const activeTerminal = terminalRef.current;
if (activeTerminal) {
writeSystemMessage(
activeTerminal,
error instanceof Error ? error.message : "Unable to copy terminal selection",
);
}
}
if (requestId === selectionActionRequestIdRef.current) {
terminalRef.current?.focus();
}
await copySelection(nextAction.clipboardText, requestId);
return;
}
};
Expand DownExpand Up@@ -684,11 +801,17 @@ export function TerminalViewport({
if (terminalRef.current?.hasSelection()) {
return;
}
const shouldClear = shouldClearTerminalSelectionAction({
timerPending: selectionActionTimerRef.current !== null,
openMenuRequestId: openSelectionMenuRequestIdRef.current,
currentRequestId: selectionActionRequestIdRef.current,
});
if (!shouldClear) return;
clearSelectionAction();
// A copy shortcut that clears the selection (Ctrl+C) must also close
// the context menu that appears with the selection, but a clear that
// never opened a menu must not dismiss an unrelated one.
if (selectionActionMenuOpenRef.current) {
if (openSelectionMenuRequestIdRef.current !== null) {
void localApi?.contextMenu.close();
}
}
Expand Down
44 changes: 44 additions & 0 deletions apps/web/src/hooks/useCopyToClipboard.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,29 @@ export class ClipboardWriteError extends Schema.TaggedErrorClass<ClipboardWriteE
}
}

export class ClipboardReadUnavailableError extends Schema.TaggedErrorClass<ClipboardReadUnavailableError>()(
"ClipboardReadUnavailableError",
{
target: Schema.String,
},
) {
override get message(): string {
return `Clipboard API is unavailable while reading ${this.target}.`;
}
}

export class ClipboardReadError extends Schema.TaggedErrorClass<ClipboardReadError>()(
"ClipboardReadError",
{
target: Schema.String,
cause: Schema.Defect(),
},
) {
override get message(): string {
return `Failed to read ${this.target} from the clipboard.`;
}
}

export async function writeTextToClipboard(value: string, target = "text") {
if (
typeof window === "undefined" ||
Expand All@@ -48,6 +71,27 @@ export async function writeTextToClipboard(value: string, target = "text") {
}
}

export async function readTextFromClipboard(target = "text"): Promise<string> {
if (
typeof window === "undefined" ||
typeof navigator === "undefined" ||
!navigator.clipboard?.readText
) {
throw new ClipboardReadUnavailableError({
target,
});
}

try {
return await navigator.clipboard.readText();
} catch (cause) {
throw new ClipboardReadError({
target,
cause,
});
}
}

export function useCopyToClipboard<TContext = void>({
timeout = 2000,
target = "text",
Expand Down
30 changes: 30 additions & 0 deletions apps/web/src/terminal/ghostty/surface.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -465,6 +465,12 @@ export interface GhosttyTerminalSurfaceOptions {
readonly onSelectionChange: () => void;
readonly beforeKey: (event: KeyboardEvent) => boolean;
readonly onLinkActivate: (text: string, event: MouseEvent) => void;
/**
* A right-click the running application did not claim through mouse
* reporting. The host owns the menu, so it also owns preventing the browser
* default — whose Paste entry can never reach a canvas terminal.
*/
readonly onContextMenu?: (event: MouseEvent) => void;
}

export class GhosttyTerminalSurface {
Expand DownExpand Up@@ -801,6 +807,28 @@ export class GhosttyTerminalSurface {
this.input.focus({ preventScroll: true });
}

/**
* Pastes clipboard text read by the host (context menu) with the same
* bracketed-paste encoding as a native paste event. The read joins the same
* race the paste shortcut uses — the token is claimed before it starts — so
* a shortcut or native paste arriving during the read supersedes this one
* instead of both reaching the shell.
*/
async pasteFromClipboard(
readText: () => Promise<string>,
isCurrent: () => boolean = () => true,
): Promise<void> {
const token = ++this.pasteShortcutToken;
const text = await readText();
if (this.disposed || this.pasteShortcutToken !== token || !isCurrent()) return;
// As in every paste path, delivering bumps the token so a clipboard read
// still in flight cannot land after this text reaches the shell.
this.pasteShortcutToken += 1;
if (text.length === 0) return;
const encoded = this.core.encodePaste(text);
if (encoded.length > 0) this.options.onData(encoded);
}

hasSelection(): boolean {
return this.core.selectionText().length > 0;
}
Expand DownExpand Up@@ -1373,7 +1401,9 @@ export class GhosttyTerminalSurface {
private readonly onContextMenu = (event: MouseEvent) => {
if (shouldReportTerminalMouse(this.core.isMouseTracking(), event)) {
event.preventDefault();
return;
}
this.options.onContextMenu?.(event);
};

private readonly onScrollbarPointerDown = (event: PointerEvent) => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
189 changes: 156 additions & 33 deletions apps/web/src/components/ThreadTerminalDrawer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import {
XIcon,
} from "lucide-react";
import {
type ContextMenuItem,
type ResolvedKeybindingsConfig,
type ScopedThreadRef,
type ThreadId,
Expand All@@ -32,7 +33,7 @@ import {
} from "react";
import { Popover, PopoverPopup, PopoverTrigger } from "~/components/ui/popover";
import { Button } from "~/components/ui/button";
import { writeTextToClipboard } from "~/hooks/useCopyToClipboard";
import { readTextFromClipboard, writeTextToClipboard } from "~/hooks/useCopyToClipboard";
import { cn } from "~/lib/utils";
import { type TerminalContextSelection } from "~/lib/terminalContext";
import {
Expand DownExpand Up@@ -255,6 +256,49 @@ export function terminalSelectionLineRange(position: {
};
}

export type TerminalContextMenuAction = "add-to-chat" | "copy" | "paste";

/** Post-selection popup: just the two selection actions, always enabled. */
export function terminalSelectionMenuItems(): ContextMenuItem<"add-to-chat" | "copy">[] {
return [
{ id: "add-to-chat", label: "Add to chat" },
{ id: "copy", label: "Copy" },
];
}

/**
* Right-click menu for the terminal canvas: the selection actions (disabled
* until a selection exists) plus Paste. Paste is always offered: the browser
* (and Electron's default editing menu) can only paste into an editable
* element, so a canvas terminal never gets a usable entry from them.
*/
export function terminalContextMenuItems(options: {
hasSelection: boolean;
}): ContextMenuItem<TerminalContextMenuAction>[] {
return [
...terminalSelectionMenuItems().map((item) => ({
...item,
disabled: !options.hasSelection,
})),
{ id: "paste", label: "Paste" },
];
}

/**
* An empty selection change may only cancel a selection-action flow that is
* still current: a pending popup timer, or an open popup whose request id has
* not been superseded. A popup already superseded by a right-click keeps its
* menu promise unsettled for a moment; treating it as active would cancel the
* newer context-menu flow instead.
*/
export function shouldClearTerminalSelectionAction(options: {
timerPending: boolean;
openMenuRequestId: number | null;
currentRequestId: number;
}): boolean {
return options.timerPending || options.openMenuRequestId === options.currentRequestId;
}

export function shouldHandleTerminalExit(
current: TerminalSessionState["status"],
synchronized: TerminalSessionState["status"],
Expand DownExpand Up@@ -328,7 +372,10 @@ export function TerminalViewport({
const selectionPointerRef = useRef<{ x: number; y: number } | null>(null);
const selectionGestureActiveRef = useRef(false);
const selectionActionRequestIdRef = useRef(0);
const selectionActionMenuOpenRef = useRef(false);
// Holds the request id of the selection popup currently on screen, so a
// popup that was superseded (but whose menu promise has not settled yet)
// cannot be mistaken for the active flow.
const openSelectionMenuRequestIdRef = useRef<number | null>(null);
const selectionActionTimerRef = useRef<number | null>(null);
const keybindingsRef = useRef(keybindings);
const runtimeEnvKey = useMemo(() => runtimeEnvSignature(runtimeEnv), [runtimeEnv]);
Expand DownExpand Up@@ -443,6 +490,12 @@ export function TerminalViewport({
onSelectionChange: () => handleSelectionChange(),
beforeKey: (event) => handleBeforeKey(event),
onLinkActivate: (text, event) => handleLinkActivate(text, event),
// The surface listens from construction, so a right-click can land
// while `create` is still awaiting WASM — before the handler below it
// exists. The ref is only assigned once that setup has run.
onContextMenu: (event) => {
if (terminalRef.current) void showTerminalContextMenu(event);
},
};
const terminal = await GhosttyTerminalSurface.create(mount, terminalOptions);
if (cancelled) {
Expand DownExpand Up@@ -518,12 +571,98 @@ export function TerminalViewport({
};
};

const addSelectionToChat = (selection: TerminalContextSelection) => {
handleAddTerminalContext(selection);
terminalRef.current?.clearSelection();
terminalRef.current?.focus();
};

// A selection-action flow that was superseded while its async work ran
// must go silent: no error message, no focus steal.
const reportIfCurrent = (requestId: number, error: unknown, fallback: string) => {
if (requestId !== selectionActionRequestIdRef.current) return;
const activeTerminal = terminalRef.current;
if (activeTerminal) {
writeSystemMessage(activeTerminal, error instanceof Error ? error.message : fallback);
}
};

const focusIfCurrent = (requestId: number) => {
if (requestId === selectionActionRequestIdRef.current) {
terminalRef.current?.focus();
}
};

const copySelection = async (text: string, requestId: number) => {
try {
await writeTextToClipboard(text, "terminal selection");
} catch (error) {
reportIfCurrent(requestId, error, "Unable to copy terminal selection");
}
focusIfCurrent(requestId);
};

const pasteFromClipboard = async (requestId: number) => {
const activeTerminal = terminalRef.current;
if (!activeTerminal) return;
try {
// The surface owns the read so it can claim the paste race before it
// starts: a paste shortcut fired while the menu read is in flight
// supersedes this paste instead of landing alongside it.
await activeTerminal.pasteFromClipboard(
() => readTextFromClipboard("terminal input"),
() => requestId === selectionActionRequestIdRef.current,
);
Comment thread
StiensWout marked this conversation as resolved.
} catch (error) {
reportIfCurrent(requestId, error, "Unable to read the clipboard");
return;
}
focusIfCurrent(requestId);
};
Comment thread
cursor[bot] marked this conversation as resolved.

const showTerminalContextMenu = async (event: MouseEvent) => {
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
if (!localApi || !terminalRef.current) return;
// Own the gesture before anything async: leaving the default alive lets
// the browser (or Electron's editing menu) answer with a Paste entry
// that is permanently disabled over the terminal canvas.
event.preventDefault();
// A right-click supersedes a selection popup that is pending or open.
clearSelectionAction();
const selectionAction = readSelectionAction();
Comment thread
StiensWout marked this conversation as resolved.
const requestId = selectionActionRequestIdRef.current;
let clicked: TerminalContextMenuAction | null;
try {
clicked = await localApi.contextMenu.show(
terminalContextMenuItems({ hasSelection: selectionAction !== null }),
{ x: event.clientX, y: event.clientY },
);
} catch (error) {
reportIfCurrent(requestId, error, "Unable to open the terminal context menu");
focusIfCurrent(requestId);
return;
}
if (requestId !== selectionActionRequestIdRef.current || clicked === null) {
return;
}
switch (clicked) {
case "add-to-chat":
if (selectionAction) addSelectionToChat(selectionAction.selection);
return;
case "copy":
if (selectionAction) await copySelection(selectionAction.clipboardText, requestId);
return;
case "paste":
await pasteFromClipboard(requestId);
return;
}
};

const showSelectionAction = async () => {
if (!localApi) {
clearSelectionAction();
return;
}
if (selectionActionMenuOpenRef.current) {
if (openSelectionMenuRequestIdRef.current !== null) {
return;
}
const nextAction = readSelectionAction();
Expand All@@ -532,45 +671,23 @@ export function TerminalViewport({
return;
}
const requestId = ++selectionActionRequestIdRef.current;
selectionActionMenuOpenRef.current = true;
openSelectionMenuRequestIdRef.current = requestId;
const clicked = await localApi.contextMenu
.show(
[
{ id: "add-to-chat", label: "Add to chat" },
{ id: "copy", label: "Copy" },
],
nextAction.position,
)
.show(terminalSelectionMenuItems(), nextAction.position)
.finally(() => {
selectionActionMenuOpenRef.current = false;
if (openSelectionMenuRequestIdRef.current === requestId) {
openSelectionMenuRequestIdRef.current = null;
}
});
if (requestId !== selectionActionRequestIdRef.current || clicked === null) {
return;
}
switch (clicked) {
case "add-to-chat":
handleAddTerminalContext(nextAction.selection);
terminalRef.current?.clearSelection();
terminalRef.current?.focus();
addSelectionToChat(nextAction.selection);
return;
case "copy":
try {
await writeTextToClipboard(nextAction.clipboardText, "terminal selection");
} catch (error) {
if (requestId !== selectionActionRequestIdRef.current) {
return;
}
const activeTerminal = terminalRef.current;
if (activeTerminal) {
writeSystemMessage(
activeTerminal,
error instanceof Error ? error.message : "Unable to copy terminal selection",
);
}
}
if (requestId === selectionActionRequestIdRef.current) {
terminalRef.current?.focus();
}
await copySelection(nextAction.clipboardText, requestId);
return;
}
};
Expand DownExpand Up@@ -684,11 +801,17 @@ export function TerminalViewport({
if (terminalRef.current?.hasSelection()) {
return;
}
const shouldClear = shouldClearTerminalSelectionAction({
timerPending: selectionActionTimerRef.current !== null,
openMenuRequestId: openSelectionMenuRequestIdRef.current,
currentRequestId: selectionActionRequestIdRef.current,
});
if (!shouldClear) return;
clearSelectionAction();
// A copy shortcut that clears the selection (Ctrl+C) must also close
// the context menu that appears with the selection, but a clear that
// never opened a menu must not dismiss an unrelated one.
if (selectionActionMenuOpenRef.current) {
if (openSelectionMenuRequestIdRef.current !== null) {
void localApi?.contextMenu.close();
}
}
Expand Down
44 changes: 44 additions & 0 deletions apps/web/src/hooks/useCopyToClipboard.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,29 @@ export class ClipboardWriteError extends Schema.TaggedErrorClass<ClipboardWriteE
}
}

export class ClipboardReadUnavailableError extends Schema.TaggedErrorClass<ClipboardReadUnavailableError>()(
"ClipboardReadUnavailableError",
{
target: Schema.String,
},
) {
override get message(): string {
return `Clipboard API is unavailable while reading ${this.target}.`;
}
}

export class ClipboardReadError extends Schema.TaggedErrorClass<ClipboardReadError>()(
"ClipboardReadError",
{
target: Schema.String,
cause: Schema.Defect(),
},
) {
override get message(): string {
return `Failed to read ${this.target} from the clipboard.`;
}
}

export async function writeTextToClipboard(value: string, target = "text") {
if (
typeof window === "undefined" ||
Expand All@@ -48,6 +71,27 @@ export async function writeTextToClipboard(value: string, target = "text") {
}
}

export async function readTextFromClipboard(target = "text"): Promise<string> {
if (
typeof window === "undefined" ||
typeof navigator === "undefined" ||
!navigator.clipboard?.readText
) {
throw new ClipboardReadUnavailableError({
target,
});
}

try {
return await navigator.clipboard.readText();
} catch (cause) {
throw new ClipboardReadError({
target,
cause,
});
}
}

export function useCopyToClipboard<TContext = void>({
timeout = 2000,
target = "text",
Expand Down
30 changes: 30 additions & 0 deletions apps/web/src/terminal/ghostty/surface.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -465,6 +465,12 @@ export interface GhosttyTerminalSurfaceOptions {
readonly onSelectionChange: () => void;
readonly beforeKey: (event: KeyboardEvent) => boolean;
readonly onLinkActivate: (text: string, event: MouseEvent) => void;
/**
* A right-click the running application did not claim through mouse
* reporting. The host owns the menu, so it also owns preventing the browser
* default — whose Paste entry can never reach a canvas terminal.
*/
readonly onContextMenu?: (event: MouseEvent) => void;
}

export class GhosttyTerminalSurface {
Expand DownExpand Up@@ -801,6 +807,28 @@ export class GhosttyTerminalSurface {
this.input.focus({ preventScroll: true });
}

/**
* Pastes clipboard text read by the host (context menu) with the same
* bracketed-paste encoding as a native paste event. The read joins the same
* race the paste shortcut uses — the token is claimed before it starts — so
* a shortcut or native paste arriving during the read supersedes this one
* instead of both reaching the shell.
*/
async pasteFromClipboard(
readText: () => Promise<string>,
isCurrent: () => boolean = () => true,
): Promise<void> {
const token = ++this.pasteShortcutToken;
const text = await readText();
if (this.disposed || this.pasteShortcutToken !== token || !isCurrent()) return;
// As in every paste path, delivering bumps the token so a clipboard read
// still in flight cannot land after this text reaches the shell.
this.pasteShortcutToken += 1;
if (text.length === 0) return;
const encoded = this.core.encodePaste(text);
if (encoded.length > 0) this.options.onData(encoded);
}

hasSelection(): boolean {
return this.core.selectionText().length > 0;
}
Expand DownExpand Up@@ -1373,7 +1401,9 @@ export class GhosttyTerminalSurface {
private readonly onContextMenu = (event: MouseEvent) => {
if (shouldReportTerminalMouse(this.core.isMouseTracking(), event)) {
event.preventDefault();
return;
}
this.options.onContextMenu?.(event);
};

private readonly onScrollbarPointerDown = (event: PointerEvent) => {
Expand Down
Loading