Skip to content

Commit 2d1b2e8

Browse files
committed
fix(web): preserve remote written IDs while their families reload
Wait for a successful family read to confirm that a selected remote thread is absent before replacing it. Preserve written-ID precedence when both remote candidates are visible.
1 parent 2add256 commit 2d1b2e8

2 files changed

Lines changed: 49 additions & 7 deletions

File tree

‎apps/web/src/components/chat/MarkdownThreadLink.browser.test.tsx‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,12 @@ describe("thread link family lookups", () => {
207207
const decoded = ref("provider:1");
208208
const failed = lookup === "written" ? literal : decoded;
209209
const remote = ref(failed.threadId, EnvironmentId.make("remote-environment"));
210-
using fixture = setup(new Map([[key(remote), row(remote.threadId, "Remote thread")]]));
210+
const alternative = ref(decoded.threadId, EnvironmentId.make("decoded-remote-environment"));
211+
const shells = new Map([[key(remote), row(remote.threadId, "Remote thread")]]);
212+
if (lookup === "written") {
213+
shells.set(key(alternative), row(alternative.threadId, "Decoded remote thread"));
214+
}
215+
using fixture = setup(shells);
211216
await using screen = await render(view(literal, "markdown", true));
212217
if (lookup === "decoded") await fixture.resolve(literal, []);
213218
await fixture.fail(failed, true);
@@ -221,6 +226,13 @@ describe("thread link family lookups", () => {
221226
expect(fixture.requested.has(key(remote))).toBe(false);
222227
await fixture.setShell(remote, null);
223228
expect(fixture.requested.has(key(remote))).toBe(true);
229+
await expect
230+
.element(screen.getByRole("link", { name: "Thread, Decoded remote thread" }))
231+
.not.toBeInTheDocument();
232+
await fixture.fail(remote);
233+
await expect
234+
.element(screen.getByRole("link", { name: "Thread, Decoded remote thread" }))
235+
.not.toBeInTheDocument();
224236
await fixture.resolve(remote, [row(remote.threadId, "Remote thread reloaded")]);
225237
await expect
226238
.element(screen.getByRole("link", { name: "Thread, Remote thread reloaded" }))
@@ -234,12 +246,30 @@ describe("thread link family lookups", () => {
234246
await expect
235247
.element(screen.getByRole("link", { name: "Thread, Remote thread reloaded" }))
236248
.toBeInTheDocument();
249+
if (lookup === "written") {
250+
await fixture.resolve(remote, []);
251+
await expect
252+
.element(screen.getByRole("link", { name: "Thread, Decoded remote thread" }))
253+
.toBeInTheDocument();
254+
} else {
255+
const preferred = ref(literal.threadId, EnvironmentId.make("written-remote-environment"));
256+
await fixture.setShell(preferred, row(preferred.threadId, "Preferred written remote"));
257+
await expect
258+
.element(screen.getByRole("link", { name: "Thread, Preferred written remote" }))
259+
.toBeInTheDocument();
260+
}
237261
const next = ref("different-thread");
238262
await screen.rerender(view(next, "markdown", true));
239263
await fixture.fail(next);
240264
await expect
241265
.element(screen.getByRole("link", { name: "Thread, Remote thread reloaded" }))
242266
.not.toBeInTheDocument();
267+
await expect
268+
.element(screen.getByRole("link", { name: "Thread, Decoded remote thread" }))
269+
.not.toBeInTheDocument();
270+
await expect
271+
.element(screen.getByRole("link", { name: "Thread, Preferred written remote" }))
272+
.not.toBeInTheDocument();
243273
expect(appAtomRegistry.get(mocks.shells).has(key(remote))).toBe(false);
244274
},
245275
);

‎apps/web/src/components/chat/MarkdownThreadLink.tsx‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,29 @@ export function MarkdownThreadLink(props: {
6565
ref: ScopedThreadRef;
6666
} | null>(null);
6767
const rememberedRef = remoteSelection?.sourceKey === sourceKey ? remoteSelection.ref : null;
68+
const remoteRef = guess ? rememberedRef : null;
69+
const remote = useThreadShell(remoteRef);
70+
const remoteFamily = useThreadFamilyIfMissing(remoteRef, remoteRef !== null && remote === null);
71+
const remoteMissing =
72+
remoteRef !== null &&
73+
remote === null &&
74+
AsyncResult.isSuccess(remoteFamily) &&
75+
!remoteFamily.waiting &&
76+
!remoteFamily.value.threads.some((thread) => thread.id === remoteRef.threadId);
77+
const matchesGuess =
78+
guessedRef !== null &&
79+
rememberedRef?.environmentId === guessedRef.environmentId &&
80+
rememberedRef.threadId === guessedRef.threadId;
81+
const preferWrittenGuess =
82+
guessedRef?.threadId === props.link.threadId && rememberedRef?.threadId !== props.link.threadId;
6883
if (
6984
guessedRef !== null &&
70-
(rememberedRef?.environmentId !== guessedRef.environmentId ||
71-
rememberedRef.threadId !== guessedRef.threadId)
85+
!matchesGuess &&
86+
(rememberedRef === null || remoteMissing || preferWrittenGuess)
7287
) {
7388
setRemoteSelection({ sourceKey, ref: guessedRef });
7489
}
75-
const remoteRef = guess ? (guessedRef ?? rememberedRef) : null;
76-
const remote = useThreadShell(remoteRef);
77-
useThreadFamilyIfMissing(remoteRef, remoteRef !== null && remote === null);
78-
const thread = local ?? (guessedRef === null ? null : remote);
90+
const thread = local ?? (matchesGuess ? remote : null);
7991
if (thread === null) {
8092
const unknown = unknownThreadLinkLabel(props.link, props.environmentId);
8193
return <UnresolvedChip label={props.label ?? unknown} tooltip={unknown} />;

0 commit comments

Comments
 (0)