Skip to content

Commit e0f69e9

Browse files
fix(web,mobile): chat images reload when the agent rewrites the file (#29741)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 07a1e79 commit e0f69e9

15 files changed

Lines changed: 554 additions & 381 deletions

‎apps/mobile/src/features/threads/ThreadDetailScreen.tsx‎

Lines changed: 51 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ import {
197197
} from "./ThreadComposer";
198198
import { ComposerPopoverHost } from "./ComposerPopoverHost";
199199
import { ThreadFeed, type ThreadFeedHandle, type ThreadFeedHistoryControls } from "./ThreadFeed";
200+
import { WorkspaceMutationIdProvider } from "./WorkspaceMutationIdProvider";
200201
import { useThreadTurnSubagents } from "./ThreadAgentsSheet";
201202
import { ComposerQueuedEditBanner } from "./ComposerQueuedEdit";
202203
import { useThreadQueuedCount } from "./ThreadQueueControl";
@@ -1437,54 +1438,56 @@ function ThreadDetailBody(
14371438
/>
14381439
)}
14391440
>
1440-
<ThreadFeed
1441-
environmentId={props.environmentId}
1442-
threadId={props.selectedThread.id}
1443-
detailRef={props.selectedThreadDetailRef}
1444-
workspaceRoot={props.threadCwd}
1445-
feed={props.selectedThreadFeed}
1446-
pendingHandoff={props.pendingHandoff}
1447-
worktreeSetup={props.worktreeSetup}
1448-
setupWorkingStartedAt={props.setupWorkingStartedAt}
1449-
queuedMessages={props.queuedMessages}
1450-
dispatchingMessageId={props.dispatchingMessageId}
1451-
// A native subagent has no composer to edit a pending message in;
1452-
// Cancel on the edit banner would discard it.
1453-
onEditPendingMessage={
1454-
isProviderSubagent || pendingMessageEditBlocked ? null : handleEditPendingMessage
1455-
}
1456-
contentPresentation={props.contentPresentation}
1457-
threadTitle={props.selectedThread.title}
1458-
latestRun={props.activityRun}
1459-
activeWorkStartedAt={props.activeWorkStartedAt}
1460-
runlessWorkActive={props.runlessWorkActive ?? false}
1461-
listRef={listRef}
1462-
freeze={freeze}
1463-
anchorMessageId={anchorMessageId}
1464-
jumpToMessageId={jumpMessageLoaded ? jumpMessageId : null}
1465-
onJumpedToMessage={() => finishThreadMessageJump(selectedThreadKey)}
1466-
ref={feedRef}
1467-
contentInsetEndAdjustment={combinedContentInsetEndAdjustment}
1468-
keyboardOffset={composerKeyboardOffset}
1469-
sendingWithKeyboard={sendingWithKeyboard}
1470-
fitShortFeedToViewport={questionInFlow && !isKeyboardVisible}
1471-
contentTopInset={0}
1472-
contentBottomInset={
1473-
questionInFlow
1474-
? 0
1475-
: estimatedOverlayHeight +
1476-
(showFloatingStatus ? FLOATING_WORKING_CONTROL_COVERAGE : 0)
1477-
}
1478-
contentMaxWidth={contentMaxWidth}
1479-
historyControls={props.historyControls}
1480-
contentSideInsets={nativeMetrics?.safeArea}
1481-
layoutVariant={layoutVariant}
1482-
usesAutomaticContentInsets={props.usesAutomaticContentInsets}
1483-
onHeaderMaterialVisibilityChange={props.onHeaderMaterialVisibilityChange}
1484-
onEndFollowEnabledChange={handleEndFollowEnabledChange}
1485-
skills={selectedProviderSkills}
1486-
onUseArtifactTemplate={handleUseArtifactTemplate}
1487-
/>
1441+
<WorkspaceMutationIdProvider threadRef={props.selectedThreadDetailRef}>
1442+
<ThreadFeed
1443+
environmentId={props.environmentId}
1444+
threadId={props.selectedThread.id}
1445+
detailRef={props.selectedThreadDetailRef}
1446+
workspaceRoot={props.threadCwd}
1447+
feed={props.selectedThreadFeed}
1448+
pendingHandoff={props.pendingHandoff}
1449+
worktreeSetup={props.worktreeSetup}
1450+
setupWorkingStartedAt={props.setupWorkingStartedAt}
1451+
queuedMessages={props.queuedMessages}
1452+
dispatchingMessageId={props.dispatchingMessageId}
1453+
// A native subagent has no composer to edit a pending message in;
1454+
// Cancel on the edit banner would discard it.
1455+
onEditPendingMessage={
1456+
isProviderSubagent || pendingMessageEditBlocked ? null : handleEditPendingMessage
1457+
}
1458+
contentPresentation={props.contentPresentation}
1459+
threadTitle={props.selectedThread.title}
1460+
latestRun={props.activityRun}
1461+
activeWorkStartedAt={props.activeWorkStartedAt}
1462+
runlessWorkActive={props.runlessWorkActive ?? false}
1463+
listRef={listRef}
1464+
freeze={freeze}
1465+
anchorMessageId={anchorMessageId}
1466+
jumpToMessageId={jumpMessageLoaded ? jumpMessageId : null}
1467+
onJumpedToMessage={() => finishThreadMessageJump(selectedThreadKey)}
1468+
ref={feedRef}
1469+
contentInsetEndAdjustment={combinedContentInsetEndAdjustment}
1470+
keyboardOffset={composerKeyboardOffset}
1471+
sendingWithKeyboard={sendingWithKeyboard}
1472+
fitShortFeedToViewport={questionInFlow && !isKeyboardVisible}
1473+
contentTopInset={0}
1474+
contentBottomInset={
1475+
questionInFlow
1476+
? 0
1477+
: estimatedOverlayHeight +
1478+
(showFloatingStatus ? FLOATING_WORKING_CONTROL_COVERAGE : 0)
1479+
}
1480+
contentMaxWidth={contentMaxWidth}
1481+
historyControls={props.historyControls}
1482+
contentSideInsets={nativeMetrics?.safeArea}
1483+
layoutVariant={layoutVariant}
1484+
usesAutomaticContentInsets={props.usesAutomaticContentInsets}
1485+
onHeaderMaterialVisibilityChange={props.onHeaderMaterialVisibilityChange}
1486+
onEndFollowEnabledChange={handleEndFollowEnabledChange}
1487+
skills={selectedProviderSkills}
1488+
onUseArtifactTemplate={handleUseArtifactTemplate}
1489+
/>
1490+
</WorkspaceMutationIdProvider>
14881491
</RenderErrorBoundary>
14891492
</View>
14901493
) : (

‎apps/mobile/src/features/threads/ThreadMarkdownImage.tsx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { PresentationSource } from "../../components/ui/NativePresentation";
1919
import { useMediaActions } from "../../state/mediaActions";
2020
import type { MediaActionsSource } from "../../lib/mediaActionsSource";
2121
import { useAssetUrlState } from "../../state/assets";
22+
import { WorkspaceMutationIdContext } from "./workspaceMutationIdContext";
2223
import { assetImageCacheKey } from "../../lib/assetImageSource";
2324
import {
2425
MARKDOWN_IMAGE_MAX_WIDTH,
@@ -277,7 +278,12 @@ export function ThreadMarkdownImage(props: {
277278
readonly onPressPreview: (source: FilePreviewSource) => void;
278279
}) {
279280
const withGallery = useFilePreviewGallery();
280-
const assetUrl = useAssetUrlState(props.environmentId, props.resource);
281+
const workspaceMutationId = useContext(WorkspaceMutationIdContext);
282+
const assetUrl = useAssetUrlState(
283+
props.environmentId,
284+
props.resource,
285+
props.resource._tag === "media-file" ? workspaceMutationId : undefined,
286+
);
281287
const resourceKey =
282288
props.resource._tag === "attachment"
283289
? `attachment:${props.resource.attachmentId}`
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { useAtomValue } from "@effect/atom-react";
2+
import type { ScopedThreadRef } from "@t3tools/contracts";
3+
import { Atom } from "effect/reactivity";
4+
import type { ReactNode } from "react";
5+
6+
import { environmentThreadDetails } from "../../state/threads";
7+
import { WorkspaceMutationIdContext } from "./workspaceMutationIdContext";
8+
9+
const NO_WORKSPACE_MUTATION_ID_ATOM = Atom.make<string | null | undefined>(undefined);
10+
11+
export function WorkspaceMutationIdProvider(props: {
12+
readonly threadRef: ScopedThreadRef | null;
13+
readonly children: ReactNode;
14+
}) {
15+
const workspaceMutationId = useAtomValue(
16+
props.threadRef === null
17+
? NO_WORKSPACE_MUTATION_ID_ATOM
18+
: environmentThreadDetails.workspaceMutationIdAtom(props.threadRef),
19+
);
20+
return (
21+
<WorkspaceMutationIdContext value={workspaceMutationId}>
22+
{props.children}
23+
</WorkspaceMutationIdContext>
24+
);
25+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import { createContext } from "react";
2+
3+
/** The thread's workspace mutation id, so a host image the agent rewrites gets a fresh URL. */
4+
export const WorkspaceMutationIdContext = createContext<string | null | undefined>(undefined);

‎apps/mobile/src/state/assets.ts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
createAssetEnvironmentAtoms,
77
createProjectFaviconUrlAtomFamily,
88
EMPTY_ASSET_URL_ATOM,
9+
makeRevisionedAssetUrlFamily,
910
} from "@t3tools/client-runtime/state/assets";
1011
import { executeAtomQuery } from "@t3tools/client-runtime/state/runtime";
1112
import type { AssetResource, EnvironmentId } from "@t3tools/contracts";
@@ -34,9 +35,16 @@ export const projectFaviconUrlAtom = createProjectFaviconUrlAtomFamily({
3435
projectClones: environmentProjectCloneListAtom,
3536
});
3637

38+
const revisionedAssetUrl = makeRevisionedAssetUrlFamily(assetEnvironment.createUrl);
39+
40+
/**
41+
* Pass `revision` for a host file whose bytes can change under the same path; each new
42+
* revision re-mints the URL so the image reloads.
43+
*/
3744
export function useAssetUrlState(
3845
environmentId: EnvironmentId | null,
3946
resource: AssetResource | null,
47+
revision?: string | null,
4048
): AssetUrlState {
4149
const fileAccessSession = useEnvironmentQuery(
4250
environmentId === null ? null : environmentSession.sessionStateAtom(environmentId),
@@ -54,7 +62,9 @@ export function useAssetUrlState(
5462
const result = useAtomValue(
5563
blocked !== null || environmentId === null || resource === null
5664
? EMPTY_ASSET_URL_ATOM
57-
: assetEnvironment.createUrl({ environmentId, input: { resource } }),
65+
: revision === undefined
66+
? assetEnvironment.createUrl({ environmentId, input: { resource } })
67+
: revisionedAssetUrl({ environmentId, input: { resource }, revision }),
5868
);
5969
const shared =
6070
blocked ??

‎apps/web/src/assets/assetUrls.test.ts‎

Lines changed: 0 additions & 107 deletions
This file was deleted.

‎apps/web/src/assets/assetUrls.ts‎

Lines changed: 3 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import {
44
assetUrlStateFromResult,
55
blockedAssetUrlState,
66
EMPTY_ASSET_URL_ATOM,
7+
makeRevisionedAssetUrlFamily,
78
resolveAssetUrl,
89
} from "@t3tools/client-runtime/state/assets";
910
import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime";
10-
import { AssetResource, type AssetCreateUrlResult, EnvironmentId } from "@t3tools/contracts";
11-
import * as Schema from "effect/Schema";
12-
import { AsyncResult, Atom, type AtomRegistry } from "effect/reactivity";
11+
import { AssetResource, EnvironmentId } from "@t3tools/contracts";
12+
import { AsyncResult } from "effect/reactivity";
1313

1414
import { assetEnvironment } from "~/state/assets";
1515
import { useFilesystemReadAccess } from "~/state/filesystem";
@@ -20,72 +20,6 @@ export { resolveAssetUrl } from "@t3tools/client-runtime/state/assets";
2020

2121
export type AssetUrlState = RuntimeAssetUrlState & { readonly waiting?: boolean };
2222

23-
type AssetUrlTarget = {
24-
readonly environmentId: EnvironmentId;
25-
readonly input: { readonly resource: AssetResource };
26-
};
27-
28-
const decodeRevisionedAssetUrlKey = Schema.decodeUnknownSync(
29-
Schema.Tuple([EnvironmentId, AssetResource, Schema.NullOr(Schema.String)]),
30-
);
31-
32-
const isSettled = (result: AsyncResult.AsyncResult<unknown, unknown>) =>
33-
!AsyncResult.isInitial(result) && !result.waiting;
34-
35-
/**
36-
* The URL is minted per resource and shared across revisions, so reading a
37-
* different revision (even an earlier one after a revert) re-mints it. An
38-
* in-flight mint is shared only on first read; after an edit the server must
39-
* re-read the file, so the re-mint waits for that mint to settle.
40-
*/
41-
export function makeRevisionedAssetUrlFamily(
42-
createUrl: (
43-
target: AssetUrlTarget,
44-
) => Atom.Atom<AsyncResult.AsyncResult<AssetCreateUrlResult, unknown>>,
45-
) {
46-
// Outside the nodes: a node is dropped once unmounted, and the next read of
47-
// its revision must still see the revisions minted since. Never pruned on
48-
// purpose: pruning would forget the revision and re-mint on the next mount.
49-
// It holds one short entry per file shown, and goes with the registry.
50-
const mintedUnder = new WeakMap<AtomRegistry.AtomRegistry, Map<string, string | null>>();
51-
const family = Atom.family((key: string) => {
52-
const [environmentId, resource, revision] = decodeRevisionedAssetUrlKey(JSON.parse(key));
53-
const resourceKey = JSON.stringify([environmentId, resource]);
54-
const query = createUrl({ environmentId, input: { resource } });
55-
return Atom.transform(
56-
query,
57-
(get) => {
58-
let minted = mintedUnder.get(get.registry);
59-
if (minted === undefined) {
60-
minted = new Map();
61-
mintedUnder.set(get.registry, minted);
62-
}
63-
const firstRead = !minted.has(resourceKey);
64-
let pending = minted.get(resourceKey) !== revision;
65-
const current = get.once(query);
66-
if (pending && (firstRead || isSettled(current))) {
67-
pending = false;
68-
minted.set(resourceKey, revision);
69-
if (isSettled(current)) get.refresh(query);
70-
}
71-
get.subscribe(query, (value) => {
72-
get.setSelf(value);
73-
if (!pending || !isSettled(value)) return;
74-
pending = false;
75-
minted.set(resourceKey, revision);
76-
get.refresh(query);
77-
});
78-
return get.once(query);
79-
},
80-
{ initialValueTarget: query },
81-
// No idle TTL: each mount rebuilds the node, so a revision read again after
82-
// another one is compared against the record instead of a cached node.
83-
).pipe(Atom.setIdleTTL(0));
84-
});
85-
return (target: AssetUrlTarget & { readonly revision: string | null }) =>
86-
family(JSON.stringify([target.environmentId, target.input.resource, target.revision]));
87-
}
88-
8923
const revisionedAssetUrl = makeRevisionedAssetUrlFamily(assetEnvironment.createUrl);
9024

9125
/**

0 commit comments

Comments
 (0)