Skip to content

Commit 1acee5b

Browse files
fix(web): terminal OSC 8 file URIs open the file they name (pingdotgg#36025)
1 parent 2432ee1 commit 1acee5b

3 files changed

Lines changed: 38 additions & 5 deletions

File tree

‎apps/web/src/components/ThreadTerminalDrawer.tsx‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ import {
5757
} from "~/terminal/ghostty/surface";
5858
import { type GhosttyColor, type GhosttyTheme } from "~/terminal/ghostty/core";
5959
import { useOpenInPreferredEditor } from "../editorPreferences";
60-
import { resolvePathLinkTarget } from "@t3tools/shared/fileLinks";
61-
import { isTerminalUrl } from "../terminal-links";
60+
import { isTerminalUrl, resolveTerminalLinkTarget } from "../terminal-links";
6261
import {
6362
isDiffToggleShortcut,
6463
isTerminalClearShortcut,
@@ -526,7 +525,7 @@ function TerminalSessionViewport({
526525
linkPath !== null && canOpenHostEditor && canReadFilesystem
527526
? getFileMetadataQueryAtom(
528527
environmentId,
529-
resolvePathLinkTarget(linkPath, cwd),
528+
resolveTerminalLinkTarget(linkPath, cwd),
530529
cwd,
531530
metadataThreadRef,
532531
)
@@ -547,7 +546,7 @@ function TerminalSessionViewport({
547546
return false;
548547
const query = getFileMetadataQueryAtom(
549548
environmentId,
550-
resolvePathLinkTarget(text, cwd),
549+
resolveTerminalLinkTarget(text, cwd),
551550
cwd,
552551
metadataThreadRef,
553552
);
@@ -1011,7 +1010,7 @@ function TerminalSessionViewport({
10111010
);
10121011
return;
10131012
}
1014-
const target = resolvePathLinkTarget(text, cwd);
1013+
const target = resolveTerminalLinkTarget(text, cwd);
10151014
void (async () => {
10161015
const result = await openTerminalPath(target);
10171016
if (result._tag === "Success" || isAtomCommandInterrupted(result)) {

‎apps/web/src/terminal-links.test.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
collectWrappedTerminalLinkLine,
66
extractTerminalLinks,
77
isTerminalUrl,
8+
resolveTerminalLinkTarget,
89
type TerminalBufferLineLike,
910
} from "./terminal-links";
1011

@@ -297,4 +298,17 @@ describe("resolvePathLinkTarget", () => {
297298
"/Users/julius/project/main.c:10:5",
298299
);
299300
});
301+
302+
// regression: #36005 OSC 8 file URIs were joined onto the cwd as relative paths
303+
it("does not resolve an OSC 8 file URI target against the cwd", () => {
304+
expect(resolveTerminalLinkTarget("file:///var/tmp/report.txt", "/workspace/project")).toBe(
305+
"/var/tmp/report.txt",
306+
);
307+
expect(
308+
resolveTerminalLinkTarget("file://remote.invalid/var/tmp/report.txt", "/workspace/project"),
309+
).not.toMatch(/^\/workspace\/project\//);
310+
expect(resolvePathLinkTarget("file:notes.md", "/workspace/project")).toBe(
311+
"/workspace/project/file:notes.md",
312+
);
313+
});
300314
});

‎apps/web/src/terminal-links.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
import {
2+
formatFilePathPosition,
3+
parseFileUrlHref,
4+
resolvePathLinkTarget,
5+
splitFilePathPosition,
6+
} from "@t3tools/shared/fileLinks";
7+
import { safeDecodeURIComponent } from "@t3tools/shared/markdownLinks";
8+
import { stripSlashPrefixedWindowsDrive } from "@t3tools/shared/path";
19
import { isMacPlatform } from "./lib/utils";
210

311
export type TerminalLinkKind = "url" | "path";
@@ -150,6 +158,18 @@ export function isTerminalUrl(value: string): boolean {
150158
return /^https?:\/\//iu.test(value);
151159
}
152160

161+
/** Explicit OSC 8 targets may be `file://` URIs; everything else is a path relative to `cwd`. */
162+
export function resolveTerminalLinkTarget(text: string, cwd: string): string {
163+
const fileUrl = /^file:\/\//iu.test(text) ? parseFileUrlHref(text) : null;
164+
if (!fileUrl) return resolvePathLinkTarget(text, cwd);
165+
return formatFilePathPosition(
166+
splitFilePathPosition(
167+
stripSlashPrefixedWindowsDrive(safeDecodeURIComponent(fileUrl.path)),
168+
fileUrl.hash,
169+
),
170+
);
171+
}
172+
153173
export function collectWrappedTerminalLinkLine(
154174
bufferLineNumber: number,
155175
getLine: (bufferLineIndex: number) => TerminalBufferLineLike | null | undefined,

0 commit comments

Comments
 (0)