diff --git a/apps/web/src/components/ChatMarkdown.permissions.browser.test.tsx b/apps/web/src/components/ChatMarkdown.permissions.browser.test.tsx index 61cf3c140278..c157fe8fe982 100644 --- a/apps/web/src/components/ChatMarkdown.permissions.browser.test.tsx +++ b/apps/web/src/components/ChatMarkdown.permissions.browser.test.tsx @@ -1,3 +1,4 @@ +import { MISSING_FILE_ACCESS_MESSAGE } from "@t3tools/client-runtime/state/assets"; import { AuthOrchestrationOperateScope, EnvironmentId, @@ -25,6 +26,12 @@ const state = vi.hoisted(() => ({ openExternal: vi.fn(), copy: vi.fn(), pullRequests: [] as ThreadPullRequestLink[], + fileAccess: { canReadFiles: true, isPending: false, error: null as string | null }, +})); + +vi.mock(import("../state/filesystem"), async (original) => ({ + ...(await original()), + useFilesystemReadAccess: () => state.fileAccess, })); vi.mock(import("../state/use-atom-query-runner"), async (original) => ({ @@ -130,6 +137,7 @@ function setup() { state.allowed = true; state.listeners.clear(); state.pullRequests = []; + state.fileAccess = { canReadFiles: true, isPending: false, error: null }; state.openEditor.mockReset().mockResolvedValue(AsyncResult.success(undefined)); state.link.mockReset().mockResolvedValue(AsyncResult.success(undefined)); state.unlink.mockReset().mockResolvedValue(AsyncResult.success(undefined)); @@ -278,3 +286,14 @@ it.each(["link-to-thread", "unlink-from-thread"])( ); }, ); + +it("explains missing file access for a host video instead of offering a retry", async () => { + using _setup = setup(); + state.fileAccess = { canReadFiles: false, isPending: false, error: null }; + await using screen = await renderMarkdown("![Demo](/tmp/demo.mp4)"); + await expect.element(screen.getByText(/Video unavailable · Demo/)).toBeVisible(); + await expect + .element(screen.getByText(MISSING_FILE_ACCESS_MESSAGE, { exact: false })) + .toBeVisible(); + await expect.element(screen.getByRole("button", { name: "Retry video" })).not.toBeInTheDocument(); +}); diff --git a/apps/web/src/components/chat/ChatMarkdownMedia.tsx b/apps/web/src/components/chat/ChatMarkdownMedia.tsx index c810890ebf96..7ea32fcde20c 100644 --- a/apps/web/src/components/chat/ChatMarkdownMedia.tsx +++ b/apps/web/src/components/chat/ChatMarkdownMedia.tsx @@ -281,6 +281,7 @@ export function ChatMarkdownVideo(props: { readonly copyMarkdown: string | undefined; readonly originalUrl?: string | undefined; readonly sourceFailed?: boolean | undefined; + readonly unavailableDetail?: string | undefined; readonly style?: CSSProperties | undefined; readonly mediaIdentity?: string | undefined; readonly actionsSource?: MediaActionSource | undefined; @@ -291,6 +292,7 @@ export function ChatMarkdownVideo(props: { key={props.mediaIdentity ?? props.copyMarkdown ?? props.src} src={props.src} sourceFailed={props.sourceFailed} + unavailableDetail={props.unavailableDetail} label={props.alt} originalUrl={props.originalUrl} style={props.style} @@ -373,6 +375,10 @@ export const ChatMarkdownAssetImage = memo(function ChatMarkdownAssetImage(props : fallbackSrc === undefined ? null : fallbackSrc + (props.srcFragment ?? ""); + const missingFileAccess = + assetUrl._tag === "Failure" && + assetUrl.reason === "missing-file-access" && + fallbackSrc === undefined; const knownSize = assetUrl._tag === "Success" ? assetUrl.imageDimensions : undefined; const maxHeightRem = props.maxHeightRem ?? 30; const style = @@ -408,12 +414,14 @@ export const ChatMarkdownAssetImage = memo(function ChatMarkdownAssetImage(props ); @@ -424,13 +432,7 @@ export const ChatMarkdownAssetImage = memo(function ChatMarkdownAssetImage(props key={JSON.stringify([props.environmentId, props.resource, props.srcFragment])} src={src} sourceFailed={assetUrl._tag === "Failure" && fallbackSrc === undefined} - unavailableDetail={ - assetUrl._tag === "Failure" && - assetUrl.reason === "missing-file-access" && - fallbackSrc === undefined - ? MISSING_FILE_ACCESS_MESSAGE - : undefined - } + unavailableDetail={missingFileAccess ? MISSING_FILE_ACCESS_MESSAGE : undefined} alt={props.alt} copyMarkdown={props.copyMarkdown} standalone={props.standalone ?? true} diff --git a/apps/web/src/components/media/MediaVideoPlayer.tsx b/apps/web/src/components/media/MediaVideoPlayer.tsx index 6faae7da2344..ec185ad87158 100644 --- a/apps/web/src/components/media/MediaVideoPlayer.tsx +++ b/apps/web/src/components/media/MediaVideoPlayer.tsx @@ -13,6 +13,7 @@ import { MediaActions, type MediaActionSource } from "./MediaActions"; interface MediaVideoPlayerProps { readonly src: string | null; readonly label: string; + readonly unavailableDetail?: string | undefined; readonly sourceFailed?: boolean | undefined; readonly originalUrl?: string | undefined; readonly revision?: string | null | undefined; @@ -31,6 +32,7 @@ interface MediaVideoPlayerProps { export function MediaVideoPlayer({ src: latestSrc, label, + unavailableDetail, sourceFailed = false, originalUrl, revision = null, @@ -132,13 +134,15 @@ export function MediaVideoPlayer({ - Video unavailable{label ? ` · ${label}` : ""} + {["Video unavailable", label, unavailableDetail].filter(Boolean).join(" · ")} {latestSrc !== null || onRetry ? (