Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

fix(web): make terminal links appear clickable only when clickable (#7488)

oliver883e1a3cd9d7
diff --git a/apps/web/src/components/ThreadTerminalDrawer.tsx b/apps/web/src/components/ThreadTerminalDrawer.tsx
index 3cfeaa649..abd9bf9ed 100644
--- a/apps/web/src/components/ThreadTerminalDrawer.tsx
+++ b/apps/web/src/components/ThreadTerminalDrawer.tsx
@@ -43,7 +43,7 @@ import {
} from "~/terminal/ghostty/surface";
import { type GhosttyColor, type GhosttyTheme } from "~/terminal/ghostty/core";
import { useOpenInPreferredEditor } from "../editorPreferences";
-import { isTerminalLinkActivation, resolvePathLinkTarget } from "../terminal-links";
+import { isTerminalLinkActivation, isTerminalUrl, resolvePathLinkTarget } from "../terminal-links";
import {
isDiffToggleShortcut,
isTerminalClearShortcut,
@@ -750,7 +750,7 @@ export function TerminalViewport({
if (!isTerminalLinkActivation(event)) return;
const latestTerminal = terminalRef.current;
if (!latestTerminal) return;
- if (/^https?:\/\//u.test(text)) {
+ if (isTerminalUrl(text)) {
if (!localApi) {
writeSystemMessage(latestTerminal, "Opening links is unavailable in this browser.");
return;
diff --git a/apps/web/src/terminal-links.test.ts b/apps/web/src/terminal-links.test.ts
index 0f8e61962..34c6c9830 100644
--- a/apps/web/src/terminal-links.test.ts
+++ b/apps/web/src/terminal-links.test.ts
@@ -4,6 +4,7 @@ import {
collectWrappedTerminalLinkLine,
extractTerminalLinks,
isTerminalLinkActivation,
+ isTerminalUrl,
resolvePathLinkTarget,
resolveWrappedTerminalLinkRange,
wrappedTerminalLinkRangeIntersectsBufferLine,
@@ -37,6 +38,24 @@ describe("extractTerminalLinks", () => {
]);
});
+ it("classifies uppercase schemes as URLs at activation time too", () => {
+ expect(isTerminalUrl("HTTPS://example.com/docs")).toBe(true);
+ expect(isTerminalUrl("Http://example.com")).toBe(true);
+ expect(isTerminalUrl("src/components/main.ts")).toBe(false);
+ expect(isTerminalUrl("httpsdocs/readme.md")).toBe(false);
+ });
+
+ it("finds URLs regardless of scheme casing", () => {
+ expect(extractTerminalLinks("open HTTPS://example.com/docs")).toEqual([
+ {
+ kind: "url",
+ text: "HTTPS://example.com/docs",
+ start: 5,
+ end: 29,
+ },
+ ]);
+ });
+
it("trims trailing punctuation from links", () => {
const line = "(https://example.com/docs), ./src/main.ts:12.";
expect(extractTerminalLinks(line)).toEqual([
diff --git a/apps/web/src/terminal-links.ts b/apps/web/src/terminal-links.ts
index a4eeda427..1351a2a6c 100644
--- a/apps/web/src/terminal-links.ts
+++ b/apps/web/src/terminal-links.ts
@@ -36,7 +36,7 @@ export interface WrappedTerminalLinkLine {
segments: ReadonlyArray<WrappedTerminalLinkLineSegment>;
}
-const URL_PATTERN = /https?:\/\/[^\s"'`<>]+/g;
+const URL_PATTERN = /https?:\/\/[^\s"'`<>]+/giu;
const FILE_PATH_PATTERN =
/(?:~\/|\.{1,2}\/|\/|[A-Za-z]:[\\/]|\\\\)[^\s"'`<>]+|[A-Za-z0-9._-]+(?:\/[A-Za-z0-9._-]+)+(?::\d+){0,2}/g;
const TRAILING_PUNCTUATION_PATTERN = /[.,;!?]+$/;
@@ -80,7 +80,7 @@ function collectMatches(
const trimmed = trimClosingDelimiters(raw);
if (trimmed.length === 0) continue;
- if (kind === "path" && /^https?:\/\//i.test(trimmed)) continue;
+ if (kind === "path" && isTerminalUrl(trimmed)) continue;
const candidate: TerminalLinkMatch = {
kind,
@@ -172,6 +172,10 @@ export function extractTerminalLinks(line: string): TerminalLinkMatch[] {
return [...urlMatches, ...pathMatches].toSorted((a, b) => a.start - b.start);
}
+export function isTerminalUrl(value: string): boolean {
+ return /^https?:\/\//iu.test(value);
+}
+
export function collectWrappedTerminalLinkLine(
bufferLineNumber: number,
getLine: (bufferLineIndex: number) => TerminalBufferLineLike | null | undefined,
diff --git a/apps/web/src/terminal/ghostty/surface.test.ts b/apps/web/src/terminal/ghostty/surface.test.ts
index 45177a43a..11b3cc890 100644
--- a/apps/web/src/terminal/ghostty/surface.test.ts
+++ b/apps/web/src/terminal/ghostty/surface.test.ts
@@ -20,7 +20,6 @@ import {
resolveTerminalMouseTrackingState,
shouldBlinkTerminalCursor,
shouldReportTerminalMouse,
- shouldShowTerminalLinkHover,
terminalGridCellAt,
terminalScrollbarGeometry,
terminalScrollbarOffsetAtPointer,
@@ -438,13 +437,6 @@ describe("application mouse reporting", () => {
motionData: "\u001b[<35;8;4M",
});
});
-
- it("only shows link hover during mouse tracking when the link modifier is held", () => {
- expect(shouldShowTerminalLinkHover(false, false)).toBe(true);
- expect(shouldShowTerminalLinkHover(false, true)).toBe(true);
- expect(shouldShowTerminalLinkHover(true, false)).toBe(false);
- expect(shouldShowTerminalLinkHover(true, true)).toBe(true);
- });
});
describe("terminal font resolution", () => {
diff --git a/apps/web/src/terminal/ghostty/surface.ts b/apps/web/src/terminal/ghostty/surface.ts
index f390947c4..d4e503d19 100644
--- a/apps/web/src/terminal/ghostty/surface.ts
+++ b/apps/web/src/terminal/ghostty/surface.ts
@@ -483,13 +483,6 @@ export function isTerminalLinkPointerGesture(
: event.ctrlKey && !event.metaKey;
}
-export function shouldShowTerminalLinkHover(
- mouseTracking: boolean,
- linkModifierActive: boolean,
-): boolean {
- return !mouseTracking || linkModifierActive;
-}
-
export function ghosttyMouseButton(button: number): number | null {
switch (button) {
case 0:
@@ -1409,10 +1402,7 @@ export class GhosttyTerminalSurface {
private refreshHoveredLink(): void {
const pointer = this.hoverPointer;
- const link =
- pointer && shouldShowTerminalLinkHover(this.core.isMouseTracking(), this.linkModifierActive)
- ? this.linkAt(pointer.x, pointer.y)
- : null;
+ const link = pointer && this.linkModifierActive ? this.linkAt(pointer.x, pointer.y) : null;
this.setHoveredLink(link);
}