diff --git a/apps/mobile/src/components/FilePreviewModal.tsx b/apps/mobile/src/components/FilePreviewModal.tsx index 8079379fd4895..8b7394c1e1048 100644 --- a/apps/mobile/src/components/FilePreviewModal.tsx +++ b/apps/mobile/src/components/FilePreviewModal.tsx @@ -53,7 +53,7 @@ async function resolvePreviewItem( } if (!("environmentId" in item)) return { source: { ...item, name } }; // Refresh expired URLs before handing them to Quick Look or ACTION_VIEW, which retain them. - const url = await refreshAssetUrl(item.environmentId, item.resource, signal) + const url = await refreshAssetUrl(item.environmentId, item.resource, signal, item.scope) .then((value) => { if (!value) throw new Error("Reconnect to this environment and try again."); return value; diff --git a/apps/mobile/src/components/FilePreviewModal.types.ts b/apps/mobile/src/components/FilePreviewModal.types.ts index cc0643828aa3c..1a26448821a75 100644 --- a/apps/mobile/src/components/FilePreviewModal.types.ts +++ b/apps/mobile/src/components/FilePreviewModal.types.ts @@ -16,7 +16,11 @@ export type FilePreviewItem = FilePreviewMetadata & ( | { readonly uri: string } | { readonly attachment: FileBackedComposerAttachment } - | { readonly environmentId: EnvironmentId; readonly resource: AssetResource } + | { + readonly environmentId: EnvironmentId; + readonly resource: AssetResource; + readonly scope?: string | undefined; + } ); export type FilePreviewSource = FilePreviewItem & { diff --git a/apps/mobile/src/components/VideoPreviewModal.ios.tsx b/apps/mobile/src/components/VideoPreviewModal.ios.tsx index 5479e1be52145..d5c2b6cdba013 100644 --- a/apps/mobile/src/components/VideoPreviewModal.ios.tsx +++ b/apps/mobile/src/components/VideoPreviewModal.ios.tsx @@ -50,7 +50,12 @@ function NativeVideoPreview(props: { const resolvePlaybackUrl = useEffectEvent(async (): Promise => { if (source.type !== "media") throw new Error("Could not load this video."); if (!("resource" in source)) return source.uri; - const url = await refreshAssetUrl(source.environmentId, source.resource); + const url = await refreshAssetUrl( + source.environmentId, + source.resource, + undefined, + source.scope, + ); const playbackUrl = mediaVideoPreviewUri(source, url); if (playbackUrl !== null) return playbackUrl; throw new Error( @@ -61,7 +66,7 @@ function NativeVideoPreview(props: { }); const reauthorize = useEffectEvent(() => { if (source.type === "media" && "resource" in source) { - void refreshAssetUrl(source.environmentId, source.resource); + void refreshAssetUrl(source.environmentId, source.resource, undefined, source.scope); } }); diff --git a/apps/mobile/src/components/VideoPreviewModal.tsx b/apps/mobile/src/components/VideoPreviewModal.tsx index 4e63851dcd3eb..53bfd220a9224 100644 --- a/apps/mobile/src/components/VideoPreviewModal.tsx +++ b/apps/mobile/src/components/VideoPreviewModal.tsx @@ -36,8 +36,9 @@ function useMediaPlayback(source: MediaVideoPreviewSource): PlaybackState { const environmentId = "environmentId" in source ? source.environmentId : null; const resource = "resource" in source ? source.resource : null; const connection = usePreparedConnection(environmentId); - const asset = useAssetUrlState(environmentId, resource); - const refreshAssetUrl = useRefreshAssetUrl(environmentId, resource); + const scope = "resource" in source ? source.scope : undefined; + const asset = useAssetUrlState(environmentId, resource, scope); + const refreshAssetUrl = useRefreshAssetUrl(environmentId, resource, scope); const uri = mediaVideoPreviewUri(source, asset._tag === "Success" ? asset.url : null); return { uri, diff --git a/apps/mobile/src/features/threads/ThreadFeed.tsx b/apps/mobile/src/features/threads/ThreadFeed.tsx index 36fe66a026493..446b64a799f52 100644 --- a/apps/mobile/src/features/threads/ThreadFeed.tsx +++ b/apps/mobile/src/features/threads/ThreadFeed.tsx @@ -263,6 +263,7 @@ import { fileChipClipboardPath, fileChipMenu, resolveFileChipTarget } from "./fi import { useFileChipShare } from "./useFileChipShare"; import { useOpenLinkedThread } from "./useOpenLinkedThread"; import { + MarkdownImageAssetScopeContext, MarkdownImageAvailableWidthContext, ThreadMarkdownImage, ThreadMarkdownImageUnavailable, @@ -822,10 +823,10 @@ function ThreadMediaVisibility(props: { readonly children: ReactNode }) { } interface MarkdownLinkHandlers { - readonly onLinkPress: (href: string) => void; + readonly onLinkPress: (href: string, scope?: string) => void; readonly fileContextMenu: (href: string) => MarkdownFileContextMenu | undefined; - readonly onFileContextMenuAction: (href: string, actionId: string) => void; - readonly onImagePress?: (href: string) => void; + readonly onFileContextMenuAction: (href: string, actionId: string, scope?: string) => void; + readonly onImagePress?: (href: string, scope?: string) => void; readonly resolveImageSource?: MarkdownImageSourceResolver; readonly fileEmbedLabel?: (href: string, standalone: boolean) => string | null; readonly linkCustomization?: (href: string) => MarkdownLinkCustomization | undefined; @@ -907,6 +908,12 @@ const AssistantMarkdownContent = memo(function AssistantMarkdownContent(props: { readonly renderImage: MarkdownImageRenderer; readonly skills?: ReadonlyArray | undefined; }) { + const scope = useContext(MarkdownImageAssetScopeContext); + const resolveImageSource = props.linkHandlers.resolveImageSource; + const scopedImageSource = useCallback( + (image) => resolveImageSource?.(image, scope) ?? null, + [resolveImageSource, scope], + ); const liveMarkdown = useLiveThreadLinkLabels(props.markdown, props.environmentId); const segments = useMemo(() => splitCodexArtifactTemplateMarkdown(liveMarkdown), [liveMarkdown]); const threadIcons = useThreadChipIcons(props.environmentId, liveMarkdown); @@ -936,6 +943,12 @@ const AssistantMarkdownContent = memo(function AssistantMarkdownContent(props: { skills={props.skills} textStyle={props.markdownStyles.nativeTextStyle} {...linkHandlers} + onLinkPress={(href) => props.linkHandlers.onLinkPress(href, scope)} + onImagePress={(href) => props.linkHandlers.onImagePress?.(href, scope)} + onFileContextMenuAction={(href, actionId) => + props.linkHandlers.onFileContextMenuAction(href, actionId, scope) + } + resolveImageSource={scopedImageSource} renderImage={props.renderImage} /> ); @@ -1760,15 +1773,17 @@ function renderFeedEntry( > {renderedText.trim().length > 0 ? ( - + + + ) : null} { + const onMarkdownLinkPress = (href: string, scope?: string, imageEmbed = false) => { markdownLinkRequest.current?.abort(); const request = new AbortController(); markdownLinkRequest.current = request; @@ -2301,6 +2316,7 @@ export const ThreadFeed = memo(function ThreadFeed({ threadId: props.threadId, workspaceRoot: props.workspaceRoot, imageEmbed, + scope, }); if (media && media.kind !== "file") { void Haptics.selectionAsync(); @@ -2436,7 +2452,7 @@ export const ThreadFeed = memo(function ThreadFeed({ ), onLinkPress: onMarkdownLinkPress, linkCustomization: enrichedThreadLinkCustomization, - onImagePress: (href) => onMarkdownLinkPress(href, true), + onImagePress: (href, scope) => onMarkdownLinkPress(href, scope, true), resolveImageSource, fileContextMenu: (href) => { const skill = enrichedSkillReference(href, props.skills); @@ -2467,7 +2483,7 @@ export const ThreadFeed = memo(function ThreadFeed({ const target = resolveFileChipTarget(href, props.workspaceRoot); return target ? fileChipMenu(target) : undefined; }, - onFileContextMenuAction: (href, actionId) => { + onFileContextMenuAction: (href, actionId, scope) => { const skill = enrichedSkillReference(href, props.skills); if (skill) { const instructionsPath = enrichedSkillInstructionsPath(skill); @@ -2490,7 +2506,7 @@ export const ThreadFeed = memo(function ThreadFeed({ return; } case "open-file": - onMarkdownLinkPress(href); + onMarkdownLinkPress(href, scope); return; case "save": shareFileChip(target); @@ -2519,7 +2535,7 @@ export const ThreadFeed = memo(function ThreadFeed({ onMarkdownLinkPress(image.href, true)} + onOpen={() => onMarkdownLinkPress(image.href, undefined, true)} onPlaybackStart={onInlinePlaybackStart} /> ); @@ -2534,7 +2550,7 @@ export const ThreadFeed = memo(function ThreadFeed({ onMarkdownLinkPress(image.href, true)} + onPress={() => onMarkdownLinkPress(image.href, undefined, true)} style={{ color: markdownStyles.assistant.nativeTextStyle.linkColor, fontSize: markdownStyles.assistant.nativeTextStyle.fontSize, @@ -3333,7 +3349,12 @@ function MessageImageGalleryScope(props: { const images = entry.type === "message" ? [ - ...messageImageGallery(entry.message, { environmentId, threadId, workspaceRoot }), + ...messageImageGallery(entry.message, { + environmentId, + threadId, + workspaceRoot, + scope: entry.message.role === "assistant" ? entry.message.id : undefined, + }), ...composerImageGallery(entry.pendingMessage?.attachments ?? []), ] : []; diff --git a/apps/mobile/src/features/threads/ThreadMarkdownImage.tsx b/apps/mobile/src/features/threads/ThreadMarkdownImage.tsx index 9b6075615aa4c..69a0747621dfc 100644 --- a/apps/mobile/src/features/threads/ThreadMarkdownImage.tsx +++ b/apps/mobile/src/features/threads/ThreadMarkdownImage.tsx @@ -25,6 +25,9 @@ import { /** Use known feed width immediately; later image measurement would move already-positioned rows. */ export const MarkdownImageAvailableWidthContext = createContext(0); +/** Later messages must re-sign workspace files that may have changed. */ +export const MarkdownImageAssetScopeContext = createContext(undefined); + export function ThreadMarkdownImageView(props: { readonly uri: string | null; readonly sourceKey: string; @@ -243,7 +246,12 @@ export function ThreadMarkdownImage(props: { readonly onPressPreview: (source: FilePreviewSource) => void; }) { const withGallery = useFilePreviewGallery(); - const assetUrl = useAssetUrlState(props.environmentId, props.resource); + const scope = useContext(MarkdownImageAssetScopeContext); + const assetUrl = useAssetUrlState(props.environmentId, props.resource, scope); + const actionsSource = + props.actionsSource && "resource" in props.actionsSource + ? { ...props.actionsSource, scope } + : props.actionsSource; return ( { const { uri: _uri, ...rest } = source as FilePreviewSource & { uri?: string }; props.onPressPreview( @@ -278,6 +286,8 @@ export function ThreadMarkdownImage(props: { gallery: undefined, environmentId: props.environmentId, resource: props.resource, + scope, + actionsSource, }), ); }} diff --git a/apps/mobile/src/features/threads/ThreadMarkdownVideo.tsx b/apps/mobile/src/features/threads/ThreadMarkdownVideo.tsx index 5f4b5ec263d48..f844a65cc1a8d 100644 --- a/apps/mobile/src/features/threads/ThreadMarkdownVideo.tsx +++ b/apps/mobile/src/features/threads/ThreadMarkdownVideo.tsx @@ -1,4 +1,5 @@ import { createContext, useContext } from "react"; +import { MarkdownImageAssetScopeContext } from "./ThreadMarkdownImage"; import { MediaVideoPlayer } from "../../components/MediaVideoPlayer"; import { useAssetUrlState, useRefreshAssetUrl } from "../../state/assets"; import { @@ -14,17 +15,23 @@ export function ThreadMarkdownVideo(props: { readonly thumbnailVisible?: boolean; readonly onPlaybackStart?: () => void; }) { - const { source } = props; + const scope = useContext(MarkdownImageAssetScopeContext); + const source = + "resource" in props.source + ? { ...props.source, scope: props.source.scope ?? scope } + : props.source; const feedVisible = useContext(ThreadMediaVisibleContext); const visible = props.thumbnailVisible ?? feedVisible; const thumbnailKey = mediaVideoThumbnailKey(source); const asset = useAssetUrlState( "environmentId" in source ? source.environmentId : null, "resource" in source ? source.resource : null, + "resource" in source ? source.scope : undefined, ); const refreshAssetUrl = useRefreshAssetUrl( "environmentId" in source ? source.environmentId : null, "resource" in source ? source.resource : null, + "resource" in source ? source.scope : undefined, ); const uri = mediaVideoPreviewUri(source, asset._tag === "Success" ? asset.url : null); return ( @@ -42,7 +49,11 @@ export function ThreadMarkdownVideo(props: { visible={visible} onPlaybackStart={props.onPlaybackStart} unavailable={"resource" in source && asset._tag === "Failure"} - actionsSource={source.actionsSource} + actionsSource={ + source.actionsSource && "resource" in source.actionsSource + ? { ...source.actionsSource, scope: "resource" in source ? source.scope : undefined } + : source.actionsSource + } /> ); } diff --git a/apps/mobile/src/features/threads/messageImageGallery.ts b/apps/mobile/src/features/threads/messageImageGallery.ts index c02269976a272..3aa378af9ec81 100644 --- a/apps/mobile/src/features/threads/messageImageGallery.ts +++ b/apps/mobile/src/features/threads/messageImageGallery.ts @@ -10,6 +10,7 @@ export function messageImageGallery( environmentId: EnvironmentId; threadId: ThreadId; workspaceRoot: string | null | undefined; + scope?: string | undefined; }, ): FilePreviewItem[] { const images: FilePreviewItem[] = []; diff --git a/apps/mobile/src/features/threads/thread-work-log.tsx b/apps/mobile/src/features/threads/thread-work-log.tsx index 0ea7616f31d82..b21cf087ecd6b 100644 --- a/apps/mobile/src/features/threads/thread-work-log.tsx +++ b/apps/mobile/src/features/threads/thread-work-log.tsx @@ -92,7 +92,7 @@ import { notificationChildThreadId } from "@t3tools/client-runtime/state/thread- import type { MarkdownImageRenderer } from "../../native/SelectableMarkdownText"; import type { FilePreviewSource } from "../../components/FilePreviewModal"; import { FilePreviewGallery } from "../../components/FilePreviewGallery"; -import { ThreadMarkdownImage } from "./ThreadMarkdownImage"; +import { MarkdownImageAssetScopeContext, ThreadMarkdownImage } from "./ThreadMarkdownImage"; import Animated, { FadeIn, FadeOut, @@ -530,7 +530,11 @@ export function ThreadWorkLog(props: ThreadWorkLogProps) { return ( {props.activities.map((row) => ( - {props.renderReasoning(row.workEntry.detail ?? "")} + + + {props.renderReasoning(row.workEntry.detail ?? "")} + + ))} ); @@ -1166,7 +1170,9 @@ const ThreadWorkLogRow = function ThreadWorkLogRow( ) : null} {viewedImagePath ? ( - {props.renderImage({ href: viewedImagePath, alt: null, title: null })} + + {props.renderImage({ href: viewedImagePath, alt: null, title: null })} + ) : null} {reasoning ? ( - props.renderReasoning(reasoning.text) + + {props.renderReasoning(reasoning.text)} + ) : call ? ( [ call.command, diff --git a/apps/mobile/src/lib/filePreview.test.ts b/apps/mobile/src/lib/filePreview.test.ts index 7525868e5b049..3cab4302b18ba 100644 --- a/apps/mobile/src/lib/filePreview.test.ts +++ b/apps/mobile/src/lib/filePreview.test.ts @@ -283,7 +283,10 @@ vi.mock("../features/threads/thread-workflow-opening", () => ({ useWorkflowOpeni vi.mock("../features/threads/useFileChipShare", () => ({ useFileChipShare: () => vi.fn() })); vi.mock("../features/threads/ThreadMarkdownImage", async () => { const { createContext } = await import("react"); - return { MarkdownImageAvailableWidthContext: createContext(390) }; + return { + MarkdownImageAvailableWidthContext: createContext(390), + MarkdownImageAssetScopeContext: createContext(undefined), + }; }); vi.mock("../features/review/ReviewCommentCard", () => ({ useReviewCommentColors: () => ({}) })); vi.mock("../features/prompt-links/prompt-link-actions", () => ({})); diff --git a/apps/mobile/src/lib/filePreviewGallery.ts b/apps/mobile/src/lib/filePreviewGallery.ts index 4150054562442..8e6f5d3c11b77 100644 --- a/apps/mobile/src/lib/filePreviewGallery.ts +++ b/apps/mobile/src/lib/filePreviewGallery.ts @@ -7,6 +7,7 @@ export function filePreviewKey(source: FilePreviewItem): string { Object.entries(source.resource) .filter(([key]) => key !== "mimeType" && key !== "fileName") .sort(([a], [b]) => a.localeCompare(b)), + source.scope ?? null, ]); if ("attachment" in source) return `attachment:${source.attachment.id}`; return source.uri; diff --git a/apps/mobile/src/lib/markdownMedia.ts b/apps/mobile/src/lib/markdownMedia.ts index 31dcefb29f127..91a6319312e82 100644 --- a/apps/mobile/src/lib/markdownMedia.ts +++ b/apps/mobile/src/lib/markdownMedia.ts @@ -41,6 +41,7 @@ export function resolveMarkdownMediaPreview( readonly workspaceRoot: string | null | undefined; readonly captured?: boolean; readonly imageEmbed?: boolean; + readonly scope?: string | undefined; }, ): | { readonly kind: "image"; readonly source: FilePreviewSource } @@ -139,6 +140,7 @@ export function resolveMarkdownMediaPreview( : { environmentId: input.environmentId, resource: media.resource, + scope: input.scope, ...(srcFragment ? { srcFragment } : {}), }; const actionsSource: MediaActionsSource = @@ -149,6 +151,7 @@ export function resolveMarkdownMediaPreview( environmentId: input.environmentId, threadId: input.threadId, resource: media.resource, + scope: input.scope, name, mimeType, }; diff --git a/apps/mobile/src/lib/mediaActionsSource.ts b/apps/mobile/src/lib/mediaActionsSource.ts index d3e499a7c3df3..8337eec853975 100644 --- a/apps/mobile/src/lib/mediaActionsSource.ts +++ b/apps/mobile/src/lib/mediaActionsSource.ts @@ -14,5 +14,6 @@ export type MediaActionsSource = { readonly environmentId: EnvironmentId; readonly threadId?: ThreadId; readonly resource: AssetResource; + readonly scope?: string | undefined; } ); diff --git a/apps/mobile/src/lib/useMediaVideoPlayback.test.tsx b/apps/mobile/src/lib/useMediaVideoPlayback.test.tsx index c52563b4b4e23..6b8cc22a09f98 100644 --- a/apps/mobile/src/lib/useMediaVideoPlayback.test.tsx +++ b/apps/mobile/src/lib/useMediaVideoPlayback.test.tsx @@ -108,7 +108,13 @@ vi.mock("../components/FilePreviewGallery", () => ({ })); vi.mock("../components/FilePreviewModal", () => ({ FilePreviewModal: () => null })); vi.mock("../components/VideoPreviewModal", () => ({ VideoPreviewModal: () => null })); -vi.mock("../features/threads/ThreadMarkdownImage", () => ({ ThreadMarkdownImageView: () => null })); +vi.mock("../features/threads/ThreadMarkdownImage", async () => { + const { createContext } = await import("react"); + return { + ThreadMarkdownImageView: () => null, + MarkdownImageAssetScopeContext: createContext(undefined), + }; +}); import { ThreadMarkdownVideo, diff --git a/apps/mobile/src/lib/videoPreviewSource.ts b/apps/mobile/src/lib/videoPreviewSource.ts index 837b4fbb0ae40..3335019ce15dc 100644 --- a/apps/mobile/src/lib/videoPreviewSource.ts +++ b/apps/mobile/src/lib/videoPreviewSource.ts @@ -20,6 +20,7 @@ export type MediaVideoPreviewSource = { | { readonly uri: string } | { readonly environmentId: EnvironmentId; + readonly scope?: string | undefined; readonly resource: Extract< AssetResource, { @@ -42,7 +43,7 @@ export function mediaVideoPreviewUri( } export function mediaVideoThumbnailKey(source: MediaVideoPreviewSource): string { - return JSON.stringify( + const key = "uri" in source ? ["media-video", source.uri] : source.resource._tag === "attachment" @@ -71,8 +72,8 @@ export function mediaVideoThumbnailKey(source: MediaVideoPreviewSource): string source.resource.cwd, source.resource.path, source.srcFragment ?? "", - ], - ); + ]; + return JSON.stringify("uri" in source ? key : [...key, source.scope ?? null]); } export interface LocalVideoPreviewSource { diff --git a/apps/mobile/src/native/SelectableMarkdownText.types.ts b/apps/mobile/src/native/SelectableMarkdownText.types.ts index ddb40d22db37e..a0d0bfe03cb3f 100644 --- a/apps/mobile/src/native/SelectableMarkdownText.types.ts +++ b/apps/mobile/src/native/SelectableMarkdownText.types.ts @@ -38,6 +38,7 @@ export type MarkdownImageRenderer = (image: MarkdownImageRequest) => import("rea export type MarkdownImageSourceResolver = ( image: MarkdownImageRequest, + scope?: string, ) => | { uri: string; headers?: Record } | null diff --git a/apps/mobile/src/native/useMarkdownImageSource.ts b/apps/mobile/src/native/useMarkdownImageSource.ts index 4c00705cf7121..b378e57a69e3b 100644 --- a/apps/mobile/src/native/useMarkdownImageSource.ts +++ b/apps/mobile/src/native/useMarkdownImageSource.ts @@ -33,7 +33,7 @@ export function useMarkdownImageSource(props: { const httpBaseUrl = Option.isSome(connection) ? connection.value.httpBaseUrl : null; const createUrl = useAtomQueryRunner(assetEnvironment.createUrl, { reportFailure: false }); return useCallback( - async (image) => { + async (image, scope) => { const media = resolveMobileMarkdownMediaSource(image.href, { threadId: threadId ?? undefined, workspaceRoot, @@ -52,7 +52,7 @@ export function useMarkdownImageSource(props: { connectionPhase === "reconnecting" ) throw new Error("Markdown image is unavailable"); - const result = await createUrl({ environmentId, input: { resource: media.resource } }); + const result = await createUrl({ environmentId, input: { resource: media.resource, scope } }); if (result._tag !== "Success") throw new Error("Could not authorize Markdown image"); const uri = resolveAssetUrl(httpBaseUrl, result.value.relativeUrl); if (uri === null) throw new Error("Markdown image URL is invalid"); diff --git a/apps/mobile/src/state/assets.ts b/apps/mobile/src/state/assets.ts index 3eb0d2fe718fa..e3ac0d03391a9 100644 --- a/apps/mobile/src/state/assets.ts +++ b/apps/mobile/src/state/assets.ts @@ -37,6 +37,7 @@ export const projectFaviconUrlAtom = createProjectFaviconUrlAtomFamily({ export function useAssetUrlState( environmentId: EnvironmentId | null, resource: AssetResource | null, + scope?: string, ): AssetUrlState { const fileAccessSession = useEnvironmentQuery( environmentId === null ? null : environmentSession.sessionStateAtom(environmentId), @@ -54,7 +55,7 @@ export function useAssetUrlState( const result = useAtomValue( blocked !== null || environmentId === null || resource === null ? EMPTY_ASSET_URL_ATOM - : assetEnvironment.createUrl({ environmentId, input: { resource } }), + : assetEnvironment.createUrl({ environmentId, input: { resource, scope } }), ); const shared = blocked ?? @@ -80,6 +81,7 @@ export function useAssetUrl( export function useRefreshAssetUrl( environmentId: EnvironmentId | null, resource: AssetResource | null, + scope?: string, ): () => Promise { const connection = usePreparedConnection(environmentId); const httpBaseUrl = connection._tag === "Some" ? connection.value.httpBaseUrl : null; @@ -90,11 +92,11 @@ export function useRefreshAssetUrl( return useCallback(async () => { if (environmentId === null || resource === null || httpBaseUrl === null) return null; const state = assetUrlStateFromResult( - await createUrl({ environmentId, input: { resource } }), + await createUrl({ environmentId, input: { resource, scope } }), httpBaseUrl, ); return state._tag === "Success" ? state.url : null; - }, [createUrl, environmentId, httpBaseUrl, resource]); + }, [createUrl, environmentId, httpBaseUrl, resource, scope]); } /** {@link useRefreshAssetUrl} for async tasks that resolve several resources at once. */ @@ -102,10 +104,11 @@ export async function refreshAssetUrl( environmentId: EnvironmentId, resource: AssetResource, signal?: AbortSignal, + scope?: string, ): Promise { const connectionAtom = environmentSession.preparedConnectionValueAtom(environmentId); if (appAtomRegistry.get(connectionAtom)._tag === "None") return null; - const atom = assetEnvironment.createUrl({ environmentId, input: { resource } }); + const atom = assetEnvironment.createUrl({ environmentId, input: { resource, scope } }); const result = await executeAtomQuery(appAtomRegistry, atom, { label: atom.label?.[0] ?? "asset url", refresh: true, diff --git a/apps/mobile/src/state/mediaActions.ts b/apps/mobile/src/state/mediaActions.ts index dde7e2fe6b5ba..1a5b504f0cc0a 100644 --- a/apps/mobile/src/state/mediaActions.ts +++ b/apps/mobile/src/state/mediaActions.ts @@ -52,6 +52,7 @@ export function useMediaActions(source: MediaActionsSource | undefined, onOpenFi const refresh = useRefreshAssetUrl( source && "environmentId" in source ? source.environmentId : null, source && "resource" in source ? source.resource : null, + source && "resource" in source ? source.scope : undefined, ); const controller = useRef(null); const [sharing, setSharing] = useState(false); diff --git a/apps/web/src/assets/assetUrls.ts b/apps/web/src/assets/assetUrls.ts index 6e0dbfb5c6aee..611bdf951a8b1 100644 --- a/apps/web/src/assets/assetUrls.ts +++ b/apps/web/src/assets/assetUrls.ts @@ -89,22 +89,22 @@ export function makeRevisionedAssetUrlFamily( export const revisionedAssetUrl = makeRevisionedAssetUrlFamily(assetEnvironment.createUrl); /** - * Pass `revision` for a workspace file whose bytes can change under the same - * path; each new revision gets a freshly minted URL. + * `revision` re-mints a workspace file whose bytes can change under the same path. + * `scope` gives one rendering its own URL, so a later message never reuses an earlier one's. */ export function useAssetUrlState( environmentId: EnvironmentId | null, resource: AssetResource | null, - revision?: string | null, + options: { readonly revision?: string | null; readonly scope?: string | undefined } = {}, ): AssetUrlState { const blocked = blockedAssetUrlState(resource, useFilesystemReadAccess(environmentId)); const preparedConnection = usePreparedConnection(environmentId); const result = useAtomValue( blocked !== null || environmentId === null || resource === null ? EMPTY_ASSET_URL_ATOM - : revision === undefined - ? assetEnvironment.createUrl({ environmentId, input: { resource } }) - : revisionedAssetUrl({ environmentId, input: { resource }, revision }), + : options.revision === undefined + ? assetEnvironment.createUrl({ environmentId, input: { resource, scope: options.scope } }) + : revisionedAssetUrl({ environmentId, input: { resource }, revision: options.revision }), ); if (blocked !== null) return blocked; return { @@ -119,6 +119,7 @@ export function useAssetUrlState( export function useAssetUrlRefresh( environmentId: EnvironmentId | null, resource: AssetResource | null, + scope?: string, ): () => Promise { const connection = usePreparedConnection(environmentId); const httpBaseUrl = connection._tag === "Some" ? connection.value.httpBaseUrl : null; @@ -128,7 +129,7 @@ export function useAssetUrlRefresh( }); return async () => { if (environmentId === null || resource === null || httpBaseUrl === null) return null; - const result = await refresh({ environmentId, input: { resource } }); + const result = await refresh({ environmentId, input: { resource, scope } }); if (result._tag === "Failure") throw squashAtomCommandFailure(result); return resolveAssetUrl(httpBaseUrl, result.value.relativeUrl); }; diff --git a/apps/web/src/components/ChatMarkdown.tsx b/apps/web/src/components/ChatMarkdown.tsx index e5691c8cbd35e..fc75fb6ef4ada 100644 --- a/apps/web/src/components/ChatMarkdown.tsx +++ b/apps/web/src/components/ChatMarkdown.tsx @@ -242,6 +242,8 @@ interface ChatMarkdownProps { `cwd`'s; without it a private repository's uploads load unauthenticated and 404. */ sourceControlMedia?: boolean | undefined; headingLevelOffset?: number | undefined; + /** Keeps rewritten workspace files from reusing an earlier message's cached URL. */ + assetScope?: string | undefined; } export interface ChatMarkdownContextReference { @@ -450,6 +452,7 @@ function useChatMarkdownState({ renderContextReference, headingLevelOffset = 0, sourceControlMedia = false, + assetScope, }: ChatMarkdownProps) { const resolvedTheme = useRenderedAppearance(); const markdownRef = useRef(null); @@ -460,6 +463,7 @@ function useChatMarkdownState({ explicitEnvironmentId, cwd, imageBaseDir, + assetScope, ].join("\u0000"); // Hide requests from an old scope even if they resolve before effect cleanup. const [localMedia, setLocalMedia] = useState<{ @@ -522,6 +526,7 @@ function useChatMarkdownState({ httpBaseUrl: environmentId === null ? undefined : readPreparedConnection(environmentId)?.httpBaseUrl, createAssetUrl, + assetScope, onOpenFile: threadRef ? (path) => useRightPanelStore.getState().openFile(threadRef, path) : undefined, @@ -873,6 +878,7 @@ function useChatMarkdownState({ }; const componentState = { + assetScope, canOperateHost, canOperatePreview, cwd, @@ -1339,6 +1345,7 @@ const CHAT_MARKDOWN_COMPONENTS = { }, img: function MarkdownImage({ node, title, src, alt, ...props }) { const { + assetScope, expandMedia, cwd, environmentId, @@ -1489,6 +1496,7 @@ const CHAT_MARKDOWN_COMPONENTS = { threadId: threadRef.threadId, path: imageSource.path, }} + assetScope={assetScope} alt={altText} kind={kind} copyMarkdown={copyMarkdown} diff --git a/apps/web/src/components/chat/ChatMarkdownMedia.tsx b/apps/web/src/components/chat/ChatMarkdownMedia.tsx index f2740de785b29..6c5e6a4b1d76a 100644 --- a/apps/web/src/components/chat/ChatMarkdownMedia.tsx +++ b/apps/web/src/components/chat/ChatMarkdownMedia.tsx @@ -337,6 +337,7 @@ export const ChatMarkdownAssetImage = memo(function ChatMarkdownAssetImage(props readonly workspaceRoot?: string | undefined; readonly workspaceMutationId?: string | null | undefined; readonly onImageExpand?: ((preview: ExpandedImagePreview) => void) | undefined; + readonly assetScope?: string | undefined; }) { const resource = props.resource; const assetUrl = useAssetUrlState( @@ -345,10 +346,10 @@ export const ChatMarkdownAssetImage = memo(function ChatMarkdownAssetImage(props props.workspaceMutationId !== undefined && props.kind !== "video" && (resource._tag === "media-file" || resource._tag === "workspace-file") - ? props.workspaceMutationId - : undefined, + ? { revision: props.workspaceMutationId, scope: props.assetScope } + : { scope: props.assetScope }, ); - const refreshAssetUrl = useAssetUrlRefresh(props.environmentId, resource); + const refreshAssetUrl = useAssetUrlRefresh(props.environmentId, resource, props.assetScope); const path = resource._tag === "media-file" ? resource.path @@ -382,7 +383,7 @@ export const ChatMarkdownAssetImage = memo(function ChatMarkdownAssetImage(props name: props.alt || (props.kind ?? "image"), src, ...(fallbackSrc === undefined - ? { asset: { environmentId: props.environmentId, resource } } + ? { asset: { environmentId: props.environmentId, resource, scope: props.assetScope } } : {}), ...(reference ? { reference } : {}), ...(relativePath && (resource._tag === "media-file" || resource._tag === "workspace-file") diff --git a/apps/web/src/components/chat/ExpandedImageDialog.tsx b/apps/web/src/components/chat/ExpandedImageDialog.tsx index aadbcab79b129..fd661f1f0eb60 100644 --- a/apps/web/src/components/chat/ExpandedImageDialog.tsx +++ b/apps/web/src/components/chat/ExpandedImageDialog.tsx @@ -44,8 +44,14 @@ function ExpandedMediaFailure({ children }: { children: ReactNode }) { function ExpandedVideo({ item }: { readonly item: ExpandedImageItem }) { const asset = item.actionsSource?.asset; - const assetUrl = useAssetUrlState(asset?.environmentId ?? null, asset?.resource ?? null); - const refreshAssetUrl = useAssetUrlRefresh(asset?.environmentId ?? null, asset?.resource ?? null); + const assetUrl = useAssetUrlState(asset?.environmentId ?? null, asset?.resource ?? null, { + scope: asset?.scope, + }); + const refreshAssetUrl = useAssetUrlRefresh( + asset?.environmentId ?? null, + asset?.resource ?? null, + asset?.scope, + ); const src = asset ? assetUrl._tag === "Success" ? assetUrl.url + (item.srcFragment ?? "") diff --git a/apps/web/src/components/chat/ExpandedImagePreview.tsx b/apps/web/src/components/chat/ExpandedImagePreview.tsx index 0eec6753f8e96..ffdcd8552e3c0 100644 --- a/apps/web/src/components/chat/ExpandedImagePreview.tsx +++ b/apps/web/src/components/chat/ExpandedImagePreview.tsx @@ -2,15 +2,10 @@ import type { SnapShotSource } from "@t3tools/contracts"; import type { ComposerFileAttachment } from "../../composerDraftStore"; import { type ChatFileAttachment, type ChatImageAttachment, isVideoAttachment } from "../../types"; -import type { - AssetCreateUrlResult, - AssetResource, - EnvironmentId, - ScopedThreadRef, -} from "@t3tools/contracts"; +import type { AssetCreateUrlResult, EnvironmentId, ScopedThreadRef } from "@t3tools/contracts"; import { videoMimeType } from "@t3tools/shared/video"; import { resolveMediaSource } from "@t3tools/client-runtime/media-source"; -import { resolveAssetUrl } from "@t3tools/client-runtime/state/assets"; +import { resolveAssetUrl, type AssetUrlQuery } from "@t3tools/client-runtime/state/assets"; import { squashAtomCommandFailure, type AtomCommandResult, @@ -44,10 +39,11 @@ export async function resolveMarkdownMediaPreview(input: { cwd?: string | undefined; threadRef?: ScopedThreadRef | undefined; httpBaseUrl?: string | undefined; + assetScope?: string | undefined; onOpenFile?: ((relativePath: string) => void) | undefined; createAssetUrl: (input: { environmentId: EnvironmentId; - input: { resource: AssetResource }; + input: AssetUrlQuery; }) => Promise>; }): Promise { const media = resolveMediaSource(input.source, { @@ -67,10 +63,14 @@ export async function resolveMarkdownMediaPreview(input: { if (media.access === "unavailable" || !input.threadRef || !input.httpBaseUrl) { throw new Error("Reconnect to this environment and open the media again."); } - asset = { environmentId: input.threadRef.environmentId, resource: media.resource }; + asset = { + environmentId: input.threadRef.environmentId, + resource: media.resource, + scope: input.assetScope, + }; const result = await input.createAssetUrl({ environmentId: asset.environmentId, - input: { resource: asset.resource }, + input: { resource: asset.resource, scope: asset.scope }, }); if (result._tag === "Failure") throw squashAtomCommandFailure(result); const assetUrl = resolveAssetUrl(input.httpBaseUrl, result.value.relativeUrl); @@ -150,7 +150,7 @@ export function buildAttachmentVideoPreview( export function expandedImageKey(preview: ExpandedImagePreview): string { const item = preview.images[preview.index]; const asset = item?.actionsSource?.asset; - return `${item?.src ?? (asset ? JSON.stringify([asset.environmentId, asset.resource]) : "image")}:${preview.index}`; + return `${item?.src ?? (asset ? JSON.stringify([asset.environmentId, asset.resource, asset.scope]) : "image")}:${preview.index}`; } export function attachVideoThumbnail(video: HTMLVideoElement, file: File): () => void { diff --git a/apps/web/src/components/chat/TimelineAssistantRows.tsx b/apps/web/src/components/chat/TimelineAssistantRows.tsx index 89b52ae5c5cba..03aff98da73a4 100644 --- a/apps/web/src/components/chat/TimelineAssistantRows.tsx +++ b/apps/web/src/components/chat/TimelineAssistantRows.tsx @@ -41,6 +41,7 @@ export function AssistantTimelineRow({ row }: { row: Extract void; } @@ -83,10 +87,10 @@ export function useMediaActions(source: MediaActionSource) { if (!source.src) throw new Error("This media is unavailable. Try reopening the preview."); return source.src; } - const { environmentId, resource } = source.asset; + const { environmentId, resource, scope } = source.asset; const connection = readPreparedConnection(environmentId); if (!connection) throw new Error("Reconnect to this environment and try again."); - const result = await createAssetUrl({ environmentId, input: { resource } }); + const result = await createAssetUrl({ environmentId, input: { resource, scope } }); if (result._tag === "Failure") throw squashAtomCommandFailure(result); assertCanReadMedia(); const url = resolveAssetUrl(connection.httpBaseUrl, result.value.relativeUrl); diff --git a/packages/client-runtime/src/state/assets.ts b/packages/client-runtime/src/state/assets.ts index 298772ca05cc3..1785af0f614ea 100644 --- a/packages/client-runtime/src/state/assets.ts +++ b/packages/client-runtime/src/state/assets.ts @@ -129,6 +129,9 @@ export function assetUrlStateFromResult( }; } +/** Client-only cache identity: later messages must re-sign files that may have changed. */ +export type AssetUrlQuery = AssetCreateUrlInput & { readonly scope?: string | undefined }; + export function createAssetEnvironmentAtoms( runtime: Atom.AtomRuntime, localMediaEnvironment?: Atom.Atom<{ @@ -136,11 +139,11 @@ export function createAssetEnvironmentAtoms( readonly httpBaseUrl: string; } | null>, ) { - const execute = Effect.fn("assets.createUrl")(function* (input: AssetCreateUrlInput) { + const execute = Effect.fn("assets.createUrl")(function* ({ resource }: AssetUrlQuery) { + const input = { resource }; const result = yield* request(WS_METHODS.assetsCreateUrl, input).pipe(Effect.result); if (Result.isSuccess(result)) return result.success; const error = result.failure; - const resource = input.resource; const local = localMediaEnvironment ? (yield* AtomRegistry.AtomRegistry).get(localMediaEnvironment) : null; diff --git a/packages/client-runtime/src/state/runtime.test.ts b/packages/client-runtime/src/state/runtime.test.ts index 5b348d012027c..719c6872788cc 100644 --- a/packages/client-runtime/src/state/runtime.test.ts +++ b/packages/client-runtime/src/state/runtime.test.ts @@ -1,9 +1,10 @@ -import { describe, expect, it } from "@effect/vitest"; +import { describe, expect, it, vi } from "@effect/vitest"; import { EnvironmentId, type PreviewEvent, type TerminalAttachInput, type TerminalAttachStreamEvent, + ThreadId, type TerminalMetadataStreamEvent, type TerminalSummary, WS_METHODS, @@ -33,6 +34,7 @@ import * as EnvironmentRegistry from "../connection/registry.ts"; import * as EnvironmentSupervisor from "../connection/supervisor.ts"; import { EnvironmentRpcUnavailableError } from "../rpc/client.ts"; import type * as RpcSession from "../rpc/session.ts"; +import { createAssetEnvironmentAtoms } from "./assets.ts"; import { createPreviewEnvironmentAtoms } from "./preview.ts"; import type { QueryPersistence } from "./queryPersistence.ts"; import { createTerminalEnvironmentAtoms } from "./terminal.ts"; @@ -328,6 +330,47 @@ describe("finite environment subscription lifecycle", () => { }); describe("environment query lifecycle", () => { + it.effect("caches an asset URL per rendering without sending its scope to the server", () => + Effect.gen(function* () { + const { runtime, supervisorSession } = yield* makeEnvironmentQueryHarness(Effect.void); + const sign = vi + .fn() + .mockReturnValueOnce( + Effect.succeed({ relativeUrl: "/api/assets/first/image.png", expiresAt: 999999 }), + ) + .mockReturnValueOnce( + Effect.succeed({ relativeUrl: "/api/assets/updated/image.png", expiresAt: 999999 }), + ); + yield* SubscriptionRef.set( + supervisorSession, + Option.some({ + ...QUERY_RPC_SESSION, + client: { ...QUERY_RPC_SESSION.client, [WS_METHODS.assetsCreateUrl]: sign }, + }), + ); + const assets = createAssetEnvironmentAtoms(runtime); + const resource = { + _tag: "media-file" as const, + threadId: ThreadId.make("thread"), + path: "image.png", + }; + const query = (scope: string) => + assets.createUrl({ + environmentId: QUERY_ENVIRONMENT.environmentId, + input: { resource, scope }, + }); + const registry = yield* mountEnvironmentQuery(query("message-1")); + const url = (scope: string) => + readEnvironmentQuery(registry, query(scope)).pipe(Effect.map((asset) => asset.relativeUrl)); + + expect(yield* url("message-1")).toBe("/api/assets/first/image.png"); + expect(yield* url("message-1")).toBe("/api/assets/first/image.png"); + expect(yield* url("message-2")).toBe("/api/assets/updated/image.png"); + expect(yield* url("message-1")).toBe("/api/assets/first/image.png"); + expect(sign.mock.calls).toEqual([[{ resource }], [{ resource }]]); + }).pipe(Effect.scoped), + ); + it.effect( "terminal metadata waits for snapshots and retains known sessions across restarts", () =>