Skip to content

Commit 826ef55

Browse files
ScottN-PVclaudejuliusmarminge
authored
fix(web): name the remote host and checked path when media is not found (#19677)
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
1 parent 100d146 commit 826ef55

8 files changed

Lines changed: 277 additions & 25 deletions

File tree

‎apps/server/src/assets/AssetAccess.test.ts‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,41 @@ describe("AssetAccess", () => {
387387
}).pipe(Effect.provide(layerTest)),
388388
);
389389

390+
it.effect.each([
391+
{ form: "absolute", requestedPath: undefined, checked: ["absolute.mp4"] },
392+
{
393+
form: "workspace-relative",
394+
requestedPath: "clips/relative.mp4",
395+
checked: ["workspace", "clips", "relative.mp4"],
396+
},
397+
{
398+
form: "home-relative",
399+
requestedPath: "~/Downloads/home.mp4",
400+
checked: ["home", "Downloads", "home.mp4"],
401+
},
402+
])("reports the absolute path it checked for a missing $form media path", (scenario) =>
403+
Effect.gen(function* () {
404+
const fs = yield* FileSystem.FileSystem;
405+
const path = yield* Path.Path;
406+
const directory = yield* fs.makeTempDirectoryScoped({ prefix: "t3-media-missing-" });
407+
const root = path.join(directory, "workspace");
408+
yield* fs.makeDirectory(root);
409+
const checkedPath = path.join(directory, ...scenario.checked);
410+
const error = yield* issueAssetUrl({
411+
resource: {
412+
_tag: "media-file",
413+
threadId: ThreadId.make("thread-1"),
414+
path: scenario.requestedPath ?? checkedPath,
415+
},
416+
workspaceRoot: root,
417+
}).pipe(
418+
Effect.flip,
419+
Effect.provideService(HostProcess.HomeDirectory, path.join(directory, "home")),
420+
);
421+
expect(error).toMatchObject({ _tag: "AssetWorkspaceAssetNotFoundError", checkedPath });
422+
}).pipe(Effect.provide(layerTest)),
423+
);
424+
390425
it.effect.skipIf(!symlinksSupported)(
391426
"rejects non-previewable files, disguised targets, and directories",
392427
() =>

‎apps/server/src/assets/AssetAccess.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,10 @@ const finalizeAbsoluteMediaFileAsset = Effect.fn("AssetAccess.finalizeAbsoluteMe
359359
),
360360
);
361361
if (!canonicalFile) {
362-
return yield* new AssetWorkspaceAssetNotFoundError({ resource: input.resource });
362+
return yield* new AssetWorkspaceAssetNotFoundError({
363+
resource: input.resource,
364+
checkedPath: input.requestedPath,
365+
});
363366
}
364367
if (hostPreviewMimeTypeFromExtension(path.extname(canonicalFile)) === null) {
365368
return yield* new AssetPreviewTypeValidationError({ resource: input.resource });
@@ -385,7 +388,10 @@ const finalizeAbsoluteMediaFileAsset = Effect.fn("AssetAccess.finalizeAbsoluteMe
385388
),
386389
);
387390
if (!opened) {
388-
return yield* new AssetWorkspaceAssetNotFoundError({ resource: input.resource });
391+
return yield* new AssetWorkspaceAssetNotFoundError({
392+
resource: input.resource,
393+
checkedPath: input.requestedPath,
394+
});
389395
}
390396
return {
391397
claims: {

‎apps/web/src/components/ChatMarkdown.assets.browser.test.tsx‎

Lines changed: 134 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,28 @@
1+
import { PrimaryConnectionTarget } from "@t3tools/client-runtime/connection";
12
import { RegistryContext } from "@effect/atom-react";
2-
import { type AssetCreateUrlResult, EnvironmentId, ThreadId } from "@t3tools/contracts";
3+
import {
4+
AssetAccessError,
5+
AssetWorkspaceAssetNotFoundError,
6+
AssetPreviewTypeValidationError,
7+
type AssetCreateUrlResult,
8+
EnvironmentId,
9+
ThreadId,
10+
} from "@t3tools/contracts";
311
import * as Effect from "effect/Effect";
12+
import * as Cause from "effect/Cause";
13+
import * as Schema from "effect/Schema";
414
import { AtomRegistry } from "effect/reactivity";
515
import { act, type ReactNode } from "react";
616
import { createRoot, type Root } from "react-dom/client";
717
import { afterEach, beforeEach, expect, it, vi } from "vite-plus/test";
818

919
const mint = vi.hoisted(() => vi.fn<() => Promise<AssetCreateUrlResult>>());
20+
const remoteOpen = vi.hoisted(() => ({
21+
state: { mode: "local-exec" as "local-exec" | "remote-unavailable" },
22+
isResolved: true,
23+
label: "media-host",
24+
httpBaseUrl: "https://host.test",
25+
}));
1026
// Atoms derived from the server config run in the real registry over a missing config.
1127
vi.mock(import("../state/server"), async (original) => {
1228
const actual = await original();
@@ -21,8 +37,14 @@ vi.mock(import("../state/server"), async (original) => {
2137
vi.mock(import("../state/assets"), async (original) => {
2238
const actual = await original();
2339
const { Atom } = await import("effect/reactivity");
40+
const isAssetError = Schema.is(AssetAccessError);
2441
const family = Atom.family((_key: string) =>
25-
Atom.make(Effect.tryPromise(() => mint())).pipe(Atom.keepAlive),
42+
Atom.make(
43+
Effect.tryPromise({
44+
try: () => mint(),
45+
catch: (error) => (isAssetError(error) ? error : new Cause.UnknownError(error)),
46+
}),
47+
).pipe(Atom.keepAlive),
2648
);
2749
return {
2850
...actual,
@@ -40,14 +62,30 @@ vi.mock(import("../state/session"), async (original) => ({
4062
...(await original()),
4163
readEnvironmentScope: () => false,
4264
useEnvironmentScope: () => false,
43-
readPreparedConnection: (() => ({ httpBaseUrl: "https://host.test" })) as never,
65+
readPreparedConnection: (() => ({
66+
httpBaseUrl: "https://host.test",
67+
target: remoteOpen.isResolved
68+
? new PrimaryConnectionTarget({
69+
environmentId: EnvironmentId.make("media-environment"),
70+
label: remoteOpen.label,
71+
httpBaseUrl: remoteOpen.httpBaseUrl,
72+
wsBaseUrl: "wss://host.test",
73+
})
74+
: undefined,
75+
})) as never,
4476
usePreparedConnection: (() => ({
4577
_tag: "Some",
4678
value: { httpBaseUrl: "https://host.test" },
4779
})) as never,
4880
}));
4981

82+
vi.mock(import("../remoteOpen"), async (original) => ({
83+
...(await original()),
84+
useRemoteOpenResolution: () => remoteOpen,
85+
}));
86+
5087
import ChatMarkdown from "./ChatMarkdown";
88+
import { toastManager } from "./ui/toast";
5189

5290
const roots: Root[] = [];
5391
let registry: AtomRegistry.AtomRegistry;
@@ -68,9 +106,24 @@ afterEach(async () => {
68106
for (const root of roots.splice(0)) await act(async () => root.unmount());
69107
registry.dispose();
70108
document.body.replaceChildren();
109+
remoteOpen.isResolved = true;
110+
remoteOpen.state.mode = "local-exec";
111+
remoteOpen.label = "media-host";
112+
remoteOpen.httpBaseUrl = "https://host.test";
113+
vi.restoreAllMocks();
71114
vi.unstubAllGlobals();
72115
});
73116

117+
function deferred<T>() {
118+
let resolve!: (value: T) => void;
119+
let reject!: (error: unknown) => void;
120+
const promise = new Promise<T>((resolvePromise, rejectPromise) => {
121+
resolve = resolvePromise;
122+
reject = rejectPromise;
123+
});
124+
return { promise, resolve, reject };
125+
}
126+
74127
function createTestRoot() {
75128
const container = document.body.appendChild(document.createElement("div"));
76129
const root = createRoot(container);
@@ -88,7 +141,8 @@ function createTestRoot() {
88141

89142
it("opens host media through server authorization before the client grant loads", async () => {
90143
mint.mockResolvedValue({ relativeUrl: "/api/assets/image.png", expiresAt: 1 });
91-
const onImageExpand = vi.fn();
144+
const expanded = deferred<unknown>();
145+
const onImageExpand = vi.fn(expanded.resolve);
92146
const { container, render } = createTestRoot();
93147
await render(
94148
<ChatMarkdown
@@ -104,20 +158,89 @@ it("opens host media through server authorization before the client grant loads"
104158
const link = container.querySelector<HTMLAnchorElement>('a[href="/tmp/image.png"]');
105159
expect(link).not.toBeNull();
106160
await act(async () => link!.click());
107-
await vi.waitFor(() =>
108-
expect(onImageExpand).toHaveBeenCalledWith(
109-
expect.objectContaining({
110-
images: [expect.objectContaining({ src: "https://host.test/api/assets/image.png" })],
111-
}),
112-
),
113-
);
161+
expect(await expanded.promise).toMatchObject({
162+
images: [expect.objectContaining({ src: "https://host.test/api/assets/image.png" })],
163+
});
114164
});
115165

116166
const threadRef = {
117167
environmentId: EnvironmentId.make("media-environment"),
118168
threadId: ThreadId.make("media-thread"),
119169
};
120170

171+
it.each([
172+
{
173+
name: "a remote lookup whose host resolves while it is pending",
174+
checkedPath: "/home/remote/Downloads/image.png",
175+
description: "The file was not found on settled-host at /home/remote/Downloads/image.png.",
176+
},
177+
{
178+
name: "an older remote server without a checked path",
179+
description: "The file was not found on settled-host at ~/Downloads/image.png.",
180+
},
181+
{
182+
name: "a missing file on this device",
183+
local: true,
184+
checkedPath: "/home/local/Downloads/image.png",
185+
description: "Media file was not found.",
186+
},
187+
{
188+
name: "a different remote failure",
189+
unsupported: true,
190+
description: "Only images, videos, audio, HTML, and PDF files can be previewed.",
191+
},
192+
])("reports the media failure for $name", async (scenario) => {
193+
const lookup = deferred<AssetCreateUrlResult>();
194+
const started = deferred<void>();
195+
const reported = deferred<Parameters<typeof toastManager.add>[0]>();
196+
mint.mockImplementation(() => {
197+
started.resolve();
198+
return lookup.promise;
199+
});
200+
vi.spyOn(toastManager, "add").mockImplementation((toast) => {
201+
reported.resolve(toast);
202+
return "media-toast";
203+
});
204+
remoteOpen.isResolved = false;
205+
const { container, render } = createTestRoot();
206+
const content = (
207+
<ChatMarkdown cwd="/repo" threadRef={threadRef} text="[Open image](~/Downloads/image.png)" />
208+
);
209+
await render(content);
210+
const link = container.querySelector<HTMLAnchorElement>('a[href="~/Downloads/image.png"]');
211+
expect(link).not.toBeNull();
212+
await act(async () => {
213+
link!.click();
214+
await started.promise;
215+
});
216+
217+
remoteOpen.isResolved = true;
218+
remoteOpen.state.mode = scenario.local ? "local-exec" : "remote-unavailable";
219+
remoteOpen.httpBaseUrl = scenario.local ? "http://localhost:3773" : "https://host.test";
220+
remoteOpen.label = "settled-host";
221+
await render(content);
222+
const resource = {
223+
_tag: "media-file" as const,
224+
path: "~/Downloads/image.png",
225+
threadId: threadRef.threadId,
226+
};
227+
await act(async () => {
228+
lookup.reject(
229+
scenario.unsupported
230+
? new AssetPreviewTypeValidationError({ resource })
231+
: new AssetWorkspaceAssetNotFoundError({
232+
resource,
233+
...(scenario.checkedPath ? { checkedPath: scenario.checkedPath } : {}),
234+
}),
235+
);
236+
await reported.promise;
237+
});
238+
expect(await reported.promise).toMatchObject({
239+
title: "Media unavailable",
240+
description: scenario.description,
241+
});
242+
});
243+
121244
function markdown(workspaceMutationId?: string | null) {
122245
return (
123246
<ChatMarkdown

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

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import {
4848
} from "lucide-react";
4949
import { Check, Copy, Maximize2, Minimize2 } from "lucide";
5050
import {
51+
AssetWorkspaceAssetNotFoundError,
5152
AuthPreviewOperateScope,
5253
type AssetResource,
5354
type EditorId,
@@ -78,6 +79,7 @@ import { MISSING_FILE_ACCESS_MESSAGE } from "@t3tools/client-runtime/state/asset
7879
import { mediaKindFromPath, mediaMimeTypeFromExtension } from "@t3tools/shared/filePreview";
7980
import * as Cause from "effect/Cause";
8081
import * as Option from "effect/Option";
82+
import * as Schema from "effect/Schema";
8183
import { AsyncResult, Atom } from "effect/reactivity";
8284
import React, {
8385
Children,
@@ -183,7 +185,11 @@ import { isElectron } from "../env";
183185
import { readLocalApi } from "../localApi";
184186
import { useAssetUrlRefresh, useAssetUrlState } from "../assets/assetUrls";
185187
import { cn } from "../lib/utils";
186-
import { useRemoteOpenResolution, type RemoteOpenMode } from "../remoteOpen";
188+
import {
189+
resolveRemoteOpenState,
190+
useRemoteOpenResolution,
191+
type RemoteOpenMode,
192+
} from "../remoteOpen";
187193
import { useRightPanelStore } from "../rightPanelStore";
188194
import { readThreadShell, useProjects } from "../state/entities";
189195
import { serverEnvironment } from "../state/server";
@@ -228,6 +234,8 @@ import {
228234
import { resolveLinkTarget } from "../browser/browserLinkTarget";
229235
import { PullRequestLinkPreview } from "./pullRequest/PullRequestLinkPreview";
230236

237+
const isAssetNotFoundError = Schema.is(AssetWorkspaceAssetNotFoundError);
238+
231239
interface ChatMarkdownProps {
232240
/** Compact markdown transforms remove blocks before rendering inside a label. */
233241
inline?: boolean;
@@ -2466,14 +2474,34 @@ function useChatMarkdownState({
24662474
},
24672475
(error: unknown) => {
24682476
if (mediaRequestId.current !== requestId) return;
2477+
let description =
2478+
error instanceof Error
2479+
? error.message
2480+
: "The file could not be loaded. It may have been moved or deleted.";
2481+
if (
2482+
isAssetNotFoundError(error) &&
2483+
error.resource._tag === "media-file" &&
2484+
environmentId !== null
2485+
) {
2486+
// The connection may resolve while the media lookup is pending.
2487+
const target = readPreparedConnection(environmentId)?.target ?? null;
2488+
if (
2489+
target !== null &&
2490+
resolveRemoteOpenState({
2491+
target,
2492+
sshAlias: null,
2493+
remoteOpenTargets: undefined,
2494+
isDesktopRenderer: window.desktopBridge !== undefined,
2495+
}).mode !== "local-exec"
2496+
) {
2497+
description = `The file was not found on ${target.label} at ${error.checkedPath ?? error.resource.path}.`;
2498+
}
2499+
}
24692500
toastManager.add(
24702501
stackedThreadToast({
24712502
type: "error",
24722503
title: "Media unavailable",
2473-
description:
2474-
error instanceof Error
2475-
? error.message
2476-
: "The file could not be loaded. It may have been moved or deleted.",
2504+
description,
24772505
}),
24782506
);
24792507
},

0 commit comments

Comments
 (0)